November 2012 - Wine-commits

Jacek Caban : atl100: Addeed stub DLL.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 565d9f6dc8ba1b571d10de464dcfd0813b992323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565d9f6dc8ba1b571d10de464… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:09:45 2012 +0100 atl100: Addeed stub DLL. --- configure | 1 + configure.ac | 1 + dlls/atl100/Makefile.in | 5 ++++ dlls/atl100/atl.c | 33 +++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2fcdd20..2baf8c8 100755 --- a/configure +++ b/configure @@ -15247,6 +15247,7 @@ wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl implib wine_fn_config_test dlls/atl/tests atl_test +wine_fn_config_dll atl100 enable_atl100 wine_fn_config_dll atl80 enable_atl80 wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib diff --git a/configure.ac b/configure.ac index a08b995..d003e8a 100644 --- a/configure.ac +++ b/configure.ac @@ -2513,6 +2513,7 @@ WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[implib]) WINE_CONFIG_TEST(dlls/atl/tests) +WINE_CONFIG_DLL(atl100) WINE_CONFIG_DLL(atl80) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in new file mode 100644 index 0000000..9121a10 --- /dev/null +++ b/dlls/atl100/Makefile.in @@ -0,0 +1,5 @@ +MODULE = atl100.dll + +C_SRCS = atl.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c new file mode 100644 index 0000000..ff257ce --- /dev/null +++ b/dlls/atl100/atl.c @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Stefan Leichter + * + * 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 + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atl); + +/*********************************************************************** + * AtlGetVersion [atl100.@] + */ +DWORD WINAPI AtlGetVersion(void *pReserved) +{ + return 0x0a00; +} diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec new file mode 100644 index 0000000..d367615 --- /dev/null +++ b/dlls/atl100/atl100.spec @@ -0,0 +1,52 @@ +10 stub AtlAdvise +11 stub AtlUnadvise +12 stub AtlFreeMarshalStream +13 stub AtlMarshalPtrInProc +14 stub AtlUnmarshalPtr +15 stub AtlComModuleGetClassObject +17 stub AtlComModuleRegisterClassObjects +20 stub AtlComModuleRevokeClassObjects +22 stub AtlComModuleUnregisterServer +23 stub AtlUpdateRegistryFromResourceD +24 stub AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stub AtlCreateTargetDC +27 stub AtlHiMetricToPixel +28 stub AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stub AtlComPtrAssign +31 stub AtlComQIPtrAssign +32 stub AtlInternalQueryInterface +34 stdcall AtlGetVersion(ptr) +35 stub AtlAxDialogBoxW +36 stub AtlAxDialogBoxA +37 stub AtlAxCreateDialogW +38 stub AtlAxCreateDialogA +39 stub AtlAxCreateControl +40 stub AtlAxCreateControlEx +41 stub AtlAxAttachControl +42 stub AtlAxWinInit +43 stub AtlWinModuleAddCreateWndData +44 stub AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA +47 stub AtlAxGetControl +48 stub AtlAxGetHost +49 stub AtlRegisterClassCategoriesHelper +50 stub AtlIPersistStreamInit_Load +51 stub AtlIPersistStreamInit_Save +52 stub AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stub AtlGetObjectSourceInterface +56 stub AtlLoadTypeLib +58 stub AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stub AtlCreateRegistrar +62 stub AtlWinModuleRegisterClassExW +63 stub AtlWinModuleRegisterClassExA +64 stub AtlCallTermFunc +65 stub AtlWinModuleInit +66 stub AtlWinModuleTerm +67 stub AtlSetPerUserRegistration +68 stub AtlGetPerUserRegistration

1 0

