February 2019 - Wine-Commits

Sven Baars : ole32: Fix some memory leaks (Valgrind).
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: wine Branch: master Commit: e32b30c323340e3f35b030e82b8a93427c5c4b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32b30c323340e3f35b030e8… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Jan 30 11:35:23 2019 +0100 ole32: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 75d97fa..94f4a72 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -433,6 +433,7 @@ static HRESULT WINAPI CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { + HRESULT res; IMoniker *tempMk,*antiMk,*rightMostMk,*leftReducedComposedMk,*rightMostReducedMk; IEnumMoniker *enumMoniker; @@ -453,7 +454,11 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - return IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); + res = IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); + IMoniker_Release(tempMk); + IMoniker_Release(rightMostMk); + + return res; } else if (*ppmkToLeft==NULL) @@ -473,13 +478,16 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar /* If any of the components reduces itself, the method returns S_OK and passes back a composite */ /* of the reduced components */ if (IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,NULL,&rightMostReducedMk) && - IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) - ) + IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) ){ + IMoniker_Release(tempMk); + IMoniker_Release(rightMostMk); return CreateGenericComposite(leftReducedComposedMk,rightMostReducedMk,ppmkReduced); - + } else{ /* If no reduction occurred, the method passes back the same moniker and returns MK_S_REDUCED_TO_SELF.*/ + IMoniker_Release(tempMk); + IMoniker_Release(rightMostMk); IMoniker_AddRef(iface);

1 0

Jacek Caban : ntoskrnl.exe: Properly export *SList functions on win64.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: wine Branch: master Commit: 2401d86f68ee2100445ea8cd252197ca42b3cc9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2401d86f68ee2100445ea8cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 4 17:23:35 2019 +0100 ntoskrnl.exe: Properly export *SList functions on win64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45820 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 --------------------------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 11 ++++--- dlls/ntoskrnl.exe/sync.c | 63 +++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 61 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f21d6f7..c52736f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1977,63 +1977,6 @@ LONG WINAPI NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) /*********************************************************************** - * InterlockedPopEntrySList (NTOSKRNL.EXE.@) - */ -#ifdef DEFINE_FASTCALL1_ENTRYPOINT -DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedPopEntrySList ) -PSLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) -#else -PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) -#endif -{ - return InterlockedPopEntrySList( list ); -} - - -/*********************************************************************** - * ExInterlockedPopEntrySList (NTOSKRNL.EXE.@) - */ -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_ExInterlockedPopEntrySList ) -PSLIST_ENTRY WINAPI __regs_NTOSKRNL_ExInterlockedPopEntrySList( PSLIST_HEADER list, PKSPIN_LOCK lock ) -#else -PSLIST_ENTRY WINAPI NTOSKRNL_ExInterlockedPopEntrySList( PSLIST_HEADER list, PKSPIN_LOCK lock ) -#endif -{ - return InterlockedPopEntrySList( list ); -} - - -/*********************************************************************** - * InterlockedPushEntrySList (NTOSKRNL.EXE.@) - */ -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedPushEntrySList ) -PSLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, - PSLIST_ENTRY entry ) -#else -PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry ) -#endif -{ - return InterlockedPushEntrySList( list, entry ); -} - -/*********************************************************************** - * ExInterlockedPushEntrySList (NTOSKRNL.EXE.@) - */ -#ifdef DEFINE_FASTCALL3_ENTRYPOINT -DEFINE_FASTCALL3_ENTRYPOINT( NTOSKRNL_ExInterlockedPushEntrySList ) -PSLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_ExInterlockedPushEntrySList( PSLIST_HEADER list, - PSLIST_ENTRY entry, - PKSPIN_LOCK lock ) -#else -PSLIST_ENTRY WINAPI NTOSKRNL_ExInterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry, PKSPIN_LOCK lock ) -#endif -{ - return InterlockedPushEntrySList( list, entry ); -} - -/*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePool( POOL_TYPE type, SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 40f5b27..0fe0da3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -5,8 +5,8 @@ @ stub ExInterlockedAddLargeStatistic @ stub ExInterlockedCompareExchange64 @ stub ExInterlockedFlushSList -@ stdcall -norelay ExInterlockedPopEntrySList(ptr ptr) NTOSKRNL_ExInterlockedPopEntrySList -@ stdcall -norelay ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList +@ stdcall -arch=i386 -norelay ExInterlockedPopEntrySList(ptr ptr) NTOSKRNL_ExInterlockedPopEntrySList +@ stdcall -arch=i386 -norelay ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection @ stdcall -norelay ExReleaseFastMutexUnsafe(ptr) @ stdcall ExReleaseResourceLite(ptr) @@ -27,14 +27,17 @@ @ stub Exfi386InterlockedDecrementLong @ stub Exfi386InterlockedExchangeUlong @ stub Exfi386InterlockedIncrementLong +@ stdcall -arch=win64 ExpInterlockedPopEntrySList(ptr) RtlInterlockedPopEntrySList +@ stdcall -arch=win64 ExpInterlockedPushEntrySList(ptr ptr) RtlInterlockedPushEntrySList @ stub HalExamineMBR @ stdcall -norelay InterlockedCompareExchange(ptr long long) NTOSKRNL_InterlockedCompareExchange @ stdcall -norelay InterlockedDecrement(ptr) NTOSKRNL_InterlockedDecrement @ stdcall -norelay InterlockedExchange(ptr long) NTOSKRNL_InterlockedExchange @ stdcall -norelay InterlockedExchangeAdd(ptr long) NTOSKRNL_InterlockedExchangeAdd @ stdcall -norelay InterlockedIncrement(ptr) NTOSKRNL_InterlockedIncrement -@ stdcall -norelay InterlockedPopEntrySList(ptr) NTOSKRNL_InterlockedPopEntrySList -@ stdcall -norelay InterlockedPushEntrySList(ptr ptr) NTOSKRNL_InterlockedPushEntrySList +@ stdcall -arch=win32 -norelay InterlockedPopEntrySList(ptr) NTOSKRNL_InterlockedPopEntrySList +@ stdcall -arch=win32 -norelay InterlockedPushEntrySList(ptr ptr) NTOSKRNL_InterlockedPushEntrySList +@ stdcall -arch=win64 ExQueryDepthSList(ptr) RtlQueryDepthSList @ stub IoAssignDriveLetters @ stub IoReadPartitionTable @ stub IoSetPartitionInformation diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 0656091..98b3f9d 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -563,6 +563,69 @@ LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList( LIST_ENTRY *list, KSPIN_LOCK *l return ret; } +#ifndef _WIN64 + +/*********************************************************************** + * InterlockedPopEntrySList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedPopEntrySList ) +PSLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) +#else +PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) +#endif +{ + return RtlInterlockedPopEntrySList( list ); +} + + +/*********************************************************************** + * InterlockedPushEntrySList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedPushEntrySList ) +PSLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, + PSLIST_ENTRY entry ) +#else +PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry ) +#endif +{ + return RtlInterlockedPushEntrySList( list, entry ); +} + +#ifdef __i386__ + +/*********************************************************************** + * ExInterlockedPopEntrySList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_ExInterlockedPopEntrySList ) +PSLIST_ENTRY WINAPI __regs_NTOSKRNL_ExInterlockedPopEntrySList( PSLIST_HEADER list, PKSPIN_LOCK lock ) +#else +PSLIST_ENTRY WINAPI NTOSKRNL_ExInterlockedPopEntrySList( PSLIST_HEADER list, PKSPIN_LOCK lock ) +#endif +{ + return RtlInterlockedPopEntrySList( list ); +} + +/*********************************************************************** + * ExInterlockedPushEntrySList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL3_ENTRYPOINT +DEFINE_FASTCALL3_ENTRYPOINT( NTOSKRNL_ExInterlockedPushEntrySList ) +PSLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_ExInterlockedPushEntrySList( PSLIST_HEADER list, + PSLIST_ENTRY entry, + PKSPIN_LOCK lock ) +#else +PSLIST_ENTRY WINAPI NTOSKRNL_ExInterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry, PKSPIN_LOCK lock ) +#endif +{ + return RtlInterlockedPushEntrySList( list, entry ); +} + +#endif /* __i386__ */ +#endif /* _WIN64 */ + /*********************************************************************** * ExAcquireFastMutexUnsafe (NTOSKRNL.EXE.@) */

