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

Timestamp:

Feb 11, 2002, 2:46:36 PM (24 years ago)

Author:

sandervl

Message:

DF: fixes for translating ascii strings between os/2 & windows (in case of different code pages)

File:

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

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.94 2002-01-18 16:23:35 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.95 2002-02-11 13:46:36 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -43 +43 @@
 static PROC_DosOpenL         DosOpenLProc = 0;
 static BOOL f64BitIO = FALSE;
+
+BOOL WINAPI CharToOemA( LPCSTR s, LPSTR d );
+BOOL WINAPI OemToCharA( LPCSTR s, LPSTR d );
+
 //******************************************************************************
 //******************************************************************************
@@ -116 +120 @@
  APIRET yyrc;
  USHORT sel = RestoreOS2FS();
+ char OemFileName[260];
+ CharToOemA(pszFileName, OemFileName);
 
     if(DosOpenLProc) {
-        yyrc = DosOpenLProc(pszFileName, phf, pulAction, cbFile, ulAttribute, fsOpenFlags,
+        yyrc = DosOpenLProc(OemFileName, phf, pulAction, cbFile, ulAttribute, fsOpenFlags,
                             fsOpenMode, peaop2);
     }
-    else yyrc = DosOpen(pszFileName, phf, pulAction, cbFile.ulLo, ulAttribute, fsOpenFlags,
+    else yyrc = DosOpen(OemFileName, phf, pulAction, cbFile.ulLo, ulAttribute, fsOpenFlags,
                         fsOpenMode, peaop2);
     SetFS(sel);
@@ -581 +587 @@
  ULONG  ulAction;
  DWORD  os2flags = OPEN_FLAGS_NOINHERIT;
+ char lOemFileName[260];        
+
+ CharToOemA(lpszFileName, lOemFileName);
 
 
@@ -599 +608 @@
 
 tryopen:
-  rc = DosOpen(lpszFileName,                     /* File path name */
+  rc = DosOpen(lOemFileName,                     /* File path name */
                &hFile,                   /* File handle */
                &ulAction,                      /* Action taken */
@@ -648 +657 @@
 {
  APIRET rc;
-
-  rc = DosCopy((PSZ)lpszOldFile, (PSZ)lpszNewFile, fFailIfExist ? 0: DCPY_EXISTING);
+ char lOemOldFile[260], lOemNewFile[260];
+
+  CharToOemA(lpszOldFile, lOemOldFile);
+  CharToOemA(lpszNewFile, lOemNewFile);
+
+  rc = DosCopy((PSZ)lOemOldFile, (PSZ)lOemNewFile, fFailIfExist ? 0: DCPY_EXISTING);
   SetLastError(error2WinError(rc));
   return (rc == NO_ERROR);
@@ -658 +671 @@
 {
  APIRET rc;
-
-  rc = DosMove((PSZ)lpszOldFile, (PSZ)lpszNewFile);
+ char lOemOldFile[260], lOemNewFile[260];
+
+  CharToOemA(lpszOldFile, lOemOldFile);
+  CharToOemA(lpszNewFile, lOemNewFile);
+
+  rc = DosMove((PSZ)lOemOldFile, (PSZ)lOemNewFile);
   SetLastError(error2WinError(rc));
   return (rc == NO_ERROR);
@@ -668 +685 @@
 {
  APIRET rc;
-
-  rc = DosDeleteDir((PSZ)lpszDir);
+ char lOemDir[260];
+
+  CharToOemA(lpszDir, lOemDir);
+
+  rc = DosDeleteDir((PSZ)lOemDir);
   SetLastError(error2WinError(rc));
   return (rc == NO_ERROR);
@@ -678 +698 @@
 {
  APIRET rc;
-
-  rc = DosCreateDir((PSZ)lpszDir, NULL);
+ char lOemDir[260];
+
+  CharToOemA(lpszDir, lOemDir);
+
+  rc = DosCreateDir((PSZ)lOemDir, NULL);
   SetLastError(error2WinError(rc));
   return (rc == NO_ERROR);
@@ -785 +808 @@
 {
  APIRET rc;
-
-  rc = DosDelete(lpszFileName);
+ char lOemFileName[260];        
+
+ CharToOemA(lpszFileName, lOemFileName);
+
+  rc = DosDelete(lOemFileName);
   if(rc) {
       SetLastError(error2WinError(rc));
@@ -1081 +1107 @@
          *      This problem exist on WS4eB SMP FP1 and Warp4 FP14/Kernel 14059 at least.
          */
-        rc = DosOpen((PSZ)lpszFile,
+        rc = DosOpen((PSZ)lOemFile,
                       &hFile,
                       &actionTaken,
@@ -2196 +2222 @@
   {
     name++;
-    strcpy(pFind->cFileName,name);
+//    strcpy(pFind->cFileName,name);
+    OemToCharA( name, pFind->cFileName );
   }
   else
@@ -2203 +2230 @@
   long2ShortName(pFind->cFileName,pFind->cAlternateFileName);
 }
+
 
 VOID translateFindResults(FILEFINDBUF3 *pResult,LPWIN32_FIND_DATAA pFind)
@@ -2215 +2243 @@
   pFind->nFileSizeHigh = 0; //CB: fixme
   pFind->nFileSizeLow = pResult->cbFile;
-  strcpy(pFind->cFileName,pResult->achName);
+//  strcpy(pFind->cFileName,pResult->achName);
+  OemToCharA( pResult->achName, pFind->cFileName );
   long2ShortName(pFind->cFileName,pFind->cAlternateFileName);
 }
@@ -2231 +2260 @@
 
   ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS_W);
-  APIRET rc = DosFindFirst((PSZ)lpFileName,&hDir,attrs,&result,sizeof(result),&searchCount,FIL_STANDARD);
+  char    lOemFileName[260];        
+
+  CharToOemA(lpFileName, lOemFileName);
+
+  APIRET rc = DosFindFirst((PSZ)lOemFileName,&hDir,attrs,&result,sizeof(result),&searchCount,FIL_STANDARD);
 
   //check root: skip "." and ".." (HPFS, not on FAT)
@@ -2281 +2314 @@
 
   ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS_W);
-  APIRET rc = DosFindFirst((PSZ)lpFileName,&hDir,attrs,result,searchCount*sizeof(FILEFINDBUF3),&searchCount,FIL_STANDARD);
+  char  lOemFileName[260];        
+
+  CharToOemA(lpFileName, lOemFileName);
+  APIRET rc = DosFindFirst((PSZ)lOemFileName,&hDir,attrs,result,searchCount*sizeof(FILEFINDBUF3),&searchCount,FIL_STANDARD);
   SetErrorMode(oldmode);
   if (rc)