Changeset 21569 for trunk/src/kernel32/oslibdos.cpp

Timestamp:

Feb 4, 2011, 11:59:05 PM (15 years ago)

Author:

dmik

Message:

kernel32: Fixed a bunch of OSLibDos* functions dealing with file names that passed ANSI strings to the OS/2 APIs w/o first converting it to the OEM codepage which caused "file not found" errors in various Win32 APIs like GetFileAttributesEx() on file names with national characters (Cyrillic, umlauts, etc).

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (17 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -802 +802 @@
   FILESTATUS3 fs3;                             /* file information structure */
   LPWIN32_FILE_ATTRIBUTE_DATA lpFad = (LPWIN32_FILE_ATTRIBUTE_DATA) pBuffer;
+  char        pszOemName[CCHMAXPATH];
+
+  //Convert file name from Windows to OS/2 codepage
+  CharToOemA(ODINHelperStripUNC(pszName), pszOemName);
 
   // Note: we only handle standard "GetFileExInfoStandard" requests
-  rc = DosQueryPathInfo(ODINHelperStripUNC(pszName),               /* query the file information */
+  rc = DosQueryPathInfo(pszOemName,            /* query the file information */
                         FIL_STANDARD,
                         &fs3,
@@ -887 +891 @@
                             ULONG cbInfoBuf)
 {
-   APIRET rc = DosQueryPathInfo( ODINHelperStripUNC(pszPathName), ulInfoLevel,
-                                 pInfoBuf, cbInfoBuf );
-
-   if(rc == ERROR_TOO_MANY_OPEN_FILES)
-   {
+    APIRET      rc;
+    char        pszOemPathName[CCHMAXPATH];
+
+    //Convert file name from Windows to OS/2 codepage
+    CharToOemA(ODINHelperStripUNC(pszPathName), pszOemPathName);
+
+    rc = DosQueryPathInfo(pszOemPathName, ulInfoLevel,
+                          pInfoBuf, cbInfoBuf);
+
+    if(rc == ERROR_TOO_MANY_OPEN_FILES)
+    {
         LONG  reqCount = 2;
         ULONG maxFiles;
 
         if(DosSetRelMaxFH(&reqCount, &maxFiles) == NO_ERROR)
-          rc = DosQueryPathInfo(pszPathName, ulInfoLevel,
-                                      pInfoBuf, cbInfoBuf );
-   }
-   return rc;
+          rc = DosQueryPathInfo(pszOemPathName, ulInfoLevel,
+                                pInfoBuf, cbInfoBuf);
+    }
+    return rc;
 }
 //******************************************************************************
@@ -1397 +1407 @@
 BOOL OSLibDosGetFileInformationByHandle(LPCSTR lpFileName, DWORD hFile, BY_HANDLE_FILE_INFORMATION* pInfo)
 {
- APIRET       rc;
+   APIRET      rc;
 
    // NOTE: On HPFS386, doing FIL_QUERYEASIZE on a write-only file will
@@ -1658 +1668 @@
    DWORD hPipe;
    DWORD rc, ulAction;
+   char  lpOemName[CCHMAXPATH];
+
+  //Convert file name from Windows to OS/2 codepage
+  CharToOemA(lpName, lpOemName);
 
   if ((dwOpenMode & PIPE_ACCESS_DUPLEX_W) == PIPE_ACCESS_DUPLEX_W)
@@ -1695 +1709 @@
   dwOS2PipeMode |= nMaxInstances;
 
-  if (strstr(lpName,"\\\\."))
+  if (strstr(lpOemName,"\\\\."))
   {
     // If pipe is created on the local machine
@@ -1701 +1715 @@
     // in Windows named pipes scheme is a \\.\PIPE\pipename
     // but in OS/2 only \PIPE\pipename
-    lpOS2Name = (LPSTR)lpName + 3;
-  }
-  else lpOS2Name = (LPSTR)lpName;
+    lpOS2Name = (LPSTR)lpOemName + 3;
+  }
+  else lpOS2Name = (LPSTR)lpOemName;
 
   dprintf(("DosCreateNPipe(%s,%x,%x,%x,%x,%x)",lpOS2Name,dwOS2Mode,dwOS2PipeMode,nInBufferSize,nOutBufferSize,nDefaultTimeOut));
@@ -1785 +1799 @@
   ULONG openFlag = 0;
   ULONG openMode = OPEN_FLAGS_NOINHERIT; //default is not inherited by child processes
-
+  char  lpOemName[CCHMAXPATH];
+
+   //Convert file name from Windows to OS/2 codepage
+   CharToOemA(lpName, lpOemName);
 
    switch(fuCreate)
@@ -1844 +1861 @@
         openMode |= OPEN_ACCESS_WRITEONLY;
 
-  if (strstr(lpName,"\\\\."))
+  if (strstr(lpOemName,"\\\\."))
   {
        // If pipe is created on the local machine
@@ -1850 +1867 @@
        // in Windows named pipes scheme is a \\.\PIPE\pipename
        // but in OS/2 only \PIPE\pipename
-       lpOS2Name = (LPSTR)lpName + 3;
-  }
-  else lpOS2Name = (LPSTR)lpName;
+       lpOS2Name = (LPSTR)lpOemName + 3;
+  }
+  else lpOS2Name = (LPSTR)lpOemName;
 
   rc = DosOpen(lpOS2Name, &hPipe, &ulAction, 0, 0,
@@ -1897 +1914 @@
   LPSTR lpOS2Name;
   DWORD rc;
-
-  if (strstr(lpNamedPipeName,"\\\\."))
+  char  lpOemNamedPipeName[CCHMAXPATH];
+
+  //Convert file name from Windows to OS/2 codepage
+  CharToOemA(lpNamedPipeName, lpOemNamedPipeName);
+
+  if (strstr(lpOemNamedPipeName,"\\\\."))
   {
     // If pipe is created on the local machine
@@ -1904 +1925 @@
     // in Windows named pipes scheme is a \\.\PIPE\pipename
     // but in OS/2 only \PIPE\pipename
-    lpOS2Name = (LPSTR)lpNamedPipeName + 3;
-  }
-  else lpOS2Name = (LPSTR)lpNamedPipeName;
+    lpOS2Name = (LPSTR)lpOemNamedPipeName + 3;
+  }
+  else lpOS2Name = (LPSTR)lpOemNamedPipeName;
 
   rc=DosCallNPipe(lpOS2Name,
@@ -2026 +2047 @@
   LPSTR lpOS2Name;
   DWORD rc;
-
-  if (strstr(lpszNamedPipeName,"\\\\."))
+  char  lpszOemNamedPipeName[CCHMAXPATH];
+
+  //Convert file name from Windows to OS/2 codepage
+  CharToOemA(lpszNamedPipeName, lpszOemNamedPipeName);
+
+  if (strstr(lpszOemNamedPipeName,"\\\\."))
   {
     // If pipe is created on the local machine
@@ -2033 +2058 @@
     // in Windows named pipes scheme is a \\.\PIPE\pipename
     // but in OS/2 only \PIPE\pipename
-    lpOS2Name = (LPSTR)lpszNamedPipeName + 3;
-  }
-  else lpOS2Name = (LPSTR)lpszNamedPipeName;
+    lpOS2Name = (LPSTR)lpszOemNamedPipeName + 3;
+  }
+  else lpOS2Name = (LPSTR)lpszOemNamedPipeName;
 
   rc=DosWaitNPipe(lpOS2Name,dwTimeout);
@@ -3123 +3148 @@
 }
 
