msvcrt: Add an MSVCRT prefix to _wenviron.

dlls/msvcrt/data.c

@@ -51,7 +51,7 @@ MSVCRT_wchar_t **MSVCRT___wargv = NULL;
 char *MSVCRT__acmdln = NULL;
 MSVCRT_wchar_t *MSVCRT__wcmdln = NULL;
 char **MSVCRT__environ = NULL;
-MSVCRT_wchar_t **_wenviron = NULL;
+MSVCRT_wchar_t **MSVCRT__wenviron = NULL;
 char **MSVCRT___initenv = NULL;
 MSVCRT_wchar_t **MSVCRT___winitenv = NULL;
 int MSVCRT_app_type = 0;
@@ -213,9 +213,9 @@ char*** CDECL __p__environ(void)
  */
 MSVCRT_wchar_t*** CDECL __p__wenviron(void)
 {
-  if (!_wenviron)
-    _wenviron = msvcrt_SnapshotOfEnvironmentW(NULL);
-  return &_wenviron;
+  if (!MSVCRT__wenviron)
+    MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL);
+  return &MSVCRT__wenviron;
 }
 
 /*********************************************************************
@@ -325,7 +325,7 @@ void msvcrt_free_args(void)
   HeapFree(GetProcessHeap(), 0, MSVCRT___initenv);
   HeapFree(GetProcessHeap(), 0, MSVCRT___winitenv);
   HeapFree(GetProcessHeap(), 0, MSVCRT__environ);
-  HeapFree(GetProcessHeap(), 0, _wenviron);
+  HeapFree(GetProcessHeap(), 0, MSVCRT__wenviron);
   HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr);
   HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr);
 }

dlls/msvcrt/environ.c

@@ -107,8 +107,8 @@ int CDECL _putenv(const char *str)
  /* Update the __p__environ array only when already initialized */
  if (MSVCRT__environ)
    MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ);
- if (_wenviron)
-   _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron);
+ if (MSVCRT__wenviron)
+   MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);
    
 finish:
  HeapFree(GetProcessHeap(), 0, name);
@@ -153,8 +153,8 @@ int CDECL _wputenv(const MSVCRT_wchar_t *str)
  /* Update the __p__environ array only when already initialized */
  if (MSVCRT__environ)
    MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ);
- if (_wenviron)
-   _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron);
+ if (MSVCRT__wenviron)
+   MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);
 
 finish:
  HeapFree(GetProcessHeap(), 0, name);

dlls/msvcrt/msvcrt.h

@@ -131,7 +131,7 @@ void __cdecl _purecall(void);
 void __cdecl _amsg_exit(int errnum);
 
 extern char **MSVCRT__environ;
-extern MSVCRT_wchar_t **_wenviron;
+extern MSVCRT_wchar_t **MSVCRT__wenviron;
 
 extern char ** msvcrt_SnapshotOfEnvironmentA(char **);
 extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **);

dlls/msvcrt/msvcrt.spec

@@ -550,7 +550,7 @@
 @ cdecl _wctime(ptr) MSVCRT__wctime
 @ cdecl _wctime32(ptr) MSVCRT__wctime32
 @ cdecl _wctime64(ptr) MSVCRT__wctime64
-@ extern _wenviron
+@ extern _wenviron MSVCRT__wenviron
 @ varargs _wexecl(wstr wstr)
 @ varargs _wexecle(wstr wstr)
 @ varargs _wexeclp(wstr wstr)