[PATCH 3/4] comdlg32: Add implementation of DllRegisterServer/DllUnregisterServer. (resend)

[David Hedberg]

---
 dlls/comdlg32/cdlg32.c      |   82 +++++++++++++++++++++++++++++++++++++++++++
 dlls/comdlg32/cdlg_En.rc    |    3 ++
 dlls/comdlg32/comdlg32.inf  |   20 ++++++++++
 dlls/comdlg32/comdlg32.spec |    4 ++-
 tools/wine.inf.in           |    1 +
 5 files changed, 109 insertions(+), 1 deletions(-)
 create mode 100644 dlls/comdlg32/comdlg32.inf

diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c
index a2388d1..22d5d3e 100644
--- a/dlls/comdlg32/cdlg32.c
+++ b/dlls/comdlg32/cdlg32.c
@@ -20,6 +20,7 @@
  */
 
 #include <stdarg.h>
+#include <stdio.h>
 
 #define COBJMACROS
 
@@ -29,6 +30,8 @@
 #include "winuser.h"
 #include "commdlg.h"
 #include "cderr.h"
+#include "winreg.h"
+#include "advpub.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
@@ -274,3 +277,82 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
 
     return CLASS_E_CLASSNOTAVAILABLE;
 }
+
+/***********************************************************************
+ *          Register/Unregister DLL, based on shdocvw/factory.c
+ */
+
+static HRESULT reg_install(LPCSTR section, STRTABLEA *strtable)
+{
+    HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable);
+    HMODULE hadvpack;
+    HRESULT hres;
+
+    static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
+
+    hadvpack = LoadLibraryW(advpackW);
+    pRegInstall = (void *)GetProcAddress(hadvpack, "RegInstall");
+
+    hres = pRegInstall(COMDLG32_hInstance, section, strtable);
+
+    FreeLibrary(hadvpack);
+    return hres;
+}
+
+#define INF_SET_CLSID(clsid)                  \
+    do                                        \
+    {                                         \
+        static CHAR name[] = "CLSID_" #clsid; \
+                                              \
+        pse[i].pszName = name;                \
+        clsids[i++] = &CLSID_ ## clsid;       \
+    } while (0)
+
+static HRESULT register_server(BOOL doregister)
+{
+    STRTABLEA strtable;
+    STRENTRYA pse[2];
+    static CLSID const *clsids[2];
+    unsigned int i = 0;
+    HRESULT hres;
+
+    INF_SET_CLSID(FileOpenDialog);
+    INF_SET_CLSID(FileSaveDialog);
+
+    for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++)
+    {
+        pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39);
+        sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+                clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0],
+                clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4],
+                clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]);
+    }
+
+    strtable.cEntries = sizeof(pse)/sizeof(pse[0]);
+    strtable.pse = pse;
+
+    hres = reg_install(doregister ? "RegisterDll" : "UnregisterDll", &strtable);
+
+    for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++)
+        HeapFree(GetProcessHeap(), 0, pse[i].pszValue);
+
+    return hres;
+}
+
+#undef INF_SET_CLSID
+
+/***********************************************************************
+ *          DllRegisterServer (COMMDLG32.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    return register_server(TRUE);
+}
+
+/***********************************************************************
+ *          DllUnregisterServer (COMMDLG32.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    return register_server(FALSE);
+}
diff --git a/dlls/comdlg32/cdlg_En.rc b/dlls/comdlg32/cdlg_En.rc
index d4f215d..9515e56 100644
--- a/dlls/comdlg32/cdlg_En.rc
+++ b/dlls/comdlg32/cdlg_En.rc
@@ -422,3 +422,6 @@ FONT 8, "MS Shell Dlg"
  PUSHBUTTON "&Define Custom Colours >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
 }
+
+/* @makedep: comdlg32.inf */
+REGINST REGINST comdlg32.inf
diff --git a/dlls/comdlg32/comdlg32.inf b/dlls/comdlg32/comdlg32.inf
new file mode 100644
index 0000000..1b6afe3
--- /dev/null
+++ b/dlls/comdlg32/comdlg32.inf
@@ -0,0 +1,20 @@
+[version]
+Signature="$CHICAGO$"
+
+[RegisterDll]
+AddReg=Classes.Reg
+
+[UnregisterDll]
+DelReg=Classes.Reg
+
+[Classes.Reg]
+HKCR,"CLSID\%CLSID_FileOpenDialog%",,,"File Open Dialog"
+HKCR,"CLSID\%CLSID_FileOpenDialog%\InProcServer32",,,"%MODULE%"
+HKCR,"CLSID\%CLSID_FileOpenDialog%\InProcServer32","ThreadingModel",,"Apartment"
+
+HKCR,"CLSID\%CLSID_FileSaveDialog%",,,"File Save Dialog"
+HKCR,"CLSID\%CLSID_FileSaveDialog%\InProcServer32",,,"%MODULE%"
+HKCR,"CLSID\%CLSID_FileSaveDialog%\InProcServer32","ThreadingModel",,"Apartment"
+
+[Strings]
+MODULE="comdlg32.dll"
\ No newline at end of file
diff --git a/dlls/comdlg32/comdlg32.spec b/dlls/comdlg32/comdlg32.spec
index 0083f75..6fe3d68 100644
--- a/dlls/comdlg32/comdlg32.spec
+++ b/dlls/comdlg32/comdlg32.spec
@@ -23,4 +23,6 @@
 @ stub WantArrows
 @ stub dwLBSubclass
 @ stub dwOKSubclass
-@ stdcall -private DllGetClassObject(ptr ptr ptr)
\ No newline at end of file
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index ff72e56..5c09faf 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -2489,6 +2489,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 11,,avifil32.dll,1
 11,,browseui.dll,1
 11,,comctl32.dll,2
+11,,comdlg32.dll,1
 11,,cryptdlg.dll,1
 11,,cryptnet.dll,1
 11,,d3dxof.dll,1
-- 
1.7.4.1