Changeset 4451 for trunk/src/kernel32/environ.cpp

Timestamp:

Oct 8, 2000, 4:01:02 PM (25 years ago)

Author:

sandervl

Message:

extra logging + toolhelp apis not exported anymore

File:

• trunk/src/kernel32/environ.cpp (modified) (3 diffs)

trunk/src/kernel32/environ.cpp

@@ -1 @@
-/* $Id: environ.cpp,v 1.8 2000-10-02 16:22:09 phaller Exp $ */
+/* $Id: environ.cpp,v 1.9 2000-10-08 14:01:01 sandervl Exp $ */
 
 /*
@@ -120 +120 @@
               DWORD,  nSize)
 {
+  dprintf(("GetEnvironmentVariableA %s", lpName));
   return O32_GetEnvironmentVariable(lpName, lpBuffer, nSize);
 }
@@ -132 +133 @@
   DWORD rc;
 
-  asciibuffer = (char *)malloc(nSize+1);
-  *asciibuffer = 0;
+  if(nSize) {
+       asciibuffer = (char *)malloc(nSize+1);
+       *asciibuffer = 0;
+  }
+  else asciibuffer = NULL;
+
   astring     = UnicodeToAsciiString((LPWSTR)lpName);
 
-  rc = O32_GetEnvironmentVariable(astring, asciibuffer, nSize);
+  rc = CALL_ODINFUNC(GetEnvironmentVariableA)(astring, asciibuffer, nSize);
   AsciiToUnicode(asciibuffer, lpBuffer);
   FreeAsciiString(astring);
-  free(asciibuffer);
+  if(asciibuffer)
+        free(asciibuffer);
   return(rc);
 }