wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Jacek Caban : atl80: Share registrar.c with atl100.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 62cc1da580250265a9083af4c21cfec1ae2f7419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62cc1da580250265a9083af4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 10:25:10 2014 +0100 atl80: Share registrar.c with atl100. --- dlls/atl80/Makefile.in | 5 +++-- dlls/atl80/atl80.spec | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index e05e197..cbd10ec 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,12 +1,13 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_80 PARENTSRC = ../atl100 C_SRCS = \ atl.c \ atl80.c \ - atl_ax.c + atl_ax.c \ + registrar.c RC_SRCS = atl80.rc diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 88d74ed..fb5fae8 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -9,7 +9,7 @@ 19 stdcall AtlRegisterTypeLib(ptr wstr) 20 stdcall AtlComModuleRevokeClassObjects(ptr) 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) -23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) @@ -45,7 +45,7 @@ 58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr)

1 0

Jacek Caban : atl80: Share atl.c with atl100.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 61051202a184280a15acb32e4615d3c0609f745d URL: http://source.winehq.org/git/wine.git/?a=commit;h=61051202a184280a15acb32e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 10:24:44 2014 +0100 atl80: Share atl.c with atl100. --- dlls/atl100/atl.c | 4 ++++ dlls/atl80/Makefile.in | 3 ++- dlls/atl80/atl80.c | 9 -------- dlls/atl80/atl80.spec | 54 ++++++++++++++++++++++++------------------------ 4 files changed, 33 insertions(+), 37 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 058fa22..82412b7 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -781,6 +781,8 @@ HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown *unk, GUID *libid, IID *iid, return hres; } +#if _ATL_VER >= _ATL_VER90 + /*********************************************************************** * AtlSetPerUserRegistration [atl100.67] */ @@ -800,6 +802,8 @@ HRESULT WINAPI AtlGetPerUserRegistration(cpp_bool *pbEnabled) return S_OK; } +#endif + /*********************************************************************** * AtlGetVersion [atl100.@] */ diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 65f8055..e05e197 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,10 +1,11 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = atl100 oleaut32 user32 ole32 uuid +IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_80 PARENTSRC = ../atl100 C_SRCS = \ + atl.c \ atl80.c \ atl_ax.c diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index d39819a..b6aedda 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -89,12 +89,3 @@ HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index) SysFreeString(path); return hres; } - -/*********************************************************************** - * AtlGetVersion [atl80.@] - */ -DWORD WINAPI AtlGetVersion(void *pReserved) -{ - TRACE("version %04x (%p)\n", _ATL_VER, pReserved); - return _ATL_VER; -} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index a595681..88d74ed 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -1,24 +1,24 @@ -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 AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject -17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects +10 stdcall AtlAdvise(ptr ptr ptr ptr) +11 stdcall AtlUnadvise(ptr ptr long) +12 stdcall AtlFreeMarshalStream(ptr) +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) 18 stdcall AtlComModuleRegisterServer(ptr long ptr) 19 stdcall AtlRegisterTypeLib(ptr wstr) -20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects -22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer +20 stdcall AtlComModuleRevokeClassObjects(ptr) +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD -24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +26 stdcall AtlCreateTargetDC(long ptr) +27 stdcall AtlHiMetricToPixel(ptr ptr) +28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign -31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign -32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +30 stdcall AtlComPtrAssign(ptr ptr) +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) 35 stdcall AtlAxDialogBoxW(long wstr long ptr long) 36 stdcall AtlAxDialogBoxA(long str long ptr long) @@ -28,26 +28,26 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() -43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData -44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) +44 stdcall AtlWinModuleExtractCreateWndData(ptr) 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper -50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load -51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) 53 stub AtlIPersistPropertyBag_Save -54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 55 stub AtlUnRegisterTypeLib -56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib -58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) +58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx 61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA -64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc -65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +64 stdcall AtlCallTermFunc(ptr) +65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm

