December 2010 - Wine-commits

Alexandre Julliard : include: Disable widl-specific coclass attributes when not building with widl.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: b13722cd2fad3950304d9e062bb63a2e43e7e131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13722cd2fad3950304d9e062… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 14:26:29 2010 +0100 include: Disable widl-specific coclass attributes when not building with widl. --- include/gameux.idl | 6 ++++++ include/msxml6.idl | 6 ++++++ include/wuapi.idl | 6 ++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/gameux.idl b/include/gameux.idl index b058593..31be9ca 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -23,6 +23,12 @@ import "oaidl.idl"; import "ocidl.idl"; import "shobjidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(4F48A59C-942D-4F3C-83C9-4EFFE84E4959), version(1.0), diff --git a/include/msxml6.idl b/include/msxml6.idl index 3d5946a..45cef98 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -25,6 +25,12 @@ import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(f5078f18-c551-11d3-89b9-0000f81fe221), version(6.0), diff --git a/include/wuapi.idl b/include/wuapi.idl index fe70c06..1989cd4 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -18,6 +18,12 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ helpstring("WUAPI 2.0 Type Library"), uuid(b596cc9f-56e5-419e-a622-e01bb457431e),

1 0

Alexandre Julliard : msimtf: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 0da53e3dd23012db7d4a8a4d9978f72a8e17b8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da53e3dd23012db7d4a8a4d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 14:41:57 2010 +0100 msimtf: Convert dll registration to the IRegistrar mechanism. --- dlls/msimtf/Makefile.in | 2 +- dlls/msimtf/activeimmapp.c | 1 - dlls/msimtf/main.c | 54 ++--------------------------------- dlls/msimtf/{rsrc.rc => msimtf.idl} | 24 +++++++++++++-- dlls/msimtf/msimtf.inf | 26 ----------------- 5 files changed, 25 insertions(+), 82 deletions(-) diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in index 4c6e27d..d781544 100644 --- a/dlls/msimtf/Makefile.in +++ b/dlls/msimtf/Makefile.in @@ -5,6 +5,6 @@ C_SRCS = \ activeimmapp.c \ main.c -RC_SRCS = rsrc.rc +IDL_R_SRCS = msimtf.idl @MAKE_DLL_RULES@ diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index 4178992..6b8b014 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "winerror.h" #include "objbase.h" -#include "advpub.h" #include "dimm.h" #include "imm.h" diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index dab1e27..972429a 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -27,9 +27,8 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" -#include "advpub.h" #include "ole2.h" +#include "rpcproxy.h" #include "dimm.h" #include "wine/debug.h" @@ -159,59 +158,12 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } -#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) -{ - HRESULT hres; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - STRTABLEA strtable; - STRENTRYA pse[1]; - static CLSID const *clsids[34]; - unsigned int i = 0; - - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - INF_SET_CLSID(CActiveIMM); - - 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; - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hres = pRegInstall(msimtf_instance, 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 (msimtf.@) */ HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources( msimtf_instance, NULL ); } /*********************************************************************** @@ -219,5 +171,5 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources( msimtf_instance, NULL ); } diff --git a/dlls/msimtf/rsrc.rc b/dlls/msimtf/msimtf.idl similarity index 60% rename from dlls/msimtf/rsrc.rc rename to dlls/msimtf/msimtf.idl index 361feee..388222e 100644 --- a/dlls/msimtf/rsrc.rc +++ b/dlls/msimtf/msimtf.idl @@ -1,5 +1,7 @@ /* - * Copyright 2007 Jacek Caban for CodeWeavers + * COM Classes for msimtf + * + * 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 @@ -16,5 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: msimtf.inf */ -REGINST REGINST msimtf.inf +[ + helpstring("CActiveIMMApp"), + threading(apartment), + uuid(4955dd33-b159-11d0-8fcf-00aa006bcc59) +] +coclass CActiveIMM { interface IActiveIMMApp; } + +[ + threading(apartment), + uuid(c1ee01f2-b3b6-4a6a-9ddd-e988c088ec82) +] +coclass CActiveIMMAppEx { interface IActiveIMMApp; } + +[ + threading(apartment), + uuid(50d5107a-d278-4871-8989-f4ceaaf59cfc) +] +coclass CActiveIMMAppEx_Trident { interface IActiveIMMApp; } diff --git a/dlls/msimtf/msimtf.inf b/dlls/msimtf/msimtf.inf deleted file mode 100644 index 2bc5785..0000000 --- a/dlls/msimtf/msimtf.inf +++ /dev/null @@ -1,26 +0,0 @@ -[version] -Signature="$CHICAGO$" - - -[RegisterDll] -AddReg=Classes.Reg - - -[UnregisterDll] -DelReg=Classes.Reg - - -[Classes.Reg] -HKCR,"CLSID\%CLSID_CActiveIMM%",,,"CActiveIMMApp" -HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32","ThreadingModel",,"Apartment" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%",,,"CActiveIMMAppEx_Trident" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%\InProcServer32","ThreadingModel",,"Apartment" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%",,,"CActiveIMMAppEx" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%\InProcServer32","ThreadingModel",,"Apartment" - -[Strings] -CLSID_CActiveIMMAppEx_Trident={50D5107A-D278-4871-8989-F4CEAAF59CFC} -CLSID_CActiveIMMAppEx="{C1EE01F2-B3B6-4A6A-9DDD-E988C088EC82}"

