Changeset 8500 for trunk/src

Timestamp:

May 28, 2002, 9:35:07 AM (23 years ago)

Author:

sandervl

Message:

fixed exe startup

File:

• trunk/src/ole32/regsvr32.cpp (modified) (3 diffs)

trunk/src/ole32/regsvr32.cpp

@@ -1 @@
-/* $Id: regsvr32.cpp,v 1.7 2001-10-02 17:14:57 sandervl Exp $ */
+/* $Id: regsvr32.cpp,v 1.8 2002-05-28 07:35:07 sandervl Exp $ */
 /* 
  * RegSvr32 for OS/2
@@ -54 +54 @@
 int main(int argc, char *argv[])
 {
+    HRESULT     hr;
+
+    if((hr = parse_command(argc, argv)) != S_OK)
+        return hr;
+
     RegisterLxExe(EntryPoint, NULL);
 
-    HRESULT     hr;
-
-    if((hr = sign_on()) != S_OK)
-        return hr;
-
-    if((hr = parse_command(argc, argv)) != S_OK)
-        return hr;
-
-    if((hr = load_object()) != S_OK)
-        return hr;
-
-    if (fRegister)
-        hr = register_object();
-    else
-        hr = deregister_object();
-
-    if (hr != S_OK)
-        return hr;
-
-    if((hr = unload_object()) != S_OK)
-        return hr;
-
-    return sign_off();
+    return 0;
 }
 
@@ -94 +77 @@
     int         nCmdShow)
 {
-    return S_OK;
+    HRESULT     hr;
+
+    if((hr = sign_on()) != S_OK)
+        return hr;
+
+    if((hr = load_object()) != S_OK)
+        return hr;
+
+    if (fRegister)
+        hr = register_object();
+    else
+        hr = deregister_object();
+
+    if (hr != S_OK)
+        return hr;
+
+    if((hr = unload_object()) != S_OK)
+        return hr;
+
+    return sign_off();
 }