1 0

Jacek Caban : atl110: Share atl_ax.c with atl100.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: a9a3e3957d56685aa4eeb45ef1568ef6ea8770fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a3e3957d56685aa4eeb45ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 14:49:37 2014 +0100 atl110: Share atl_ax.c with atl100. --- dlls/atl100/atl_ax.c | 2 ++ dlls/atl110/Makefile.in | 7 +++++-- dlls/atl110/atl110.c | 53 ----------------------------------------------- dlls/atl110/atl110.spec | 18 ++++++++-------- 4 files changed, 16 insertions(+), 64 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index be0b836..be52917 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -93,6 +93,8 @@ BOOL WINAPI AtlAxWinInit(void) #define ATL_NAME_SUFFIX '9','0',0 #elif _ATL_VER == _ATL_VER_100 #define ATL_NAME_SUFFIX '1','0','0',0 +#elif _ATL_VER == _ATL_VER_110 +#define ATL_NAME_SUFFIX '1','1','0',0 #else #error Unsupported version #endif diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index 8160d64..e8d340f 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -1,5 +1,8 @@ MODULE = atl110.dll -IMPORTS = atl100 ole32 user32 +IMPORTS = atl100 oleaut32 ole32 user32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_110 +PARENTSRC = ../atl100 -C_SRCS = atl110.c +C_SRCS = \ + atl110.c \ + atl_ax.c diff --git a/dlls/atl110/atl110.c b/dlls/atl110/atl110.c index 707b43b..9386812 100644 --- a/dlls/atl110/atl110.c +++ b/dlls/atl110/atl110.c @@ -40,56 +40,3 @@ DWORD WINAPI AtlGetVersion(void *pReserved) TRACE("version %04x (%p)\n", _ATL_VER, pReserved); return _ATL_VER; } - -/********************************************************************** - * AtlAxWin class window procedure - */ -static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) -{ - if ( wMsg == WM_CREATE ) - { - DWORD len = GetWindowTextLengthW( hWnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - if (!ptr) - return 1; - GetWindowTextW( hWnd, ptr, len ); - AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); - return 0; - } - return DefWindowProcW( hWnd, wMsg, wParam, lParam ); -} - -BOOL WINAPI AtlAxWinInit(void) -{ - WNDCLASSEXW wcex; - const WCHAR AtlAxWin110[] = {'A','t','l','A','x','W','i','n','1','1','0',0}; - const WCHAR AtlAxWinLic110[] = {'A','t','l','A','x','W','i','n','L','i','c','1','1','0',0}; - - FIXME("version %04x semi-stub\n", _ATL_VER); - - if ( FAILED( OleInitialize(NULL) ) ) - return FALSE; - - wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = GetModuleHandleW( NULL ); - wcex.hIcon = NULL; - wcex.hCursor = NULL; - wcex.hbrBackground = NULL; - wcex.lpszMenuName = NULL; - wcex.hIconSm = 0; - - wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin110; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - wcex.lpszClassName = AtlAxWinLic110; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - return TRUE; -} diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec index 045969e..35facf8 100644 --- a/dlls/atl110/atl110.spec +++ b/dlls/atl110/atl110.spec @@ -18,20 +18,20 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW -36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA -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 +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) +38 stdcall AtlAxCreateDialogA(long str long ptr long) +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) +41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData 44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA -47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +47 stdcall AtlAxGetControl(long ptr) +48 stdcall AtlAxGetHost(long ptr) 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save

1 0