1 0

Alistair Leslie-Hughes : combase: Add DllGetActivationFactory stub.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: wine Branch: master Commit: 5e2aac997798a473877076db450793dd7ccde756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e2aac997798a473877076db… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 30 05:04:30 2019 +0000 combase: Add DllGetActivationFactory stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c8a8dee..cffb33f 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -170,7 +170,7 @@ @ stdcall CreateStreamOnHGlobal(ptr long ptr) ole32.CreateStreamOnHGlobal @ stub DcomChannelSetHResult @ stdcall DllDebugObjectRPCHook(long ptr) ole32.DllDebugObjectRPCHook -@ stub DllGetActivationFactory +@ stdcall DllGetActivationFactory(ptr ptr) @ stdcall -private DllGetClassObject(ptr ptr ptr) ole32.DllGetClassObject @ stub EnableHookObject @ stdcall FreePropVariantArray(long ptr) ole32.FreePropVariantArray diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 63e218d..c9fe80f 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -282,3 +282,13 @@ void WINAPI CleanupTlsOleState(void *unknown) { FIXME("(%p): stub\n", unknown); } + +/*********************************************************************** + * DllGetActivationFactory (combase.@) + */ +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + FIXME("(%s, %p): stub\n", debugstr_hstring(classid), factory); + + return REGDB_E_CLASSNOTREG; +}

