Changeset 21976 for trunk/src

Timestamp:

Feb 27, 2012, 6:47:33 PM (13 years ago)

Author:

dmik

Message:

Fix some DLL init code that would return incorrect result on failure.

Location:

trunk/src

Files:

• gdi32/initterm.cpp (modified) (2 diffs)
• imm32/initterm.cpp (modified) (1 diff)
• mscms/initterm.cpp (modified) (1 diff)
• oleacc/initterm.cpp (modified) (3 diffs)
• rsaenh/initterm.cpp (modified) (1 diff)
• schannel/initterm.cpp (modified) (1 diff)
• secur32/initterm.cpp (modified) (1 diff)
• user32/initterm.cpp (modified) (3 diffs)

trunk/src/gdi32/initterm.cpp

@@ -65 +65 @@
 
     if (!InitializeKernel32())
-        return 0;
+        return -1;
 
     CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
-    if(InitRegionSpace() == FALSE)
-    {
-        return 0UL;
-    }
+    if (InitRegionSpace() == FALSE)
+        return -1;
 
     DIBSection::initDIBSection();
-    if(CPUFeatures & CPUID_MMX)
+    if (CPUFeatures & CPUID_MMX)
     {
         pRGB555to565 = RGB555to565MMX;
@@ -88 +86 @@
                               GDI32_MAJORIMAGE_VERSION, GDI32_MINORIMAGE_VERSION,
                               IMAGE_SUBSYSTEM_NATIVE);
-    if(dllHandle == 0)
-        return 0UL;
+    if (dllHandle == 0)
+        return -1;
 
     dprintf(("gdi32 init %s %s (%x)", __DATE__, __TIME__, DLL_InitGdi32));

trunk/src/imm32/initterm.cpp

@@ -56 +56 @@
                               IMAGE_SUBSYSTEM_WINDOWS_GUI);
     if (dllHandle == 0)
-        return 0UL;
+        return -1;
 
     dprintf(("imm32 init %s %s (%x)", __DATE__, __TIME__, DLL_InitImm32));

trunk/src/mscms/initterm.cpp

@@ -56 +56 @@
 {
     if (!InitializeKernel32())
-        return 0;
+        return -1;
 
     //CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/

trunk/src/oleacc/initterm.cpp

@@ -50 +50 @@
 }
 
-ULONG SYSTEM DLL_InitMSCms(ULONG hModule)
+ULONG SYSTEM DLL_InitOleAcc(ULONG hModule)
 {
     if (!InitializeKernel32())
-        return 0;
+        return -1;
 
     CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
@@ -61 +61 @@
         return -1;
 
-    dprintf(("oleacc init %s %s (%x)", __DATE__, __TIME__, DLL_InitMSCms));
+    dprintf(("oleacc init %s %s (%x)", __DATE__, __TIME__, DLL_InitOleAcc));
 
     return 0;
 }
 
-void SYSTEM DLL_TermMSCms(ULONG hModule)
+void SYSTEM DLL_TermOleAcc(ULONG hModule)
 {
     if (dllHandle)
@@ -76 +76 @@
     if (DLL_InitDefault(hModule) == -1)
         return -1;
-    return DLL_InitMSCms(hModule);
+    return DLL_InitOleAcc(hModule);
 }
 
 void SYSTEM DLL_Term(ULONG hModule)
 {
-    DLL_TermMSCms(hModule);
+    DLL_TermOleAcc(hModule);
     DLL_TermDefault(hModule);
 }

trunk/src/rsaenh/initterm.cpp

@@ -56 +56 @@
 {
     if (!InitializeKernel32())
-        return 0;
+        return -1;
 
     //CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/

trunk/src/schannel/initterm.cpp

@@ -56 +56 @@
 {
     if (!InitializeKernel32())
-        return 0;
+        return -1;
 
     //CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/

trunk/src/secur32/initterm.cpp

@@ -56 +56 @@
 {
     if (!InitializeKernel32())
-        return 0;
+        return -1;
 
     //CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/

trunk/src/user32/initterm.cpp

@@ -142 +142 @@
 
     if (!InitializeKernel32())
-        return 0;
+        return -1;
 
     CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
@@ -149 +149 @@
                                     USER32_MAJORIMAGE_VERSION, USER32_MINORIMAGE_VERSION,
                                     IMAGE_SUBSYSTEM_WINDOWS_GUI);
-    if(hInstanceUser32 == 0)
-           return 0UL;
+    if (hInstanceUser32 == 0)
+        return -1;
 
     dprintf(("user32 init %s %s (%x)", __DATE__, __TIME__, DLL_InitUser32));
@@ -160 +160 @@
     //PH:  initializes HAB!
     if (FALSE == InitPM())
-      return 0UL;
+        return -1;
 
     InitializeWindowHandles();