Changeset 2042 for trunk/src/kernel32/KERNEL32.CPP

Timestamp:

Dec 9, 1999, 12:01:09 PM (26 years ago)

Author:

sandervl

Message:

Ported ExpandEnvironmentStringsA/W (Wine: 991114)

File:

• trunk/src/kernel32/KERNEL32.CPP (modified) (5 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.37 1999-11-30 20:19:34 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.38 1999-12-09 11:00:40 sandervl Exp $ */
 
 /*
@@ -175 +175 @@
   dprintf(("KERNEL32:  GetACP\n"));
   return(O32_GetACP());
-}
-//******************************************************************************
-//******************************************************************************
-//******************************************************************************
-//******************************************************************************
-LPWSTR WIN32API GetEnvironmentStringsW(VOID)
-{
- char *envstrings = (char *)O32_GetEnvironmentStrings();
- char *tmp;
- LPWSTR wenvstrings;
- int len, i;
-
-  dprintf(("KERNEL32:  GetEnvironmentStringsW\n"));
-
-  if(envstrings == NULL)
-    return(NULL);
-
-  tmp = envstrings;
-  len = 0;
-  while(*tmp != 0)
-  {
-    len += strlen(tmp)+1;
-    tmp = envstrings + len;
-  }
-  len++;        //terminating 0
-  wenvstrings = (LPWSTR)malloc(len*sizeof(WCHAR));
-  for(i=0;
-      i<len;
-      i++)
-  {
-     wenvstrings[i] = envstrings[i];
-  }
-  return(wenvstrings);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API FreeEnvironmentStringsA(LPSTR envstrings)
-{
-  dprintf(("KERNEL32:  FreeEnvironmentStringsA\n"));
-  return(TRUE);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API FreeEnvironmentStringsW(LPWSTR envstrings)
-{
-  dprintf(("KERNEL32:  FreeEnvironmentStringsW\n"));
-  free(envstrings);
-  return(TRUE);
 }
 //******************************************************************************
@@ -314 +266 @@
 }
 //******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetEnvironmentVariableA(LPCSTR arg1, LPCSTR arg2)
-{
-    dprintf(("KERNEL32:  SetEnvironmentVariable %s to %s\n", arg1, arg2));
-    return O32_SetEnvironmentVariable(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetEnvironmentVariableW(LPCWSTR lpName, LPCWSTR lpValue)
-{
- char *asciiname, *asciivalue;
- BOOL  rc;
-
-    dprintf(("KERNEL32:  OS2SetEnvironmentVariableW\n"));
-    asciiname  = UnicodeToAsciiString((LPWSTR)lpName);
-    asciivalue = UnicodeToAsciiString((LPWSTR)lpValue);
-    rc = O32_SetEnvironmentVariable(asciiname, asciivalue);
-    FreeAsciiString(asciivalue);
-    FreeAsciiString(asciiname);
-    return(rc);
-}
-//******************************************************************************
 VOID WIN32API GlobalMemoryStatus( MEMORYSTATUS *arg1)
 {
@@ -348 +278 @@
     dprintf(("dwAvailVirtual  %X\n", arg1->dwAvailVirtual));
 }
-//******************************************************************************
-//******************************************************************************
-DWORD WIN32API GetEnvironmentVariableA(LPCSTR arg1, LPSTR arg2, DWORD  arg3)
-{
-    dprintf(("KERNEL32:  GetEnvironmentVariable %s\n", arg1));
-    return O32_GetEnvironmentVariable(arg1, arg2, arg3);
-}
-//******************************************************************************
-//******************************************************************************
-DWORD WIN32API GetEnvironmentVariableW(LPCWSTR lpName, LPWSTR lpBuffer,
-                                       DWORD nSize)
-{
-  char *astring, *asciibuffer;
-  DWORD rc;
-
-    dprintf(("KERNEL32:  OS2GetEnvironmentVariableW\n"));
-    asciibuffer = (char *)malloc(nSize+1);
-    *asciibuffer = 0;
-    astring     = UnicodeToAsciiString((LPWSTR)lpName);
-
-    rc = O32_GetEnvironmentVariable(astring, asciibuffer, nSize);
-    AsciiToUnicode(asciibuffer, lpBuffer);
-    FreeAsciiString(astring);
-    free(asciibuffer);
-    return(rc);
-}
 VOID WIN32API Sleep(DWORD arg1)
 {
@@ -464 +368 @@
     dprintf(("KERNEL32:  OS2FatalExit\n"));
     O32_FatalExit(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-LPSTR WIN32API GetEnvironmentStringsA(void)
-{
-    dprintf(("KERNEL32:  OS2GetEnvironmentStringsA\n"));
-    return (LPSTR) O32_GetEnvironmentStrings();
 }
 //******************************************************************************