1 0

Zhiyi Zhang : setupapi: Implement SetupDiGetDevicePropertyW.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: wine Branch: master Commit: 307812c30d2d9a037e3ebfc9c392bfe11fe39112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=307812c30d2d9a037e3ebfc9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 30 11:21:38 2019 +0800 setupapi: Implement SetupDiGetDevicePropertyW. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 71 +++++++++++++++-- dlls/setupapi/tests/devinst.c | 175 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 239 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=307812c30d2d9a037e3e…

1 0

Michael Stefaniuc : taskschd: Avoid TRUE : FALSE conditional expressions.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: wine Branch: master Commit: d99f91c5c664aeb3b1380f383d8982dc9cfbcb9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99f91c5c664aeb3b1380f38… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 4 23:16:40 2019 +0100 taskschd: Avoid TRUE : FALSE conditional expressions. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1306c8c..54b6782 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -239,7 +239,7 @@ static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOO TRACE("(%p)->(%x)\n", This, enabled); - This->enabled = enabled ? TRUE : FALSE; + This->enabled = !!enabled; return S_OK; } @@ -939,7 +939,7 @@ static HRESULT WINAPI TaskSettings_put_AllowDemandStart(ITaskSettings *iface, VA TRACE("%p,%d\n", iface, allow); - taskset->allow_on_demand_start = allow ? TRUE : FALSE; + taskset->allow_on_demand_start = !!allow; return S_OK; } @@ -1045,7 +1045,7 @@ static HRESULT WINAPI TaskSettings_put_StopIfGoingOnBatteries(ITaskSettings *ifa TRACE("%p,%d\n", iface, stop); - taskset->stop_if_going_on_batteries = stop ? TRUE : FALSE; + taskset->stop_if_going_on_batteries = !!stop; return S_OK; } @@ -1069,7 +1069,7 @@ static HRESULT WINAPI TaskSettings_put_DisallowStartIfOnBatteries(ITaskSettings TRACE("%p,%d\n", iface, disallow); - taskset->disallow_start_if_on_batteries = disallow ? TRUE : FALSE; + taskset->disallow_start_if_on_batteries = !!disallow; return S_OK; } @@ -1093,7 +1093,7 @@ static HRESULT WINAPI TaskSettings_put_AllowHardTerminate(ITaskSettings *iface, TRACE("%p,%d\n", iface, allow); - taskset->allow_hard_terminate = allow ? TRUE : FALSE; + taskset->allow_hard_terminate = !!allow; return S_OK; } @@ -1117,7 +1117,7 @@ static HRESULT WINAPI TaskSettings_put_StartWhenAvailable(ITaskSettings *iface, TRACE("%p,%d\n", iface, start); - taskset->start_when_available = start ? TRUE : FALSE; + taskset->start_when_available = !!start; return S_OK; } @@ -1153,7 +1153,7 @@ static HRESULT WINAPI TaskSettings_put_RunOnlyIfNetworkAvailable(ITaskSettings * TRACE("%p,%d\n", iface, run); - taskset->run_only_if_network_available = run ? TRUE : FALSE; + taskset->run_only_if_network_available = !!run; return S_OK; } @@ -1211,7 +1211,7 @@ static HRESULT WINAPI TaskSettings_put_Enabled(ITaskSettings *iface, VARIANT_BOO TRACE("%p,%d\n", iface, enabled); - taskset->enabled = enabled ? TRUE : FALSE; + taskset->enabled = !!enabled; return S_OK; } @@ -1311,7 +1311,7 @@ static HRESULT WINAPI TaskSettings_put_Hidden(ITaskSettings *iface, VARIANT_BOOL TRACE("%p,%d\n", iface, hidden); - taskset->hidden = hidden ? TRUE : FALSE; + taskset->hidden = !!hidden; return S_OK; } @@ -1347,7 +1347,7 @@ static HRESULT WINAPI TaskSettings_put_RunOnlyIfIdle(ITaskSettings *iface, VARIA TRACE("%p,%d\n", iface, run); - taskset->run_only_if_idle = run ? TRUE : FALSE; + taskset->run_only_if_idle = !!run; return S_OK; } @@ -1371,7 +1371,7 @@ static HRESULT WINAPI TaskSettings_put_WakeToRun(ITaskSettings *iface, VARIANT_B TRACE("%p,%d\n", iface, wake); - taskset->wake_to_run = wake ? TRUE : FALSE; + taskset->wake_to_run = !!wake; return S_OK; }

