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

Timestamp:

Feb 9, 2002, 1:45:14 PM (24 years ago)

Author:

sandervl

Message:

logging updates

File:

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

trunk/src/kernel32/environ.cpp

@@ -1 @@
-/* $Id: environ.cpp,v 1.13 2001-11-14 18:38:48 sandervl Exp $ */
+/* $Id: environ.cpp,v 1.14 2002-02-09 12:45:12 sandervl Exp $ */
 
 /*
@@ -46 +46 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION0(LPWSTR, GetEnvironmentStringsW)
+LPWSTR WIN32API GetEnvironmentStringsW()
 {
   char *envstrings = (char *)O32_GetEnvironmentStrings();
@@ -75 +75 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(BOOL, FreeEnvironmentStringsA,
-              LPSTR, envstrings)
+BOOL WIN32API FreeEnvironmentStringsA(LPSTR envstrings)
 {
   return(TRUE);
@@ -82 +81 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(BOOL, FreeEnvironmentStringsW,
-              LPWSTR, envstrings)
+BOOL WIN32API FreeEnvironmentStringsW(LPWSTR envstrings)
 {
   free(envstrings);
@@ -90 +88 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(BOOL, SetEnvironmentVariableA,
-              LPCSTR, lpName,
-              LPCSTR, lpValue)
+BOOL WIN32API SetEnvironmentVariableA(LPCSTR lpName, LPCSTR lpValue)
 {
   dprintf(("KERNEL32:  SetEnvironmentVariable %s to %s\n", lpName, lpValue));
@@ -99 +95 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(BOOL, SetEnvironmentVariableW,
-              LPCWSTR, lpName,
-              LPCWSTR, lpValue)
+BOOL WIN32API SetEnvironmentVariableW(LPCWSTR lpName, LPCWSTR lpValue)
 {
   char *asciiname, *asciivalue;
@@ -116 +110 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION3(DWORD,  GetEnvironmentVariableA,
-              LPCSTR, lpName,
-              LPSTR,  lpBuffer,
-              DWORD,  nSize)
+DWORD WIN32API GetEnvironmentVariableA(LPCSTR lpName, LPSTR lpBuffer,
+                                       DWORD nSize)
 {
   dprintf(("GetEnvironmentVariableA %s", lpName));
@@ -126 +118 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION3(DWORD, GetEnvironmentVariableW,
-              LPCWSTR, lpName,
-              LPWSTR,  lpBuffer,
-              DWORD,   nSize)
+DWORD WIN32API GetEnvironmentVariableW(LPCWSTR lpName, LPWSTR lpBuffer,
+                                       DWORD nSize)
 {
   char *astring, *asciibuffer;
@@ -149 +139 @@
   astring     = UnicodeToAsciiString((LPWSTR)lpName);
 
-  rc = CALL_ODINFUNC(GetEnvironmentVariableA)(astring, asciibuffer, nSize);
+  rc = GetEnvironmentVariableA(astring, asciibuffer, nSize);
   if(asciibuffer)
       AsciiToUnicode(asciibuffer, lpBuffer);
@@ -192 +182 @@
  *****************************************************************************/
 
-ODINFUNCTION3(DWORD,  ExpandEnvironmentStringsA,
-              LPCSTR, src,
-              LPSTR,  dst,
-              DWORD,  count)
+DWORD WIN32API ExpandEnvironmentStringsA(LPCSTR src, LPSTR dst, DWORD count)
 {
   DWORD len, total_size = 1;  /* 1 for terminating '\0' */
@@ -278 +265 @@
  *****************************************************************************/
 
-ODINFUNCTION3(DWORD,   ExpandEnvironmentStringsW,
-              LPCWSTR, lpSrc,
-              LPWSTR,  lpDst,
-              DWORD,   nSize)
+DWORD WIN32API  ExpandEnvironmentStringsW(LPCWSTR lpSrc, LPWSTR lpDst,
+                                          DWORD nSize)
 {
   LPSTR srcA = HEAP_strdupWtoA( GetProcessHeap(), 0, lpSrc );