Nikolay Sivov : oleaut32: Remove useless NULL checks.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: cb74cd3e48aa01ac36156a97fab08f6ff113422e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb74cd3e48aa01ac36156a97f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 08:19:53 2014 +0400 oleaut32: Remove useless NULL checks. --- dlls/oleaut32/dispatch.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index f743bcb..a666d3d 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -226,13 +226,15 @@ static HRESULT WINAPI StdDispatch_QueryInterface( void** ppvObject) { StdDispatch *This = impl_from_IDispatch(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); + + *ppvObject = NULL; if (IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { - *ppvObject = This; - IUnknown_AddRef((LPUNKNOWN)*ppvObject); + *ppvObject = iface; + IDispatch_AddRef(iface); return S_OK; } return E_NOINTERFACE; @@ -293,10 +295,8 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface) */ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pctinfo) { - StdDispatch *This = impl_from_IDispatch(iface); TRACE("(%p)\n", pctinfo); - - *pctinfo = This->pTypeInfo ? 1 : 0; + *pctinfo = 1; return S_OK; } @@ -327,11 +327,9 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI if (iTInfo != 0) return DISP_E_BADINDEX; - if (This->pTypeInfo) - { - *ppTInfo = This->pTypeInfo; - ITypeInfo_AddRef(*ppTInfo); - } + *ppTInfo = This->pTypeInfo; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; }

1 0

Nikolay Sivov : oleaut32: Fix parameter validation in CreateStdDispatch().
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: e9debeb642cd193a1aaea6b96eef85816a9f6463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9debeb642cd193a1aaea6b96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 08:19:33 2014 +0400 oleaut32: Fix parameter validation in CreateStdDispatch(). --- dlls/oleaut32/dispatch.c | 65 ++++++++++++++++--------------------- dlls/oleaut32/tests/dispatch.c | 70 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 37 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 760f8aa..f743bcb 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static IDispatch * StdDispatch_Construct(IUnknown * punkOuter, void * pvThis, ITypeInfo * pTypeInfo); - /****************************************************************************** * DispInvoke (OLEAUT32.30) * @@ -169,32 +167,6 @@ done: return hr; } -/****************************************************************************** - * CreateStdDispatch [OLEAUT32.32] - * - * Create and return a standard IDispatch object. - * - * RETURNS - * Success: S_OK. ppunkStdDisp contains the new object. - * Failure: An HRESULT error code. - * - * NOTES - * Outer unknown appears to be completely ignored. - */ -HRESULT WINAPI CreateStdDispatch( - IUnknown* punkOuter, - void* pvThis, - ITypeInfo* ptinfo, - IUnknown** ppunkStdDisp) -{ - TRACE("(%p, %p, %p, %p)\n", punkOuter, pvThis, ptinfo, ppunkStdDisp); - - *ppunkStdDisp = (LPUNKNOWN)StdDispatch_Construct(punkOuter, pvThis, ptinfo); - if (!*ppunkStdDisp) - return E_OUTOFMEMORY; - return S_OK; -} - /****************************************************************************** * IDispatch {OLEAUT32} @@ -451,25 +423,44 @@ static const IDispatchVtbl StdDispatch_VTable = StdDispatch_Invoke }; -static IDispatch * StdDispatch_Construct( - IUnknown * punkOuter, - void * pvThis, - ITypeInfo * pTypeInfo) +/****************************************************************************** + * CreateStdDispatch [OLEAUT32.32] + * + * Create and return a standard IDispatch object. + * + * RETURNS + * Success: S_OK. ppunkStdDisp contains the new object. + * Failure: An HRESULT error code. + * + * NOTES + * Outer unknown appears to be completely ignored. + */ +HRESULT WINAPI CreateStdDispatch( + IUnknown* punkOuter, + void* pvThis, + ITypeInfo* ptinfo, + IUnknown** stddisp) { - StdDispatch * pStdDispatch; + StdDispatch *pStdDispatch; + + TRACE("(%p, %p, %p, %p)\n", punkOuter, pvThis, ptinfo, stddisp); + + if (!pvThis || !ptinfo || !stddisp) + return E_INVALIDARG; pStdDispatch = CoTaskMemAlloc(sizeof(StdDispatch)); if (!pStdDispatch) - return &pStdDispatch->IDispatch_iface; + return E_OUTOFMEMORY; pStdDispatch->IDispatch_iface.lpVtbl = &StdDispatch_VTable; pStdDispatch->pvThis = pvThis; - pStdDispatch->pTypeInfo = pTypeInfo; + pStdDispatch->pTypeInfo = ptinfo; pStdDispatch->ref = 1; /* we keep a reference to the type info so prevent it from * being destroyed until we are done with it */ - ITypeInfo_AddRef(pTypeInfo); + ITypeInfo_AddRef(ptinfo); + *stddisp = (IUnknown*)&pStdDispatch->IDispatch_iface; - return &pStdDispatch->IDispatch_iface; + return S_OK; } diff --git a/dlls/oleaut32/tests/dispatch.c b/dlls/oleaut32/tests/dispatch.c index 0f52241..ff63a7d 100644 --- a/dlls/oleaut32/tests/dispatch.c +++ b/dlls/oleaut32/tests/dispatch.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#define CONST_VTABLE + #include <wine/test.h> #include <windef.h> #include <winbase.h> @@ -267,7 +270,74 @@ static void test_DispGetParam(void) VariantClear(&result); } +static HRESULT WINAPI unk_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + else + { + *obj = NULL; + return E_NOINTERFACE; + } +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl unkvtbl = +{ + unk_QI, + unk_AddRef, + unk_Release +}; + +static IUnknown test_unk = { &unkvtbl }; + +static void test_CreateStdDispatch(void) +{ + static const WCHAR stdole2W[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; + ITypeLib *tl; + ITypeInfo *ti; + IUnknown *unk; + HRESULT hr; + + hr = CreateStdDispatch(NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CreateStdDispatch(NULL, NULL, NULL, &unk); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = LoadTypeLib(stdole2W, &tl); + ok(hr == S_OK, "got %08x\n", hr); + hr = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IUnknown, &ti); + ok(hr == S_OK, "got %08x\n", hr); + ITypeLib_Release(tl); + + hr = CreateStdDispatch(NULL, &test_unk, NULL, &unk); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = CreateStdDispatch(NULL, NULL, ti, &unk); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = CreateStdDispatch(NULL, &test_unk, ti, &unk); + ok(hr == S_OK, "got %08x\n", hr); + IUnknown_Release(unk); + + ITypeInfo_Release(ti); +} + START_TEST(dispatch) { test_DispGetParam(); + test_CreateStdDispatch(); }