1 0

Alexandre Julliard : mstask: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: ba709a1d4551a91f4719202dae754c935bc5971b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba709a1d4551a91f4719202da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 14:55:46 2010 +0100 mstask: Convert dll registration to the IRegistrar mechanism. --- dlls/mstask/Makefile.in | 3 +- dlls/mstask/mstask.inf | 16 -------- dlls/mstask/mstask_main.c | 93 ++------------------------------------------- dlls/mstask/rsrc.rc | 20 ---------- include/mstask.idl | 8 ++++ 5 files changed, 13 insertions(+), 127 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index ed1c9ee..a4559d1 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -8,8 +8,7 @@ C_SRCS = \ task_scheduler.c \ task_trigger.c -RC_SRCS = rsrc.rc - IDL_I_SRCS = mstask_local.idl +IDL_R_SRCS = mstask_local.idl @MAKE_DLL_RULES@ diff --git a/dlls/mstask/mstask.inf b/dlls/mstask/mstask.inf deleted file mode 100644 index 1056093..0000000 --- a/dlls/mstask/mstask.inf +++ /dev/null @@ -1,16 +0,0 @@ -[version] -Signature="$CHICAGO$" - -[RegisterDll] -AddReg=Classes.Reg - -[UnregisterDll] -DelReg=Classes.Reg - -[Classes.Reg] -HKCR,"CLSID\%CLSID_CTaskScheduler%",,,"CTaskScheduler" -HKCR,"CLSID\%CLSID_CTaskScheduler%\InProcServer32",,,"mstask.dll" -HKCR,"CLSID\%CLSID_CTaskScheduler%\InProcServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_CTask%",,,"CTask" -HKCR,"CLSID\%CLSID_CTask%\InProcServer32",,,"mstask.dll" -HKCR,"CLSID\%CLSID_CTask%\InProcServer32","ThreadingModel",,"Both" diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index df1f1d8..000833d 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -19,8 +19,8 @@ #include <stdio.h> #include "mstask_private.h" -#include "winreg.h" -#include "advpub.h" +#include "objbase.h" +#include "rpcproxy.h" #include "wine/debug.h" @@ -66,97 +66,12 @@ HRESULT WINAPI DllCanUnloadNow(void) return dll_ref != 0 ? S_FALSE : S_OK; } -static inline char *mstask_strdup(const char *s) -{ - size_t n = strlen(s) + 1; - char *d = HeapAlloc(GetProcessHeap(), 0, n); - return d ? memcpy(d, s, n) : NULL; -} - -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(CTaskScheduler), - CLSID_EXPANSION_ENTRY(CTask) - }; -#undef CLSID_EXPANSION_ENTRY - static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - unsigned int 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 = mstask_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) -{ - unsigned int 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; - } -} - -static HRESULT register_mstask(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)) - WINE_ERR("RegInstall failed: %08x\n", hr); - - return hr; -} - HRESULT WINAPI DllRegisterServer(void) { - return register_mstask(TRUE); + return __wine_register_resources( hInst, NULL ); } HRESULT WINAPI DllUnregisterServer(void) { - return register_mstask(FALSE); + return __wine_unregister_resources( hInst, NULL ); } diff --git a/dlls/mstask/rsrc.rc b/dlls/mstask/rsrc.rc deleted file mode 100644 index 9915e02..0000000 --- a/dlls/mstask/rsrc.rc +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2008 Google (Roy Shea) - * - * 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 - */ - -/* @makedep: mstask.inf */ -REGINST REGINST mstask.inf diff --git a/include/mstask.idl b/include/mstask.idl index cc70cce..ecff641 100644 --- a/include/mstask.idl +++ b/include/mstask.idl @@ -22,6 +22,12 @@ import "oaidl.idl"; import "oleidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + cpp_quote("#define TASK_SUNDAY 0x1") cpp_quote("#define TASK_MONDAY 0x2") cpp_quote("#define TASK_TUESDAY 0x4") @@ -368,6 +374,7 @@ interface ITaskScheduler : IUnknown } [ + threading(both), uuid(148BD52A-A2AB-11CE-B11F-00AA00530503) ] coclass CTaskScheduler @@ -377,6 +384,7 @@ coclass CTaskScheduler [ + threading(both), uuid(148BD520-A2AB-11CE-B11F-00AA00530503) ] coclass CTask

