X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fperllib.c;h=cc46b304bdeca7dbf9298f686db77e608d2691fa;hb=46471bde41ad0777edf7b89818df6730e8b55c20;hp=5bd7ee83d7dcbde1c9bf8eaaf8bb4c75805669e0;hpb=d2b2597412218806baa0430cf97cc8334ac3ec71;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/perllib.c b/win32/perllib.c
index 5bd7ee8..cc46b30 100644
--- a/win32/perllib.c
+++ b/win32/perllib.c
@@ -17,19 +17,15 @@
 char *staticlinkmodules[] = {
     "DynaLoader",
     /* other similar records will be included from "perllibst.h" */
-#ifdef WITH_STATIC
 #define STATIC1
 #include "perllibst.h"
-#endif
     NULL,
 };
 
 EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
 /* other similar records will be included from "perllibst.h" */
-#ifdef WITH_STATIC
 #define STATIC2
 #include "perllibst.h"
-#endif
 
 static void
 xs_init(pTHX)
@@ -38,14 +34,15 @@ xs_init(pTHX)
     dXSUB_SYS;
     newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
     /* other similar records will be included from "perllibst.h" */
-#ifdef WITH_STATIC
 #define STATIC3
 #include "perllibst.h"
-#endif
 }
 
 #ifdef PERL_IMPLICIT_SYS
 
+/* WINCE: include replaced by:
+extern "C" void win32_checkTLS(PerlInterpreter *host_perl);
+*/
 #include "perlhost.h"
 
 void
@@ -54,11 +51,45 @@ win32_checkTLS(PerlInterpreter *host_perl)
     dTHX;
     if (host_perl != my_perl) {
 	int *nowhere = NULL;
-        *nowhere = 0; 
+#ifdef UNDER_CE
+	printf(" ... bad in win32_checkTLS\n");
+	printf("  %08X ne %08X\n",host_perl,my_perl);
+#endif
 	abort();
     }
 }
 
+#ifdef UNDER_CE
+int GetLogicalDrives() {
+    return 0; /* no logical drives on CE */
+}
+int GetLogicalDriveStrings(int size, char addr[]) {
+    return 0; /* no logical drives on CE */
+}
+/* TBD */
+DWORD GetFullPathNameA(LPCSTR fn, DWORD blen, LPTSTR buf,  LPSTR *pfile) {
+    return 0;
+}
+/* TBD */
+DWORD GetFullPathNameW(CONST WCHAR *fn, DWORD blen, WCHAR * buf,  WCHAR **pfile) {
+    return 0;
+}
+/* TBD */
+DWORD SetCurrentDirectoryA(LPSTR pPath) {
+    return 0;
+}
+/* TBD */
+DWORD SetCurrentDirectoryW(CONST WCHAR *pPath) {
+    return 0;
+}
+int xcesetuid(uid_t id){return 0;}
+int xceseteuid(uid_t id){  return 0;}
+int xcegetuid() {return 0;}
+int xcegeteuid(){ return 0;}
+#endif
+
+/* WINCE??: include "perlhost.h" */
+
 EXTERN_C void
 perl_get_host_info(struct IPerlMemInfo* perlMemInfo,
 		   struct IPerlMemInfo* perlMemSharedInfo,
@@ -176,17 +207,25 @@ RunPerl(int argc, char **argv, char **env)
 {
     int exitstatus;
     PerlInterpreter *my_perl, *new_perl = NULL;
-
-#ifndef __BORLANDC__
-    /* XXX this _may_ be a problem on some compilers (e.g. Borland) that
-     * want to free() argv after main() returns.  As luck would have it,
-     * Borland's CRT does the right thing to argv[0] already. */
+    OSVERSIONINFO osver;
     char szModuleName[MAX_PATH];
+    char *arg0 = argv[0];
+    char *ansi = NULL;
+    bool use_environ = (env == environ);
 
-    GetModuleFileName(NULL, szModuleName, sizeof(szModuleName));
-    (void)win32_longpath(szModuleName);
-    argv[0] = szModuleName;
-#endif
+    osver.dwOSVersionInfoSize = sizeof(osver);
+    GetVersionEx(&osver);
+
+    if (osver.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+        WCHAR widename[MAX_PATH];
+        GetModuleFileNameW(NULL, widename, sizeof(widename)/sizeof(WCHAR));
+        argv[0] = ansi = win32_ansipath(widename);
+    }
+    else {
+        Win_GetModuleFileName(NULL, szModuleName, sizeof(szModuleName));
+        (void)win32_longpath(szModuleName);
+        argv[0] = szModuleName;
+    }
 
 #ifdef PERL_GLOBAL_STRUCT
 #define PERLVAR(var,type) /**/
@@ -207,6 +246,16 @@ RunPerl(int argc, char **argv, char **env)
     perl_construct(my_perl);
     PL_perl_destruct_level = 0;
 
+    /* PERL_SYS_INIT() may update the environment, e.g. via ansify_path().
+     * This may reallocate the RTL environment block. Therefore we need
+     * to make sure that `env` continues to have the same value as `environ`
+     * if we have been called this way.  If we have been called with any
+     * other value for `env` then all environment munging by PERL_SYS_INIT()
+     * will be lost again.
+     */
+    if (use_environ)
+        env = environ;
+
     exitstatus = perl_parse(my_perl, xs_init, argc, argv, env);
     if (!exitstatus) {
 #if defined(TOP_CLONE) && defined(USE_ITHREADS)		/* XXXXXX testing */
@@ -228,6 +277,11 @@ RunPerl(int argc, char **argv, char **env)
     }
 #endif
 
+    /* At least the Borland RTL wants to free argv[] after main() returns. */
+    argv[0] = arg0;
+    if (ansi)
+        win32_free(ansi);
+
     PERL_SYS_TERM();
 
     return (exitstatus);
@@ -260,7 +314,11 @@ DllMain(HANDLE hModule,		/* DLL module handle */
 	setmode( fileno( stderr ), O_BINARY );
 	_fmode = O_BINARY;
 #endif
+
+#ifndef UNDER_CE
 	DisableThreadLibraryCalls((HMODULE)hModule);
+#endif
+
 	w32_perldll_handle = hModule;
 	set_w32_module_name();
 	break;
@@ -296,6 +354,7 @@ DllMain(HANDLE hModule,		/* DLL module handle */
     return TRUE;
 }
 
+
 #if defined(USE_ITHREADS) && defined(PERL_IMPLICIT_SYS)
 EXTERN_C PerlInterpreter *
 perl_clone_host(PerlInterpreter* proto_perl, UV flags) {