1 0

Michael Stefaniuc : dmstyle: Remove the extraneous IUnknown from DirectMusicStyle8.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 97428376efb03aa0ff5d5c668c63953edb9b2219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97428376efb03aa0ff5d5c668… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 28 23:19:07 2014 +0100 dmstyle: Remove the extraneous IUnknown from DirectMusicStyle8. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmstyle/dmstyle_private.h | 2 - dlls/dmstyle/style.c | 124 ++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 76 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 3ecb95c..bae61a0 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -103,8 +103,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { * IDirectMusicStyle8Impl implementation structure */ struct IDirectMusicStyle8Impl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; IDirectMusicStyle8 IDirectMusicStyle8_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index dc0e1cf..2945e5d 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -31,84 +31,56 @@ static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicS return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, IDirectMusicStyle8_iface); } -/* IDirectMusicStyleImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID(riid, &IID_IDirectMusicStyle) || - IsEqualIID(riid, &IID_IDirectMusicStyle8)) { - *ppobj = &This->IDirectMusicStyle8_iface; - IDirectMusicStyle8_AddRef(&This->IDirectMusicStyle8_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IDirectMusicObject_AddRef((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IPersistStream_AddRef((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicStyle8Impl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMSTYLE_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicStyle8Impl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); +/* DirectMusicStyle8Impl IDirectMusicStyle8 part: */ +static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, + void **ret_iface) +{ + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMSTYLE_UnlockModule(); - - return ref; -} + *ret_iface = NULL; -static const IUnknownVtbl DirectMusicStyle8_Unknown_Vtbl = { - IDirectMusicStyle8Impl_IUnknown_QueryInterface, - IDirectMusicStyle8Impl_IUnknown_AddRef, - IDirectMusicStyle8Impl_IUnknown_Release -}; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicStyle) || + IsEqualIID(riid, &IID_IDirectMusicStyle8)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } -/* IDirectMusicStyle8Impl IDirectMusicStyle8 part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, - void **ppobj) -{ - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - return IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - return IDirectMusicStyle8Impl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->pDesc); + HeapFree(GetProcessHeap(), 0, This); + DMSTYLE_UnlockModule(); + } + + return ref; } /* IDirectMusicStyle8Impl IDirectMusicStyle(8) part: */ @@ -228,17 +200,17 @@ static const IDirectMusicStyle8Vtbl dmstyle8_vtbl = { /* IDirectMusicStyle8Impl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, ObjectVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicStyle8_QueryInterface(&This->IDirectMusicStyle8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, ObjectVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicStyle8_AddRef(&This->IDirectMusicStyle8_iface); } static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, ObjectVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicStyle8_Release(&This->IDirectMusicStyle8_iface); } static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -443,17 +415,17 @@ static const IDirectMusicObjectVtbl DirectMusicStyle8_Object_Vtbl = { /* IDirectMusicStyle8Impl IPersistStream part: */ static HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicStyle8_QueryInterface(&This->IDirectMusicStyle8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicStyle8Impl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicStyle8_AddRef(&This->IDirectMusicStyle8_iface); } static ULONG WINAPI IDirectMusicStyle8Impl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicStyle8_Release(&This->IDirectMusicStyle8_iface); } static HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -1113,13 +1085,13 @@ static const IPersistStreamVtbl DirectMusicStyle8_PersistStream_Vtbl = { HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) { IDirectMusicStyle8Impl* obj; - + HRESULT hr; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyle8Impl)); if (NULL == obj) { *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicStyle8_Unknown_Vtbl; obj->IDirectMusicStyle8_iface.lpVtbl = &dmstyle8_vtbl; obj->ObjectVtbl = &DirectMusicStyle8_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicStyle8_PersistStream_Vtbl; @@ -1127,9 +1099,13 @@ HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicStyle; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; list_init (&obj->Bands); list_init (&obj->Motifs); - return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + DMSTYLE_LockModule(); + hr = IDirectMusicStyle8_QueryInterface(&obj->IDirectMusicStyle8_iface, lpcGUID, ppobj); + IDirectMusicStyle8_Release(&obj->IDirectMusicStyle8_iface); + + return hr; }