1 0

Alexandre Julliard : explorerframe: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: a967d985c2618b585e5c2f0cebccd02e7d4db7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a967d985c2618b585e5c2f0ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 15:02:43 2010 +0100 explorerframe: Convert dll registration to the IRegistrar mechanism. --- dlls/explorerframe/Makefile.in | 3 +- .../explorerframe/{eframe.rc => explorerframe.idl} | 12 +++- dlls/explorerframe/explorerframe.inf | 17 ----- dlls/explorerframe/explorerframe_main.c | 67 +------------------- 4 files changed, 13 insertions(+), 86 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index af92758..975f197 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -6,8 +6,9 @@ C_SRCS = \ explorerframe_main.c \ nstc.c +IDL_R_SRCS = explorerframe.idl + RC_SRCS = \ - eframe.rc \ version.rc @MAKE_DLL_RULES@ diff --git a/dlls/explorerframe/eframe.rc b/dlls/explorerframe/explorerframe.idl similarity index 74% rename from dlls/explorerframe/eframe.rc rename to dlls/explorerframe/explorerframe.idl index 25619de..8171396 100644 --- a/dlls/explorerframe/eframe.rc +++ b/dlls/explorerframe/explorerframe.idl @@ -1,7 +1,7 @@ /* - * ExplorerFrame main resource file + * COM Classes for explorerframe * - * Copyright 2010 David Hedberg + * 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 @@ -18,5 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: explorerframe.inf */ -REGINST REGINST explorerframe.inf +[ + helpstring("Shell Name Space ListView"), + threading(apartment), + uuid(ae054212-3535-4430-83ed-d501aa6680e6) +] +coclass NamespaceTreeControl { interface INameSpaceTreeControl2; } diff --git a/dlls/explorerframe/explorerframe.inf b/dlls/explorerframe/explorerframe.inf deleted file mode 100644 index 7d6ba63..0000000 --- a/dlls/explorerframe/explorerframe.inf +++ /dev/null @@ -1,17 +0,0 @@ -[version] -Signature="$CHICAGO$" - -[RegisterDll] -AddReg=Classes.Reg - -[UnregisterDll] -DelReg=Classes.Reg - -[Classes.Reg] -; For some reason called "ListView" in the registry. -HKCR,"CLSID\%CLSID_NamespaceTreeControl%",,,"Shell Name Space ListView" -HKCR,"CLSID\%CLSID_NamespaceTreeControl%\InProcServer32",,,"%MODULE%" -HKCR,"CLSID\%CLSID_NamespaceTreeControl%\InProcServer32","ThreadingModel",,"Apartment" - -[Strings] -MODULE="explorerframe.dll" diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index cc535e7..365898f 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -30,8 +30,8 @@ #include "winuser.h" #include "winreg.h" #include "shlwapi.h" -#include "advpub.h" #include "shobjidl.h" +#include "rpcproxy.h" #include "wine/debug.h" @@ -209,72 +209,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) } /************************************************************************* - * Register/Unregister DLL, based on shdocvw/factory.c - */ -static HRESULT reg_install(LPCSTR section, const 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(explorerframe_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[1]; - static CLSID const *clsids[1]; - unsigned int i = 0; - HRESULT hres; - - INF_SET_CLSID(NamespaceTreeControl); - - 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 (ExplorerFrame.@) */ HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources( explorerframe_hinstance, NULL ); } /************************************************************************* @@ -282,5 +221,5 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources( explorerframe_hinstance, NULL ); }

