Alexandre Julliard : mmdevapi: Convert dll registration to the IRegistrar mechanism.
Alexandre Julliard
julliard at winehq.org
Tue Dec 7 10:59:30 CST 2010
Module: wine
Branch: master
Commit: 343a2cb07ac6030c7095e94d234923f24c1f0e2b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=343a2cb07ac6030c7095e94d234923f24c1f0e2b
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Dec 7 13:30:55 2010 +0100
mmdevapi: Convert dll registration to the IRegistrar mechanism.
---
dlls/mmdevapi/Makefile.in | 5 +-
dlls/mmdevapi/main.c | 20 ++++
dlls/mmdevapi/mmdevapi_classes.idl | 26 +++++
dlls/mmdevapi/regsvr.c | 181 ------------------------------------
4 files changed, 49 insertions(+), 183 deletions(-)
diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in
index c20920c..993639c 100644
--- a/dlls/mmdevapi/Makefile.in
+++ b/dlls/mmdevapi/Makefile.in
@@ -6,7 +6,8 @@ C_SRCS = \
audio.c \
audiovolume.c \
devenum.c \
- main.c \
- regsvr.c
+ main.c
+
+IDL_R_SRCS = mmdevapi_classes.idl
@MAKE_DLL_RULES@
diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c
index cb23dd0..550dbf6 100644
--- a/dlls/mmdevapi/main.c
+++ b/dlls/mmdevapi/main.c
@@ -37,6 +37,7 @@
#include "ole2.h"
#include "olectl.h"
+#include "rpcproxy.h"
#include "propsys.h"
#include "initguid.h"
#include "propkeydef.h"
@@ -314,6 +315,8 @@ static void load_libopenal(void)
#endif /*HAVE_OPENAL*/
+static HINSTANCE instance;
+
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
@@ -321,6 +324,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
switch (fdwReason)
{
case DLL_PROCESS_ATTACH:
+ instance = hinstDLL;
DisableThreadLibraryCalls(hinstDLL);
#ifdef HAVE_OPENAL
load_libopenal();
@@ -452,3 +456,19 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
debugstr_guid(riid), ppv);
return CLASS_E_CLASSNOTAVAILABLE;
}
+
+/***********************************************************************
+ * DllRegisterServer (MMDEVAPI.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+ return __wine_register_resources( instance, NULL );
+}
+
+/***********************************************************************
+ * DllUnregisterServer (MMDEVAPI.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+ return __wine_unregister_resources( instance, NULL );
+}
diff --git a/dlls/mmdevapi/mmdevapi_classes.idl b/dlls/mmdevapi/mmdevapi_classes.idl
new file mode 100644
index 0000000..a93dd3f
--- /dev/null
+++ b/dlls/mmdevapi/mmdevapi_classes.idl
@@ -0,0 +1,26 @@
+/*
+ * COM Classes for mmdevapi
+ *
+ * Copyright 2010 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+[
+ helpstring("MMDeviceEnumerator class"),
+ threading(both),
+ uuid(bcde0395-e52f-467c-8e3d-c4579291692e)
+]
+coclass MMDeviceEnumerator { interface IMMDeviceEnumerator; }
diff --git a/dlls/mmdevapi/regsvr.c b/dlls/mmdevapi/regsvr.c
deleted file mode 100644
index 265c0a3..0000000
--- a/dlls/mmdevapi/regsvr.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright 2009 Vincent Povirk for CodeWeavers
- * Copyright 2009 Maarten Lankhorst
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#define COBJMACROS
-#include <stdarg.h>
-#include <string.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "winerror.h"
-
-#include "guiddef.h"
-#include "objbase.h"
-#include "ocidl.h"
-#include "mmdeviceapi.h"
-
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
-
-/***********************************************************************
- * interface for self-registering
- */
-struct regsvr_coclass
-{
- CLSID const *clsid; /* NULL for end of list */
- LPCSTR name; /* can be NULL to omit */
- LPCSTR ips32; /* can be NULL to omit */
- LPCSTR ips32_tmodel; /* can be NULL to omit */
-};
-
-static HRESULT register_coclasses(struct regsvr_coclass const *list);
-static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
-
-/***********************************************************************
- * static string constants
- */
-static WCHAR const clsid_keyname[] = {
- 'C', 'L', 'S', 'I', 'D', 0 };
-static WCHAR const ips32_keyname[] = {
- 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
- '3', '2', 0 };
-static WCHAR const progid_keyname[] = {
- 'P', 'r', 'o', 'g', 'I', 'D', 0 };
-static WCHAR const viprogid_keyname[] = {
- 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p',
- 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D',
- 0 };
-static char const tmodel_valuename[] = "ThreadingModel";
-
-/***********************************************************************
- * register_coclasses
- */
-static HRESULT register_coclasses(struct regsvr_coclass const *list)
-{
- LONG res = ERROR_SUCCESS;
- HKEY coclass_key;
-
- res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL);
- if (res != ERROR_SUCCESS) goto error_return;
-
- for (; res == ERROR_SUCCESS && list->clsid; ++list) {
- WCHAR buf[39];
- HKEY clsid_key;
-
- StringFromGUID2(list->clsid, buf, 39);
- res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL);
- if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-
- if (list->name) {
- res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ,
- (CONST BYTE*)(list->name),
- strlen(list->name) + 1);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
- }
-
- if (list->ips32) {
- HKEY ips32_key;
-
- res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL,
- &ips32_key, NULL);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
- res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ,
- (CONST BYTE*)list->ips32,
- lstrlenA(list->ips32) + 1);
- if (res == ERROR_SUCCESS && list->ips32_tmodel)
- res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ,
- (CONST BYTE*)list->ips32_tmodel,
- strlen(list->ips32_tmodel) + 1);
- RegCloseKey(ips32_key);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
- }
-
- error_close_clsid_key:
- RegCloseKey(clsid_key);
- }
-
-error_close_coclass_key:
- RegCloseKey(coclass_key);
-error_return:
- return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- * unregister_coclasses
- */
-static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
-{
- LONG res = ERROR_SUCCESS;
- HKEY coclass_key;
-
- res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0,
- KEY_READ | KEY_WRITE, &coclass_key);
- if (res == ERROR_FILE_NOT_FOUND) return S_OK;
- if (res != ERROR_SUCCESS) goto error_return;
-
- for (; res == ERROR_SUCCESS && list->clsid; ++list) {
- WCHAR buf[39];
-
- StringFromGUID2(list->clsid, buf, 39);
- res = RegDeleteTreeW(coclass_key, buf);
- if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
- if (res != ERROR_SUCCESS) goto error_close_coclass_key;
- }
-
-error_close_coclass_key:
- RegCloseKey(coclass_key);
-error_return:
- return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- * coclass list
- */
-static struct regsvr_coclass const coclass_list[] = {
- { &CLSID_MMDeviceEnumerator,
- "MMDeviceEnumerator class",
- "mmdevapi.dll",
- "both"
- },
- { NULL } /* list terminator */
-};
-
-HRESULT WINAPI DllRegisterServer(void)
-{
- TRACE("\n");
-
- return register_coclasses(coclass_list);
-}
-
-HRESULT WINAPI DllUnregisterServer(void)
-{
- TRACE("\n");
-
- return unregister_coclasses(coclass_list);
-}
More information about the wine-cvs
mailing list