April 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : devenum: Remove some unnecessary includes.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 8edbd2d3e85ebe03b0bcaf5d1ffc65a786664efd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8edbd2d3e85ebe03b0bcaf5d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 22:22:49 2020 -0500 devenum: Remove some unnecessary includes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum.rc | 1 - dlls/devenum/devenum_private.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 24da9b8d9e..eef5c15078 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -21,7 +21,6 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "devenum_private.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 6d969ff608..e0c693a2e9 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -22,9 +22,7 @@ * - Private file where devenum globals are declared */ -#ifndef RC_INVOKED #include <stdarg.h> -#endif #include "windef.h" #include "winbase.h"

1 0

Zebediah Figura : devenum: Get rid of the union in struct moniker.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 3ed689c0f28d41d0e68aa16c37df9ecc95480631 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ed689c0f28d41d0e68aa16c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 22:22:50 2020 -0500 devenum: Get rid of the union in struct moniker. To avoid an invalid free in moniker_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index e0c693a2e9..43a5a0c50e 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -59,11 +59,8 @@ struct moniker CLSID class; BOOL has_class; enum device_type type; - union - { - WCHAR *name; /* for filters and codecs */ - CLSID clsid; /* for DMOs */ - }; + WCHAR *name; /* for filters and codecs */ + CLSID clsid; /* for DMOs */ IPropertyBag IPropertyBag_iface; };

1 0

