wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Jacek Caban : mshtml: Use ATTR_FIX_PX in IHTMLStyle2:: put_bottom implementation.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 6b0f51f9de1c9ddb314833ba6586f97ff8498341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0f51f9de1c9ddb314833ba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:57:26 2012 +0100 mshtml: Use ATTR_FIX_PX in IHTMLStyle2::put_bottom implementation. --- dlls/mshtml/htmlstyle2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index 7eedc00..b2740d5 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -208,7 +208,7 @@ static HRESULT WINAPI HTMLStyle2_put_bottom(IHTMLStyle2 *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - return set_nsstyle_attr_var(This->nsstyle, STYLEID_BOTTOM, &v, 0); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BOTTOM, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle2_get_bottom(IHTMLStyle2 *iface, VARIANT *p)

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

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 : 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 : 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 : 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 : 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 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 : 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: 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 : 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 + +@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

Henri Verbeet : d3d10core: Implement d3d10_device_IAGetIndexBuffer().
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: d0d213f7d14d242ad5ebd5893ec0ea0edc82b7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d213f7d14d242ad5ebd5893… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:21 2012 +0100 d3d10core: Implement d3d10_device_IAGetIndexBuffer(). --- dlls/d3d10core/device.c | 20 +++++++++++++++++++- dlls/d3d8/device.c | 3 ++- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 6 ++++-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 6 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index be55387..2501da99 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -534,7 +534,25 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_IAGetIndexBuffer(ID3D10Device *iface, ID3D10Buffer **buffer, DXGI_FORMAT *format, UINT *offset) { - FIXME("iface %p, buffer %p, format %p, offset %p stub!\n", iface, buffer, format, offset); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + enum wined3d_format_id wined3d_format; + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + TRACE("iface %p, buffer %p, format %p, offset %p.\n", iface, buffer, format, offset); + + wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format); + *format = dxgi_format_from_wined3dformat(wined3d_format); + *offset = 0; /* FIXME */ + if (!wined3d_buffer) + { + *buffer = NULL; + return; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + *buffer = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(*buffer); } static void STDMETHODCALLTYPE d3d10_device_GSGetConstantBuffers(ID3D10Device *iface, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d1dcd02..d8d230f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2302,6 +2302,7 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, IDirect3DIndexBuffer8 **buffer, UINT *base_vertex_index) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d8_indexbuffer *buffer_impl; @@ -2313,7 +2314,7 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, /* The case from UINT to INT is safe because d3d8 will never set negative values */ wined3d_mutex_lock(); *base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); - if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device))) + if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format))) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer8_iface; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0c70f96..1c707e2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2483,6 +2483,7 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 **buffer) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d9_indexbuffer *buffer_impl; @@ -2492,7 +2493,7 @@ static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3 return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device))) + if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format))) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer9_iface; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea11f70..3211038 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2236,10 +2236,12 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, } } -struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device) +struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, + enum wined3d_format_id *format) { - TRACE("device %p.\n", device); + TRACE("device %p, format %p.\n", device, format); + *format = device->stateBlock->state.index_format; return device->stateBlock->state.index_buffer; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e97c102..cb8304a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -65,7 +65,7 @@ @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) -@ cdecl wined3d_device_get_index_buffer(ptr) +@ cdecl wined3d_device_get_index_buffer(ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) @ cdecl wined3d_device_get_material(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 329698a..cf86df6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2125,7 +2125,8 @@ HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); -struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, + enum wined3d_format_id *format); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, struct wined3d_light *light); HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_IAGetVertexBuffers().
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 860c0eb24e5077458ef90113558531e8dd33852c URL: http://source.winehq.org/git/wine.git/?a=commit;h=860c0eb24e5077458ef901135… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:22 2012 +0100 d3d10core: Implement d3d10_device_IAGetVertexBuffers(). --- dlls/d3d10core/device.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 2501da99..853c538 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -527,8 +527,31 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer **buffers, UINT *strides, UINT *offsets) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n", iface, start_slot, buffer_count, buffers, strides, offsets); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, start_slot + i, + &wined3d_buffer, &offsets[i], &strides[i]))) + ERR("Failed to get vertex buffer.\n"); + + if (!wined3d_buffer) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_IAGetIndexBuffer(ID3D10Device *iface,

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DDEVICE.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 49041569462fffbfe779738860fc73567f2e1ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49041569462fffbfe77973886… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:20 2012 +0100 d3drm: Avoid LPDIRECT3DDEVICE. --- dlls/d3drm/d3drm.c | 3 ++- dlls/d3drm/device.c | 18 ++++++++---------- include/d3drm.h | 3 ++- include/d3drmobj.h | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index dd33a2f..7261eb2 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -251,7 +251,8 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromSurface(IDirect3DRM *iface return Direct3DRMDevice_create(&IID_IDirect3DRMDevice, (IUnknown**)ppDevice); } -static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM* iface, LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE * ppDevice) +static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM *iface, + IDirect3D *pD3D, IDirect3DDevice *pD3DDev, IDirect3DRMDevice **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 5d2b249..ed6055b 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -212,9 +212,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_Init(IDirect3DRMDevice2* iface, ULO } /*** IDirect3DRMDevice2 methods ***/ -static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2* iface, - LPDIRECT3D lpD3D, - LPDIRECT3DDEVICE lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2 *iface, + IDirect3D *lpD3D, IDirect3DDevice *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -411,8 +410,8 @@ static D3DRMTEXTUREQUALITY WINAPI IDirect3DRMDevice2Impl_GetTextureQuality(IDire return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice2* iface, - LPDIRECT3DDEVICE * dev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice2 *iface, + IDirect3DDevice **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -639,9 +638,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_Init(IDirect3DRMDevice3* iface, ULO return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3* iface, - LPDIRECT3D lpD3D, - LPDIRECT3DDEVICE lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3 *iface, + IDirect3D *lpD3D, IDirect3DDevice *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); @@ -844,8 +842,8 @@ static D3DRMTEXTUREQUALITY WINAPI IDirect3DRMDevice3Impl_GetTextureQuality(IDire return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice3* iface, - LPDIRECT3DDEVICE * dev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice3 *iface, + IDirect3DDevice **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); diff --git a/include/d3drm.h b/include/d3drm.h index 4125e8a..8311759 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -71,7 +71,8 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device, + IDirect3DRMDevice **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 1df113d..5e50abe 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -376,7 +376,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -397,7 +397,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; }; #undef INTERFACE @@ -503,7 +503,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -524,7 +524,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; /*** IDirect3DRMDevice2 methods ***/ STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; @@ -648,7 +648,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -669,7 +669,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; /*** IDirect3DRMDevice2 methods ***/ STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DDEVICE2.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 55ee76431ccb593ae19e98e255406cff65a36b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ee76431ccb593ae19e98e25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:19 2012 +0100 d3drm: Avoid LPDIRECT3DDEVICE2. --- dlls/d3drm/d3drm.c | 10 ++++------ dlls/d3drm/device.c | 18 ++++++++---------- include/d3drm.h | 6 ++++-- include/d3drmobj.h | 8 ++++---- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index e90ce30..dd33a2f 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -629,9 +629,8 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromSurface(IDirect3DRM2 *ifa return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2* iface, LPDIRECT3D2 pD3D, - LPDIRECT3DDEVICE2 pD3DDev, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2 *iface, + IDirect3D2 *pD3D, IDirect3DDevice2 *pD3DDev, IDirect3DRMDevice2 **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); @@ -1073,9 +1072,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromSurface(IDirect3DRM3 *ifa return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); } -static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3* iface, LPDIRECT3D2 d3d, - LPDIRECT3DDEVICE2 d3ddev, - LPDIRECT3DRMDEVICE3* device) +static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3 *iface, + IDirect3D2 *d3d, IDirect3DDevice2 *d3ddev, IDirect3DRMDevice3 **device) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 05ca080..5d2b249 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -421,9 +421,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D2(IDirect3DRMDevice2* iface, - LPDIRECT3D2 lpD3D, - LPDIRECT3DDEVICE2 lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D2(IDirect3DRMDevice2 *iface, + IDirect3D2 *lpD3D, IDirect3DDevice2 *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -460,8 +459,8 @@ static DWORD WINAPI IDirect3DRMDevice2Impl_GetRenderMode(IDirect3DRMDevice2* ifa return IDirect3DRMDevice3_GetRenderMode(&This->IDirect3DRMDevice3_iface); } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice2(IDirect3DRMDevice2* iface, - LPDIRECT3DDEVICE2 * dev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice2(IDirect3DRMDevice2 *iface, + IDirect3DDevice2 **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -856,9 +855,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice } /*** IDirect3DRMDevice2 methods ***/ -static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D2(IDirect3DRMDevice3* iface, - LPDIRECT3D2 lpD3D, - LPDIRECT3DDEVICE2 lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D2(IDirect3DRMDevice3 *iface, + IDirect3D2 *lpD3D, IDirect3DDevice2 *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); @@ -897,8 +895,8 @@ static DWORD WINAPI IDirect3DRMDevice3Impl_GetRenderMode(IDirect3DRMDevice3* ifa return This->rendermode; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevice3* iface, - LPDIRECT3DDEVICE2 * dev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevice3 *iface, + IDirect3DDevice2 **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); diff --git a/include/d3drm.h b/include/d3drm.h index 3ec1183..4125e8a 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -206,7 +206,8 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE2 *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, + IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, @@ -344,7 +345,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE3 *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, + IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 2265b56..1df113d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -526,11 +526,11 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; /*** IDirect3DRMDevice2 methods ***/ - STDMETHOD(InitFromD3D2)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev) PURE; + STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; STDMETHOD(SetRenderMode)(THIS_ DWORD flags) PURE; STDMETHOD_(DWORD, GetRenderMode)(THIS) PURE; - STDMETHOD(GetDirect3DDevice2)(THIS_ LPDIRECT3DDEVICE2 *) PURE; + STDMETHOD(GetDirect3DDevice2)(THIS_ IDirect3DDevice2 **device) PURE; }; #undef INTERFACE @@ -671,11 +671,11 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; /*** IDirect3DRMDevice2 methods ***/ - STDMETHOD(InitFromD3D2)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev) PURE; + STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; STDMETHOD(SetRenderMode)(THIS_ DWORD flags) PURE; STDMETHOD_(DWORD, GetRenderMode)(THIS) PURE; - STDMETHOD(GetDirect3DDevice2)(THIS_ LPDIRECT3DDEVICE2 *) PURE; + STDMETHOD(GetDirect3DDevice2)(THIS_ IDirect3DDevice2 **device) PURE; /*** IDirect3DRMDevice3 methods ***/ STDMETHOD(FindPreferredTextureFormat)(THIS_ DWORD BitDepths, DWORD flags, LPDDPIXELFORMAT pDDPF) PURE; STDMETHOD(RenderStateChange)(THIS_ D3DRENDERSTATETYPE drsType, DWORD val, DWORD flags) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DVIEWPORT.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 0ac2b823b5f52dfd2dac4e8b362629ddb7c0e7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac2b823b5f52dfd2dac4e8b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:18 2012 +0100 d3drm: Avoid LPDIRECT3DVIEWPORT. --- dlls/d3drm/viewport.c | 8 ++++---- include/d3drmobj.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index fb93dc6..75eb225 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -448,8 +448,8 @@ static D3DRMPROJECTIONTYPE WINAPI IDirect3DRMViewportImpl_GetProjection(IDirect3 return IDirect3DRMViewport2_GetProjection(&This->IDirect3DRMViewport2_iface); } -static HRESULT WINAPI IDirect3DRMViewportImpl_GetDirect3DViewport(IDirect3DRMViewport* iface, - LPDIRECT3DVIEWPORT * viewport) +static HRESULT WINAPI IDirect3DRMViewportImpl_GetDirect3DViewport(IDirect3DRMViewport *iface, + IDirect3DViewport **viewport) { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); @@ -883,8 +883,8 @@ static D3DRMPROJECTIONTYPE WINAPI IDirect3DRMViewport2Impl_GetProjection(IDirect return This->projection; } -static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDirect3DViewport(IDirect3DRMViewport2* iface, - LPDIRECT3DVIEWPORT * viewport) +static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDirect3DViewport(IDirect3DRMViewport2 *iface, + IDirect3DViewport **viewport) { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 3bafd9d..2265b56 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -835,7 +835,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) STDMETHOD_(D3DVALUE, GetBack)(THIS) PURE; STDMETHOD_(D3DVALUE, GetFront)(THIS) PURE; STDMETHOD_(D3DRMPROJECTIONTYPE, GetProjection)(THIS) PURE; - STDMETHOD(GetDirect3DViewport)(THIS_ LPDIRECT3DVIEWPORT *) PURE; + STDMETHOD(GetDirect3DViewport)(THIS_ IDirect3DViewport **viewport) PURE; }; #undef INTERFACE @@ -975,7 +975,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD_(D3DVALUE, GetBack)(THIS) PURE; STDMETHOD_(D3DVALUE, GetFront)(THIS) PURE; STDMETHOD_(D3DRMPROJECTIONTYPE, GetProjection)(THIS) PURE; - STDMETHOD(GetDirect3DViewport)(THIS_ LPDIRECT3DVIEWPORT *) PURE; + STDMETHOD(GetDirect3DViewport)(THIS_ IDirect3DViewport **viewport) PURE; STDMETHOD(TransformVectors)(THIS_ DWORD NumVectors, LPD3DRMVECTOR4D pDstVectors, LPD3DVECTOR pSrcVectors) PURE; STDMETHOD(InverseTransformVectors)(THIS_ DWORD NumVectors, LPD3DVECTOR pDstVectors,