1 0

Michael Stefaniuc : dmstyle: COM cleanup for IDirectMusicStyle8.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 8e6a15ffd78501884023be6d154812075b3c7e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6a15ffd78501884023be6d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 28 23:16:19 2014 +0100 dmstyle: COM cleanup for IDirectMusicStyle8. --- dlls/dmstyle/dmstyle_private.h | 2 +- dlls/dmstyle/style.c | 43 ++++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 7ac9fac..3ecb95c 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -105,7 +105,7 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { struct IDirectMusicStyle8Impl { /* IUnknown fields */ const IUnknownVtbl *UnknownVtbl; - const IDirectMusicStyle8Vtbl *StyleVtbl; + IDirectMusicStyle8 IDirectMusicStyle8_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index c1c2a7b..dc0e1cf 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -26,6 +26,11 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicStyleImpl implementation */ +static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicStyle8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, IDirectMusicStyle8_iface); +} + /* IDirectMusicStyleImpl IUnknown part: */ static HRESULT WINAPI IDirectMusicStyle8Impl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, UnknownVtbl, iface); @@ -37,8 +42,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IUnknown_QueryInterface (LPUNKNOWN return S_OK; } else if (IsEqualIID(riid, &IID_IDirectMusicStyle) || IsEqualIID(riid, &IID_IDirectMusicStyle8)) { - *ppobj = &This->StyleVtbl; - IDirectMusicStyle8_AddRef((LPDIRECTMUSICSTYLE8)&This->StyleVtbl); + *ppobj = &This->IDirectMusicStyle8_iface; + IDirectMusicStyle8_AddRef(&This->IDirectMusicStyle8_iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; @@ -90,19 +95,19 @@ static const IUnknownVtbl DirectMusicStyle8_Unknown_Vtbl = { static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); return IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); return IDirectMusicStyle8Impl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } @@ -110,7 +115,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, WCHAR *pwszName, IDirectMusicBand **ppBand) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppBand); return S_OK; } @@ -118,7 +123,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, DWORD dwIndex, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -126,7 +131,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, IDirectMusicBand **ppBand) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p): stub\n", This, ppBand); return S_OK; } @@ -134,7 +139,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 * static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD dwIndex, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -142,7 +147,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName, IDirectMusicSegment **ppSegment) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppSegment); return S_OK; } @@ -150,7 +155,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyle8 *iface, IDirectMusicChordMap **ppChordMap) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p): stub\n", This, ppChordMap); return S_OK; } @@ -158,7 +163,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyl static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *iface, DWORD dwIndex, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -166,7 +171,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *if static HRESULT WINAPI IDirectMusicStyle8Impl_GetChordMap(IDirectMusicStyle8 *iface, WCHAR *pwszName, IDirectMusicChordMap **ppChordMap) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppChordMap); return S_OK; } @@ -174,7 +179,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetChordMap(IDirectMusicStyle8 *ifa static HRESULT WINAPI IDirectMusicStyle8Impl_GetTimeSignature(IDirectMusicStyle8 *iface, DMUS_TIMESIGNATURE *pTimeSig) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p): stub\n", This, pTimeSig); return S_OK; } @@ -182,14 +187,14 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetTimeSignature(IDirectMusicStyle8 static HRESULT WINAPI IDirectMusicStyle8Impl_GetEmbellishmentLength(IDirectMusicStyle8 *iface, DWORD dwType, DWORD dwLevel, DWORD *pdwMin, DWORD *pdwMax) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %d, %d, %p, %p): stub\n", This, dwType, dwLevel, pdwMin, pdwMax); return S_OK; } static HRESULT WINAPI IDirectMusicStyle8Impl_GetTempo(IDirectMusicStyle8 *iface, double *pTempo) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p): stub\n", This, pTempo); return S_OK; } @@ -197,12 +202,12 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetTempo(IDirectMusicStyle8 *iface, static HRESULT WINAPI IDirectMusicStyle8Impl_EnumPattern(IDirectMusicStyle8 *iface, DWORD dwIndex, DWORD dwPatternType, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %d, %d, %p): stub\n", This, dwIndex, dwPatternType, pwszName); return S_OK; } -static const IDirectMusicStyle8Vtbl DirectMusicStyle8_Style_Vtbl = { +static const IDirectMusicStyle8Vtbl dmstyle8_vtbl = { IDirectMusicStyle8Impl_QueryInterface, IDirectMusicStyle8Impl_AddRef, IDirectMusicStyle8Impl_Release, @@ -1115,7 +1120,7 @@ HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } obj->UnknownVtbl = &DirectMusicStyle8_Unknown_Vtbl; - obj->StyleVtbl = &DirectMusicStyle8_Style_Vtbl; + obj->IDirectMusicStyle8_iface.lpVtbl = &dmstyle8_vtbl; obj->ObjectVtbl = &DirectMusicStyle8_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicStyle8_PersistStream_Vtbl; obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));

