Changeset 22023 for trunk/tools/install/odininst.cpp

Timestamp:

Sep 26, 2012, 12:55:40 AM (13 years ago)

Author:

dmik

Message:

odininst: Register DLLs that require registration.

Do what regsvr32 does on a real Win32 machine. Necessary for
some DLLs (e.g. RSAENH.DLL that must add some Registry entries
for proper operation).

This fixes playback of some Flash content for Flash versions starting
from 10.1.

File:

• trunk/tools/install/odininst.cpp (modified) (3 diffs)

trunk/tools/install/odininst.cpp

@@ -55 +55 @@
 BOOL InitSystemAndRegistry();
 void SetupTimeZoneInfo();
+void RegisterDLLs();
 
 //******************************************************************************
@@ -86 +87 @@
 
   SetupTimeZoneInfo();
+
+  RegisterDLLs();
+
   return 0;
 }
@@ -1092 +1096 @@
 //******************************************************************************
 //******************************************************************************
-
+void RegisterDLLs()
+{
+    // Register a number of DLLs that perform necessary initialization in
+    // DLLRegisterServer(). On a real machine this is done by regsvr32.exe
+    // during installation. Since we don't have regsvr32.exe, we will call
+    // this entry point manually from here.
+
+    char buf[sizeof(DIR_System)+260];
+
+    const char *DLLs[] = { "RSAENH.DLL" };
+
+    for (int i = 0; i < sizeof(DLLs)/sizeof(DLLs[0]); i++)
+    {
+        sprintf(buf, "%s\\%s", DIR_System, DLLs[i]);
+
+        dprintf(("RegisterDLLs: Registering %s", buf));
+
+        HMODULE hmod = LoadLibrary(buf);
+        if (!hmod)
+        {
+            dprintf(("RegisterDLLs: Unable to load DLL %s (error %d)",
+                     buf, GetLastError()));
+            continue;
+        }
+
+        typedef HRESULT WINAPI fnDllRegisterServer();
+
+        fnDllRegisterServer *proc = (fnDllRegisterServer *)
+            GetProcAddress(hmod, "DllRegisterServer");
+        if (!proc)
+        {
+            dprintf(("RegisterDLLs: Unable to find DllRegisterServer "
+                     "in %s (error %d)", buf, GetLastError()));
+        }
+        else
+        {
+            HRESULT hrc = proc();
+            if (hrc)
+                dprintf(("RegisterDLLs: Calling DllRegisterServer "
+                         "in %s returned error %x", buf, hrc));
+        }
+
+        FreeLibrary(hmod);
+    }
+
+
+        ProcessEmbeddedFile(TimeZones, TRUE);
+}
+//******************************************************************************
+//******************************************************************************
+