Jacek Caban : atl: Always return S_FALSE in DllCanUnloadNow.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 0cc483a07b7e8a5392692b16edfc2c00d8120e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc483a07b7e8a5392692b16e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:10:01 2012 +0100 atl: Always return S_FALSE in DllCanUnloadNow. --- dlls/atl/registrar.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 028f35e..2aaf888 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -static LONG dll_count; - /************************************************************** * ATLRegistrar implementation */ @@ -570,7 +568,6 @@ static ULONG WINAPI Registrar_Release(IRegistrar *iface) if(!ref) { IRegistrar_ClearReplacements(iface); HeapFree(GetProcessHeap(), 0, This); - InterlockedDecrement(&dll_count); } return ref; } @@ -711,8 +708,6 @@ static HRESULT AtlCreateRegistrar(IRegistrar **ret) registrar->ref = 1; registrar->rep = NULL; - InterlockedIncrement(&dll_count); - *ret = &registrar->IRegistrar_iface; return S_OK; } @@ -736,13 +731,11 @@ static HRESULT WINAPI RegistrarCF_QueryInterface(IClassFactory *iface, REFIID ri static ULONG WINAPI RegistrarCF_AddRef(IClassFactory *iface) { - InterlockedIncrement(&dll_count); return 2; } static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface) { - InterlockedDecrement(&dll_count); return 1; } @@ -771,12 +764,6 @@ static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock) { TRACE("(%p)->(%x)\n", iface, lock); - - if(lock) - InterlockedIncrement(&dll_count); - else - InterlockedDecrement(&dll_count); - return S_OK; } @@ -886,6 +873,5 @@ HRESULT WINAPI DllUnregisterServer(void) */ HRESULT WINAPI DllCanUnloadNow(void) { - TRACE("dll_count = %u\n", dll_count); - return dll_count ? S_FALSE : S_OK; + return S_FALSE; }

1 0

Jacek Caban : atl: Removed unneeded includes.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 0c8e91af5147fcc708d5559a900b281e27ed6ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8e91af5147fcc708d5559a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:10:14 2012 +0100 atl: Removed unneeded includes. --- dlls/atl/registrar.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 2aaf888..b03fdf0 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -16,19 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <stdarg.h> - #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "objbase.h" #include "oaidl.h" #include "rpcproxy.h" -#include "atliface.h" #include "atlbase.h" #include "wine/debug.h"

1 0

Jacek Caban : atl: Moved atlbase.h to public includes.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 7f98899bbae00c397ac678c912ac314b4437e58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f98899bbae00c397ac678c91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:10:28 2012 +0100 atl: Moved atlbase.h to public includes. --- include/Makefile.in | 1 + {dlls/atl => include}/atlbase.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 314b37f..dc6ee88 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -141,6 +141,7 @@ SRCDIR_INCLUDES = \ appmgmt.h \ asynot.idl \ asysta.idl \ + atlbase.h \ audevcod.h \ audiosessiontypes.h \ aviriff.h \ diff --git a/dlls/atl/atlbase.h b/include/atlbase.h similarity index 99% rename from dlls/atl/atlbase.h rename to include/atlbase.h index 59cdddf..8fa9987 100644 --- a/dlls/atl/atlbase.h +++ b/include/atlbase.h @@ -21,9 +21,7 @@ #ifndef __WINE_ATLBASE_H__ #define __WINE_ATLBASE_H__ -#define COBJMACROS - -#include "atliface.h" +#include <atliface.h> typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw);

1 0

Jacek Caban : atl100: Moved IRegistrar implementation to atl100.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 9d956864b7ae21134b6b8c0c733eff22653b57fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d956864b7ae21134b6b8c0c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:10:54 2012 +0100 atl100: Moved IRegistrar implementation to atl100. --- configure | 2 +- configure.ac | 2 +- dlls/atl/Makefile.in | 2 +- dlls/atl/registrar.c | 676 --------------------------------------------- dlls/atl100/Makefile.in | 6 +- dlls/atl100/atl100.spec | 2 +- dlls/atl100/registrar.c | 704 +++++++++++++++++++++++++++++++++++++++++++++++ include/atlbase.h | 1 + 8 files changed, 714 insertions(+), 681 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d956864b7ae21134b6b8…

1 0