1 0

Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in update_downloader.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: ecd7ea605e6f1a9b69888de1ad881da37deae320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd7ea605e6f1a9b69888de1a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:31:49 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in update_downloader. --- dlls/wuapi/downloader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wuapi/downloader.c b/dlls/wuapi/downloader.c index 7292966..6bed32e 100644 --- a/dlls/wuapi/downloader.c +++ b/dlls/wuapi/downloader.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _update_downloader { - const struct IUpdateDownloaderVtbl *vtbl; + IUpdateDownloader IUpdateDownloader_iface; LONG refs; } update_downloader; static inline update_downloader *impl_from_IUpdateDownloader( IUpdateDownloader *iface ) { - return (update_downloader *)((char *)iface - FIELD_OFFSET( update_downloader, vtbl )); + return CONTAINING_RECORD(iface, update_downloader, IUpdateDownloader_iface); } static ULONG WINAPI update_downloader_AddRef( @@ -257,10 +257,10 @@ HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) downloader = HeapAlloc( GetProcessHeap(), 0, sizeof(*downloader) ); if (!downloader) return E_OUTOFMEMORY; - downloader->vtbl = &update_downloader_vtbl; + downloader->IUpdateDownloader_iface.lpVtbl = &update_downloader_vtbl; downloader->refs = 1; - *ppObj = &downloader->vtbl; + *ppObj = &downloader->IUpdateDownloader_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in automatic_updates.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 79d03435ad11583e8a39cc06e877c77da813d142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d03435ad11583e8a39cc06e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:32:41 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in automatic_updates. --- dlls/wuapi/updates.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wuapi/updates.c b/dlls/wuapi/updates.c index 663ff39..d099fb4 100644 --- a/dlls/wuapi/updates.c +++ b/dlls/wuapi/updates.c @@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _automatic_updates { - const struct IAutomaticUpdatesVtbl *vtbl; + IAutomaticUpdates IAutomaticUpdates_iface; LONG refs; } automatic_updates; static inline automatic_updates *impl_from_IAutomaticUpdates( IAutomaticUpdates *iface ) { - return (automatic_updates *)((char*)iface - FIELD_OFFSET( automatic_updates, vtbl )); + return CONTAINING_RECORD(iface, automatic_updates, IAutomaticUpdates_iface); } static ULONG WINAPI automatic_updates_AddRef( @@ -211,10 +211,10 @@ HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) updates = HeapAlloc( GetProcessHeap(), 0, sizeof(*updates) ); if (!updates) return E_OUTOFMEMORY; - updates->vtbl = &automatic_updates_vtbl; + updates->IAutomaticUpdates_iface.lpVtbl = &automatic_updates_vtbl; updates->refs = 1; - *ppObj = &updates->vtbl; + *ppObj = &updates->IAutomaticUpdates_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : oleaut32: Use ifaces instead of vtbl pointers in OLEPictureImpl.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 812a0495c5f7fca72a5cd5bd056eb7358736de79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=812a0495c5f7fca72a5cd5bd0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:33:13 2010 +0100 oleaut32: Use ifaces instead of vtbl pointers in OLEPictureImpl. --- dlls/oleaut32/olepicture.c | 105 ++++++++++++++++++++++---------------------- 1 files changed, 53 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=812a0495c5f7fca72a5cd…

1 0

