- wine-devel - winehq.org

[PATCH 1/6] mfplat: Implement Compare() for attributes.
by Nikolay Sivov 18 Mar '19

18 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 101 +++++++++++++++-- dlls/mfplat/tests/mfplat.c | 223 ++++++++++++++++++++++++++++++++++++- 2 files changed, 315 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 88945f6724..4589840c21 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -724,9 +724,24 @@ static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PR static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) { - FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), type); + struct attributes *attributes = impl_from_IMFAttributes(iface); + struct attribute *attribute; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), type); + + EnterCriticalSection(&attributes->cs); + + if ((attribute = attributes_find_item(attributes, key, NULL))) + { + *type = attribute->value.vt; + } + else + hr = MF_E_ATTRIBUTENOTFOUND; + + LeaveCriticalSection(&attributes->cs); + + return hr; } static HRESULT WINAPI mfattributes_CompareItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) @@ -748,14 +763,86 @@ static HRESULT WINAPI mfattributes_CompareItem(IMFAttributes *iface, REFGUID key return S_OK; } -static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, - BOOL *result) +static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes *theirs, + MF_ATTRIBUTES_MATCH_TYPE match_type, BOOL *ret) { - mfattributes *This = impl_from_IMFAttributes(iface); + struct attributes *attributes = impl_from_IMFAttributes(iface); + IMFAttributes *smaller, *other; + MF_ATTRIBUTE_TYPE type; + HRESULT hr = S_OK; + UINT32 count; + BOOL result; + size_t i; - FIXME("%p, %p, %d, %p\n", This, theirs, type, result); + TRACE("%p, %p, %d, %p.\n", iface, theirs, match_type, ret); - return E_NOTIMPL; + if (FAILED(hr = IMFAttributes_GetCount(theirs, &count))) + return hr; + + EnterCriticalSection(&attributes->cs); + + result = TRUE; + + switch (match_type) + { + case MF_ATTRIBUTES_MATCH_OUR_ITEMS: + for (i = 0; i < attributes->count; ++i) + { + if (FAILED(hr = IMFAttributes_CompareItem(theirs, &attributes->attributes[i].key, + &attributes->attributes[i].value, &result))) + break; + if (!result) + break; + } + break; + case MF_ATTRIBUTES_MATCH_THEIR_ITEMS: + hr = IMFAttributes_Compare(theirs, iface, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + break; + case MF_ATTRIBUTES_MATCH_ALL_ITEMS: + if (count != attributes->count) + { + result = FALSE; + break; + } + for (i = 0; i < count; ++i) + { + if (FAILED(hr = IMFAttributes_CompareItem(theirs, &attributes->attributes[i].key, + &attributes->attributes[i].value, &result))) + break; + if (!result) + break; + } + break; + case MF_ATTRIBUTES_MATCH_INTERSECTION: + for (i = 0; i < attributes->count; ++i) + { + if (FAILED(IMFAttributes_GetItemType(theirs, &attributes->attributes[i].key, &type))) + continue; + + if (FAILED(hr = IMFAttributes_CompareItem(theirs, &attributes->attributes[i].key, + &attributes->attributes[i].value, &result))) + break; + + if (!result) + break; + } + break; + case MF_ATTRIBUTES_MATCH_SMALLER: + smaller = attributes->count > count ? theirs : iface; + other = attributes->count > count ? iface : theirs; + hr = IMFAttributes_Compare(smaller, other, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + break; + default: + WARN("Unknown match type %d.\n", match_type); + hr = E_INVALIDARG; + } + + LeaveCriticalSection(&attributes->cs); + + if (SUCCEEDED(hr)) + *ret = result; + + return hr; } static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 38151d9020..d012acc524 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -496,14 +496,27 @@ static void check_attr_count(IMFAttributes* obj, UINT32 expected, int line) ok_(__FILE__, line)(count == expected, "Unexpected count %u, expected %u.\n", count, expected); } -static void test_MFCreateAttributes(void) +#define CHECK_ATTR_TYPE(obj, key, expected) check_attr_type(obj, key, expected, __LINE__) +static void check_attr_type(IMFAttributes *obj, const GUID *key, MF_ATTRIBUTE_TYPE expected, int line) +{ + MF_ATTRIBUTE_TYPE type; + HRESULT hr; + + hr = IMFAttributes_GetItemType(obj, key, &type); + ok_(__FILE__, line)(hr == S_OK, "Failed to get item type, hr %#x.\n", hr); + ok_(__FILE__, line)(type == expected, "Unexpected item type %d, expected %d.\n", type, expected); +} + +static void test_attributes(void) { static const WCHAR stringW[] = {'W','i','n','e',0}; static const UINT8 blob[] = {0,1,2,3,4,5}; IMFAttributes *attributes, *attributes1; UINT8 blob_value[256], *blob_buf = NULL; + MF_ATTRIBUTES_MATCH_TYPE match_type; UINT32 value, string_length, size; PROPVARIANT propvar, ret_propvar; + MF_ATTRIBUTE_TYPE type; double double_value; IUnknown *unk_value; WCHAR bufferW[256]; @@ -516,10 +529,14 @@ static void test_MFCreateAttributes(void) hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFAttributes_GetItemType(attributes, &GUID_NULL, &type); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); ok(hr == S_OK, "Failed to set UINT32 value, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 1); + CHECK_ATTR_TYPE(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, MF_ATTRIBUTE_UINT32); value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &value); @@ -534,6 +551,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); ok(hr == S_OK, "Failed to set UINT64 value, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 1); + CHECK_ATTR_TYPE(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, MF_ATTRIBUTE_UINT64); hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &value64); ok(hr == S_OK, "Failed to get UINT64 value, hr %#x.\n", hr); @@ -643,6 +661,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetDouble(attributes, &GUID_NULL, 22.0); ok(hr == S_OK, "Failed to set double value, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 3); + CHECK_ATTR_TYPE(attributes, &GUID_NULL, MF_ATTRIBUTE_DOUBLE); double_value = 0xdeadbeef; hr = IMFAttributes_GetDouble(attributes, &GUID_NULL, &double_value); @@ -664,6 +683,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetString(attributes, &DUMMY_GUID1, stringW); ok(hr == S_OK, "Failed to set string attribute, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 3); + CHECK_ATTR_TYPE(attributes, &DUMMY_GUID1, MF_ATTRIBUTE_STRING); hr = IMFAttributes_GetStringLength(attributes, &DUMMY_GUID1, &string_length); ok(hr == S_OK, "Failed to get string length, hr %#x.\n", hr); @@ -701,6 +721,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID2, (IUnknown *)attributes); ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 4); + CHECK_ATTR_TYPE(attributes, &DUMMY_GUID2, MF_ATTRIBUTE_IUNKNOWN); hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IUnknown, (void **)&unk_value); ok(hr == S_OK, "Failed to get value, hr %#x.\n", hr); @@ -747,6 +768,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetBlob(attributes, &DUMMY_GUID1, blob, sizeof(blob)); ok(hr == S_OK, "Failed to set blob attribute, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 1); + CHECK_ATTR_TYPE(attributes, &DUMMY_GUID1, MF_ATTRIBUTE_BLOB); hr = IMFAttributes_GetBlobSize(attributes, &DUMMY_GUID1, &size); ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); ok(size == sizeof(blob), "Unexpected blob size %u.\n", size); @@ -779,6 +801,203 @@ static void test_MFCreateAttributes(void) IMFAttributes_Release(attributes); IMFAttributes_Release(attributes1); + + /* Compare() */ + hr = MFCreateAttributes(&attributes, 0); + ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + hr = MFCreateAttributes(&attributes1, 0); + ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + + hr = IMFAttributes_Compare(attributes, attributes, MF_ATTRIBUTES_MATCH_SMALLER + 1, &result); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + for (match_type = MF_ATTRIBUTES_MATCH_OUR_ITEMS; match_type <= MF_ATTRIBUTES_MATCH_SMALLER; ++match_type) + { + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes, match_type, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, match_type, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + } + + hr = IMFAttributes_SetUINT32(attributes, &DUMMY_GUID1, 1); + ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + hr = IMFAttributes_SetUINT32(attributes1, &DUMMY_GUID1, 2); + ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + hr = IMFAttributes_SetUINT32(attributes1, &DUMMY_GUID1, 1); + ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + hr = IMFAttributes_SetUINT32(attributes1, &DUMMY_GUID2, 2); + ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + IMFAttributes_Release(attributes); + IMFAttributes_Release(attributes1); } static void test_MFCreateMFByteStreamOnStream(void) @@ -2112,7 +2331,7 @@ START_TEST(mfplat) test_register(); test_media_type(); test_MFCreateMediaEvent(); - test_MFCreateAttributes(); + test_attributes(); test_sample(); test_MFCreateFile(); test_MFCreateMFByteStreamOnStream(); -- 2.20.1

2 8

[PATCH 3/5] include: Introduce ascii_strncasecmp helper and use it in msvcrt.
by Piotr Caban 18 Mar '19

18 Mar '19

In tr_TR.UTF-8 locale tolower('I') != 'i' (this is not a bug in glibc, tolower('I') is suppossed to return dotless i that is 2-byte long). Because of that strcasemp("i", "I") returns that the strings are different. Another way of fixing it is to stop setting system locale for LC_CTYPE. Spotted by Jactry Zeng. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 13 +++++++------ dlls/msvcrt/mbcs.c | 5 +++-- dlls/msvcrt/string.c | 7 ++++--- include/wine/strings.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 include/wine/strings.h

2 1

[PATCH] riched20: Implement MSVC asm wrappers.
by Thomas Faber 18 Mar '19

18 Mar '19

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/riched20/txthost.c | 23 +++++++++++++++++++++++ dlls/riched20/txtsrv.c | 12 ++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index eaa6aaef065..d709502a1ec 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -502,6 +502,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) (void *) __thiscall_ ## func +#ifdef _MSC_VER +#define DEFINE_THISCALL_WRAPPER(func,args) \ + __declspec(naked) HRESULT __thiscall_##func(void) \ + { \ + __asm pop eax \ + __asm push ecx \ + __asm push eax \ + __asm jmp func \ + } +#else /* _MSC_VER */ #define DEFINE_THISCALL_WRAPPER(func,args) \ extern HRESULT __thiscall_ ## func(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -509,6 +519,7 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ #else /* __i386__ */ @@ -560,6 +571,17 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) #ifdef __i386__ /* thiscall functions are i386-specific */ #define STDCALL(func) (void *) __stdcall_ ## func +#ifdef _MSC_VER +#define DEFINE_STDCALL_WRAPPER(num,func,args) \ + __declspec(naked) HRESULT __stdcall_##func(void) \ + { \ + __asm pop eax \ + __asm pop ecx \ + __asm push eax \ + __asm mov eax, [ecx] \ + __asm jmp dword ptr [eax + 4*num] \ + } +#else /* _MSC_VER */ #define DEFINE_STDCALL_WRAPPER(num,func,args) \ extern HRESULT __stdcall_ ## func(void); \ __ASM_GLOBAL_FUNC(__stdcall_ ## func, \ @@ -568,6 +590,7 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) "pushl %eax\n\t" \ "movl (%ecx), %eax\n\t" \ "jmp *(4*(" #num "))(%eax)" ) +#endif /* _MSC_VER */ DEFINE_STDCALL_WRAPPER(3,ITextHostImpl_TxGetDC,4) DEFINE_STDCALL_WRAPPER(4,ITextHostImpl_TxReleaseDC,8) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 639a94fbd06..37b866a7f85 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -36,6 +36,16 @@ #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) (void *) __thiscall_ ## func +#ifdef _MSC_VER +#define DEFINE_THISCALL_WRAPPER(func,args) \ + __declspec(naked) HRESULT __thiscall_##func(void) \ + { \ + __asm pop eax \ + __asm push ecx \ + __asm push eax \ + __asm jmp func \ + } +#else /* _MSC_VER */ #define DEFINE_THISCALL_WRAPPER(func,args) \ extern HRESULT __thiscall_ ## func(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -43,6 +53,8 @@ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ + #else /* __i386__ */ #define THISCALL(func) func -- 2.16.1.windows.2