1 0

Michael Stefaniuc : kernelbase: Avoid TRUE : FALSE conditional expressions.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: wine Branch: master Commit: 426099a4a3c637794c883c053bcd9185095e424b URL: https://source.winehq.org/git/wine.git/?a=commit;h=426099a4a3c637794c883c05… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 4 23:16:41 2019 +0100 kernelbase: Avoid TRUE : FALSE conditional expressions. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index bcd129c..dfcc825 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -421,7 +421,7 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens next++; } - has_dot = extension[0] == '.' ? TRUE : FALSE; + has_dot = extension[0] == '.'; hr = PathCchFindExtension(path, size, &existing_extension); if (FAILED(hr)) return hr; @@ -863,5 +863,5 @@ BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server) result = path + 2; if (server) *server = result; - return result ? TRUE : FALSE; + return !!result; }

1 0

Michael Stefaniuc : d3dx9/tests: Actually test the return of the effect SetInt() call.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: wine Branch: master Commit: 7e01ec6018c062d11b29ba2b9a2056d98e8bc406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e01ec6018c062d11b29ba2b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 5 01:01:43 2019 +0100 d3dx9/tests: Actually test the return of the effect SetInt() call. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8f2f06b..5efc93b 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7182,11 +7182,12 @@ static void test_effect_unsupported_shader(void) hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == E_FAIL, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7229,7 +7230,7 @@ static void test_effect_unsupported_shader(void) HeapFree(GetProcessHeap(), 0, byte_code); IDirect3DVertexShader9_Release(vshader); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7321,16 +7322,16 @@ static void test_effect_null_shader(void) hr = effect->lpVtbl->ValidateTechnique(effect, "tech0"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 2); + hr = effect->lpVtbl->SetInt(effect, "i", 2); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == E_FAIL, "Got result %#x.\n", hr); @@ -7938,7 +7939,7 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); tech = (D3DXHANDLE)0xdeadbeef; @@ -7951,7 +7952,8 @@ static void test_effect_find_next_valid_technique(void) hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); ok(hr == S_FALSE, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

Michael Stefaniuc : webservices: Delete duplicated return value checks.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: wine Branch: master Commit: c0de14a1d4c72dfadcb0c5cbfe96682f0009449f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0de14a1d4c72dfadcb0c5cb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 4 23:16:44 2019 +0100 webservices: Delete duplicated return value checks. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 2b0475f..afbc46b 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5086,7 +5086,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BOOL, "got %u\n", text_node->text->textType ); bool_text = (WS_XML_BOOL_TEXT *)text_node->text; ok( !bool_text->value, "got %d\n", bool_text->value ); @@ -5096,7 +5095,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BOOL, "got %u\n", text_node->text->textType ); bool_text = (WS_XML_BOOL_TEXT *)text_node->text; ok( bool_text->value == TRUE, "got %d\n", bool_text->value ); @@ -5106,7 +5104,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); int32_text = (WS_XML_INT32_TEXT *)text_node->text; ok( int32_text->value == -1, "got %d\n", int32_text->value ); @@ -5116,7 +5113,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); int32_text = (WS_XML_INT32_TEXT *)text_node->text; ok( int32_text->value == -1, "got %d\n", int32_text->value ); @@ -5126,7 +5122,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); int32_text = (WS_XML_INT32_TEXT *)text_node->text; ok( int32_text->value == -1, "got %d\n", int32_text->value ); @@ -5136,7 +5131,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT64, "got %u\n", text_node->text->textType ); int64_text = (WS_XML_INT64_TEXT *)text_node->text; ok( int64_text->value == -1, "got %s\n", wine_dbgstr_longlong(int64_text->value) ); @@ -5146,7 +5140,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_DOUBLE, "got %u\n", text_node->text->textType ); double_text = (WS_XML_DOUBLE_TEXT *)text_node->text; ok( !double_text->value, "got %s\n", wine_dbgstr_longlong(double_text->value) ); @@ -5156,7 +5149,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_DATETIME, "got %u\n", text_node->text->textType ); datetime_text = (WS_XML_DATETIME_TEXT *)text_node->text; ok( !datetime_text->value.ticks, "got %s\n", wine_dbgstr_longlong(datetime_text->value.ticks) ); @@ -5167,7 +5159,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); @@ -5178,7 +5169,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); @@ -5189,7 +5179,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); @@ -5200,7 +5189,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; ok( base64_text->length == 1, "got %u\n", base64_text->length ); @@ -5211,7 +5199,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; ok( base64_text->length == 1, "got %u\n", base64_text->length ); @@ -5222,7 +5209,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; ok( base64_text->length == 1, "got %u\n", base64_text->length ); @@ -5233,7 +5219,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( !utf8_text->value.length, "got %u\n", utf8_text->value.length ); @@ -5244,7 +5229,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 2, "got %u\n", utf8_text->value.length ); @@ -5256,7 +5240,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UNIQUE_ID, "got %u\n", text_node->text->textType ); unique_id_text = (WS_XML_UNIQUE_ID_TEXT *)text_node->text; ok( IsEqualGUID( &unique_id_text->value, &guid_null ), "wrong data\n" ); @@ -5266,7 +5249,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_GUID, "got %u\n", text_node->text->textType ); guid_text = (WS_XML_GUID_TEXT *)text_node->text; ok( IsEqualGUID( &guid_text->value, &guid_null ), "wrong data\n" ); @@ -5276,7 +5258,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UINT64, "got %u\n", text_node->text->textType ); uint64_text = (WS_XML_UINT64_TEXT *)text_node->text; ok( uint64_text->value == 1, "got %s\n", wine_dbgstr_longlong(uint64_text->value) );

