June 2019 - Wine-commits - list.winehq.org

André Hentschel : comctl32/tests: Don' t test functions directly when reporting GetLastError().
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 8ad4cce047b153e1f0691a0f84b45b9c2e009d79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ad4cce047b153e1f0691a0f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 9 18:17:23 2019 +0200 comctl32/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index f48dc03..4b5dfe6 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -564,9 +564,11 @@ static void test_wm_notifyformat(void) static const INT formats[] = {NFR_UNICODE, NFR_ANSI}; HWND parent, pager, child; LRESULT ret; + BOOL bret; INT i; - ok(register_notifyformat_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + bret = register_notifyformat_class(); + ok(bret, "Register test class failed, error 0x%08x\n", GetLastError()); for (i = 0; i < ARRAY_SIZE(formats); i++) { @@ -1280,9 +1282,11 @@ static void test_wm_notify(void) {&nmtv, sizeof(nmtv), &nmtv.itemOld.mask, TVIF_TEXT, &nmtv.itemOld.pszText, &nmtv.itemOld.cchTextMax, TVN_SELCHANGEDW, TVN_SELCHANGEDA, CONVERT_SEND, TVITEM_OLD_HANDLER} }; + BOOL bret; INT i; - ok(register_test_notify_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + bret = register_test_notify_class(); + ok(bret, "Register test class failed, error 0x%08x\n", GetLastError()); parent = CreateWindowA(class, "parent", WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), 0); ok(parent != NULL, "CreateWindow failed\n");

1 0

André Hentschel : ntoskrnl.exe/tests: Don' t test functions directly when reporting GetLastError().
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: dd84b0a7445ccb59246ab98e5c6f6855352f47c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd84b0a7445ccb59246ab98e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 9 18:17:21 2019 +0200 ntoskrnl.exe/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 19eeca2..267fddb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -377,8 +377,10 @@ START_TEST(ntoskrnl) unload_driver(service2); unload_driver(service); - ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); - ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA(filename); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA(filename2); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); test_driver3(); }

1 0

André Hentschel : shcore: Fix IUnknown_AtomicRelease spec file entry.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 51386804b4df71c5bffef47777869d0faea63ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51386804b4df71c5bffef477… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 9 18:16:39 2019 +0200 shcore: Fix IUnknown_AtomicRelease spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/shcore.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 4c27179..6a634bd 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -20,7 +20,7 @@ @ stdcall IStream_Size(ptr ptr) @ stdcall IStream_Write(ptr ptr long) _IStream_Write @ stub IStream_WriteStr -@ stdcall IUnknown_AtomicRelease(long) +@ stdcall IUnknown_AtomicRelease(ptr) @ stdcall IUnknown_GetSite(ptr ptr ptr) @ stdcall IUnknown_QueryService(ptr ptr ptr ptr) @ stdcall IUnknown_Set(ptr ptr)

1 0