2 1

[PATCH v3] kernel32: make GetEnvironmentStringsW returns a copy of the environment
by Jon Doron 18 Mar '19

18 Mar '19

There are certain applications which try to traverse the environement being returned, but this is problematic since they cannot acquire the PEB Lock (i.e cl.exe on Visual Studio 14.15) . To resolve the issue provide a copy of the current environment same as in GetEnvironmentStringsA . Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/environ.c | 27 +++++++++++++++++++++++++-- dlls/kernel32/tests/environ.c | 15 +++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 99bf706e95..5a5f50340e 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -139,7 +139,30 @@ LPSTR WINAPI GetEnvironmentStringsA(void) */ LPWSTR WINAPI GetEnvironmentStringsW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->Environment; + LPWSTR ret, ptrW; + unsigned len; + + RtlAcquirePebLock(); + + ptrW = NtCurrentTeb()->Peb->ProcessParameters->Environment; + if (!ptrW || !*ptrW) + { + RtlReleasePebLock(); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR) * 2); + } + + while (*ptrW) + ptrW += strlenW(ptrW) + 1; + + len = (ULONG_PTR)ptrW - (ULONG_PTR)NtCurrentTeb()->Peb->ProcessParameters->Environment; + ret = HeapAlloc(GetProcessHeap(), 0, len + sizeof(WCHAR)); + if (ret) { + memcpy(ret, NtCurrentTeb()->Peb->ProcessParameters->Environment, len); + ret[len / 2] = 0; + } + + RtlReleasePebLock(); + return ret; } @@ -157,7 +180,7 @@ BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr ) */ BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr ) { - return TRUE; + return HeapFree( GetProcessHeap(), 0, ptr ); } diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index f8452be2ee..4249ea7ebe 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -554,6 +554,20 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); } +static void test_GetEnvironmentStringsW(void) +{ + PWCHAR env1; + PWCHAR env2; + + env1 = GetEnvironmentStringsW(); + env2 = GetEnvironmentStringsW(); + ok(env1 != env2 || + broken(env1 == env2), /* NT <= 5.1 */ + "should return different copies\n"); + FreeEnvironmentStringsW(env1); + FreeEnvironmentStringsW(env2); +} + START_TEST(environ) { init_functionpointers(); @@ -565,4 +579,5 @@ START_TEST(environ) test_GetComputerName(); test_GetComputerNameExA(); test_GetComputerNameExW(); + test_GetEnvironmentStringsW(); } -- 2.19.2

