December 2010 - Wine-Commits

Alexandre Julliard : mlang: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 0508dff006426f17ce2606d0035d82c355ffec24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0508dff006426f17ce2606d00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 13:25:18 2010 +0100 mlang: Convert dll registration to the IRegistrar mechanism. --- dlls/mlang/Makefile.in | 5 +- dlls/mlang/mlang.c | 21 ++ dlls/mlang/mlang_classes.idl | 40 ++++ dlls/mlang/regsvr.c | 510 ------------------------------------------ 4 files changed, 64 insertions(+), 512 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0508dff006426f17ce260…

1 0

Andrew Nguyen : shdocvw/tests: Avoid using a freed IUniformResourceLocatorA variable.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 2f302cfe0be98d5d542d9b17fbd1de3763f32a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f302cfe0be98d5d542d9b17f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Dec 7 03:12:01 2010 -0600 shdocvw/tests: Avoid using a freed IUniformResourceLocatorA variable. Spotted with Valgrind. --- dlls/shdocvw/tests/intshcut.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 56efdba..dbfb4d6 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -241,7 +241,7 @@ static void test_ReadAndWriteProperties(void) LPSTR url = NULL; /* Now read that .url file back in. */ - hr = urlAFromFile->lpVtbl->QueryInterface(urlA, &IID_IPersistFile, (void **) &pf); + hr = urlAFromFile->lpVtbl->QueryInterface(urlAFromFile, &IID_IPersistFile, (void **) &pf); ok(hr == S_OK, "Failed to get the IPersistFile for reading. hr=0x%x\n", hr); hr = IPersistFile_Load(pf, fileNameW, 0); @@ -249,11 +249,11 @@ static void test_ReadAndWriteProperties(void) IPersistFile_Release(pf); - hr = urlA->lpVtbl->GetURL(urlAFromFile, &url); + hr = urlAFromFile->lpVtbl->GetURL(urlAFromFile, &url); ok(lstrcmp(url, testurl) == 0, "Wrong url read from file: %s\n",url); - hr = urlA->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg); + hr = urlAFromFile->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg); ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &pPropStgRead); @@ -270,7 +270,7 @@ static void test_ReadAndWriteProperties(void) PropVariantClear(&pvread[1]); IPropertyStorage_Release(pPropStgRead); IPropertySetStorage_Release(pPropSetStg); - urlA->lpVtbl->Release(urlA); + urlAFromFile->lpVtbl->Release(urlAFromFile); DeleteFileW(fileNameW); } else

1 0

Jacek Caban : appwiz.cpl: Added Gecko installer based on mshtml code.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 280ec3999735add7ee5a8391ea6a9515f7525db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=280ec3999735add7ee5a8391e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 19:25:01 2010 +0100 appwiz.cpl: Added Gecko installer based on mshtml code. --- dlls/appwiz.cpl/En.rc | 22 ++ dlls/appwiz.cpl/Makefile.in | 4 +- dlls/appwiz.cpl/addons.c | 503 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.c | 19 ++- dlls/appwiz.cpl/appwiz.h | 36 +++ dlls/appwiz.cpl/res.h | 7 + 6 files changed, 589 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=280ec3999735add7ee5a8…

1 0