1 0

Michael Stefaniuc : dmstyle: Remove the redundant "IDirectMusicStyle8" from method names.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 377002161067cd687d51bf58103cf322667de0c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=377002161067cd687d51bf581… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 28 23:15:03 2014 +0100 dmstyle: Remove the redundant "IDirectMusicStyle8" from method names. --- dlls/dmstyle/style.c | 87 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 7e27934..c1c2a7b 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -87,110 +87,137 @@ static const IUnknownVtbl DirectMusicStyle8_Unknown_Vtbl = { }; /* IDirectMusicStyle8Impl IDirectMusicStyle8 part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_QueryInterface (LPDIRECTMUSICSTYLE8 iface, REFIID riid, LPVOID *ppobj) { +static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, + void **ppobj) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } -static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef (LPDIRECTMUSICSTYLE8 iface) { +static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); return IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } -static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_Release (LPDIRECTMUSICSTYLE8 iface) { +static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); return IDirectMusicStyle8Impl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } /* IDirectMusicStyle8Impl IDirectMusicStyle(8) part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetBand (LPDIRECTMUSICSTYLE8 iface, WCHAR* pwszName, IDirectMusicBand** ppBand) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, WCHAR *pwszName, + IDirectMusicBand **ppBand) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppBand); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumBand (LPDIRECTMUSICSTYLE8 iface, DWORD dwIndex, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, DWORD dwIndex, + WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetDefaultBand (LPDIRECTMUSICSTYLE8 iface, IDirectMusicBand** ppBand) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, + IDirectMusicBand **ppBand) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p): stub\n", This, ppBand); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumMotif (LPDIRECTMUSICSTYLE8 iface, DWORD dwIndex, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD dwIndex, + WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetMotif (LPDIRECTMUSICSTYLE8 iface, WCHAR* pwszName, IDirectMusicSegment** ppSegment) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName, + IDirectMusicSegment **ppSegment) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppSegment); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetDefaultChordMap (LPDIRECTMUSICSTYLE8 iface, IDirectMusicChordMap** ppChordMap) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyle8 *iface, + IDirectMusicChordMap **ppChordMap) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p): stub\n", This, ppChordMap); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumChordMap (LPDIRECTMUSICSTYLE8 iface, DWORD dwIndex, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *iface, DWORD dwIndex, + WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetChordMap (LPDIRECTMUSICSTYLE8 iface, WCHAR* pwszName, IDirectMusicChordMap** ppChordMap) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetChordMap(IDirectMusicStyle8 *iface, WCHAR *pwszName, + IDirectMusicChordMap **ppChordMap) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppChordMap); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetTimeSignature (LPDIRECTMUSICSTYLE8 iface, DMUS_TIMESIGNATURE* pTimeSig) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetTimeSignature(IDirectMusicStyle8 *iface, + DMUS_TIMESIGNATURE *pTimeSig) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p): stub\n", This, pTimeSig); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetEmbellishmentLength (LPDIRECTMUSICSTYLE8 iface, DWORD dwType, DWORD dwLevel, DWORD* pdwMin, DWORD* pdwMax) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetEmbellishmentLength(IDirectMusicStyle8 *iface, + DWORD dwType, DWORD dwLevel, DWORD *pdwMin, DWORD *pdwMax) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %d, %d, %p, %p): stub\n", This, dwType, dwLevel, pdwMin, pdwMax); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetTempo (LPDIRECTMUSICSTYLE8 iface, double* pTempo) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetTempo(IDirectMusicStyle8 *iface, double *pTempo) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p): stub\n", This, pTempo); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumPattern (LPDIRECTMUSICSTYLE8 iface, DWORD dwIndex, DWORD dwPatternType, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumPattern(IDirectMusicStyle8 *iface, DWORD dwIndex, + DWORD dwPatternType, WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %d, %d, %p): stub\n", This, dwIndex, dwPatternType, pwszName); return S_OK; } static const IDirectMusicStyle8Vtbl DirectMusicStyle8_Style_Vtbl = { - IDirectMusicStyle8Impl_IDirectMusicStyle8_QueryInterface, - IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef, - IDirectMusicStyle8Impl_IDirectMusicStyle8_Release, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetBand, - IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumBand, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetDefaultBand, - IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumMotif, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetMotif, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetDefaultChordMap, - IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumChordMap, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetChordMap, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetTimeSignature, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetEmbellishmentLength, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetTempo, - IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumPattern + IDirectMusicStyle8Impl_QueryInterface, + IDirectMusicStyle8Impl_AddRef, + IDirectMusicStyle8Impl_Release, + IDirectMusicStyle8Impl_GetBand, + IDirectMusicStyle8Impl_EnumBand, + IDirectMusicStyle8Impl_GetDefaultBand, + IDirectMusicStyle8Impl_EnumMotif, + IDirectMusicStyle8Impl_GetMotif, + IDirectMusicStyle8Impl_GetDefaultChordMap, + IDirectMusicStyle8Impl_EnumChordMap, + IDirectMusicStyle8Impl_GetChordMap, + IDirectMusicStyle8Impl_GetTimeSignature, + IDirectMusicStyle8Impl_GetEmbellishmentLength, + IDirectMusicStyle8Impl_GetTempo, + IDirectMusicStyle8Impl_EnumPattern }; /* IDirectMusicStyle8Impl IDirectMusicObject part: */

