Changeset 9693 for trunk/src/kernel32/osliblvm.cpp

Timestamp:

Jan 20, 2003, 11:46:28 AM (23 years ago)

Author:

sandervl

Message:

Only load LVM.DLL when we actually need it; CreateProcess bugfix for thread id if launched directly; CreateFile returns ERROR_ALREADY_EXISTS if file not found and CREATE_NEW; Check and correct process type in thread wrapper

File:

• trunk/src/kernel32/osliblvm.cpp (modified) (4 diffs)

trunk/src/kernel32/osliblvm.cpp

@@ -1 @@
-/* $Id: osliblvm.cpp,v 1.4 2002-09-27 14:35:56 sandervl Exp $ */
+/* $Id: osliblvm.cpp,v 1.5 2003-01-20 10:46:27 sandervl Exp $ */
 
 /*
@@ -52 +52 @@
 static BOOL    fLVMOpened = FALSE;
 
+static void Close_LVM_Engine ( void );
+
+//******************************************************************************
+//******************************************************************************
+static BOOL OSLibLVMInit()
+{
+    APIRET rc;
+    CHAR   szModuleFailure[CCHMAXPATH];
+
+    rc = DosLoadModule(szModuleFailure, sizeof(szModuleFailure), "LVM.DLL", (HMODULE *)&hModLVM);
+    if(rc) {
+        return FALSE;
+    }
+    rc = DosQueryProcAddr(hModLVM, 0, "Open_LVM_Engine", (PFN *)&pfnOpen_LVM_Engine);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Close_LVM_Engine", (PFN *)&pfnClose_LVM_Engine);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Get_Drive_Control_Data", (PFN *)&pfnGet_Drive_Control_Data);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Get_Drive_Status", (PFN *)&pfnGet_Drive_Status);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Get_Partitions", (PFN *)&pfnGet_Partitions);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Get_Partition_Handle", (PFN *)&pfnGet_Partition_Handle);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Get_Partition_Information", (PFN *)&pfnGet_Partition_Information);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Get_Volume_Control_Data", (PFN *)&pfnGet_Volume_Control_Data);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Get_Volume_Information", (PFN *)&pfnGet_Volume_Information);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Free_Engine_Memory", (PFN *)&pfnFree_Engine_Memory);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Read_Sectors", (PFN *)&pfnRead_Sectors);
+    if(rc) goto fail;
+    rc = DosQueryProcAddr(hModLVM, 0, "Write_Sectors", (PFN *)&pfnWrite_Sectors);
+    if(rc) goto fail;
+    
+    return TRUE;
+
+fail:
+    if(hModLVM) {
+        DosFreeModule(hModLVM);
+        hModLVM = 0;
+    }
+    return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
+void OSLibLVMExit()
+{
+    if(fLVMOpened) {
+        Close_LVM_Engine();
+    }
+    if(hModLVM) {
+        DosFreeModule(hModLVM);
+        hModLVM = 0;
+    }
+}
 //******************************************************************************
 //******************************************************************************
@@ -57 +116 @@
 {
     USHORT               sel;
+
+    //Load LVM dll
+    OSLibLVMInit();
 
     sel = RestoreOS2FS();
@@ -198 +260 @@
     SetFS(sel);
     return;
-}
-//******************************************************************************
-//******************************************************************************
-BOOL OSLibLVMInit()
-{
-    APIRET rc;
-    CHAR   szModuleFailure[CCHMAXPATH];
-
-    rc = DosLoadModule(szModuleFailure, sizeof(szModuleFailure), "LVM.DLL", (HMODULE *)&hModLVM);
-    if(rc) {
-        return FALSE;
-    }
-    rc = DosQueryProcAddr(hModLVM, 0, "Open_LVM_Engine", (PFN *)&pfnOpen_LVM_Engine);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Close_LVM_Engine", (PFN *)&pfnClose_LVM_Engine);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Get_Drive_Control_Data", (PFN *)&pfnGet_Drive_Control_Data);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Get_Drive_Status", (PFN *)&pfnGet_Drive_Status);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Get_Partitions", (PFN *)&pfnGet_Partitions);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Get_Partition_Handle", (PFN *)&pfnGet_Partition_Handle);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Get_Partition_Information", (PFN *)&pfnGet_Partition_Information);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Get_Volume_Control_Data", (PFN *)&pfnGet_Volume_Control_Data);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Get_Volume_Information", (PFN *)&pfnGet_Volume_Information);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Free_Engine_Memory", (PFN *)&pfnFree_Engine_Memory);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Read_Sectors", (PFN *)&pfnRead_Sectors);
-    if(rc) goto fail;
-    rc = DosQueryProcAddr(hModLVM, 0, "Write_Sectors", (PFN *)&pfnWrite_Sectors);
-    if(rc) goto fail;
-    
-    return TRUE;
-
-fail:
-    if(hModLVM) {
-        DosFreeModule(hModLVM);
-        hModLVM = 0;
-    }
-    return FALSE;
-}
-//******************************************************************************
-//******************************************************************************
-void OSLibLVMExit()
-{
-    if(fLVMOpened) {
-        Close_LVM_Engine();
-    }
-    if(hModLVM) {
-        DosFreeModule(hModLVM);
-        hModLVM = 0;
-    }
 }
 //******************************************************************************