Jacek Caban : appwiz.cpl: Added translations from mshtml.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: cc361eefcef4e1fe0f15ecbf1aae65bcde1e6ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc361eefcef4e1fe0f15ecbf1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 19:25:28 2010 +0100 appwiz.cpl: Added translations from mshtml. --- dlls/appwiz.cpl/Bg.rc | 41 +++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Da.rc | 22 +++++++++++++++++++++ dlls/appwiz.cpl/De.rc | 25 ++++++++++++++++++++++- dlls/appwiz.cpl/Es.rc | 6 +++++ dlls/appwiz.cpl/Fi.rc | 29 +++++++++++++++++++++++++++ dlls/appwiz.cpl/Fr.rc | 24 ++++++++++++++++++++++ dlls/appwiz.cpl/He.rc | 21 ++++++++++++++++++++ dlls/appwiz.cpl/Hu.rc | 20 +++++++++++++++++++ dlls/appwiz.cpl/It.rc | 22 ++++++++++++++++++++- dlls/appwiz.cpl/Ja.rc | 22 +++++++++++++++++++++ dlls/appwiz.cpl/Ko.rc | 2 +- dlls/appwiz.cpl/Lt.rc | 22 ++++++++++++++++++++- dlls/appwiz.cpl/Makefile.in | 3 ++ dlls/appwiz.cpl/Nl.rc | 21 ++++++++++++++++++++ dlls/appwiz.cpl/No.rc | 22 ++++++++++++++++++++- dlls/appwiz.cpl/Pl.rc | 21 ++++++++++++++++++++ dlls/appwiz.cpl/Pt.rc | 45 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Ro.rc | 20 +++++++++++++++++++ dlls/appwiz.cpl/Ru.rc | 23 ++++++++++++++++++++++ dlls/appwiz.cpl/Si.rc | 21 ++++++++++++++++++++ dlls/appwiz.cpl/Sr.rc | 45 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Tr.rc | 41 +++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Uk.rc | 20 +++++++++++++++++++ dlls/appwiz.cpl/Zh.rc | 38 ++++++++++++++++++++++++++++++++++++ 24 files changed, 571 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc361eefcef4e1fe0f15e…

1 0

Alexandre Julliard : infosoft: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 79bab49904d870f23d74da46665164484b5ee831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79bab49904d870f23d74da466… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 14:50:56 2010 +0100 infosoft: Convert dll registration to the IRegistrar mechanism. --- .gitignore | 1 + dlls/infosoft/Makefile.in | 3 ++ dlls/infosoft/infosoft.idl | 26 +++++++++++++++++++++ dlls/infosoft/infosoft_main.c | 50 +++++++++------------------------------- 4 files changed, 42 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index dd74759..a981f92 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ dlls/d3dcompiler_43/asmshader.yy.c dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h +dlls/infosoft/infosoft.h dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index 36c4a02..f6af67c 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -6,4 +6,7 @@ C_SRCS = \ infosoft_main.c \ wordbreaker.c +IDL_H_SRCS = infosoft.idl +IDL_R_SRCS = infosoft.idl + @MAKE_DLL_RULES@ diff --git a/dlls/infosoft/infosoft.idl b/dlls/infosoft/infosoft.idl new file mode 100644 index 0000000..2891617 --- /dev/null +++ b/dlls/infosoft/infosoft.idl @@ -0,0 +1,26 @@ +/* + * COM Classes for infosoft + * + * 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("Neutral Word Breaker"), + threading(both), + uuid(369647e0-17b0-11ce-9950-00aa004bbb1f) +] +coclass wb_Neutral { interface IWordBreaker; } diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index a177dfd..619eca2 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -28,16 +28,17 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" #include "ole2.h" +#include "rpcproxy.h" #include "indexsrv.h" #include "initguid.h" +#include "infosoft.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(infosoft); -DEFINE_GUID(CLSID_wb_Neutral,0x369647e0,0x17b0,0x11ce,0x99,0x50,0x00,0xaa,0x00,0x4b,0xbb,0x1f); +static HINSTANCE instance; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -46,6 +47,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: @@ -155,46 +157,18 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } -static HRESULT add_key_val( LPCSTR key, LPCSTR valname, LPCSTR value ) -{ - HKEY hkey; - - if (RegCreateKeyA( HKEY_CLASSES_ROOT, key, &hkey ) != ERROR_SUCCESS) return E_FAIL; - RegSetValueA( hkey, valname, REG_SZ, value, strlen( value ) + 1 ); - RegCloseKey( hkey ); - return S_OK; -} - -static HRESULT add_wordbreaker_clsid( LPCSTR lang, const CLSID *id) -{ - CHAR key[100], val[50]; - - strcpy(key, "CLSID\\"); - sprintf(key+6, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7]); - sprintf(val, "%s Word Breaker", lang); - add_key_val( key, NULL, val ); - strcat(key, "\\InProcServer32"); - add_key_val( key, NULL, "infosoft.dll" ); - add_key_val( key, "ThreadingModel", "Both" ); - return S_OK; -} - -#define ADD_BREAKER(name) add_wordbreaker_clsid( #name, &CLSID_wb_##name ) - -static HRESULT add_content_index_keys(void) +/*********************************************************************** + * DllRegisterServer (INFOSOFT.@) + */ +HRESULT WINAPI DllRegisterServer(void) { - ADD_BREAKER(Neutral); /* in query.dll on Windows */ - return S_OK; + return __wine_register_resources( instance, NULL ); } /*********************************************************************** - * DllRegisterServer (INFOSOFT.@) + * DllUnregisterServer (INFOSOFT.@) */ -HRESULT WINAPI DllRegisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { - add_content_index_keys(); - return S_OK; + return __wine_unregister_resources( instance, NULL ); }