-/**
- * Pure wrapper for DosQueryModulName which returns the OS/2 returncode.
- * @returns     Returncode from DosQueryModuleName.
- * @param       hModule     Handle of the module which name we query.
- * @param       cchName     Length of the output name buffer.
- * @param       pszname     Pointer to the output name buffer.
- * @status      Completely implemented.
- * @author      knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- */
 ULONG OSLibDosQueryModuleName(ULONG hModule, int cchName, char *pszName)
 {
-    return DosQueryModuleName(hModule, cchName, pszName);
-}
-
+    char pszOemName[CCHMAXPATH];
+    APIRET rc;
+
+    rc = DosQueryModuleName(hModule, sizeof(pszOemName), pszOemName);
+    if(rc == NO_ERROR)
+    {
+       //Convert file name from OS/2 to Windows
+       if (!OemToCharBuffA(pszOemName, pszName, cchName))
+           return GetLastError();
+    }
+
+    rc = error2WinError(rc,ERROR_INVALID_HANDLE);
+    SetLastError(rc);
+    return rc;
+}
 
 HINSTANCE OSLibDosLoadModule(LPSTR szModName)
@@ -3143 +3171 @@
  HMODULE hModule = NULLHANDLE;
  char    name[ CCHMAXPATH ];
-
-  rc = DosLoadModule(name, CCHMAXPATH, szModName, &hModule);
+ char    szOemModName[CCHMAXPATH];
+
+  //Convert file name from Windows to OS/2 codepage
+  CharToOemA(ODINHelperStripUNC(szModName), szOemModName);
+
+  rc = DosLoadModule(name, CCHMAXPATH, szOemModName, &hModule);
   if(rc) {
       SetLastError(error2WinError(rc,ERROR_FILE_NOT_FOUND));
@@ -3229 +3261 @@
    PPIB pPIB;
    APIRET rc;
+   char lpszOemPath[CCHMAXPATH];
 
    if(hModule == -1 || hModule == 0)
@@ -3236 +3269 @@
    }
    *lpszPath = 0;
-   rc = DosQueryModuleName(hModule, cchPath, lpszPath);
+   rc = DosQueryModuleName(hModule, sizeof(lpszOemPath), lpszOemPath);
+
+   if(rc == NO_ERROR)
+   {
+      //Convert file name from OS/2 to Windows
+      if (!OemToCharBuffA(lpszOemPath, lpszPath, cchPath))
+          return 0;
+   }
 
    DWORD len = strlen(lpszPath);