Zebediah Figura : maintainers: Add devenum to the DirectShow section.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 3ca217219725212f2f13488956f1a0a80937f1ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ca217219725212f2f134889… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 22:22:51 2020 -0500 maintainers: Add devenum to the DirectShow section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index dd55c12db8..d5b9133c79 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -106,6 +106,7 @@ DirectShow M: Zebediah Figura <z.figura12(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/amstream/ +F: dlls/devenum/ F: dlls/mciqtz32/ F: dlls/qasf/ F: dlls/qcap/

1 0

Jacek Caban : kernelbase: Forward threadpool I/O functions to ntdll.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 1da0d17419909cec92f1f2b78d2ee216e1f6f20a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1da0d17419909cec92f1f2b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 02:00:06 2020 +0200 kernelbase: Forward threadpool I/O functions to ntdll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-threadpool-l1-1-0.spec | 6 +++--- .../api-ms-win-core-threadpool-l1-2-0.spec | 6 +++--- dlls/kernel32/kernel32.spec | 6 +++--- dlls/kernelbase/kernelbase.spec | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec index a8a264182a..52057fedca 100644 --- a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec +++ b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec @@ -1,10 +1,10 @@ @ stdcall CallbackMayRunLong(ptr) kernel32.CallbackMayRunLong -@ stub CancelThreadpoolIo +@ stdcall CancelThreadpoolIo(ptr) kernel32.CancelThreadpoolIo @ stdcall ChangeTimerQueueTimer(ptr ptr long long) kernel32.ChangeTimerQueueTimer @ stdcall CloseThreadpool(ptr) kernel32.CloseThreadpool @ stdcall CloseThreadpoolCleanupGroup(ptr) kernel32.CloseThreadpoolCleanupGroup @ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) kernel32.CloseThreadpoolCleanupGroupMembers -@ stub CloseThreadpoolIo +@ stdcall CloseThreadpoolIo(ptr) kernel32.CloseThreadpoolIo @ stdcall CloseThreadpoolTimer(ptr) kernel32.CloseThreadpoolTimer @ stdcall CloseThreadpoolWait(ptr) kernel32.CloseThreadpoolWait @ stdcall CloseThreadpoolWork(ptr) kernel32.CloseThreadpoolWork @@ -36,7 +36,7 @@ @ stdcall SubmitThreadpoolWork(ptr) kernel32.SubmitThreadpoolWork @ stdcall TrySubmitThreadpoolCallback(ptr ptr ptr) kernel32.TrySubmitThreadpoolCallback @ stdcall UnregisterWaitEx(long long) kernel32.UnregisterWaitEx -@ stub WaitForThreadpoolIoCallbacks +@ stdcall WaitForThreadpoolIoCallbacks(ptr) kernel32.WaitForThreadpoolIoCallbacks @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) kernel32.WaitForThreadpoolTimerCallbacks @ stdcall WaitForThreadpoolWaitCallbacks(ptr long) kernel32.WaitForThreadpoolWaitCallbacks @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) kernel32.WaitForThreadpoolWorkCallbacks diff --git a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec index fc373c3c89..0c5d176c4e 100644 --- a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec +++ b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec @@ -1,9 +1,9 @@ @ stdcall CallbackMayRunLong(ptr) kernel32.CallbackMayRunLong -@ stub CancelThreadpoolIo +@ stdcall CancelThreadpoolIo(ptr) kernel32.CancelThreadpoolIo @ stdcall CloseThreadpool(ptr) kernel32.CloseThreadpool @ stdcall CloseThreadpoolCleanupGroup(ptr) kernel32.CloseThreadpoolCleanupGroup @ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) kernel32.CloseThreadpoolCleanupGroupMembers -@ stub CloseThreadpoolIo +@ stdcall CloseThreadpoolIo(ptr) kernel32.CloseThreadpoolIo @ stdcall CloseThreadpoolTimer(ptr) kernel32.CloseThreadpoolTimer @ stdcall CloseThreadpoolWait(ptr) kernel32.CloseThreadpoolWait @ stdcall CloseThreadpoolWork(ptr) kernel32.CloseThreadpoolWork @@ -31,7 +31,7 @@ @ stdcall StartThreadpoolIo(ptr) kernel32.StartThreadpoolIo @ stdcall SubmitThreadpoolWork(ptr) kernel32.SubmitThreadpoolWork @ stdcall TrySubmitThreadpoolCallback(ptr ptr ptr) kernel32.TrySubmitThreadpoolCallback -@ stub WaitForThreadpoolIoCallbacks +@ stdcall WaitForThreadpoolIoCallbacks(ptr) kernel32.WaitForThreadpoolIoCallbacks @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) kernel32.WaitForThreadpoolTimerCallbacks @ stdcall WaitForThreadpoolWaitCallbacks(ptr long) kernel32.WaitForThreadpoolWaitCallbacks @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) kernel32.WaitForThreadpoolWorkCallbacks diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2e2f7c9a84..a5550dd359 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -210,7 +210,7 @@ @ stdcall -import CancelIo(long) @ stdcall -import CancelIoEx(long ptr) @ stdcall -import CancelSynchronousIo(long) -# @ stub CancelThreadpoolIo +@ stdcall CancelThreadpoolIo(ptr) ntdll.TpCancelAsyncIoOperation @ stdcall CancelTimerQueueTimer(ptr ptr) @ stdcall -import CancelWaitableTimer(long) @ stdcall -import ChangeTimerQueueTimer(ptr ptr long long) @@ -230,7 +230,7 @@ @ stdcall CloseThreadpool(ptr) ntdll.TpReleasePool @ stdcall CloseThreadpoolCleanupGroup(ptr) ntdll.TpReleaseCleanupGroup @ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) ntdll.TpReleaseCleanupGroupMembers -# @ stub CloseThreadpoolIo +@ stdcall CloseThreadpoolIo(ptr) ntdll.TpReleaseIoCompletion @ stdcall CloseThreadpoolTimer(ptr) ntdll.TpReleaseTimer @ stdcall CloseThreadpoolWait(ptr) ntdll.TpReleaseWait @ stdcall CloseThreadpoolWork(ptr) ntdll.TpReleaseWork @@ -1581,7 +1581,7 @@ @ stdcall -import WaitForMultipleObjectsEx(long ptr long long long) @ stdcall -import WaitForSingleObject(long long) @ stdcall -import WaitForSingleObjectEx(long long long) -# @ stub WaitForThreadpoolIoCallbacks +@ stdcall WaitForThreadpoolIoCallbacks(ptr) ntdll.TpWaitForIoCompletion @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) ntdll.TpWaitForTimer @ stdcall WaitForThreadpoolWaitCallbacks(ptr long) ntdll.TpWaitForWait @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) ntdll.TpWaitForWork diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index d74f65c8f1..9aa0613ea5 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -105,7 +105,7 @@ @ stdcall CancelIo(long) @ stdcall CancelIoEx(long ptr) @ stdcall CancelSynchronousIo(long) -@ stub CancelThreadpoolIo +@ stdcall CancelThreadpoolIo(ptr) ntdll.TpCancelAsyncIoOperation @ stdcall CancelWaitableTimer(long) # @ stub CeipIsOptedIn @ stdcall ChangeTimerQueueTimer(ptr ptr long long) @@ -146,7 +146,7 @@ @ stdcall CloseThreadpool(ptr) ntdll.TpReleasePool @ stdcall CloseThreadpoolCleanupGroup(ptr) ntdll.TpReleaseCleanupGroup @ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) ntdll.TpReleaseCleanupGroupMembers -@ stub CloseThreadpoolIo +@ stdcall CloseThreadpoolIo(ptr) ntdll.TpReleaseIoCompletion @ stdcall CloseThreadpoolTimer(ptr) ntdll.TpReleaseTimer @ stdcall CloseThreadpoolWait(ptr) ntdll.TpReleaseWait @ stdcall CloseThreadpoolWork(ptr) ntdll.TpReleaseWork @@ -1690,7 +1690,7 @@ @ stdcall WaitForMultipleObjectsEx(long ptr long long long) @ stdcall WaitForSingleObject(long long) @ stdcall WaitForSingleObjectEx(long long long) -@ stub WaitForThreadpoolIoCallbacks +@ stdcall WaitForThreadpoolIoCallbacks(ptr) ntdll.TpWaitForIoCompletion @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) ntdll.TpWaitForTimer @ stdcall WaitForThreadpoolWaitCallbacks(ptr long) ntdll.TpWaitForWait @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) ntdll.TpWaitForWork

