Changeset 1710 for trunk/src/kernel32/hmopen32.cpp

Timestamp:

Nov 12, 1999, 12:38:45 PM (26 years ago)

Author:

sandervl

Message:

DIBSection changes, EB's file io additions, Jens Weissner's changes to several dlls

File:

• trunk/src/kernel32/hmopen32.cpp (modified) (14 diffs)

trunk/src/kernel32/hmopen32.cpp

@@ -1 @@
-/* $Id: hmopen32.cpp,v 1.9 1999-08-25 14:27:06 sandervl Exp $ */
+/* $Id: hmopen32.cpp,v 1.10 1999-11-12 11:38:39 sandervl Exp $ */
 
 /*
@@ -97 +97 @@
            srcprocess, pHMSrcHandle->hHMHandle, destprocess, desthandle));
 
+#if 1
   rc = O32_DuplicateHandle(srcprocess, pHMSrcHandle->hHMHandle, destprocess, desthandle, fdwAccess, fInherit, fdwOptions);
 
@@ -104 +105 @@
   }
   else  return(O32_GetLastError());
+#else
+  rc = OSLibDosDupHandle(pHMSrcHandle->hHMHandle, desthandle);
+  if(rc == NO_ERROR)
+  {
+    pHMHandleData->hHMHandle = *desthandle;
+    return (NO_ERROR);
+  }
+  else
+  {
+    dprintfl(("KERNEL32: HandleManager::Open32::DuplicateHandle Error %d\n",rc));
+    O32_SetLastError(rc);
+    return(rc);
+  }
+#endif
 }
 
@@ -149 +164 @@
      hTemplate = 0;
 
+#if 1
   hFile = O32_CreateFile(lpFileName,
                          pHMHandleData->dwAccess,
@@ -164 +180 @@
   else
     return(O32_GetLastError());
+#else
+
+  rc = OSLibDosCreate((char *)lpFileName,
+                       pHMHandleData->dwAccess,
+                       pHMHandleData->dwShare,
+                       //(LPSECURITY_ATTRIBUTES)lpSecurityAttributes,
+                       NULL,
+                       pHMHandleData->dwCreation,
+                       pHMHandleData->dwFlags,
+                       hTemplate, &hFile);
+  if(rc)
+  {
+    dprintfl(("KERNEL32: HandleManager::Open32::CreateFile Error %d\n",rc));
+    O32_SetLastError(rc);
+    return(rc);
+  }
+  else
+  {
+    pHMHandleData->hHMHandle = hFile;
+    return (NO_ERROR);
+  }
+#endif
 }
 
@@ -186 +224 @@
            pHMHandleData->hHMHandle));
 
+#if 1
   bRC = O32_CloseHandle(pHMHandleData->hHMHandle);
 
@@ -192 +231 @@
 
   return (DWORD)bRC;
+#else
+  bRC = OSLibDosClose(pHMHandleData->hHMHandle);
+  if(bRC)
+  {
+    dprintfl(("KERNEL32: HandleManager::Open32::CloseHandle Error %d\n",bRC));
+    O32_SetLastError(bRC);
+    return TRUE;      // MUTEX Problem
+    return FALSE;
+  }
+  else
+  {
+    return TRUE;
+  }
+#endif
 }
 
@@ -227 +280 @@
            lpOverlapped));
 
+#if 1
   bRC = O32_ReadFile(pHMHandleData->hHMHandle,
                      (PVOID)lpBuffer,
@@ -237 +291 @@
 
   return (DWORD)bRC;
+#else
+  rc = OSLibDosRead(pHMHandleData->hHMHandle,
+                    (PVOID) lpBuffer,
+                    nNumberOfBytesToRead,
+                    lpNumberOfBytesRead);
+  if(rc)
+  {
+    dprintfl(("KERNEL32: HandleManager::Open32::ReadFile Error %d\n",rc));
+    O32_SetLastError(rc);
+    return FALSE;
+  }
+  else
+  {
+    return TRUE;
+  }
+#endif
 }
 
@@ -272 +342 @@
            lpOverlapped));
 
+#if 1
   bRC = O32_WriteFile(pHMHandleData->hHMHandle,
                       lpBuffer,
@@ -282 +353 @@
 
   return (DWORD)bRC;
+#else
+  rc = OSLibDosWrite(pHMHandleData->hHMHandle,
+                     (PVOID) lpBuffer,
+                     nNumberOfBytesToWrite,
+                     lpNumberOfBytesWritten);
+  if(rc)
+  {
+    dprintfl(("KERNEL32: HandleManager::Open32::WriteFile Error %d\n",rc));
+    O32_SetLastError(rc);
+    return FALSE;
+  }
+  else
+  {
+    return TRUE;
+  }
+#endif
 }
 
@@ -303 +390 @@
            pHMHandleData));
 
+#if 1
   return O32_GetFileType(pHMHandleData->hHMHandle);
+#else
+  // TODO: FILE_TYPE_DISK
+  return FILE_TYPE_CHAR;
+#endif
 }
 
@@ -410 +502 @@
            pSize));
 
+#if 1
   return O32_GetFileSize(pHMHandleData->hHMHandle,
                          pSize);
+#else
+  size = OSLibDosGetFileSize(pHMHandleData->hHMHandle);
+  if(pSize)
+    *pSize = size;
+  return size;
+#endif
 }
 
@@ -442 +541 @@
            dwMoveMethod));
 
+#if 1
   return O32_SetFilePointer(pHMHandleData->hHMHandle,
                             lDistanceToMove,
                             lpDistanceToMoveHigh,
                             dwMoveMethod);
+#else
+
+  if(lpDistanceToMoveHigh)
+    *lpDistanceToMoveHigh = 0;
+  pos = OSLibDosSetFilePtr2(pHMHandleData->hHMHandle, lDistanceToMove, dwMoveMethod);
+  return pos;
+#endif
 }