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

Jacek Caban : devpropdef.h: Fix DECLSPEC_SELECTANY usage.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: c32a97fad131ccbd6532aff0c808fef099e221c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c32a97fad131ccbd6532aff0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 14 20:22:39 2020 +0200 devpropdef.h: Fix DECLSPEC_SELECTANY usage. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/devpropdef.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/devpropdef.h b/include/devpropdef.h index 8db292c7d1..2b0b7f4a84 100644 --- a/include/devpropdef.h +++ b/include/devpropdef.h @@ -82,18 +82,18 @@ typedef struct _DEVPROPKEY { #ifdef INITGUID #ifdef __cplusplus #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ - EXTERN_C const DEVPROPKEY name = \ + EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN; \ + EXTERN_C const DEVPROPKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #else #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ - const DEVPROPKEY name = \ + extern const DEVPROPKEY name DECLSPEC_HIDDEN; \ + const DEVPROPKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #endif #else #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY + EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN #endif #ifndef IsEqualDevPropKey

1 0

Jacek Caban : wdm.h: Fix MmMapLockedPagesSpecifyCache declaration.
by Alexandre Julliard 14 Apr '20

14 Apr '20

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

Zebediah Figura : devenum/tests: Add more tests for IPropertyBag methods.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: 27f13b2bb4d0b9837775fe0a8a9e485eca53da0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=27f13b2bb4d0b9837775fe0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 00:16:01 2020 -0500 devenum/tests: Add more tests for IPropertyBag methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 128 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 124 insertions(+), 4 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index a666b2753b..89f6f8d5bb 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -310,8 +310,10 @@ static IMoniker *check_display_name_(int line, IParseDisplayName *parser, WCHAR static void test_directshow_filter(void) { + SAFEARRAYBOUND bound = {.cElements = 10}; IParseDisplayName *parser; IPropertyBag *prop_bag; + void *array_data; IMoniker *mon; WCHAR buffer[200]; LRESULT res; @@ -348,9 +350,72 @@ static void test_directshow_filter(void) ok(find_moniker(&CLSID_AudioRendererCategory, mon), "filter should be registered\n"); VariantClear(&var); + V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!wcscmp(V_BSTR(&var), L"test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + V_VT(&var) = VT_LPWSTR; + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_BSTR; + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); + + V_VT(&var) = VT_LPWSTR; + hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + VariantClear(&var); + + V_VT(&var) = VT_I4; + V_I4(&var) = 0xdeadbeef; + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_EMPTY; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + + V_VT(&var) = VT_UI4; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + V_VT(&var) = VT_BSTR; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_I4; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + + V_VT(&var) = VT_UI4; + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_ARRAY | VT_UI1; + V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); + SafeArrayAccessData(V_ARRAY(&var), &array_data); + memcpy(array_data, "test data", 10); + SafeArrayUnaccessData(V_ARRAY(&var)); + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + VariantClear(&var); + V_VT(&var) = VT_EMPTY; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == (VT_ARRAY | VT_UI1), "Got type %#x.\n", V_VT(&var)); + SafeArrayAccessData(V_ARRAY(&var), &array_data); + ok(!memcmp(array_data, "test data", 10), "Got wrong data.\n"); + SafeArrayUnaccessData(V_ARRAY(&var)); IMoniker_Release(mon); @@ -405,8 +470,10 @@ static void test_directshow_filter(void) static void test_codec(void) { + SAFEARRAYBOUND bound = {.cElements = 10}; IParseDisplayName *parser; IPropertyBag *prop_bag; + void *array_data; IMoniker *mon; WCHAR buffer[200]; VARIANT var; @@ -436,10 +503,63 @@ static void test_codec(void) hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); ok(hr == S_OK, "Write failed: %#x\n", hr); + V_VT(&var) = VT_LPWSTR; + hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + VariantClear(&var); + V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!wcscmp(V_BSTR(&var), L"test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + V_VT(&var) = VT_LPWSTR; + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_BSTR; + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); + + V_VT(&var) = VT_I4; + V_I4(&var) = 0xdeadbeef; + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_EMPTY; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + + V_VT(&var) = VT_UI4; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + V_VT(&var) = VT_BSTR; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_I4; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + + V_VT(&var) = VT_UI4; + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_ARRAY | VT_UI1; + V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); + SafeArrayAccessData(V_ARRAY(&var), &array_data); + memcpy(array_data, "test data", 10); + SafeArrayUnaccessData(V_ARRAY(&var)); + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* unlike DirectShow filters, these are automatically generated, so * enumerating them will destroy the key */

1 0

Zebediah Figura : devenum: Don't support VT_LPWSTR in IPropertyBag methods.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: e3df3ca839bfdd9a3fc71ddff04d72d40ee4ef7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3df3ca839bfdd9a3fc71ddf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 00:16:02 2020 -0500 devenum: Don't support VT_LPWSTR in IPropertyBag methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 10 ++-------- dlls/devenum/tests/devenum.c | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 4a5ae45e8b..aab044cbad 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -170,11 +170,6 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, case REG_SZ: switch (V_VT(pVar)) { - case VT_LPWSTR: - V_BSTR(pVar) = CoTaskMemAlloc(received); - memcpy(V_BSTR(pVar), pData, received); - res = S_OK; - break; case VT_EMPTY: V_VT(pVar) = VT_BSTR; /* fall through */ @@ -261,7 +256,6 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, switch (V_VT(pVar)) { case VT_BSTR: - case VT_LPWSTR: TRACE("writing %s\n", debugstr_w(V_BSTR(pVar))); lpData = V_BSTR(pVar); dwType = REG_SZ; @@ -481,13 +475,13 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, pProp = pvptr; if (SUCCEEDED(res)) { - V_VT(&var) = VT_LPWSTR; + V_VT(&var) = VT_BSTR; res = IPropertyBag_Read(pProp, clsidW, &var, NULL); } if (SUCCEEDED(res)) { res = CLSIDFromString(V_BSTR(&var), &clsID); - CoTaskMemFree(V_BSTR(&var)); + VariantClear(&var); } if (SUCCEEDED(res)) { diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 89f6f8d5bb..ce452e3904 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -359,7 +359,7 @@ static void test_directshow_filter(void) VariantClear(&var); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -517,7 +517,7 @@ static void test_codec(void) VariantClear(&var); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL);

1 0

Zebediah Figura : devenum: Don't support VT_UI4 in IPropertyBag methods.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: ccefc1f46964f083283b5c722c52f70e23d9a2ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccefc1f46964f083283b5c72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 00:16:03 2020 -0500 devenum: Don't support VT_UI4 in IPropertyBag methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 6 ++---- dlls/devenum/tests/devenum.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index aab044cbad..cee2389617 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -187,7 +187,6 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, V_VT(pVar) = VT_I4; /* fall through */ case VT_I4: - case VT_UI4: V_I4(pVar) = *(DWORD *)pData; res = S_OK; break; @@ -262,9 +261,8 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, cbData = (lstrlenW(V_BSTR(pVar)) + 1) * sizeof(WCHAR); break; case VT_I4: - case VT_UI4: - TRACE("writing %u\n", V_UI4(pVar)); - lpData = &V_UI4(pVar); + TRACE("writing %d\n", V_I4(pVar)); + lpData = &V_I4(pVar); dwType = REG_DWORD; cbData = sizeof(DWORD); break; diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index ce452e3904..6164efb777 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -385,7 +385,7 @@ static void test_directshow_filter(void) V_VT(&var) = VT_UI4; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); @@ -538,7 +538,7 @@ static void test_codec(void) V_VT(&var) = VT_UI4; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : devenum: Merge the property bag object into the moniker object.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: e3cf3823f899ce90af996c720b743c80a46603e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3cf3823f899ce90af996c72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 00:16:04 2020 -0500 devenum: Merge the property bag object into the moniker object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 2 + dlls/devenum/mediacatenum.c | 401 +++++++++++++++++------------------------ 2 files changed, 170 insertions(+), 233 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3cf3823f899ce90af99…

1 0

Zebediah Figura : ntdll: Handle unaligned condition variables when using futexes.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: aceff2102296300010dc8db7db72f059a3204eeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=aceff2102296300010dc8db7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 13 18:09:43 2020 -0500 ntdll: Handle unaligned condition variables when using futexes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48389 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 76 +++++++++++++++++------------ dlls/ntdll/sync.c | 117 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 144 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aceff2102296300010dc…

1 0

Zebediah Figura : ntdll: Handle unaligned SRW locks when using keyed events.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: 28619e60358f75740df29d0ff0be80cbd0c9e10c URL: https://source.winehq.org/git/wine.git/?a=commit;h=28619e60358f75740df29d0f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 13 18:09:44 2020 -0500 ntdll: Handle unaligned SRW locks when using keyed events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 5d1f5c3910..c0e1a30e2c 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1985,11 +1985,11 @@ static NTSTATUS fast_release_srw_shared( RTL_SRWLOCK *lock ) #define SRWLOCK_RES_SHARED 0x00000001 #ifdef WORDS_BIGENDIAN -#define srwlock_key_exclusive(lock) (&lock->Ptr) -#define srwlock_key_shared(lock) ((void *)((char *)&lock->Ptr + 2)) +#define srwlock_key_exclusive(lock) ((void *)(((ULONG_PTR)&lock->Ptr + 1) & ~1)) +#define srwlock_key_shared(lock) ((void *)(((ULONG_PTR)&lock->Ptr + 3) & ~1)) #else -#define srwlock_key_exclusive(lock) ((void *)((char *)&lock->Ptr + 2)) -#define srwlock_key_shared(lock) (&lock->Ptr) +#define srwlock_key_exclusive(lock) ((void *)(((ULONG_PTR)&lock->Ptr + 3) & ~1)) +#define srwlock_key_shared(lock) ((void *)(((ULONG_PTR)&lock->Ptr + 1) & ~1)) #endif static inline void srwlock_check_invalid( unsigned int val )

1 0

Zebediah Figura : ntdll: Handle unaligned SRW locks when using futexes.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: a6e70c60745d3d32737670aa6e8e18f95680948e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e70c60745d3d32737670aa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 13 18:09:45 2020 -0500 ntdll: Handle unaligned SRW locks when using futexes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 174 +++++++++++++++++++++++++-------------------- dlls/ntdll/sync.c | 74 +++++++++++-------- 2 files changed, 141 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6e70c60745d3d327376…

1 0

Ziqing Hui : comctl32/tests: Check alpha channel in ImageList_DrawIndirect tests.
by Alexandre Julliard 14 Apr '20

14 Apr '20

Module: wine Branch: master Commit: 8af5a4356d33a77966f87f015b50440ea24c317a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af5a4356d33a77966f87f01… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 14 10:39:28 2020 +0800 comctl32/tests: Check alpha channel in ImageList_DrawIndirect tests. Version6 comctl32 supports alpha blend. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 70 ++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 8cc3243323..1c047e046c 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1392,18 +1392,19 @@ static BOOL colour_match(UINT32 x, UINT32 y) const INT32 dr = abs((INT32)(x & 0x000000FF) - (INT32)(y & 0x000000FF)); const INT32 dg = abs((INT32)((x & 0x0000FF00) >> 8) - (INT32)((y & 0x0000FF00) >> 8)); const INT32 db = abs((INT32)((x & 0x00FF0000) >> 16) - (INT32)((y & 0x00FF0000) >> 16)); + const INT32 da = abs((INT32)((x & 0xFF000000) >> 24) - (INT32)((y & 0xFF000000) >> 24)); - return (dr <= tolerance && dg <= tolerance && db <= tolerance); + return (dr <= tolerance && dg <= tolerance && db <= tolerance && da <= tolerance); } static void check_ImageList_DrawIndirect(IMAGELISTDRAWPARAMS *ildp, UINT32 *bits, UINT32 expected, int line) { - bits[0] = 0x00FFFFFF; + bits[0] = 0xFFFFFFFF; pImageList_DrawIndirect(ildp); ok(colour_match(bits[0], expected), "ImageList_DrawIndirect: Pixel %08X, Expected a close match to %08X from line %d\n", - bits[0] & 0x00FFFFFF, expected, line); + bits[0], expected, line); } @@ -1437,12 +1438,12 @@ static void check_ImageList_DrawIndirect_broken(HDC hdc, HIMAGELIST himl, UINT32 { IMAGELISTDRAWPARAMS ildp = {sizeof(IMAGELISTDRAWPARAMS), himl, i, hdc, 0, 0, 0, 0, 0, 0, CLR_NONE, CLR_NONE, fStyle, 0, fState, Frame, 0x00000000}; - bits[0] = 0x00FFFFFF; + bits[0] = 0xFFFFFFFF; pImageList_DrawIndirect(&ildp); ok(colour_match(bits[0], expected) || broken(colour_match(bits[0], broken_expected)), "ImageList_DrawIndirect: Pixel %08X, Expected a close match to %08X from line %d\n", - bits[0] & 0x00FFFFFF, expected, line); + bits[0], expected, line); } static void check_ImageList_DrawIndirect_grayscale(HDC hdc, HIMAGELIST himl, UINT32 *dst_bits, const UINT32 *bitmap_bits, @@ -1471,13 +1472,18 @@ static void check_ImageList_DrawIndirect_grayscale(HDC hdc, HIMAGELIST himl, UIN UINT32 alpha = (bitmap_bits[i] & 0xFF000000) >> 24; gray = gray * alpha / 0xff * alpha / 0xff; gray_winxp = gray_winxp * alpha / 0xff * 0x96 / 0xff; + expected = (alpha << 24) | (gray << 16) | (gray << 8) | gray; + expected_winxp = ((alpha * 0x96 / 0xff) << 24) | (gray_winxp << 16) | (gray_winxp << 8) | gray_winxp; + } + else + { + expected = ((UINT32)0xFF << 24) | (gray << 16) | (gray << 8) | gray; + expected_winxp = (gray_winxp << 16) | (gray_winxp << 8) | gray_winxp; } - expected = (gray << 16) | (gray << 8) | gray; - expected_winxp = (gray_winxp << 16) | (gray_winxp << 8) | gray_winxp; ok(colour_match(dst_bits[i], expected) || broken(colour_match(dst_bits[i], expected_winxp)), "ImageList_DrawIndirect: got Pixel(%d,%d) %08X, Expected a close match to %08X from line %d\n", - i % width, i / width, dst_bits[i] & 0x00FFFFFF, expected, line); + i % width, i / width, dst_bits[i], expected, line); } } @@ -1574,46 +1580,46 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_NORMAL, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_TRANSPARENT, 0x00ABCDEF, __LINE__); - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0x00E8F1FA, 0x00D4D9DD, __LINE__); - if (bpp == 16 || bpp == 24) broken_value = 0x00D4D9DD; - else broken_value = 0x00B4BDC4; - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, broken_value, __LINE__); + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0xFFE8F1FA, 0xFFD4D9DD, __LINE__); + if (bpp == 16 || bpp == 24) broken_value = 0xFFD4D9DD; + else broken_value = 0xFFB4BDC4; + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0xFFE8F1FA, broken_value, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_MASK, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_IMAGE, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_PRESERVEALPHA, 0x00ABCDEF, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, 0x00D3E5F7, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_TRANSPARENT, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, 0xFFD3E5F7, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_TRANSPARENT, 0xFFD3E5F7, __LINE__); - if (bpp == 16 || bpp == 24) broken_value = 0x00D4D9DD; - else broken_value = 0x009DA8B1; - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0x00E8F1FA, broken_value, __LINE__); - if (bpp == 16 || bpp == 24) broken_value = 0x00D4D9DD; - else broken_value = 0x008C99A3; - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, broken_value, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0x00D3E5F7, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0x00D3E5F7, __LINE__); - todo_wine check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x005D6F81, __LINE__); + if (bpp == 16 || bpp == 24) broken_value = 0xFFD4D9DD; + else broken_value = 0xFF9DA8B1; + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0xFFE8F1FA, broken_value, __LINE__); + if (bpp == 16 || bpp == 24) broken_value = 0xFFD4D9DD; + else broken_value = 0xFF8C99A3; + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0xFFE8F1FA, broken_value, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0xFFD3E5F7, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0xFFD3E5F7, __LINE__); + todo_wine check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x895D6F81, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iTransparentImage, ILD_NORMAL, 0x00FFFFFF, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iTransparentImage, ILD_NORMAL, 0xFFFFFFFF, __LINE__); check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iImage, SRCCOPY, 0x00ABCDEF, __LINE__); - check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iImage, SRCINVERT, 0x00543210, __LINE__); + check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iImage, SRCINVERT, 0xFF543210, __LINE__); /* ILD_ROP is ignored when the image has an alpha channel */ - check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCCOPY, 0x00D3E5F7, __LINE__); - check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCINVERT, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCCOPY, 0xFFD3E5F7, __LINE__); + check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCINVERT, 0xFFD3E5F7, __LINE__); check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_image, iImage, 2, 1, __LINE__); check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_alpha, iAlphaImage, 2, 1, __LINE__); check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_transparent, iTransparentImage, 2, 1, __LINE__); - check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_GLOW, 0, 0x00ABCDEF, __LINE__); - check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SHADOW, 0, 0x00ABCDEF, __LINE__); + check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_GLOW, 0, 0x00ABCDEF, 0xFFABCDEF, __LINE__); + check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SHADOW, 0, 0x00ABCDEF, 0xFFABCDEF, __LINE__); - check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00D5E6F7, __LINE__); - check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00E9F2FB, 0x00AEB7C0, __LINE__); - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_NORMAL, 127, 0x00E9F2FB, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_ALPHA, 127, 0xFFD5E6F7, __LINE__); + check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_ALPHA, 127, 0xFFE9F2FB, 0xFFAEB7C0, __LINE__); + check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_NORMAL, 127, 0xFFD3E5F7, __LINE__); /* 4x4 bitmap tests */ SelectObject(hdcDst, hbmOld);

1 0