André Hentschel : shlwapi: Fix some spec file entries.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 6de6939534fcceddfae1c3029fb4f8ec6e37d1f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de6939534fcceddfae1c302… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 9 18:16:48 2019 +0200 shlwapi: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-registryuserspecific-l1-1-0.spec | 4 ++-- .../api-ms-win-core-shlwapi-obsolete-l1-1-0.spec | 4 ++-- .../api-ms-win-core-shlwapi-obsolete-l1-2-0.spec | 4 ++-- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 8 ++++---- dlls/kernelbase/kernelbase.spec | 6 +++--- dlls/shlwapi/shlwapi.spec | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec index 1da9379..1e26724 100644 --- a/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec +++ b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec @@ -13,8 +13,8 @@ @ stdcall SHRegGetBoolUSValueW(wstr wstr long long) shlwapi.SHRegGetBoolUSValueW @ stdcall SHRegGetUSValueA( str str ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueA @ stdcall SHRegGetUSValueW( wstr wstr ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueW -@ stdcall SHRegOpenUSKeyA( str long long long long ) shlwapi.SHRegOpenUSKeyA -@ stdcall SHRegOpenUSKeyW( wstr long long long long ) shlwapi.SHRegOpenUSKeyW +@ stdcall SHRegOpenUSKeyA( str long long ptr long ) shlwapi.SHRegOpenUSKeyA +@ stdcall SHRegOpenUSKeyW( wstr long long ptr long ) shlwapi.SHRegOpenUSKeyW @ stdcall SHRegQueryInfoUSKeyA( long ptr ptr ptr ptr long ) shlwapi.SHRegQueryInfoUSKeyA @ stdcall SHRegQueryInfoUSKeyW( long ptr ptr ptr ptr long ) shlwapi.SHRegQueryInfoUSKeyW @ stdcall SHRegQueryUSValueA( long str ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueA diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec index 4b969ee..a867dfd 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec @@ -20,10 +20,10 @@ @ stdcall StrCmpIW(wstr wstr) shlwapi.StrCmpIW @ stdcall StrCmpLogicalW(wstr wstr) shlwapi.StrCmpLogicalW @ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA -@ stdcall StrCmpNCA(str ptr long) shlwapi.StrCmpNCA +@ stdcall StrCmpNCA(str str long) shlwapi.StrCmpNCA @ stdcall StrCmpNCW(wstr wstr long) shlwapi.StrCmpNCW @ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA -@ stdcall StrCmpNICA(long long long) shlwapi.StrCmpNICA +@ stdcall StrCmpNICA(str str long) shlwapi.StrCmpNICA @ stdcall StrCmpNICW(wstr wstr long) shlwapi.StrCmpNICW @ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec index be3b9f1..50661b1 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec @@ -15,10 +15,10 @@ @ stdcall StrCmpIW(wstr wstr) shlwapi.StrCmpIW @ stdcall StrCmpLogicalW(wstr wstr) shlwapi.StrCmpLogicalW @ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA -@ stdcall StrCmpNCA(str ptr long) shlwapi.StrCmpNCA +@ stdcall StrCmpNCA(str str long) shlwapi.StrCmpNCA @ stdcall StrCmpNCW(wstr wstr long) shlwapi.StrCmpNCW @ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA -@ stdcall StrCmpNICA(long long long) shlwapi.StrCmpNICA +@ stdcall StrCmpNICA(str str long) shlwapi.StrCmpNICA @ stdcall StrCmpNICW(wstr wstr long) shlwapi.StrCmpNICW @ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index 96d44be..c8d82ac 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -78,8 +78,8 @@ @ stdcall SHRegGetBoolUSValueW(wstr wstr long long) shlwapi.SHRegGetBoolUSValueW @ stdcall SHRegGetUSValueA( str str ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueA @ stdcall SHRegGetUSValueW( wstr wstr ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueW -@ stdcall SHRegOpenUSKeyA( str long long long long ) shlwapi.SHRegOpenUSKeyA -@ stdcall SHRegOpenUSKeyW( wstr long long long long ) shlwapi.SHRegOpenUSKeyW +@ stdcall SHRegOpenUSKeyA( str long long ptr long ) shlwapi.SHRegOpenUSKeyA +@ stdcall SHRegOpenUSKeyW( wstr long long ptr long ) shlwapi.SHRegOpenUSKeyW @ stdcall SHRegQueryUSValueA( long str ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueA @ stdcall SHRegQueryUSValueW( long wstr ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueW @ stdcall SHRegSetUSValueA( str str long ptr long long) shlwapi.SHRegSetUSValueA @@ -104,10 +104,10 @@ @ stdcall StrCmpIW(wstr wstr) shlwapi.StrCmpIW @ stdcall StrCmpLogicalW(wstr wstr) shlwapi.StrCmpLogicalW @ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA -@ stdcall StrCmpNCA(str ptr long) shlwapi.StrCmpNCA +@ stdcall StrCmpNCA(str str long) shlwapi.StrCmpNCA @ stdcall StrCmpNCW(wstr wstr long) shlwapi.StrCmpNCW @ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA -@ stdcall StrCmpNICA(long long long) shlwapi.StrCmpNICA +@ stdcall StrCmpNICA(str str long) shlwapi.StrCmpNICA @ stdcall StrCmpNICW(wstr wstr long) shlwapi.StrCmpNICW @ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 07a4041..cce4262 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1371,8 +1371,8 @@ @ stdcall SHRegGetBoolUSValueW(wstr wstr long long) @ stdcall SHRegGetUSValueA(str str ptr ptr ptr long ptr long) @ stdcall SHRegGetUSValueW(wstr wstr ptr ptr ptr long ptr long) -@ stdcall SHRegOpenUSKeyA(str long long long long) -@ stdcall SHRegOpenUSKeyW(wstr long long long long) +@ stdcall SHRegOpenUSKeyA(str long long ptr long) +@ stdcall SHRegOpenUSKeyW(wstr long long ptr long) @ stdcall SHRegQueryInfoUSKeyA(long ptr ptr ptr ptr long) @ stdcall SHRegQueryInfoUSKeyW(long ptr ptr ptr ptr long) @ stdcall SHRegQueryUSValueA(long str ptr ptr ptr long ptr long) @@ -1549,7 +1549,7 @@ @ stdcall StrCmpNCA(str str long) @ stdcall StrCmpNCW(wstr wstr long) @ stdcall StrCmpNIA(str str long) -@ stdcall StrCmpNICA(long long long) +@ stdcall StrCmpNICA(str str long) @ stdcall StrCmpNICW(wstr wstr long) @ stdcall StrCmpNIW(wstr wstr long) @ stdcall StrCmpNW(wstr wstr long) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 060dacc..6724860 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -148,9 +148,9 @@ 148 stdcall -noname VkKeyScanWrapW(long) user32.VkKeyScanW 149 stdcall -noname WinHelpWrapW(long wstr long long) user32.WinHelpW 150 stdcall -noname wvsprintfWrapW(ptr wstr ptr) user32.wvsprintfW -151 stdcall -ordinal StrCmpNCA(str ptr long) +151 stdcall -ordinal StrCmpNCA(str str long) 152 stdcall -ordinal StrCmpNCW(wstr wstr long) -153 stdcall -ordinal StrCmpNICA(long long long) +153 stdcall -ordinal StrCmpNICA(str str long) 154 stdcall -ordinal StrCmpNICW(wstr wstr long) 155 stdcall -ordinal StrCmpCA(str str) 156 stdcall -ordinal StrCmpCW(wstr wstr) @@ -733,8 +733,8 @@ @ stdcall SHRegGetUSValueW ( wstr wstr ptr ptr ptr long ptr long ) @ stdcall SHRegGetValueA ( long str str long ptr ptr ptr ) advapi32.RegGetValueA @ stdcall SHRegGetValueW ( long wstr wstr long ptr ptr ptr ) advapi32.RegGetValueW -@ stdcall SHRegOpenUSKeyA ( str long long long long ) -@ stdcall SHRegOpenUSKeyW ( wstr long long long long ) +@ stdcall SHRegOpenUSKeyA ( str long long ptr long ) +@ stdcall SHRegOpenUSKeyW ( wstr long long ptr long ) @ stdcall SHRegQueryInfoUSKeyA ( long ptr ptr ptr ptr long ) @ stdcall SHRegQueryInfoUSKeyW ( long ptr ptr ptr ptr long ) @ stdcall SHRegQueryUSValueA ( long str ptr ptr ptr long ptr long )

1 0

André Hentschel : rpcrt4: Fix NdrServerContextMarshall spec file entry.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 660ee356e9cc0478b806949e4fdbc9f0588468db URL: https://source.winehq.org/git/wine.git/?a=commit;h=660ee356e9cc0478b806949e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 9 18:17:12 2019 +0200 rpcrt4: Fix NdrServerContextMarshall spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index d8e873d..6d7d0fb 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -275,7 +275,7 @@ @ stdcall NdrServerCall2(ptr) @ stdcall NdrServerCall(ptr) @ stdcall NdrServerCallAll(ptr) -@ stdcall NdrServerContextMarshall(ptr ptr long) +@ stdcall NdrServerContextMarshall(ptr ptr ptr) @ stdcall NdrServerContextNewMarshall(ptr ptr ptr ptr) # wxp @ stdcall NdrServerContextNewUnmarshall(ptr ptr) # wxp @ stdcall NdrServerContextUnmarshall(ptr)

1 0

André Hentschel : mpr: Fix some spec file entries.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: e0e89cdc900b626d3242fce058db8379a91b13a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0e89cdc900b626d3242fce0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 9 18:17:18 2019 +0200 mpr: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/mpr.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec index 2f102ab..155e448 100644 --- a/dlls/mpr/mpr.spec +++ b/dlls/mpr/mpr.spec @@ -32,8 +32,8 @@ @ stdcall NPSDeviceGetNumberA(str ptr ptr) @ stdcall NPSDeviceGetStringA(long long ptr ptr) @ stdcall NPSGetProviderHandleA(ptr) -@ stdcall NPSGetProviderNameA(long ptr) -@ stdcall NPSGetSectionNameA(long ptr) +@ stdcall NPSGetProviderNameA(ptr ptr) +@ stdcall NPSGetSectionNameA(ptr ptr) @ stdcall NPSNotifyGetContextA(ptr) @ stdcall NPSNotifyRegisterA(long ptr) @ stdcall NPSSetCustomTextA(str) @@ -101,7 +101,7 @@ @ stdcall WNetOpenEnumW(long long long ptr ptr) @ stub WNetPasswordChangeNotify @ stub WNetPropertyDialogA -@ stdcall WNetRemoveCachedPassword(long long long) +@ stdcall WNetRemoveCachedPassword(ptr long long) @ stub WNetRestoreConnection @ stdcall WNetRestoreConnectionA(long str) @ stdcall WNetRestoreConnectionW(long wstr)

1 0

Alistair Leslie-Hughes : dinput: Return correct value in IDirectInputDevice2 Release.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: e29effc633f0ae26de8ce831fe1581bcc60c4f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e29effc633f0ae26de8ce831… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 7 05:37:18 2019 +0000 dinput: Return correct value in IDirectInputDevice2 Release. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ade7947..c9d24a9 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1168,7 +1168,7 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) HeapFree(GetProcessHeap(), 0, This); - return DI_OK; + return ref; } ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface)

1 0

Alistair Leslie-Hughes : dinput: Trace reference count in a consistent way.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: dba4428b6d2a31c572fd55d64c1f6edc174f47d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dba4428b6d2a31c572fd55d6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 7 06:03:37 2019 +0000 dinput: Trace reference count in a consistent way. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 6 ++++-- dlls/dinput/dinput_main.c | 4 ++-- dlls/dinput/effect_linuxinput.c | 6 +++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c9d24a9..28329d0 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1140,7 +1140,7 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) releasing from %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (ref) return ref; @@ -1215,7 +1215,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A ifa ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE( "(%p) ref %d\n", This, ref ); + return ref; } ULONG WINAPI IDirectInputDevice2AImpl_AddRef(LPDIRECTINPUTDEVICE8A iface) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index acf2cf3..a690505 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -527,7 +527,7 @@ static ULONG WINAPI IDirectInputAImpl_AddRef(LPDIRECTINPUT7A iface) IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedIncrement(&This->ref); - TRACE( "(%p) incrementing from %d\n", This, ref - 1); + TRACE( "(%p) ref %d\n", This, ref ); return ref; } @@ -542,7 +542,7 @@ static ULONG WINAPI IDirectInputAImpl_Release(LPDIRECTINPUT7A iface) IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedDecrement( &This->ref ); - TRACE( "(%p) releasing from %d\n", This, ref + 1 ); + TRACE( "(%p) ref %d\n", This, ref ); if (ref == 0) { diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 7477bc7..4b2f317 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -167,7 +167,9 @@ static ULONG WINAPI LinuxInputEffectImpl_AddRef( LPDIRECTINPUTEFFECT iface) { LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); - return InterlockedIncrement(&(This->ref)); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE( "(%p) ref %d\n", This, ref ); + return ref; } static HRESULT WINAPI LinuxInputEffectImpl_Download( @@ -759,6 +761,8 @@ static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface) LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); ULONG ref = InterlockedDecrement(&(This->ref)); + TRACE( "(%p) ref %d\n", This, ref ); + if (ref == 0) { LinuxInputEffectImpl_Stop(iface);

1 0

Zebediah Figura : strmbase: Add a cached implementation of IDispatch and use it in IBasicVideo.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 384d3a45abc1bd2871fe132f24356a5828382d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=384d3a45abc1bd2871fe132f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 19:49:21 2019 -0400 strmbase: Add a cached implementation of IDispatch and use it in IBasicVideo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/dispatch.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ dlls/strmbase/video.c | 53 ++++++++++++++++++++++++++++-------------------- include/wine/strmbase.h | 14 ++++++++++++- 3 files changed, 93 insertions(+), 23 deletions(-) diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index e91b65a..1521471 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -20,6 +20,55 @@ #include "strmbase_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +static ITypeLib *control_typelib; +static ITypeInfo *control_typeinfo[last_tid]; + +static REFIID control_tid_id[] = +{ + &IID_IBasicAudio, + &IID_IBasicVideo, + &IID_IMediaControl, + &IID_IMediaEvent, + &IID_IMediaPosition, + &IID_IVideoWindow, +}; + +HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret) +{ + HRESULT hr; + + if (!control_typelib) + { + ITypeLib *typelib; + + hr = LoadRegTypeLib(&LIBID_QuartzTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &typelib); + if (FAILED(hr)) + { + ERR("Failed to load typelib, hr %#x.\n", hr); + return hr; + } + if (InterlockedCompareExchangePointer((void **)&control_typelib, typelib, NULL)) + ITypeLib_Release(typelib); + } + if (!control_typeinfo[tid]) + { + ITypeInfo *typeinfo; + + hr = ITypeLib_GetTypeInfoOfGuid(control_typelib, control_tid_id[tid], &typeinfo); + if (FAILED(hr)) + { + ERR("Failed to get type info for %s, hr %#x.\n", debugstr_guid(control_tid_id[tid]), hr); + return hr; + } + if (InterlockedCompareExchangePointer((void **)(control_typeinfo + tid), typeinfo, NULL)) + ITypeInfo_Release(typeinfo); + } + ITypeInfo_AddRef(*ret = control_typeinfo[tid]); + return S_OK; +} + HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { ITypeLib *pTypeLib; diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 2857932..440adc4 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -35,14 +35,12 @@ HRESULT WINAPI BaseControlVideo_Init(BaseControlVideo *pControlVideo, const IBas pControlVideo->pPin = pPin; pControlVideo->pFuncsTable = pFuncsTable; - BaseDispatch_Init(&pControlVideo->baseDispatch, &IID_IBasicVideo); - return S_OK; } HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) { - return BaseDispatch_Destroy(&pControlVideo->baseDispatch); + return S_OK; } static HRESULT BaseControlVideoImpl_CheckSourceRect(BaseControlVideo *This, RECT *pSourceRect) @@ -72,40 +70,51 @@ static HRESULT BaseControlVideoImpl_CheckTargetRect(BaseControlVideo *This, RECT return S_OK; } -HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *pctinfo) +HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *count) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); - - return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); + TRACE("iface %p, count %p.\n", iface, count); + *count = 1; + return S_OK; } -HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT index, + LCID lcid, ITypeInfo **typeinfo) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); - - return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); + TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo); + return strmbase_get_typeinfo(IBasicVideo_tid, typeinfo); } -HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID iid, + LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); + ITypeInfo *typeinfo; + HRESULT hr; - return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); + TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n", + iface, debugstr_guid(iid), names, count, lcid, ids); + + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo))) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids); + ITypeInfo_Release(typeinfo); + } + return hr; } -HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) +HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID id, REFIID iid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); - ITypeInfo *pTypeInfo; + ITypeInfo *typeinfo; HRESULT hr; - hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); - if (SUCCEEDED(hr)) + TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n", + iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg); + + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo))) { - hr = ITypeInfo_Invoke(pTypeInfo, &This->IBasicVideo_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - ITypeInfo_Release(pTypeInfo); + hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg); + ITypeInfo_Release(typeinfo); } - return hr; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 56560ed..0cbb7c3 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -399,6 +399,19 @@ RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This); LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width); +enum strmbase_type_id +{ + IBasicAudio_tid, + IBasicVideo_tid, + IMediaControl_tid, + IMediaEvent_tid, + IMediaPosition_tid, + IVideoWindow_tid, + last_tid +}; + +HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); + typedef struct{ ITypeInfo *pTypeInfo; } BaseDispatch; @@ -473,7 +486,6 @@ HRESULT WINAPI BaseControlWindowImpl_IsCursorHidden(IVideoWindow *iface, LONG *C typedef struct tagBaseControlVideo { IBasicVideo IBasicVideo_iface; - BaseDispatch baseDispatch; BaseFilter* pFilter; CRITICAL_SECTION* pInterfaceLock;

1 0

Zebediah Figura : strmbase: Use the type info cache for IVideoWindow.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: fad521f525b052d9c316c1ea2cdbd026443da5fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fad521f525b052d9c316c1ea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 19:49:22 2019 -0400 strmbase: Use the type info cache for IVideoWindow. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 54 +++++++++++++++++++++++++++++-------------------- include/wine/strmbase.h | 1 - 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index d0105bd..eea45aa 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -200,7 +200,6 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, const I hr = BaseWindow_Init(&pControlWindow->baseWindow, pFuncsTable); if (SUCCEEDED(hr)) { - BaseDispatch_Init(&pControlWindow->baseDispatch, &IID_IVideoWindow); pControlWindow->IVideoWindow_iface.lpVtbl = lpVtbl; pControlWindow->AutoShow = TRUE; pControlWindow->hwndDrain = NULL; @@ -215,43 +214,54 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, const I HRESULT WINAPI BaseControlWindow_Destroy(BaseControlWindow *pControlWindow) { BaseWindowImpl_DoneWithWindow(&pControlWindow->baseWindow); - return BaseDispatch_Destroy(&pControlWindow->baseDispatch); + return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_GetTypeInfoCount(IVideoWindow *iface, UINT *pctinfo) +HRESULT WINAPI BaseControlWindowImpl_GetTypeInfoCount(IVideoWindow *iface, UINT *count) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); - - return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); + TRACE("iface %p, count %p.\n", iface, count); + *count = 1; + return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_GetTypeInfo(IVideoWindow *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo) +HRESULT WINAPI BaseControlWindowImpl_GetTypeInfo(IVideoWindow *iface, UINT index, + LCID lcid, ITypeInfo **typeinfo) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); - - return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); + TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo); + return strmbase_get_typeinfo(IVideoWindow_tid, typeinfo); } -HRESULT WINAPI BaseControlWindowImpl_GetIDsOfNames(IVideoWindow *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) - { - BaseControlWindow* This = impl_from_IVideoWindow(iface); +HRESULT WINAPI BaseControlWindowImpl_GetIDsOfNames(IVideoWindow *iface, REFIID iid, + LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) +{ + ITypeInfo *typeinfo; + HRESULT hr; - return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); + TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n", + iface, debugstr_guid(iid), names, count, lcid, ids); + + if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo))) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids); + ITypeInfo_Release(typeinfo); + } + return hr; } -HRESULT WINAPI BaseControlWindowImpl_Invoke(IVideoWindow *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) +HRESULT WINAPI BaseControlWindowImpl_Invoke(IVideoWindow *iface, DISPID id, REFIID iid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); - ITypeInfo *pTypeInfo; + ITypeInfo *typeinfo; HRESULT hr; - hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); - if (SUCCEEDED(hr)) + TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n", + iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg); + + if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo))) { - hr = ITypeInfo_Invoke(pTypeInfo, &This->IVideoWindow_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - ITypeInfo_Release(pTypeInfo); + hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg); + ITypeInfo_Release(typeinfo); } - return hr; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 0cbb7c3..e762f44 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -421,7 +421,6 @@ typedef struct tagBaseControlWindow { BaseWindow baseWindow; IVideoWindow IVideoWindow_iface; - BaseDispatch baseDispatch; BOOL AutoShow; HWND hwndDrain;

1 0