1 0

Andrew Talbot : cryptui: Remove unused variable.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: e21b7bbaf1dc4f6bfcc98e5cd85926f5d667d985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21b7bbaf1dc4f6bfcc98e5cd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:58:04 2012 +0000 cryptui: Remove unused variable. --- dlls/cryptui/main.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 387b6c6..3835573 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1804,7 +1804,6 @@ static void add_icon_to_control(HWND hwnd, int id) DWORD conn; LPDATAOBJECT dataObject = NULL; HBITMAP bitmap = NULL; - RECT rect; STGMEDIUM stgm; LPOLECLIENTSITE clientSite = NULL; REOBJECT reObject; @@ -1843,9 +1842,6 @@ static void add_icon_to_control(HWND hwnd, int id) LR_DEFAULTSIZE | LR_LOADTRANSPARENT); if (!bitmap) goto end; - rect.left = rect.top = 0; - rect.right = GetSystemMetrics(SM_CXICON); - rect.bottom = GetSystemMetrics(SM_CYICON); stgm.tymed = TYMED_GDI; stgm.u.hBitmap = bitmap; stgm.pUnkForRelease = NULL;

1 0

Andrew Talbot : d3d8: Remove unused variable.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 1cd505cb8168bf74a3eeb354478948edefa57983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd505cb8168bf74a3eeb3544… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:58:10 2012 +0000 d3d8: Remove unused variable. --- dlls/d3d8/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b4bd3f9..d1dcd02 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -545,13 +545,12 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_swapchain_desc desc; struct d3d8_swapchain *object; - HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); - if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) + if (SUCCEEDED(d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc);

1 0

Andrew Talbot : d3d10core: Remove unused variables.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 608be1715b0313002c04c9d0fe78e1dc4bdb67f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=608be1715b0313002c04c9d0f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:58:16 2012 +0000 d3d10core: Remove unused variables. --- dlls/d3d10core/view.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index b36f9d7..98ba776 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -48,7 +48,6 @@ static struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *r static HRESULT set_dsdesc_from_resource(D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; - HRESULT hr; ID3D10Resource_GetType(resource, &dimension); @@ -59,7 +58,7 @@ static HRESULT set_dsdesc_from_resource(D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3 D3D10_TEXTURE1D_DESC texture_desc; ID3D10Texture1D *texture; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) { ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); return E_INVALIDARG; @@ -90,7 +89,7 @@ static HRESULT set_dsdesc_from_resource(D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3 D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) { ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); return E_INVALIDARG; @@ -262,7 +261,6 @@ static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3 static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; - HRESULT hr; ID3D10Resource_GetType(resource, &dimension); @@ -273,7 +271,7 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I D3D10_TEXTURE1D_DESC texture_desc; ID3D10Texture1D *texture; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) { ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); return E_INVALIDARG; @@ -306,7 +304,7 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) { ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); return E_INVALIDARG; @@ -355,7 +353,7 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I D3D10_TEXTURE3D_DESC texture_desc; ID3D10Texture3D *texture; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture))) + if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture))) { ERR("Resource of type TEXTURE3D doesn't implement ID3D10Texture3D.\n"); return E_INVALIDARG;

1 0

Andrew Talbot : ddraw: Remove unused variable.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 9c3722ec4050f3034baafb8f97ba8a44888273f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c3722ec4050f3034baafb8f9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:58:23 2012 +0000 ddraw: Remove unused variable. --- dlls/ddraw/ddraw.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 14fc73d..e4e50df 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5168,7 +5168,6 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic struct ddraw *ddraw = ddraw_from_device_parent(device_parent); MONITORINFO monitor_info; HMONITOR monitor; - BOOL ret; RECT *r; TRACE("device_parent %p.\n", device_parent); @@ -5181,7 +5180,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic monitor = MonitorFromWindow(ddraw->swapchain_window, MONITOR_DEFAULTTOPRIMARY); monitor_info.cbSize = sizeof(monitor_info); - if (!(ret = GetMonitorInfoW(monitor, &monitor_info))) + if (!GetMonitorInfoW(monitor, &monitor_info)) { ERR("Failed to get monitor info.\n"); return; @@ -5190,8 +5189,8 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic r = &monitor_info.rcMonitor; TRACE("Resizing window %p to %s.\n", ddraw->swapchain_window, wine_dbgstr_rect(r)); - if (!(ret = SetWindowPos(ddraw->swapchain_window, HWND_TOP, r->left, r->top, - r->right - r->left, r->bottom - r->top, SWP_SHOWWINDOW | SWP_NOACTIVATE))) + if (!SetWindowPos(ddraw->swapchain_window, HWND_TOP, r->left, r->top, + r->right - r->left, r->bottom - r->top, SWP_SHOWWINDOW | SWP_NOACTIVATE)) ERR("Failed to resize window.\n"); }

1 0

Andrew Talbot : hhctrl.ocx: Remove unused variable.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 9e01b1752ac4d94444c34a6486d9f3ed6fcbf8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e01b1752ac4d94444c34a648… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:58:28 2012 +0000 hhctrl.ocx: Remove unused variable. --- dlls/hhctrl.ocx/help.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 38446dc..f6155c7 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -266,7 +266,6 @@ static void DoSync(HHInfo *info) { WCHAR buf[INTERNET_MAX_URL_LENGTH]; HRESULT hres; - DWORD len; BSTR url; hres = IWebBrowser2_get_LocationURL(info->web_browser, &url); @@ -278,7 +277,7 @@ static void DoSync(HHInfo *info) } /* If we're not currently viewing a page in the active .chm file, abort */ - if ((!AppendFullPathURL(info->WinType.pszFile, buf, NULL)) || (len = lstrlenW(buf) > lstrlenW(url))) + if ((!AppendFullPathURL(info->WinType.pszFile, buf, NULL)) || (lstrlenW(buf) > lstrlenW(url))) { SysFreeString(url); return;

1 0

Aric Stewart : wineqtdecoder: Properly clean up splitter and loader threads on QTSplitter destruction.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 2a4cab537531104c59e42f48444985dc0f9d5eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a4cab537531104c59e42f484… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 20 08:08:36 2012 -0600 wineqtdecoder: Properly clean up splitter and loader threads on QTSplitter destruction. --- dlls/wineqtdecoder/qtsplitter.c | 56 +++++++++++++++++++++++++++++--------- 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index b584198..a3cd91f 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -168,6 +168,9 @@ typedef struct QTSplitter { TimeValue movie_time; TimeValue movie_start; TimeScale movie_scale; + + HANDLE loaderThread; + HANDLE splitterThread; } QTSplitter; static const IPinVtbl QT_OutputPin_Vtbl; @@ -293,6 +296,7 @@ static void QT_Destroy(QTSplitter *This) TRACE("Destroying\n"); + EnterCriticalSection(&This->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ IPin_ConnectedTo(&This->pInputPin.pin.IPin_iface, &connected); if (connected) @@ -311,14 +315,31 @@ static void QT_Destroy(QTSplitter *This) } if (This->pQTMovie) + { DisposeMovie(This->pQTMovie); + This->pQTMovie = NULL; + } if (This->vContext) QTVisualContextRelease(This->vContext); if (This->aSession) MovieAudioExtractionEnd(This->aSession); - CloseHandle(This->runEvent); ExitMovies(); + LeaveCriticalSection(&This->csReceive); + + if (This->loaderThread) + { + WaitForSingleObject(This->loaderThread, INFINITE); + CloseHandle(This->loaderThread); + } + if (This->splitterThread) + { + SetEvent(This->runEvent); + WaitForSingleObject(This->splitterThread, INFINITE); + CloseHandle(This->splitterThread); + } + + CloseHandle(This->runEvent); This->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csReceive); @@ -495,13 +516,15 @@ static DWORD WINAPI QTSplitter_loading_thread(LPVOID data) to try to minimize that. */ - while(GetMovieLoadState(This->pQTMovie) < kMovieLoadStateComplete) + EnterCriticalSection(&This->csReceive); + while(This->pQTMovie && GetMovieLoadState(This->pQTMovie) < kMovieLoadStateComplete) { - EnterCriticalSection(&This->csReceive); MoviesTask(This->pQTMovie, 100); LeaveCriticalSection(&This->csReceive); Sleep(0); + EnterCriticalSection(&This->csReceive); } + LeaveCriticalSection(&This->csReceive); } return 0; } @@ -518,6 +541,12 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) WaitForSingleObject(This->runEvent, -1); EnterCriticalSection(&This->csReceive); + if (!This->pQTMovie) + { + LeaveCriticalSection(&This->csReceive); + return 0; + } + This->state = State_Running; /* Prime the pump: Needed for MPEG streams */ GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); @@ -536,6 +565,12 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) float time; EnterCriticalSection(&This->csReceive); + if (!This->pQTMovie) + { + LeaveCriticalSection(&This->csReceive); + return 0; + } + GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); if (next_time == -1) @@ -992,7 +1027,6 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) Track trk; short id = 0; DWORD tid; - HANDLE thread; LONGLONG time; TRACE("Trying movie connect\n"); @@ -1039,18 +1073,12 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) TRACE("Movie duration is %s\n",wine_dbgstr_longlong(filter->sourceSeeking.llDuration)); - thread = CreateThread(NULL, 0, QTSplitter_loading_thread, filter, 0, &tid); - if (thread) - { + filter->loaderThread = CreateThread(NULL, 0, QTSplitter_loading_thread, filter, 0, &tid); + if (filter->loaderThread) TRACE("Created loading thread 0x%08x\n", tid); - CloseHandle(thread); - } - thread = CreateThread(NULL, 0, QTSplitter_thread, filter, 0, &tid); - if (thread) - { + filter->splitterThread = CreateThread(NULL, 0, QTSplitter_thread, filter, 0, &tid); + if (filter->splitterThread) TRACE("Created processing thread 0x%08x\n", tid); - CloseHandle(thread); - } else hr = HRESULT_FROM_WIN32(GetLastError());