1 0

Józef Kucia : vkd3d-common: Fix vkd3d_strdup_{w16, w32}_utf8() functions.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: vkd3d Branch: master Commit: 0055aa67f155d1f50b7b6c647e909b436289f807 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0055aa67f155d1f50b7b6c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 1 09:42:51 2019 +0100 vkd3d-common: Fix vkd3d_strdup_{w16, w32}_utf8() functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-common/utf8.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-common/utf8.c b/libs/vkd3d-common/utf8.c index e48316d..8bf4eb0 100644 --- a/libs/vkd3d-common/utf8.c +++ b/libs/vkd3d-common/utf8.c @@ -107,8 +107,8 @@ static char *vkd3d_strdup_w16_utf8(const uint16_t *wstr) { const uint16_t *src = wstr; size_t dst_size = 0; + char *dst, *utf8; uint32_t c; - char *dst; while (*src) { @@ -121,14 +121,15 @@ static char *vkd3d_strdup_w16_utf8(const uint16_t *wstr) if (!(dst = vkd3d_malloc(dst_size))) return NULL; + utf8 = dst; src = wstr; while (*src) { if (!(c = vkd3d_utf16_read(&src))) continue; - vkd3d_utf8_append(&dst, c); + vkd3d_utf8_append(&utf8, c); } - *dst = 0; + *utf8 = 0; return dst; } @@ -137,7 +138,7 @@ static char *vkd3d_strdup_w32_utf8(const uint32_t *wstr) { const uint32_t *src = wstr; size_t dst_size = 0; - char *dst; + char *dst, *utf8; while (*src) dst_size += vkd3d_utf8_len(*src++); @@ -146,10 +147,11 @@ static char *vkd3d_strdup_w32_utf8(const uint32_t *wstr) if (!(dst = vkd3d_malloc(dst_size))) return NULL; + utf8 = dst; src = wstr; while (*src) - vkd3d_utf8_append(&dst, *src++); - *dst = 0; + vkd3d_utf8_append(&utf8, *src++); + *utf8 = 0; return dst; }

1 0

Zhiyi Zhang : vkd3d: Implement d3d12_command_allocator_SetName().
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: vkd3d Branch: master Commit: 3e955da66866a5b6247937c1b0597f2a46728825 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3e955da66866a5b6247937c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 1 11:37:30 2019 +0800 vkd3d: Implement d3d12_command_allocator_SetName(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index abee0e2..dd0d564 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1081,9 +1081,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetName(ID3D12CommandAl { struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, allocator->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, allocator->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_GetDevice(ID3D12CommandAllocator *iface,

1 0