Jacek Caban : atl: Moved atlwin.h to public includes.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: fe3684cadd30564cdac5bebc327825e9f1d34c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3684cadd30564cdac5bebc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:11:10 2012 +0100 atl: Moved atlwin.h to public includes. --- include/Makefile.in | 1 + {dlls/atl => include}/atlwin.h | 0 2 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index dc6ee88..c2ca25a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -142,6 +142,7 @@ SRCDIR_INCLUDES = \ asynot.idl \ asysta.idl \ atlbase.h \ + atlwin.h \ audevcod.h \ audiosessiontypes.h \ aviriff.h \ diff --git a/dlls/atl/atlwin.h b/include/atlwin.h similarity index 100% rename from dlls/atl/atlwin.h rename to include/atlwin.h

1 0

Jacek Caban : atl: Added AtlGetVersion implementation.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 8cfe856b17ba2c7be43d2648d4b8da0e4cb19c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cfe856b17ba2c7be43d2648d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:11:56 2012 +0100 atl: Added AtlGetVersion implementation. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index d33d986..c043d3e 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -25,7 +25,7 @@ 30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface -34 stub AtlGetVersion +34 stdcall AtlGetVersion(ptr) 35 stub AtlAxDialogBoxW 36 stub AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 9e7467a..f215151 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -472,3 +472,11 @@ void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) } return NULL; } + +/*********************************************************************** + * AtlGetVersion [ATL.@] + */ +DWORD WINAPI AtlGetVersion(void *pReserved) +{ + return 0x0300; +}

1 0

Jacek Caban : atl100: Moved more function implementations to atl100.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 84587b689e3c42ca20fd2c86c8e22138598cc0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=84587b689e3c42ca20fd2c86c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:11:37 2012 +0100 atl100: Moved more function implementations to atl100. --- dlls/atl/Makefile.in | 3 +- dlls/atl/atl.spec | 50 +++++----- dlls/atl/atl_main.c | 197 +-------------------------------------- dlls/atl100/Makefile.in | 3 +- dlls/atl100/atl.c | 208 ++++++++++++++++++++++++++++++++++++++++- dlls/atl100/atl100.spec | 42 ++++---- dlls/{atl => atl100}/atl_ax.c | 30 +++--- 7 files changed, 270 insertions(+), 263 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84587b689e3c42ca20fd2…

1 0

Jacek Caban : atl80: Forward calls directly to atl100 when possible.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: f63617efb3ce6199dc10f60c1805876beeaaf99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63617efb3ce6199dc10f60c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:12:13 2012 +0100 atl80: Forward calls directly to atl100 when possible. --- dlls/atl80/atl80.c | 13 ++--------- dlls/atl80/atl80.spec | 54 ++++++++++++++++++++++++------------------------ tools/make_specfiles | 1 + 3 files changed, 31 insertions(+), 37 deletions(-) diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index 1c31fe9..ec9a515 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -19,17 +19,10 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "atliface.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atl80); - -HRESULT WINAPI AtlCreateRegistrar(IRegistrar** ppReg) -{ - FIXME("(%p) stub\n", ppReg); - return E_NOTIMPL; -} +/*********************************************************************** + * AtlGetVersion [atl80.@] + */ DWORD WINAPI AtlGetVersion(void *pReserved) { return 0x0800; diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 7f8cfc2..519bdd0 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -1,8 +1,8 @@ -10 stdcall AtlAdvise(ptr ptr ptr ptr) atl.AtlAdvise -11 stdcall AtlUnadvise(ptr ptr long) atl.AtlUnadvise -12 stdcall AtlFreeMarshalStream(ptr) atl.AtlFreeMarshalStream -13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl.AtlMarshalPtrInProc -14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl.AtlUnmarshalPtr +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr 15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) atl.AtlModuleGetClassObject 16 stdcall AtlModuleInit(ptr long long) atl.AtlModuleInit 17 stdcall AtlModuleRegisterClassObjects(ptr long long) atl.AtlModuleRegisterClassObjects @@ -14,41 +14,41 @@ 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) atl.AtlModuleUpdateRegistryFromResourceD 24 stub AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl.AtlPixelToHiMetric +26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric 29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl.AtlComPtrAssign -31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl.AtlComQIPtrAssign -32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl.AtlInternalQueryInterface +30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) 35 stub AtlAxDialogBoxW 36 stub AtlAxDialogBoxA -37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl.AtlAxCreateDialogW -38 stdcall AtlAxCreateDialogA(long str long ptr long) atl.AtlAxCreateDialogA -39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl.AtlAxCreateControl -40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl.AtlAxCreateControlEx -41 stdcall AtlAxAttachControl(ptr ptr ptr) atl.AtlAxAttachControl -42 stdcall AtlAxWinInit() atl.AtlAxWinInit -43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData -44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData -45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW -46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA -47 stdcall AtlAxGetControl(long ptr) atl.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl.AtlAxGetHost +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +42 stdcall AtlAxWinInit() atl100.AtlAxWinInit +43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData # don't forward to atl100.dll +44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData # don't forward to atl100.dll +45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW # don't forward to atl100.dll +46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA # don't forward to atl100.dll +47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost 49 stub AtlRegisterClassCategoriesHelper -50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl.AtlIPersistStreamInit_Load -51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl.AtlIPersistStreamInit_Save +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save 52 stub AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stub AtlGetObjectSourceInterface 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx -58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl.AtlModuleAddTermFunc +58 stdcall AtlModuleAddTermFunc(ptr) atl.AtlModuleAddTermFunc # don't forward to atl100.dll 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) +61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar 62 stub AltWinModuleRegisterClassExW 63 stub AltWinModuleRegisterClassExA 64 stub AltCallTermFunc diff --git a/tools/make_specfiles b/tools/make_specfiles index 301345c..fdba89d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -112,6 +112,7 @@ my @dll_groups = "vcomp90", ], [ + "atl100", "atl", "atl80", ],