1 0

Jacek Caban : mshtml: Use stdint.h type names in nsiface.idl.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 96ace8636a307e30144df074c6906bb978ffbf73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ace8636a307e30144df074c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 15:29:21 2012 +0100 mshtml: Use stdint.h type names in nsiface.idl. Gecko uses stdint.h types instead of NSPR types for most of the codebase now. --- dlls/mshtml/nsiface.idl | 934 ++++++++++++++++++++++++----------------------- 1 files changed, 475 insertions(+), 459 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96ace8636a307e30144df…

1 0

Michael Stefaniuc : comdlg32/tests: Fix the prototype of callback functions .
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 098fd250095f6ac6f540336e2adcb4bfff47be93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098fd250095f6ac6f540336e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 20 13:35:05 2012 +0100 comdlg32/tests: Fix the prototype of callback functions. --- dlls/comdlg32/tests/filedlg.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index b701956..9ae4e66 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -239,7 +239,7 @@ cleanup: return 0; } -static LONG_PTR WINAPI template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_INITDIALOG) { @@ -286,7 +286,7 @@ static void test_create_view_template(void) ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; - ofn.lpfnHook = (LPOFNHOOKPROC)template_hook; + ofn.lpfnHook = template_hook; ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE; ofn.hInstance = GetModuleHandleA(NULL); ofn.lpTemplateName = "template1"; @@ -318,7 +318,7 @@ static const struct { { 0xffffffff } }; -static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { static RECT initrc, rc; static int index, count; @@ -538,7 +538,7 @@ static void test_resize(void) ofn.lpstrFile = filename; ofn.nMaxFile = 1024; - ofn.lpfnHook = (LPOFNHOOKPROC) resize_template_hook; + ofn.lpfnHook = resize_template_hook; ofn.hInstance = GetModuleHandle(NULL); ofn.lpTemplateName = "template_sz"; for( i = 0; resize_testcases[i].flags != 0xffffffff; i++) { @@ -581,7 +581,7 @@ static ok_wndproc_testcase ok_testcases[] = { /* test_ok_wndproc can be used as hook procedure or a subclass * window proc for the file dialog */ -static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { HWND parent = GetParent( dlg); static ok_wndproc_testcase *testcase = NULL; @@ -624,7 +624,7 @@ static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM return FALSE; } -static LONG_PTR WINAPI ok_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI ok_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_SETFONT) SetWindowLongPtrA( dlg, GWLP_WNDPROC, (LONG_PTR) test_ok_wndproc); @@ -655,9 +655,7 @@ static void test_ok(void) for( i = 0; ok_testcases[i].retval != -1; i++) { strcpy( filename, tmpfilename); ofn.lCustData = (LPARAM)(ok_testcases + i); - ofn.lpfnHook = ok_testcases[i].do_subclass - ? (LPOFNHOOKPROC) ok_template_hook - : (LPOFNHOOKPROC) test_ok_wndproc; + ofn.lpfnHook = ok_testcases[i].do_subclass ? ok_template_hook : test_ok_wndproc; ret = GetOpenFileNameA(&ofn); ok( ok_testcases[i].expclose == ok_testcases[i].actclose, "testid %d: Open File dialog should %shave closed.\n", i, @@ -706,7 +704,7 @@ static struct { { -1 } }; -static LONG_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wParam, LPARAM lParam) { static int index, fixhelp; static posz posz0[2]; @@ -846,7 +844,7 @@ static void test_arrange(void) ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; - ofn.lpfnHook = (LPOFNHOOKPROC)template_hook_arrange; + ofn.lpfnHook = template_hook_arrange; ofn.hInstance = hDlgTmpl; ofn.lpstrFilter="text\0*.txt\0All\0*\0\0"; for( i = 0; arrange_tests[i].nrcontrols != -1; i++) { @@ -996,7 +994,7 @@ static void test_mru(void) ofn.hInstance = GetModuleHandle(NULL); ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_NOCHANGEDIR; ofn.lCustData = (LPARAM)&testcase; - ofn.lpfnHook = (LPOFNHOOKPROC)test_ok_wndproc; + ofn.lpfnHook = test_ok_wndproc; SetLastError(0xdeadbeef); ret = CreateDirectoryA(test_dir_name, NULL);

1 0

Michael Stefaniuc : shell32: Use the proper type for a function pointer field.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 0705793eb0abf9e716dfd7407dda1348bbf32484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0705793eb0abf9e716dfd7407… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 20 13:13:18 2012 +0100 shell32: Use the proper type for a function pointer field. --- dlls/shell32/shellord.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 7f329de..c1fb382 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -60,7 +60,7 @@ typedef struct tagCREATEMRULIST DWORD dwFlags; /* see below */ HKEY hKey; /* root reg. key under which list is saved */ LPCSTR lpszSubKey; /* reg. subkey */ - PROC lpfnCompare; /* item compare proc */ + int (CALLBACK *lpfnCompare)(LPCVOID, LPCVOID, DWORD); /* item compare proc */ } CREATEMRULISTA, *LPCREATEMRULISTA; /* dwFlags */ @@ -927,7 +927,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) mymru.dwFlags = MRUF_BINARY_LIST | MRUF_DELAYED_SAVE; mymru.hKey = HCUbasekey; mymru.lpszSubKey = "RecentDocs"; - mymru.lpfnCompare = (PROC)SHADD_compare_mru; + mymru.lpfnCompare = SHADD_compare_mru; mruhandle = CreateMRUListA(&mymru); if (!mruhandle) { /* MRU failed */

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012