1 0

[PATCH 5/5] include: Introduce ascii_toupper and use it in msvcrt.
by Piotr Caban 17 Mar '19

17 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/mbcs.c | 6 +++--- include/wine/strings.h | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-)

1 0

[PATCH 4/5] include: Introduce ascii_tolower and use it in msvcrt.
by Piotr Caban 17 Mar '19

17 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 5 +++-- dlls/msvcrt/mbcs.c | 6 +++--- dlls/msvcrt/string.c | 22 +++++++++++----------- include/wine/strings.h | 5 +++++ 4 files changed, 22 insertions(+), 16 deletions(-)

1 0

[PATCH 2/5] msvcrt: Use correct locale when comparing strings in getenv.
by Piotr Caban 17 Mar '19

17 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 1/5] msvcrt: Correctly set _stat64.st_dev fields in _wstat64.
by Piotr Caban 17 Mar '19

17 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

Re: [PATCH v1] kernel32: make GetEnvironmentStringsW returns a copy of the environment
by Nikolay Sivov 17 Mar '19

17 Mar '19

On 3/17/19 6:27 PM, Jon Doron wrote: > Also one thing worth noting how do you want me to code a test for > this? This part in the PEB is opaque > (https://docs.microsoft.com/en-us/windows/desktop/api/winternl/) Just call it two times and compare pointers. > > Thanks, > Jon. > > On Sun, Mar 17, 2019, 17:23 Jon Doron <arilou(a)gmail.com > <mailto:arilou@gmail.com>> wrote: > > Hi Nikolay I looked and noticed on XP the behavior is what's > currently in Wine but from NT6 aka Vista it's the new behavior > that I have implemented > > Do you want me to code a test that runs only if it's nt 6 and above? > It should run on both, with one case marked broken() for example. I think the real question is why this has anything to do with PEB lock, if current implementation does not require locking. > > Thanks, > Jon. > > On Sat, Mar 16, 2019, 21:02 Nikolay Sivov <nsivov(a)codeweavers.com > <mailto:nsivov@codeweavers.com>> wrote: > > On 3/16/19 9:57 PM, Jon Doron wrote: > > There are certain applications which try to traverse the > environement > > being returned, but this is problematic since they cannot > acquire the > > PEB Lock (i.e cl.exe on Visual Studio 14.15) . To resolve > the issue > > provide a copy of the current environment same as in > > GetEnvironmentStringsA . > Please add a test to confirm this change. >

2 1

Wine staging 4.4 release
by Alistair Leslie-Hughes 17 Mar '19

17 Mar '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.4 (770 patches are applied to wine vanilla) NOTE: All FAudio patches has been reverted due to the lack of offical package support. This will allow games that require XAudio2 support to still function. Upstreamed (Either directly from staging or fixed with a similar patch). * d3d8: Improve ValidatePixelShader stub. * wmvcore: Implement WMCreateSyncReader. * wmvcore: Implement WMCreateSyncReaderPriv. * iccvid: Fix calculation of stride and size. * msvidc32: Add support for converting 16 bit depth to 24 bit. * msvidc32: Fix calculation of stride and size. * setupapi: Added CM_Request_Device_EjectA/W stub. * setupapi: Add SetupDiInstallDeviceInterfaces. * setupapi: Add SetupDiRegisterCoDeviceInstallers stub. * msidb: Add stub tool for manipulating MSI databases. * msidb: Add support for importing database tables. * msidb: Add support for adding stream/cabinet files to MSI databases. * msi: Add support for deleting streams from an MSI database. * msidb: Add support for removing stream/cabinet files from MSI databases. * msidb: Add support for extracting stream/cabinet files from MSI databases. * msidb: Add support for exporting database tables. * msidb: Add support for exporting with short (DOS) filenames. * msi: Add support for exporting the _SummaryInformation table. * msi: Break out field exporting into a separate routine. * msi: Add support for exporting binary streams (Binary/Icon tables). * msidb: Add support for wildcard (full database) export. Added: * [33018] pdh: Support the 'Processor' object string. Updated: * d3dx9_36-DrawText * wined3d-SWVP-shaders * wined3d-Indexed_Vertex_Blending Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v2] kernel32: make GetEnvironmentStringsW returns a copy of the environment
by Jon Doron 17 Mar '19

17 Mar '19

There are certain applications which try to traverse the environement being returned, but this is problematic since they cannot acquire the PEB Lock (i.e cl.exe on Visual Studio 14.15) . To resolve the issue provide a copy of the current environment same as in GetEnvironmentStringsA . Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/environ.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 99bf706e95..5a5f50340e 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -139,7 +139,30 @@ LPSTR WINAPI GetEnvironmentStringsA(void) */ LPWSTR WINAPI GetEnvironmentStringsW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->Environment; + LPWSTR ret, ptrW; + unsigned len; + + RtlAcquirePebLock(); + + ptrW = NtCurrentTeb()->Peb->ProcessParameters->Environment; + if (!ptrW || !*ptrW) + { + RtlReleasePebLock(); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR) * 2); + } + + while (*ptrW) + ptrW += strlenW(ptrW) + 1; + + len = (ULONG_PTR)ptrW - (ULONG_PTR)NtCurrentTeb()->Peb->ProcessParameters->Environment; + ret = HeapAlloc(GetProcessHeap(), 0, len + sizeof(WCHAR)); + if (ret) { + memcpy(ret, NtCurrentTeb()->Peb->ProcessParameters->Environment, len); + ret[len / 2] = 0; + } + + RtlReleasePebLock(); + return ret; } @@ -157,7 +180,7 @@ BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr ) */ BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr ) { - return TRUE; + return HeapFree( GetProcessHeap(), 0, ptr ); } -- 2.19.2

2 1

[PATCH] mfplat/tests: A wording tweak in a win_skip() messages.
by Francois Gouget 16 Mar '19