Michael Stefaniuc : mscoree: Use an iface instead of a vtbl pointer in MetaDataDispenser.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: bcf15c7b163f20b6a0598c090d08bca28e748205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf15c7b163f20b6a0598c090… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:31:42 2010 +0100 mscoree: Use an iface instead of a vtbl pointer in MetaDataDispenser. --- dlls/mscoree/metadata.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c index c9b8c72..7a5336d 100644 --- a/dlls/mscoree/metadata.c +++ b/dlls/mscoree/metadata.c @@ -41,10 +41,15 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); typedef struct MetaDataDispenser { - const struct IMetaDataDispenserExVtbl *lpVtbl; + IMetaDataDispenserEx IMetaDataDispenserEx_iface; LONG ref; } MetaDataDispenser; +static inline MetaDataDispenser *impl_from_IMetaDataDispenserEx(IMetaDataDispenserEx *iface) +{ + return CONTAINING_RECORD(iface, MetaDataDispenser, IMetaDataDispenserEx_iface); +} + static HRESULT WINAPI MetaDataDispenser_QueryInterface(IMetaDataDispenserEx* iface, REFIID riid, void **ppvObject) { @@ -69,7 +74,7 @@ static HRESULT WINAPI MetaDataDispenser_QueryInterface(IMetaDataDispenserEx* ifa static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface) { - MetaDataDispenser *This = (MetaDataDispenser*)iface; + MetaDataDispenser *This = impl_from_IMetaDataDispenserEx(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p ref=%u\n", This, ref); @@ -81,7 +86,7 @@ static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface) static ULONG WINAPI MetaDataDispenser_Release(IMetaDataDispenserEx* iface) { - MetaDataDispenser *This = (MetaDataDispenser*)iface; + MetaDataDispenser *This = impl_from_IMetaDataDispenserEx(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p ref=%u\n", This, ref); @@ -193,7 +198,7 @@ HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MetaDataDispenserVtbl; + This->IMetaDataDispenserEx_iface.lpVtbl = &MetaDataDispenserVtbl; This->ref = 1; *ppUnk = (IUnknown*)This;

1 0

Michael Stefaniuc : mscoree: Use ifaces instead of vtbl pointers in ConfigFileHandler.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: ac0826d51eddf034b7e23e6f2a4d6150c3b54ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0826d51eddf034b7e23e6f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:31:35 2010 +0100 mscoree: Use ifaces instead of vtbl pointers in ConfigFileHandler. --- dlls/mscoree/config.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 3a00194..3e16226 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -46,8 +46,8 @@ enum parse_state typedef struct ConfigFileHandler { - const struct ISAXContentHandlerVtbl *lpVtbl; - const struct ISAXErrorHandlerVtbl *lpErrorVtbl; + ISAXContentHandler ISAXContentHandler_iface; + ISAXErrorHandler ISAXErrorHandler_iface; LONG ref; enum parse_state states[16]; int statenum; @@ -56,12 +56,12 @@ typedef struct ConfigFileHandler static inline ConfigFileHandler *impl_from_ISAXContentHandler(ISAXContentHandler *iface) { - return (ConfigFileHandler *)((char*)iface - FIELD_OFFSET(ConfigFileHandler, lpVtbl)); + return CONTAINING_RECORD(iface, ConfigFileHandler, ISAXContentHandler_iface); } static inline ConfigFileHandler *impl_from_ISAXErrorHandler(ISAXErrorHandler *iface) { - return (ConfigFileHandler *)((char*)iface - FIELD_OFFSET(ConfigFileHandler, lpErrorVtbl)); + return CONTAINING_RECORD(iface, ConfigFileHandler, ISAXErrorHandler_iface); } static HRESULT WINAPI ConfigFileHandler_QueryInterface(ISAXContentHandler *iface, @@ -399,8 +399,8 @@ static HRESULT parse_config(VARIANT input, parsed_config_file *result) if (!handler) return E_OUTOFMEMORY; - handler->lpVtbl = &ConfigFileHandlerVtbl; - handler->lpErrorVtbl = &ConfigFileHandlerErrorVtbl; + handler->ISAXContentHandler_iface.lpVtbl = &ConfigFileHandlerVtbl; + handler->ISAXErrorHandler_iface.lpVtbl = &ConfigFileHandlerErrorVtbl; handler->ref = 1; handler->states[0] = STATE_ROOT; handler->statenum = 0; @@ -411,10 +411,10 @@ static HRESULT parse_config(VARIANT input, parsed_config_file *result) if (SUCCEEDED(hr)) { - hr = ISAXXMLReader_putContentHandler(reader, (ISAXContentHandler*)&handler->lpVtbl); + hr = ISAXXMLReader_putContentHandler(reader, &handler->ISAXContentHandler_iface); if (SUCCEEDED(hr)) - hr = ISAXXMLReader_putErrorHandler(reader, (ISAXErrorHandler*)&handler->lpErrorVtbl); + hr = ISAXXMLReader_putErrorHandler(reader, &handler->ISAXErrorHandler_iface); if (SUCCEEDED(hr)) hr = ISAXXMLReader_parse(reader, input);

1 0

Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in update_searcher.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: b0c925cdb2bbcd60cf7449ba5b95e7ddc1f3833b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c925cdb2bbcd60cf7449ba5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:32:12 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in update_searcher. --- dlls/wuapi/searcher.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wuapi/searcher.c b/dlls/wuapi/searcher.c index 8105681..da3dd81 100644 --- a/dlls/wuapi/searcher.c +++ b/dlls/wuapi/searcher.c @@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _update_searcher { - const struct IUpdateSearcherVtbl *vtbl; + IUpdateSearcher IUpdateSearcher_iface; LONG refs; } update_searcher; static inline update_searcher *impl_from_IUpdateSearcher( IUpdateSearcher *iface ) { - return (update_searcher *)((char *)iface - FIELD_OFFSET( update_searcher, vtbl )); + return CONTAINING_RECORD(iface, update_searcher, IUpdateSearcher_iface); } static ULONG WINAPI update_searcher_AddRef( @@ -247,10 +247,10 @@ HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) ); if (!searcher) return E_OUTOFMEMORY; - searcher->vtbl = &update_searcher_vtbl; + searcher->IUpdateSearcher_iface.lpVtbl = &update_searcher_vtbl; searcher->refs = 1; - *ppObj = &searcher->vtbl; + *ppObj = &searcher->IUpdateSearcher_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0