1 0

Michael Stefaniuc : dmstyle: Do not use method implementations directly.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: e383cc393a586f7f788aa5ff8ccc4eb0ce5f08b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e383cc393a586f7f788aa5ff8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 28 23:13:07 2014 +0100 dmstyle: Do not use method implementations directly. --- dlls/dmstyle/style.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 077ed06..7e27934 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -23,11 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -static ULONG WINAPI IDirectMusicStyle8Impl_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef (LPDIRECTMUSICSTYLE8 iface); -static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface); -static ULONG WINAPI IDirectMusicStyle8Impl_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicStyleImpl implementation */ @@ -38,23 +33,20 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IUnknown_QueryInterface (LPUNKNOWN if (IsEqualIID (riid, &IID_IUnknown)) { *ppobj = &This->UnknownVtbl; - IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IUnknown_AddRef((LPUNKNOWN)&This->UnknownVtbl); return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicStyle)) { - *ppobj = &This->StyleVtbl; - IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef ((LPDIRECTMUSICSTYLE8)&This->StyleVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicStyle8)) { + } else if (IsEqualIID(riid, &IID_IDirectMusicStyle) || + IsEqualIID(riid, &IID_IDirectMusicStyle8)) { *ppobj = &This->StyleVtbl; - IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef ((LPDIRECTMUSICSTYLE8)&This->StyleVtbl); + IDirectMusicStyle8_AddRef((LPDIRECTMUSICSTYLE8)&This->StyleVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; - IDirectMusicStyle8Impl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); + IDirectMusicObject_AddRef((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { *ppobj = &This->PersistStreamVtbl; - IDirectMusicStyle8Impl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); + IPersistStream_AddRef((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; }

1 0

Ken Thomases : winemac: Ignore window dragging if window is disabled, maximized, minimized, or hidden.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 0d23637e0d53df541862d7c3d89a3ef8a884e7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d23637e0d53df541862d7c3d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 28 15:50:52 2014 -0600 winemac: Ignore window dragging if window is disabled, maximized, minimized, or hidden. --- dlls/winemac.drv/window.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 838a1b6..259552e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2153,11 +2153,15 @@ void macdrv_window_restore_requested(HWND hwnd) */ void macdrv_window_drag_begin(HWND hwnd) { + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); struct macdrv_win_data *data; MSG msg; TRACE("win %p\n", hwnd); + if (style & (WS_DISABLED | WS_MAXIMIZE | WS_MINIMIZE)) return; + if (!(style & WS_VISIBLE)) return; + if (!(data = get_win_data(hwnd))) return; if (data->being_dragged) goto done;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
82
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 January 2014