16 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 38151d90207..3a102e2aa29 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -825,7 +825,7 @@ static void test_MFCreateMFByteStreamOnStream(void) if (hr != S_OK) { - win_skip("Can not retrieve IMFAttributes interface from IMFByteStream\n"); + win_skip("Cannot retrieve IMFAttributes interface from IMFByteStream\n"); IStream_Release(stream); IMFByteStream_Release(bytestream); return; -- 2.20.1

1 0

[PATCH] dbghelp: Make minidump_add_memory64_block() static.
by Francois Gouget 16 Mar '19

16 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/minidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index b096476aaf3..6a2525f8e1f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -294,7 +294,7 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, return TRUE; } -void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) +static void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) { if (!dc->mem64) { -- 2.20.1

1 0

[PATCH] ntoskrnl.exe/tests: Make vskip_(), win_skip_() and kmemcpy() static.
by Francois Gouget 16 Mar '19

16 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntoskrnl.exe/tests/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 7f2e68c3ded..ae15df38129 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -126,7 +126,7 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m __ms_va_end(args); } -void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +static void vskip_(const char *file, int line, const char *msg, __ms_va_list args) { const char *current_file; @@ -141,7 +141,7 @@ void vskip_(const char *file, int line, const char *msg, __ms_va_list args) skipped++; } -void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +static void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) { __ms_va_list args; __ms_va_start(args, msg); @@ -185,7 +185,7 @@ static unsigned int strlenW( const WCHAR *str ) return s - str; } -void *kmemcpy(void *dest, const void *src, SIZE_T n) +static void *kmemcpy(void *dest, const void *src, SIZE_T n) { const char *s = src; char *d = dest; -- 2.20.1

1 0

[PATCH] kernel32/tests: A spelling fix in a win_skip() message.
by Francois Gouget 16 Mar '19

16 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 4c7df3d9899..3f30cce5353 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3680,7 +3680,7 @@ static void test_multiple_instances(void) if(!pCancelIoEx) { - win_skip("Skiping multiple instance tests on too old Windows\n"); + win_skip("Skipping multiple instance tests on too old Windows\n"); return; } -- 2.20.1

1 0

[PATCH] ntdll: Fix unwinding from leaf function on x86_64.
by Derek Lesho 16 Mar '19

16 Mar '19

--- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 54871b8302..21e7098876 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4232,7 +4232,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec new_context.Rip = *(ULONG64 *)context->Rsp; new_context.Rsp = context->Rsp + sizeof(ULONG64); - dispatch.EstablisherFrame = new_context.Rsp; + dispatch.EstablisherFrame = context->Rsp; dispatch.LanguageHandler = NULL; unwind_done: -- 2.20.1

3 5

[PATCH v1] kernel32: make GetEnvironmentStringsW returns a copy of the environment
by Jon Doron 16 Mar '19

16 Mar '19

There are certain applications which try to traverse the environement being returned, but this is problematic since they cannot acquire the PEB Lock (i.e cl.exe on Visual Studio 14.15) . To resolve the issue provide a copy of the current environment same as in GetEnvironmentStringsA . Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/environ.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 99bf706e95..c8f32aa0fb 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -139,7 +139,22 @@ LPSTR WINAPI GetEnvironmentStringsA(void) */ LPWSTR WINAPI GetEnvironmentStringsW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->Environment; + LPWSTR ret, ptrW; + unsigned len; + + RtlAcquirePebLock(); + + ptrW = NtCurrentTeb()->Peb->ProcessParameters->Environment; + while (*ptrW) + ptrW += strlenW(ptrW) + 1; + + len = (ULONG_PTR)ptrW - (ULONG_PTR)NtCurrentTeb()->Peb->ProcessParameters->Environment; + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len + (sizeof(WCHAR) * 2)); + if (ret) + memcpy(ret, NtCurrentTeb()->Peb->ProcessParameters->Environment, len); + + RtlReleasePebLock(); + return ret; } @@ -157,7 +172,7 @@ BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr ) */ BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr ) { - return TRUE; + return HeapFree( GetProcessHeap(), 0, ptr ); } -- 2.19.2

2 1

[PATCH 1/4] quartz/systemclock: Avoid using the sink structure pointer as a cookie.
by Zebediah Figura 16 Mar '19

16 Mar '19

