Changeset 7798 for trunk/src/kernel32

Timestamp:

Feb 3, 2002, 10:06:40 PM (24 years ago)

Author:

sandervl

Message:

Ported GetTempPathA/W from Wine

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (2 diffs)
• directory.cpp (modified) (2 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.63 2002-01-02 18:37:51 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.64 2002-02-03 21:06:40 sandervl Exp $ */
 
 /*
@@ -725 +725 @@
   FreeAsciiString(asciipath);
   free(asciitemp);
-  return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION2(UINT, GetTempPathA,
-              UINT, arg1,
-              LPSTR, arg2)
-{
-  return O32_GetTempPath(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION2(UINT, GetTempPathW,
-              UINT, nBufferLength,
-              LPWSTR, lpBuffer)
-{
-  char *asciibuffer = (char *)malloc(nBufferLength+1);
-  DWORD rc;
-
-  rc = O32_GetTempPath(nBufferLength, asciibuffer);
-  if(rc)      AsciiToUnicode(asciibuffer, lpBuffer);
-  free(asciibuffer);
   return(rc);
 }

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.42 2001-11-14 18:38:45 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.43 2002-02-03 21:06:40 sandervl Exp $ */
 
 /*
@@ -754 +754 @@
     return ret;
 }
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION2(UINT, GetTempPathA,
+              UINT, count, LPSTR, path)
+{
+    UINT ret;
+    if (!(ret = GetEnvironmentVariableA( "TMP", path, count )))
+        if (!(ret = GetEnvironmentVariableA( "TEMP", path, count )))
+            if (!(ret = GetCurrentDirectoryA( count, path )))
+                return 0;
+    if (count && (ret < count - 1) && (path[ret-1] != '\\'))
+    {
+        path[ret++] = '\\';
+        path[ret]   = '\0';
+    }
+    return ret;
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION2(UINT, GetTempPathW,
+              UINT, count, LPWSTR, path)
+{
+    static const WCHAR tmp[]  = { 'T', 'M', 'P', 0 };
+    static const WCHAR temp[] = { 'T', 'E', 'M', 'P', 0 };
+    UINT ret;
+    if (!(ret = GetEnvironmentVariableW( tmp, path, count )))
+        if (!(ret = GetEnvironmentVariableW( temp, path, count )))
+            if (!(ret = GetCurrentDirectoryW( count, path )))
+                return 0;
+    if (count && (ret < count - 1) && (path[ret-1] != '\\'))
+    {
+        path[ret++] = '\\';
+        path[ret]   = '\0';
+    }
+    return ret;
+}
+//******************************************************************************
+//******************************************************************************