1 0

Zebediah Figura : devenum: Return E_INVALIDARG from IPropertyBag::Write() for invalid variant types.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 7c16aacc5f35fde06566ad47625c9347dc68035b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c16aacc5f35fde06566ad47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 22:22:48 2020 -0500 devenum: Return E_INVALIDARG from IPropertyBag::Write() for invalid variant types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 2 +- dlls/devenum/tests/devenum.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 569baffb21..15e5c9642c 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -265,7 +265,7 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, const WCHAR *name, } default: WARN("Unhandled type %s.\n", debugstr_vt(V_VT(var))); - return E_FAIL; + return E_INVALIDARG; } RegCloseKey(key); diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 06efa3d773..01e6be98da 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -377,7 +377,7 @@ static void test_directshow_filter(void) V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); VariantClear(&var); V_VT(&var) = VT_I4; @@ -406,7 +406,7 @@ static void test_directshow_filter(void) V_VT(&var) = VT_UI4; hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); V_VT(&var) = VT_ARRAY | VT_UI1; V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); @@ -513,7 +513,7 @@ static void test_codec(void) V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); VariantClear(&var); V_VT(&var) = VT_EMPTY; @@ -559,7 +559,7 @@ static void test_codec(void) V_VT(&var) = VT_UI4; hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); V_VT(&var) = VT_ARRAY | VT_UI1; V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound);

1 0