1 0

Jacek Caban : winecrt0: Use atl100. dll directly to create a registrar instance.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: eb51602304e6e3a6937feab8ca3ad9ed9cd9fa77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb51602304e6e3a6937feab8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:12:37 2012 +0100 winecrt0: Use atl100.dll directly to create a registrar instance. --- dlls/winecrt0/register.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index 407dfbd..70a4a35 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -30,7 +30,7 @@ #include "rpcproxy.h" #include "atliface.h" -static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0}; +static const WCHAR atl100W[] = {'a','t','l','1','0','0','.','d','l','l',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; @@ -38,32 +38,25 @@ struct reg_info { IRegistrar *registrar; BOOL do_register; - BOOL uninit; HRESULT result; }; -static HMODULE ole32; -static HRESULT (WINAPI *pCoInitialize)(LPVOID); -static void (WINAPI *pCoUninitialize)(void); -static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*); +static HMODULE atl100; +static HRESULT (WINAPI *pAtlCreateRegistrar)(IRegistrar**); static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) { - if (!pCoCreateInstance) + if (!pAtlCreateRegistrar) { - if (!(ole32 = LoadLibraryW( ole32W )) || - !(pCoInitialize = (void *)GetProcAddress( ole32, "CoInitialize" )) || - !(pCoUninitialize = (void *)GetProcAddress( ole32, "CoUninitialize" )) || - !(pCoCreateInstance = (void *)GetProcAddress( ole32, "CoCreateInstance" ))) + if (!(atl100 = LoadLibraryW( atl100W )) || + !(pAtlCreateRegistrar = (void *)GetProcAddress( atl100, "AtlCreateRegistrar" ))) { info->result = E_NOINTERFACE; return NULL; } } - info->uninit = SUCCEEDED( pCoInitialize( NULL )); - info->result = pCoCreateInstance( &CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, - &IID_IRegistrar, (void **)&info->registrar ); + info->result = pAtlCreateRegistrar( &info->registrar ); if (SUCCEEDED( info->result )) { WCHAR str[MAX_PATH]; @@ -108,11 +101,9 @@ HRESULT __wine_register_resources( HMODULE module ) info.registrar = NULL; info.do_register = TRUE; - info.uninit = FALSE; info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); - if (info.uninit) pCoUninitialize(); return info.result; } @@ -122,10 +113,8 @@ HRESULT __wine_unregister_resources( HMODULE module ) info.registrar = NULL; info.do_register = FALSE; - info.uninit = FALSE; info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); - if (info.uninit) pCoUninitialize(); return info.result; }

1 0