1 0

Alexandre Julliard : devenum: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 7092313b2a3a25533a1b27e37cf6f6527784a273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7092313b2a3a25533a1b27e37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 14:44:19 2010 +0100 devenum: Convert dll registration to the IRegistrar mechanism. --- dlls/devenum/Makefile.in | 2 + dlls/devenum/devenum_classes.idl | 90 ++++++++++++++++ dlls/devenum/devenum_main.c | 218 +------------------------------------- 3 files changed, 96 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7092313b2a3a25533a1b2…

1 0

Alexandre Julliard : mmdevapi: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 343a2cb07ac6030c7095e94d234923f24c1f0e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=343a2cb07ac6030c7095e94d2… Author: Alexandre Julliard <julliard(a)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); -}

1 0

Alexandre Julliard : dxdiagn: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: d1d90f4b0d250dbbb9d370c6d2bcba0915772d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d90f4b0d250dbbb9d370c6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 13:13:45 2010 +0100 dxdiagn: Convert dll registration to the IRegistrar mechanism. --- dlls/dxdiagn/Makefile.in | 5 +- dlls/dxdiagn/dxdiag_main.c | 30 +++- dlls/dxdiagn/dxdiag_private.h | 3 - dlls/dxdiagn/dxdiagn.idl | 28 +++ dlls/dxdiagn/regsvr.c | 493 ----------------------------------------- 5 files changed, 60 insertions(+), 499 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1d90f4b0d250dbbb9d37…

1 0

Alexandre Julliard : dplayx: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: c6f91df4b7f216cbb30e114ad9620336d72c815b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f91df4b7f216cbb30e114ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 12:52:05 2010 +0100 dplayx: Convert dll registration to the IRegistrar mechanism. --- dlls/dplayx/Makefile.in | 5 +- dlls/dplayx/dplayx.idl | 33 +++ dlls/dplayx/dplayx_main.c | 21 ++ dlls/dplayx/regsvr.c | 494 --------------------------------------------- 4 files changed, 57 insertions(+), 496 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6f91df4b7f216cbb30e1…

1 0

Alexandre Julliard : d3dxof: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 5940d37d11516a208f29a7161c39b537c9869f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5940d37d11516a208f29a7161… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 12:30:05 2010 +0100 d3dxof: Convert dll registration to the IRegistrar mechanism. --- dlls/d3dxof/Makefile.in | 5 +- dlls/d3dxof/d3dxof.idl | 26 +++ dlls/d3dxof/main.c | 19 ++ dlls/d3dxof/regsvr.c | 491 ----------------------------------------------- 4 files changed, 48 insertions(+), 493 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5940d37d11516a208f29a…

1 0