qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file

Thomas Faber thomas.faber at reactos.org
Thu May 1 07:01:37 CDT 2014


Currently "regsvr32 qmgr.dll" just fails:
err:advpack:create_tmp_ini_file Can't find REGINST resource
err:qmgr:register_server RegInstall failed: 80004005

This will make it correctly register/unregister the rgs file instead.
-------------- next part --------------
From 5babeb5a1c2652c0e053379e8a6727d84541dfa9 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber at reactos.org>
Date: Thu, 1 May 2014 13:48:00 +0200
Subject: qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of
 a nonexistent inf file

---
 dlls/qmgr/qmgr_main.c | 77 ++-------------------------------------------------
 1 file changed, 3 insertions(+), 74 deletions(-)

diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c
index 051c3a5..97c206a 100644
--- a/dlls/qmgr/qmgr_main.c
+++ b/dlls/qmgr/qmgr_main.c
@@ -28,6 +28,7 @@
 #include "winreg.h"
 #include "advpub.h"
 #include "olectl.h"
+#include "rpcproxy.h"
 #include "winsvc.h"
 
 #include "bits.h"
@@ -41,9 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 /* Handle to the base address of this DLL */
 static HINSTANCE hInst;
 
-/* Other GUIDs used by this module */
-DEFINE_GUID(CLSID_BackgroundCopyQMgr, 0x69AD4AEE, 0x51BE, 0x439b, 0xA9,0x2C, 0x86,0xAE,0x49,0x0E,0x8B,0x30);
-
 /* Entry point for DLL */
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
@@ -62,81 +60,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     return TRUE;
 }
 
-static HRESULT init_register_strtable(STRTABLEA *strtable)
-{
-#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id }
-    static const struct {
-        const char *name;
-        const CLSID *clsid;
-    } expns[] =  {
-        CLSID_EXPANSION_ENTRY(BackgroundCopyQMgr),
-        CLSID_EXPANSION_ENTRY(BackgroundCopyManager)
-    };
-#undef CLSID_EXPANSION_ENTRY
-    static STRENTRYA pse[sizeof expns / sizeof expns[0]];
-    DWORD i;
-
-    strtable->cEntries = sizeof pse / sizeof pse[0];
-    strtable->pse = pse;
-    for (i = 0; i < strtable->cEntries; i++) {
-        static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}";
-        const CLSID *clsid = expns[i].clsid;
-        pse[i].pszName = qmgr_strdup(expns[i].name);
-        pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample);
-        if (!pse[i].pszName || !pse[i].pszValue)
-            return E_OUTOFMEMORY;
-        sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
-                clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0],
-                clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4],
-                clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]);
-    }
-
-    return S_OK;
-}
-
-static void cleanup_register_strtable(STRTABLEA *strtable)
-{
-    DWORD i;
-    for (i = 0; i < strtable->cEntries; i++) {
-        HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName);
-        HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue);
-        if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue)
-            return;
-    }
-}
-
-/* Use an INF file to register or unregister the DLL */
-static HRESULT register_server(BOOL do_register)
-{
-    HRESULT hr;
-    STRTABLEA strtable;
-    HMODULE hAdvpack;
-    HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable);
-    static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
-
-    TRACE("(%x)\n", do_register);
-
-    hAdvpack = LoadLibraryW(wszAdvpack);
-    pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall");
-
-    hr = init_register_strtable(&strtable);
-    if (SUCCEEDED(hr))
-        hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll",
-                         &strtable);
-    cleanup_register_strtable(&strtable);
-
-    if (FAILED(hr))
-        ERR("RegInstall failed: %08x\n", hr);
-
-    return hr;
-}
-
 HRESULT WINAPI DllRegisterServer(void)
 {
-    return register_server(TRUE);
+    return __wine_register_resources(hInst);
 }
 
 HRESULT WINAPI DllUnregisterServer(void)
 {
-    return register_server(FALSE);
+    return __wine_unregister_resources(hInst);
 }
-- 
1.9.0.msysgit.0



More information about the wine-patches mailing list