Zebediah Figura : devenum/tests: Avoid running test_devenum() twice.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: ab355d6ea3c9f1b0ebdbfc20821b680d0f3c2789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab355d6ea3c9f1b0ebdbfc20… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 22:22:47 2020 -0500 devenum/tests: Avoid running test_devenum() twice. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 6164efb777..06efa3d773 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -37,7 +37,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static void test_devenum(IBindCtx *bind_ctx) +static void test_devenum(void) { IEnumMoniker *enum_cat, *enum_moniker; ICreateDevEnum* create_devenum; @@ -45,6 +45,7 @@ static void test_devenum(IBindCtx *bind_ctx) IMoniker *moniker; GUID cat_guid, clsid; WCHAR *displayname; + IBindCtx *bindctx; VARIANT var; HRESULT hr; int count; @@ -58,7 +59,7 @@ static void test_devenum(IBindCtx *bind_ctx) while (IEnumMoniker_Next(enum_cat, 1, &moniker, NULL) == S_OK) { - hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (void **)&prop_bag); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); VariantInit(&var); @@ -100,7 +101,7 @@ static void test_devenum(IBindCtx *bind_ctx) "Expected CLSID_CDeviceMoniker got %s\n", wine_dbgstr_guid(&clsid)); VariantInit(&var); - hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -110,9 +111,16 @@ static void test_devenum(IBindCtx *bind_ctx) if (winetest_debug > 1) trace(" %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var))); - hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); + IPropertyBag_Release(prop_bag); + IBindCtx_Release(bindctx); + VariantClear(&var); CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); @@ -1087,21 +1095,11 @@ static void test_vfw(void) START_TEST(devenum) { - IBindCtx *bind_ctx = NULL; HRESULT hr; CoInitialize(NULL); - test_devenum(NULL); - - /* IBindCtx is allowed in IMoniker_BindToStorage (IMediaCatMoniker_BindToStorage) */ - hr = CreateBindCtx(0, &bind_ctx); - ok(hr == S_OK, "Cannot create BindCtx: (res = 0x%x)\n", hr); - if (bind_ctx) { - test_devenum(bind_ctx); - IBindCtx_Release(bind_ctx); - } - + test_devenum(); test_moniker_isequal(); test_register_filter(); test_directshow_filter();

1 0

Chip Davis : tests: Introduce compare_uint().
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: vkd3d Branch: master Commit: 5ad16f14588fb94582c11aa111a7e49456e7c943 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5ad16f14588fb94582c11aa… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Apr 12 16:03:37 2020 -0500 tests: Introduce compare_uint(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_test_utils.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 5092183..e4c8e58 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -53,20 +53,19 @@ static void set_viewport(D3D12_VIEWPORT *vp, float x, float y, vp->MaxDepth = max_depth; } +static bool compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static bool compare_color(DWORD c1, DWORD c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return false; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return false; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return false; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return false; - return true; + return compare_uint(c1 & 0xff, c2 & 0xff, max_diff) + && compare_uint((c1 >> 8) & 0xff, (c2 >> 8) & 0xff, max_diff) + && compare_uint((c1 >> 16) & 0xff, (c2 >> 16) & 0xff, max_diff) + && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff); } static D3D12_SHADER_BYTECODE shader_bytecode(const DWORD *code, size_t size)

1 0

Jacek Caban : wdm.h: Fix MmMapLockedPagesSpecifyCache declaration.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: dc214bfad723efeea96a5d33eb7fc0802dc34be9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc214bfad723efeea96a5d33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 14 20:44:38 2020 +0200 wdm.h: Fix MmMapLockedPagesSpecifyCache declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b4325cec6c..5afd274e22 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1660,7 +1660,7 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICA void WINAPI MmBuildMdlForNonPagedPool(MDL*); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); void * WINAPI MmGetSystemRoutineAddress(UNICODE_STRING*); -PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG); +PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDLX,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,MM_PAGE_PRIORITY); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); void WINAPI MmProbeAndLockPages(PMDLX, KPROCESSOR_MODE, LOCK_OPERATION); void WINAPI MmUnmapLockedPages(void*, PMDL);

1 0

Francois Gouget : winapi: Ignore function declarations that are too complex.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 4c554940d463f57e761d951b3767ddf76330563e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c554940d463f57e761d951b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:57:00 2020 +0200 winapi: Ignore function declarations that are too complex. A few function declarations are simply too complex for the winapi parser. Some are because they are in fact macro calls, and other because they mix parentheses with array declarations or strange function pointer types. When that happens print an error message and ignore the function declaration. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_parser.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index da0a929bf1..ca4cef4267 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -492,7 +492,11 @@ sub parse_c_file($$) { # die "$file: $.: syntax error: '$argument_type':'$argument_name'\n"; } else { - die "$file: $.: syntax error: '$argument'\n"; + # This is either a complex argument type, typically + # involving parentheses, or a macro argument. This is rare + # so just ignore the 'function' declaration. + print STDERR "$file: $.: cannot parse declaration argument (ignoring): '$argument'\n"; + next readmore; } $argument_type =~ s/\s*(?:const|volatile)\s*/ /g; # Remove const/volatile

1 0

Francois Gouget : winapi_test: Clarify the error message regarding struct size and alignment.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: e5531732ae8653fa81c78f7bdeb068fcbe915c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5531732ae8653fa81c78f7b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 16:56:00 2020 +0200 winapi_test: Clarify the error message regarding struct size and alignment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8f4a..453b7a42e1 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -276,7 +276,7 @@ sub _find_align_kind_size($) { } elsif (/^(struct|union)$/) { $kind = $1; if (!$size_parse_reported{$_}) { - $output->write("$type_name: can't parse type\n"); + $output->write("cannot compute the size and alignment of $type_name types\n"); $size_parse_reported{$_} = 1; } } elsif (/^\w+\s*$(?:\s*CALLBACK|\s*NTAPI|\s*WINAPI)?\s*\*\s*$\s*$.*?$$/) {

1 0