The same pointer address may be allocated to multiple different structures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/systemclock.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 0cc6d87f84..f41cdbe534 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -26,11 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +static int cookie_counter; + struct advise_sink { struct list entry; HANDLE handle; REFERENCE_TIME due_time, period; + int cookie; }; typedef struct SystemClockImpl { @@ -228,6 +231,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, sink->handle = (HANDLE)event; sink->due_time = base + offset; sink->period = 0; + sink->cookie = InterlockedIncrement(&cookie_counter); EnterCriticalSection(&clock->cs); insert_advise_sink(sink, &clock->single_sinks); @@ -235,7 +239,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, notify_thread(clock); - *cookie = (DWORD_PTR)sink; + *cookie = sink->cookie; return S_OK; } @@ -263,6 +267,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, sink->handle = (HANDLE)semaphore; sink->due_time = start; sink->period = period; + sink->cookie = InterlockedIncrement(&cookie_counter); EnterCriticalSection(&clock->cs); insert_advise_sink(sink, &clock->periodic_sinks); @@ -270,7 +275,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, notify_thread(clock); - *cookie = (DWORD_PTR)sink; + *cookie = sink->cookie; return S_OK; } @@ -285,7 +290,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR LIST_FOR_EACH_ENTRY(sink, &clock->single_sinks, struct advise_sink, entry) { - if (sink == (struct advise_sink *)cookie) + if (sink->cookie == cookie) { list_remove(&sink->entry); heap_free(sink); @@ -296,7 +301,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR LIST_FOR_EACH_ENTRY(sink, &clock->periodic_sinks, struct advise_sink, entry) { - if (sink == (struct advise_sink *)cookie) + if (sink->cookie == cookie) { list_remove(&sink->entry); heap_free(sink); -- 2.20.1

2 4

[PATCH 2/2] msvcrt: Don't detect overflow in atol implementation.
by Piotr Caban 16 Mar '19

16 Mar '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46845 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 4 ++++ dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+)

1 0

[PATCH 1/2] msvcrt: Fix long limits in _atol_l.
by Piotr Caban 16 Mar '19

16 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v2 3/3] po: Update Tamil translation.
by Isira Seneviratne 16 Mar '19

16 Mar '19

1 0

[PATCH v2 2/3] po: Update French translation.
by Isira Seneviratne 16 Mar '19

16 Mar '19

1 0

[PATCH v2 1/3] po: Update Sinhala translation.
by Isira Seneviratne 16 Mar '19

16 Mar '19

1 0

[PATCH 3/3] po: Update Tamil translation.
by Isira Seneviratne 15 Mar '19

15 Mar '19

2 1

[PATCH 2/3] po: Update French translation.
by Isira Seneviratne 15 Mar '19

15 Mar '19

2 1

[PATCH 1/3] po: Update Sinhala translation.
by Isira Seneviratne 15 Mar '19

15 Mar '19

2 1

[PATCH 1/2] user32/combo: Add more tests for listbox size
by Fabian Maurer 15 Mar '19

15 Mar '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/combo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 0d3b1b170f..b3f8486cd3 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -689,6 +689,8 @@ static void test_listbox_size(DWORD style) BOOL todo; } info_height[] = { {2, 24, FALSE}, + {2, 30, TRUE}, + {2, 40, TRUE}, {2, 41, TRUE}, {2, 42, FALSE}, {2, 50, FALSE}, -- 2.21.0

2 5

[PATCH 5/8] server: Notify client about freed object so that it may free associated kernel object.
by Jacek Caban 15 Mar '19

15 Mar '19

Long term, we may consider making interface between server and device manager more generic so that it could be used for messages other than IRPs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++++++++- server/device.c | 15 +++++++++++++++ server/protocol.def | 6 ++++++ 3 files changed, 34 insertions(+), 1 deletion(-)

4 8

[PATCH v2] winebus.sys: Allow mapping of SDL controllers
by Aric Stewart 15 Mar '19

15 Mar '19

With input from Zebediah Figura Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 66 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 3 deletions(-)

2 4

[PATCH] sti/tests: Remove useless cast to self
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sti/tests/sti.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 0312254e38..bda4b6dc18 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -150,7 +150,7 @@ static void test_version_flag_versus_aw(void) if (SUCCEEDED(hr)) { ok(pUnknown == (IUnknown*)pStiW, "created interface was not IID_IStillImageW\n"); - IUnknown_Release((IUnknown*)pUnknown); + IUnknown_Release(pUnknown); } IUnknown_Release((IUnknown*)pStiW); } -- 2.20.1

1 0

[PATCH v3] winebus.sys: Allow mapping of SDL controllers
by Aric Stewart 15 Mar '19

15 Mar '19

v3:Updated based on suggestions Zebediah Figura Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 78 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 3 deletions(-)

1 0

[PATCH] d3dx9: Merge the d3dx_effect_GetValue() helper
by Matteo Bruni 15 Mar '19

15 Mar '19

From: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 122 +++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 65 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 68714f7ebb7..0dc56e24063 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1254,70 +1254,6 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - TRACE("Type %s\n", debug_d3dxparameter_type(param->type)); - - switch (param->type) - { - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - case D3DXPT_STRING: - break; - - case D3DXPT_VERTEXSHADER: - case D3DXPT_PIXELSHADER: - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - { - UINT i; - - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *unk = ((IUnknown **)param->data)[i]; - if (unk) IUnknown_AddRef(unk); - } - break; - } - - default: - FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); - break; - } - - TRACE("Copy %u bytes\n", param->bytes); - memcpy(data, param->data, param->bytes); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -2615,10 +2551,66 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); - return d3dx9_base_effect_get_value(&effect->base_effect, parameter, data, bytes); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + WARN("Parameter is a sampler, returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + TRACE("Type %s.\n", debug_d3dxparameter_type(param->type)); + + switch (param->type) + { + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + case D3DXPT_STRING: + break; + + case D3DXPT_VERTEXSHADER: + case D3DXPT_PIXELSHADER: + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + { + unsigned int i; + + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *unk = ((IUnknown **)param->data)[i]; + if (unk) + IUnknown_AddRef(unk); + } + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(data, param->data, param->bytes); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) -- 2.19.2

2 2

[PATCH] widl: A spelling fix in a variable name.
by Francois Gouget 15 Mar '19

15 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/widl/client.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 30b0dce5b8a..fe88f5993cf 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -291,7 +291,7 @@ static void write_serialize_function(FILE *file, const type_t *type, const type_ const char *func_name, const char *ret_type) { enum stub_mode mode = get_stub_mode(); - static int emited_pickling_info; + static int emitted_pickling_info; if (iface && !type->typestring_offset) { @@ -301,7 +301,7 @@ static void write_serialize_function(FILE *file, const type_t *type, const type_ return; } - if (!emited_pickling_info && iface && mode != MODE_Os) + if (!emitted_pickling_info && iface && mode != MODE_Os) { fprintf(file, "static const MIDL_TYPE_PICKLING_INFO __MIDL_TypePicklingInfo =\n"); fprintf(file, "{\n"); @@ -312,7 +312,7 @@ static void write_serialize_function(FILE *file, const type_t *type, const type_ fprintf(file, " 0\n"); fprintf(file, "};\n"); fprintf(file, "\n"); - emited_pickling_info = 1; + emitted_pickling_info = 1; } /* FIXME: Assuming explicit handle */ -- 2.20.1

1 0

[PATCH 6/6] d3dx9: Merge the d3dx_effect_SetVectorArray() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 91 +++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 50 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 211c428173..4b4c5bdea9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,55 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->element_count && param->element_count >= count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_VECTOR: - set_dirty(param); - if (param->type == D3DXPT_FLOAT) - { - if (param->columns == 4) - memcpy(param->data, vector, count * 4 * sizeof(float)); - else - for (i = 0; i < count; ++i) - memcpy((float *)param->data + param->columns * i, vector + i, - param->columns * sizeof(float)); - return D3D_OK; - } - - for (i = 0; i < count; ++i) - { - set_vector(&param->members[i], &vector[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -2927,10 +2878,50 @@ static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE const D3DXVECTOR4 *vector, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); - return d3dx9_base_effect_set_vector_array(&effect->base_effect, parameter, vector, count); + if (param && param->element_count && param->element_count >= count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_VECTOR: + set_dirty(param); + if (param->type == D3DXPT_FLOAT) + { + if (param->columns == 4) + memcpy(param->data, vector, count * 4 * sizeof(float)); + else + for (i = 0; i < count; ++i) + memcpy((float *)param->data + param->columns * i, vector + i, + param->columns * sizeof(float)); + return D3D_OK; + } + + for (i = 0; i < count; ++i) + set_vector(&param->members[i], &vector[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 5/6] d3dx9: Merge the d3dx_effect_SetVector() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 99 ++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 53 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7fee00a9d4..211c428173 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,58 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - set_dirty(param); - if (param->type == D3DXPT_INT && param->bytes == 4) - { - DWORD tmp; - - TRACE("INT fixup\n"); - tmp = (DWORD)(max(min(vector->z, 1.0f), 0.0f) * INT_FLOAT_MULTI); - tmp += ((DWORD)(max(min(vector->y, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; - tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; - tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; - - *(INT *)param->data = tmp; - return D3D_OK; - } - if (param->type == D3DXPT_FLOAT) - { - memcpy(param->data, vector, param->columns * sizeof(float)); - return D3D_OK; - } - - set_vector(param, vector); - return D3D_OK; - - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) { @@ -2881,10 +2829,55 @@ static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE p static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); - return d3dx9_base_effect_set_vector(&effect->base_effect, parameter, vector); + if (param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + set_dirty(param); + if (param->type == D3DXPT_INT && param->bytes == 4) + { + DWORD tmp; + + TRACE("INT fixup.\n"); + tmp = max(min(vector->z, 1.0f), 0.0f) * INT_FLOAT_MULTI; + tmp += ((DWORD)(max(min(vector->y, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; + tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; + tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; + + *(int *)param->data = tmp; + return D3D_OK; + } + if (param->type == D3DXPT_FLOAT) + { + memcpy(param->data, vector, param->columns * sizeof(float)); + return D3D_OK; + } + + set_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) -- 2.20.1

2 1

[PATCH 4/6] d3dx9: Merge the d3dx_effect_GetVectorArray() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 72 +++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9e5da7fe98..7fee00a9d4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1278,45 +1278,6 @@ static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXVECTOR4 *vector, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (vector && param && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_VECTOR: - for (i = 0; i < count; ++i) - { - get_vector(&param->members[i], &vector[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -2983,10 +2944,41 @@ static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE D3DXVECTOR4 *vector, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); - return d3dx9_base_effect_get_vector_array(&effect->base_effect, parameter, vector, count); + if (!count) + return D3D_OK; + + if (vector && param && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_VECTOR: + for (i = 0; i < count; ++i) + get_vector(&param->members[i], &vector[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix) -- 2.20.1

2 1

[PATCH 3/6] d3dx9: Merge the d3dx_effect_GetVector() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 77 +++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6e2e453bc5..9e5da7fe98 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1229,47 +1229,6 @@ static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_vector(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXVECTOR4 *vector) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (vector && param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - if (param->type == D3DXPT_INT && param->bytes == 4) - { - TRACE("INT fixup\n"); - vector->x = (((*(INT *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; - vector->y = (((*(INT *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; - vector->z = ((*(INT *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE; - vector->w = (((*(INT *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; - return D3D_OK; - } - get_vector(param, vector); - return D3D_OK; - - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) { @@ -2970,10 +2929,44 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); - return d3dx9_base_effect_get_vector(&effect->base_effect, parameter, vector); + if (vector && param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + if (param->type == D3DXPT_INT && param->bytes == 4) + { + TRACE("INT fixup.\n"); + vector->x = (((*(int *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + vector->y = (((*(int *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + vector->z = ((*(int *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE; + vector->w = (((*(int *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + return D3D_OK; + } + get_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

Problem when running WINE for ARM64 on QEMU user mode.
by Carlo B. 15 Mar '19

15 Mar '19

Hello, I installed QEMU user mode and now I can run Aarch64 executables tranparently, by following the guidelines in this page: https://wiki.debian.org/QemuUserEmulation After that, I cloned the sources of WINE from repository and I compiled and installed WINE for ARM64. I expected that I could run something in this configuration, but unfortunately QEMU prints on the console: "Unable to find space for application" Have somebody already got this trouble, or you have an idea about to fix it? I have found very few messages from web search about that and no solutions seem to be provided. At the moment, I used QEMU 2.8.1. Sincerely.

2 3

[PATCH] jscript: Add Object.create implementation.
by Jacek Caban 15 Mar '19

15 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 41 ++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 12 ++++++++++++ 2 files changed, 53 insertions(+)

2 1

[PATCH 8/8] ntoskrnl.exe: Support event functions on kernel objects.
by Jacek Caban 15 Mar '19

15 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/sync.c | 12 ++++++++++-- dlls/ntoskrnl.exe/tests/driver.c | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-)

2 1

[PATCH 6/8] ntoskrnl.exe: Support creating event objects from server handle.
by Jacek Caban 15 Mar '19

15 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl_private.h | 2 + dlls/ntoskrnl.exe/sync.c | 63 ++++++++++++++++++++++------ dlls/ntoskrnl.exe/tests/driver.c | 41 ++++++++++++++++-- server/event.c | 11 ++++- 4 files changed, 101 insertions(+), 16 deletions(-)

2 1

[PATCH 4/8] server: Allow queuing IRPs with no file associated.
by Jacek Caban 15 Mar '19

15 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)

2 1

[PATCH 3/8] server: Allow kernel to keep reference to server objects by pointer.
by Jacek Caban 15 Mar '19

15 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 45 ++++++++++++++++++++++++--- server/device.c | 59 ++++++++++++++++++++++++++++++++++++ server/protocol.def | 14 +++++++++ 3 files changed, 114 insertions(+), 4 deletions(-)

2 1

[PATCH 2/8] server: Store pointers to objects created by kernel_object_from_handle in server.
by Jacek Caban 15 Mar '19

15 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 126 +++++++++++++++++++++++++---------- server/device.c | 90 +++++++++++++++++++++++++ server/protocol.def | 17 +++++ 3 files changed, 197 insertions(+), 36 deletions(-)

2 1

[PATCH vkd3d 05/11] vkd3d: Do not ignore "src_box" in d3d12_command_list_CopyTextureRegion().
by Józef Kucia 15 Mar '19

15 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 872504df760a..fec7d59062af 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2492,23 +2492,38 @@ static void vk_extent_3d_from_d3d12_miplevel(VkExtent3D *extent, extent->depth = d3d12_resource_desc_get_depth(resource_desc, miplevel_idx); } -static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *buffer_image_copy, +static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *copy, const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *footprint, unsigned int sub_resource_idx, const D3D12_RESOURCE_DESC *image_desc, const struct vkd3d_format *format, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + const D3D12_BOX *src_box, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) { - buffer_image_copy->bufferOffset = footprint->Offset; - buffer_image_copy->bufferRowLength = footprint->Footprint.RowPitch / + copy->bufferOffset = footprint->Offset; + if (src_box) + { + copy->bufferOffset += (src_box->left / format->block_width) * format->byte_count * format->block_byte_count; + copy->bufferOffset += src_box->top * footprint->Footprint.RowPitch; + copy->bufferOffset += src_box->front * footprint->Footprint.RowPitch * footprint->Footprint.Depth; + } + copy->bufferRowLength = footprint->Footprint.RowPitch / (format->byte_count * format->block_byte_count) * format->block_width; - buffer_image_copy->bufferImageHeight = 0; - vk_image_subresource_layers_from_d3d12(&buffer_image_copy->imageSubresource, + copy->bufferImageHeight = footprint->Footprint.Height; + vk_image_subresource_layers_from_d3d12(&copy->imageSubresource, format, sub_resource_idx, image_desc->MipLevels); - buffer_image_copy->imageOffset.x = dst_x; - buffer_image_copy->imageOffset.y = dst_y; - buffer_image_copy->imageOffset.z = dst_z; - buffer_image_copy->imageExtent.width = footprint->Footprint.Width; - buffer_image_copy->imageExtent.height = footprint->Footprint.Height; - buffer_image_copy->imageExtent.depth = footprint->Footprint.Depth; + copy->imageOffset.x = dst_x; + copy->imageOffset.y = dst_y; + copy->imageOffset.z = dst_z; + if (src_box) + { + copy->imageExtent.width = src_box->right - src_box->left; + copy->imageExtent.height = src_box->bottom - src_box->top; + copy->imageExtent.depth = src_box->back - src_box->front; + } + else + { + copy->imageExtent.width = footprint->Footprint.Width; + copy->imageExtent.height = footprint->Footprint.Height; + copy->imageExtent.depth = footprint->Footprint.Depth; + } } static void vk_image_copy_from_d3d12(VkImageCopy *image_copy, @@ -2709,7 +2724,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format); vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, - src->u.SubresourceIndex, &src_resource->desc, dst_format, dst_x, dst_y, dst_z); + src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z); VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer, src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_buffer, 1, &buffer_image_copy)); @@ -2732,7 +2747,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic FIXME("Depth-stencil format %#x not fully supported yet.\n", src_format->dxgi_format); vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &src->u.PlacedFootprint, - dst->u.SubresourceIndex, &dst_resource->desc, src_format, dst_x, dst_y, dst_z); + dst->u.SubresourceIndex, &dst_resource->desc, src_format, src_box, dst_x, dst_y, dst_z); VK_CALL(vkCmdCopyBufferToImage(list->vk_command_buffer, src_resource->u.vk_buffer, dst_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy)); -- 2.19.2

2 2

[PATCH vkd3d 7/7] tests: Add test for copying texture regions from and to BC textures.
by Józef Kucia 15 Mar '19

15 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3f881b947df4..07a66a5f9d7a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21194,6 +21194,180 @@ static void test_copy_buffer_texture(void) destroy_test_context(&context); } +static void test_copy_block_compressed_texture(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12Resource *dst_buffer, *src_buffer; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + unsigned int x, y, block_id; + struct test_context context; + struct resource_readback rb; + struct uvec4 got, expected; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + ID3D12Device *device; + unsigned int *ptr; + D3D12_BOX box; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + dst_buffer = create_default_buffer(device, 4096, 0, D3D12_RESOURCE_STATE_COPY_DEST); + src_buffer = create_upload_buffer(device, 4096, NULL); + hr = ID3D12Resource_Map(src_buffer, 0, NULL, (void **)&ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + for (x = 0; x < 4096 / format_size(DXGI_FORMAT_BC2_UNORM); ++x) + { + block_id = x << 8; + *ptr++ = block_id | 0; + *ptr++ = block_id | 1; + *ptr++ = block_id | 2; + *ptr++ = block_id | 3; + } + ID3D12Resource_Unmap(src_buffer, 0, NULL); + + texture = create_default_texture(device, + 8, 8, DXGI_FORMAT_BC2_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST); + + /* copy from buffer to texture */ + dst_location.pResource = texture; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + dst_location.SubresourceIndex = 0; + + src_location.pResource = src_buffer; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + src_location.PlacedFootprint.Offset = 0; + src_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_BC2_UNORM; + src_location.PlacedFootprint.Footprint.Width = 32; + src_location.PlacedFootprint.Footprint.Height = 32; + src_location.PlacedFootprint.Footprint.Depth = 1; + src_location.PlacedFootprint.Footprint.RowPitch + = 32 / format_block_width(DXGI_FORMAT_BC2_UNORM) * format_size(DXGI_FORMAT_BC2_UNORM); + src_location.PlacedFootprint.Footprint.RowPitch + = align(src_location.PlacedFootprint.Footprint.RowPitch, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); + + set_box(&box, 4, 4, 0, 8, 8, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + set_box(&box, 28, 0, 0, 32, 4, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 4, 0, 0, &src_location, &box); + set_box(&box, 0, 24, 0, 4, 28, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 4, 0, &src_location, &box); + set_box(&box, 16, 16, 0, 20, 20, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 4, 4, 0, &src_location, &box); + + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + /* copy from texture to buffer */ + dst_location.pResource = dst_buffer; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + dst_location.PlacedFootprint.Offset = 0; + dst_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_BC2_UNORM; + dst_location.PlacedFootprint.Footprint.Width = 8; + dst_location.PlacedFootprint.Footprint.Height = 24; + dst_location.PlacedFootprint.Footprint.Depth = 1; + dst_location.PlacedFootprint.Footprint.RowPitch + = 8 / format_block_width(DXGI_FORMAT_BC2_UNORM) * format_size(DXGI_FORMAT_BC2_UNORM); + dst_location.PlacedFootprint.Footprint.RowPitch + = align(dst_location.PlacedFootprint.Footprint.RowPitch, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); + + src_location.pResource = texture; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, NULL); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 8, 0, &src_location, NULL); + set_box(&box, 0, 0, 0, 8, 8, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 16, 0, &src_location, NULL); + + transition_resource_state(command_list, dst_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(texture, 0, &rb, queue, command_list); + for (y = 0; y < 8 / format_block_height(DXGI_FORMAT_BC2_UNORM); ++y) + { + for (x = 0; x < 8 / format_block_width(DXGI_FORMAT_BC2_UNORM); ++x) + { + if (x == 0 && y == 0) + block_id = 33; + else if (x == 1 && y == 0) + block_id = 7; + else if (x == 0 && y == 1) + block_id = 192; + else + block_id = 132; + + expected.x = block_id << 8 | 0; + expected.y = block_id << 8 | 1; + expected.z = block_id << 8 | 2; + expected.w = block_id << 8 | 3; + got = *get_readback_uvec4(&rb, x, y); + + if (!compare_uvec4(&got, &expected)) + break; + } + if (!compare_uvec4(&got, &expected)) + break; + } + release_resource_readback(&rb); + ok(compare_uvec4(&got, &expected), + "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u), expected {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + got.x, got.y, got.z, got.w, x, y, expected.x, expected.y, expected.z, expected.w); + + reset_command_list(command_list, context.allocator); + get_buffer_readback_with_command_list(dst_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 24 / format_block_height(DXGI_FORMAT_BC2_UNORM); ++y) + { + unsigned int row_offset = dst_location.PlacedFootprint.Footprint.RowPitch / sizeof(got) * y; + + for (x = 0; x < 4 / format_block_width(DXGI_FORMAT_BC2_UNORM); ++x) + { + if (x == 0 && y % 2 == 0) + block_id = 33; + else if (x == 1 && y % 2 == 0) + block_id = 7; + else if (x == 0 && y % 2 == 1) + block_id = 192; + else + block_id = 132; + + expected.x = block_id << 8 | 0; + expected.y = block_id << 8 | 1; + expected.z = block_id << 8 | 2; + expected.w = block_id << 8 | 3; + got = *get_readback_uvec4(&rb, x + row_offset, 0); + + if (!compare_uvec4(&got, &expected)) + break; + } + if (!compare_uvec4(&got, &expected)) + break; + } + release_resource_readback(&rb); + ok(compare_uvec4(&got, &expected), + "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u), expected {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + got.x, got.y, got.z, got.w, x, y, expected.x, expected.y, expected.z, expected.w); + + ID3D12Resource_Release(texture); + ID3D12Resource_Release(src_buffer); + ID3D12Resource_Release(dst_buffer); + destroy_test_context(&context); +} + static void test_separate_bindings(void) { ID3D12Resource *cs_raw_buffer, *cs_raw_uav_buffer; @@ -26301,6 +26475,7 @@ START_TEST(d3d12) run_test(test_copy_texture); run_test(test_copy_texture_buffer); run_test(test_copy_buffer_texture); + run_test(test_copy_block_compressed_texture); run_test(test_separate_bindings); run_test(test_face_culling); run_test(test_multithread_command_queue_exec); -- 2.19.2

1 0

[PATCH vkd3d 6/7] vkd3d: Fix copying from texture to buffer with NULL src_box.
by Józef Kucia 15 Mar '19

15 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index c57645f4d89d..3cbf343a8d55 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2551,9 +2551,8 @@ static void vk_image_buffer_copy_from_d3d12(VkBufferImageCopy *copy, } else { - copy->imageExtent.width = footprint->Footprint.Width; - copy->imageExtent.height = footprint->Footprint.Height; - copy->imageExtent.depth = footprint->Footprint.Depth; + unsigned int miplevel = copy->imageSubresource.mipLevel; + vk_extent_3d_from_d3d12_miplevel(&copy->imageExtent, image_desc, miplevel); } } -- 2.19.2

1 0

[PATCH vkd3d v2 5/7] vkd3d: Validate box in d3d12_command_list_CopyTextureRegion().
by Józef Kucia 15 Mar '19

15 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 13 +++++++++++++ libs/vkd3d/utils.c | 10 ++++++++++ libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 5 +++++ 4 files changed, 29 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0d8d2e0d9fd3..c57645f4d89d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2713,6 +2713,13 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy)); } +static bool validate_d3d12_box(const D3D12_BOX *box) +{ + return box->right > box->left + && box->bottom > box->top + && box->back > box->front; +} + static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12GraphicsCommandList1 *iface, const D3D12_TEXTURE_COPY_LOCATION *dst, UINT dst_x, UINT dst_y, UINT dst_z, const D3D12_TEXTURE_COPY_LOCATION *src, const D3D12_BOX *src_box) @@ -2727,6 +2734,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic TRACE("iface %p, dst %p, dst_x %u, dst_y %u, dst_z %u, src %p, src_box %p.\n", iface, dst, dst_x, dst_y, dst_z, src, src_box); + if (src_box && !validate_d3d12_box(src_box)) + { + WARN("Empty box %s.\n", debug_d3d12_box(src_box)); + return; + } + vk_procs = &list->device->vk_procs; dst_resource = unsafe_impl_from_ID3D12Resource(dst->pResource); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 0abb62fd7fbc..e0af3f6e2dfd 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -321,6 +321,16 @@ HRESULT return_interface(void *iface, REFIID iface_iid, return hr; } +const char *debug_d3d12_box(const D3D12_BOX *box) +{ + if (!box) + return "(null)"; + + return vkd3d_dbg_sprintf("(%u, %u, %u)-(%u, %u, %u)", + box->left, box->top, box->front, + box->right, box->bottom, box->back); +} + const char *debug_vk_extent_3d(VkExtent3D extent) { return vkd3d_dbg_sprintf("(%u, %u, %u)", diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index b4727a20a4df..a6ada4b4e68f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1015,6 +1015,7 @@ static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *propertie HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object) DECLSPEC_HIDDEN; +const char *debug_d3d12_box(const D3D12_BOX *box) DECLSPEC_HIDDEN; const char *debug_vk_extent_3d(VkExtent3D extent) DECLSPEC_HIDDEN; const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; diff --git a/tests/d3d12.c b/tests/d3d12.c index 3af2eb993b6f..3f881b947df4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20933,6 +20933,11 @@ static void test_copy_texture_buffer(void) ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 32, 0, 0, &src_location, &box); + /* empty box */ + set_box(&box, 128, 0, 0, 32, 32, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) { transition_resource_state(command_list, dst_buffers[i], -- 2.19.2

1 0

[PATCH vkd3d v2 4/7] tests: Add more tests for copying data from textures to buffers.
by Józef Kucia 15 Mar '19

15 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a63c027d17b9..3af2eb993b6f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20844,6 +20844,177 @@ static void test_copy_texture(void) destroy_test_context(&context); } +static void test_copy_texture_buffer(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12GraphicsCommandList *command_list; + D3D12_SUBRESOURCE_DATA texture_data; + ID3D12Resource *dst_buffers[4]; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12Resource *src_texture; + unsigned int got, expected; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int x, y; + unsigned int *ptr; + unsigned int i; + D3D12_BOX box; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + ptr = calloc(64 * 32, sizeof(*ptr)); + ok(ptr, "Failed to allocate memory.\n"); + + for (i = 0; i < 64 * 32; ++i) + ptr[i] = i; + + src_texture = create_default_texture(device, + 64, 32, DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST); + texture_data.pData = ptr; + texture_data.RowPitch = 64 * sizeof(*ptr); + texture_data.SlicePitch = texture_data.RowPitch * 32; + upload_texture_data(src_texture, &texture_data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, src_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + free(ptr); + + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) + { + dst_buffers[i] = create_default_buffer(device, + 64 * 32 * sizeof(*ptr), 0, D3D12_RESOURCE_STATE_COPY_DEST); + } + + dst_location.pResource = dst_buffers[0]; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + dst_location.PlacedFootprint.Offset = 0; + dst_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_R32_UINT; + dst_location.PlacedFootprint.Footprint.Width = 64; + dst_location.PlacedFootprint.Footprint.Height = 32; + dst_location.PlacedFootprint.Footprint.Depth = 1; + dst_location.PlacedFootprint.Footprint.RowPitch = 64 * sizeof(*ptr); + + src_location.pResource = src_texture; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, NULL); + + dst_location.pResource = dst_buffers[1]; + for (y = 0; y < 32; ++y) + { + set_box(&box, 0, y, 0, 64, y + 1, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 31 - y, 0, &src_location, &box); + } + + dst_location.pResource = dst_buffers[2]; + for (x = 0; x < 64; ++x) + { + set_box(&box, x, 0, 0, x + 1, 32, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 63 - x, 0, 0, &src_location, &box); + } + + dst_location.pResource = dst_buffers[3]; + set_box(&box, 0, 0, 0, 32, 32, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 32, 0, 0, &src_location, &box); + + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) + { + transition_resource_state(command_list, dst_buffers[i], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + } + + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[0], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (i = 0; i < 64 * 32; ++i) + { + got = get_readback_uint(&rb, i, 0, 0); + expected = i; + + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at %u, expected 0x%08x.\n", got, i, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[1], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 32; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, 64 * y + x, 0, 0); + expected = 64 * (31 - y) + x; + + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[2], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 32; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, 64 * y + x, 0, 0); + expected = 64 * y + 63 - x; + + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[3], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 32; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, 64 * y + x, 0, 0); + expected = 64 * y + x % 32; + + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected); + + ID3D12Resource_Release(src_texture); + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) + ID3D12Resource_Release(dst_buffers[i]); + destroy_test_context(&context); +} + static void test_copy_buffer_texture(void) { D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; @@ -26123,6 +26294,7 @@ START_TEST(d3d12) run_test(test_instance_id); run_test(test_vertex_id); run_test(test_copy_texture); + run_test(test_copy_texture_buffer); run_test(test_copy_buffer_texture); run_test(test_separate_bindings); run_test(test_face_culling); -- 2.19.2

1 0

[PATCH vkd3d v2 3/7] vkd3d: Fix copying texture regions from textures to buffers.
by Józef Kucia 15 Mar '19

15 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Take the block height into account. --- libs/vkd3d/command.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2594d036fca3..0d8d2e0d9fd3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2526,6 +2526,37 @@ static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *copy, } } +static void vk_image_buffer_copy_from_d3d12(VkBufferImageCopy *copy, + const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *footprint, unsigned int sub_resource_idx, + const D3D12_RESOURCE_DESC *image_desc, const struct vkd3d_format *format, + const D3D12_BOX *src_box, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) +{ + copy->bufferOffset = footprint->Offset; + copy->bufferOffset += dst_x / format->block_width * format->byte_count * format->block_byte_count; + copy->bufferOffset += dst_y / format->block_height * footprint->Footprint.RowPitch; + copy->bufferOffset += dst_z * footprint->Footprint.RowPitch * footprint->Footprint.Depth; + copy->bufferRowLength = footprint->Footprint.RowPitch / + (format->byte_count * format->block_byte_count) * format->block_width; + copy->bufferImageHeight = footprint->Footprint.Height; + vk_image_subresource_layers_from_d3d12(&copy->imageSubresource, + format, sub_resource_idx, image_desc->MipLevels); + copy->imageOffset.x = src_box ? src_box->left : 0; + copy->imageOffset.y = src_box ? src_box->top : 0; + copy->imageOffset.z = src_box ? src_box->front : 0; + if (src_box) + { + copy->imageExtent.width = src_box->right - src_box->left; + copy->imageExtent.height = src_box->bottom - src_box->top; + copy->imageExtent.depth = src_box->back - src_box->front; + } + else + { + copy->imageExtent.width = footprint->Footprint.Width; + copy->imageExtent.height = footprint->Footprint.Height; + copy->imageExtent.depth = footprint->Footprint.Depth; + } +} + static void vk_image_copy_from_d3d12(VkImageCopy *image_copy, unsigned int src_sub_resource_idx, unsigned int dst_sub_resource_idx, const D3D12_RESOURCE_DESC *src_desc, const D3D12_RESOURCE_DESC *dst_desc, @@ -2723,7 +2754,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format); - vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, + vk_image_buffer_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z); VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer, src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, -- 2.19.2

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel