Changeset 18046

Timestamp:

Nov 29, 2001, 2:38:51 PM (23 years ago)

Author:

sandervl

Message:

disk fix

Location:

tags/trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (3 diffs)
• hmcomm.cpp (modified) (4 diffs)
• hmdisk.cpp (modified) (4 diffs)
• hmmailslot.cpp (modified) (3 diffs)
• hmnpipe.cpp (modified) (2 diffs)
• oslibdos.cpp (modified) (2 diffs)

tags/trunk/src/kernel32/HandleManager.cpp ¶

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.80 2001-11-29 00:20:45 phaller Exp $ */
+/* $Id: HandleManager.cpp,v 1.81 2001-11-29 13:38:49 sandervl Exp $ */
 
 /*
@@ -1102 +1102 @@
   if (rc != NO_ERROR)     /* oops, creation failed within the device handler */
   {
-    TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
-    
+    TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;  
     
     // Note:
@@ -1120 +1119 @@
            sizeof(HMHANDLEDATA));
   }
-
-
-#ifdef DEBUG_LOCAL
-  dprintf(("KERNEL32/HandleManager: CreateFile(%s)=%08xh\n",
-           lpFileName,
-           iIndexNew));
-#endif
 
   return (HFILE)iIndexNew;                             /* return valid handle */

tags/trunk/src/kernel32/hmcomm.cpp ¶

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.20 2001-11-29 00:20:47 phaller Exp $ */
+/* $Id: hmcomm.cpp,v 1.21 2001-11-29 13:38:50 sandervl Exp $ */
 
 /*
@@ -221 +221 @@
     {
       delete pHMHandleData->lpHandlerData;
-      return error2WinError(rc);
+      return rc;
     }
     rc = SetBaud(pHMHandleData,9600);
@@ -1341 +1341 @@
                              0,0,0,
                              0,0,0);
+      dprintf(("SETXOFF: rc = %d", rc));
       break;
     case SETXON:
@@ -1348 +1349 @@
                              0,0,0,
                              0,0,0);
+      dprintf(("SETXON: rc = %d", rc));
       break;
     default:

tags/trunk/src/kernel32/hmdisk.cpp ¶

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.30 2001-11-28 23:33:36 phaller Exp $ */
+/* $Id: hmdisk.cpp,v 1.31 2001-11-29 13:38:51 sandervl Exp $ */
 
 /*
@@ -67 +67 @@
 BOOL HMDeviceDiskClass::FindDevice(LPCSTR lpClassDevName, LPCSTR lpDeviceName, int namelength)
 {
-  // @@@PH
-  // this is broken:
-  // "\\.\C:" and "C:" is a LOGICAL drive
-  // \\.\PHYSICALDRIVEx is a PHYSICAL drive!
-  
     //\\.\x:                -> length 6
     //\\.\PHYSICALDRIVEn    -> length 18
@@ -114 +109 @@
         return ERROR_INVALID_PARAMETER;
     }
+    if(strncmp(lpFileName,       // "support" for local unc names
+             "\\\\.\\",
+             4) == 0)
+    {
+        lpFileName+=4;
+    }
 
     //Disable error popus. NT allows an app to open a cdrom/dvd drive without a disk inside
@@ -205 +206 @@
     filename[2] = 0;
 
-    //Disable error popups. NT allows an app to open a cdrom/dvd drive without a disk inside
+    //Disable error popus. NT allows an app to open a cdrom/dvd drive without a disk inside
     //OS/2 fails in that case with error ERROR_NOT_READY
     ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);

tags/trunk/src/kernel32/hmmailslot.cpp ¶

@@ -1 @@
-/* $Id: hmmailslot.cpp,v 1.4 2001-11-28 23:33:36 phaller Exp $
+/* $Id: hmmailslot.cpp,v 1.5 2001-11-29 13:38:51 sandervl Exp $
  *
  * Win32 mailslot APIs
@@ -190 +190 @@
 
   char *pipename = (char *)alloca(strlen(lpFileName)+16);
-  if(pipename == NULL) 
-  {
-    DebugInt3();
-    return ERROR_NOT_ENOUGH_MEMORY;
+  if(pipename == NULL) {
+      DebugInt3();
+      SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+      return FALSE;
   }
   strcpy(pipename, "\\\\.\\pipe\\");
@@ -215 +215 @@
   //todo: lookup name and fail if exists
   mailslot = new HMMailSlotInfo(lpFileName, hPipe, -1, 0, FALSE, (LPSECURITY_ATTRIBUTES)lpSecurityAttributes);
-  if(mailslot == NULL) 
-  {
-    DebugInt3();
-    return ERROR_NOT_ENOUGH_MEMORY;
+  if(mailslot == NULL) {
+      DebugInt3();
+      return ERROR_NOT_ENOUGH_MEMORY;
   }
   pHMHandleData->dwUserData = (DWORD)mailslot;

tags/trunk/src/kernel32/hmnpipe.cpp ¶

@@ -1 @@
-/* $Id: hmnpipe.cpp,v 1.5 2001-11-28 23:33:37 phaller Exp $ */
+/* $Id: hmnpipe.cpp,v 1.6 2001-11-29 13:38:51 sandervl Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -140 +140 @@
                                                pHMHandleData->dwCreation,
                                                pHMHandleData->dwFlags);
-  if(pHMHandleData->hHMHandle == -1) 
-  {
-    return GetLastError();
-  }
-  return ERROR_SUCCESS;
+   if(pHMHandleData->hHMHandle == -1) {
+      return GetLastError();
+   }
+   return ERROR_SUCCESS;
 }
 

tags/trunk/src/kernel32/oslibdos.cpp ¶

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.87 2001-11-29 10:53:28 phaller Exp $ */
+/* $Id: oslibdos.cpp,v 1.88 2001-11-29 13:38:51 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -2684 +2684 @@
     DosFreeMem(pTiledData);
   
-  SetLastError(error2WinError(rc, ERROR_INVALID_HANDLE));
+  rc = error2WinError(rc, ERROR_INVALID_HANDLE);
+  SetLastError(rc);
   return (DWORD)rc;
 }