- wine-devel - winehq.org

[PATCH 1/2] widl: Fix context handle as return value handling.
by Jacek Caban 24 Jan '19

24 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)

1 0

[PATCH] rpcrt4/tests: Use --prefix-client to avoid duplicated function implementations.
by Jacek Caban 24 Jan '19

24 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- As suggested by Zebediah. dlls/rpcrt4/tests/Makefile.in | 4 +- dlls/rpcrt4/tests/server.c | 712 ++++++---------------------- dlls/rpcrt4/tests/server.idl | 184 +++---- dlls/rpcrt4/tests/server_interp.idl | 3 +- 4 files changed, 239 insertions(+), 664 deletions(-)

1 0

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 24 Jan '19

24 Jan '19

1 0

[PATCH] user32/dialog: Fix setting negative dialog item ids.
by Nikolay Sivov 24 Jan '19

24 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46494 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/dialog.c | 4 ++-- dlls/user32/tests/dialog.c | 41 +++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 9 ++++++++ dlls/user32/user_private.h | 1 + 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 72e6eee02f..deaeb84556 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -131,8 +131,8 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, if (dialogEx) { - /* id is a DWORD for DIALOGEX */ - info->id = GET_DWORD(p); + /* id is 4 bytes for DIALOGEX */ + info->id = GET_LONG(p); p += 2; } else diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 8c9bd21482..070ddcebb7 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1181,9 +1181,47 @@ static void test_GetDlgItemText(void) "string retrieved using GetDlgItemText should have been NULL terminated\n"); } +static INT_PTR CALLBACK getdlgitem_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_INITDIALOG) + { + char text[64]; + LONG_PTR val; + HWND hwnd; + BOOL ret; + + hwnd = GetDlgItem(hdlg, -1); + ok(hwnd != NULL, "Expected dialog item.\n"); + + *text = 0; + ret = GetDlgItemTextA(hdlg, -1, text, ARRAY_SIZE(text)); + ok(ret && !strcmp(text, "Text1"), "Unexpected item text.\n"); + + val = GetWindowLongA(hwnd, GWLP_ID); + ok(val == -1, "Unexpected id.\n"); + + val = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(val == -1, "Unexpected id %ld.\n", val); + + hwnd = GetDlgItem(hdlg, -2); + ok(hwnd != NULL, "Expected dialog item.\n"); + + val = GetWindowLongA(hwnd, GWLP_ID); + ok(val == -2, "Unexpected id.\n"); + + val = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(val == -2, "Unexpected id %ld.\n", val); + + EndDialog(hdlg, 0xdead); + } + + return FALSE; +} + static void test_GetDlgItem(void) { HWND hwnd, child1, child2, hwnd2; + INT_PTR retval; BOOL ret; hwnd = CreateWindowA("button", "parent", WS_VISIBLE, 0, 0, 100, 100, NULL, 0, g_hinst, NULL); @@ -1230,6 +1268,9 @@ static void test_GetDlgItem(void) DestroyWindow(child1); DestroyWindow(child2); DestroyWindow(hwnd); + + retval = DialogBoxParamA(g_hinst, "GETDLGITEM_TEST_DIALOG", NULL, getdlgitem_test_dialog_proc, 0); + ok(retval == 0xdead, "Unexpected return value.\n"); } static INT_PTR CALLBACK DestroyDlgWinProc (HWND hDlg, UINT uiMsg, diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 3823ed39e4..4301af6d68 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -237,6 +237,15 @@ FONT 8, "MS Sans Serif" CONTROL "oddlengthtext", -1, "TESTCONTROL", WS_CHILD|WS_VISIBLE|WS_BORDER|WS_TABSTOP, 10,60,100,50 { 1,2,3,4,5 } } +GETDLGITEM_TEST_DIALOG DIALOGEX 6, 15, 207, 111 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Test Dialog" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Text1",-1,10,10,100,50 + LTEXT "Text2",-2,10,10,100,50 +} + /* @makedep: test_mono.bmp */ 100 BITMAP test_mono.bmp diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index bf02ee5b0b..514cf6753f 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -33,6 +33,7 @@ #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) +#define GET_LONG(ptr) (*(const LONG *)(ptr)) #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313 -- 2.20.1

2 2

[PATCH resend] kernel32: Implement FormatMessage variable prefixes I, I32, and I64
by Alex Henrie 24 Jan '19

24 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33392 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/format_msg.c | 26 +++++++++++++++++++- dlls/kernel32/tests/format_msg.c | 42 ++++++++++++++++++++++++-------- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 5741713d81..bd4b2df110 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -249,7 +249,31 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, { *p++ = 'c'; } - /* FIXME: handle I64 etc. */ + /* check for 32-bit integer format */ + else if (format[0] == 'I' && format[1] == '3' && format[2] == '2' && + (format[3] == 'd' || format[3] == 'i' || format[3] == 'u' || + format[3] == 'o' || format[3] == 'x' || format[3] == 'X')) + { + *p++ = format[3]; + } + /* check for 64-bit integer format */ + else if (format[0] == 'I' && format[1] == '6' && format[2] == '4' && + (format[3] == 'd' || format[3] == 'i' || format[3] == 'u' || + format[3] == 'o' || format[3] == 'x' || format[3] == 'X')) + { + *p++ = 'l'; + *p++ = format[3]; + } + /* check for pointer-size integer format */ + else if (format[0] == 'I' && + (format[1] == 'd' || format[1] == 'i' || format[1] == 'u' || + format[1] == 'o' || format[1] == 'x' || format[1] == 'x')) + { +#ifdef _WIN64 + *p++ = 'l'; +#endif + *p++ = format[1]; + } else while (*format && *format != '!') *p++ = *format++; *p = 0; diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 57ee78af9e..58d51104f7 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -26,6 +26,8 @@ #define ULL(a,b) (((ULONG64)(a) << 32) | (b)) +static const BOOL is_32bit = (sizeof(void *) == sizeof(int)); + static DWORD WINAPIV doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPSTR out, DWORD outsize, ... ) { @@ -98,6 +100,8 @@ static void test_message_from_string_wide(void) static const WCHAR fmt_1oou1oou[] = {'%','1','!','*','.','*','u','!',',','%','1','!','*','.','*','u','!',0}; static const WCHAR fmt_1oou3oou[] = {'%','1','!','*','.','*','u','!',',','%','3','!','*','.','*','u','!',0}; static const WCHAR fmt_1oou4oou[] = {'%','1','!','*','.','*','u','!',',','%','4','!','*','.','*','u','!',0}; + static const WCHAR fmt_1I32d[] = {'%','1','!','I','3','2','d','!',0}; + static const WCHAR fmt_1Id[] = {'%','1','!','I','d','!',0}; static const WCHAR s_123d[] = {'1','2','3',0}; static const WCHAR s_14d[] = {' ',' ',' ','1',0}; @@ -390,6 +394,16 @@ static void test_message_from_string_wide(void) ok(r==12,"failed: r=%d\n",r); } + /* prefixes not shared with standard printf */ + + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1I32d, 0, 0, out, ARRAY_SIZE(out), 123); + ok(!lstrcmpW(s_123d, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==3,"failed: r=%d\n", r); + + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1Id, 0, 0, out, ARRAY_SIZE(out), 123); + ok(!lstrcmpW(s_123d, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==3,"failed: r=%d\n", r); + /* change of pace... test the low byte of dwflags */ /* line feed */ @@ -688,6 +702,16 @@ static void test_message_from_string(void) } } + /* prefixes not shared with standard printf */ + + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I32d!", 0, 0, out, ARRAY_SIZE(out), 123); + ok(!strcmp("123", out),"failed out=[%s]\n",out); + ok(r==3,"failed: r=%d\n",r); + + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!Id!", 0, 0, out, ARRAY_SIZE(out), 123); + ok(!strcmp("123", out),"failed out=[%s]\n",out); + ok(r==3,"failed: r=%d\n",r); + /* change of pace... test the low byte of dwflags */ /* line feed */ @@ -1718,26 +1742,28 @@ static void test_message_from_64bit_number(void) UINT64 number; const char expected[32]; int len; + BOOL todo32; } unsigned_tests[] = { { 0, "0", 1 }, { 1234567890, "1234567890", 10}, - { ULL(0xFFFFFFFF,0xFFFFFFFF), "18446744073709551615", 20 }, - { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19 }, + { ULL(0xFFFFFFFF,0xFFFFFFFF), "18446744073709551615", 20, TRUE }, + { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19, TRUE }, }; static const struct { INT64 number; const char expected[32]; int len; + BOOL todo32; } signed_tests[] = { { 0, "0" , 1}, { 1234567890, "1234567890", 10 }, { -1, "-1", 2}, { ULL(0xFFFFFFFF,0xFFFFFFFF), "-1", 2}, - { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19 }, - { -ULL(0x7FFFFFFF,0xFFFFFFFF), "-9223372036854775807", 20}, + { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19, TRUE }, + { -ULL(0x7FFFFFFF,0xFFFFFFFF), "-9223372036854775807", 20, TRUE }, }; int i; @@ -1746,14 +1772,12 @@ static void test_message_from_64bit_number(void) r = doitW(FORMAT_MESSAGE_FROM_STRING, I64u, 0, 0, outW, ARRAY_SIZE(outW), unsigned_tests[i].number); MultiByteToWideChar(CP_ACP, 0, unsigned_tests[i].expected, -1, expW, ARRAY_SIZE(expW)); -todo_wine { +todo_wine_if(is_32bit && unsigned_tests[i].todo32) { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, unsigned_tests[i].expected, wine_dbgstr_w(outW)); ok(r == unsigned_tests[i].len,"[%d] failed: r=%d\n", i, r); -} r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I64u!", 0, 0, outA, sizeof(outA), unsigned_tests[i].number); -todo_wine { ok(!strcmp(outA, unsigned_tests[i].expected),"[%d] failed, expected %s, got %s\n", i, unsigned_tests[i].expected, outA); ok(r == unsigned_tests[i].len,"[%d] failed: r=%d\n", i, r); @@ -1765,14 +1789,12 @@ todo_wine { r = doitW(FORMAT_MESSAGE_FROM_STRING, I64d, 0, 0, outW, ARRAY_SIZE(outW), signed_tests[i].number); MultiByteToWideChar(CP_ACP, 0, signed_tests[i].expected, -1, expW, ARRAY_SIZE(expW)); -todo_wine { +todo_wine_if(is_32bit && signed_tests[i].todo32) { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, signed_tests[i].expected, wine_dbgstr_w(outW)); ok(r == signed_tests[i].len,"[%d] failed: r=%d\n", i, r); -} r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I64d!", 0, 0, outA, sizeof(outA), signed_tests[i].number); -todo_wine { ok(!strcmp(outA, signed_tests[i].expected),"[%d] failed, expected %s, got %s\n", i, signed_tests[i].expected, outA); ok(r == signed_tests[i].len,"[%d] failed: r=%d\n", i, r); -- 2.20.1

1 0

[PATCH v2 1/6] hal: Limit exports to the appropriate architectures.
by Zebediah Figura 24 Jan '19

24 Jan '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/hal/hal.c | 81 ++++++++++++++++++----------------------------- dlls/hal/hal.spec | 30 +++++++++--------- 2 files changed, 45 insertions(+), 66 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 51bf55d58a..5560d9b742 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -47,53 +47,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) -#endif - -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExAcquireFastMutex ) VOID WINAPI DECLSPEC_HIDDEN __regs_ExAcquireFastMutex(PFAST_MUTEX FastMutex) -#else -VOID WINAPI ExAcquireFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("%p: stub\n", FastMutex); } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExReleaseFastMutex ) VOID WINAPI DECLSPEC_HIDDEN __regs_ExReleaseFastMutex(PFAST_MUTEX FastMutex) -#else -VOID WINAPI ExReleaseFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("%p: stub\n", FastMutex); } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExTryToAcquireFastMutex ) BOOLEAN WINAPI DECLSPEC_HIDDEN __regs_ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) -#else -BOOLEAN WINAPI ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("(%p) stub\n", FastMutex); return TRUE; } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) -#else -KIRQL WINAPI KfAcquireSpinLock(PKSPIN_LOCK SpinLock) -#endif { FIXME( "(%p) stub!\n", SpinLock ); return 0; } +DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) +VOID WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) +{ + FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); +} +#endif /* __i386__ */ +#if defined(__i386__) || defined(__arm__) || defined(__aarch64__) #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfLowerIrql ) VOID WINAPI DECLSPEC_HIDDEN __regs_KfLowerIrql(KIRQL NewIrql) @@ -117,39 +106,6 @@ KIRQL WINAPI KfRaiseIrql(KIRQL NewIrql) return 0; } - -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) -VOID WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) -#else -VOID WINAPI KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) -#endif -{ - FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); -} - -ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) -{ - FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); - /* Claim that there is no such bus */ - return 0; -} - -ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length) -{ - FIXME("(%u %u %u %p %u %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); - /* Claim that there is no such bus */ - return 0; -} - -BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, - PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) -{ - FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, - wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); - return FALSE; -} - KIRQL WINAPI KeGetCurrentIrql(VOID) { FIXME( " stub!\n"); @@ -177,6 +133,29 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); } +#endif /* __i386__ || __arm__ || __arm64__ */ + +ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) +{ + FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); + /* Claim that there is no such bus */ + return 0; +} + +ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length) +{ + FIXME("(%u %u %u %p %u %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); + /* Claim that there is no such bus */ + return 0; +} + +BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, + PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) +{ + FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, + wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); + return FALSE; +} ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency) { diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 5dc3fa8f8f..171d9defee 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -1,22 +1,22 @@ -@ stdcall -norelay ExAcquireFastMutex(ptr) -@ stdcall -norelay ExReleaseFastMutex(ptr) -@ stdcall -norelay ExTryToAcquireFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExAcquireFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExReleaseFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExTryToAcquireFastMutex(ptr) @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt @ stub HalSystemVectorDispatchEntry -@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) ntoskrnl.exe.KeAcquireInStackQueuedSpinLock +@ stdcall -arch=i386 -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) ntoskrnl.exe.KeAcquireInStackQueuedSpinLock @ stub KeAcquireInStackQueuedSpinLockRaiseToSynch @ stub KeAcquireQueuedSpinLock @ stub KeAcquireQueuedSpinLockRaiseToSynch @ stub KeAcquireSpinLockRaiseToSynch -@ stdcall -norelay KeReleaseInStackQueuedSpinLock(ptr) ntoskrnl.exe.KeReleaseInStackQueuedSpinLock +@ stdcall -arch=i386 -norelay KeReleaseInStackQueuedSpinLock(ptr) ntoskrnl.exe.KeReleaseInStackQueuedSpinLock @ stub KeReleaseQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLockRaiseToSynch -@ stdcall -norelay KfAcquireSpinLock(ptr) -@ stdcall -norelay KfLowerIrql(long) -@ stdcall -norelay KfRaiseIrql(long) -@ stdcall -norelay KfReleaseSpinLock(ptr long) +@ stdcall -arch=i386 -norelay KfAcquireSpinLock(ptr) +@ stdcall -arch=arm,arm64,i386 -norelay KfLowerIrql(long) +@ stdcall -arch=arm,arm64,i386 -norelay KfRaiseIrql(long) +@ stdcall -arch=i386 -norelay KfReleaseSpinLock(ptr long) @ stub HalAcquireDisplayOwnership @ stub HalAdjustResourceList @ stub HalAllProcessorsStarted @@ -70,23 +70,23 @@ @ stub KdComPortInUse @ stub KeAcquireSpinLock @ stub KeFlushWriteBuffer -@ stdcall KeGetCurrentIrql() +@ stdcall -arch=arm,arm64,i386 KeGetCurrentIrql() @ stub KeLowerIrql @ stdcall -ret64 KeQueryPerformanceCounter(ptr) @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -@ stdcall KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock +@ stdcall -arch=i386 KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock @ stub KeStallExecutionProcessor @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT -@ stdcall READ_PORT_UCHAR(ptr) -@ stdcall READ_PORT_ULONG(ptr) +@ stdcall -arch=arm,arm64,i386 READ_PORT_UCHAR(ptr) +@ stdcall -arch=arm,arm64,i386 READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG @ stub WRITE_PORT_BUFFER_USHORT -@ stdcall WRITE_PORT_UCHAR(ptr long) -@ stdcall WRITE_PORT_ULONG(ptr long) +@ stdcall -arch=arm,arm64,i386 WRITE_PORT_UCHAR(ptr long) +@ stdcall -arch=arm,arm64,i386 WRITE_PORT_ULONG(ptr long) @ stub WRITE_PORT_USHORT -- 2.20.1

2 6

[PATCH 1/6] hal: Limit exports to the appropriate architectures.
by Zebediah Figura 24 Jan '19

24 Jan '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/hal/hal.c | 81 ++++++++++++++++++----------------------------- dlls/hal/hal.spec | 30 +++++++++--------- 2 files changed, 45 insertions(+), 66 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 51bf55d58a..5560d9b742 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -47,53 +47,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) -#endif - -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExAcquireFastMutex ) VOID WINAPI DECLSPEC_HIDDEN __regs_ExAcquireFastMutex(PFAST_MUTEX FastMutex) -#else -VOID WINAPI ExAcquireFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("%p: stub\n", FastMutex); } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExReleaseFastMutex ) VOID WINAPI DECLSPEC_HIDDEN __regs_ExReleaseFastMutex(PFAST_MUTEX FastMutex) -#else -VOID WINAPI ExReleaseFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("%p: stub\n", FastMutex); } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExTryToAcquireFastMutex ) BOOLEAN WINAPI DECLSPEC_HIDDEN __regs_ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) -#else -BOOLEAN WINAPI ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("(%p) stub\n", FastMutex); return TRUE; } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) -#else -KIRQL WINAPI KfAcquireSpinLock(PKSPIN_LOCK SpinLock) -#endif { FIXME( "(%p) stub!\n", SpinLock ); return 0; } +DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) +VOID WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) +{ + FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); +} +#endif /* __i386__ */ +#if defined(__i386__) || defined(__arm__) || defined(__aarch64__) #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfLowerIrql ) VOID WINAPI DECLSPEC_HIDDEN __regs_KfLowerIrql(KIRQL NewIrql) @@ -117,39 +106,6 @@ KIRQL WINAPI KfRaiseIrql(KIRQL NewIrql) return 0; } - -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) -VOID WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) -#else -VOID WINAPI KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) -#endif -{ - FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); -} - -ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) -{ - FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); - /* Claim that there is no such bus */ - return 0; -} - -ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length) -{ - FIXME("(%u %u %u %p %u %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); - /* Claim that there is no such bus */ - return 0; -} - -BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, - PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) -{ - FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, - wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); - return FALSE; -} - KIRQL WINAPI KeGetCurrentIrql(VOID) { FIXME( " stub!\n"); @@ -177,6 +133,29 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); } +#endif /* __i386__ || __arm__ || __arm64__ */ + +ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) +{ + FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); + /* Claim that there is no such bus */ + return 0; +} + +ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length) +{ + FIXME("(%u %u %u %p %u %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); + /* Claim that there is no such bus */ + return 0; +} + +BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, + PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) +{ + FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, + wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); + return FALSE; +} ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency) { diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 5dc3fa8f8f..171d9defee 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -1,22 +1,22 @@ -@ stdcall -norelay ExAcquireFastMutex(ptr) -@ stdcall -norelay ExReleaseFastMutex(ptr) -@ stdcall -norelay ExTryToAcquireFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExAcquireFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExReleaseFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExTryToAcquireFastMutex(ptr) @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt @ stub HalSystemVectorDispatchEntry -@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) ntoskrnl.exe.KeAcquireInStackQueuedSpinLock +@ stdcall -arch=i386 -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) ntoskrnl.exe.KeAcquireInStackQueuedSpinLock @ stub KeAcquireInStackQueuedSpinLockRaiseToSynch @ stub KeAcquireQueuedSpinLock @ stub KeAcquireQueuedSpinLockRaiseToSynch @ stub KeAcquireSpinLockRaiseToSynch -@ stdcall -norelay KeReleaseInStackQueuedSpinLock(ptr) ntoskrnl.exe.KeReleaseInStackQueuedSpinLock +@ stdcall -arch=i386 -norelay KeReleaseInStackQueuedSpinLock(ptr) ntoskrnl.exe.KeReleaseInStackQueuedSpinLock @ stub KeReleaseQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLockRaiseToSynch -@ stdcall -norelay KfAcquireSpinLock(ptr) -@ stdcall -norelay KfLowerIrql(long) -@ stdcall -norelay KfRaiseIrql(long) -@ stdcall -norelay KfReleaseSpinLock(ptr long) +@ stdcall -arch=i386 -norelay KfAcquireSpinLock(ptr) +@ stdcall -arch=arm,arm64,i386 -norelay KfLowerIrql(long) +@ stdcall -arch=arm,arm64,i386 -norelay KfRaiseIrql(long) +@ stdcall -arch=i386 -norelay KfReleaseSpinLock(ptr long) @ stub HalAcquireDisplayOwnership @ stub HalAdjustResourceList @ stub HalAllProcessorsStarted @@ -70,23 +70,23 @@ @ stub KdComPortInUse @ stub KeAcquireSpinLock @ stub KeFlushWriteBuffer -@ stdcall KeGetCurrentIrql() +@ stdcall -arch=arm,arm64,i386 KeGetCurrentIrql() @ stub KeLowerIrql @ stdcall -ret64 KeQueryPerformanceCounter(ptr) @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -@ stdcall KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock +@ stdcall -arch=i386 KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock @ stub KeStallExecutionProcessor @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT -@ stdcall READ_PORT_UCHAR(ptr) -@ stdcall READ_PORT_ULONG(ptr) +@ stdcall -arch=arm,arm64,i386 READ_PORT_UCHAR(ptr) +@ stdcall -arch=arm,arm64,i386 READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG @ stub WRITE_PORT_BUFFER_USHORT -@ stdcall WRITE_PORT_UCHAR(ptr long) -@ stdcall WRITE_PORT_ULONG(ptr long) +@ stdcall -arch=arm,arm64,i386 WRITE_PORT_UCHAR(ptr long) +@ stdcall -arch=arm,arm64,i386 WRITE_PORT_ULONG(ptr long) @ stub WRITE_PORT_USHORT -- 2.20.1

2 9

[PATCH] api-ms-*: Add missing FindResourceW() forward.
by Nikolay Sivov 23 Jan '19

23 Jan '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-core-libraryloader-l1-2-1.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec b/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec index 4cc3358eed..5e2842196f 100644 --- a/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec +++ b/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec @@ -7,6 +7,7 @@ @ stub EnumResourceTypesExA @ stub EnumResourceTypesExW @ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW +@ stdcall FindResourceW(long wstr wstr) kernel32.FindResourceW @ stdcall FindStringOrdinal(long wstr long wstr long long) kernel32.FindStringOrdinal @ stdcall FreeLibrary(long) kernel32.FreeLibrary @ stdcall FreeLibraryAndExitThread(long long) kernel32.FreeLibraryAndExitThread -- 2.20.1

3 7

[PATCH] rpcrt4/tests: Run RPC tests in both mixed and fully interpreted mode.
by Jacek Caban 23 Jan '19

23 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/tests/Makefile.in | 6 +- dlls/rpcrt4/tests/server.c | 934 ++++++++++++++++++++++++---- dlls/rpcrt4/tests/server.idl | 228 ++++--- dlls/rpcrt4/tests/server_interp.idl | 25 + 4 files changed, 965 insertions(+), 228 deletions(-) create mode 100644 dlls/rpcrt4/tests/server_interp.idl

3 4

[PATCH] gdiplus/tests: Fix a memory leak (Valgrind).
by Sven Baars 23 Jan '19

23 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/gdiplus/tests/metafile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index bd4d5264ed..49adbf71e3 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2519,6 +2519,9 @@ static void test_drawimage(void) check_emfplus(hemf, draw_image_bitmap_records, "draw image bitmap"); + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + /* test drawing metafile */ stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); expect(Ok, stat); -- 2.17.1

2 1

[PATCH 2/2] ddraw: Fix the "dwMipMapCount" field of texture sub-levels.
by Henri Verbeet 23 Jan '19

23 Jan '19

From: David Adam <david.adam.cnrs(a)gmail.com> Instead of the total count, it indicates the count starting from the current level. Signed-off-by: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/surface.c | 2 ++ dlls/ddraw/tests/ddraw1.c | 16 +++++++--------- dlls/ddraw/tests/ddraw2.c | 16 +++++++--------- dlls/ddraw/tests/ddraw4.c | 16 +++++++--------- dlls/ddraw/tests/ddraw7.c | 16 +++++++--------- 5 files changed, 30 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 385ba1ac966..14aa5ab744e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6342,6 +6342,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { mip = wined3d_texture_get_sub_resource_parent(wined3d_texture, i * levels + j); mip_desc = &mip->surface_desc; + if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) + mip_desc->u2.dwMipMapCount = levels - j; if (j) { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 99df15aea5b..1f7e2ce04e7 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5482,24 +5482,22 @@ static void test_mipmap(void) ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(U2(surface_desc).dwMipMapCount == mipmap_count, - "Test %u, %u: Got unexpected mipmap count %u.\n", - i, mipmap_count, U2(surface_desc).dwMipMapCount); + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_Lock(surface_base, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(surface_desc.dwMipMapCount == mipmap_count, - "Test %u, %u: unexpected change of mipmap count %u.\n", - i, mipmap_count, surface_desc.dwMipMapCount); + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_Lock(surface_mip, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + ok(surface_desc.dwMipMapCount == mipmap_count - 1, "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); IDirectDrawSurface_Unlock(surface_mip, NULL); IDirectDrawSurface_Unlock(surface_base, NULL); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2c2008a2f02..842870d7d78 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6512,24 +6512,22 @@ static void test_mipmap(void) ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(U2(surface_desc).dwMipMapCount == mipmap_count, - "Test %u, %u: Got unexpected mipmap count %u.\n", - i, mipmap_count, U2(surface_desc).dwMipMapCount); + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface2_Lock(surface_base, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(surface_desc.dwMipMapCount == mipmap_count, - "Test %u, %u: unexpected change of mipmap count %u.\n", - i, mipmap_count, surface_desc.dwMipMapCount); + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface2_Lock(surface_mip, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + ok(surface_desc.dwMipMapCount == mipmap_count - 1, "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); IDirectDrawSurface2_Unlock(surface_mip, NULL); IDirectDrawSurface2_Unlock(surface_base, NULL); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f94f62ef799..8062fe870a9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -8040,24 +8040,22 @@ static void test_mipmap(void) ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(U2(surface_desc).dwMipMapCount == mipmap_count, - "Test %u, %u: Got unexpected mipmap count %u.\n", - i, mipmap_count, U2(surface_desc).dwMipMapCount); + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_Lock(surface_base, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(surface_desc.dwMipMapCount == mipmap_count, - "Test %u, %u: unexpected change of mipmap count %u.\n", - i, mipmap_count, surface_desc.dwMipMapCount); + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_Lock(surface_mip, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + ok(surface_desc.dwMipMapCount == mipmap_count - 1, "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); IDirectDrawSurface4_Unlock(surface_mip, NULL); IDirectDrawSurface4_Unlock(surface_base, NULL); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 061c691c961..6ef696d34fd 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7875,24 +7875,22 @@ static void test_mipmap(void) ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(U2(surface_desc).dwMipMapCount == mipmap_count, - "Test %u, %u: Got unexpected mipmap count %u.\n", - i, mipmap_count, U2(surface_desc).dwMipMapCount); + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_Lock(surface_base, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(surface_desc.dwMipMapCount == mipmap_count, - "Test %u, %u: unexpected change of mipmap count %u.\n", - i, mipmap_count, surface_desc.dwMipMapCount); + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_Lock(surface_mip, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + ok(surface_desc.dwMipMapCount == mipmap_count - 1, "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); IDirectDrawSurface7_Unlock(surface_mip, NULL); IDirectDrawSurface7_Unlock(surface_base, NULL); -- 2.11.0

2 1

[PATCH 1/2] ddraw/tests: Add tests for the "dwMipMapCount" field of texture sub-levels.
by Henri Verbeet 23 Jan '19

23 Jan '19

From: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 49 ++++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 49 ++++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw4.c | 49 ++++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw7.c | 49 ++++++++++++++++++++++++++++++++++------------- 4 files changed, 144 insertions(+), 52 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cb6bffef7f9..99df15aea5b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5396,10 +5396,10 @@ static void test_create_surface_pitch(void) static void test_mipmap(void) { - IDirectDrawSurface *surface, *surface2; + IDirectDrawSurface *surface, *surface_base, *surface_mip; + unsigned int i, mipmap_count; DDSURFACEDESC surface_desc; IDirectDraw *ddraw; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -5468,24 +5468,47 @@ static void test_mipmap(void) ok(U2(surface_desc).dwMipMapCount == tests[i].mipmap_count_out, "Test %u: Got unexpected mipmap count %u.\n", i, U2(surface_desc).dwMipMapCount); - if (U2(surface_desc).dwMipMapCount > 1) + surface_base = surface; + IDirectDrawSurface2_AddRef(surface_base); + mipmap_count = U2(surface_desc).dwMipMapCount; + while (mipmap_count > 1) { - hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &surface2); - ok(SUCCEEDED(hr), "Test %u: Failed to get attached surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface_GetAttachedSurface(surface_base, &caps, &surface_mip); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get attached surface, hr %#x.\n", i, mipmap_count, hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface_GetSurfaceDesc(surface_base, &surface_desc); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); + ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, + "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface_Lock(surface, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface_Lock(surface_base, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface_Lock(surface2, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); - IDirectDrawSurface_Unlock(surface2, NULL); - IDirectDrawSurface_Unlock(surface, NULL); - - IDirectDrawSurface_Release(surface2); + hr = IDirectDrawSurface_Lock(surface_mip, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); + IDirectDrawSurface_Unlock(surface_mip, NULL); + IDirectDrawSurface_Unlock(surface_base, NULL); + + IDirectDrawSurface_Release(surface_base); + surface_base = surface_mip; + --mipmap_count; } + IDirectDrawSurface_Release(surface_base); IDirectDrawSurface_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8a19327071d..2c2008a2f02 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6422,10 +6422,10 @@ static void test_create_surface_pitch(void) static void test_mipmap(void) { IDirectDrawSurface *surface1; - IDirectDrawSurface2 *surface, *surface2; + IDirectDrawSurface2 *surface, *surface_base, *surface_mip; + unsigned int i, mipmap_count; DDSURFACEDESC surface_desc; IDirectDraw2 *ddraw; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -6498,24 +6498,47 @@ static void test_mipmap(void) ok(U2(surface_desc).dwMipMapCount == tests[i].mipmap_count_out, "Test %u: Got unexpected mipmap count %u.\n", i, U2(surface_desc).dwMipMapCount); - if (U2(surface_desc).dwMipMapCount > 1) + surface_base = surface; + IDirectDrawSurface2_AddRef(surface_base); + mipmap_count = U2(surface_desc).dwMipMapCount; + while (mipmap_count > 1) { - hr = IDirectDrawSurface2_GetAttachedSurface(surface, &caps, &surface2); - ok(SUCCEEDED(hr), "Test %u: Failed to get attached surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface2_GetAttachedSurface(surface_base, &caps, &surface_mip); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get attached surface, hr %#x.\n", i, mipmap_count, hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface2_Lock(surface, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface2_GetSurfaceDesc(surface_base, &surface_desc); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); + ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, + "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface2_Lock(surface2, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); - IDirectDrawSurface2_Unlock(surface2, NULL); - IDirectDrawSurface2_Unlock(surface, NULL); - - IDirectDrawSurface2_Release(surface2); + hr = IDirectDrawSurface2_Lock(surface_base, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface2_Lock(surface_mip, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); + IDirectDrawSurface2_Unlock(surface_mip, NULL); + IDirectDrawSurface2_Unlock(surface_base, NULL); + + IDirectDrawSurface2_Release(surface_base); + surface_base = surface_mip; + --mipmap_count; } + IDirectDrawSurface2_Release(surface_base); IDirectDrawSurface2_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b304863a38b..f94f62ef799 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7954,10 +7954,10 @@ static void test_create_surface_pitch(void) static void test_mipmap(void) { - IDirectDrawSurface4 *surface, *surface2; + IDirectDrawSurface4 *surface, *surface_base, *surface_mip; + unsigned int i, mipmap_count; DDSURFACEDESC2 surface_desc; IDirectDraw4 *ddraw; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -8026,24 +8026,47 @@ static void test_mipmap(void) ok(U2(surface_desc).dwMipMapCount == tests[i].mipmap_count_out, "Test %u: Got unexpected mipmap count %u.\n", i, U2(surface_desc).dwMipMapCount); - if (U2(surface_desc).dwMipMapCount > 1) + surface_base = surface; + IDirectDrawSurface4_AddRef(surface_base); + mipmap_count = U2(surface_desc).dwMipMapCount; + while (mipmap_count > 1) { - hr = IDirectDrawSurface4_GetAttachedSurface(surface, &caps, &surface2); - ok(SUCCEEDED(hr), "Test %u: Failed to get attached surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface4_GetAttachedSurface(surface_base, &caps, &surface_mip); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get attached surface, hr %#x.\n", i, mipmap_count, hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface4_Lock(surface, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface4_GetSurfaceDesc(surface_base, &surface_desc); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); + ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, + "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface4_Lock(surface2, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); - IDirectDrawSurface4_Unlock(surface2, NULL); - IDirectDrawSurface4_Unlock(surface, NULL); - - IDirectDrawSurface4_Release(surface2); + hr = IDirectDrawSurface4_Lock(surface_base, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface4_Lock(surface_mip, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); + IDirectDrawSurface4_Unlock(surface_mip, NULL); + IDirectDrawSurface4_Unlock(surface_base, NULL); + + IDirectDrawSurface4_Release(surface_base); + surface_base = surface_mip; + --mipmap_count; } + IDirectDrawSurface4_Release(surface_base); IDirectDrawSurface4_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1cc8f8fe319..061c691c961 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7788,10 +7788,10 @@ static void test_create_surface_pitch(void) static void test_mipmap(void) { - IDirectDrawSurface7 *surface, *surface2; + IDirectDrawSurface7 *surface, *surface_base, *surface_mip; + unsigned int i, mipmap_count; DDSURFACEDESC2 surface_desc; IDirectDraw7 *ddraw; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -7861,24 +7861,47 @@ static void test_mipmap(void) ok(U2(surface_desc).dwMipMapCount == tests[i].mipmap_count_out, "Test %u: Got unexpected mipmap count %u.\n", i, U2(surface_desc).dwMipMapCount); - if (U2(surface_desc).dwMipMapCount > 1) + surface_base = surface; + IDirectDrawSurface7_AddRef(surface_base); + mipmap_count = U2(surface_desc).dwMipMapCount; + while (mipmap_count > 1) { - hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &surface2); - ok(SUCCEEDED(hr), "Test %u: Failed to get attached surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface7_GetAttachedSurface(surface_base, &caps, &surface_mip); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get attached surface, hr %#x.\n", i, mipmap_count, hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface7_Lock(surface, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface_base, &surface_desc); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); + ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, + "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface7_Lock(surface2, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); - IDirectDrawSurface7_Unlock(surface2, NULL); - IDirectDrawSurface7_Unlock(surface, NULL); - - IDirectDrawSurface7_Release(surface2); + hr = IDirectDrawSurface7_Lock(surface_base, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_Lock(surface_mip, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); + IDirectDrawSurface7_Unlock(surface_mip, NULL); + IDirectDrawSurface7_Unlock(surface_base, NULL); + + IDirectDrawSurface7_Release(surface_base); + surface_base = surface_mip; + --mipmap_count; } + IDirectDrawSurface7_Release(surface_base); IDirectDrawSurface7_Release(surface); } -- 2.11.0

2 1

[website] German translation for release 4.0 (try 2)
by Julian Rüger 23 Jan '19

23 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net> try 2: attach correct file...

1 0

[website] German translation for release 4.0
by Julian Rüger 23 Jan '19

23 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.0-rc7
by Julian Rüger 23 Jan '19

23 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.0-rc6
by Julian Rüger 23 Jan '19

23 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH resend] user32: Fix a memory leak.
by Zhiyi Zhang 23 Jan '19

23 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Testbot will fail because of other user32 failures. dlls/user32/rawinput.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a4ec..088e50da4e 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -172,6 +172,7 @@ static void find_hid_devices(void) done: LeaveCriticalSection(&hid_devices_cs); + SetupDiDestroyDeviceInfoList(set); heap_free(detail); } -- 2.19.2

2 1

[PATCH resend] user32: Check invalid handle in GetRawInputData.
by Zhiyi Zhang 23 Jan '19

23 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46499 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Testbot will fail because of other user32 failures. dlls/user32/rawinput.c | 3 +++ dlls/user32/tests/input.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a4ec..4bfccdfb84 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -281,6 +281,9 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * TRACE("rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size); + if (!ri) + return ~0U; + if (header_size != sizeof(RAWINPUTHEADER)) { WARN("Invalid structure size %u.\n", header_size); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14fd5f8f77..ffdd4b7137 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1530,6 +1530,16 @@ static void test_GetRawInputDeviceList(void) ok(odevcount == oret, "expected %d, got %d\n", oret, odevcount); } +static void test_GetRawInputData(void) +{ + UINT size; + UINT ret; + + /* Null raw input handle */ + ret = GetRawInputData(NULL, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER)); + ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2697,6 +2707,7 @@ START_TEST(input) test_attach_input(); test_GetKeyState(); test_OemKeyScan(); + test_GetRawInputData(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); -- 2.19.2

2 1

[PATCH 2/2] ddraw: Return the correct swapchain surface in ddraw7_GetGDISurface().
by Henri Verbeet 23 Jan '19

23 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 13 ++++++++----- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 6 ++++++ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c0c49dbab1e..8467fbf4ccc 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2266,21 +2266,24 @@ static HRESULT WINAPI ddraw4_TestCooperativeLevel(IDirectDraw4 *iface) * DDERR_NOTFOUND if the GDI surface wasn't found * *****************************************************************************/ -static HRESULT WINAPI ddraw7_GetGDISurface(IDirectDraw7 *iface, IDirectDrawSurface7 **GDISurface) +static HRESULT WINAPI ddraw7_GetGDISurface(IDirectDraw7 *iface, IDirectDrawSurface7 **surface) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + struct ddraw_surface *ddraw_surface; - TRACE("iface %p, surface %p.\n", iface, GDISurface); + TRACE("iface %p, surface %p.\n", iface, surface); wined3d_mutex_lock(); - if (!(*GDISurface = &ddraw->primary->IDirectDrawSurface7_iface)) + if (!ddraw->gdi_surface || !(ddraw_surface = wined3d_texture_get_sub_resource_parent(ddraw->gdi_surface, 0))) { - WARN("Primary not created yet.\n"); + WARN("GDI surface not available.\n"); + *surface = NULL; wined3d_mutex_unlock(); return DDERR_NOTFOUND; } - IDirectDrawSurface7_AddRef(*GDISurface); + *surface = &ddraw_surface->IDirectDrawSurface7_iface; + IDirectDrawSurface7_AddRef(*surface); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b035a7e0509..77e28662724 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -97,6 +97,7 @@ struct ddraw struct ddraw_surface *primary; RECT primary_lock; struct wined3d_texture *wined3d_frontbuffer; + struct wined3d_texture *gdi_surface; struct wined3d_swapchain *wined3d_swapchain; HWND swapchain_window; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 819044214d5..385ba1ac966 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5800,7 +5800,10 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren IDirectDrawClipper_Release(&surface->clipper->IDirectDrawClipper_iface); if (surface == surface->ddraw->primary) + { surface->ddraw->primary = NULL; + surface->ddraw->gdi_surface = NULL; + } wined3d_private_store_cleanup(&surface->private_store); @@ -6457,7 +6460,10 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } if (surface_desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { ddraw->primary = root; + ddraw->gdi_surface = root->wined3d_texture; + } *surface = root; return DD_OK; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 20ec3291c5c..cb6bffef7f9 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12080,7 +12080,7 @@ static void test_gdi_surface(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + ok(gdi_surface == backbuffer || broken(gdi_surface == primary), "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); IDirectDrawSurface_Release(gdi_surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1e16f2be9c1..8a19327071d 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13381,7 +13381,7 @@ static void test_gdi_surface(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + ok(gdi_surface == backbuffer || broken(gdi_surface == primary), "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); IDirectDrawSurface_Release(gdi_surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6f9917643d2..b304863a38b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15586,7 +15586,7 @@ static void test_gdi_surface(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + ok(gdi_surface == backbuffer || broken(gdi_surface == primary), "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); IDirectDrawSurface4_Release(gdi_surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 21f8806999a..f5ec87ff395 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15294,7 +15294,7 @@ static void test_gdi_surface(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + ok(gdi_surface == backbuffer || broken(gdi_surface == primary), "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); IDirectDrawSurface7_Release(gdi_surface); -- 2.11.0

2 1

[PATCH 1/2] ddraw: Implement ddraw7_FlipToGDISurface().
by Henri Verbeet 23 Jan '19

23 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 27 +++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6b2abe3c1f9..c0c49dbab1e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2063,9 +2063,32 @@ static HRESULT WINAPI d3d1_Initialize(IDirect3D *iface, REFIID riid) *****************************************************************************/ static HRESULT WINAPI ddraw7_FlipToGDISurface(IDirectDraw7 *iface) { - FIXME("iface %p stub!\n", iface); + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + IDirectDrawSurface7 *gdi_surface; + struct ddraw_surface *gdi_impl; + HRESULT hr; - return DD_OK; + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + + if (FAILED(hr = IDirectDraw7_GetGDISurface(iface, &gdi_surface))) + { + WARN("Failed to retrieve GDI surface, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + + gdi_impl = impl_from_IDirectDrawSurface7(gdi_surface); + if (gdi_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + hr = DD_OK; + else + hr = IDirectDrawSurface7_Flip(&ddraw->primary->IDirectDrawSurface7_iface, gdi_surface, DDFLIP_WAIT); + IDirectDrawSurface7_Release(gdi_surface); + + wined3d_mutex_unlock(); + + return hr; } static HRESULT WINAPI ddraw4_FlipToGDISurface(IDirectDraw4 *iface) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d52fc313c4b..20ec3291c5c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12036,7 +12036,7 @@ static void test_gdi_surface(void) ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); hr = IDirectDraw_FlipToGDISurface(ddraw); - todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -12053,7 +12053,7 @@ static void test_gdi_surface(void) /* Flipping to the GDI surface requires the primary surface to be * flippable. */ hr = IDirectDraw_FlipToGDISurface(ddraw); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(primary); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index bacc35d31d8..1e16f2be9c1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13337,7 +13337,7 @@ static void test_gdi_surface(void) ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); hr = IDirectDraw2_FlipToGDISurface(ddraw); - todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -13354,7 +13354,7 @@ static void test_gdi_surface(void) /* Flipping to the GDI surface requires the primary surface to be * flippable. */ hr = IDirectDraw2_FlipToGDISurface(ddraw); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(primary); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0066bf770f9..6f9917643d2 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15542,7 +15542,7 @@ static void test_gdi_surface(void) ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); hr = IDirectDraw4_FlipToGDISurface(ddraw); - todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -15559,7 +15559,7 @@ static void test_gdi_surface(void) /* Flipping to the GDI surface requires the primary surface to be * flippable. */ hr = IDirectDraw4_FlipToGDISurface(ddraw); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface4_Release(primary); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1f57420250e..21f8806999a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15250,7 +15250,7 @@ static void test_gdi_surface(void) ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); hr = IDirectDraw7_FlipToGDISurface(ddraw); - todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -15267,7 +15267,7 @@ static void test_gdi_surface(void) /* Flipping to the GDI surface requires the primary surface to be * flippable. */ hr = IDirectDraw7_FlipToGDISurface(ddraw); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface7_Release(primary); -- 2.11.0

2 1

[PATCH 1/3] shell32/shfldr_desktop: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set
by Gabriel Ivăncescu 23 Jan '19

23 Jan '19

On Windows, SHGDN_FORPARSING returns the GUID name of a special folder, but only when SHGDN_FORADDRESSBAR is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is actually needed for proper enumeration implementation of e.g. the ACList_ISF class (not implemented yet but it will require this patch). dlls/shell32/shfldr_desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index d0b97c6..938871e 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -611,7 +611,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, if ((clsid = _ILGetGUIDPointer (pidl))) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if ((GET_SHGDN_FOR (dwFlags) & (SHGDN_FORPARSING | SHGDN_FORADDRESSBAR)) == SHGDN_FORPARSING) { BOOL bWantsForParsing; -- 2.19.1

1 2

[PATCH] d3d11: Implement d3d11_device_GetImmediateContext1().
by Nikolay Sivov 23 Jan '19

23 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46298 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 10 ++++++++-- dlls/d3d11/tests/d3d11.c | 14 ++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index df754de130..7ad3d9b5e9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3648,9 +3648,15 @@ static UINT STDMETHODCALLTYPE d3d11_device_GetExceptionMode(ID3D11Device2 *iface return 0; } -static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device2 *iface, ID3D11DeviceContext1 **context) +static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device2 *iface, + ID3D11DeviceContext1 **immediate_context) { - FIXME("iface %p, context %p stub!\n", iface, context); + struct d3d_device *device = impl_from_ID3D11Device2(iface); + + TRACE("iface %p, immediate_context %p.\n", iface, immediate_context); + + *immediate_context = &device->immediate_context.ID3D11DeviceContext1_iface; + ID3D11DeviceContext1_AddRef(*immediate_context); } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Device2 *iface, UINT flags, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3efba83682..3c870c27e7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6439,12 +6439,7 @@ static void test_device_context_state(void) feature_level = ID3D11Device1_GetFeatureLevel(device); ID3D11Device1_GetImmediateContext1(device, &context); - todo_wine ok(!!context, "Failed to get immediate context.\n"); - if (!context) - { - ID3D11Device1_Release(device); - return; - } + ok(!!context, "Failed to get immediate context.\n"); sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP; @@ -6471,7 +6466,14 @@ static void test_device_context_state(void) feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); +todo_wine ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); + if (FAILED(hr)) + { + ID3D11SamplerState_Release(sampler); + ID3D11Device1_Release(device); + return; + } refcount = get_refcount(context_state); ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); -- 2.20.1

3 2

[PATCH 1/4] d3d8/tests: Add a test for MultiplyTransform().
by Zebediah Figura 23 Jan '19

23 Jan '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/tests/device.c | 113 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index adfeca8eaf..99f9ae1575 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9208,6 +9208,118 @@ static void test_resource_access(void) DestroyWindow(window); } +static void test_multiply_transform(void) +{ + IDirect3DDevice8 *device; + D3DMATRIX ret_mat; + DWORD stateblock; + IDirect3D8 *d3d; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + static const D3DTRANSFORMSTATETYPE tests[] = + { + D3DTS_VIEW, + D3DTS_PROJECTION, + D3DTS_TEXTURE0, + D3DTS_TEXTURE1, + D3DTS_TEXTURE2, + D3DTS_TEXTURE3, + D3DTS_TEXTURE4, + D3DTS_TEXTURE5, + D3DTS_TEXTURE6, + D3DTS_TEXTURE7, + D3DTS_WORLDMATRIX(0), + D3DTS_WORLDMATRIX(1), + D3DTS_WORLDMATRIX(2), + D3DTS_WORLDMATRIX(3), + D3DTS_WORLDMATRIX(255), + }; + + static const D3DMATRIX mat1 = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}, + mat2 = + {{{ + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 2.0f, + }}}; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create 3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice8_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", i); + + hr = IDirect3DDevice8_MultiplyTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i); + + /* MultiplyTransform() goes directly into the primary stateblock. */ + + hr = IDirect3DDevice8_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_MultiplyTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); +todo_wine + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i); + + hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", i); + + IDirect3DDevice8_DeleteStateBlock(device, stateblock); + } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9321,6 +9433,7 @@ START_TEST(device) test_device_caps(); test_get_info(); test_resource_access(); + test_multiply_transform(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } -- 2.20.1

5 14

[PATCH vkd3d 5/5] tests: Add test for oMask shader register.
by Józef Kucia 23 Jan '19

23 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3aa12661e80e..f115e436ac6d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10991,7 +10991,6 @@ static void test_texture_ld(void) } memset(&desc, 0, sizeof(desc)); - desc.rt_width = desc.rt_height = 32; desc.no_root_signature = true; if (!init_test_context(&context, &desc)) return; @@ -23061,6 +23060,91 @@ static void test_multisample_rendering(void) destroy_test_context(&context); } +static void test_sample_mask(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE ms_rtv; + ID3D12Resource *ms_render_target; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + uint32_t sample_mask; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint mask; + + float4 main(in float4 pos : SV_Position, out uint sample_mask : SV_Coverage) : SV_Target + { + sample_mask = mask; + return float4(0.0, 1.0, 0.0, 1.0); + } +#endif + 0x43425844, 0xfab05c6c, 0xeba1b017, 0xf4493502, 0x72ce5d05, 0x00000001, 0x00000128, 0x00000003, + 0x0000002c, 0x00000060, 0x000000b8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x00000050, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000042, 0x00000000, 0x00000000, 0x00000001, 0xffffffff, 0x00000e01, + 0x545f5653, 0x65677261, 0x56530074, 0x766f435f, 0x67617265, 0xabab0065, 0x58454853, 0x00000068, + 0x00000050, 0x0000001a, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, + 0x001020f2, 0x00000000, 0x02000065, 0x0000f000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x05000036, 0x0000f001, 0x0020800a, 0x00000000, + 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_descriptor_count = 2; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_32bit_constants_root_signature(context.device, + 0, 1, D3D12_SHADER_VISIBILITY_PIXEL); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, &ps, NULL); + pso_desc.SampleDesc.Count = 4; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + ms_rtv = get_cpu_rtv_handle(&context, context.rtv_heap, 1); + desc.sample_desc.Count = 4; + create_render_target(&context, &desc, &ms_render_target, &ms_rtv); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, ms_rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &ms_rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + sample_mask = 0xa; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 1, &sample_mask, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, ms_render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_DEST); + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + context.render_target, 0, ms_render_target, 0, context.render_target_desc.Format); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff7fff7f, 2); + + ID3D12Resource_Release(ms_render_target); + destroy_test_context(&context); +} + static void test_primitive_restart(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -23461,6 +23545,7 @@ START_TEST(d3d12) run_test(test_blend_factor); run_test(test_dual_source_blending); run_test(test_multisample_rendering); + run_test(test_sample_mask); run_test(test_primitive_restart); run_test(test_vertex_shader_stream_output); } -- 2.19.2

2 1

[PATCH vkd3d 4/5] vkd3d-shader: Implement oMask shader register.
by Józef Kucia 23 Jan '19

23 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/spirv.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4b36ea644b84..2fd0cda7b308 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1573,6 +1573,7 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re case VKD3DSPR_LOCALTHREADINDEX: case VKD3DSPR_OUTPOINTID: case VKD3DSPR_PRIMID: + case VKD3DSPR_SAMPLEMASK: return true; default: return false; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 369ea92e2048..6ea9836481e9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2302,6 +2302,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_IDXTEMP: snprintf(buffer, buffer_size, "x%u", idx); break; + case VKD3DSPR_SAMPLEMASK: + snprintf(buffer, buffer_size, "oMask"); + break; default: FIXME("Unhandled register %#x.\n", reg->type); snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type); @@ -2470,6 +2473,10 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp { indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); } + else if (reg->type == VKD3DSPR_SAMPLEMASK) + { + indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); + } else { if (reg->idx[0].rel_addr || reg->idx[1].rel_addr) @@ -3109,6 +3116,8 @@ vkd3d_register_builtins[] = {VKD3DSPR_TESSCOORD, {VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}}, + {VKD3DSPR_SAMPLEMASK, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleMask, NULL, true}}, + {VKD3DSPR_DEPTHOUT, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, {VKD3DSPR_DEPTHOUTGE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, {VKD3DSPR_DEPTHOUTLE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, @@ -3574,6 +3583,7 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler const struct vkd3d_shader_register *reg = &dst->reg; const struct vkd3d_spirv_builtin *builtin; struct vkd3d_symbol reg_symbol; + unsigned int array_size; uint32_t output_id; assert(!reg->idx[0].rel_addr); @@ -3586,15 +3596,17 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler return; } - output_id = vkd3d_dxbc_compiler_emit_variable(compiler, + array_size = builtin->is_spirv_array ? 1 : 0; + output_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, - builtin->component_type, builtin->component_count); + builtin->component_type, builtin->component_count, array_size); vkd3d_spirv_add_iface_variable(builder, output_id); vkd3d_dxbc_compiler_decorate_builtin(compiler, output_id, builtin->spirv_builtin); vkd3d_symbol_make_register(&reg_symbol, reg); reg_symbol.id = output_id; reg_symbol.info.reg.storage_class = SpvStorageClassOutput; + reg_symbol.info.reg.member_idx = 0; reg_symbol.info.reg.component_type = builtin->component_type; reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); -- 2.19.2

2 1

[PATCH vkd3d 3/5] vkd3d-shader: Avoid using private variables for depth output registers.
by Józef Kucia 23 Jan '19

23 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 41 +++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 233b9b568520..369ea92e2048 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3567,6 +3567,40 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ } } +static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_dst_param *dst) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_register *reg = &dst->reg; + const struct vkd3d_spirv_builtin *builtin; + struct vkd3d_symbol reg_symbol; + uint32_t output_id; + + assert(!reg->idx[0].rel_addr); + assert(!reg->idx[1].rel_addr); + assert(reg->idx[1].offset == ~0u); + + if (!(builtin = get_spirv_builtin_for_register(reg->type))) + { + FIXME("Unhandled register %#x.\n", reg->type); + return; + } + + output_id = vkd3d_dxbc_compiler_emit_variable(compiler, + &builder->global_stream, SpvStorageClassOutput, + builtin->component_type, builtin->component_count); + vkd3d_spirv_add_iface_variable(builder, output_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, output_id, builtin->spirv_builtin); + + vkd3d_symbol_make_register(&reg_symbol, reg); + reg_symbol.id = output_id; + reg_symbol.info.reg.storage_class = SpvStorageClassOutput; + reg_symbol.info.reg.component_type = builtin->component_type; + reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); + vkd3d_dxbc_compiler_emit_register_debug_name(builder, output_id, reg); +} + static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -4386,7 +4420,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_input_sysval(struct vkd3d_dxbc_compiler static void vkd3d_dxbc_compiler_emit_dcl_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - vkd3d_dxbc_compiler_emit_output(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE); + const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; + + if (vkd3d_shader_register_is_output(&dst->reg)) + vkd3d_dxbc_compiler_emit_output(compiler, dst, VKD3D_SIV_NONE); + else + vkd3d_dxbc_compiler_emit_output_register(compiler, dst); } static void vkd3d_dxbc_compiler_emit_dcl_output_siv(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2942a3408498..e08f1f3caca7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -784,6 +784,11 @@ static inline bool vkd3d_shader_register_is_input(const struct vkd3d_shader_regi return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT; } +static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_register *reg) +{ + return reg->type == VKD3DSPR_OUTPUT || reg->type == VKD3DSPR_COLOROUT; +} + void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, -- 2.19.2

2 1

[PATCH vkd3d 2/5] tests: Add test for resinfo shader instruction.
by Józef Kucia 23 Jan '19

23 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 371 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 371 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 06543e9152f0..3aa12661e80e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -12218,6 +12218,376 @@ static void test_multisample_array_texture(void) destroy_test_context(&context); } +static void test_resinfo(void) +{ + D3D12_SHADER_RESOURCE_VIEW_DESC *current_srv_desc, srv_desc; + const D3D12_SHADER_BYTECODE *current_ps; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + struct test_context_desc desc; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + struct uvec4 constant; + ID3D12Device *device; + unsigned int i, type; + HRESULT hr; + + static const DWORD ps_2d_code[] = + { +#if 0 + Texture2D t; + + uint type; + uint level; + + float4 main() : SV_TARGET + { + if (!type) + { + float width, height, miplevels; + t.GetDimensions(level, width, height, miplevels); + return float4(width, height, miplevels, 0); + } + else + { + uint width, height, miplevels; + t.GetDimensions(level, width, height, miplevels); + return float4(width, height, miplevels, 0); + } + } +#endif + 0x43425844, 0x9c2db58d, 0x7218d757, 0x23255414, 0xaa86938e, 0x00000001, 0x00000168, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000f0, 0x00000040, 0x0000003c, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400001f, 0x0020800a, 0x00000000, + 0x00000000, 0x0800003d, 0x001000f2, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00107e46, + 0x00000000, 0x05000036, 0x00102072, 0x00000000, 0x00100346, 0x00000000, 0x05000036, 0x00102082, + 0x00000000, 0x00004001, 0x00000000, 0x0100003e, 0x01000012, 0x0800103d, 0x001000f2, 0x00000000, + 0x0020801a, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x05000056, 0x00102072, 0x00000000, + 0x00100346, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e, + 0x01000015, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_2d = {ps_2d_code, sizeof(ps_2d_code)}; + static const DWORD ps_2d_array_code[] = + { +#if 0 + Texture2DArray t; + + uint type; + uint level; + + float4 main() : SV_TARGET + { + if (!type) + { + float width, height, elements, miplevels; + t.GetDimensions(level, width, height, elements, miplevels); + return float4(width, height, elements, miplevels); + } + else + { + uint width, height, elements, miplevels; + t.GetDimensions(level, width, height, elements, miplevels); + return float4(width, height, elements, miplevels); + } + } +#endif + 0x43425844, 0x92cd8789, 0x38e359ac, 0xd65ab502, 0xa018a5ae, 0x00000001, 0x0000012c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000b4, 0x00000040, 0x0000002d, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04004058, 0x00107000, 0x00000000, 0x00005555, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400001f, 0x0020800a, 0x00000000, + 0x00000000, 0x0800003d, 0x001020f2, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00107e46, + 0x00000000, 0x0100003e, 0x01000012, 0x0800103d, 0x001000f2, 0x00000000, 0x0020801a, 0x00000000, + 0x00000000, 0x00107e46, 0x00000000, 0x05000056, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x0100003e, 0x01000015, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_2d_array = {ps_2d_array_code, sizeof(ps_2d_array_code)}; + static const DWORD ps_3d_code[] = + { +#if 0 + Texture3D t; + + uint type; + uint level; + + float4 main() : SV_TARGET + { + if (!type) + { + float width, height, depth, miplevels; + t.GetDimensions(level, width, height, depth, miplevels); + return float4(width, height, depth, miplevels); + } + else + { + uint width, height, depth, miplevels; + t.GetDimensions(level, width, height, depth, miplevels); + return float4(width, height, depth, miplevels); + } + } +#endif + 0x43425844, 0xac1f73b9, 0x2bce1322, 0x82c599e6, 0xbff0d681, 0x00000001, 0x0000012c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000b4, 0x00000040, 0x0000002d, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04002858, 0x00107000, 0x00000000, 0x00005555, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400001f, 0x0020800a, 0x00000000, + 0x00000000, 0x0800003d, 0x001020f2, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00107e46, + 0x00000000, 0x0100003e, 0x01000012, 0x0800103d, 0x001000f2, 0x00000000, 0x0020801a, 0x00000000, + 0x00000000, 0x00107e46, 0x00000000, 0x05000056, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x0100003e, 0x01000015, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_3d = {ps_3d_code, sizeof(ps_3d_code)}; + static const DWORD ps_cube_code[] = + { +#if 0 + TextureCube t; + + uint type; + uint level; + + float4 main() : SV_TARGET + { + if (!type) + { + float width, height, miplevels; + t.GetDimensions(level, width, height, miplevels); + return float4(width, height, miplevels, 0); + } + else + { + uint width, height, miplevels; + t.GetDimensions(level, width, height, miplevels); + return float4(width, height, miplevels, 0); + } + } +#endif + 0x43425844, 0x795eb161, 0xb8291400, 0xcc531086, 0x2a8143ce, 0x00000001, 0x00000168, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000f0, 0x00000040, 0x0000003c, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04003058, 0x00107000, 0x00000000, 0x00005555, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400001f, 0x0020800a, 0x00000000, + 0x00000000, 0x0800003d, 0x001000f2, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00107e46, + 0x00000000, 0x05000036, 0x00102072, 0x00000000, 0x00100346, 0x00000000, 0x05000036, 0x00102082, + 0x00000000, 0x00004001, 0x00000000, 0x0100003e, 0x01000012, 0x0800103d, 0x001000f2, 0x00000000, + 0x0020801a, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x05000056, 0x00102072, 0x00000000, + 0x00100346, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e, + 0x01000015, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_cube = {ps_cube_code, sizeof(ps_cube_code)}; + static const DWORD ps_cube_array_code[] = + { +#if 0 + TextureCubeArray t; + + uint type; + uint level; + + float4 main() : SV_TARGET + { + if (!type) + { + float width, height, elements, miplevels; + t.GetDimensions(level, width, height, elements, miplevels); + return float4(width, height, miplevels, 0); + } + else + { + uint width, height, elements, miplevels; + t.GetDimensions(level, width, height, elements, miplevels); + return float4(width, height, miplevels, 0); + } + } +#endif + 0x43425844, 0x894d136f, 0xa1f5c746, 0xd771ac09, 0x6914e044, 0x00000001, 0x0000016c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000f4, 0x00000041, 0x0000003d, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04005058, 0x00107000, 0x00000000, + 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400001f, 0x0020800a, + 0x00000000, 0x00000000, 0x0800003d, 0x00100072, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, + 0x00107b46, 0x00000000, 0x05000036, 0x00102072, 0x00000000, 0x00100246, 0x00000000, 0x05000036, + 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e, 0x01000012, 0x0800103d, 0x00100072, + 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x00107b46, 0x00000000, 0x05000056, 0x00102072, + 0x00000000, 0x00100246, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, + 0x0100003e, 0x01000015, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_cube_array = {ps_cube_array_code, sizeof(ps_cube_array_code)}; + static const struct ps_test + { + const D3D12_SHADER_BYTECODE *ps; + struct + { + unsigned int width; + unsigned int height; + unsigned int depth; + unsigned int miplevel_count; + unsigned int array_size; + unsigned int cube_count; + } texture_desc; + unsigned int miplevel; + struct vec4 expected_result; + } + ps_tests[] = + { + {&ps_2d, {64, 64, 1, 1, 1, 0}, 0, {64.0f, 64.0f, 1.0f, 0.0f}}, + {&ps_2d, {32, 16, 1, 3, 1, 0}, 0, {32.0f, 16.0f, 3.0f, 0.0f}}, + {&ps_2d, {32, 16, 1, 3, 1, 0}, 1, {16.0f, 8.0f, 3.0f, 0.0f}}, + {&ps_2d, {32, 16, 1, 3, 1, 0}, 2, { 8.0f, 4.0f, 3.0f, 0.0f}}, + + {&ps_2d_array, {64, 64, 1, 1, 6, 0}, 0, {64.0f, 64.0f, 6.0f, 1.0f}}, + {&ps_2d_array, {32, 16, 1, 3, 9, 0}, 0, {32.0f, 16.0f, 9.0f, 3.0f}}, + {&ps_2d_array, {32, 16, 1, 3, 7, 0}, 1, {16.0f, 8.0f, 7.0f, 3.0f}}, + {&ps_2d_array, {32, 16, 1, 3, 3, 0}, 2, { 8.0f, 4.0f, 3.0f, 3.0f}}, + + {&ps_3d, {64, 64, 2, 1, 1, 0}, 0, {64.0f, 64.0f, 2.0f, 1.0f}}, + {&ps_3d, {64, 64, 2, 2, 1, 0}, 1, {32.0f, 32.0f, 1.0f, 2.0f}}, + {&ps_3d, {64, 64, 4, 1, 1, 0}, 0, {64.0f, 64.0f, 4.0f, 1.0f}}, + {&ps_3d, {64, 64, 4, 2, 1, 0}, 1, {32.0f, 32.0f, 2.0f, 2.0f}}, + {&ps_3d, { 8, 8, 8, 1, 1, 0}, 0, { 8.0f, 8.0f, 8.0f, 1.0f}}, + {&ps_3d, { 8, 8, 8, 4, 1, 0}, 0, { 8.0f, 8.0f, 8.0f, 4.0f}}, + {&ps_3d, { 8, 8, 8, 4, 1, 0}, 1, { 4.0f, 4.0f, 4.0f, 4.0f}}, + {&ps_3d, { 8, 8, 8, 4, 1, 0}, 2, { 2.0f, 2.0f, 2.0f, 4.0f}}, + {&ps_3d, { 8, 8, 8, 4, 1, 0}, 3, { 1.0f, 1.0f, 1.0f, 4.0f}}, + + {&ps_cube, { 4, 4, 1, 1, 6, 1}, 0, { 4.0f, 4.0f, 1.0f, 0.0f}}, + {&ps_cube, {32, 32, 1, 1, 6, 1}, 0, {32.0f, 32.0f, 1.0f, 0.0f}}, + {&ps_cube, {32, 32, 1, 3, 6, 1}, 0, {32.0f, 32.0f, 3.0f, 0.0f}}, + {&ps_cube, {32, 32, 1, 3, 6, 1}, 1, {16.0f, 16.0f, 3.0f, 0.0f}}, + {&ps_cube, {32, 32, 1, 3, 6, 1}, 2, { 8.0f, 8.0f, 3.0f, 0.0f}}, + + {&ps_cube_array, { 4, 4, 1, 1, 12, 2}, 0, { 4.0f, 4.0f, 1.0f, 0.0f}}, + {&ps_cube_array, {32, 32, 1, 1, 12, 2}, 0, {32.0f, 32.0f, 1.0f, 0.0f}}, + {&ps_cube_array, {32, 32, 1, 3, 12, 2}, 0, {32.0f, 32.0f, 3.0f, 0.0f}}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = desc.rt_height = 64; + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_texture_root_signature(context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 4, 0); + + heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6); + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); + + current_ps = NULL; + for (i = 0; i < ARRAY_SIZE(ps_tests); ++i) + { + const struct ps_test *test = &ps_tests[i]; + + vkd3d_test_set_context("test %u", i); + + if (current_ps != test->ps) + { + if (context.pipeline_state) + ID3D12PipelineState_Release(context.pipeline_state); + + current_ps = test->ps; + + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, current_ps, NULL); + } + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + resource_desc.Dimension = test->texture_desc.depth != 1 + ? D3D12_RESOURCE_DIMENSION_TEXTURE3D : D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = test->texture_desc.width; + resource_desc.Height = test->texture_desc.height; + resource_desc.DepthOrArraySize = test->texture_desc.depth != 1 + ? test->texture_desc.depth : test->texture_desc.array_size; + resource_desc.MipLevels = test->texture_desc.miplevel_count; + resource_desc.Format = DXGI_FORMAT_R8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = 0; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, NULL, + &IID_ID3D12Resource, (void **)&texture); + ok(hr == S_OK, "Test %u: Failed to create texture, hr %#x.\n", i, hr); + + current_srv_desc = NULL; + if (test->texture_desc.cube_count) + { + current_srv_desc = &srv_desc; + srv_desc.Format = resource_desc.Format; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + if (test->texture_desc.cube_count > 1) + { + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURECUBEARRAY; + srv_desc.TextureCubeArray.MostDetailedMip = 0; + srv_desc.TextureCubeArray.MipLevels = resource_desc.MipLevels; + srv_desc.TextureCubeArray.First2DArrayFace = 0; + srv_desc.TextureCubeArray.NumCubes = test->texture_desc.cube_count; + srv_desc.TextureCubeArray.ResourceMinLODClamp = 0.0f; + } + else + { + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURECUBE; + srv_desc.TextureCube.MostDetailedMip = 0; + srv_desc.TextureCube.MipLevels = resource_desc.MipLevels; + srv_desc.TextureCube.ResourceMinLODClamp = 0.0f; + } + } + ID3D12Device_CreateShaderResourceView(context.device, texture, current_srv_desc, cpu_handle); + + for (type = 0; type < 2; ++type) + { + vkd3d_test_set_context("test %u, type %u", i, type); + + memset(&constant, 0, sizeof(constant)); + constant.x = type; + constant.y = test->miplevel; + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, heap, 0)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &constant.x, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &test->expected_result, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12Resource_Release(texture); + } + vkd3d_test_set_context(NULL); + + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} + static void test_descriptor_tables(void) { ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; @@ -23039,6 +23409,7 @@ START_TEST(d3d12) run_test(test_gather_c); run_test(test_cube_maps); run_test(test_multisample_array_texture); + run_test(test_resinfo); run_test(test_descriptor_tables); run_test(test_descriptor_tables_overlapping_bindings); run_test(test_update_root_descriptors); -- 2.19.2

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Fix resinfo for cube textures.
by Józef Kucia 23 Jan '19

23 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7afc255edf4e..233b9b568520 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1672,7 +1672,7 @@ vkd3d_spirv_resource_type_table[] = SpvCapabilitySampled1D, SpvCapabilityImage1D}, {VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY, SpvDim2D, 1, 0, 3, 2}, {VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, SpvDim2D, 1, 1, 3, 2}, - {VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY, SpvDimCube, 1, 0, 3, 0, + {VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY, SpvDimCube, 1, 0, 4, 0, SpvCapabilitySampledCubeArray, SpvCapabilityImageCubeArray}, }; @@ -6516,6 +6516,8 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_NONE); size_component_count = image.resource_type_info->coordinate_component_count; + if (image.resource_type_info->dim == SpvDimCube) + --size_component_count; type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, size_component_count); supports_mipmaps = src[1].reg.type != VKD3DSPR_UAV && !image.resource_type_info->ms; -- 2.19.2

2 1

[PATCH v2] rpcrt4/tests: Run RPC tests in both mixed and fully interpreted mode.
by Jacek Caban 23 Jan '19

23 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/tests/Makefile.in | 6 +- dlls/rpcrt4/tests/server.c | 934 ++++++++++++++++++++++++---- dlls/rpcrt4/tests/server.idl | 228 ++++--- dlls/rpcrt4/tests/server_interp.idl | 25 + 4 files changed, 965 insertions(+), 228 deletions(-) create mode 100644 dlls/rpcrt4/tests/server_interp.idl

1 0

[PATCH v2] ping: Add Ctrl+C event handling
by Isira Seneviratne 23 Jan '19

23 Jan '19

1 0

[PATCH 1/2] shell32/autocomplete: Don't autoappend on Paste if ACO_AUTOAPPEND is off
by Gabriel Ivăncescu 23 Jan '19

23 Jan '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Fixes a minor issue. dlls/shell32/autocomplete.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6c013a8..679ec29 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -761,7 +761,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, return ret; case WM_PASTE: ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - autocomplete_text(This, hwnd, autoappend_flag_yes); + autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) + ? autoappend_flag_yes : autoappend_flag_no); return ret; case WM_MOUSEWHEEL: if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) -- 2.19.1

1 1

[PATCH v2 1/2] libs/port/mbtowc: Handle partially overlapped buffers
by Gabriel Ivăncescu 23 Jan '19

23 Jan '19

Cause of bug discovered by Jason Edmeades. Some applications partially overlap the two buffers, so don't assume they don't overlap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38558 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The code uses the same method as wcstombs now. libs/port/mbtowc.c | 65 +++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82..0994ade 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -65,34 +65,51 @@ static inline int mbstowcs_sbcs( const struct sbcs_table *table, int flags, ret = -1; } - for (;;) + while (srclen >= 16) { - switch(srclen) - { - default: - case 16: dst[15] = cp2uni[src[15]]; - case 15: dst[14] = cp2uni[src[14]]; - case 14: dst[13] = cp2uni[src[13]]; - case 13: dst[12] = cp2uni[src[12]]; - case 12: dst[11] = cp2uni[src[11]]; - case 11: dst[10] = cp2uni[src[10]]; - case 10: dst[9] = cp2uni[src[9]]; - case 9: dst[8] = cp2uni[src[8]]; - case 8: dst[7] = cp2uni[src[7]]; - case 7: dst[6] = cp2uni[src[6]]; - case 6: dst[5] = cp2uni[src[5]]; - case 5: dst[4] = cp2uni[src[4]]; - case 4: dst[3] = cp2uni[src[3]]; - case 3: dst[2] = cp2uni[src[2]]; - case 2: dst[1] = cp2uni[src[1]]; - case 1: dst[0] = cp2uni[src[0]]; - case 0: break; - } - if (srclen < 16) return ret; - dst += 16; + dst[0] = cp2uni[src[0]]; + dst[1] = cp2uni[src[1]]; + dst[2] = cp2uni[src[2]]; + dst[3] = cp2uni[src[3]]; + dst[4] = cp2uni[src[4]]; + dst[5] = cp2uni[src[5]]; + dst[6] = cp2uni[src[6]]; + dst[7] = cp2uni[src[7]]; + dst[8] = cp2uni[src[8]]; + dst[9] = cp2uni[src[9]]; + dst[10] = cp2uni[src[10]]; + dst[11] = cp2uni[src[11]]; + dst[12] = cp2uni[src[12]]; + dst[13] = cp2uni[src[13]]; + dst[14] = cp2uni[src[14]]; + dst[15] = cp2uni[src[15]]; src += 16; + dst += 16; srclen -= 16; } + + /* now handle the remaining characters */ + src += srclen; + dst += srclen; + switch (srclen) + { + case 15: dst[-15] = cp2uni[src[-15]]; + case 14: dst[-14] = cp2uni[src[-14]]; + case 13: dst[-13] = cp2uni[src[-13]]; + case 12: dst[-12] = cp2uni[src[-12]]; + case 11: dst[-11] = cp2uni[src[-11]]; + case 10: dst[-10] = cp2uni[src[-10]]; + case 9: dst[-9] = cp2uni[src[-9]]; + case 8: dst[-8] = cp2uni[src[-8]]; + case 7: dst[-7] = cp2uni[src[-7]]; + case 6: dst[-6] = cp2uni[src[-6]]; + case 5: dst[-5] = cp2uni[src[-5]]; + case 4: dst[-4] = cp2uni[src[-4]]; + case 3: dst[-3] = cp2uni[src[-3]]; + case 2: dst[-2] = cp2uni[src[-2]]; + case 1: dst[-1] = cp2uni[src[-1]]; + } + return ret; } /* mbstowcs for single-byte code page with char decomposition */ -- 2.19.1

1 1

[PATCH 2/2] widl: Use public HANDLE_PARAM_IS_* flags.
by Jacek Caban 23 Jan '19

23 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 1/2] widl: Fix HANDLE_PARAM_IS_RETURN flag handling.
by Jacek Caban 23 Jan '19

23 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH] rpcrt4: Fix comment about HANDLE_PARAM_IS_RETURN.
by Jacek Caban 23 Jan '19

23 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/ndr_stubless.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] mshtml.idl: Add IDOMCustomEvent declaration.
by Jacek Caban 23 Jan '19

23 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 4 ++++ include/mshtml.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+)

1 0

[PATCH 2/2] msvcrt: Optimize toupper function when locale was never changed
by Piotr Caban 23 Jan '19

23 Jan '19

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

1 0

[PATCH 1/2] msvcrt: Optimize tolower function when locale was never changed
by Piotr Caban 23 Jan '19

23 Jan '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 4 +++- dlls/msvcrt/locale.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 14 ++++++++++---- 4 files changed, 18 insertions(+), 5 deletions(-)

1 0

[PATCH] msvcp140: Export _Equivalent and port tests.
by Gijs Vermeulen 23 Jan '19

23 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46465 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 69 ++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 245389e61e..6a4eb14c04 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3638,7 +3638,7 @@ @ cdecl _Current_set(wstr) tr2_sys__Current_set_wchar @ extern _Denorm _Denorm @ cdecl _Dtest(ptr) _Dtest -@ stub _Equivalent +@ cdecl _Equivalent(wstr wstr) tr2_sys__Equivalent_wchar @ cdecl _Exp(ptr double long) _Exp @ stub _FCosh @ extern _FDenorm _FDenorm diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index ac7154bec2..229741a52d 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -176,6 +176,7 @@ static void (__cdecl *p__Release_chore)(_Threadpool_chore*); static void (__cdecl *p_Close_dir)(void*); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); +static int (__cdecl *p_Equivalent)(WCHAR const*, WCHAR const*); static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); static __int64 (__cdecl *p_Last_write_time)(WCHAR const*); static void (__cdecl *p_Set_last_write_time)(WCHAR const*, __int64); @@ -267,6 +268,7 @@ static BOOL init(void) SET(p_Close_dir, "_Close_dir"); SET(p_Current_get, "_Current_get"); SET(p_Current_set, "_Current_set"); + SET(p_Equivalent, "_Equivalent"); SET(p_File_size, "_File_size"); SET(p_Last_write_time, "_Last_write_time"); SET(p_Set_last_write_time, "_Set_last_write_time"); @@ -1360,6 +1362,72 @@ static void test__Winerror_map(void) } } +static void test_Equivalent(void) +{ + int val, i; + HANDLE file; + WCHAR temp_path[MAX_PATH], current_path[MAX_PATH]; + static const WCHAR wine_test_dirW[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; + static const WCHAR f1W[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; + static const WCHAR f1W_backslash[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1',0}; + static const WCHAR f1W_subdir[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','.','/','f','1',0}; + static const WCHAR f1W_long[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','.','.','/','w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; + static const WCHAR f2W[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','2',0}; + static const WCHAR not_existW[] = + {'n','o','t','_','e','x','i','s','t','s','_','f','i','l','e',0}; + static const struct { + const WCHAR *path1; + const WCHAR *path2; + int equivalent; + } tests[] = { + { NULL, NULL, -1 }, + { NULL, f1W, 0 }, + { f1W, NULL, 0 }, + { f1W, wine_test_dirW, 0 }, + { wine_test_dirW, f1W, 0 }, + { wine_test_dirW, wine_test_dirW, -1 }, + { f1W_subdir, f2W, 0 }, + { f1W, f1W, 1 }, + { not_existW, f1W, 0 }, + { f1W_backslash, f1W_subdir, 1 }, + { not_existW, not_existW, -1 }, + { f1W, not_existW, 0 }, + { f1W_long, f1W, 1 } + }; + + memset(current_path, 0, MAX_PATH); + GetCurrentDirectoryW(MAX_PATH, current_path); + memset(temp_path, 0, MAX_PATH); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + CreateDirectoryW(wine_test_dirW, NULL); + + file = CreateFileW(f1W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + file = CreateFileW(f2W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + + for(i=0; i<ARRAY_SIZE(tests); i++) { + errno = 0xdeadbeef; + val = p_Equivalent(tests[i].path1, tests[i].path2); + ok(tests[i].equivalent == val, "_Equivalent(): test %d expect: %d, got %d\n", i+1, tests[i].equivalent, val); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + } + + ok(DeleteFileW(f1W), "expect wine_test_dir/f1 to exist\n"); + ok(DeleteFileW(f2W), "expect wine_test_dir/f2 to exist\n"); + ok(p_Remove_dir(wine_test_dirW), "expect wine_test_dir to exist\n"); + ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1383,5 +1451,6 @@ START_TEST(msvcp140) test_Last_write_time(); test__Winerror_message(); test__Winerror_map(); + test_Equivalent(); FreeLibrary(msvcp); } -- 2.20.1

2 2

[PATCH v2] ping: Add Ctrl+C event handling
by Isira Seneviratne 23 Jan '19

23 Jan '19

2 4

[patch v2] ddraw: Mipmaps sublevels have their own mipmap counter
by David Adam 23 Jan '19

23 Jan '19

2 1

[PATCH 2/2] crypt32: Make sure that the provider supports the specified hash algorithm.
by Dmitry Timoshkov 23 Jan '19

23 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b532936888..eb646cd5f6 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2195,7 +2195,7 @@ BOOL WINAPI CryptHashCertificate(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, pbEncoded, cbEncoded, pbComputedHash, pcbComputedHash); if (!hCryptProv) - hCryptProv = I_CryptGetDefaultCryptProv(0); + hCryptProv = I_CryptGetDefaultCryptProv(Algid); if (!Algid) Algid = CALG_SHA1; if (ret) -- 2.20.1

1 0

[PATCH 1/2] crypt32: Make sure that the provider supports the specified signature algorithm.
by Dmitry Timoshkov 23 Jan '19

23 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2d4ce8c10c..b532936888 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2449,7 +2449,7 @@ static BOOL CRYPT_VerifySignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEnco pubKeyID = hashID; /* Load the default provider if necessary */ if (!hCryptProv) - hCryptProv = I_CryptGetDefaultCryptProv(0); + hCryptProv = I_CryptGetDefaultCryptProv(hashID); ret = CryptImportPublicKeyInfoEx(hCryptProv, dwCertEncodingType, pubKeyInfo, pubKeyID, 0, NULL, &key); if (ret) -- 2.20.1

1 0

[PATCH] ping: Add Ctrl+C event handling
by Isira Seneviratne 23 Jan '19

23 Jan '19

2 2

[PATCH 1/5] msi/tests: Introduce a variadic check_record() helper.
by Zebediah Figura 23 Jan '19

23 Jan '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/db.c | 264 ++++++++++++-------------------------------- 1 file changed, 73 insertions(+), 191 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 2b927b78f2..111f809b8d 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -36,6 +36,31 @@ static const char *mstfile = "winetst-db.mst"; static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','-','d','b','.','m','s','i',0}; static const WCHAR msifile2W[] = {'w','i','n','e','t','s','t','2','-','d','b','.','m','s','i',0}; +static void check_record_(int line, MSIHANDLE rec, UINT count, ...) +{ + va_list args; + UINT i; + + ok_(__FILE__, line)(count == MsiRecordGetFieldCount(rec), + "expected %u fields, got %u\n", count, MsiRecordGetFieldCount(rec)); + + va_start(args, count); + + for (i = 1; i <= count; ++i) + { + const char *expect = va_arg(args, const char *); + char buffer[200] = "x"; + DWORD sz = sizeof(buffer); + UINT r = MsiRecordGetStringA(rec, i, buffer, &sz); + ok_(__FILE__, line)(r == ERROR_SUCCESS, "field %u: got unexpected error %u\n", i, r); + ok_(__FILE__, line)(!strcmp(buffer, expect), + "field %u: expected \"%s\", got \"%s\"\n", i, expect, buffer); + } + + va_end(args); +} +#define check_record(rec, ...) check_record_(__LINE__, rec, __VA_ARGS__) + static void test_msidatabase(void) { MSIHANDLE hdb = 0, hdb2 = 0; @@ -1299,17 +1324,6 @@ static UINT get_columns_table_type(MSIHANDLE hdb, const char *table, UINT field) return type; } -static BOOL check_record( MSIHANDLE rec, UINT field, LPCSTR val ) -{ - CHAR buffer[0x20]; - UINT r; - DWORD sz; - - sz = sizeof buffer; - r = MsiRecordGetStringA( rec, field, buffer, &sz ); - return (r == ERROR_SUCCESS ) && !strcmp(val, buffer); -} - static void test_viewgetcolumninfo(void) { MSIHANDLE hdb = 0, rec; @@ -1335,17 +1349,7 @@ static void test_viewgetcolumninfo(void) /* check the column types */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_TYPES ); ok( rec, "failed to get column info record\n" ); - - ok( check_record( rec, 1, "S255"), "wrong record type\n"); - ok( check_record( rec, 2, "S1"), "wrong record type\n"); - ok( check_record( rec, 3, "I2"), "wrong record type\n"); - ok( check_record( rec, 4, "I2"), "wrong record type\n"); - ok( check_record( rec, 5, "I2"), "wrong record type\n"); - ok( check_record( rec, 6, "I4"), "wrong record type\n"); - ok( check_record( rec, 7, "S0"), "wrong record type\n"); - ok( check_record( rec, 8, "S0"), "wrong record type\n"); - ok( check_record( rec, 9, "L0"), "wrong record type\n"); - + check_record(rec, 9, "S255", "S1", "I2", "I2", "I2", "I4", "S0", "S0", "L0"); MsiCloseHandle( rec ); /* check the type in _Columns */ @@ -1362,17 +1366,8 @@ static void test_viewgetcolumninfo(void) /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); ok( rec, "failed to get column info record\n" ); - - ok( check_record( rec, 1, "Property"), "wrong record type\n"); - ok( check_record( rec, 2, "Value"), "wrong record type\n"); - ok( check_record( rec, 3, "Intvalue"), "wrong record type\n"); - ok( check_record( rec, 4, "Integervalue"), "wrong record type\n"); - ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n"); - ok( check_record( rec, 6, "Longvalue"), "wrong record type\n"); - ok( check_record( rec, 7, "Longcharvalue"), "wrong record type\n"); - ok( check_record( rec, 8, "Charvalue"), "wrong record type\n"); - ok( check_record( rec, 9, "Localizablevalue"), "wrong record type\n"); - + check_record(rec, 9, "Property", "Value", "Intvalue", "Integervalue", "Shortvalue", + "Longvalue", "Longcharvalue", "Charvalue", "Localizablevalue"); MsiCloseHandle( rec ); r = run_query( hdb, 0, @@ -1383,10 +1378,7 @@ static void test_viewgetcolumninfo(void) /* check the column types */ rec = get_column_info( hdb, "select * from `Binary`", MSICOLINFO_TYPES ); ok( rec, "failed to get column info record\n" ); - - ok( check_record( rec, 1, "S255"), "wrong record type\n"); - ok( check_record( rec, 2, "V0"), "wrong record type\n"); - + check_record(rec, 2, "S255", "V0"); MsiCloseHandle( rec ); /* check the type in _Columns */ @@ -1396,9 +1388,7 @@ static void test_viewgetcolumninfo(void) /* now try the names */ rec = get_column_info( hdb, "select * from `Binary`", MSICOLINFO_NAMES ); ok( rec, "failed to get column info record\n" ); - - ok( check_record( rec, 1, "Name"), "wrong record type\n"); - ok( check_record( rec, 2, "Data"), "wrong record type\n"); + check_record(rec, 2, "Name", "Data"); MsiCloseHandle( rec ); r = run_query( hdb, 0, @@ -1411,14 +1401,12 @@ static void test_viewgetcolumninfo(void) rec = get_column_info( hdb, "select * from `UIText`", MSICOLINFO_NAMES ); ok( rec, "failed to get column info record\n" ); - ok( check_record( rec, 1, "Key"), "wrong record type\n"); - ok( check_record( rec, 2, "Text"), "wrong record type\n"); + check_record(rec, 2, "Key", "Text"); MsiCloseHandle( rec ); rec = get_column_info( hdb, "select * from `UIText`", MSICOLINFO_TYPES ); ok( rec, "failed to get column info record\n" ); - ok( check_record( rec, 1, "s72"), "wrong record type\n"); - ok( check_record( rec, 2, "L255"), "wrong record type\n"); + check_record(rec, 2, "s72", "L255"); MsiCloseHandle( rec ); MsiCloseHandle( hdb ); @@ -1613,19 +1601,13 @@ static void test_streamtable(void) /* check the column types */ rec = get_column_info( hdb, "select * from `_Streams`", MSICOLINFO_TYPES ); ok( rec, "failed to get column info record\n" ); - - ok( check_record( rec, 1, "s62"), "wrong record type\n"); - ok( check_record( rec, 2, "V0"), "wrong record type\n"); - + check_record(rec, 2, "s62", "V0"); MsiCloseHandle( rec ); /* now try the names */ rec = get_column_info( hdb, "select * from `_Streams`", MSICOLINFO_NAMES ); ok( rec, "failed to get column info record\n" ); - - ok( check_record( rec, 1, "Name"), "wrong record type\n"); - ok( check_record( rec, 2, "Data"), "wrong record type\n"); - + check_record(rec, 2, "Name", "Data"); MsiCloseHandle( rec ); r = MsiDatabaseOpenViewA( hdb, @@ -2022,16 +2004,14 @@ static void test_where_not_in_selected(void) r = MsiViewFetch(view, &rec); ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); - - ok( check_record( rec, 1, "cond2"), "wrong condition\n"); - + check_record(rec, 1, "cond2"); MsiCloseHandle( rec ); + r = MsiViewFetch(view, &rec); ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); - - ok( check_record( rec, 1, "cond3"), "wrong condition\n"); - + check_record(rec, 1, "cond3"); MsiCloseHandle( rec ); + MsiViewClose(view); MsiCloseHandle(view); @@ -2081,13 +2061,13 @@ static void test_where(void) query = "SELECT * FROM `Media`"; r = do_query(hdb, query, &rec); ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %d\n", r); - ok( check_record( rec, 4, "zero.cab"), "wrong cabinet\n"); + check_record(rec, 6, "1", "0", "", "zero.cab", "", ""); MsiCloseHandle( rec ); query = "SELECT * FROM `Media` WHERE `LastSequence` >= 1"; r = do_query(hdb, query, &rec); ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %d\n", r); - ok( check_record( rec, 4, "one.cab"), "wrong cabinet\n"); + check_record(rec, 6, "2", "1", "", "one.cab", "", ""); r = MsiRecordGetInteger(rec, 1); ok( 2 == r, "field wrong\n"); @@ -2373,8 +2353,7 @@ static void test_msiimport(void) { MSIHANDLE hdb, view, rec; LPCSTR query; - UINT r, count; - signed int i; + UINT r; GetCurrentDirectoryA(MAX_PATH, CURR_DIR); @@ -2405,58 +2384,23 @@ static void test_msiimport(void) r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - count = MsiRecordGetFieldCount(rec); - ok(count == 9, "Expected 9, got %d\n", count); - ok(check_record(rec, 1, "FirstPrimaryColumn"), "Expected FirstPrimaryColumn\n"); - ok(check_record(rec, 2, "SecondPrimaryColumn"), "Expected SecondPrimaryColumn\n"); - ok(check_record(rec, 3, "ShortInt"), "Expected ShortInt\n"); - ok(check_record(rec, 4, "ShortIntNullable"), "Expected ShortIntNullalble\n"); - ok(check_record(rec, 5, "LongInt"), "Expected LongInt\n"); - ok(check_record(rec, 6, "LongIntNullable"), "Expected LongIntNullalble\n"); - ok(check_record(rec, 7, "String"), "Expected String\n"); - ok(check_record(rec, 8, "LocalizableString"), "Expected LocalizableString\n"); - ok(check_record(rec, 9, "LocalizableStringNullable"), "Expected LocalizableStringNullable\n"); + check_record(rec, 9, "FirstPrimaryColumn", "SecondPrimaryColumn", "ShortInt", + "ShortIntNullable", "LongInt", "LongIntNullable", "String", + "LocalizableString", "LocalizableStringNullable"); MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - count = MsiRecordGetFieldCount(rec); - ok(count == 9, "Expected 9, got %d\n", count); - ok(check_record(rec, 1, "s255"), "Expected s255\n"); - ok(check_record(rec, 2, "i2"), "Expected i2\n"); - ok(check_record(rec, 3, "i2"), "Expected i2\n"); - ok(check_record(rec, 4, "I2"), "Expected I2\n"); - ok(check_record(rec, 5, "i4"), "Expected i4\n"); - ok(check_record(rec, 6, "I4"), "Expected I4\n"); - ok(check_record(rec, 7, "S255"), "Expected S255\n"); - ok(check_record(rec, 8, "S0"), "Expected S0\n"); - ok(check_record(rec, 9, "s0"), "Expected s0\n"); + check_record(rec, 9, "s255", "i2", "i2", "I2", "i4", "I4", "S255", "S0", "s0"); MsiCloseHandle(rec); query = "SELECT * FROM `TestTable`"; r = do_query(hdb, query, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(check_record(rec, 1, "stringage"), "Expected 'stringage'\n"); - ok(check_record(rec, 7, "another string"), "Expected 'another string'\n"); - ok(check_record(rec, 8, "localizable"), "Expected 'localizable'\n"); - ok(check_record(rec, 9, "duh"), "Expected 'duh'\n"); - - i = MsiRecordGetInteger(rec, 2); - ok(i == 5, "Expected 5, got %d\n", i); - - i = MsiRecordGetInteger(rec, 3); - ok(i == 2, "Expected 2, got %d\n", i); - - i = MsiRecordGetInteger(rec, 4); - ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", i); - - i = MsiRecordGetInteger(rec, 5); - ok(i == 2147483640, "Expected 2147483640, got %d\n", i); - - i = MsiRecordGetInteger(rec, 6); - ok(i == -2147483640, "Expected -2147483640, got %d\n", i); - + check_record(rec, 9, "stringage", "5", "2", "", "2147483640", "-2147483640", + "another string", "localizable", "duh"); MsiCloseHandle(rec); + MsiViewClose(view); MsiCloseHandle(view); @@ -2466,19 +2410,12 @@ static void test_msiimport(void) r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - count = MsiRecordGetFieldCount(rec); - ok(count == 2, "Expected 2, got %d\n", count); - ok(check_record(rec, 1, "PrimaryOne"), "Expected PrimaryOne\n"); - ok(check_record(rec, 2, "PrimaryTwo"), "Expected PrimaryTwo\n"); - + check_record(rec, 2, "PrimaryOne", "PrimaryTwo"); MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - count = MsiRecordGetFieldCount(rec); - ok(count == 2, "Expected 2, got %d\n", count); - ok(check_record(rec, 1, "s255"), "Expected s255\n"); - ok(check_record(rec, 2, "s255"), "Expected s255\n"); + check_record(rec, 2, "s255", "s255"); MsiCloseHandle(rec); r = MsiViewExecute(view, 0); @@ -2486,18 +2423,12 @@ static void test_msiimport(void) r = MsiViewFetch(view, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - - ok(check_record(rec, 1, "papaya"), "Expected 'papaya'\n"); - ok(check_record(rec, 2, "leaf"), "Expected 'leaf'\n"); - + check_record(rec, 2, "papaya", "leaf"); MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - - ok(check_record(rec, 1, "papaya"), "Expected 'papaya'\n"); - ok(check_record(rec, 2, "flower"), "Expected 'flower'\n"); - + check_record(rec, 2, "papaya", "flower"); MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); @@ -2515,26 +2446,12 @@ static void test_msiimport(void) r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - count = MsiRecordGetFieldCount(rec); - ok(count == 6, "Expected 6, got %d\n", count); - ok(check_record(rec, 1, "A"), "Expected A\n"); - ok(check_record(rec, 2, "B"), "Expected B\n"); - ok(check_record(rec, 3, "C"), "Expected C\n"); - ok(check_record(rec, 4, "D"), "Expected D\n"); - ok(check_record(rec, 5, "E"), "Expected E\n"); - ok(check_record(rec, 6, "F"), "Expected F\n"); + check_record(rec, 6, "A", "B", "C", "D", "E", "F"); MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - count = MsiRecordGetFieldCount(rec); - ok(count == 6, "Expected 6, got %d\n", count); - ok(check_record(rec, 1, "s72"), "Expected s72\n"); - ok(check_record(rec, 2, "s72"), "Expected s72\n"); - ok(check_record(rec, 3, "s72"), "Expected s72\n"); - ok(check_record(rec, 4, "s72"), "Expected s72\n"); - ok(check_record(rec, 5, "s72"), "Expected s72\n"); - ok(check_record(rec, 6, "s72"), "Expected s72\n"); + check_record(rec, 6, "s72", "s72", "s72", "s72", "s72", "s72"); MsiCloseHandle(rec); MsiViewClose(view); @@ -2549,24 +2466,12 @@ static void test_msiimport(void) r = MsiViewFetch(view, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(check_record(rec, 1, "a"), "Expected 'a'\n"); - ok(check_record(rec, 2, "b"), "Expected 'b'\n"); - ok(check_record(rec, 3, "c"), "Expected 'c'\n"); - ok(check_record(rec, 4, "d"), "Expected 'd'\n"); - ok(check_record(rec, 5, "e"), "Expected 'e'\n"); - ok(check_record(rec, 6, "f"), "Expected 'f'\n"); - + check_record(rec, 6, "a", "b", "c", "d", "e", "f"); MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(check_record(rec, 1, "g"), "Expected 'g'\n"); - ok(check_record(rec, 2, "h"), "Expected 'h'\n"); - ok(check_record(rec, 3, "i"), "Expected 'i'\n"); - ok(check_record(rec, 4, "j"), "Expected 'j'\n"); - ok(check_record(rec, 5, "k"), "Expected 'k'\n"); - ok(check_record(rec, 6, "l"), "Expected 'l'\n"); - + check_record(rec, 6, "g", "h", "i", "j", "k", "l"); MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); @@ -4358,7 +4263,7 @@ static void test_alter(void) static void test_integers(void) { MSIHANDLE hdb = 0, view = 0, rec = 0; - DWORD count, i; + DWORD i; const char *query; UINT r; @@ -4387,30 +4292,12 @@ static void test_integers(void) r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - count = MsiRecordGetFieldCount(rec); - ok(count == 8, "Expected 8, got %d\n", count); - ok(check_record(rec, 1, "one"), "Expected one\n"); - ok(check_record(rec, 2, "two"), "Expected two\n"); - ok(check_record(rec, 3, "three"), "Expected three\n"); - ok(check_record(rec, 4, "four"), "Expected four\n"); - ok(check_record(rec, 5, "five"), "Expected five\n"); - ok(check_record(rec, 6, "six"), "Expected six\n"); - ok(check_record(rec, 7, "seven"), "Expected seven\n"); - ok(check_record(rec, 8, "eight"), "Expected eight\n"); + check_record(rec, 8, "one", "two", "three", "four", "five", "six", "seven", "eight"); MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - count = MsiRecordGetFieldCount(rec); - ok(count == 8, "Expected 8, got %d\n", count); - ok(check_record(rec, 1, "I2"), "Expected I2\n"); - ok(check_record(rec, 2, "I2"), "Expected I2\n"); - ok(check_record(rec, 3, "I2"), "Expected I2\n"); - ok(check_record(rec, 4, "I4"), "Expected I4\n"); - ok(check_record(rec, 5, "i2"), "Expected i2\n"); - ok(check_record(rec, 6, "i2"), "Expected i2\n"); - ok(check_record(rec, 7, "i2"), "Expected i2\n"); - ok(check_record(rec, 8, "i4"), "Expected i4\n"); + check_record(rec, 8, "I2", "I2", "I2", "I4", "i2", "i2", "i2", "i4"); MsiCloseHandle(rec); MsiViewClose(view); @@ -7533,17 +7420,13 @@ static void test_storages_table(void) /* check the column types */ hrec = get_column_info(hdb, "SELECT * FROM `_Storages`", MSICOLINFO_TYPES); ok(hrec, "failed to get column info hrecord\n"); - ok(check_record(hrec, 1, "s62"), "wrong hrecord type\n"); - ok(check_record(hrec, 2, "V0"), "wrong hrecord type\n"); - + check_record(hrec, 2, "s62", "V0"); MsiCloseHandle(hrec); /* now try the names */ hrec = get_column_info(hdb, "SELECT * FROM `_Storages`", MSICOLINFO_NAMES); ok(hrec, "failed to get column info hrecord\n"); - ok(check_record(hrec, 1, "Name"), "wrong hrecord type\n"); - ok(check_record(hrec, 2, "Data"), "wrong hrecord type\n"); - + check_record(hrec, 2, "Name", "Data"); MsiCloseHandle(hrec); create_storage("storage.bin"); @@ -9702,6 +9585,8 @@ static void test_select_column_names(void) static void test_primary_keys(void) { MSIHANDLE hdb, keys; + char buffer[5]; + DWORD size; UINT r; hdb = create_db(); @@ -9714,12 +9599,11 @@ static void test_primary_keys(void) r = MsiDatabaseGetPrimaryKeysA(hdb, "T", &keys); ok(!r, "got %u\n", r); - - r = MsiRecordGetFieldCount(keys); - ok(r == 1, "got %d\n", r); - ok(check_record(keys, 0, "T"), "expected 'T'\n"); - ok(check_record(keys, 1, "A"), "expected 'A'\n"); - + check_record(keys, 1, "A"); + size = sizeof(buffer); + r = MsiRecordGetStringA(keys, 0, buffer, &size); + ok(!r, "got %u\n", r); + ok(!strcmp(buffer, "T"), "got \"%s\"\n", buffer); MsiCloseHandle(keys); r = run_query(hdb, 0, "CREATE TABLE `U` (`A` SHORT, `B` SHORT, `C` SHORT PRIMARY KEY `B`, `C`)"); @@ -9727,13 +9611,11 @@ static void test_primary_keys(void) r = MsiDatabaseGetPrimaryKeysA(hdb, "U", &keys); ok(!r, "got %u\n", r); - - r = MsiRecordGetFieldCount(keys); - ok(r == 2, "got %d\n", r); - ok(check_record(keys, 0, "U"), "expected 'U'\n"); - ok(check_record(keys, 1, "B"), "expected 'B'\n"); - ok(check_record(keys, 2, "C"), "expected 'C'\n"); - + check_record(keys, 2, "B", "C"); + size = sizeof(buffer); + r = MsiRecordGetStringA(keys, 0, buffer, &size); + ok(!r, "got %u\n", r); + ok(!strcmp(buffer, "U"), "got \"%s\"\n", buffer); MsiCloseHandle(keys); MsiCloseHandle(hdb); DeleteFileA(msifile); -- 2.17.1

2 9

[RFC PATCH 3/9] setupapi: Implement SetupDiGetDevicePropertyW.
by Zhiyi Zhang 23 Jan '19

23 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 69 ++++++++++++- dlls/setupapi/tests/devinst.c | 181 +++++++++++++++++++++++++++++++++- 2 files changed, 244 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 556bba4684..2a71b59518 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3848,9 +3848,70 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO info_set, PSP_DEVINFO_DATA info_d const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - FIXME("%p, %p, %p, %p, %p, %d, %p, 0x%08x stub\n", info_set, info_data, prop_key, - prop_type, prop_buff, prop_buff_size, required_size, flags); + static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; + WCHAR property_hkey_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + DWORD reg_key_type; + DWORD value_size; + LSTATUS ls; + struct device *device; - SetLastError(ERROR_NOT_FOUND); - return FALSE; + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", info_set, info_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(info_set, info_data))) + return FALSE; + + if (!prop_key) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + if (!prop_type || (!prop_buff && prop_buff_size)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (flags) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + SETUPDI_GuidToString(&prop_key->fmtid, property_hkey_path + 11); + sprintfW(property_hkey_path + 49, formatW, prop_key->pid); + + value_size = prop_buff_size; + ls = RegGetValueW(device->key, property_hkey_path, NULL, RRF_RT_ANY, &reg_key_type, prop_buff, &value_size); + + switch (ls) + { + case ERROR_FILE_NOT_FOUND: + *prop_type = DEVPROP_TYPE_EMPTY; + if (required_size) + *required_size = 0; + SetLastError(ERROR_NOT_FOUND); + return FALSE; + default: + *prop_type = 0xffff & reg_key_type; + if (required_size) + *required_size = value_size; + + if (prop_buff_size < value_size) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + else if (ls == ERROR_UNSUPPORTED_TYPE) + { + SetLastError(NO_ERROR); + return TRUE; + } + else + { + SetLastError(ls); + return FALSE; + } + } } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 274c28745c..6928415c76 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -39,6 +39,7 @@ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0 static GUID guid2 = {0x6a55b5a5, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; BOOL (WINAPI *pSetupDiSetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD); +BOOL (WINAPI *pSetupDiGetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, DWORD *, DWORD); static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) { @@ -418,15 +419,19 @@ static void test_device_property(void) HDEVINFO set; SP_DEVINFO_DATA device = {sizeof(device)}; DEVPROPKEY key; + DEVPROPTYPE type; + DWORD size; + BYTE buffer[256]; DWORD err; BOOL ret; hmod = LoadLibraryA("setupapi.dll"); pSetupDiSetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiSetDevicePropertyW"); + pSetupDiGetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiGetDevicePropertyW"); - if (!pSetupDiSetDevicePropertyW) + if (!pSetupDiSetDevicePropertyW || !pSetupDiGetDevicePropertyW) { - win_skip("SetupDiSetDevicePropertyW() are only available on vista+, skipping tests.\n"); + win_skip("SetupDi{Set,Get}DevicePropertyW() are only available on vista+, skipping tests.\n"); FreeLibrary(hmod); return; } @@ -592,6 +597,178 @@ static void test_device_property(void) ok(!ret, "Expect failure\n"); ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + + /* SetupDiGetDevicePropertyW */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + + /* #1 Null device info list */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(NULL, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_HANDLE, "Expect last error %#x, got %#x\n", ERROR_INVALID_HANDLE, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #2 Null device */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, NULL, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_PARAMETER, "Expect last error %#x, got %#x\n", ERROR_INVALID_PARAMETER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #3 Null property key */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, NULL, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA, "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + /* Type unchanged on win8+ */ + ok(type == DEVPROP_TYPE_STRING || type == DEVPROP_TYPE_EMPTY, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #4 Null property type */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, NULL, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #5 Null buffer */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, NULL, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #6 Null buffer with zero size and wrong type */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_UINT64; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, NULL, 0, &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + + /* #7 Zero buffer size */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, 0, &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + + /* #8 Null required size */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), NULL, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + + /* #9 Flags not zero */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 1); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#x\n", ERROR_INVALID_FLAGS, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #10 Non-existent property key */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_HardwareIds, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + /* Type unchanged on win8+ */ + ok(type == DEVPROP_TYPE_EMPTY || broken(type == DEVPROP_TYPE_STRING), "Expect type %#x, got %#x\n", DEVPROP_TYPE_EMPTY, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #11 Wrong property key type */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_UINT64; + size = 0; + memset(buffer, 0, sizeof(buffer)); + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(!lstrcmpW((WCHAR *)buffer, valueW), "Expect buffer %s, got %s\n", wine_dbgstr_w(valueW), wine_dbgstr_w((WCHAR *)buffer)); + + /* #12 Get null property value */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, NULL, 0, 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + /* Type unchanged on win8+ */ + ok(type == DEVPROP_TYPE_EMPTY || broken(type == DEVPROP_TYPE_STRING), "Expect type %#x, got %#x\n", DEVPROP_TYPE_EMPTY, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #13 Insufficient buffer size */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(valueW) - 1, &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + + /* #14 Normal */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + memset(buffer, 0, sizeof(buffer)); + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(!lstrcmpW((WCHAR *)buffer, valueW), "Expect buffer %s, got %s\n", wine_dbgstr_w(valueW), wine_dbgstr_w((WCHAR *)buffer)); + ret = SetupDiRemoveDevice(set, &device); ok(ret, "Got unexpected error %#x.\n", GetLastError()); -- 2.19.2

2 2

[PATCH] riched20: Handle -1 in IRichEditOle::GetObject().
by Jactry Zeng 23 Jan '19

23 Jan '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/richole.c | 6 +++++- dlls/riched20/tests/richole.c | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index dc1a3b8405..93fe203cf2 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1393,7 +1393,11 @@ IRichEditOle_fnGetObject(IRichEditOle *me, LONG iob, } else { - if (iob > IRichEditOle_GetObjectCount(me)) + int object_count = IRichEditOle_GetObjectCount(me); + + if (iob == -1) + iob = object_count - 1; + if (iob < 0 || iob >= object_count) return E_INVALIDARG; LIST_FOR_EACH_ENTRY(reobj, &This->editor->reobj_list, struct re_object, entry) { diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d3ffdce4a7..5b46dafcdc 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3276,9 +3276,18 @@ static void test_InsertObject(void) ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); CHECK_REOBJECT_STRUCT(received_reo3, NULL, NULL, reo2.polesite, 2); + received_reo3.cbStruct = sizeof(received_reo3); + hr = IRichEditOle_GetObject(reole, -1, &received_reo3, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo3, NULL, NULL, reo2.polesite, 2); + hr = IRichEditOle_GetObject(reole, 2, NULL, REO_GETOBJ_ALL_INTERFACES); ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); + received_reo4.cbStruct = sizeof(received_reo4); + hr = IRichEditOle_GetObject(reole, -2, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); + received_reo4.cbStruct = 0; hr = IRichEditOle_GetObject(reole, 2, &received_reo4, REO_GETOBJ_ALL_INTERFACES); ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); -- 2.20.1

3 2

[PATCH] wininet: Return proper cache path from GetUrlCacheConfigInfo.
by Dmitry Timoshkov 23 Jan '19

23 Jan '19

This patch makes an application with built-in web store work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/tests/urlcache.c | 2 - dlls/wininet/urlcache.c | 89 +++++++++++++++++++++++++++++++---- 2 files changed, 81 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index acd4ff247c..c5e72ae82b 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1184,10 +1184,8 @@ static void test_GetUrlCacheConfigInfo(void) SetLastError(0xdeadbeef); ret = GetUrlCacheConfigInfoA(td[i].info, NULL, td[i].flags); -todo_wine ok(ret == td[i].ret, "%d: expected %d, got %d\n", i, td[i].ret, ret); if (!ret) -todo_wine ok(GetLastError() == td[i].error, "%d: expected %u, got %u\n", i, td[i].error, GetLastError()); else { diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f26fa3468d..4d422c9642 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -23,6 +23,7 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ws2tcpip.h" @@ -3764,21 +3765,93 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, /*********************************************************************** * GetUrlCacheConfigInfoW (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + cache_container *container; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = 0x3e800; /* FIXME */ + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + + info->u.s.CachePath[0] = 0; + info->u.s.dwCacheSize = 0x3e800; /* FIXME */ + + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) + { + switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + if (container->default_entry_type == NORMAL_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + if (container->default_entry_type == COOKIE_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + default: + FIXME("flags %08x not handled\n", flags); + break; + } + } + + TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath)); + + return TRUE; } /*********************************************************************** * GetUrlCacheConfigInfoA (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + INTERNET_CACHE_CONFIG_INFOW infoW; + + TRACE("(%p, %p, %x)\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + infoW.dwStructSize = sizeof(infoW); + if (!GetUrlCacheConfigInfoW(&infoW, size, flags)) + return FALSE; + + info->dwContainer = infoW.dwContainer; + info->dwQuota = infoW.dwQuota; + info->dwReserved4 = infoW.dwReserved4; + info->fPerUser = infoW.fPerUser; + info->dwSyncMode = infoW.dwSyncMode; + info->dwNumCachePaths = infoW.dwNumCachePaths; + info->dwNormalUsage = infoW.dwNormalUsage; + info->dwExemptUsage = infoW.dwExemptUsage; + + info->u.s.dwCacheSize = infoW.u.s.dwCacheSize; + WideCharToMultiByte(CP_ACP, 0, infoW.u.s.CachePath, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + + return TRUE; } BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, -- 2.20.1

2 1

[PATCH resend] shell32: Rename SHELL32_714 to PathIsTemporaryW
by Alex Henrie 23 Jan '19

23 Jan '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This function is documented at http://undoc.airesoft.co.uk/shell32.dll/PathIsTemporaryW.php --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index bf8b5121d7..771f5e38d9 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -260,7 +260,7 @@ 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) 704 stdcall -noname GUIDFromStringW(wstr ptr) 709 stdcall SHGetSetFolderCustomSettings(ptr wstr long) - 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW + 714 stdcall -noname PathIsTemporaryW(wstr) 723 stdcall -noname SHCreateSessionKey(long ptr) 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall -noname RestartDialogEx(long wstr long long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 6ed0c9000f..b04a56e783 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1623,12 +1623,12 @@ BOOL WINAPI GUIDFromStringW(LPCWSTR str, LPGUID guid) } /************************************************************************* - * @ [SHELL32.714] + * PathIsTemporaryW [SHELL32.714] */ -DWORD WINAPI SHELL32_714(LPVOID x) +BOOL WINAPI PathIsTemporaryW(const WCHAR *path) { - FIXME("(%s)stub\n", debugstr_w(x)); - return 0; + FIXME("(%s) stub\n", debugstr_w(path)); + return FALSE; } typedef struct _PSXA -- 2.20.1

1 0

[PATCH] comctl32/progress: Handle min == max case in PBM_STEPIT.
by Nikolay Sivov 23 Jan '19

23 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46485 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/progress.c | 31 ++++++++++++++++--------------- dlls/comctl32/tests/progress.c | 26 +++++++++++++++++++++----- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 28d9fd2fd3..268bdac5da 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -652,23 +652,24 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case PBM_STEPIT: { - INT oldVal; - oldVal = infoPtr->CurVal; - infoPtr->CurVal += infoPtr->Step; - if (infoPtr->CurVal > infoPtr->MaxVal) - { - infoPtr->CurVal = (infoPtr->CurVal - infoPtr->MinVal) % (infoPtr->MaxVal - infoPtr->MinVal) + infoPtr->MinVal; - } - if (infoPtr->CurVal < infoPtr->MinVal) + int oldVal = infoPtr->CurVal; + + if (infoPtr->MinVal != infoPtr->MaxVal) { - infoPtr->CurVal = (infoPtr->CurVal - infoPtr->MinVal) % (infoPtr->MaxVal - infoPtr->MinVal) + infoPtr->MaxVal; + infoPtr->CurVal += infoPtr->Step; + if (infoPtr->CurVal > infoPtr->MaxVal) + infoPtr->CurVal = (infoPtr->CurVal - infoPtr->MinVal) % (infoPtr->MaxVal - infoPtr->MinVal) + infoPtr->MinVal; + if (infoPtr->CurVal < infoPtr->MinVal) + infoPtr->CurVal = (infoPtr->CurVal - infoPtr->MinVal) % (infoPtr->MaxVal - infoPtr->MinVal) + infoPtr->MaxVal; + + if (oldVal != infoPtr->CurVal) + { + TRACE("PBM_STEPIT: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); + PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); + UpdateWindow( infoPtr->Self ); + } } - if(oldVal != infoPtr->CurVal) - { - TRACE("PBM_STEPIT: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); - PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); - UpdateWindow( infoPtr->Self ); - } + return oldVal; } diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 497cb47d3c..91ea6eec2a 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -254,6 +254,13 @@ static void test_PBM_STEPIT(void) { 3, 15, 5 }, { 3, 15, -5 }, { 3, 15, 50 }, + { -15, 15, 5 }, + { -3, -2, -5 }, + { 0, 0, 1 }, + { 5, 5, 1 }, + { 0, 0, -1 }, + { 5, 5, -1 }, + { 10, 5, 2 }, }; HWND progress; int i, j; @@ -261,6 +268,7 @@ static void test_PBM_STEPIT(void) for (i = 0; i < ARRAY_SIZE(stepit_tests); i++) { struct stepit_test *test = &stepit_tests[i]; + PBRANGE range; LRESULT ret; progress = create_progress(0); @@ -268,6 +276,9 @@ static void test_PBM_STEPIT(void) ret = SendMessageA(progress, PBM_SETRANGE32, test->min, test->max); ok(ret != 0, "Unexpected return value.\n"); + SendMessageA(progress, PBM_GETRANGE, 0, (LPARAM)&range); + ok(range.iLow == test->min && range.iHigh == test->max, "Unexpected range.\n"); + SendMessageA(progress, PBM_SETPOS, test->min, 0); SendMessageA(progress, PBM_SETSTEP, test->step, 0); @@ -277,15 +288,20 @@ static void test_PBM_STEPIT(void) int current; pos += test->step; - if (pos > test->max) - pos = (pos - test->min) % (test->max - test->min) + test->min; - if (pos < test->min) - pos = (pos - test->min) % (test->max - test->min) + test->max; + if (test->min != test->max) + { + if (pos > test->max) + pos = (pos - test->min) % (test->max - test->min) + test->min; + if (pos < test->min) + pos = (pos - test->min) % (test->max - test->min) + test->max; + } + else + pos = test->min; SendMessageA(progress, PBM_STEPIT, 0, 0); current = SendMessageA(progress, PBM_GETPOS, 0, 0); - ok(current == pos, "Unexpected position %d, expected %d.\n", current, pos); + ok(current == pos, "%u: unexpected position %d, expected %d.\n", i, current, pos); } DestroyWindow(progress); -- 2.20.1

1 0

[PATCH 1/3] ntdll: Store range upper boundary for dynamic unwind entry.
by Nikolay Sivov 23 Jan '19

23 Jan '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0e515ff969..807e81e52b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -338,7 +338,7 @@ struct dynamic_unwind_entry /* memory region which matches this entry */ DWORD64 base; - DWORD size; + DWORD64 end; /* lookup table */ RUNTIME_FUNCTION *table; @@ -2561,7 +2561,7 @@ static RUNTIME_FUNCTION *lookup_function_info( ULONG64 pc, ULONG64 *base, LDR_MO RtlEnterCriticalSection( &dynamic_unwind_section ); LIST_FOR_EACH_ENTRY( entry, &dynamic_unwind_list, struct dynamic_unwind_entry, entry ) { - if (pc >= entry->base && pc < entry->base + entry->size) + if (pc >= entry->base && pc < entry->end) { *base = entry->base; @@ -3457,7 +3457,7 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD64 return FALSE; entry->base = addr; - entry->size = table[count - 1].EndAddress; + entry->end = addr + table[count - 1].EndAddress; entry->table = table; entry->table_size = count * sizeof(RUNTIME_FUNCTION); entry->callback = NULL; @@ -3492,7 +3492,7 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR return FALSE; entry->base = base; - entry->size = length; + entry->end = base + length; entry->table = (RUNTIME_FUNCTION *)table; entry->table_size = 0; entry->callback = callback; -- 2.20.1

1 2

[PATCH v2 1/4] setupapi: Store the path to the driver key in the device key.
by Zebediah Figura 23 Jan '19

23 Jan '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 159 +++++++++++++++++----------------- dlls/setupapi/tests/devinst.c | 108 ++++++++--------------- 2 files changed, 116 insertions(+), 151 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 55746562c8..855fa92d31 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -492,30 +492,85 @@ static HKEY SETUPDI_CreateDevKey(struct device *device) return key; } -static HKEY SETUPDI_CreateDrvKey(struct device *device) +static HKEY open_driver_key(struct device *device, REGSAM access) { - static const WCHAR slash[] = { '\\',0 }; - WCHAR classKeyPath[MAX_PATH]; - HKEY classKey, key = INVALID_HANDLE_VALUE; + HKEY class_key, key; + WCHAR path[50]; + DWORD size = sizeof(path); LONG l; - lstrcpyW(classKeyPath, ControlClass); - lstrcatW(classKeyPath, slash); - SETUPDI_GuidToString(&device->set->ClassGuid, - classKeyPath + lstrlenW(classKeyPath)); - l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, classKeyPath, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &classKey, NULL); - if (!l) + if ((l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ControlClass, 0, NULL, 0, + KEY_CREATE_SUB_KEY, NULL, &class_key, NULL))) { - static const WCHAR fmt[] = { '%','0','4','u',0 }; - WCHAR devId[10]; - - sprintfW(devId, fmt, device->devnode); - RegCreateKeyExW(classKey, devId, 0, NULL, 0, KEY_READ | KEY_WRITE, - NULL, &key, NULL); - RegCloseKey(classKey); + ERR("Failed to open driver class root key, error %u.\n", l); + SetLastError(l); + return INVALID_HANDLE_VALUE; } - return key; + + if (!(l = RegGetValueW(device->key, NULL, Driver, RRF_RT_REG_SZ, NULL, path, &size))) + { + if (!(l = RegOpenKeyExW(class_key, path, 0, access, &key))) + { + RegCloseKey(class_key); + return key; + } + ERR("Failed to open driver key, error %u.\n", l); + } + + RegCloseKey(class_key); + SetLastError(ERROR_KEY_DOES_NOT_EXIST); + return INVALID_HANDLE_VALUE; +} + +static HKEY create_driver_key(struct device *device) +{ + static const WCHAR formatW[] = {'%','0','4','u',0}; + static const WCHAR slash[] = { '\\',0 }; + HKEY class_key, key; + WCHAR path[50]; + LONG l; + + if ((key = open_driver_key(device, KEY_READ | KEY_WRITE)) != INVALID_HANDLE_VALUE) + return key; + + if ((l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ControlClass, 0, NULL, 0, + KEY_CREATE_SUB_KEY, NULL, &class_key, NULL))) + { + ERR("Failed to open driver class root key, error %u.\n", l); + SetLastError(l); + return INVALID_HANDLE_VALUE; + } + + SETUPDI_GuidToString(&device->class, path); + strcatW(path, slash); + sprintfW(path + strlenW(path), formatW, device->devnode); + if (!(l = RegCreateKeyExW(class_key, path, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, NULL))) + { + RegSetValueExW(device->key, Driver, 0, REG_SZ, (BYTE *)path, strlenW(path) * sizeof(WCHAR)); + RegCloseKey(class_key); + return key; + } + ERR("Failed to create driver key, error %u.\n", l); + RegCloseKey(class_key); + SetLastError(l); + return INVALID_HANDLE_VALUE; +} + +static BOOL delete_driver_key(struct device *device) +{ + HKEY key; + LONG l; + + if ((key = open_driver_key(device, KEY_READ | KEY_WRITE)) != INVALID_HANDLE_VALUE) + { + l = RegDeleteKeyW(key, emptyW); + RegCloseKey(key); + + SetLastError(l); + return !l; + } + + return FALSE; } struct PropertyMapEntry @@ -1367,7 +1422,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da key = SETUPDI_CreateDevKey(device); break; case DIREG_DRV: - key = SETUPDI_CreateDrvKey(device); + key = create_driver_key(device); break; default: WARN("unknown KeyType %d\n", KeyType); @@ -3358,36 +3413,6 @@ static HKEY SETUPDI_OpenDevKey(struct device *device, REGSAM samDesired) return key; } -static HKEY SETUPDI_OpenDrvKey(struct device *device, REGSAM samDesired) -{ - static const WCHAR slash[] = { '\\',0 }; - WCHAR classKeyPath[MAX_PATH]; - HKEY classKey, key = INVALID_HANDLE_VALUE; - LONG l; - - lstrcpyW(classKeyPath, ControlClass); - lstrcatW(classKeyPath, slash); - SETUPDI_GuidToString(&device->set->ClassGuid, - classKeyPath + lstrlenW(classKeyPath)); - l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, classKeyPath, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &classKey, NULL); - if (!l) - { - static const WCHAR fmt[] = { '%','0','4','u',0 }; - WCHAR devId[10]; - - sprintfW(devId, fmt, device->devnode); - l = RegOpenKeyExW(classKey, devId, 0, samDesired, &key); - RegCloseKey(classKey); - if (l) - { - SetLastError(ERROR_KEY_DOES_NOT_EXIST); - return INVALID_HANDLE_VALUE; - } - } - return key; -} - /*********************************************************************** * SetupDiOpenDevRegKey (SETUPAPI.@) */ @@ -3427,7 +3452,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, key = SETUPDI_OpenDevKey(device, samDesired); break; case DIREG_DRV: - key = SETUPDI_OpenDrvKey(device, samDesired); + key = open_driver_key(device, samDesired); break; default: WARN("unknown KeyType %d\n", KeyType); @@ -3453,34 +3478,6 @@ static BOOL SETUPDI_DeleteDevKey(struct device *device) return ret; } -static BOOL SETUPDI_DeleteDrvKey(struct device *device) -{ - static const WCHAR slash[] = { '\\',0 }; - WCHAR classKeyPath[MAX_PATH]; - HKEY classKey; - LONG l; - BOOL ret = FALSE; - - lstrcpyW(classKeyPath, ControlClass); - lstrcatW(classKeyPath, slash); - SETUPDI_GuidToString(&device->set->ClassGuid, - classKeyPath + lstrlenW(classKeyPath)); - l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, classKeyPath, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &classKey, NULL); - if (!l) - { - static const WCHAR fmt[] = { '%','0','4','u',0 }; - WCHAR devId[10]; - - sprintfW(devId, fmt, device->devnode); - ret = RegDeleteTreeW(classKey, devId); - RegCloseKey(classKey); - } - else - SetLastError(l); - return ret; -} - /*********************************************************************** * SetupDiDeleteDevRegKey (SETUPAPI.@) */ @@ -3520,12 +3517,12 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat ret = SETUPDI_DeleteDevKey(device); break; case DIREG_DRV: - ret = SETUPDI_DeleteDrvKey(device); + ret = delete_driver_key(device); break; case DIREG_BOTH: ret = SETUPDI_DeleteDevKey(device); if (ret) - ret = SETUPDI_DeleteDrvKey(device); + ret = delete_driver_key(device); break; default: WARN("unknown KeyType %d\n", KeyType); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 4abc188ea4..e90f4166b7 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,72 +37,6 @@ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; static GUID guid2 = {0x6a55b5a5, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; -static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) -{ - LONG ret; - DWORD dwMaxSubkeyLen, dwMaxValueLen; - DWORD dwMaxLen, dwSize; - WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; - HKEY hSubKey = hKey; - - if(lpszSubKey) - { - ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if (ret) return ret; - } - - /* Get highest length for keys, values */ - ret = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, - &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); - if (ret) goto cleanup; - - dwMaxSubkeyLen++; - dwMaxValueLen++; - dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); - if (dwMaxLen > ARRAY_SIZE(szNameBuf)) - { - /* Name too big: alloc a buffer for it */ - if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(WCHAR)))) - { - ret = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - } - - - /* Recursively delete all the subkeys */ - while (TRUE) - { - dwSize = dwMaxLen; - if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, - NULL, NULL, NULL)) break; - - ret = devinst_RegDeleteTreeW(hSubKey, lpszName); - if (ret) goto cleanup; - } - - if (lpszSubKey) - ret = RegDeleteKeyW(hKey, lpszSubKey); - else - while (TRUE) - { - dwSize = dwMaxLen; - if (RegEnumValueW(hKey, 0, lpszName, &dwSize, - NULL, NULL, NULL, NULL)) break; - - ret = RegDeleteValueW(hKey, lpszName); - if (ret) goto cleanup; - } - -cleanup: - /* Free buffer if allocated */ - if (lpszName != szNameBuf) - HeapFree( GetProcessHeap(), 0, lpszName); - if(lpszSubKey) - RegCloseKey(hSubKey); - return ret; -} - static void test_create_device_list_ex(void) { static const WCHAR machine[] = { 'd','u','m','m','y',0 }; @@ -776,9 +710,11 @@ static void test_device_key(void) 'E','n','u','m','\\','R','o','o','t','\\', 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; SP_DEVINFO_DATA device = {sizeof(device)}; + char driver_path[50], data[4]; + HKEY class_key, key; + DWORD size; BOOL ret; HDEVINFO set; - HKEY key = NULL; LONG res; SetLastError(0xdeadbeef); @@ -836,9 +772,13 @@ static void test_device_key(void) ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DRIVER, NULL, + (BYTE *)driver_path, sizeof(driver_path), NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); + SetLastError(0xdeadbeef); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key); -todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); RegCloseKey(key); @@ -852,6 +792,17 @@ todo_wine ok(!RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key), "Key should exist.\n"); RegCloseKey(key); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Class", &class_key); + ok(!res, "Failed to open class key, error %u.\n", res); + + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DRIVER, NULL, + (BYTE *)driver_path, sizeof(driver_path), NULL); + ok(ret, "Failed to get driver property, error %#x.\n", GetLastError()); + res = RegOpenKeyA(class_key, driver_path, &key); + ok(!res, "Failed to open driver key, error %u.\n", res); + RegSetValueExA(key, "foo", 0, REG_SZ, (BYTE *)"bar", sizeof("bar")); + RegCloseKey(key); + SetLastError(0xdeadbeef); key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); todo_wine { @@ -862,15 +813,32 @@ todo_wine { key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ); ok(key != INVALID_HANDLE_VALUE, "Failed to open device key, error %#x.\n", GetLastError()); + size = sizeof(data); + res = RegQueryValueExA(key, "foo", NULL, NULL, (BYTE *)data, &size); + ok(!res, "Failed to get value, error %u.\n", res); + ok(!strcmp(data, "bar"), "Got wrong data %s.\n", data); RegCloseKey(key); + + ret = SetupDiDeleteDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV); + ok(ret, "Failed to delete device key, error %#x.\n", GetLastError()); + + res = RegOpenKeyA(class_key, driver_path, &key); + ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + + RegCloseKey(class_key); } ret = SetupDiRemoveDevice(set, &device); ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); - /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); + /* Vista+ deletes the key automatically. */ + res = RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey); + ok(!res || res == ERROR_FILE_NOT_FOUND, "Failed to delete class key, error %u.\n", res); } static void test_register_device_iface(void) -- 2.17.1

1 3

[PATCH 1/4] setupapi: Store the path to the driver key in the device key.
by Zebediah Figura 23 Jan '19

23 Jan '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 110 ++++++++++++++++++---------------- dlls/setupapi/tests/devinst.c | 25 +++++++- 2 files changed, 82 insertions(+), 53 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 55746562c8..c3ba9010f8 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -492,30 +492,68 @@ static HKEY SETUPDI_CreateDevKey(struct device *device) return key; } -static HKEY SETUPDI_CreateDrvKey(struct device *device) +static HKEY open_driver_key(struct device *device, REGSAM access) { - static const WCHAR slash[] = { '\\',0 }; - WCHAR classKeyPath[MAX_PATH]; - HKEY classKey, key = INVALID_HANDLE_VALUE; + HKEY class_key, key; + WCHAR path[50]; + DWORD size = sizeof(path); LONG l; - lstrcpyW(classKeyPath, ControlClass); - lstrcatW(classKeyPath, slash); - SETUPDI_GuidToString(&device->set->ClassGuid, - classKeyPath + lstrlenW(classKeyPath)); - l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, classKeyPath, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &classKey, NULL); - if (!l) + if ((l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ControlClass, 0, NULL, 0, + KEY_CREATE_SUB_KEY, NULL, &class_key, NULL))) { - static const WCHAR fmt[] = { '%','0','4','u',0 }; - WCHAR devId[10]; - - sprintfW(devId, fmt, device->devnode); - RegCreateKeyExW(classKey, devId, 0, NULL, 0, KEY_READ | KEY_WRITE, - NULL, &key, NULL); - RegCloseKey(classKey); + ERR("Failed to open driver class root key, error %u.\n", l); + SetLastError(l); + return INVALID_HANDLE_VALUE; } - return key; + + if (!(l = RegGetValueW(device->key, NULL, Driver, RRF_RT_REG_SZ, NULL, path, &size))) + { + if (!(l = RegOpenKeyExW(class_key, path, 0, access, &key))) + { + RegCloseKey(class_key); + return key; + } + ERR("Failed to open driver key, error %u.\n", l); + } + + RegCloseKey(class_key); + SetLastError(ERROR_KEY_DOES_NOT_EXIST); + return INVALID_HANDLE_VALUE; +} + +static HKEY create_driver_key(struct device *device) +{ + static const WCHAR formatW[] = {'%','0','4','u',0}; + static const WCHAR slash[] = { '\\',0 }; + HKEY class_key, key; + WCHAR path[50]; + LONG l; + + if ((key = open_driver_key(device, KEY_READ | KEY_WRITE)) != INVALID_HANDLE_VALUE) + return key; + + if ((l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ControlClass, 0, NULL, 0, + KEY_CREATE_SUB_KEY, NULL, &class_key, NULL))) + { + ERR("Failed to open driver class root key, error %u.\n", l); + SetLastError(l); + return INVALID_HANDLE_VALUE; + } + + SETUPDI_GuidToString(&device->class, path); + strcatW(path, slash); + sprintfW(path + strlenW(path), formatW, device->devnode); + if (!(l = RegCreateKeyExW(class_key, path, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, NULL))) + { + RegSetValueExW(device->key, Driver, 0, REG_SZ, (BYTE *)path, strlenW(path) * sizeof(WCHAR)); + RegCloseKey(class_key); + return key; + } + ERR("Failed to create driver key, error %u.\n", l); + RegCloseKey(class_key); + SetLastError(l); + return INVALID_HANDLE_VALUE; } struct PropertyMapEntry @@ -1367,7 +1405,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da key = SETUPDI_CreateDevKey(device); break; case DIREG_DRV: - key = SETUPDI_CreateDrvKey(device); + key = create_driver_key(device); break; default: WARN("unknown KeyType %d\n", KeyType); @@ -3358,36 +3396,6 @@ static HKEY SETUPDI_OpenDevKey(struct device *device, REGSAM samDesired) return key; } -static HKEY SETUPDI_OpenDrvKey(struct device *device, REGSAM samDesired) -{ - static const WCHAR slash[] = { '\\',0 }; - WCHAR classKeyPath[MAX_PATH]; - HKEY classKey, key = INVALID_HANDLE_VALUE; - LONG l; - - lstrcpyW(classKeyPath, ControlClass); - lstrcatW(classKeyPath, slash); - SETUPDI_GuidToString(&device->set->ClassGuid, - classKeyPath + lstrlenW(classKeyPath)); - l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, classKeyPath, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &classKey, NULL); - if (!l) - { - static const WCHAR fmt[] = { '%','0','4','u',0 }; - WCHAR devId[10]; - - sprintfW(devId, fmt, device->devnode); - l = RegOpenKeyExW(classKey, devId, 0, samDesired, &key); - RegCloseKey(classKey); - if (l) - { - SetLastError(ERROR_KEY_DOES_NOT_EXIST); - return INVALID_HANDLE_VALUE; - } - } - return key; -} - /*********************************************************************** * SetupDiOpenDevRegKey (SETUPAPI.@) */ @@ -3427,7 +3435,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, key = SETUPDI_OpenDevKey(device, samDesired); break; case DIREG_DRV: - key = SETUPDI_OpenDrvKey(device, samDesired); + key = open_driver_key(device, samDesired); break; default: WARN("unknown KeyType %d\n", KeyType); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 4abc188ea4..6aa5a1e277 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -776,9 +776,11 @@ static void test_device_key(void) 'E','n','u','m','\\','R','o','o','t','\\', 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; SP_DEVINFO_DATA device = {sizeof(device)}; + char driver_path[50], data[4]; + HKEY class_key, key; + DWORD size; BOOL ret; HDEVINFO set; - HKEY key = NULL; LONG res; SetLastError(0xdeadbeef); @@ -836,9 +838,13 @@ static void test_device_key(void) ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DRIVER, NULL, + (BYTE *)driver_path, sizeof(driver_path), NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); + SetLastError(0xdeadbeef); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key); -todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); RegCloseKey(key); @@ -852,6 +858,17 @@ todo_wine ok(!RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key), "Key should exist.\n"); RegCloseKey(key); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DRIVER, NULL, + (BYTE *)driver_path, sizeof(driver_path), NULL); + ok(ret, "Failed to get driver property, error %#x.\n", GetLastError()); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Class", &class_key); + ok(!res, "Failed to open class key, error %u.\n", res); + res = RegOpenKeyA(class_key, driver_path, &key); + ok(!res, "Failed to open driver key, error %u.\n", res); + RegSetValueExA(key, "foo", 0, REG_SZ, (BYTE *)"bar", sizeof("bar")); + RegCloseKey(key); + RegCloseKey(class_key); + SetLastError(0xdeadbeef); key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); todo_wine { @@ -862,6 +879,10 @@ todo_wine { key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ); ok(key != INVALID_HANDLE_VALUE, "Failed to open device key, error %#x.\n", GetLastError()); + size = sizeof(data); + res = RegQueryValueExA(key, "foo", NULL, NULL, (BYTE *)data, &size); + ok(!res, "Failed to get value, error %u.\n", res); + ok(!strcmp(data, "bar"), "Got wrong data %s.\n", data); RegCloseKey(key); } -- 2.17.1

2 4

[PATCH] dmloader: Fix a memory leak
by Michael Stefaniuc 23 Jan '19

23 Jan '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/tests/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 084c5c8a15..0ab2e9eaba 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -547,6 +547,7 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == DMUS_E_DESCEND_CHUNK_FAIL, "ParseDescriptor failed: %08x, expected DMUS_E_DESCEND_CHUNK_FAIL\n", hr); + IStream_Release(stream); /* All desc chunks */ stream = gen_riff_stream(alldesc); -- 2.20.1

2 1

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 23 Jan '19

23 Jan '19

1 0

[PATCH] winetest: Add GUI to display results of individual tests
by Isira Seneviratne 22 Jan '19

22 Jan '19

1 0

[PATCH] dmusic/tests: Fix a memory leak (Valgrind).
by Sven Baars 22 Jan '19

22 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/dmusic/tests/dmusic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 19890d17dc..a4fbd4af71 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -720,6 +720,7 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(empty); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == DMUS_E_NOTADLSCOL, "ParseDescriptor failed: %08x, expected DMUS_E_NOTADLSCOL\n", hr); + IStream_Release(stream); /* All desc chunks */ stream = gen_riff_stream(alldesc); -- 2.17.1

2 1

[PATCH] dmband/tests: Fix a memory leak (Valgrind).
by Sven Baars 22 Jan '19

22 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/dmband/tests/dmband.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index b7a3a5b2b5..29d0668219 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -390,6 +390,7 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == DMUS_E_INVALID_BAND, "ParseDescriptor failed: %08x, expected DMUS_E_INVALID_BAND\n", hr); + IStream_Release(stream); /* A category chunk adds DMUS_OBJ_DATE too */ stream = gen_riff_stream(catdate); -- 2.17.1

2 7

[PATCH] dswave/tests: Fix a memory leak (Valgrind).
by Sven Baars 22 Jan '19

22 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/dswave/tests/dswave.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index 29b6815265..d9bdc85ea7 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -246,6 +246,7 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == DMUS_E_CHUNKNOTFOUND, "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + IStream_Release(stream); /* All desc chunks, only DMUS_OBJ_OBJECT and DMUS_OBJ_VERSION supported */ stream = gen_riff_stream(alldesc); -- 2.17.1

2 1

[PATCH vkd3d] README: Expand on building and using vkd3d
by Andrew Eikum 22 Jan '19

22 Jan '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- README | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/README b/README index f353c36..0abaa08 100644 --- a/README +++ b/README @@ -4,3 +4,31 @@ The vkd3d 3D Graphics Library Vkd3d is a 3D graphics library built on top of Vulkan. It has an API very similar, but not identical, to Direct3D 12. + +============== +Building vkd3d +============== + +Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.88). + +Vkd3d builds some of its headers from IDL files. If you are using the release +tarballs, then these headers are pre-built and are included. If you are +building from git, then they will be built at build-time using widl. By +default, vkd3d will use the widl found in PATH. If widl is not available or +is not recent (>= 3.0 or so), then you can build Wine with "make tools/widl" +to avoid building all of Wine. You can then point vkd3d's configure at that +widl binary with WIDL=/path/to/widl. + +=========== +Using vkd3d +=========== + +Vkd3d can be used by projects that target D3D12 as a drop-in replacement at +build-time with some modest source modifications. Or it can be used by Wine to +run Windows applications that target D3D12. + +To build Wine with vkd3d for D3D12 support, first build and install vkd3d (see +above for widl requirement) and then build Wine. Wine's configure should pick +up on vkd3d if it is installed to the system, or you can use PKG_CONFIG_PATH +to point Wine's configure script at vkd3d's pc-files located in a non-standard +installation. -- 2.20.1

2 2

[PATCH vkd3d 7/7] tests: Add more tests for texture allocation info.
by Józef Kucia 22 Jan '19

22 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 61 ++++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 1 + 2 files changed, 62 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index bccface6de51..06543e9152f0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22025,6 +22025,7 @@ static void test_resource_allocation_info(void) ID3D12Device *device; unsigned int i, j; ULONG refcount; + UINT64 size; static const unsigned int alignments[] = { @@ -22046,6 +22047,22 @@ static void test_resource_allocation_info(void) D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT + 1, }; + static const struct + { + unsigned int width; + unsigned int height; + unsigned int array_size; + DXGI_FORMAT format; + } + texture_tests[] = + { + { 4, 4, 1, DXGI_FORMAT_R8_UINT}, + { 8, 8, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 6, DXGI_FORMAT_R8G8B8A8_UNORM}, + + {1024, 1024, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + }; if (!(device = create_device())) { @@ -22086,6 +22103,50 @@ static void test_resource_allocation_info(void) } } + desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + desc.MipLevels = 1; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + desc.Flags = 0; + + for (i = 0; i < ARRAY_SIZE(texture_tests); ++i) + { + desc.Width = texture_tests[i].width; + desc.Height = texture_tests[i].height; + desc.DepthOrArraySize = texture_tests[i].array_size; + desc.Format = texture_tests[i].format; + + desc.Alignment = 0; + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); + ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + check_alignment(info.SizeInBytes, info.Alignment); + + desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); + ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + check_alignment(info.SizeInBytes, info.Alignment); + + desc.Alignment = D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT; + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); + ok(info.Alignment >= D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + size = desc.Width * desc.Height * desc.DepthOrArraySize * format_size(desc.Format); + if (size <= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + check_alignment(info.SizeInBytes, info.Alignment); + } + else + { + ok(info.SizeInBytes == ~(UINT64)0, + "Got unexpected size %"PRIu64".\n", info.SizeInBytes); + ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + } + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index d4265fc893c8..6ccbc64981b9 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -227,6 +227,7 @@ static unsigned int format_size(DXGI_FORMAT format) { case DXGI_FORMAT_UNKNOWN: case DXGI_FORMAT_A8_UNORM: + case DXGI_FORMAT_R8_UINT: return 1; case DXGI_FORMAT_R32G32B32A32_FLOAT: case DXGI_FORMAT_R32G32B32A32_UINT: -- 2.19.2

2 1

[PATCH vkd3d 2/7] vkd3d: Handle base offset in GetCopyableFootprints().
by Józef Kucia 22 Jan '19

22 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 03a7a25bab8e..7c2006232795 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2367,9 +2367,6 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - if (base_offset) - FIXME("Ignoring base offset %#"PRIx64".\n", base_offset); - offset = 0; total = 0; for (i = 0; i < sub_resource_count; ++i) @@ -2385,7 +2382,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i if (layouts) { - layouts[i].Offset = offset; + layouts[i].Offset = base_offset + offset; layouts[i].Footprint.Format = desc->Format; layouts[i].Footprint.Width = width; layouts[i].Footprint.Height = height; -- 2.19.2

2 1

[PATCH vkd3d 6/7] vkd3d: Allow D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT only when explicitly requested.
by Józef Kucia 22 Jan '19

22 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 12 ++++++------ libs/vkd3d/resource.c | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 52e741053bea..93af06cb1b5b 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2077,6 +2077,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour struct d3d12_device *device = impl_from_ID3D12Device(iface); const struct vkd3d_format *format; const D3D12_RESOURCE_DESC *desc; + UINT64 requested_alignment; UINT64 estimated_size; TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p.\n", @@ -2101,6 +2102,9 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour goto invalid; } + requested_alignment = desc->Alignment + ? desc->Alignment : D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { info->SizeInBytes = desc->Width; @@ -2114,6 +2118,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour goto invalid; } + info->Alignment = max(info->Alignment, requested_alignment); + if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) { if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) @@ -2124,13 +2130,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour estimated_size = desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count; if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) - { info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); - } - else - { - info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); - } } } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 64d6e658bd5a..016d050998b0 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1085,6 +1085,8 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) return E_INVALIDARG; } + /* FIXME: Validate alignment for textures. */ + return S_OK; } -- 2.19.2

2 1

[PATCH vkd3d 3/7] tests: Test GetCopyableFootprints() with base offset.
by Józef Kucia 22 Jan '19

22 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 94 +++++++++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 40 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 41704b3c076a..bccface6de51 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14619,10 +14619,10 @@ static void test_null_descriptors(void) destroy_test_context(&context); } -#define check_copyable_footprints(a, b, c, d, e, f, g) \ - check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g) +#define check_copyable_footprints(a, b, c, d, e, f, g, h) \ + check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g, h) static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_DESC *desc, - unsigned int sub_resource_idx, unsigned int sub_resource_count, + unsigned int sub_resource_idx, unsigned int sub_resource_count, UINT64 base_offset, const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, const UINT *row_counts, const UINT64 *row_sizes, UINT64 *total_size) { @@ -14647,7 +14647,8 @@ static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_D const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *l = &layouts[i]; const D3D12_SUBRESOURCE_FOOTPRINT *f = &l->Footprint; - ok_(line)(l->Offset == offset, "Got offset %"PRIu64", expected %"PRIu64".\n", l->Offset, offset); + ok_(line)(l->Offset == base_offset + offset, + "Got offset %"PRIu64", expected %"PRIu64".\n", l->Offset, base_offset + offset); ok_(line)(f->Format == desc->Format, "Got format %#x, expected %#x.\n", f->Format, desc->Format); ok_(line)(f->Width == width, "Got width %u, expected %u.\n", f->Width, width); ok_(line)(f->Height == height, "Got height %u, expected %u.\n", f->Height, height); @@ -14678,7 +14679,7 @@ static void test_get_copyable_footprints(void) D3D12_RESOURCE_DESC resource_desc; UINT64 row_sizes[10], total_size; unsigned int sub_resource_count; - unsigned int i, j, k; + unsigned int i, j, k, l; ID3D12Device *device; UINT row_counts[10]; ULONG refcount; @@ -14732,6 +14733,10 @@ static void test_get_copyable_footprints(void) {DXGI_FORMAT_BC6H_SF16, true}, {DXGI_FORMAT_BC7_UNORM, true}, }; + static const UINT64 base_offsets[] = + { + 0, 1, 2, 30, 255, 512, 513, 600, 4096, 4194304, ~(UINT64)0, + }; static const struct { D3D12_RESOURCE_DESC resource_desc; @@ -14780,7 +14785,6 @@ static void test_get_copyable_footprints(void) return; } - /* TODO: test base offset */ for (i = 0; i < ARRAY_SIZE(resources); ++i) { const bool is_buffer = resources[i].dimension == D3D12_RESOURCE_DIMENSION_BUFFER; @@ -14814,49 +14818,59 @@ static void test_get_copyable_footprints(void) sub_resource_count *= resource_desc.DepthOrArraySize; assert(sub_resource_count <= ARRAY_SIZE(layouts)); - memset(layouts, 0, sizeof(layouts)); - memset(row_counts, 0, sizeof(row_counts)); - memset(row_sizes, 0, sizeof(row_sizes)); - total_size = 0; - ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, 0, - layouts, row_counts, row_sizes, &total_size); - check_copyable_footprints(&resource_desc, 0, sub_resource_count, - layouts, row_counts, row_sizes, &total_size); - - memset(layouts, 0, sizeof(layouts)); - ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, 0, - layouts, NULL, NULL, NULL); - check_copyable_footprints(&resource_desc, 0, sub_resource_count, - layouts, NULL, NULL, NULL); - memset(row_counts, 0, sizeof(row_counts)); - ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, 0, - NULL, row_counts, NULL, NULL); - check_copyable_footprints(&resource_desc, 0, sub_resource_count, - NULL, row_counts, NULL, NULL); - memset(row_sizes, 0, sizeof(row_sizes)); - ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, 0, - NULL, NULL, row_sizes, NULL); - check_copyable_footprints(&resource_desc, 0, sub_resource_count, - NULL, NULL, row_sizes, NULL); - total_size = 0; - ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, 0, - NULL, NULL, NULL, &total_size); - check_copyable_footprints(&resource_desc, 0, sub_resource_count, - NULL, NULL, NULL, &total_size); - - for (k = 0; k < sub_resource_count; ++k) + for (k = 0; k < ARRAY_SIZE(base_offsets); ++k) { + vkd3d_test_set_context("resource %u, format %#x, offset %#"PRIx64, + i, resource_desc.Format, base_offsets[k]); + memset(layouts, 0, sizeof(layouts)); memset(row_counts, 0, sizeof(row_counts)); memset(row_sizes, 0, sizeof(row_sizes)); total_size = 0; - ID3D12Device_GetCopyableFootprints(device, &resource_desc, k, 1, 0, + ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k], layouts, row_counts, row_sizes, &total_size); - check_copyable_footprints(&resource_desc, k, 1, + check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], layouts, row_counts, row_sizes, &total_size); + + memset(layouts, 0, sizeof(layouts)); + ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k], + layouts, NULL, NULL, NULL); + check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], + layouts, NULL, NULL, NULL); + memset(row_counts, 0, sizeof(row_counts)); + ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, row_counts, NULL, NULL); + check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, row_counts, NULL, NULL); + memset(row_sizes, 0, sizeof(row_sizes)); + ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, NULL, row_sizes, NULL); + check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, NULL, row_sizes, NULL); + total_size = 0; + ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, NULL, NULL, &total_size); + check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, NULL, NULL, &total_size); + + for (l = 0; l < sub_resource_count; ++l) + { + vkd3d_test_set_context("resource %u, format %#x, offset %#"PRIx64", sub-resource %u", + i, resource_desc.Format, base_offsets[k], l); + + memset(layouts, 0, sizeof(layouts)); + memset(row_counts, 0, sizeof(row_counts)); + memset(row_sizes, 0, sizeof(row_sizes)); + total_size = 0; + ID3D12Device_GetCopyableFootprints(device, &resource_desc, l, 1, base_offsets[k], + layouts, row_counts, row_sizes, &total_size); + check_copyable_footprints(&resource_desc, l, 1, base_offsets[k], + layouts, row_counts, row_sizes, &total_size); + } } } } + vkd3d_test_set_context(NULL); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_desc.Alignment = 0; @@ -14874,7 +14888,7 @@ static void test_get_copyable_footprints(void) total_size = 0; ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, 1, 0, layouts, row_counts, row_sizes, &total_size); - check_copyable_footprints(&resource_desc, 0, 1, + check_copyable_footprints(&resource_desc, 0, 1, 0, layouts, row_counts, row_sizes, &total_size); for (i = 0; i < ARRAY_SIZE(invalid_descs); ++i) -- 2.19.2

2 1

[PATCH vkd3d 5/7] vkd3d: Simplify d3d12_device_GetResourceAllocationInfo().
by Józef Kucia 22 Jan '19

22 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 64 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7a6dcb68862d..52e741053bea 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2074,11 +2074,10 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour ID3D12Device *iface, D3D12_RESOURCE_ALLOCATION_INFO *info, UINT visible_mask, UINT count, const D3D12_RESOURCE_DESC *resource_descs) { - UINT64 default_alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; struct d3d12_device *device = impl_from_ID3D12Device(iface); const struct vkd3d_format *format; const D3D12_RESOURCE_DESC *desc; - bool valid = true; + UINT64 estimated_size; TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p.\n", iface, info, visible_mask, count, resource_descs); @@ -2099,7 +2098,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour if (FAILED(d3d12_resource_validate_desc(desc))) { WARN("Invalid resource desc.\n"); - valid = false; + goto invalid; } if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) @@ -2109,57 +2108,56 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour } else { - /* FIXME: Should we support D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT for small MSSA resources? */ - if (desc->SampleDesc.Count != 1) - default_alignment = D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT; - - if (valid && FAILED(vkd3d_get_image_allocation_info(device, desc, info))) + if (FAILED(vkd3d_get_image_allocation_info(device, desc, info))) { WARN("Failed to get allocation info for texture.\n"); - valid = false; + goto invalid; } - if (valid && info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) { - if ((format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) + if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) { - if (desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count - > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) - { - info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); - } - else - { - info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); - } + WARN("Invalid format %#x.\n", desc->Format); + goto invalid; + } + + estimated_size = desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count; + if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); } else { - WARN("Invalid format %#x.\n", desc->Format); - valid = false; + info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); } } } - if (valid && desc->Alignment % info->Alignment) + if (desc->Alignment % info->Alignment) { WARN("Invalid resource alignment %#"PRIx64" (required %#"PRIx64").\n", desc->Alignment, info->Alignment); - valid = false; + goto invalid; } - if (valid) - { - info->SizeInBytes = align(info->SizeInBytes, info->Alignment); - } - else - { - info->SizeInBytes = ~(UINT64)0; - info->Alignment = default_alignment; - } + info->SizeInBytes = align(info->SizeInBytes, info->Alignment); TRACE("Size %#"PRIx64", alignment %#"PRIx64".\n", info->SizeInBytes, info->Alignment); + return info; + +invalid: + info->SizeInBytes = ~(UINT64)0; + + /* FIXME: Should we support D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT for small MSSA resources? */ + if (desc->SampleDesc.Count != 1) + info->Alignment = D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT; + else + info->Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + + TRACE("Alignment %#"PRIx64".\n", info->Alignment); + return info; } -- 2.19.2

2 1

[PATCH vkd3d 4/7] vkd3d: Allow D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT only for small textures.
by Józef Kucia 22 Jan '19

22 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Use a simple heuristic to decide if a resource is "small". The heuristic is based on theoretical constraints for the most detailed mip level of small resources. Those constraints are mentioned in D3D12 validation layer errors and in the DirectX 12 Graphics samples. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7c2006232795..7a6dcb68862d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2076,6 +2076,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour { UINT64 default_alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; struct d3d12_device *device = impl_from_ID3D12Device(iface); + const struct vkd3d_format *format; const D3D12_RESOURCE_DESC *desc; bool valid = true; @@ -2118,7 +2119,26 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour valid = false; } - info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); + if (valid && info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + if ((format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) + { + if (desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count + > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); + } + else + { + info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); + } + } + else + { + WARN("Invalid format %#x.\n", desc->Format); + valid = false; + } + } } if (valid && desc->Alignment % info->Alignment) -- 2.19.2

2 1

[PATCH vkd3d 1/7] vkd3d: Skip uninitialized descriptors in OMSetRenderTargets().
by Józef Kucia 22 Jan '19

22 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 5 +++-- tests/d3d12.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 49c3830030ee..fa5f8fb2ef4d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3749,7 +3749,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]); } - if (!rtv_desc) + if (!rtv_desc || !rtv_desc->resource) { WARN("RTV descriptor %u is not initialized.\n", i); list->views[i + 1] = VK_NULL_HANDLE; @@ -3773,7 +3773,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi if (depth_stencil_descriptor) { - if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor))) + if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor)) + && dsv_desc->resource) { d3d12_command_list_track_resource_usage(list, dsv_desc->resource); diff --git a/tests/d3d12.c b/tests/d3d12.c index 97af4c1a9f67..41704b3c076a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4219,6 +4219,42 @@ static void test_clear_unordered_access_view(void) #undef BUFFER_SIZE } +static void test_set_render_targets(void) +{ + ID3D12DescriptorHeap *dsv_heap, *rtv_heap; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE dsv, rtv; + struct test_context context; + ID3D12Device *device; + HRESULT hr; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + command_list = context.list; + + rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 4); + dsv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_DSV, 4); + + dsv = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(dsv_heap); + rtv = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, FALSE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, TRUE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, TRUE, &dsv); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, &rtv, TRUE, &dsv); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, &rtv, FALSE, &dsv); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, TRUE, &dsv); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, FALSE, &dsv); + + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + + ID3D12DescriptorHeap_Release(rtv_heap); + ID3D12DescriptorHeap_Release(dsv_heap); + destroy_test_context(&context); +} + static void test_draw_instanced(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -22893,6 +22929,7 @@ START_TEST(d3d12) run_test(test_clear_depth_stencil_view); run_test(test_clear_render_target_view); run_test(test_clear_unordered_access_view); + run_test(test_set_render_targets); run_test(test_draw_instanced); run_test(test_draw_indexed_instanced); run_test(test_draw_no_descriptor_bindings); -- 2.19.2

2 1

[PATCH] comdlg32: Improve PRINT32 dialog
by Alistair Leslie-Hughes 21 Jan '19

21 Jan '19

- Corrected TAB order to be the same as windows - Moved Help button to Bottom Right, align top with OK/Cancel buttons. - Moved Print to File Checkbox to be in the same position as windows. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comdlg32/comdlg32.rc | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 22a5a93..04ce3da9 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -354,40 +354,37 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "Print" FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "OK", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 230,164, 50,14, WS_GROUP - PUSHBUTTON "&Help", pshHelp, 50, 161, 50,14, WS_GROUP - +BEGIN GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "Print to fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 + COMBOBOX cmb4,54,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP + CONTROL "Print to fi&le",chx1,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,213,71,60,12 LTEXT "&Name:", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX - LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Type:", stc7, 16, 48, 47,10, SS_NOPREFIX - LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Where:", stc10, 16, 60, 47,10, SS_NOPREFIX - LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Comment:", stc9, 16, 72, 47,10, SS_NOPREFIX - LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "Number of &copies:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 - EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - + LTEXT "Status:",stc8,16,36,36,10,SS_NOPREFIX + LTEXT "",stc12,SS_LEFTNOWORDWRAP | SS_NOPREFIX,54,36,152,10 + LTEXT "Type:",stc7,16,48,36,10,SS_NOPREFIX + LTEXT "",stc11,SS_LEFTNOWORDWRAP | SS_NOPREFIX,54,48,152,10 + LTEXT "Where:",stc10,16,60,36,10,SS_NOPREFIX + LTEXT "",stc14,SS_LEFTNOWORDWRAP | SS_NOPREFIX,54,60,152,10 + LTEXT "Comment:",stc9,16,72,36,10,SS_NOPREFIX + LTEXT "",stc13,SS_LEFTNOWORDWRAP | SS_NOPREFIX,54,72,152,10 GROUPBOX "Print range", grp1, 8,92, 144,64, WS_GROUP CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "&Selection", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&from:", stc2, 52,124, 20,8 + RTEXT "&from:", stc2, 52,122, 20,8 RTEXT "&to:", stc3, 99,124, 20,8 -} + GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "Number of &copies:",stc5,168,105,68,8 + ICON "",ico3,170,131,20,20,SS_CENTERIMAGE | WS_GROUP + CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER + DEFPUSHBUTTON "OK",IDOK,176,164,50,14,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,230,164,50,14,WS_GROUP + PUSHBUTTON "&Help",pshHelp,8,164,50,14,WS_GROUP +END PRINT32_SETUP DIALOG 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -- 1.9.1

1 0

[PATCH] hlink/tests: Fix some memory leaks (Valgrind).
by Sven Baars 21 Jan '19

21 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/hlink/tests/browse_ctx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 319352500c..95a72d7772 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -165,16 +165,12 @@ static void test_GetObject(void) { IHlinkBrowseContext *bc; IMoniker *dummy; - IBindCtx *bindctx; IUnknown *unk; WCHAR one[] = {'1',0}; WCHAR five[] = {'5',0}; DWORD cookie; HRESULT hres; - hres = CreateBindCtx(0, &bindctx); - ok(hres == S_OK, "CreateBindCtx() failed: 0x%08x\n", hres); - hres = CreateItemMoniker(one, five, &dummy); ok(hres == S_OK, "CreateItemMoniker() failed: 0x%08x\n", hres); @@ -198,6 +194,7 @@ static void test_GetObject(void) ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); IHlinkBrowseContext_Release(bc); + IMoniker_Release(dummy); } START_TEST(browse_ctx) -- 2.17.1

1 0

[PATCH] user32/tests: Add more tests for SetWindowPos() on child window.
by Paul Gofman 21 Jan '19

21 Jan '19

Related to bug https://bugs.winehq.org/show_bug.cgi?id=20190. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/win.c | 67 ++++++++++++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 94eff5ee4f..e55c1399a5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2471,6 +2471,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) LONG_PTR old_proc; HWND hwnd_grandchild, hwnd_child, hwnd_child2; HWND hwnd_desktop; + RECT rc_expected; RECT rc1, rc2; BOOL ret; @@ -2554,11 +2555,59 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) /* Does not seem to do anything even without passing flags, still returns TRUE */ GetWindowRect(hwnd_child, &rc1); - ret = SetWindowPos(hwnd_child, hwnd2 , 1, 2, 3, 4, 0); - ok(ret, "Got %d\n", ret); + ret = SetWindowPos(hwnd_child, hwnd2, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); GetWindowRect(hwnd_child, &rc2); - ok(EqualRect(&rc1, &rc2), "%s != %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); + ok(EqualRect(&rc1, &rc2), "%s != %s.\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); + check_active_state(hwnd2, hwnd2, hwnd2); + + GetWindowRect(hwnd_child, &rc1); + ret = SetWindowPos(hwnd_child, HWND_NOTOPMOST, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); + GetWindowRect(hwnd_child, &rc2); + todo_wine ok(EqualRect(&rc1, &rc2), "%s != %s.\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); + check_active_state(hwnd2, hwnd2, hwnd2); + SetWindowPos(hwnd_child, HWND_NOTOPMOST, 0, 0, rc1.right - rc1.left, rc1.bottom - rc1.top, 0); + + GetWindowRect(hwnd_child, &rc1); + ret = SetWindowPos(hwnd_child, HWND_TOPMOST, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); + GetWindowRect(hwnd_child, &rc2); + todo_wine ok(EqualRect(&rc1, &rc2), "%s != %s.\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); + check_active_state(hwnd2, hwnd2, hwnd2); + SetWindowPos(hwnd_child, HWND_TOPMOST, 0, 0, rc1.right - rc1.left, rc1.bottom - rc1.top, 0); + + /* HWND_TOP / HWND_BOTTOM are different. */ + GetWindowRect(hwnd_child, &rc1); + rc_expected.left = rc1.left + 1; + rc_expected.top = rc1.top + 2; + rc_expected.right = rc1.left + 4; + rc_expected.bottom = rc1.top + 6; + ret = SetWindowPos(hwnd_child, HWND_TOP, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); + GetWindowRect(hwnd_child, &rc2); + ok(EqualRect(&rc_expected, &rc2), "%s != %s.\n", + wine_dbgstr_rect(&rc_expected), wine_dbgstr_rect(&rc2)); + check_active_state(hwnd2, hwnd2, hwnd2); + SetWindowPos(hwnd_child, HWND_TOP, 0, 0, rc1.right - rc1.left, rc1.bottom - rc1.top, 0); + + GetWindowRect(hwnd_child, &rc1); + ret = SetWindowPos(hwnd_child, HWND_BOTTOM, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); + GetWindowRect(hwnd_child, &rc2); + ok(EqualRect(&rc_expected, &rc2), "%s != %s.\n", + wine_dbgstr_rect(&rc_expected), wine_dbgstr_rect(&rc2)); check_active_state(hwnd2, hwnd2, hwnd2); + SetWindowPos(hwnd_child, HWND_BOTTOM, 0, 0, rc1.right - rc1.left, rc1.bottom - rc1.top, 0); + + GetWindowRect(hwnd_child, &rc1); + ret = SetWindowPos(hwnd_child, NULL, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); + GetWindowRect(hwnd_child, &rc2); + ok(EqualRect(&rc_expected, &rc2), "%s != %s.\n", + wine_dbgstr_rect(&rc_expected), wine_dbgstr_rect(&rc2)); + check_active_state(hwnd2, hwnd2, hwnd2); + SetWindowPos(hwnd_child, NULL, 0, 0, rc1.right - rc1.left, rc1.bottom - rc1.top, 0); /* Same thing the other way around. */ GetWindowRect(hwnd2, &rc1); @@ -2581,10 +2630,8 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_grandchild, hwnd_child2, 1, 2, 3, 4, SWP_NOZORDER); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd_grandchild, &rc2); - ok((rc1.left+1) == rc2.left && (rc1.top+2) == rc2.top && - (rc1.left+4) == rc2.right && (rc1.top+6) == rc2.bottom, - "(%d,%d)-(%d,%d) != %s\n", rc1.left+1, rc1.top+2, rc1.left+4, rc1.top+6, - wine_dbgstr_rect(&rc2)); + ok(EqualRect(&rc_expected, &rc2), + "%s != %s.\n", wine_dbgstr_rect(&rc_expected), wine_dbgstr_rect(&rc2)); check_active_state(hwnd2, hwnd2, hwnd2); /* Given a sibling window, the window is properly resized. */ @@ -2592,10 +2639,8 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, hwnd_child2, 1, 2, 3, 4, 0); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd_child, &rc2); - ok((rc1.left+1) == rc2.left && (rc1.top+2) == rc2.top && - (rc1.left+4) == rc2.right && (rc1.top+6) == rc2.bottom, - "(%d,%d)-(%d,%d) != %s\n", rc1.left+1, rc1.top+2, rc1.left+4, rc1.top+6, - wine_dbgstr_rect(&rc2)); + ok(EqualRect(&rc_expected, &rc2), + "%s != %s.\n", wine_dbgstr_rect(&rc_expected), wine_dbgstr_rect(&rc2)); check_active_state(hwnd2, hwnd2, hwnd2); /* Involving the desktop window changes things. */ -- 2.20.1

2 2

Wine staging 4.0-rc7 release
by Alistair Leslie-Hughes 21 Jan '19

21 Jan '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 4.0-rc7 (837 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * windowscodecs: Fix the buffer size check in the TIFF decoder's IWICBitmapFrameDecode::CopyPixels implementation. Added: * 26653 - oleaut32: Support VT_DECIMAL in VarRound. * 37639 - vssapi: Add ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@ stub * 46088 - vssapi: Add CreateVssBackupComponentsInternal stub * 46465 - msvcp140: Forward _Equivalent to tr2_sys__Equivalent_wchar Updated: * Improved support for python2 in staging scripts. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Steal 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

Fwd: [PATCH] d3dx9_36/tests: Fix D3DXMatrixTransformation when the scaling matrix is NULL
by David Adam 21 Jan '19

21 Jan '19

2 1

[PATCH] ddraw: Mipmap sublevels have their own mipmap counter
by David Adam 21 Jan '19

21 Jan '19

2 1

[PATCH] ole32/tests: Test for the correct IID
by Alistair Leslie-Hughes 20 Jan '19

20 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ole32/tests/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 2173209..2823a0e 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -788,7 +788,7 @@ static HRESULT WINAPI MessageFilter_QueryInterface(IMessageFilter *iface, REFIID if (ppvObj == NULL) return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IClassFactory)) + IsEqualGUID(riid, &IID_IMessageFilter)) { *ppvObj = iface; IMessageFilter_AddRef(iface); -- 1.9.1

1 0

[PATCH] kernel32/tests: Fix a memory leak (Valgrind).
by Sven Baars 20 Jan '19

20 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/kernel32/tests/profile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 4dbe129b76..c075e0a745 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -579,6 +579,8 @@ static void test_profile_directory_readonly(void) ret = RemoveDirectoryA(path_folder); ok(ret == TRUE, "RemoveDirectoryA failed: %d\n", GetLastError()); + + LocalFree(attributes.lpSecurityDescriptor); } static void test_GetPrivateProfileString(const char *content, const char *descript) -- 2.17.1

1 0

[PATCH] d3d9: Make IDirect3D9Ex::GetAdapterDisplayModeEx PURE and add missing defines.
by Joshua Ashton 20 Jan '19

20 Jan '19

1 0

[PATCH v2 1/2] po: Update Sinhala translation.
by Isira Seneviratne 19 Jan '19

19 Jan '19

1 0

4.0 release
by Alexandre Julliard 19 Jan '19

19 Jan '19

Folks, Things are looking good for 4.0, we've made quite a bit of progress on the regressions, thank you to everybody who helped! rc7 should be the last release candidate, please give it a good last check. If no last minute issues are found, I'll release final 4.0 in a couple of days, and lift code freeze :-) -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] msscript.ocx/tests: Fix some memory leaks (Valgrind).
by Sven Baars 19 Jan '19

19 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/msscript.ocx/tests/msscript.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 3110ea278d..47ae76dd24 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -283,8 +283,11 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(hres == S_OK, "Could not get IActiveScriptSiteWindow interface: %08x\n", hres); IActiveScriptSiteWindow_Release(window); + if (site) + IActiveScriptSite_Release(site); site = pass; IActiveScriptSite_AddRef(site); + return S_OK; } @@ -430,6 +433,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown ok(!outer, "outer = %p\n", outer); ok(IsEqualGUID(&IID_IActiveScript, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = &ActiveScript; + site = NULL; return S_OK; } @@ -780,6 +784,8 @@ static void test_Language(void) ok(!lstrcmpW(testscriptW, str), "%s\n", wine_dbgstr_w(str)); SysFreeString(str); + IActiveScriptSite_Release(site); + init_registry(FALSE); SET_EXPECT(Close); @@ -1077,6 +1083,9 @@ static void test_Reset(void) ok(hr == S_OK, "got 0x%08x\n", hr); CHECK_CALLED(SetScriptState_INITIALIZED); + CHECK_CALLED(SetScriptSite); + IActiveScriptSite_Release(site); + init_registry(FALSE); SET_EXPECT(Close); @@ -1213,6 +1222,9 @@ static void test_AddObject(void) hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_TRUE); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptSite); + IActiveScriptSite_Release(site); + init_registry(FALSE); SET_EXPECT(Close); -- 2.17.1

1 0

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

19 Jan '19

2 1

[PATCH 1/2] po: Update Sinhala translation.
by Isira Seneviratne 19 Jan '19

19 Jan '19

2 1

[PATCH] ntdll/tests: Fix some string leaks (Valgrind).
by Sven Baars 18 Jan '19

18 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/ntdll/tests/file.c | 2 ++ dlls/ntdll/tests/reg.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index dcea45e27b..8391570e91 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3662,6 +3662,8 @@ static void test_file_mode(void) if (option_tests[i].file_name == &file_name) DeleteFileW(dos_file_name); } + + pRtlFreeUnicodeString(&file_name); } static void test_query_volume_information_file(void) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index b59d267618..9bb8d25020 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2008,6 +2008,8 @@ static void test_RtlCreateRegistryKey(void) status = pRtlCreateRegistryKey((RTL_REGISTRY_USER+1) | RTL_REGISTRY_OPTIONAL, NULL); ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_INVALID_PARAMETER); + + pRtlFreeUnicodeString(&str); } START_TEST(reg) -- 2.17.1

1 0

[PATCH] ntoskrnl.exe/tests: Fix some memory leaks (Valgrind).
by Sven Baars 17 Jan '19

17 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 9ab05bc279..5579a7f401 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -33,6 +33,7 @@ static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); +static BOOL (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static void load_resource(const char *name, char *filename) { @@ -176,6 +177,8 @@ static void main_test(void) } while (read == sizeof(buffer)); winetest_add_failures(new_failures); + pRtlFreeUnicodeString(&pathU); + heap_free(test_input); CloseHandle(okfile); DeleteFileW(pathW); } @@ -248,6 +251,7 @@ START_TEST(ntoskrnl) HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; -- 2.17.1

1 0

[PATCH] msvcp140/tests: Fix typos in ok() messages.
by Gijs Vermeulen 17 Jan '19

17 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcp140/tests/msvcp140.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 5705882c88..ac7154bec2 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -880,13 +880,13 @@ static void test_Stat(void) ok(0777 == perms, "_Stat(): perms expect: 0777, got 0%o\n", perms); if(ret) { - todo_wine ok(DeleteFileW(test_f1_linkW), "expect tr2_test_dir/f1_link to exist\n"); - todo_wine ok(RemoveDirectoryW(test_dir_linkW), "expect tr2_test_dir/dir_link to exist\n"); + todo_wine ok(DeleteFileW(test_f1_linkW), "expect wine_test_dir/f1_link to exist\n"); + todo_wine ok(RemoveDirectoryW(test_dir_linkW), "expect wine_test_dir/dir_link to exist\n"); } - ok(DeleteFileW(test_f1W), "expect tr2_test_dir/f1 to exist\n"); + ok(DeleteFileW(test_f1W), "expect wine_test_dir/f1 to exist\n"); SetFileAttributesW(test_f2W, FILE_ATTRIBUTE_NORMAL); - ok(DeleteFileW(test_f2W), "expect tr2_test_dir/f2 to exist\n"); - ok(RemoveDirectoryW(test_dirW), "expect tr2_test_dir to exist\n"); + ok(DeleteFileW(test_f2W), "expect wine_test_dir/f2 to exist\n"); + ok(RemoveDirectoryW(test_dirW), "expect wine_test_dir to exist\n"); ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } @@ -1173,7 +1173,7 @@ static void test_Rename(void) CloseHandle(h2); ok(info1.nFileIndexHigh == info2.nFileIndexHigh && info1.nFileIndexLow == info2.nFileIndexLow, - "test_tr2_sys__Rename(): test %d expect two files equivalent\n", i+1); + "_Rename(): test %d expect two files equivalent\n", i+1); } } @@ -1187,7 +1187,7 @@ static void test_Rename(void) ok(ret == ERROR_ALREADY_EXISTS, "_Rename(): expect: ERROR_ALREADY_EXISTS, got %d\n", ret); ok(p_File_size(f1W) == 7, "_Rename(): expect: 7, got %s\n", wine_dbgstr_longlong(p_File_size(f1W))); - ok(p_File_size(f1_renameW) == 0, "test_tr2_sys__Rename(): expect: 0, got %s\n", + ok(p_File_size(f1_renameW) == 0, "_Rename(): expect: 0, got %s\n", wine_dbgstr_longlong(p_File_size(f1_renameW))); ok(DeleteFileW(f1_renameW), "expect f1_rename to exist\n"); -- 2.20.1

2 1

[PATCH] ole32/tests: Fix a memory leak (Valgrind).
by Sven Baars 17 Jan '19

17 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/ole32/tests/ole2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f0ff24b622..422e03a358 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4091,6 +4091,8 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ *enumerated_streams += 1; } + + IStorage_Release(enumstg); } static HRESULT stgmedium_cmp(const STGMEDIUM *med1, STGMEDIUM *med2) -- 2.17.1

1 0

[PATCH] ddraw/tests: Add a test for the "GDI" surface.
by Henri Verbeet 17 Jan '19

17 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 364 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d36120426f9..d52fc313c4b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12013,6 +12013,96 @@ static void test_killfocus(void) UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_gdi_surface(void) +{ + IDirectDrawSurface *primary, *backbuffer, *gdi_surface; + DDSCAPS caps = {DDSCAPS_BACKBUFFER}; + DDSURFACEDESC surface_desc; + IDirectDraw *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + /* Retrieving the GDI surface requires a primary surface to exist. */ + gdi_surface = (void *)0xc0dec0de; + hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); + + hr = IDirectDraw_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + /* Flipping to the GDI surface requires the primary surface to be + * flippable. */ + hr = IDirectDraw_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(primary); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + U5(surface_desc).dwBackBufferCount = 1; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(primary, &caps, &backbuffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(backbuffer != primary, "Got unexpected backbuffer %p.\n", backbuffer); + + hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDrawSurface_Flip(primary, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDraw_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDraw_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(backbuffer); + IDirectDrawSurface_Release(primary); + + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -12119,4 +12209,5 @@ START_TEST(ddraw1) test_viewport(); test_find_device(); test_killfocus(); + test_gdi_surface(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7cbfce056fd..bacc35d31d8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13314,6 +13314,96 @@ static void test_killfocus(void) UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_gdi_surface(void) +{ + IDirectDrawSurface *primary, *backbuffer, *gdi_surface; + DDSCAPS caps = {DDSCAPS_BACKBUFFER}; + DDSURFACEDESC surface_desc; + IDirectDraw2 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + /* Retrieving the GDI surface requires a primary surface to exist. */ + gdi_surface = (void *)0xc0dec0de; + hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); + + hr = IDirectDraw2_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + /* Flipping to the GDI surface requires the primary surface to be + * flippable. */ + hr = IDirectDraw2_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(primary); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + U5(surface_desc).dwBackBufferCount = 1; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(primary, &caps, &backbuffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(backbuffer != primary, "Got unexpected backbuffer %p.\n", backbuffer); + + hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDrawSurface_Flip(primary, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDraw2_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDraw2_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(backbuffer); + IDirectDrawSurface_Release(primary); + + refcount = IDirectDraw2_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -13428,4 +13518,5 @@ START_TEST(ddraw2) test_viewport(); test_find_device(); test_killfocus(); + test_gdi_surface(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9b47c2bd3ca..0066bf770f9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15519,6 +15519,96 @@ static void test_sysmem_draw(void) DestroyWindow(window); } +static void test_gdi_surface(void) +{ + IDirectDrawSurface4 *primary, *backbuffer, *gdi_surface; + DDSCAPS2 caps = {DDSCAPS_BACKBUFFER, 0, 0, {0}}; + DDSURFACEDESC2 surface_desc; + IDirectDraw4 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + /* Retrieving the GDI surface requires a primary surface to exist. */ + gdi_surface = (void *)0xc0dec0de; + hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); + + hr = IDirectDraw4_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface4_Release(gdi_surface); + + /* Flipping to the GDI surface requires the primary surface to be + * flippable. */ + hr = IDirectDraw4_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface4_Release(primary); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + U5(surface_desc).dwBackBufferCount = 1; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(primary, &caps, &backbuffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(backbuffer != primary, "Got unexpected backbuffer %p.\n", backbuffer); + + hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface4_Release(gdi_surface); + + hr = IDirectDrawSurface4_Flip(primary, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); + IDirectDrawSurface4_Release(gdi_surface); + + hr = IDirectDraw4_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface4_Release(gdi_surface); + + hr = IDirectDraw4_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface4_Release(backbuffer); + IDirectDrawSurface4_Release(primary); + + refcount = IDirectDraw4_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -15648,4 +15738,5 @@ START_TEST(ddraw4) test_find_device(); test_killfocus(); test_sysmem_draw(); + test_gdi_surface(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fbc27376a53..1f57420250e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15227,6 +15227,96 @@ static void test_sysmem_draw(void) DestroyWindow(window); } +static void test_gdi_surface(void) +{ + IDirectDrawSurface7 *primary, *backbuffer, *gdi_surface; + DDSCAPS2 caps = {DDSCAPS_BACKBUFFER, 0, 0, {0}}; + DDSURFACEDESC2 surface_desc; + IDirectDraw7 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + /* Retrieving the GDI surface requires a primary surface to exist. */ + gdi_surface = (void *)0xc0dec0de; + hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); + + hr = IDirectDraw7_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface7_Release(gdi_surface); + + /* Flipping to the GDI surface requires the primary surface to be + * flippable. */ + hr = IDirectDraw7_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(primary); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + U5(surface_desc).dwBackBufferCount = 1; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(primary, &caps, &backbuffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(backbuffer != primary, "Got unexpected backbuffer %p.\n", backbuffer); + + hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface7_Release(gdi_surface); + + hr = IDirectDrawSurface7_Flip(primary, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); + IDirectDrawSurface7_Release(gdi_surface); + + hr = IDirectDraw7_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface7_Release(gdi_surface); + + hr = IDirectDraw7_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(backbuffer); + IDirectDrawSurface7_Release(primary); + + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -15367,4 +15457,5 @@ START_TEST(ddraw7) test_color_vertex(); test_killfocus(); test_sysmem_draw(); + test_gdi_surface(); } -- 2.11.0

2 1

[PATCH] wined3d: Avoid potential out-of-bounds memory access in surface_cpu_blt_colour_fill().
by Józef Kucia 17 Jan '19

17 Jan '19

Draw rects are derived from the current viewport. It is possible to produce a clear operation with a draw rect which lies completely outside of one of render targets in D3D9. It seems that we never use the CPU blitter for D3D9 render target clears, so it might not be a problem in practice. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1b6e7a5a0654..0ee2f8266372 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2970,8 +2970,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; - w = min(box->right, view->width) - box->left; - h = min(box->bottom, view->height) - box->top; + w = min(box->right, view->width) - min(box->left, view->width); + h = min(box->bottom, view->height) - min(box->top, view->height); texture = texture_from_resource(view->resource); map_binding = texture->resource.map_binding; -- 2.19.2

2 1

[PATCH vkd3d 3/3] vkd3d-shader: Rename vkd3d_shader_interface to vkd3d_shader_interface_info.
by Józef Kucia 17 Jan '19

17 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> For consistency with other vkd3d and vkd3d-shader structures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 8 ++++---- libs/vkd3d-shader/spirv.c | 14 +++++++------- libs/vkd3d-shader/vkd3d_shader_main.c | 12 ++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- libs/vkd3d/state.c | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2ac8e0fd9505..67884254a88b 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -29,7 +29,7 @@ extern "C" { enum vkd3d_shader_structure_type { - VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE, + VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, @@ -129,7 +129,7 @@ struct vkd3d_shader_push_constant_buffer unsigned int size; /* in bytes */ }; -struct vkd3d_shader_interface +struct vkd3d_shader_interface_info { enum vkd3d_shader_structure_type type; const void *next; @@ -163,7 +163,7 @@ struct vkd3d_shader_transform_feedback_element uint8_t output_slot; }; -/* Extends vkd3d_shader_interface. */ +/* Extends vkd3d_shader_interface_info. */ struct vkd3d_shader_transform_feedback_info { enum vkd3d_shader_structure_type type; @@ -197,7 +197,7 @@ struct vkd3d_shader_compile_arguments int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface *shader_interface, + const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_compile_arguments *compile_args); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 82a9f628ba88..7afc255edf4e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1898,7 +1898,7 @@ struct vkd3d_dxbc_compiler struct vkd3d_control_flow_info *control_flow_info; size_t control_flow_info_size; - struct vkd3d_shader_interface shader_interface; + struct vkd3d_shader_interface_info shader_interface; struct vkd3d_push_constant_buffer_binding *push_constants; const struct vkd3d_shader_compile_arguments *compile_args; @@ -1925,7 +1925,7 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, - const struct vkd3d_shader_interface *shader_interface, + const struct vkd3d_shader_interface_info *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args, const struct vkd3d_shader_scan_info *scan_info) { @@ -2039,7 +2039,7 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_ static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) { - const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_combined_resource_sampler *combined_sampler; unsigned int i; @@ -2065,7 +2065,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) { - const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -3993,7 +3993,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com static uint32_t vkd3d_dxbc_compiler_get_dummy_sampler_id(struct vkd3d_dxbc_compiler *compiler) { - const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, var_id; @@ -4079,7 +4079,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ enum vkd3d_component_type sampled_type, unsigned int structure_stride, bool raw, const struct vkd3d_spirv_resource_type *resource_type_info) { - const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -5662,7 +5662,7 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_resource(struct vkd3d static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *resource_reg, const struct vkd3d_shader_register *sampler_reg) { - const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; unsigned int resource_index, sampler_index; struct vkd3d_symbol key; struct rb_entry *entry; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 37aee0f6fce4..73a9236799d0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -85,7 +85,7 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface *shader_interface, + const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_compile_arguments *compile_args) { struct vkd3d_shader_instruction instruction; @@ -94,12 +94,12 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_parser parser; int ret; - TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface %p, compile_args %p.\n", - dxbc->code, dxbc->size, spirv, compiler_options, shader_interface, compile_args); + TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface_info %p, compile_args %p.\n", + dxbc->code, dxbc->size, spirv, compiler_options, shader_interface_info, compile_args); - if (shader_interface && shader_interface->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE) + if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO) { - WARN("Invalid structure type %#x.\n", shader_interface->type); + WARN("Invalid structure type %#x.\n", shader_interface_info->type); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -118,7 +118,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, vkd3d_shader_trace(parser.data); if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compiler_options, shader_interface, compile_args, &scan_info))) + &parser.shader_desc, compiler_options, shader_interface_info, compile_args, &scan_info))) { ERR("Failed to create DXBC compiler.\n"); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index bf2f45571375..2942a3408498 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -806,7 +806,7 @@ struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, - const struct vkd3d_shader_interface *shader_interface, + const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_compile_arguments *compile_args, const struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 18addf39409d..eb7c8be3c6c4 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1310,7 +1310,7 @@ static void dump_shader_stage(VkShaderStageFlagBits stage, const void *data, siz static HRESULT create_shader_stage(struct d3d12_device *device, struct VkPipelineShaderStageCreateInfo *stage_desc, enum VkShaderStageFlagBits stage, - const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface *shader_interface, + const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args) { struct vkd3d_shader_code dxbc = {code->pShaderBytecode, code->BytecodeLength}; @@ -1435,8 +1435,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; - struct vkd3d_shader_interface shader_interface; VkComputePipelineCreateInfo pipeline_info; struct vkd3d_shader_scan_info shader_info; struct vkd3d_shader_code dxbc; @@ -1475,7 +1475,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hr; } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; @@ -1949,8 +1949,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; struct vkd3d_shader_compile_arguments ps_compile_args; struct vkd3d_shader_transform_feedback_info xfb_info; + struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; - struct vkd3d_shader_interface shader_interface; struct vkd3d_shader_signature input_signature; struct VkSubpassDescription sub_pass_desc; struct VkRenderPassCreateInfo pass_desc; @@ -2202,7 +2202,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s xfb_stage = VK_SHADER_STAGE_VERTEX_BIT; } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; -- 2.19.2

2 1

[PATCH vkd3d 2/3] vkd3d: Require D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT for input layout.
by Józef Kucia 17 Jan '19

17 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e9f73e82b44f..18addf39409d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -904,7 +904,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->static_sampler_count = 0; root_signature->static_samplers = NULL; - if (desc->Flags & ~D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT) + if (desc->Flags & ~(D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT)) FIXME("Ignoring root signature flags %#x.\n", desc->Flags); if (FAILED(hr = d3d12_root_signature_info_from_desc(&info, desc))) @@ -2282,6 +2283,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attribute_count = ARRAY_SIZE(graphics->attributes); } + if (graphics->attribute_count + && !(root_signature->flags & D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)) + { + WARN("Input layout is used without D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (FAILED(hr = compute_input_layout_offsets(&desc->InputLayout, aligned_offsets))) goto fail; -- 2.19.2

2 1

[PATCH vkd3d 1/3] vkd3d: Require D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT for stream output.
by Józef Kucia 17 Jan '19

17 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 12 ++++++++++-- libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a9a463de97e2..e9f73e82b44f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -899,11 +899,12 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->vk_push_set_layout = VK_NULL_HANDLE; root_signature->vk_set_layout = VK_NULL_HANDLE; root_signature->parameters = NULL; + root_signature->flags = desc->Flags; root_signature->descriptor_mapping = NULL; root_signature->static_sampler_count = 0; root_signature->static_samplers = NULL; - if (desc->Flags) + if (desc->Flags & ~D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT) FIXME("Ignoring root signature flags %#x.\n", desc->Flags); if (FAILED(hr = d3d12_root_signature_info_from_desc(&info, desc))) @@ -2168,10 +2169,17 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->xfb_enabled = false; if (so_desc->NumEntries) { + if (!(root_signature->flags & D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT)) + { + WARN("Stream output is used without D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (!vk_info->EXT_transform_feedback) { - hr = E_NOTIMPL; FIXME("Transform feedback is not supported by Vulkan implementation.\n"); + hr = E_NOTIMPL; goto fail; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 65fcd9f5ce11..c4b0a4c06513 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -568,6 +568,8 @@ struct d3d12_root_signature unsigned int parameter_count; uint32_t main_set; + D3D12_ROOT_SIGNATURE_FLAGS flags; + unsigned int descriptor_count; struct vkd3d_shader_resource_binding *descriptor_mapping; struct vkd3d_shader_descriptor_binding dummy_sampler; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5be8e0d9b967..97af4c1a9f67 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2425,6 +2425,12 @@ static void test_create_graphics_pipeline_state(void) unsigned int i; HRESULT hr; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_Position", 0, 0, 4, 0}, + }; + static const unsigned int strides[] = {16}; + if (!(device = create_device())) { skip("Failed to create device.\n"); @@ -2537,6 +2543,16 @@ static void test_create_graphics_pipeline_state(void) &IID_ID3D12PipelineState, (void **)&pipeline_state); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* Stream output without D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT. */ + init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = strides; + pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device); -- 2.19.2

2 1

[PATCH] oleaut32/tests: Fix a memory leak (Valgrind).
by Sven Baars 17 Jan '19

17 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/oleaut32/tests/usrmarshal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 97c05024e5..f49f439f4f 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1283,6 +1283,7 @@ static void test_marshal_VARIANT(void) ok(!memcmp(*V_BSTRREF(&v), *V_BSTRREF(&v2), SysStringByteLen(*V_BSTRREF(&v))), "bstrs differ\n"); SysFreeString(b2); + VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); SysFreeString(b); -- 2.17.1

1 0

[PATCH v2] comctl32/tests: Fix a memory leak (Valgrind).
by Gijs Vermeulen 17 Jan '19

17 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/comctl32/tests/edit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index bc44d0c240..307835ce24 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -2957,6 +2957,7 @@ static void test_paste(void) ok(strlen(str2) == len, "got %d\n", len); /* Cleanup */ + GlobalFree(hmem); DestroyWindow(hEdit); DestroyWindow(hMultilineEdit); } -- 2.20.1

2 1

[PATCH 1/2] riched20/tests: Fix a memory leak (Valgrind).
by Sven Baars 17 Jan '19

17 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/riched20/tests/txtsrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 0415be8b80..20d411afcb 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -705,6 +705,8 @@ static void test_TxSetText(void) ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, "String returned differs\n"); + SysFreeString(rettext); + /* Null-pointer should behave the same as empty-string */ hres = ITextServices_TxSetText(txtserv, 0); -- 2.17.1

2 2

[PATCH] include: Fix a typo.
by Dmitry Timoshkov 17 Jan '19

17 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/wincrypt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 5c0fb0fc0b..a1b1305902 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2541,7 +2541,7 @@ static const WCHAR CERT_PHYSICAL_STORE_AUTH_ROOT_NAME[] = #define CERT_SIGNATURE_HASH_PROP_ID 15 #define CERT_SMART_CARD_DATA_PROP_ID 16 #define CERT_EFS_PROP_ID 17 -#define CERT_FORTEZZA_DATA_PROP 18 +#define CERT_FORTEZZA_DATA_PROP_ID 18 #define CERT_ARCHIVED_PROP_ID 19 #define CERT_KEY_IDENTIFIER_PROP_ID 20 #define CERT_AUTO_ENROLL_PROP_ID 21 -- 2.20.1

1 0

[PATCH] atl100/tests: Fix a memory leak (Valgrind).
by Gijs Vermeulen 17 Jan '19

17 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/atl100/tests/atl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index bdd3c57eb0..d23c53c104 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -964,6 +964,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; -- 2.20.1

2 2

[PATCH] opcservices/tests: Fix some memory leaks (Valgrind).
by Sven Baars 16 Jan '19

16 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/opcservices/tests/opcservices.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 9792302f7e..939a118387 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -356,7 +356,10 @@ static void test_relationship(void) hr = IOpcFactory_CreatePackage(factory, &package); ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL) /* Vista */, "Failed to create a package, hr %#x.\n", hr); if (FAILED(hr)) + { + IOpcFactory_Release(factory); return; + } hr = CreateUri(targetW, Uri_CREATE_ALLOW_RELATIVE, 0, &target_uri); ok(SUCCEEDED(hr), "Failed to create target uri, hr %#x.\n", hr); @@ -1201,6 +1204,7 @@ static void test_create_part_uri(void) ok(!!ret, "%u: unexpected result %d.\n", i, ret); IOpcPartUri_Release(part_uri); + IOpcPartUri_Release(uri); heap_free(inputW); heap_free(rawW); -- 2.17.1

1 0

[PATCH 4/4] d3d9: Clamp index buffer upload range to buffer size.
by Józef Kucia 16 Jan '19

16 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/device.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8ade5beedb45..a26d943fa309 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2750,8 +2750,10 @@ static void d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device, unsigned int start_idx, unsigned int idx_count) { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; - struct d3d9_vertexbuffer *d3d9_buffer; + struct wined3d_resource *dst_resource; + struct d3d9_indexbuffer *d3d9_buffer; struct wined3d_buffer *dst_buffer; + struct wined3d_resource_desc desc; enum wined3d_format_id format; unsigned int offset, idx_size; HRESULT hr; @@ -2762,11 +2764,13 @@ static void d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device, if (!(dst_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset))) ERR("Failed to get index buffer.\n"); d3d9_buffer = wined3d_buffer_get_parent(dst_buffer); + dst_resource = wined3d_buffer_get_resource(dst_buffer); + wined3d_resource_get_desc(dst_resource, &desc); idx_size = format == WINED3DFMT_R16_UINT ? 2 : 4; box.left = offset + start_idx * idx_size; - box.right = box.left + idx_count * idx_size; + box.right = min(box.left + idx_count * idx_size, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, - wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, + dst_resource, 0, box.left, 0, 0, wined3d_buffer_get_resource(d3d9_buffer->wined3d_buffer), 0, &box, 0))) ERR("Failed to update buffer.\n"); } -- 2.19.2

3 2

[PATCH 3/4] d3d8: Clamp index buffer upload range to buffer size.
by Józef Kucia 16 Jan '19

16 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/device.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9e82b1e72763..1d892ecf8d31 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2301,8 +2301,10 @@ static void d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device, unsigned int start_idx, unsigned int idx_count) { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; - struct d3d8_vertexbuffer *d3d8_buffer; + struct wined3d_resource *dst_resource; + struct d3d8_indexbuffer *d3d8_buffer; struct wined3d_buffer *dst_buffer; + struct wined3d_resource_desc desc; enum wined3d_format_id format; unsigned int offset, idx_size; HRESULT hr; @@ -2313,11 +2315,13 @@ static void d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device, if (!(dst_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset))) ERR("Failed to get index buffer.\n"); d3d8_buffer = wined3d_buffer_get_parent(dst_buffer); + dst_resource = wined3d_buffer_get_resource(dst_buffer); + wined3d_resource_get_desc(dst_resource, &desc); idx_size = format == WINED3DFMT_R16_UINT ? 2 : 4; box.left = offset + start_idx * idx_size; - box.right = box.left + idx_count * idx_size; + box.right = min(box.left + idx_count * idx_size, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, - wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, + dst_resource, 0, box.left, 0, 0, wined3d_buffer_get_resource(d3d8_buffer->wined3d_buffer), 0, &box, 0))) ERR("Failed to update buffer.\n"); } -- 2.19.2

3 2

[PATCH 2/4] d3d9: Clamp vertex buffer upload range to buffer size.
by Józef Kucia 16 Jan '19

16 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/device.c | 8 ++++++-- dlls/d3d9/tests/visual.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9ebaebab969d..8ade5beedb45 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2712,8 +2712,10 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct d3d9_vertexbuffer *d3d9_buffer; + struct wined3d_resource *dst_resource; unsigned int i, offset, stride, map; struct wined3d_buffer *dst_buffer; + struct wined3d_resource_desc desc; HRESULT hr; if (!device->sysmem_vb) @@ -2733,10 +2735,12 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) ERR("Failed to get stream source.\n"); d3d9_buffer = wined3d_buffer_get_parent(dst_buffer); + dst_resource = wined3d_buffer_get_resource(dst_buffer); + wined3d_resource_get_desc(dst_resource, &desc); box.left = offset + start_vertex * stride; - box.right = box.left + vertex_count * stride; + box.right = min(box.left + vertex_count * stride, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, - wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, + dst_resource, 0, box.left, 0, 0, wined3d_buffer_get_resource(d3d9_buffer->wined3d_buffer), 0, &box, 0))) ERR("Failed to update buffer.\n"); } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9a62f873dce3..fb7c3e4ea4ab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24510,7 +24510,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 4, 0, 4, 0, 2); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 4, 0, 5, 0, 2); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -- 2.19.2

3 2

[PATCH 1/4] d3d8: Clamp vertex buffer upload range to buffer size.
by Józef Kucia 16 Jan '19

16 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/device.c | 8 ++++++-- dlls/d3d8/tests/visual.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b2a6e48da090..9e82b1e72763 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2271,8 +2271,10 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct d3d8_vertexbuffer *d3d8_buffer; + struct wined3d_resource *dst_resource; unsigned int i, offset, stride, map; struct wined3d_buffer *dst_buffer; + struct wined3d_resource_desc desc; HRESULT hr; map = device->sysmem_vb; @@ -2284,10 +2286,12 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) ERR("Failed to get stream source.\n"); d3d8_buffer = wined3d_buffer_get_parent(dst_buffer); + dst_resource = wined3d_buffer_get_resource(dst_buffer); + wined3d_resource_get_desc(dst_resource, &desc); box.left = offset + start_vertex * stride; - box.right = box.left + vertex_count * stride; + box.right = min(box.left + vertex_count * stride, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, - wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, + dst_resource, 0, box.left, 0, 0, wined3d_buffer_get_resource(d3d8_buffer->wined3d_buffer), 0, &box, 0))) ERR("Failed to update buffer.\n"); } diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 43b286b0373b..cc5992281f34 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10687,7 +10687,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 5, 0, 2); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -- 2.19.2

3 2

[PATCH] rpcrt4/tests: Fix some memory leaks (Valgrind).
by Sven Baars 15 Jan '19

15 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/rpcrt4/tests/ndr_marshall.c | 42 +++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 2187a08394..e4a4c6a727 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -431,7 +431,10 @@ static void test_pointer_marshal(const unsigned char *formattypes, if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); else + { ok(mem != mem_orig, "%s: mem has not changed\n", msgpfx); + HeapFree(GetProcessHeap(), 0, mem_orig); + } ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); @@ -465,7 +468,10 @@ static void test_pointer_marshal(const unsigned char *formattypes, if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); else + { ok(mem != mem_orig, "%s: mem has not changed\n", msgpfx); + HeapFree(GetProcessHeap(), 0, mem_orig); + } ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); @@ -806,6 +812,7 @@ static void test_nontrivial_pointer_types(void) /* Server */ my_alloc_called = 0; + my_free_called = 0; StubMsg.IsClient = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; @@ -813,14 +820,19 @@ static void test_nontrivial_pointer_types(void) ok(mem != StubMsg.BufferStart, "mem pointing at buffer\n"); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 0, "free called %d\n", my_free_called); + my_free(mem); my_alloc_called = 0; + my_free_called = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, &fmtstr_ref_unique_out[4], 1); ok(mem != StubMsg.BufferStart, "mem pointing at buffer\n"); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 0, "free called %d\n", my_free_called); + my_free(mem); my_alloc_called = 0; mem = mem_orig; @@ -917,7 +929,10 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); /* If we're a server we still use the supplied memory */ StubMsg.Buffer = StubMsg.BufferStart; @@ -928,7 +943,10 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); /* ...unless we pass a NULL ptr, then the buffer is used. Passing a NULL ptr while we're a client && !must_alloc @@ -946,6 +964,8 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); } /*** now must_alloc is true ***/ @@ -961,7 +981,11 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; @@ -970,8 +994,12 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(mem != mem_orig, "mem not changed %p %p\n", mem, mem_orig); ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); - my_alloc_called = 0; + my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); mem = mem_orig; StubMsg.Buffer = StubMsg.BufferStart; @@ -984,7 +1012,11 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; @@ -996,7 +1028,11 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); HeapFree(GetProcessHeap(), 0, mem_orig); HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); @@ -1506,6 +1542,8 @@ static void test_iface_ptr(void) NdrInterfacePointerFree(&StubMsg, (unsigned char *)proxy, fmtstr_ip); ok(client_obj.ref == 1, "got %d references\n", client_obj.ref); + HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); + CoUninitialize(); } @@ -1867,6 +1905,8 @@ static void test_ndr_allocate(void) else win_skip("v1 mem list format\n"); } /* NdrFree isn't exported so we can't test free'ing */ + my_free(p1); + my_free(p2); } static void test_conformant_array(void) -- 2.17.1

1 0

[PATCH] crypt32/tests: Fix a memory leak (Valgrind).
by Gijs Vermeulen 15 Jan '19

15 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/crypt32/tests/store.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 0adfeb8529..d862902c88 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2834,6 +2834,8 @@ static void testEmptyStore(void) ok(res, "CertDeleteCertificateContextFromStore failed\n"); ok(cert3->hCertStore == cert->hCertStore, "Unexpected hCertStore\n"); + CertFreeCertificateContext(cert3); + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); ok(store != NULL, "CertOpenStore failed\n"); @@ -2847,6 +2849,7 @@ static void testEmptyStore(void) ok(cert3->hCertStore == store, "Unexpected hCertStore\n"); CertCloseStore(store, 0); + CertFreeCertificateContext(cert3); res = CertCloseStore(cert->hCertStore, CERT_CLOSE_STORE_CHECK_FLAG); ok(!res && GetLastError() == E_UNEXPECTED, "CertCloseStore returned: %x(%x)\n", res, GetLastError()); -- 2.20.1

1 0

[PATCH] windowscodecs: Fix the buffer size check in TIFF decoder's CopyPixels implementation.
by Dmitry Timoshkov 15 Jan '19

15 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 2 -- dlls/windowscodecs/tiffformat.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index c15e4985e6..7651ea154a 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -598,11 +598,9 @@ static void test_tiff_24bpp(void) ok(hr == E_INVALIDARG, "CopyPixels(%u) should fail: %#x\n", stride, hr); else { -todo_wine_if(stride > 3) ok(hr == S_OK, "CopyPixels(%u) error %#x\n", stride, hr); for (i = 0; i < sizeof(data); i++) -todo_wine_if(stride > 3) ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); } } diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 93af5594a7..3d53b2439a 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1105,7 +1105,7 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, if (cbStride < bytesperrow) return E_INVALIDARG; - if ((cbStride * prc->Height) > cbBufferSize) + if ((cbStride * (prc->Height-1)) + bytesperrow > cbBufferSize) return E_INVALIDARG; min_tile_x = prc->X / This->decode_info.tile_width; -- 2.20.1

2 1

[website] Revise the 'Get Involved' web page.
by Jeremy White 15 Jan '19

15 Jan '19

This attempts to remove some information that is provided at other points in the web site, and to adjust the language to attempt to improve the overall flow of the page. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> --- templates/en/getinvolved.template | 92 +++++++++++---------------------------- templates/en/home.template | 2 +- 2 files changed, 26 insertions(+), 68 deletions(-) diff --git a/templates/en/getinvolved.template b/templates/en/getinvolved.template index 8ad5b049..23028db4 100644 --- a/templates/en/getinvolved.template +++ b/templates/en/getinvolved.template @@ -1,14 +1,14 @@ - + -<h1 class="title">Development Links</h1> +<h1 class="title">Get Involved</h1> -<p>Welcome to Wine development. On this page you will find links to our -various resources available for our developers.</p> +<p>The Wine Project is largely a volunteer project and we welcome +and value volunteers of all kinds. This page has links to pages describing how to get more involved with Wine.</p> <div class="black inverse bold cornerround padding-sm"> <div class="row"> - <div class="col-xs-3 col-md-2">Option</div> - <div class="col-xs-9 col-md-10">About this Option</div> + <div class="col-xs-3 col-md-2">Link</div> + <div class="col-xs-9 col-md-10">Description</div> </div> </div> @@ -17,108 +17,66 @@ various resources available for our developers.</p> <a href="https://wiki.winehq.org/Main_Page#Contribute">Contributing to Wine</a> </div> <div class="col-xs-9 col-md-10"> - Information for 1st time contributors. + A list of ways to contribute to Wine, with further links. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer Documentation</a> + <a href="https://wiki.winehq.org/Developers">Developer Documentation</a> </div> <div class="col-xs-9 col-md-10"> - The <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer</a> pages will have more current - information than this page. It should be the first place for new developers to look. + The developer pages provide a great deal of information about how + to work with the Wine source code and how to contribute code to Wine. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://www.codeweavers.com/about/jobs">Internships</a> + <a href="{$root}/forums">Forums and Mailing Lists</a> </div> <div class="col-xs-9 col-md-10"> - CodeWeavers fills 1-2 Wine Development Internship slots every quarter for students and recent graduates. - Applications are accepted on an ongoing basis, and candidates from both the United States and overseas - are welcome. + Most user support happens on our forums, and most technical + Wine discussion takes place on the wine-devel mailing list. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Wine_Developer's_Guide">Developer's Guide</a> + <a href="{$root}/irc">IRC</a> </div> <div class="col-xs-9 col-md-10"> - Online resource for development with Wine. + Our IRC chat rooms can be a good place for more informal conversations. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="{$root}/forums">Mailing Lists</a> - </div> - <div class="col-xs-9 col-md-10"> - Most of our developers communicate over our various mailing lists. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Git_Wine_Tutorial">Git</a> - </div> - <div class="col-xs-9 col-md-10"> - We use the source management tool Git. More information on how to use it can be found on this page. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Submitting_Patches">Sending Patches</a> - </div> - <div class="col-xs-9 col-md-10"> - Guidelines on how to format and send your patches. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Category:ToDo">To Do Lists</a> - </div> - <div class="col-xs-9 col-md-10"> - What needs to be done. A good first place to look for projects to be completed. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Winelib">Winelib</a> - </div> - <div class="col-xs-9 col-md-10"> - Documentation on development with Winelib, our application porting tools. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Wine_Status">Status</a> + <a href="https://wiki.winehq.org/WineConf">WineConf</a> </div> <div class="col-xs-9 col-md-10"> - Status of the Wine project.<br> + We hold a conference annually. Everyone is welcome, and coming to + our conference is a great way to get involved. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Licensing">Wine License</a> + <a href="https://wiki.winehq.org/Summer_Of_Code">Summer of Code</a> </div> <div class="col-xs-9 col-md-10"> - Wine uses the GNU Lesser General Public License 2.1 + Wine is a regular participant in the Google Summer of Code program. + Students can be paid to help improve Wine! </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/WineConf">WineConf</a> + <a href="https://www.codeweavers.com/about/jobs">Jobs at CodeWeavers</a> </div> <div class="col-xs-9 col-md-10"> - We hold a conference annually. Information on where and when can be found here. + CodeWeavers employs a range of staff to develop Wine. If you think + working on Free Software full time would be rewarding, you might consider + applying for a job with CodeWeavers. </div> </div> diff --git a/templates/en/home.template b/templates/en/home.template index 04115692..cc8d5de9 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -137,7 +137,7 @@ <i class="fa-inverse fas fa-users" data-fa-transform="shrink-6"></i> </span> <span class="title">Get Involved</span> - <span class="subtitle">Become a Wine advocate.</span> + <span class="subtitle">Improve and develop Wine.</span> </a> <div class="clear"></div> -- 2.11.0

1 0

[PATCH] taskschd/tests: Fix some memory leaks (Valgrind).
by Sven Baars 15 Jan '19

15 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/taskschd/tests/scheduler.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5fc3aab595..60546c30b2 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -153,11 +153,13 @@ static void test_GetFolder(void) hr = ITaskService_GetFolder(service, slash, &folder); todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + if (hr == S_OK) ITaskFolder_Release(folder); hr = ITaskService_GetFolder(service, dot, &folder); todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, "expected ERROR_INVALID_NAME, got %#x\n", hr); + if (hr == S_OK) ITaskFolder_Release(folder); hr = ITaskService_GetFolder(service, bslash, &folder); ok(hr == S_OK, "GetFolder error %#x\n", hr); @@ -544,6 +546,7 @@ static void test_FolderCollection(void) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); ITaskFolder_Release(subfolder); } @@ -571,6 +574,7 @@ static void test_FolderCollection(void) hr = IUnknown_QueryInterface(unknown, &IID_IUnknown, (void **)&enumvar); ok(hr == S_OK, "QueryInterface error %#x\n", hr); + IUnknown_Release(unknown); hr = IEnumVARIANT_Skip(enumvar, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); @@ -605,6 +609,7 @@ static void test_FolderCollection(void) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); IDispatch_Release(V_DISPATCH(&var[0])); memset(var, 0, sizeof(var)); @@ -650,6 +655,7 @@ static void test_FolderCollection(void) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); ITaskFolder_Release(subfolder); } @@ -1049,7 +1055,10 @@ static void test_settings_v1(ITaskDefinition *taskdef, struct settings *test, st if (!test->execution_time_limit[0]) ok(bstr == NULL, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); else + { ok(!lstrcmpW(bstr, test->execution_time_limit), "expected %s, got %s\n", wine_dbgstr_w(test->execution_time_limit), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + } hr = ITaskSettings_get_Enabled(set, &vbool); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.17.1

2 5

[PATCH vkd3d 5/6] vkd3d-shader: Use vkd3d_dxbc_compiler_emit_load_src() in more places.
by Józef Kucia 15 Jan '19

15 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 40cb2e3929f0..a15bc32116bb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5014,8 +5014,7 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp continue; for (j = 0; j < src_count; ++j) - src_ids[src_count - j - 1] = vkd3d_dxbc_compiler_emit_load_reg(compiler, - &src[j].reg, src[j].swizzle, write_mask); + src_ids[src_count - j - 1] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[j], write_mask); for (j = src_count - 2; j < src_count; ++j) { -- 2.19.2

2 1

[PATCH vkd3d 6/6] vkd3d-shader: Use result type for bitfield instructions source parameters.
by Józef Kucia 15 Jan '19

15 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes SPIR-V validation errors: Expected Base Type to be equal to Result Type: BitFieldSExtract Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a15bc32116bb..82a9f628ba88 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4988,6 +4988,7 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + enum vkd3d_component_type component_type; unsigned int i, j, k, src_count; DWORD write_mask; SpvOp op; @@ -4995,7 +4996,8 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp src_count = instruction->src_count; assert(2 <= src_count && src_count <= ARRAY_SIZE(src_ids)); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + component_type = vkd3d_component_type_from_data_type(dst->reg.data_type); + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); mask_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0x1f); switch (instruction->handler_idx) @@ -5014,20 +5016,22 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp continue; for (j = 0; j < src_count; ++j) - src_ids[src_count - j - 1] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[j], write_mask); + { + src_ids[src_count - j - 1] = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, + &src[j], write_mask, component_type); + } + /* In SPIR-V, the last two operands are Offset and Count. */ for (j = src_count - 2; j < src_count; ++j) { - uint32_t int_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1); - src_ids[j] = vkd3d_spirv_build_op_and(builder, int_type_id, src_ids[j], mask_id); + src_ids[j] = vkd3d_spirv_build_op_and(builder, type_id, src_ids[j], mask_id); } constituents[k++] = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, src_ids, src_count); } - vkd3d_dxbc_compiler_emit_store_dst_components(compiler, - dst, vkd3d_component_type_from_data_type(dst->reg.data_type), constituents); + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, dst, component_type, constituents); } static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compiler, -- 2.19.2

2 1

[PATCH vkd3d 4/6] vkd3d-shader: Use result type for atomic instructions source parameters.
by Józef Kucia 15 Jan '19

15 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes SPIR-V validation errors: AtomicIAdd: expected Value to be of type Result Type Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fa9434080dda..40cb2e3929f0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2799,6 +2799,15 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_src(struct vkd3d_dxbc_compiler *co return vkd3d_dxbc_compiler_emit_src_modifier(compiler, &src->reg, write_mask, src->modifiers, val_id); } +static uint32_t vkd3d_dxbc_compiler_emit_load_src_with_type(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_src_param *src, DWORD write_mask, enum vkd3d_component_type component_type) +{ + struct vkd3d_shader_src_param src_param = *src; + + src_param.reg.data_type = vkd3d_data_type_from_component_type(component_type); + return vkd3d_dxbc_compiler_emit_load_src(compiler, &src_param, write_mask); +} + static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask, const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) @@ -6244,7 +6253,6 @@ static void vkd3d_dxbc_compiler_emit_store_uav_typed(struct vkd3d_dxbc_compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - struct vkd3d_shader_src_param texel_param = src[1]; uint32_t coordinate_id, texel_id; struct vkd3d_shader_image image; DWORD coordinate_mask; @@ -6254,9 +6262,7 @@ static void vkd3d_dxbc_compiler_emit_store_uav_typed(struct vkd3d_dxbc_compiler vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, NULL, VKD3D_IMAGE_FLAG_NONE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); - /* XXX: Fix the data type. */ - texel_param.reg.data_type = vkd3d_data_type_from_component_type(image.sampled_type); - texel_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &texel_param, dst->write_mask); + texel_id = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[1], dst->write_mask, image.sampled_type); vkd3d_spirv_build_op_image_write(builder, image.image_id, coordinate_id, texel_id, SpvImageOperandsMaskNone, NULL, 0); @@ -6365,6 +6371,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil const struct vkd3d_shader_dst_param *resource; uint32_t coordinate_id, sample_id, pointer_id; struct vkd3d_shader_register_info reg_info; + enum vkd3d_component_type component_type; struct vkd3d_shader_image image; unsigned int structure_stride; DWORD coordinate_mask; @@ -6417,12 +6424,14 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil if (resource->reg.type == VKD3DSPR_GROUPSHAREDMEM) { + component_type = VKD3D_TYPE_UINT; ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); pointer_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, reg_info.id, &coordinate_id, 1); } else { + component_type = image.sampled_type; type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id); sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); @@ -6430,7 +6439,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil ptr_type_id, image.id, coordinate_id, sample_id); } - val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + val_id = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[1], VKD3DSP_WRITEMASK_0, component_type); operands[i++] = pointer_id; operands[i++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, scope); @@ -6438,7 +6447,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil if (instruction->src_count >= 3) { operands[i++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, SpvMemorySemanticsMaskNone); - operands[i++] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[2], VKD3DSP_WRITEMASK_0); + operands[i++] = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[2], VKD3DSP_WRITEMASK_0, component_type); } operands[i++] = val_id; result_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, -- 2.19.2

2 1

[PATCH vkd3d 3/6] tests: Add test for SV_VertexID with indirect draws.
by Józef Kucia 15 Jan '19

15 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 163 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 111 insertions(+), 52 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 32220a9fc96e..5be8e0d9b967 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -763,6 +763,42 @@ static ID3D12PipelineState *create_compute_pipeline_state_(unsigned int line, ID return pipeline_state; } +#define create_command_signature(a, b) create_command_signature_(__LINE__, a, b) +static ID3D12CommandSignature *create_command_signature_(unsigned int line, + ID3D12Device *device, D3D12_INDIRECT_ARGUMENT_TYPE argument_type) +{ + D3D12_COMMAND_SIGNATURE_DESC signature_desc; + D3D12_INDIRECT_ARGUMENT_DESC argument_desc; + ID3D12CommandSignature *command_signature; + HRESULT hr; + + argument_desc.Type = argument_type; + + switch (argument_type) + { + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW: + signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + signature_desc.ByteStride = sizeof(D3D12_DRAW_INDEXED_ARGUMENTS); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: + signature_desc.ByteStride = sizeof(D3D12_DISPATCH_ARGUMENTS); + break; + default: + return NULL; + } + + signature_desc.NumArgumentDescs = 1; + signature_desc.pArgumentDescs = &argument_desc; + signature_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok_(line)(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + + return command_signature; +} + #define init_compute_test_context(context) init_compute_test_context_(__LINE__, context) static bool init_compute_test_context_(unsigned int line, struct test_context *context) { @@ -2559,9 +2595,7 @@ static void test_create_fence(void) static void test_private_data(void) { - D3D12_COMMAND_SIGNATURE_DESC command_signature_desc; D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; - D3D12_INDIRECT_ARGUMENT_DESC argument_desc; D3D12_QUERY_HEAP_DESC query_heap_desc; D3D12_COMMAND_QUEUE_DESC queue_desc; ID3D12RootSignature *root_signature; @@ -2638,14 +2672,7 @@ static void test_private_data(void) else if (IsEqualGUID(tests[i], &IID_ID3D12CommandSignature)) { vkd3d_test_set_context("command signature"); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; - command_signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS); - command_signature_desc.NumArgumentDescs = 1; - command_signature_desc.pArgumentDescs = &argument_desc; - command_signature_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandSignature(device, &command_signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&unknown); - ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + unknown = (IUnknown *)create_command_signature(device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); } else if (IsEqualGUID(tests[i], &IID_ID3D12DescriptorHeap)) { @@ -18602,8 +18629,6 @@ static void test_resolve_query_data_in_reordered_command_list(void) static void test_execute_indirect(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; - D3D12_COMMAND_SIGNATURE_DESC signature_desc; - D3D12_INDIRECT_ARGUMENT_DESC argument_desc; ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; ID3D12Resource *argument_buffer, *uav; @@ -18742,15 +18767,7 @@ static void test_execute_indirect(void) argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; - - signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS); - signature_desc.NumArgumentDescs = 1; - signature_desc.pArgumentDescs = &argument_desc; - signature_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); @@ -18769,11 +18786,7 @@ static void test_execute_indirect(void) reset_command_list(command_list, context.allocator); ID3D12CommandSignature_Release(command_signature); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH; - signature_desc.ByteStride = sizeof(D3D12_DISPATCH_ARGUMENTS); - hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH); uav = create_default_buffer(context.device, 2 * 3 * 4 * sizeof(UINT), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); @@ -18814,11 +18827,7 @@ static void test_execute_indirect(void) D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); ID3D12CommandSignature_Release(command_signature); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED; - signature_desc.ByteStride = sizeof(*argument_data.indexed_draws); - hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED); ID3D12PipelineState_Release(context.pipeline_state); input_layout.pInputElementDescs = layout_desc; @@ -18874,8 +18883,6 @@ static void test_execute_indirect(void) static void test_dispatch_zero_thread_groups(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; - D3D12_COMMAND_SIGNATURE_DESC signature_desc; - D3D12_INDIRECT_ARGUMENT_DESC argument_desc; ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; @@ -18926,15 +18933,7 @@ static void test_dispatch_zero_thread_groups(void) argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH; - - signature_desc.ByteStride = sizeof(D3D12_DISPATCH_ARGUMENTS); - signature_desc.NumArgumentDescs = 1; - signature_desc.pArgumentDescs = &argument_desc; - signature_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(SUCCEEDED(hr), "Failed to create command signature, hr %#x.\n", hr); + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH); uav = create_default_buffer(context.device, 2 * 256, /* minTexelBufferOffsetAlignment */ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); @@ -19000,9 +18999,7 @@ static void test_dispatch_zero_thread_groups(void) static void test_instance_id(void) { - D3D12_COMMAND_SIGNATURE_DESC signature_desc; D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; - D3D12_INDIRECT_ARGUMENT_DESC argument_desc; ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; @@ -19220,14 +19217,7 @@ static void test_instance_id(void) vbv[2].StrideInBytes = sizeof(*stream2); vbv[2].SizeInBytes = sizeof(stream2); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; - signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS); - signature_desc.NumArgumentDescs = 1; - signature_desc.pArgumentDescs = &argument_desc; - signature_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data); @@ -19345,12 +19335,34 @@ static void test_vertex_id(void) 5, 6, 7, + + 0xa, + 0xb, + 0xc, + 0xd, + + 0xe, + 0xf, }; static const unsigned int indices[] = { 6, 7, 8, 0, 1, 2, + + 0, 1, 2, 3, + + 8, 9, + }; + static const D3D12_DRAW_ARGUMENTS argument_data[] = + { + {4, 1, 12, 1}, + {2, 3, 16, 0}, + }; + static const D3D12_DRAW_INDEXED_ARGUMENTS indexed_argument_data[] = + { + {4, 1, 6, 12, 1}, + {2, 3, 10, 8, 0}, }; struct uvec4 expected_values[] = { @@ -19375,12 +19387,39 @@ static void test_vertex_id(void) {5, 0, 0}, {6, 0, 1}, {7, 0, 2}, + + {0xa, 0, 0}, + {0xb, 0, 1}, + {0xc, 0, 2}, + {0xd, 0, 3}, + + {0xe, 0, 0}, + {0xf, 0, 1}, + {0xe, 1, 0}, + {0xf, 1, 1}, + {0xe, 2, 0}, + {0xf, 2, 1}, + + {0xa, 0, 0}, + {0xb, 0, 1}, + {0xc, 0, 2}, + {0xd, 0, 3}, + + {0xe, 0, 8}, + {0xf, 0, 9}, + {0xe, 1, 8}, + {0xf, 1, 9}, + {0xe, 2, 8}, + {0xf, 2, 9}, }; BOOL found_values[ARRAY_SIZE(expected_values)] = {0}; BOOL used_values[ARRAY_SIZE(expected_values)] = {0}; + ID3D12Resource *args_buffer, *indexed_args_buffer; + ID3D12CommandSignature *indexed_command_signature; D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12Resource *counter_buffer, *so_buffer; + ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; @@ -19438,6 +19477,12 @@ static void test_vertex_id(void) ibv.SizeInBytes = sizeof(indices); ibv.Format = DXGI_FORMAT_R32_UINT; + args_buffer = create_upload_buffer(device, sizeof(argument_data), &argument_data); + indexed_args_buffer = create_upload_buffer(device, sizeof(indexed_argument_data), &indexed_argument_data); + + command_signature = create_command_signature(device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); + indexed_command_signature = create_command_signature(device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED); + count = 0; upload_buffer = create_upload_buffer(device, sizeof(count), &count); @@ -19471,6 +19516,16 @@ static void test_vertex_id(void) ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 2, 0, 0, 0); ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 1, 3, 9, 7); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, + command_signature, 1, args_buffer, 0, NULL, 0); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, + command_signature, 1, args_buffer, sizeof(*argument_data), NULL, 0); + + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, + indexed_command_signature, 1, indexed_args_buffer, 0, NULL, 0); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, + indexed_command_signature, 1, indexed_args_buffer, sizeof(*indexed_argument_data), NULL, 0); + transition_resource_state(command_list, counter_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); transition_resource_state(command_list, so_buffer, @@ -19512,8 +19567,12 @@ static void test_vertex_id(void) expected_values[i].x, expected_values[i].y, expected_values[i].z, expected_values[i].w); } + ID3D12CommandSignature_Release(command_signature); + ID3D12CommandSignature_Release(indexed_command_signature); + ID3D12Resource_Release(args_buffer); ID3D12Resource_Release(counter_buffer); ID3D12Resource_Release(ib); + ID3D12Resource_Release(indexed_args_buffer); ID3D12Resource_Release(so_buffer); ID3D12Resource_Release(upload_buffer); ID3D12Resource_Release(vb); -- 2.19.2

2 1

[PATCH vkd3d 2/6] tests: Add test for SV_VertexID.
by Józef Kucia 15 Jan '19

15 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a2a40d665a9d..32220a9fc96e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19295,6 +19295,231 @@ static void test_instance_id(void) destroy_test_context(&context); } +static void test_vertex_id(void) +{ + static const DWORD vs_code[] = + { +#if 0 + uint4 main(uint id : ID, uint instance_id : SV_InstanceID, uint vertex_id : SV_VertexID) : OUTPUT + { + return uint4(id, instance_id, vertex_id, 0); + } +#endif + 0x43425844, 0x5625197b, 0x588ccf8f, 0x48694905, 0x961d19ca, 0x00000001, 0x00000170, 0x00000003, + 0x0000002c, 0x000000a4, 0x000000d4, 0x4e475349, 0x00000070, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000101, 0x00000053, 0x00000000, 0x00000008, + 0x00000001, 0x00000001, 0x00000101, 0x00000061, 0x00000000, 0x00000006, 0x00000001, 0x00000002, + 0x00000101, 0x53004449, 0x6e495f56, 0x6e617473, 0x44496563, 0x5f565300, 0x74726556, 0x44497865, + 0xababab00, 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000001, 0x00000000, 0x0000000f, 0x5054554f, 0xab005455, 0x52444853, 0x00000094, 0x00010040, + 0x00000025, 0x0300005f, 0x00101012, 0x00000000, 0x04000060, 0x00101012, 0x00000001, 0x00000008, + 0x04000060, 0x00101012, 0x00000002, 0x00000006, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010100a, + 0x00000001, 0x05000036, 0x00102042, 0x00000000, 0x0010100a, 0x00000002, 0x05000036, 0x00102082, + 0x00000000, 0x00004001, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"ID", 0, DXGI_FORMAT_R32_UINT, 0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "OUTPUT", 0, 0, 4, 0}, + }; + static const unsigned int strides[] = {16}; + static const unsigned int vertices[] = + { + 0, + 1, + 2, + + 3, + 4, + 5, + + 6, + 7, + 8, + + 5, + 6, + 7, + }; + static const unsigned int indices[] = + { + 6, 7, 8, + + 0, 1, 2, + }; + struct uvec4 expected_values[] = + { + {0, 0, 0}, + {1, 0, 1}, + {2, 0, 2}, + {0, 1, 0}, + {1, 1, 1}, + {2, 1, 2}, + + {3, 0, 0}, + {4, 0, 1}, + {5, 0, 2}, + + {6, 0, 6}, + {7, 0, 7}, + {8, 0, 8}, + {6, 1, 6}, + {7, 1, 7}, + {8, 1, 8}, + + {5, 0, 0}, + {6, 0, 1}, + {7, 0, 2}, + }; + + BOOL found_values[ARRAY_SIZE(expected_values)] = {0}; + BOOL used_values[ARRAY_SIZE(expected_values)] = {0}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12Resource *counter_buffer, *so_buffer; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + ID3D12Resource *upload_buffer; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + D3D12_INDEX_BUFFER_VIEW ibv; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb, *ib; + ID3D12Device *device; + unsigned int count; + unsigned int i, j; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, &vs, NULL, &input_layout); + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = strides; + pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides); + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + if (hr == E_NOTIMPL) + { + skip("Stream output is not supported.\n"); + destroy_test_context(&context); + return; + } + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); + + ib = create_upload_buffer(context.device, sizeof(indices), indices); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); + ibv.SizeInBytes = sizeof(indices); + ibv.Format = DXGI_FORMAT_R32_UINT; + + count = 0; + upload_buffer = create_upload_buffer(device, sizeof(count), &count); + + counter_buffer = create_default_buffer(device, 32, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + so_buffer = create_default_buffer(device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = ID3D12Resource_GetGPUVirtualAddress(counter_buffer); + + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, counter_buffer, 0, + upload_buffer, 0, sizeof(count)); + + transition_resource_state(command_list, counter_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT); + + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_POINTLIST); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 2, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 3, 16); + + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 2, 0, 0, 0); + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 1, 3, 9, 7); + + transition_resource_state(command_list, counter_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + count = get_readback_uint(&rb, 0, 0, 0); + ok(count == ARRAY_SIZE(expected_values) * sizeof(struct vec4), "Got counter value %u, expected %uu.\n", + count, (unsigned int)(ARRAY_SIZE(expected_values) * sizeof(struct vec4))); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + count /= sizeof(struct vec4); + + count = min(count, ARRAY_SIZE(used_values)); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + for (j = 0; j < count; ++j) + { + if (!used_values[j] && compare_uvec4(get_readback_uvec4(&rb, j, 0), &expected_values[i])) + { + found_values[i] = TRUE; + used_values[j] = TRUE; + break; + } + } + } + + for (i = 0; i < count; ++i) + { + const struct uvec4 *v = get_readback_uvec4(&rb, i, 0); + ok(used_values[i], "Found unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", v->x, v->y, v->z, v->w); + } + release_resource_readback(&rb); + + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + ok(found_values[i], "Failed to find value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + expected_values[i].x, expected_values[i].y, expected_values[i].z, expected_values[i].w); + } + + ID3D12Resource_Release(counter_buffer); + ID3D12Resource_Release(ib); + ID3D12Resource_Release(so_buffer); + ID3D12Resource_Release(upload_buffer); + ID3D12Resource_Release(vb); + destroy_test_context(&context); +} + static void test_copy_texture_region(void) { D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; @@ -22661,6 +22886,7 @@ START_TEST(d3d12) run_test(test_execute_indirect); run_test(test_dispatch_zero_thread_groups); run_test(test_instance_id); + run_test(test_vertex_id); run_test(test_copy_texture_region); run_test(test_separate_bindings); run_test(test_face_culling); -- 2.19.2

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Fix SV_VertexID.
by Józef Kucia 15 Jan '19

15 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 43 +++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9d1a0df7566f..fa9434080dda 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3003,31 +3003,40 @@ static uint32_t vkd3d_dxbc_compiler_emit_bool_to_int(struct vkd3d_dxbc_compiler typedef uint32_t (*vkd3d_spirv_builtin_fixup_pfn)(struct vkd3d_dxbc_compiler *compiler, uint32_t val_id); -/* Substitute "InstanceIndex - BaseInstance" for SV_InstanceID. */ -static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler, - uint32_t instance_index_id) +static uint32_t vkd3d_dxbc_compiler_emit_draw_parameter_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t index_id, SpvBuiltIn base) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t base_instance_var_id, base_instance_id, type_id; + uint32_t base_var_id, base_id, type_id; vkd3d_spirv_enable_capability(builder, SpvCapabilityDrawParameters); - /* The Vulkan spec states: - * - * "The variable decorated with BaseInstance must be declared as a scalar - * 32-bit integer. - */ - base_instance_var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + base_var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, SpvStorageClassInput, VKD3D_TYPE_INT, 1); - vkd3d_spirv_add_iface_variable(builder, base_instance_var_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, base_instance_var_id, SpvBuiltInBaseInstance); + vkd3d_spirv_add_iface_variable(builder, base_var_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, base_var_id, base); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1); - base_instance_id = vkd3d_spirv_build_op_load(builder, - type_id, base_instance_var_id, SpvMemoryAccessMaskNone); + base_id = vkd3d_spirv_build_op_load(builder, + type_id, base_var_id, SpvMemoryAccessMaskNone); - return vkd3d_spirv_build_op_isub(builder, - type_id, instance_index_id, base_instance_id); + return vkd3d_spirv_build_op_isub(builder, type_id, index_id, base_id); +} + +/* Substitute "VertexIndex - BaseVertex" for SV_VertexID. */ +static uint32_t sv_vertex_id_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t vertex_index_id) +{ + return vkd3d_dxbc_compiler_emit_draw_parameter_fixup(compiler, + vertex_index_id, SpvBuiltInBaseVertex); +} + +/* Substitute "InstanceIndex - BaseInstance" for SV_InstanceID. */ +static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t instance_index_id) +{ + return vkd3d_dxbc_compiler_emit_draw_parameter_fixup(compiler, + instance_index_id, SpvBuiltInBaseInstance); } static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler, @@ -3061,7 +3070,7 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, {VKD3D_SIV_POSITION, {VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}}, - {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex}}, + {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex, sv_vertex_id_fixup}}, {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}}, {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}}, -- 2.19.2

2 1

[PATCH] wined3d: Allow multisample destination textures in the GLSL blitter.
by Henri Verbeet 15 Jan '19

15 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46459 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d6fd565bd80..3298a604fda 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13127,11 +13127,9 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi return FALSE; if (src_texture->target == GL_TEXTURE_2D_MULTISAMPLE - || dst_texture->target == GL_TEXTURE_2D_MULTISAMPLE - || src_texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY - || dst_texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY) + || src_texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY) { - TRACE("Multi-sample textures not supported.\n"); + TRACE("Multi-sample source textures not supported.\n"); return FALSE; } -- 2.11.0

1 0

[PATCH] shell32/tests: Fix some memory leaks (Valgrind).
by Sven Baars 15 Jan '19

15 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/shell32/tests/autocomplete.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 4f81214b02..4ef124c9d2 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -786,7 +786,10 @@ static void test_custom_source(void) SendMessageW(hwnd_edit, WM_CHAR, 'x', 1); dispatch_messages(); ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); + IAutoCompleteDropDown_Release(acdropdown); + IAutoComplete2_Release(autocomplete); + IUnknown_Release(enumerator); test_prefix_filtering(hwnd_edit); -- 2.17.1

2 1

[PATCH] wbemprox/tests: Fix some memory leaks (Valgrind).
by Sven Baars 15 Jan '19

15 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/wbemprox/tests/query.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 95690cf370..0fa6b5e966 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1544,6 +1544,7 @@ static void test_Win32_IP4RouteTable( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); } @@ -1656,6 +1657,7 @@ static void test_Win32_Processor( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); } @@ -1731,6 +1733,7 @@ static void test_Win32_VideoController( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); } @@ -1796,6 +1799,7 @@ static void test_Win32_Printer( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); } -- 2.17.1

2 1

[PATCH] po: Update Sinhala translation
by Isira Seneviratne 15 Jan '19

15 Jan '19

1 0

[PATCH 1/2] po: Update Sinhala translation
by Isira Seneviratne 15 Jan '19

15 Jan '19

2 2

[PATCH] ntoskrnl.exe: Properly handle already-loaded drivers in handle_bus_relations().
by Zebediah Figura 15 Jan '19

15 Jan '19

This fixes a regression introduced by d498780294c635f67aee823bc030151a6b75bee4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46469 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d8a87a6ad0..c46418e239 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3758,9 +3758,7 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) strcatW( buffer, driver ); RtlInitUnicodeString( &string, buffer ); status = ZwLoadDriver( &string ); - if (status == STATUS_IMAGE_ALREADY_LOADED) - return; - else if (status != STATUS_SUCCESS) + if (status != STATUS_SUCCESS && status != STATUS_IMAGE_ALREADY_LOADED) { ERR_(plugplay)( "Failed to load driver %s\n", debugstr_w(driver) ); return; -- 2.17.1

1 0

[PATCH v2 1/6] d3dx9: Factor out {lock|unlock}_surface() functions.
by Matteo Bruni 14 Jan '19

14 Jan '19

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 75 ++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 11a0ee1a2fe..2d00cd1dcdc 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -199,6 +199,53 @@ static const struct { { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000, D3DFMT_X8B8G8R8 }, }; +static HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, + IDirect3DSurface9 **temp_surface) +{ + IDirect3DDevice9 *device; + D3DSURFACE_DESC desc; + HRESULT hr; + + *temp_surface = NULL; + if (FAILED(hr = IDirect3DSurface9_LockRect(surface, lock, NULL, D3DLOCK_READONLY))) + { + IDirect3DSurface9_GetDevice(surface, &device); + IDirect3DSurface9_GetDesc(surface, &desc); + if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, desc.Width, desc.Height, + desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, temp_surface, NULL))) + { + IDirect3DDevice9_Release(device); + return hr; + } + + if (SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, surface, NULL, *temp_surface, NULL, D3DTEXF_NONE))) + hr = IDirect3DSurface9_LockRect(*temp_surface, lock, NULL, D3DLOCK_READONLY); + IDirect3DDevice9_Release(device); + if (FAILED(hr)) + { + WARN("Failed to lock surface %p, usage %#x, pool %#x.\n", + surface, desc.Usage, desc.Pool); + IDirect3DSurface9_Release(*temp_surface); + *temp_surface = NULL; + return hr; + } + } + return hr; +} + +static HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, + IDirect3DSurface9 *temp_surface) +{ + HRESULT hr; + + if (!temp_surface) + return IDirect3DSurface9_UnlockRect(surface); + + hr = IDirect3DSurface9_UnlockRect(temp_surface); + IDirect3DSurface9_Release(temp_surface); + return hr; +} + static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_format) { unsigned int i; @@ -1924,7 +1971,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { - IDirect3DSurface9 *surface = src_surface; + IDirect3DSurface9 *temp_surface; D3DTEXTUREFILTERTYPE d3d_filter; IDirect3DDevice9 *device; D3DSURFACE_DESC src_desc; @@ -1979,32 +2026,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, src_rect = &s; } - if (FAILED(IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY))) - { - IDirect3DSurface9_GetDevice(src_surface, &device); - if (FAILED(IDirect3DDevice9_CreateRenderTarget(device, src_desc.Width, src_desc.Height, - src_desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL))) - { - IDirect3DDevice9_Release(device); - return D3DXERR_INVALIDDATA; - } - - if (SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, surface, NULL, D3DTEXF_NONE))) - hr = IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY); - IDirect3DDevice9_Release(device); - if (FAILED(hr)) - { - IDirect3DSurface9_Release(surface); - return D3DXERR_INVALIDDATA; - } - } + if (FAILED(lock_surface(src_surface, &lock, &temp_surface))) + return D3DXERR_INVALIDDATA; hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, src_desc.Format, lock.Pitch, src_palette, src_rect, filter, color_key); - IDirect3DSurface9_UnlockRect(surface); - if (surface != src_surface) - IDirect3DSurface9_Release(surface); + if (FAILED(unlock_surface(src_surface, &lock, temp_surface))) + return D3DXERR_INVALIDDATA; return hr; } -- 2.19.2

1 5

[PATCH vkd3d 05/10] vkd3d-shader: Introduce vkd3d_dxbc_compiler_emit_initial_declarations().
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> To emit more declarations immediately after creating a new SPIR-V builder. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 91 +++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9a14e8030783..538c44fdbcaf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1899,22 +1899,7 @@ struct vkd3d_dxbc_compiler const struct vkd3d_shader_scan_info *scan_info; }; -static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler); - -static void vkd3d_dxbc_compiler_emit_execution_mode(struct vkd3d_dxbc_compiler *compiler, - SpvExecutionMode mode, const uint32_t *literals, unsigned int literal_count) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - - vkd3d_spirv_build_op_execution_mode(&builder->execution_mode_stream, - builder->main_function_id, mode, literals, literal_count); -} - -static void vkd3d_dxbc_compiler_emit_execution_mode1(struct vkd3d_dxbc_compiler *compiler, - SpvExecutionMode mode, const uint32_t literal) -{ - vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, &literal, 1); -} +static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler); struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, @@ -1942,31 +1927,6 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader rb_init(&compiler->symbol_table, vkd3d_symbol_compare); - switch (shader_version->type) - { - case VKD3D_SHADER_TYPE_VERTEX: - vkd3d_spirv_set_execution_model(&compiler->spirv_builder, SpvExecutionModelVertex); - break; - case VKD3D_SHADER_TYPE_HULL: - vkd3d_spirv_set_execution_model(&compiler->spirv_builder, SpvExecutionModelTessellationControl); - break; - case VKD3D_SHADER_TYPE_DOMAIN: - vkd3d_spirv_set_execution_model(&compiler->spirv_builder, SpvExecutionModelTessellationEvaluation); - break; - case VKD3D_SHADER_TYPE_GEOMETRY: - vkd3d_spirv_set_execution_model(&compiler->spirv_builder, SpvExecutionModelGeometry); - break; - case VKD3D_SHADER_TYPE_PIXEL: - vkd3d_spirv_set_execution_model(&compiler->spirv_builder, SpvExecutionModelFragment); - vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeOriginUpperLeft, NULL, 0); - break; - case VKD3D_SHADER_TYPE_COMPUTE: - vkd3d_spirv_set_execution_model(&compiler->spirv_builder, SpvExecutionModelGLCompute); - break; - default: - ERR("Invalid shader type %#x.\n", shader_version->type); - } - compiler->shader_type = shader_version->type; compiler->input_signature = &shader_desc->input_signature; @@ -1991,7 +1951,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->scan_info = scan_info; - vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + vkd3d_dxbc_compiler_emit_initial_declarations(compiler); return compiler; } @@ -2735,6 +2695,21 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co return val_id; } +static void vkd3d_dxbc_compiler_emit_execution_mode(struct vkd3d_dxbc_compiler *compiler, + SpvExecutionMode mode, const uint32_t *literals, unsigned int literal_count) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_execution_mode(&builder->execution_mode_stream, + builder->main_function_id, mode, literals, literal_count); +} + +static void vkd3d_dxbc_compiler_emit_execution_mode1(struct vkd3d_dxbc_compiler *compiler, + SpvExecutionMode mode, const uint32_t literal) +{ + vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, &literal, 1); +} + static uint32_t vkd3d_dxbc_compiler_emit_abs(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { @@ -3606,6 +3581,38 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } } +static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + switch (compiler->shader_type) + { + case VKD3D_SHADER_TYPE_VERTEX: + vkd3d_spirv_set_execution_model(builder, SpvExecutionModelVertex); + break; + case VKD3D_SHADER_TYPE_HULL: + vkd3d_spirv_set_execution_model(builder, SpvExecutionModelTessellationControl); + break; + case VKD3D_SHADER_TYPE_DOMAIN: + vkd3d_spirv_set_execution_model(builder, SpvExecutionModelTessellationEvaluation); + break; + case VKD3D_SHADER_TYPE_GEOMETRY: + vkd3d_spirv_set_execution_model(builder, SpvExecutionModelGeometry); + break; + case VKD3D_SHADER_TYPE_PIXEL: + vkd3d_spirv_set_execution_model(builder, SpvExecutionModelFragment); + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeOriginUpperLeft, NULL, 0); + break; + case VKD3D_SHADER_TYPE_COMPUTE: + vkd3d_spirv_set_execution_model(builder, SpvExecutionModelGLCompute); + break; + default: + ERR("Invalid shader type %#x.\n", compiler->shader_type); + } + + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); +} + static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { -- 2.19.2

2 1

[PATCH vkd3d 04/10] vkd3d: Implement RasterizedStream.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 1 + libs/vkd3d/state.c | 27 ++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 26 +++++++++++++++----------- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 71666f965416..03a7a25bab8e 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -940,6 +940,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->device_limits = device_properties2.properties.limits; vulkan_info->sparse_properties = device_properties2.properties.sparseProperties; + vulkan_info->rasterization_stream = xfb_properties.transformFeedbackRasterizationStreamSelect; vulkan_info->max_vertex_attrib_divisor = max(vertex_divisor_properties.maxVertexAttribDivisor, 1); device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 86ceee31803e..7af8b6030d58 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1614,6 +1614,27 @@ static void rs_desc_from_d3d12(struct VkPipelineRasterizationStateCreateInfo *vk FIXME("Ignoring ConservativeRaster %#x.\n", d3d12_desc->ConservativeRaster); } +static void rs_stream_desc_from_d3d12(VkPipelineRasterizationStateStreamCreateInfoEXT *vk_desc, + VkPipelineRasterizationStateCreateInfo *vk_rs_desc, const D3D12_STREAM_OUTPUT_DESC *so_desc, + const struct vkd3d_vulkan_info *vk_info) +{ + if (!so_desc->RasterizedStream || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) + return; + + if (!vk_info->rasterization_stream) + { + FIXME("Rasterization stream select is not supported by Vulkan implementation.\n"); + return; + } + + vk_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_STREAM_CREATE_INFO_EXT; + vk_desc->pNext = NULL; + vk_desc->flags = 0; + vk_desc->rasterizationStream = so_desc->RasterizedStream; + + vk_rs_desc->pNext = vk_desc; +} + static enum VkStencilOp vk_stencil_op_from_d3d12(D3D12_STENCIL_OP op) { switch (op) @@ -1916,6 +1937,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s unsigned int ps_output_swizzle[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const D3D12_STREAM_OUTPUT_DESC *so_desc = &desc->StreamOutput; VkVertexInputBindingDivisorDescriptionEXT *binding_divisor; const struct vkd3d_vulkan_info *vk_info = &device->vk_info; const struct vkd3d_shader_compile_arguments *compile_args; @@ -2350,9 +2372,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); - if (!graphics->attachment_count && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) + if ((!graphics->attachment_count && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) + || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; + rs_stream_desc_from_d3d12(&graphics->rs_stream_desc, &graphics->rs_desc, so_desc, vk_info); + if (desc->SampleMask != ~0u) FIXME("Ignoring sample mask %#x.\n", desc->SampleMask); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 62245b1e57a0..4564b9635fe5 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -90,6 +90,8 @@ struct vkd3d_vulkan_info bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor; + bool rasterization_stream; + bool vertex_attrib_zero_divisor; unsigned int max_vertex_attrib_divisor; @@ -559,7 +561,7 @@ struct d3d12_root_signature VkDescriptorSetLayout vk_push_set_layout; VkDescriptorSetLayout vk_set_layout; - struct VkDescriptorPoolSize *pool_sizes; + VkDescriptorPoolSize *pool_sizes; size_t pool_size_count; struct d3d12_root_parameter *parameters; @@ -593,25 +595,27 @@ struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSign struct d3d12_graphics_pipeline_state { - struct VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES]; + VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES]; size_t stage_count; - struct VkVertexInputAttributeDescription attributes[D3D12_VS_INPUT_REGISTER_COUNT]; - enum VkVertexInputRate input_rates[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; + VkVertexInputAttributeDescription attributes[D3D12_VS_INPUT_REGISTER_COUNT]; + VkVertexInputRate input_rates[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; VkVertexInputBindingDivisorDescriptionEXT instance_divisors[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; size_t instance_divisor_count; size_t attribute_count; - struct VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; - struct VkAttachmentReference attachment_references[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; - struct VkPipelineColorBlendAttachmentState blend_attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; + VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; + VkAttachmentReference attachment_references[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; + VkPipelineColorBlendAttachmentState blend_attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; size_t attachment_count, rt_idx; VkRenderPass render_pass; D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value; - struct VkPipelineRasterizationStateCreateInfo rs_desc; - struct VkPipelineMultisampleStateCreateInfo ms_desc; - struct VkPipelineDepthStencilStateCreateInfo ds_desc; + VkPipelineRasterizationStateCreateInfo rs_desc; + VkPipelineMultisampleStateCreateInfo ms_desc; + VkPipelineDepthStencilStateCreateInfo ds_desc; + + VkPipelineRasterizationStateStreamCreateInfoEXT rs_stream_desc; const struct d3d12_root_signature *root_signature; @@ -961,7 +965,7 @@ static inline unsigned int d3d12_resource_desc_get_sub_resource_count(const D3D1 return d3d12_resource_desc_get_layer_count(desc) * desc->MipLevels; } -enum VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; +VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH vkd3d 09/10] vkd3d: Implement stream output resource barriers naively.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> With some tracking we could do better. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9c3165c98765..49c3830030ee 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1308,13 +1308,28 @@ static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list { VK_CALL(vkCmdEndTransformFeedbackEXT(list->vk_command_buffer, 0, ARRAY_SIZE(list->so_counter_buffers), list->so_counter_buffers, list->so_counter_buffer_offsets)); - list->xfb_enabled = false; } if (list->current_render_pass) VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); list->current_render_pass = VK_NULL_HANDLE; + + if (list->xfb_enabled) + { + VkMemoryBarrier vk_barrier; + + /* We need a barrier between pause and resume. */ + vk_barrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT; + vk_barrier.dstAccessMask = VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT; + VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT, VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT, 0, + 1, &vk_barrier, 0, NULL, 0, NULL)); + + list->xfb_enabled = false; + } } static void d3d12_command_list_invalidate_current_render_pass(struct d3d12_command_list *list) @@ -1419,8 +1434,14 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, return true; case D3D12_RESOURCE_STATE_STREAM_OUT: - FIXME("Unhandled resource state %#x.\n", state); - return false; + *access_mask = VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT + | VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT + | VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT; + *stage_flags = VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT + | VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT; + if (image_layout) + *image_layout = VK_IMAGE_LAYOUT_UNDEFINED; + return true; /* Set the Vulkan image layout for read-only states. */ case D3D12_RESOURCE_STATE_DEPTH_READ: -- 2.19.2

2 1

[PATCH vkd3d 01/10] vkd3d: Enable VK_EXT_transform_feedback.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 2 +- libs/vkd3d/device.c | 39 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 1 + libs/vkd3d/vulkan_procs.h | 6 ++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8c82741a9bae..6e5527952ba1 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) -VKD3D_CHECK_VULKAN_HEADER_VERSION([84], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.84 is required.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION([88], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.88 is required.])]) dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 9b09f66b7251..71666f965416 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -84,6 +84,8 @@ static const char * const required_device_extensions[] = static const struct vkd3d_optional_extension_info optional_device_extensions[] = { {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, + {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, + offsetof(struct vkd3d_vulkan_info, EXT_transform_feedback)}, {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_vertex_attribute_divisor)}, }; @@ -621,6 +623,7 @@ static void vkd3d_trace_physical_device_limits(const VkPhysicalDeviceProperties2 { const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *divisor_properties; const VkPhysicalDeviceLimits *limits = &properties2->properties.limits; + const VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb; TRACE("Device limits:\n"); TRACE(" maxImageDimension1D: %u.\n", limits->maxImageDimension1D); @@ -739,6 +742,22 @@ static void vkd3d_trace_physical_device_limits(const VkPhysicalDeviceProperties2 TRACE(" optimalBufferCopyRowPitchAlignment: %#"PRIx64".\n", limits->optimalBufferCopyRowPitchAlignment); TRACE(" nonCoherentAtomSize: %#"PRIx64".\n", limits->nonCoherentAtomSize); + xfb = vk_find_struct(properties2->pNext, PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT); + if (xfb) + { + TRACE(" VkPhysicalDeviceTransformFeedbackPropertiesEXT:\n"); + TRACE(" maxTransformFeedbackStreams: %u.\n", xfb->maxTransformFeedbackStreams); + TRACE(" maxTransformFeedbackBuffers: %u.\n", xfb->maxTransformFeedbackBuffers); + TRACE(" maxTransformFeedbackBufferSize: %#"PRIx64".\n", xfb->maxTransformFeedbackBufferSize); + TRACE(" maxTransformFeedbackStreamDataSize: %u.\n", xfb->maxTransformFeedbackStreamDataSize); + TRACE(" maxTransformFeedbackBufferDataSize: %u.\n", xfb->maxTransformFeedbackBufferDataSize); + TRACE(" maxTransformFeedbackBufferDataStride: %u.\n", xfb->maxTransformFeedbackBufferDataStride); + TRACE(" transformFeedbackQueries: %#x.\n", xfb->transformFeedbackQueries); + TRACE(" transformFeedbackStreamsLinesTriangles: %#x.\n", xfb->transformFeedbackStreamsLinesTriangles); + TRACE(" transformFeedbackRasterizationStreamSelect: %#x.\n", xfb->transformFeedbackRasterizationStreamSelect); + TRACE(" transformFeedbackDraw: %x.\n", xfb->transformFeedbackDraw); + } + divisor_properties = vk_find_struct(properties2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT); if (divisor_properties) @@ -752,6 +771,7 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 { const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceFeatures *features = &features2->features; + const VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb; TRACE("Device features:\n"); TRACE(" robustBufferAccess: %#x.\n", features->robustBufferAccess); @@ -810,6 +830,14 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 TRACE(" variableMultisampleRate: %#x.\n", features->variableMultisampleRate); TRACE(" inheritedQueries: %#x.\n", features->inheritedQueries); + xfb = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT); + if (xfb) + { + TRACE(" VkPhysicalDeviceTransformFeedbackFeaturesEXT:\n"); + TRACE(" transformFeedback: %#x.\n", xfb->transformFeedback); + TRACE(" geometryStreams: %#x.\n", xfb->geometryStreams); + } + divisor_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT); if (divisor_features) { @@ -863,6 +891,9 @@ static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_ CHECK_FEATURE(shaderClipDistance); CHECK_FEATURE(shaderCullDistance); + if (!vk_info->EXT_transform_feedback) + WARN("Stream output is not supported.\n"); + if (!vk_info->EXT_vertex_attribute_divisor) WARN("Vertex attribute instance rate divisor is not supported.\n"); else if (!vk_info->vertex_attrib_zero_divisor) @@ -880,6 +911,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; + VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; VkPhysicalDevice physical_device = device->vk_physical_device; VkPhysicalDeviceFeatures *features = &features2->features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; @@ -892,8 +924,11 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_trace_physical_device_features(features2); + memset(&xfb_properties, 0, sizeof(xfb_properties)); + xfb_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT; memset(&vertex_divisor_properties, 0, sizeof(vertex_divisor_properties)); vertex_divisor_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; + vertex_divisor_properties.pNext = &xfb_properties; device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; device_properties2.pNext = &vertex_divisor_properties; if (vulkan_info->KHR_get_physical_device_properties2) @@ -1092,6 +1127,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; VkQueueFamilyProperties *queue_properties = NULL; VkDeviceQueueCreateInfo *queue_info = NULL; @@ -1182,8 +1218,11 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); + memset(&xfb_features, 0, sizeof(xfb_features)); + xfb_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; memset(&vertex_divisor_features, 0, sizeof(vertex_divisor_features)); vertex_divisor_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; + vertex_divisor_features.pNext = &xfb_features; features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; features2.pNext = &vertex_divisor_features; if (vulkan_info->KHR_get_physical_device_properties2) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9ffaa7920eb1..3b78a5e2c55d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -87,6 +87,7 @@ struct vkd3d_vulkan_info bool EXT_debug_report; /* device extensions */ bool KHR_push_descriptor; + bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor; bool vertex_attrib_zero_divisor; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index ac03b3f89ff8..be983ec4db54 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -176,6 +176,12 @@ VK_DEVICE_PFN(vkUpdateDescriptorSets) VK_DEVICE_PFN(vkWaitForFences) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) +/* VK_EXT_transform_feedback */ +VK_DEVICE_EXT_PFN(vkCmdBeginQueryIndexedEXT) +VK_DEVICE_EXT_PFN(vkCmdBeginTransformFeedbackEXT) +VK_DEVICE_EXT_PFN(vkCmdBindTransformFeedbackBuffersEXT) +VK_DEVICE_EXT_PFN(vkCmdEndQueryIndexedEXT) +VK_DEVICE_EXT_PFN(vkCmdEndTransformFeedbackEXT) #undef VK_INSTANCE_PFN #undef VK_INSTANCE_EXT_PFN -- 2.19.2

3 2

[PATCH vkd3d 10/10] tests: Add test for stream output without geometry shader.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> The test is skipped when transform feedback is not supported by Vulkan implementation. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f34b82c855d7..a2a40d665a9d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22454,6 +22454,111 @@ static void test_primitive_restart(void) destroy_test_context(&context); } +static void test_vertex_shader_stream_output(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12Resource *counter_buffer, *so_buffer; + ID3D12GraphicsCommandList *command_list; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + ID3D12Resource *upload_buffer; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + unsigned int counter, i; + const struct vec4 *data; + ID3D12Device *device; + HRESULT hr; + + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_Position", 0, 0, 4, 0}, + }; + static const struct vec4 expected_output[] = + { + {-1.0f, 1.0f, 0.0f, 1.0f}, + { 3.0f, 1.0f, 0.0f, 1.0f}, + {-1.0f,-3.0f, 0.0f, 1.0f}, + }; + unsigned int strides[] = {16}; + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, NULL, NULL); + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = strides; + pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides); + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + if (hr == E_NOTIMPL) + { + skip("Stream output is not supported.\n"); + destroy_test_context(&context); + return; + } + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + counter = 0; + upload_buffer = create_upload_buffer(device, sizeof(counter), &counter); + + counter_buffer = create_default_buffer(device, 32, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + so_buffer = create_default_buffer(device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = ID3D12Resource_GetGPUVirtualAddress(counter_buffer); + + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, counter_buffer, 0, + upload_buffer, 0, sizeof(counter)); + + transition_resource_state(command_list, counter_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT); + + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, counter_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + counter = get_readback_uint(&rb, 0, 0, 0); + ok(counter == 3 * sizeof(struct vec4), "Got unexpected counter %u.\n", counter); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (i = 0; i < ARRAY_SIZE(expected_output); ++i) + { + const struct vec4 *expected = &expected_output[i]; + data = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(data, expected, 1), + "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w); + } + release_resource_readback(&rb); + + ID3D12Resource_Release(counter_buffer); + ID3D12Resource_Release(upload_buffer); + ID3D12Resource_Release(so_buffer); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -22573,4 +22678,5 @@ START_TEST(d3d12) run_test(test_dual_source_blending); run_test(test_multisample_rendering); run_test(test_primitive_restart); + run_test(test_vertex_shader_stream_output); } -- 2.19.2

2 1

[PATCH vkd3d 03/10] vkd3d: Implement d3d12_command_list_SOSetTargets().
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 62 +++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 3 ++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ce4af4e6a6fd..8402668f3a05 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1754,6 +1754,9 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->state = NULL; + memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers)); + memset(list->so_counter_buffer_offsets, 0, sizeof(list->so_counter_buffer_offsets)); + ID3D12GraphicsCommandList_SetPipelineState(iface, initial_pipeline_state); } @@ -3609,7 +3612,64 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsCommandList *iface, UINT start_slot, UINT view_count, const D3D12_STREAM_OUTPUT_BUFFER_VIEW *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + VkDeviceSize offsets[ARRAY_SIZE(list->so_counter_buffers)]; + VkDeviceSize sizes[ARRAY_SIZE(list->so_counter_buffers)]; + VkBuffer buffers[ARRAY_SIZE(list->so_counter_buffers)]; + struct vkd3d_gpu_va_allocator *gpu_va_allocator; + const struct vkd3d_vk_device_procs *vk_procs; + struct d3d12_resource *resource; + unsigned int i, first, count; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + d3d12_command_list_end_current_render_pass(list); + + if (!list->device->vk_info.EXT_transform_feedback) + { + FIXME("Transform feedback is not supported by Vulkan implementation.\n"); + return; + } + + if (start_slot >= ARRAY_SIZE(buffers) || view_count > ARRAY_SIZE(buffers) - start_slot) + { + WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count); + return; + } + + vk_procs = &list->device->vk_procs; + gpu_va_allocator = &list->device->gpu_va_allocator; + + count = 0; + first = start_slot; + for (i = 0; i < view_count; ++i) + { + if (views[i].BufferLocation && views[i].SizeInBytes) + { + resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferLocation); + buffers[count] = resource->u.vk_buffer; + offsets[count] = views[i].BufferLocation - resource->gpu_address; + sizes[count] = views[i].SizeInBytes; + + resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferFilledSizeLocation); + list->so_counter_buffers[start_slot + i] = resource->u.vk_buffer; + list->so_counter_buffer_offsets[start_slot + i] = views[i].BufferFilledSizeLocation - resource->gpu_address; + ++count; + } + else + { + if (count) + VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(list->vk_command_buffer, first, count, buffers, offsets, sizes)); + count = 0; + first = start_slot + i + 1; + + list->so_counter_buffers[start_slot + i] = VK_NULL_HANDLE; + list->so_counter_buffer_offsets[start_slot + i] = 0; + } + } + + if (count) + VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(list->vk_command_buffer, first, count, buffers, offsets, sizes)); } static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3b78a5e2c55d..62245b1e57a0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -794,6 +794,9 @@ struct d3d12_command_list struct d3d12_command_allocator *allocator; struct d3d12_device *device; + VkBuffer so_counter_buffers[D3D12_SO_BUFFER_SLOT_COUNT]; + VkDeviceSize so_counter_buffer_offsets[D3D12_SO_BUFFER_SLOT_COUNT]; + struct vkd3d_private_store private_store; }; -- 2.19.2

2 1

[PATCH vkd3d 08/10] vkd3d: Enable transform feedback for pipeline states with stream output.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 19 +++++++++++++++++++ libs/vkd3d/state.c | 3 +++ libs/vkd3d/vkd3d_private.h | 4 ++++ 3 files changed, 26 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8402668f3a05..9c3165c98765 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1304,6 +1304,13 @@ static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + if (list->xfb_enabled) + { + VK_CALL(vkCmdEndTransformFeedbackEXT(list->vk_command_buffer, 0, ARRAY_SIZE(list->so_counter_buffers), + list->so_counter_buffers, list->so_counter_buffer_offsets)); + list->xfb_enabled = false; + } + if (list->current_render_pass) VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); @@ -1746,6 +1753,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->fb_height = 0; list->fb_layer_count = 0; + list->xfb_enabled = false; + list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; list->current_render_pass = VK_NULL_HANDLE; @@ -2252,6 +2261,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + struct d3d12_graphics_pipeline_state *graphics; struct VkRenderPassBeginInfo begin_desc; VkRenderPass vk_render_pass; @@ -2287,6 +2297,15 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list list->current_render_pass = vk_render_pass; + graphics = &list->state->u.graphics; + if (graphics->xfb_enabled) + { + VK_CALL(vkCmdBeginTransformFeedbackEXT(list->vk_command_buffer, 0, ARRAY_SIZE(list->so_counter_buffers), + list->so_counter_buffers, list->so_counter_buffer_offsets)); + + list->xfb_enabled = true; + } + return true; } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 77538ebb3dce..a9a463de97e2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2165,6 +2165,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } } + graphics->xfb_enabled = false; if (so_desc->NumEntries) { if (!vk_info->EXT_transform_feedback) @@ -2174,6 +2175,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + graphics->xfb_enabled = true; + xfb_info.type = VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO; xfb_info.next = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4564b9635fe5..65fcd9f5ce11 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -620,6 +620,8 @@ struct d3d12_graphics_pipeline_state const struct d3d12_root_signature *root_signature; struct list compiled_pipelines; + + bool xfb_enabled; }; struct d3d12_compute_pipeline_state @@ -788,6 +790,8 @@ struct d3d12_command_list unsigned int fb_height; unsigned int fb_layer_count; + bool xfb_enabled; + VkFramebuffer current_framebuffer; VkPipeline current_pipeline; VkRenderPass current_render_pass; -- 2.19.2

2 1

[PATCH vkd3d 07/10] vkd3d: Pass transform feedback info to vkd3d-shader.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7af8b6030d58..77538ebb3dce 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1931,6 +1931,8 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_ return true; } +STATIC_ASSERT(sizeof(struct vkd3d_shader_transform_feedback_element) == sizeof(D3D12_SO_DECLARATION_ENTRY)); + static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *state, struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc) { @@ -1944,11 +1946,13 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s uint32_t instance_divisors[D3D12_VS_INPUT_REGISTER_COUNT]; uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; struct vkd3d_shader_compile_arguments ps_compile_args; + struct vkd3d_shader_transform_feedback_info xfb_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_interface shader_interface; struct vkd3d_shader_signature input_signature; struct VkSubpassDescription sub_pass_desc; struct VkRenderPassCreateInfo pass_desc; + VkShaderStageFlagBits xfb_stage = 0; VkSampleCountFlagBits sample_count; const struct vkd3d_format *format; enum VkVertexInputRate input_rate; @@ -2161,6 +2165,31 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } } + if (so_desc->NumEntries) + { + if (!vk_info->EXT_transform_feedback) + { + hr = E_NOTIMPL; + FIXME("Transform feedback is not supported by Vulkan implementation.\n"); + goto fail; + } + + xfb_info.type = VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO; + xfb_info.next = NULL; + + xfb_info.elements = (const struct vkd3d_shader_transform_feedback_element *)so_desc->pSODeclaration; + xfb_info.element_count = so_desc->NumEntries; + xfb_info.buffer_strides = so_desc->pBufferStrides; + xfb_info.buffer_stride_count = so_desc->NumStrides; + + if (desc->GS.pShaderBytecode) + xfb_stage = VK_SHADER_STAGE_GEOMETRY_BIT; + else if (desc->DS.pShaderBytecode) + xfb_stage = VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT; + else + xfb_stage = VK_SHADER_STAGE_VERTEX_BIT; + } + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; @@ -2225,6 +2254,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + shader_interface.next = shader_stages[i].stage == xfb_stage ? &xfb_info : NULL; + if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], shader_stages[i].stage, b, &shader_interface, compile_args))) goto fail; -- 2.19.2

2 1

[PATCH vkd3d 02/10] vkd3d: Set transform feedback buffer usage flags.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 5b4110886299..64d6e658bd5a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -481,6 +481,13 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; + if (heap_properties->Type == D3D12_HEAP_TYPE_DEFAULT + && device->vk_info.EXT_transform_feedback) + { + buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT + | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; + } + if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD) buffer_info.usage &= ~VK_BUFFER_USAGE_TRANSFER_DST_BIT; else if (heap_properties->Type == D3D12_HEAP_TYPE_READBACK) -- 2.19.2

2 1

[PATCH vkd3d 06/10] vkd3d-shader: Add basic support for transform feedback.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 24 +++++++++++ libs/vkd3d-shader/spirv.c | 91 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 946defb2f87e..2ac8e0fd9505 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -20,6 +20,7 @@ #define __VKD3D_SHADER_H #include <stdbool.h> +#include <stdint.h> #include <vkd3d_types.h> #ifdef __cplusplus @@ -31,6 +32,7 @@ enum vkd3d_shader_structure_type VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE, VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, + VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -151,6 +153,28 @@ struct vkd3d_shader_interface unsigned int uav_counter_count; }; +struct vkd3d_shader_transform_feedback_element +{ + unsigned int stream_index; + const char *semantic_name; + unsigned int semantic_index; + uint8_t component_index; + uint8_t component_count; + uint8_t output_slot; +}; + +/* Extends vkd3d_shader_interface. */ +struct vkd3d_shader_transform_feedback_info +{ + enum vkd3d_shader_structure_type type; + const void *next; + + const struct vkd3d_shader_transform_feedback_element *elements; + unsigned int element_count; + const unsigned int *buffer_strides; + unsigned int buffer_stride_count; +}; + enum vkd3d_shader_target { VKD3D_SHADER_TARGET_NONE, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 538c44fdbcaf..9d1a0df7566f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -108,6 +108,27 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd #endif /* HAVE_SPIRV_TOOLS */ +struct vkd3d_struct +{ + enum vkd3d_shader_structure_type type; + const void *next; +}; + +#define vkd3d_find_struct(c, t) vkd3d_find_struct_(c, VKD3D_SHADER_STRUCTURE_TYPE_##t) +static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, + enum vkd3d_shader_structure_type type) +{ + while (chain) + { + if (chain->type == type) + return chain; + + chain = chain->next; + } + + return NULL; +} + #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 1 @@ -1884,6 +1905,7 @@ struct vkd3d_dxbc_compiler bool after_declarations_section; const struct vkd3d_shader_signature *input_signature; const struct vkd3d_shader_signature *output_signature; + const struct vkd3d_shader_transform_feedback_info *xfb_info; struct vkd3d_shader_output_info { uint32_t id; @@ -1934,6 +1956,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader if (shader_interface) { + compiler->xfb_info = vkd3d_find_struct(shader_interface->next, TRANSFORM_FEEDBACK_INFO); + compiler->shader_interface = *shader_interface; if (shader_interface->push_constant_buffer_count) { @@ -3178,6 +3202,64 @@ static unsigned int vkd3d_count_signature_elements_for_reg( return count; } +static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler *compiler, + uint32_t id, unsigned int component_count, const struct vkd3d_shader_signature_element *signature_element) +{ + const struct vkd3d_shader_transform_feedback_info *xfb_info = compiler->xfb_info; + const struct vkd3d_shader_transform_feedback_element *xfb_element; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int offset, stride, i; + + if (!xfb_info) + return; + + offset = 0; + xfb_element = NULL; + for (i = 0; i < xfb_info->element_count; ++i) + { + const struct vkd3d_shader_transform_feedback_element *e = &xfb_info->elements[i]; + + if (e->stream_index == signature_element->stream_index + && !strcasecmp(e->semantic_name, signature_element->semantic_name) + && e->semantic_index == signature_element->semantic_index) + { + xfb_element = e; + break; + } + + offset += 4 * e->component_count; + } + + if (!xfb_element) + return; + + if (xfb_element->component_index || xfb_element->component_count > component_count) + { + FIXME("Unhandled component range %u, %u.\n", xfb_element->component_index, xfb_element->component_count); + return; + } + + if (xfb_element->output_slot < xfb_info->buffer_stride_count) + { + stride = xfb_info->buffer_strides[xfb_element->output_slot]; + } + else + { + stride = 0; + for (i = 0; i < xfb_info->element_count; ++i) + { + const struct vkd3d_shader_transform_feedback_element *e = &xfb_info->elements[i]; + + if (e->stream_index == xfb_element->stream_index && e->output_slot == xfb_element->output_slot) + stride += 4 * e->component_count; + } + } + + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationXfbBuffer, xfb_element->output_slot); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationXfbStride, stride); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationOffset, offset); +} + static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3541,6 +3623,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (component_idx) vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); } + + vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); } compiler->output_info[signature_idx].id = id; @@ -3583,6 +3667,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler) { + const struct vkd3d_shader_transform_feedback_info *xfb_info = compiler->xfb_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; switch (compiler->shader_type) @@ -3610,6 +3695,12 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp ERR("Invalid shader type %#x.\n", compiler->shader_type); } + if (xfb_info && xfb_info->element_count) + { + vkd3d_spirv_enable_capability(builder, SpvCapabilityTransformFeedback); + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeXfb, NULL, 0); + } + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } -- 2.19.2

2 1

[PATCH] crypt32/tests: Fix a typo in ok() message.
by Gijs Vermeulen 14 Jan '19

14 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/crypt32/tests/store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 9915482277..0adfeb8529 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -541,7 +541,7 @@ static void testStoresInCollection(void) cert2 = CertCreateCertificateContext(X509_ASN_ENCODING, signedBigCert, sizeof(signedBigCert)); ok (cert2 != NULL, "Failed to create cert context %x\n", GetLastError()); ret = CertAddCertificateContextToStore(collection, cert2, CERT_STORE_ADD_REPLACE_EXISTING, NULL); - ok (ret, "Failed to add cert3 to the store %x\n",GetLastError()); + ok (ret, "Failed to add cert2 to the store %x\n",GetLastError()); /** checking certificates in the stores */ tcert1 = CertEnumCertificatesInStore(ro_store, 0); -- 2.20.1

1 0

[PATCH] xmllite/tests: Fix a memory leak (Valgrind).
by Sven Baars 14 Jan '19

14 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/xmllite/tests/writer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 99ad168c53..1c6689a00d 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -483,6 +483,7 @@ todo_wine CHECK_OUTPUT_RAW(stream, utf16_outputW, sizeof(utf16_outputW)); IStream_Release(stream); + IUnknown_Release(output); /* Create output with meaningless code page value. */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); -- 2.17.1

2 1

[PATCH] gdi32/tests: Korean and Chinese machines may use MS Shell Dlg as their default GUI font.
by Huw Davies 14 Jan '19

14 Jan '19

This is an extension of commit c81ff0f8cfc1a7b6fa7546d8ffb656e290ef5e7e. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35573 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 75696946b2..67e8941b5e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6340,7 +6340,7 @@ static void test_stock_fonts(void) int charset, weight, height, height_pixels, dpi; const char face_name[LF_FACESIZE]; WORD lang_id; - } td[][12] = + } td[][17] = { { /* ANSI_FIXED_FONT */ { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC }, @@ -6374,10 +6374,15 @@ static void test_stock_fonts(void) }, { /* DEFAULT_GUI_FONT */ { SHIFTJIS_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, + { SHIFTJIS_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" }, { SHIFTJIS_CHARSET, FW_NORMAL, -12, 15, 96, "?MS UI Gothic" }, { SHIFTJIS_CHARSET, FW_NORMAL, -15, 18, 120, "?MS UI Gothic" }, + { HANGEUL_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, + { HANGEUL_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" }, { HANGEUL_CHARSET, FW_NORMAL, -12, 15, 96, "?Gulim" }, { HANGEUL_CHARSET, FW_NORMAL, -15, 18, 120, "?Gulim" }, + { GB2312_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, + { GB2312_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" }, { GB2312_CHARSET, FW_NORMAL, -12, 15, 96, "?SimHei" }, { GB2312_CHARSET, FW_NORMAL, -15, 18, 120, "?SimHei" }, { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 15, 96, "?MingLiU" }, -- 2.18.0

2 1

[PATCH 2/2] wined3d: Execute all CS commands before setting palette entries.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> This is not the most performant solution. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44796 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/palette.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 2436100238aa..d78a364aaf52 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -98,6 +98,8 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, palette, flags, start, count, entries); TRACE("Palette flags: %#x.\n", palette->flags); + wined3d_cs_finish(palette->device->cs, WINED3D_CS_QUEUE_DEFAULT); + if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) { const BYTE *entry = (const BYTE *)entries; -- 2.19.2

3 2

[PATCH 1/2] wined3d: Execute all CS commands before changing swapchain palette.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44796 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3a7039da4489..f7fc05f8ef31 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -299,6 +299,9 @@ HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *s void CDECL wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, struct wined3d_palette *palette) { TRACE("swapchain %p, palette %p.\n", swapchain, palette); + + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); + swapchain->palette = palette; } -- 2.19.2

2 1

[PATCH 1/6] d3dx9: Factor out {lock|unlock}_surface() functions.
by Paul Gofman 14 Jan '19

14 Jan '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3dx9_36/surface.c | 75 ++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 11a0ee1a2f..83c6f6dd4d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -199,6 +199,53 @@ static const struct { { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000, D3DFMT_X8B8G8R8 }, }; +static HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, + IDirect3DSurface9 **temp_surface) +{ + IDirect3DDevice9 *device; + D3DSURFACE_DESC desc; + HRESULT hr; + + *temp_surface = NULL; + if (FAILED(IDirect3DSurface9_LockRect(surface, lock, NULL, D3DLOCK_READONLY))) + { + IDirect3DSurface9_GetDevice(surface, &device); + IDirect3DSurface9_GetDesc(surface, &desc); + if (FAILED(IDirect3DDevice9_CreateRenderTarget(device, desc.Width, desc.Height, + desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, temp_surface, NULL))) + { + IDirect3DDevice9_Release(device); + return D3DERR_INVALIDCALL; + } + + if (SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, surface, NULL, *temp_surface, NULL, D3DTEXF_NONE))) + hr = IDirect3DSurface9_LockRect(*temp_surface, lock, NULL, D3DLOCK_READONLY); + IDirect3DDevice9_Release(device); + if (FAILED(hr)) + { + WARN("Failed to lock surface %p, usage %#x, pool %#x.\n", + surface, desc.Usage, desc.Pool); + IDirect3DSurface9_Release(*temp_surface); + *temp_surface = NULL; + return D3DERR_INVALIDCALL; + } + } + return D3D_OK; +} + +static HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, + IDirect3DSurface9 *temp_surface) +{ + HRESULT hr = D3D_OK; + + if (!temp_surface) + return IDirect3DSurface9_UnlockRect(surface); + + IDirect3DSurface9_UnlockRect(temp_surface); + IDirect3DSurface9_Release(temp_surface); + return hr; +} + static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_format) { unsigned int i; @@ -1924,7 +1971,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { - IDirect3DSurface9 *surface = src_surface; + IDirect3DSurface9 *temp_surface; D3DTEXTUREFILTERTYPE d3d_filter; IDirect3DDevice9 *device; D3DSURFACE_DESC src_desc; @@ -1979,32 +2026,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, src_rect = &s; } - if (FAILED(IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY))) - { - IDirect3DSurface9_GetDevice(src_surface, &device); - if (FAILED(IDirect3DDevice9_CreateRenderTarget(device, src_desc.Width, src_desc.Height, - src_desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL))) - { - IDirect3DDevice9_Release(device); - return D3DXERR_INVALIDDATA; - } - - if (SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, surface, NULL, D3DTEXF_NONE))) - hr = IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY); - IDirect3DDevice9_Release(device); - if (FAILED(hr)) - { - IDirect3DSurface9_Release(surface); - return D3DXERR_INVALIDDATA; - } - } + if (FAILED(lock_surface(src_surface, &lock, &temp_surface))) + return D3DXERR_INVALIDDATA; hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, src_desc.Format, lock.Pitch, src_palette, src_rect, filter, color_key); - IDirect3DSurface9_UnlockRect(surface); - if (surface != src_surface) - IDirect3DSurface9_Release(surface); + if (FAILED(unlock_surface(src_surface, &lock, temp_surface))) + return D3DXERR_INVALIDDATA; return hr; } -- 2.20.1

1 5

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 14 Jan '19

14 Jan '19

This fixes the translation issue spotted by Francois, https://source.winehq.org/patches/data/156568 . Thanks. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

msxml3: Handle libxml2 API breakage.
by Thomas Faber 14 Jan '19

14 Jan '19

--- v2.9.8 adds 'const' to the callback function signatures, which causes warnings such as: schema.c: In function ‘cache_add_entry’: schema.c:1008:47: error: passing argument 3 of ‘xmlHashRemoveEntry’ from incompatible pointer type [-Werror=incompatible-pointer-types] if (xmlHashRemoveEntry(cache->cache, uri, cache_free)) ^~~~~~~~~~ In file included from /usr/include/libxml2/libxml/parser.h:18, from /usr/include/libxml2/libxml/xmlerror.h:10, from schema.c:29: /usr/include/libxml2/libxml/hash.h:160:47: note: expected ‘xmlHashDeallocator’ {aka ‘void (*)(void *, const unsigned char *)’} but argument is of type ‘void (*)(void *, xmlChar *)’ {aka ‘void (*)(void *, unsigned char *)’} xmlHashDeallocator f); ~~~~~~~~~~~~~~~~~~~^ This isn't the prettiest solution, but I think it's better than casting the function pointers. Happy to take ideas to make it nicer. dlls/msxml3/schema.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 80879852041a..e385b9b56357 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -52,6 +52,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#if LIBXML_VERSION >= 20908 +#define XMLHASH_CONST const +#else +#define XMLHASH_CONST +#endif + /* We use a chained hashtable, which can hold any number of schemas * TODO: grow/shrink hashtable depending on load factor * TODO: implement read-only where appropriate @@ -980,7 +986,7 @@ static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI, MSXM return entry; } -static void cache_free(void* data, xmlChar* name /* ignored */) +static void cache_free(void* data, XMLHASH_CONST xmlChar* name /* ignored */) { cache_entry_release((cache_entry*)data); } @@ -1397,7 +1403,7 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* if return S_OK; } -static void cache_copy(void* data, void* dest, xmlChar* name) +static void cache_copy(void* data, void* dest, XMLHASH_CONST xmlChar* name) { schema_cache* This = (schema_cache*) dest; cache_entry* entry = (cache_entry*) data; -- 2.20.1

2 2

[PATCH v2] msi/tests: Add a trailing '\n' to an ok() call.
by Francois Gouget 14 Jan '19

14 Jan '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- With Signed-off-by line this time! dlls/msi/tests/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 1267db3426d..9f847ce2f01 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -14213,7 +14213,7 @@ static void test_setpropertyfolder(void) ok(delete_pf("msitest\\maximus", TRUE), "file not installed\n"); ok(delete_pf("msitest", FALSE), "directory not created\n"); - ok(DeleteFileA("c:\\parent\\child\\Shortcut.lnk"), "file not installed"); + ok(DeleteFileA("c:\\parent\\child\\Shortcut.lnk"), "file not installed\n"); ok(RemoveDirectoryA("c:\\parent\\child"), "directory not created\n"); ok(RemoveDirectoryA("c:\\parent"), "directory not created\n"); -- 2.20.1

2 1

[PATCH] po: Fix a format mismatch in a Russian translation.
by Francois Gouget 14 Jan '19

14 Jan '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] po: Fuzzy an Arabic translation with a format mismatch.
by Francois Gouget 14 Jan '19

14 Jan '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- The %1 is missing. Feel free to provide a fixed translation instead. po/ar.po | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] po: Fuzzy a Japanese translation with a format mismatch.
by Francois Gouget 14 Jan '19

14 Jan '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Feel free to provide a fixed translation instead. po/ja.po | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] po: Fuzzy a Portuguese (Portugal) translation with a format mismatch.
by Francois Gouget 14 Jan '19

14 Jan '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Feel free to provide a fixed translation instead. po/pt_PT.po | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] oleaut32/tests: Fix some memory leaks (Valgrind).
by Sven Baars 13 Jan '19

13 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/oleaut32/tests/tmarshal.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 0b6776b40a..4b03d5a890 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -38,6 +38,7 @@ static inline void release_iface_(unsigned int line, void *iface) { ULONG ref = IUnknown_Release((IUnknown *)iface); ok_(__FILE__, line)(!ref, "Got outstanding refcount %d.\n", ref); + if (ref == 1) IUnknown_Release((IUnknown *)iface); } #define release_iface(a) release_iface_(__LINE__, a) @@ -2141,8 +2142,8 @@ static void test_marshal_iface(IWidget *widget, IDispatch *disp) sfd1 = create_disp_obj(); sfd2 = create_disp_obj(); sfd3 = create_disp_obj(); - hr = IWidget_iface_in(widget, (IUnknown *)create_disp_obj(), - (IDispatch *)create_disp_obj(), create_disp_obj()); + hr = IWidget_iface_in(widget, (IUnknown *)sfd1, + (IDispatch *)sfd2, sfd3); ok(hr == S_OK, "Got hr %#x.\n", hr); release_iface(sfd1); release_iface(sfd2); @@ -2329,9 +2330,10 @@ if (hr == S_OK) { release_iface(unk_out); release_iface(unk_in_out); +} release_iface(sfd1); +todo_wine release_iface(sfd3); -} testmode = 2; unk_in = unk_out = unk_in_out = NULL; @@ -2471,22 +2473,24 @@ static void test_marshal_variant(IWidget *widget, IDispatch *disp) static void test_marshal_safearray(IWidget *widget, IDispatch *disp) { - SAFEARRAY *in, *out, *in_ptr, *in_out; + SAFEARRAY *in, *out, *out2, *in_ptr, *in_out; HRESULT hr; in = make_safearray(3); - out = make_safearray(5); + out = out2 = make_safearray(5); in_ptr = make_safearray(7); in_out = make_safearray(9); hr = IWidget_safearray(widget, in, &out, &in_ptr, &in_out); ok(hr == S_OK, "Got hr %#x.\n", hr); check_safearray(in, 3); check_safearray(out, 4); + check_safearray(out2, 5); check_safearray(in_ptr, 7); check_safearray(in_out, 6); SafeArrayDestroy(in); SafeArrayDestroy(out); + SafeArrayDestroy(out2); SafeArrayDestroy(in_ptr); SafeArrayDestroy(in_out); } @@ -2629,6 +2633,7 @@ static void test_marshal_coclass(IWidget *widget, IDispatch *disp) release_iface(out); release_iface(in_out); release_iface(&class1->ICoclass1_iface); + release_iface(&class3->ICoclass1_iface); testmode = 2; in = out = in_out = NULL; -- 2.17.1

1 0

[v2 PATCH] oledb32: Support Milliseconds when converting BSTR -> DBTIMESTAMP
by Alistair Leslie-Hughes 13 Jan '19

13 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 30 ++++++++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 29 +++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f18c756..22fe5af 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -30,11 +30,25 @@ #include "oledb_private.h" +#include <stdio.h> #include "wine/debug.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); +static inline char *strdupWtoA( LPCWSTR str ) +{ + LPSTR ret = NULL; + DWORD len; + + if (!str) return ret; + len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + ret = heap_alloc( len ); + if (ret) + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + return ret; +} + typedef struct { IDataConvert IDataConvert_iface; @@ -527,6 +541,22 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->second = st.wSecond; d->fraction = st.wMilliseconds * 1000000; } + else + { + char *buff = strdupWtoA(s); + static const char *format = "%d-%d-%d %d:%d:%d.%d"; + + if(sscanf( buff, format, &d->year, &d->month, &d->day, &d->hour, &d->minute, &d->second, &d->fraction) != 7) + { + hr = DISP_E_TYPEMISMATCH; + *dst_status = DBSTATUS_E_CANTCONVERTVALUE; + *dst_len = get_length(dst_type); + } + else + hr = S_OK; + + heap_free(buff); + } VariantClear(&var); } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index e79bb45..7cafeda 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3608,8 +3608,12 @@ static void test_converttovar(void) static void test_converttotimestamp(void) { static const WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0}; + static const WCHAR str1W[] = {'2','0','1','3','/','0','5','/','1','4',' ','0','2','.','0','4','.','1','2',0}; static const WCHAR strFullW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2', '.','0','1','7','0','0','0','0','0','0',0}; + static const WCHAR strFull1W[] = {'2','0','1','3','/','0','5','/','1','4',' ','0','2',':','0','4',':','1','2', + '.','0','1','7',0}; + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; DBTIMESTAMP ts1 = {2013, 5, 14, 2, 4, 12, 17000000}; DATE date; @@ -3639,13 +3643,30 @@ static void test_converttotimestamp(void) ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); SysFreeString(bstr); + bstr = SysAllocString(str1W); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); + SysFreeString(bstr); + bstr = SysAllocString(strFullW); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); - todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + + bstr = SysAllocString(strFull1W); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DISP_E_TYPEMISMATCH, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_CANTCONVERTVALUE, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); SysFreeString(bstr); V_VT(&var) = VT_NULL; -- 1.9.1

1 0

Re: [PATCH v2] ntoskrnl.exe: fix handling relocations on page boundary
by Rafał H 13 Jan '19

13 Jan '19

Why this is deferred. I hoped to have it included in Wine 4.0. It fixes kernel driver crashes for multiple games (StarForce v3, Age of Wushu, MTA: SA, makes the last one totally working, no idea about others) and is not intrusive at all. If not crash-fixes than what is accepted type of patches right now before Wine 4.0? W dniu 11.01.2019 o 19:05, Marvin pisze: Thank you for your contribution to Wine! This is an automated notification to let you know that your patch has been reviewed and its status set to "Deferred". This means that the patch is deferred because of code freeze for an upcoming release. You need to either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release. If you do not understand the reason for this status, disagree with our assessment, or are simply not sure how to proceed next, please ask for clarification by replying to this email.

2 1

[PATCH] mstask/tests: Fix some memory leaks (Valgrind).
by Sven Baars 13 Jan '19

13 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/mstask/tests/task.c | 1 + dlls/mstask/tests/task_scheduler.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 4e8386a008..6195194d61 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -760,6 +760,7 @@ static void test_workitem_data(void) ok(count == sizeof(hello), "got %u\n", count); ok(data != NULL, "got NULL\n"); ok(!memcmp(data, hello, sizeof(hello)), "data mismatch\n"); + CoTaskMemFree(data); hr = ITask_SetWorkItemData(task, 0, NULL); ok(hr == S_OK, "got %#x\n", hr); diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index f61022575d..5abee75e23 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -329,11 +329,13 @@ static void test_save_task_curfile(ITask *task) hr = IPersistFile_Save(pfile, NULL, TRUE); ok(hr == S_OK, "Save error %#x\n", hr); + CoTaskMemFree(curfile); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); ok(hr == S_OK, "GetCurFile error %#x\n", hr); ok(curfile && curfile[0] , "curfile should not be NULL\n"); + CoTaskMemFree(curfile); IPersistFile_Release(pfile); } @@ -454,18 +456,21 @@ static void test_task_storage(void) curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task2_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task3, (IScheduledWorkItem *)task); ok(hr == S_OK, "AddWorkItem error %#x\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task3_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); ok(hr == S_OK, "AddWorkItem error %#x\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); -- 2.17.1

2 1

[PATCH] winebuild: Fix a segmentation fault
by James Larrowe 12 Jan '19

12 Jan '19

When 'winebuild' is called with no arguments, the make_c_identifier function is passed a null pointer, which is dereferenced and causes a segmentation fault. This patch fixes that issue. Signed-off-by: James Larrowe <larrowe.semaj11(a)gmail.com> --- tools/winebuild/utils.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 95da1758c5..a6b1c102fd 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -816,10 +816,17 @@ char *make_c_identifier( const char *str ) { char *p, buffer[256]; - for (p = buffer; *str && p < buffer+sizeof(buffer)-1; p++, str++) + if ( str == NULL ) { - if (isalnum(*str)) *p = *str; - else *p = '_'; + return NULL; + } + else + { + for (p = buffer; *str && p < buffer+sizeof(buffer)-1; p++, str++) + { + if (isalnum(*str)) *p = *str; + else *p = '_'; + } } *p = 0; return xstrdup( buffer ); -- 2.20.1

1 0

[PATCH] shell32/tests: Fix a typo.
by Sven Baars 12 Jan '19

12 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- Noticed this while fixing the SHGetKnownFolderPath implementation. Will send a patch for that after the code freeze. dlls/shell32/tests/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index bac64e57a7..38b56f01d3 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1882,7 +1882,7 @@ if (0) { /* crashes */ path2 = NULL; hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_SIMPLE_IDLIST, NULL, &path2); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); - ok(path != NULL, "expected path != NULL\n"); + ok(path2 != NULL, "expected path != NULL\n"); ok(!lstrcmpiW(path, path2), "expected equal paths: %s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(path2)); CoTaskMemFree(path2); -- 2.17.1

1 0

[PATCH 2/2] po: Update French translation
by Isira Seneviratne 12 Jan '19

12 Jan '19

1 0

Re: [PATCH 2/2] po: Update French translation
by Isira Seneviratne 11 Jan '19

11 Jan '19

On Sat, Jan 12, 2019, 4:53 AM Dorian Wouters <dorian(a)elementw.net wrote: > You're welcome :) > Just noticed another thing: "Êtes vous" should be "Êtes-vous" (for some > reason I can hardly grasp even as a native french speaker); make sure to > include that in your patch if you submit it again. > Will do, thanks! > On 12/01/2019 00:20, Isira Seneviratne wrote: > > > > > > On Sat, Jan 12, 2019, 4:22 AM Dorian Wouters <dorian(a)elementw.net > > <mailto:dorian@elementw.net> wrote: > > > > Hi Isira, > > > > On 07/01/2019 17:10, Isira Seneviratne wrote: > > > #: winemine.rc:34 > > > msgid "All results will be lost. Are you sure?" > > > -msgstr "" > > > +msgstr "Tout les résultats seront perdu. Êtes vous sûr?" > > > > Shouldn't it be "perdus"? "résultats" is plural. > > > > > > Thank you, French isn't my strongest language. > > > > In addition the rest of the translation file has " "/NBSP/U+00A0 > before > > question marks, as per the punctuation rules of most french-speaking > > places (Québec not being one of them, mandating no or half-space > > instead); I think it should be added here too. > > > > > > Yeah, that was a mistake. Thank you again :) > > > > > > -- > > Regards, > > Dorian > > > > >

1 0

[PATCH 2/2] po: Update French translation
by Isira Seneviratne 11 Jan '19

11 Jan '19

2 2

[PATCH vkd3d 4/4] include: Add stream output constants.
by Józef Kucia 11 Jan '19

11 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 29f4ab3cbf47..c025dbe8b2bb 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -54,6 +54,12 @@ const UINT D3D12_REQ_TEXTURE3D_U_V_OR_W_DIMENSION = 2048; const UINT D3D12_REQ_TEXTURECUBE_DIMENSION = 16384; const UINT D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES = 0xffffffff; const UINT D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; +const UINT D3D12_SO_BUFFER_MAX_STRIDE_IN_BYTES = 2048; +const UINT D3D12_SO_BUFFER_SLOT_COUNT = 4; +const UINT D3D12_SO_DDI_REGISTER_INDEX_DENOTING_GAP = 0xffffffff; +const UINT D3D12_SO_NO_RASTERIZED_STREAM = 0xffffffff; +const UINT D3D12_SO_OUTPUT_COMPONENT_COUNT = 128; +const UINT D3D12_SO_STREAM_COUNT = 4; const UINT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT = 256; const UINT D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 4194304; const UINT D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT = 65536; -- 2.19.2

2 1

[PATCH vkd3d 1/4] vkd3d-shader: Declare OriginUpperLeft execution mode for fragment shaders.
by Józef Kucia 11 Jan '19

11 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Required by the Vulkan spec: "fragment entry points must declare OriginUpperLeft." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a24585c542da..9a14e8030783 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1901,6 +1901,21 @@ struct vkd3d_dxbc_compiler static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler); +static void vkd3d_dxbc_compiler_emit_execution_mode(struct vkd3d_dxbc_compiler *compiler, + SpvExecutionMode mode, const uint32_t *literals, unsigned int literal_count) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_execution_mode(&builder->execution_mode_stream, + builder->main_function_id, mode, literals, literal_count); +} + +static void vkd3d_dxbc_compiler_emit_execution_mode1(struct vkd3d_dxbc_compiler *compiler, + SpvExecutionMode mode, const uint32_t literal) +{ + vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, &literal, 1); +} + struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, const struct vkd3d_shader_interface *shader_interface, @@ -1943,6 +1958,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader break; case VKD3D_SHADER_TYPE_PIXEL: vkd3d_spirv_set_execution_model(&compiler->spirv_builder, SpvExecutionModelFragment); + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeOriginUpperLeft, NULL, 0); break; case VKD3D_SHADER_TYPE_COMPUTE: vkd3d_spirv_set_execution_model(&compiler->spirv_builder, SpvExecutionModelGLCompute); @@ -2719,21 +2735,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co return val_id; } -static void vkd3d_dxbc_compiler_emit_execution_mode(struct vkd3d_dxbc_compiler *compiler, - SpvExecutionMode mode, const uint32_t *literals, unsigned int literal_count) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - - vkd3d_spirv_build_op_execution_mode(&builder->execution_mode_stream, - builder->main_function_id, mode, literals, literal_count); -} - -static void vkd3d_dxbc_compiler_emit_execution_mode1(struct vkd3d_dxbc_compiler *compiler, - SpvExecutionMode mode, const uint32_t literal) -{ - vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, &literal, 1); -} - static uint32_t vkd3d_dxbc_compiler_emit_abs(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { -- 2.19.2

2 1

[PATCH vkd3d 3/4] vkd3d: Add FIXME() for sample mask.
by Józef Kucia 11 Jan '19

11 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 771ef241738a..86ceee31803e 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2353,6 +2353,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!graphics->attachment_count && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; + if (desc->SampleMask != ~0u) + FIXME("Ignoring sample mask %#x.\n", desc->SampleMask); + graphics->ms_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; graphics->ms_desc.pNext = NULL; graphics->ms_desc.flags = 0; -- 2.19.2

2 1

[PATCH vkd3d 2/4] include: Include stdbool.h in vkd3d_shader.h.
by Józef Kucia 11 Jan '19

11 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1153fdea0a0d..946defb2f87e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -19,6 +19,7 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H +#include <stdbool.h> #include <vkd3d_types.h> #ifdef __cplusplus -- 2.19.2

2 1

[PATCH] wined3d: Set proper GL internal format for sRGB formats.
by Matteo Bruni 11 Jan '19

11 Jan '19

The idea was to defer that part to check_fbo_compat() for the FBO ORM but, it turns out, there are formats like DXTn that aren't generally FBO-attachable but still support sRGB. Fixes 9fc3444d6ed8ad0e124a77d2faf1e2cc6639f40f (it's a partial revert, in fact). It might help with bug 46212. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/utils.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f8da256b07e..dd70d3fc2d5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3053,8 +3053,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, if (!(format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) format->srgb_internal = format->internal; - else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) format->internal = format->srgb_internal; } } @@ -3076,8 +3075,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, format->srgb_internal = format->internal; format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } - else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { format->internal = format->srgb_internal; } -- 2.19.2

2 1

[PATCH] po: Update Sinhala translation
by Isira Seneviratne 11 Jan '19

11 Jan '19

2 1

[PATCH 2/2] wined3d: Support WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST in the GLSL blitter.
by Henri Verbeet 11 Jan '19

11 Jan '19

Both the ARBfp and fixed-function blitter support WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST, but the fixed-function blitter requires a compatibility context, and the ARBfp blitter isn't created when the GLSL blitter is available. This fixes a regression introduced by commit 6fc027e5acfb7f7c7f50af421658e5442e896588. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45874 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fc0b2c78bd0..d6fd565bd80 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13116,7 +13116,8 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY + && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) { TRACE("Unsupported blit_op %#x.\n", blit_op); return FALSE; @@ -13168,6 +13169,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *staging_texture = NULL; struct wined3d_glsl_blitter *glsl_blitter; + struct wined3d_color_key alpha_test_key; struct glsl_blitter_program *program; struct wined3d_blitter *next; unsigned int src_level; @@ -13284,8 +13286,20 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli context_invalidate_state(context, STATE_FRAMEBUFFER); } - if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, - op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY))) + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + { + const struct wined3d_format *f = src_texture->resource.format; + + alpha_test_key.color_space_low_value = 0; + alpha_test_key.color_space_high_value = ~(((1u << f->alpha_size) - 1) << f->alpha_offset); + colour_key = &alpha_test_key; + } + else if (op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + { + colour_key = NULL; + } + + if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, !!colour_key))) { ERR("Failed to get blitter program.\n"); return dst_location; @@ -13310,7 +13324,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli default: break; } - if (op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + if (colour_key) { struct wined3d_color float_key[2]; -- 2.11.0

1 0

[PATCH 1/2] wined3d: Support WINED3D_BLIT_OP_COLOR_BLIT_CKEY in the GLSL blitter.
by Henri Verbeet 11 Jan '19

11 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45874 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5f1a86608ba..fc0b2c78bd0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7659,6 +7659,14 @@ static void shader_glsl_generate_alpha_test(struct wined3d_string_buffer *buffer shader_addline(buffer, " discard;\n"); } +static void shader_glsl_generate_colour_key_test(struct wined3d_string_buffer *buffer, + const char *colour, const char *colour_key_low, const char *colour_key_high) +{ + shader_addline(buffer, "if (all(greaterThanEqual(%s, %s)) && all(lessThan(%s, %s)))\n", + colour, colour_key_low, colour, colour_key_high); + shader_addline(buffer, " discard;\n"); +} + static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info) { @@ -9952,10 +9960,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } if (settings->color_key_enabled) - { - shader_addline(buffer, "if (all(greaterThanEqual(tex0, color_key[0])) && all(lessThan(tex0, color_key[1])))\n"); - shader_addline(buffer, " discard;\n"); - } + shader_glsl_generate_colour_key_test(buffer, "tex0", "color_key[0]", "color_key[1]"); shader_addline(buffer, "ret = ffp_varying_diffuse;\n"); @@ -12499,7 +12504,7 @@ struct glsl_blitter_args { GLenum texture_type; struct color_fixup_desc fixup; - unsigned short padding; + unsigned short use_colour_key; }; struct glsl_blitter_program @@ -12573,6 +12578,8 @@ static void glsl_blitter_generate_p8_shader(struct wined3d_string_buffer *buffer shader_addline(buffer, " index = (index * 255.0 + 0.5) / 256.0;\n"); shader_addline(buffer, " %s = texture%s(sampler_palette, index);\n", output, needs_legacy_glsl_syntax(gl_info) ? "1D" : ""); + if (args->use_colour_key) + shader_glsl_generate_colour_key_test(buffer, output, "colour_key.low", "colour_key.high"); shader_addline(buffer, "}\n"); } @@ -12866,6 +12873,8 @@ static void glsl_blitter_generate_yuv_shader(struct wined3d_string_buffer *buffe shader_addline(buffer, " %s.x = luminance + chroma.x * yuv_coef.x;\n", output); shader_addline(buffer, " %s.y = luminance + chroma.y * yuv_coef.y + chroma.x * yuv_coef.z;\n", output); shader_addline(buffer, " %s.z = luminance + chroma.y * yuv_coef.w;\n", output); + if (args->use_colour_key) + shader_glsl_generate_colour_key_test(buffer, output, "colour_key.low", "colour_key.high"); shader_addline(buffer, "}\n"); } @@ -12878,6 +12887,8 @@ static void glsl_blitter_generate_plain_shader(struct wined3d_string_buffer *buf shader_addline(buffer, " %s = texture%s(sampler, out_texcoord.%s);\n", output, needs_legacy_glsl_syntax(gl_info) ? tex_type : "", swizzle); shader_glsl_color_correction_ext(buffer, output, WINED3DSP_WRITEMASK_ALL, args->fixup); + if (args->use_colour_key) + shader_glsl_generate_colour_key_test(buffer, output, "colour_key.low", "colour_key.high"); shader_addline(buffer, "}\n"); } @@ -12947,6 +12958,12 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter string_buffer_clear(buffer); shader_glsl_add_version_declaration(buffer, gl_info); shader_addline(buffer, "uniform sampler%s sampler;\n", tex_type); + if (args->use_colour_key) + { + shader_addline(buffer, "uniform struct\n{\n"); + shader_addline(buffer, " vec4 low, high;\n"); + shader_addline(buffer, "} colour_key;\n"); + } declare_in_varying(gl_info, buffer, FALSE, "vec3 out_texcoord;\n"); /* TODO: Declare the out variable with the correct type (and put it in the * blitter args). */ @@ -13041,7 +13058,7 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, /* Context activation is done by the caller. */ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl_blitter *blitter, - struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl) + struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl, BOOL use_colour_key) { const struct wined3d_gl_info *gl_info = context->gl_info; struct glsl_blitter_program *program; @@ -13051,6 +13068,7 @@ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl memset(&args, 0, sizeof(args)); args.texture_type = texture_gl->target; args.fixup = texture_gl->t.resource.format->color_fixup; + args.use_colour_key = use_colour_key; if ((entry = wine_rb_get(&blitter->programs, &args))) return WINE_RB_ENTRY_VALUE(entry, struct glsl_blitter_program, entry); @@ -13098,7 +13116,7 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT) + if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY) { TRACE("Unsupported blit_op %#x.\n", blit_op); return FALSE; @@ -13266,7 +13284,8 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli context_invalidate_state(context, STATE_FRAMEBUFFER); } - if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl))) + if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, + op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY))) { ERR("Failed to get blitter program.\n"); return dst_location; @@ -13291,6 +13310,16 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli default: break; } + if (op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + { + struct wined3d_color float_key[2]; + + wined3d_format_get_float_color_key(src_texture->resource.format, colour_key, float_key); + location = GL_EXTCALL(glGetUniformLocation(program->id, "colour_key.low")); + GL_EXTCALL(glUniform4fv(location, 1, &float_key[0].r)); + location = GL_EXTCALL(glGetUniformLocation(program->id, "colour_key.high")); + GL_EXTCALL(glUniform4fv(location, 1, &float_key[1].r)); + } context_draw_shaded_quad(context, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); GL_EXTCALL(glUseProgram(0)); -- 2.11.0

1 0

[PATCH] msacm32: Reference count local drivers.
by Zhiyi Zhang 11 Jan '19

11 Jan '19

One local driver can be assigned to multiple driver ids. When releasing the driver id, check if the reference count of a local driver is one before actually releasing the local driver. Fix Kindred Spirits on the Roof (Steam ID: 402620) crashing at multiple places. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/msacm32/internal.c | 12 +++++++++++- dlls/msacm32/wineacm.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index aad071e8ad..7d324a8b27 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -737,12 +737,17 @@ static PWINE_ACMLOCALDRIVER MSACM_pLastACMLocalDriver; static PWINE_ACMLOCALDRIVER MSACM_UnregisterLocalDriver(PWINE_ACMLOCALDRIVER paldrv) { PWINE_ACMLOCALDRIVER pNextACMLocalDriver; + LONG ref; if (paldrv->pACMInstList) { ERR("local driver instances still present after closing all drivers - memory leak\n"); return NULL; } + ref = InterlockedDecrement(&paldrv->ref); + if (ref) + return paldrv; + if (paldrv == MSACM_pFirstACMLocalDriver) MSACM_pFirstACMLocalDriver = paldrv->pNextACMLocalDrv; if (paldrv == MSACM_pLastACMLocalDriver) @@ -883,7 +888,11 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri /* look up previous instance of local driver module */ for (paldrv = MSACM_pFirstACMLocalDriver; paldrv; paldrv = paldrv->pNextACMLocalDrv) { - if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) return paldrv; + if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) + { + InterlockedIncrement(&paldrv->ref); + return paldrv; + } } paldrv = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMLOCALDRIVER)); @@ -892,6 +901,7 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri paldrv->hModule = hModule; paldrv->lpDrvProc = lpDriverProc; paldrv->pACMInstList = NULL; + paldrv->ref = 1; paldrv->pNextACMLocalDrv = NULL; paldrv->pPrevACMLocalDrv = MSACM_pLastACMLocalDriver; diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h index 406e01bf21..98d1ab5a2c 100644 --- a/dlls/msacm32/wineacm.h +++ b/dlls/msacm32/wineacm.h @@ -52,6 +52,7 @@ typedef struct _WINE_ACMLOCALDRIVER PWINE_ACMLOCALDRIVERINST pACMInstList; PWINE_ACMLOCALDRIVER pNextACMLocalDrv; PWINE_ACMLOCALDRIVER pPrevACMLocalDrv; + LONG ref; } WINE_ACMLOCALDRIVER; typedef struct _WINE_ACMLOCALDRIVERINST -- 2.19.2

3 3

[PATCH v2] dsound: Trace ref in a consistent way
by Alistair Leslie-Hughes 11 Jan '19

11 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/buffer.c | 16 ++++++++-------- dlls/dsound/capture.c | 10 +++++----- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/primary.c | 4 ++-- dlls/dsound/propset.c | 4 ++-- dlls/dsound/sound3d.c | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index cb7ff78..5262628 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -60,7 +60,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -344,7 +344,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_AddRef(IDirectSoundBuffer8 *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -361,7 +361,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) ref = capped_refcount_dec(&This->ref); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now: %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -369,7 +369,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -1237,7 +1237,7 @@ static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&This->refiks); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1254,7 +1254,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) ref = capped_refcount_dec(&This->refiks); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now: %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -1262,7 +1262,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index c849624..8fc2749 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -137,7 +137,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -150,7 +150,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -263,7 +263,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_AddRef(IDirectSoundCaptureBuff IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -276,7 +276,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_Release(IDirectSoundCaptureBuf IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -851,7 +851,7 @@ static ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) { ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref + 1); + TRACE("(%p) ref %d\n", device, ref); if (!ref) { TRACE("deleting object\n"); diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 71ede7d..2fbb3ce 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -189,7 +189,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) { ULONG ref = InterlockedIncrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref - 1); + TRACE("(%p) ref %d\n", device, ref); return ref; } @@ -197,7 +197,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) { HRESULT hr; ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref was %u\n", device, ref + 1); + TRACE("(%p) ref %d\n", device, ref); if (!ref) { int i; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f74db2f..a30fc5e 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -675,7 +675,7 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer8 *iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); return ref; @@ -704,7 +704,7 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer8 *iface) if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) primary ref is now %d\n", This, ref); + TRACE("(%p) primary ref %d\n", This, ref); return ref; } diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 0272ac0..92aae8f 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -81,7 +81,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -89,7 +89,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 118bb60..27fc416 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -396,7 +396,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(IDirectSound3DBuffer *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -409,7 +409,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -744,7 +744,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *if IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -761,7 +761,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(IDirectSound3DListener *i if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } -- 1.9.1

2 1

[PATCH v1 1/2] kernel32: Fix MoveFileWithProgressW from closing same handle twice
by Jon Doron 11 Jan '19

11 Jan '19

Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 41f0d34aa4..554f96a2b1 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1392,6 +1392,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } NtClose( dest_handle ); + dest_handle = NULL; } else if (status != STATUS_OBJECT_NAME_NOT_FOUND) { -- 2.19.2

1 1

[PATCH 6/6] d3d9/tests: Add test for clearing surfaces with different sizes.
by Józef Kucia 10 Jan '19

10 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 107 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b4f512ed0aff..9a62f873dce3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -239,10 +239,10 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) #define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color) { + D3DCOLOR color = 0xdeadbeef; struct surface_readback rb; D3DSURFACE_DESC desc; unsigned int x, y; - D3DCOLOR color; HRESULT hr; hr = IDirect3DSurface9_GetDesc(rt, &desc); @@ -261,7 +261,7 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR e break; } release_surface_readback(&rb); - ok_(__FILE__, line)(color == 0x000000ff, "Got unexpected color 0x%08x.\n", color); + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -1349,6 +1349,108 @@ done: DestroyWindow(window); } +static void test_clear_different_size_surfaces(void) +{ + IDirect3DSurface9 *ds, *rt, *rt2; + IDirect3DDevice9 *device; + D3DFORMAT ds_format; + D3DLOCKED_RECT lr; + unsigned int x, y; + D3DVIEWPORT9 vp; + IDirect3D9 *d3d; + D3DCAPS9 caps; + WORD *depth; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 1, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 2, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt2, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + + if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) + { + ds_format = D3DFMT_D16_LOCKABLE; + } + else + { + ds_format = D3DFMT_D24S8; + } + + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 4, 4, ds_format, + D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(hr == D3D_OK, "Failed to create depth surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(hr == D3D_OK, "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + if (caps.NumSimultaneousRTs >= 2) + { + hr = IDirect3DDevice9_SetRenderTarget(device, 1, rt2); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + } + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 640; + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.5f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + check_rt_color(rt, 0x00ff0000); + + if (caps.NumSimultaneousRTs >= 2) + check_rt_color(rt2, 0x00ff0000); + + if (ds_format == D3DFMT_D16_LOCKABLE) + { + hr = IDirect3DSurface9_LockRect(ds, &lr, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock rect, hr %#x.\n", hr); + for (y = 0; y < 4; ++y) + { + depth = (WORD *)((BYTE *)lr.pBits + y * lr.Pitch); + for (x = 0; x < 4; ++x) + { + ok(abs(depth[x] - 0x7fff) <= 2, "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); + } + } + hr = IDirect3DSurface9_UnlockRect(ds); + ok(hr == D3D_OK, "Failed to unlock rect, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + } + else + { + skip("D3DFMT_D16_LOCKABLE is not supported.\n"); + } + + IDirect3DSurface9_Release(rt); + IDirect3DSurface9_Release(rt2); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void color_fill_test(void) { IDirect3DSurface9 *surface; @@ -24465,6 +24567,7 @@ START_TEST(visual) lighting_test(); test_specular_lighting(); clear_test(); + test_clear_different_size_surfaces(); color_fill_test(); fog_test(); test_cube_wrap(); -- 2.19.2

2 1

[PATCH 5/6] wined3d: Do not limit draw rect to intersection of all render target views.
by Józef Kucia 10 Jan '19

10 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c67cc6ce3f0f..7471d24e7ee7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -605,7 +605,6 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; unsigned int rt_count, i; - RECT view_rect; rt_count = flags & WINED3DCLEAR_TARGET ? cs->device->adapter->d3d_info.limits.max_rt_count : 0; @@ -627,17 +626,11 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * for (i = 0; i < rt_count; ++i) { if ((view = state->fb->render_targets[i])) - { - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); wined3d_resource_acquire(view->resource); - } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { view = state->fb->depth_stencil; - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); wined3d_resource_acquire(view->resource); } -- 2.19.2

2 1

[PATCH 4/6] wined3d: Limit surface_cpu_blt_colour_fill() to dimensions of render target view.
by Józef Kucia 10 Jan '19

10 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5dbac1c6aec9..1b6e7a5a0654 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2970,8 +2970,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; - w = box->right - box->left; - h = box->bottom - box->top; + w = min(box->right, view->width) - box->left; + h = min(box->bottom, view->height) - box->top; texture = texture_from_resource(view->resource); map_binding = texture->resource.map_binding; -- 2.19.2

2 1

[PATCH 3/6] wined3d: Split clears for different size resources in ffp_blitter_clear().
by Józef Kucia 10 Jan '19

10 Jan '19

We cannot reliably clear attachments of different sizes using a single glClear() command. The OpenGL spec says: "If the attachment sizes are not all identical, the results of rendering are defined only within the largest area that can fit in all of the attachments. This area is defined as the intersection of rectangles having a lower left of (0, 0) and an upper right of (width, height) for each attachment. Contents of attachments outside this area are undefined after execution of a rendering command (as defined in section 2.4)." Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 61 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a36d010e7930..5dbac1c6aec9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2052,8 +2052,12 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { + BOOL have_previous_rect = FALSE, have_identical_size = TRUE; struct wined3d_rendertarget_view *view; + struct wined3d_fb_state tmp_fb; + unsigned int next_rt_count = 0; struct wined3d_blitter *next; + RECT previous_rect, rect; DWORD next_flags = 0; unsigned int i; @@ -2071,6 +2075,8 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de { next_flags |= WINED3DCLEAR_TARGET; flags &= ~WINED3DCLEAR_TARGET; + next_rt_count = rt_count; + rt_count = 0; break; } @@ -2089,11 +2095,60 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } if (flags) - device_clear_render_targets(device, flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, - clear_rects, draw_rect, flags, colour, depth, stencil); + { + for (i = 0; i < rt_count; ++i) + { + if (!(view = fb->render_targets[i])) + continue; + + SetRect(&rect, 0, 0, view->width, view->height); + IntersectRect(&rect, draw_rect, &rect); + if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + have_identical_size = FALSE; + previous_rect = rect; + have_previous_rect = TRUE; + } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + view = fb->depth_stencil; + + SetRect(&rect, 0, 0, view->width, view->height); + IntersectRect(&rect, draw_rect, &rect); + if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + have_identical_size = FALSE; + previous_rect = rect; + have_previous_rect = TRUE; + } + + if (have_identical_size) + { + device_clear_render_targets(device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); + } + else + { + for (i = 0; i < rt_count; ++i) + { + if (!(view = fb->render_targets[i])) + continue; + + tmp_fb.render_targets[0] = view; + tmp_fb.depth_stencil = NULL; + device_clear_render_targets(device, 1, &tmp_fb, rect_count, + clear_rects, draw_rect, WINED3DCLEAR_TARGET, colour, depth, stencil); + } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + tmp_fb.render_targets[0] = NULL; + tmp_fb.depth_stencil = fb->depth_stencil; + device_clear_render_targets(device, 0, &tmp_fb, rect_count, + clear_rects, draw_rect, flags & ~WINED3DCLEAR_TARGET, colour, depth, stencil); + } + } + } if (next_flags && (next = blitter->next)) - next->ops->blitter_clear(next, device, next_flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, + next->ops->blitter_clear(next, device, next_rt_count, fb, rect_count, clear_rects, draw_rect, next_flags, colour, depth, stencil); } -- 2.19.2

2 1

[PATCH 2/6] wined3d: Use accurate rt_count in ffp_blitter_clear().
by Józef Kucia 10 Jan '19

10 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 85f94899cd60..a36d010e7930 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2089,11 +2089,11 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } if (flags) - device_clear_render_targets(device, rt_count, fb, rect_count, + device_clear_render_targets(device, flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, clear_rects, draw_rect, flags, colour, depth, stencil); if (next_flags && (next = blitter->next)) - next->ops->blitter_clear(next, device, rt_count, fb, rect_count, + next->ops->blitter_clear(next, device, next_flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, clear_rects, draw_rect, next_flags, colour, depth, stencil); } -- 2.19.2

2 1

[PATCH 1/6] wined3d: Sanitise clear flags passed to blitters.
by Józef Kucia 10 Jan '19

10 Jan '19

In order to not trigger "if (flags)" conditions in ffp_blitter_clear() unnecessarily. Also, avoids passing WINED3DCLEAR_SYNCHRONOUS, which is handled at the level of command stream. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index aa8eef7a2e01..c67cc6ce3f0f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -612,7 +612,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; - op->flags = flags; + op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); op->rt_count = rt_count; op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); @@ -655,7 +655,7 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; - op->flags = flags; + op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); if (flags & WINED3DCLEAR_TARGET) { op->rt_count = 1; -- 2.19.2

2 1

[PATCH 3/3] windowscodecs: Simplify the buffer size check in copy_pixels() helper.
by Dmitry Timoshkov 10 Jan '19

10 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 7650c755ba..78281519b8 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -82,7 +82,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if (dststride < bytesperrow) return E_INVALIDARG; - if ((dststride * (rc->Height-1)) + ((rc->Width * bpp) + 7)/8 > dstbuffersize) + if ((dststride * (rc->Height-1)) + bytesperrow > dstbuffersize) return E_INVALIDARG; /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */ -- 2.20.1

2 1

[PATCH] windowscodecs/tests: Fix typos in TIFF test data.
by Dmitry Timoshkov 10 Jan '19

10 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 8da843bdcc..c15e4985e6 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -220,7 +220,7 @@ static struct tiff_resolution_image_data { 0x11, 0x22, 0x33, 0 } }; -static const struct +static const struct tiff_24bpp_data { USHORT byte_order; USHORT version; @@ -247,12 +247,12 @@ static const struct { 0x102, IFD_SHORT, 1, 8 }, /* BITSPERSAMPLE */ { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ - { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_1bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_24bpp_data, pixel_data) }, /* STRIPOFFSETS */ { 0x115, IFD_SHORT, 1, 3 }, /* SAMPLESPERPIXEL */ { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ - { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ - { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* XRESOLUTION */ - { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* YRESOLUTION */ + { 0x117, IFD_LONG, 1, 3 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_24bpp_data, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_24bpp_data, res) }, /* YRESOLUTION */ { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ }, 0, -- 2.20.1

2 1

10 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COPYING b/COPYING index 32417ceba701..4bb951fc423f 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright 2016-2018 the Vkd3d project authors (see the file AUTHORS for a +Copyright 2016-2019 the Vkd3d project authors (see the file AUTHORS for a complete list) Vkd3d is free software; you can redistribute it and/or modify it under -- 2.19.2

2 1

[PATCH vkd3d v2 3/3] tests: Add multithreaded private data test.
by Józef Kucia 10 Jan '19

10 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b8563b32e91e..f34b82c855d7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2832,6 +2832,159 @@ static void test_private_data(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +struct private_data +{ + ID3D12Object *object; + GUID guid; + unsigned int value; +}; + +static void private_data_thread_main(void *untyped_data) +{ + struct private_data *data = untyped_data; + unsigned int i; + HRESULT hr; + + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, 0, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +struct private_data_interface +{ + ID3D12Object *object; + GUID guid; + IUnknown *iface; +}; + +static void private_data_interface_thread_main(void *untyped_data) +{ + struct private_data_interface *data = untyped_data; + unsigned int i; + HRESULT hr; + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +static void test_multithread_private_data(void) +{ + static const GUID guid = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0x00}}; + struct private_data_interface private_data_interface[4]; + HANDLE private_data_interface_thread[4]; + struct private_data private_data[4]; + ID3D12RootSignature *root_signature; + HANDLE private_data_thread[4]; + IUnknown *test_object, *unk; + ID3D12Device *device; + ID3D12Object *object; + unsigned int value; + unsigned int size; + unsigned int id; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + root_signature = create_empty_root_signature(device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + hr = ID3D12RootSignature_QueryInterface(root_signature, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12RootSignature_Release(root_signature); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&test_object); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0, id = 1; i < ARRAY_SIZE(private_data_interface); ++i, ++id) + { + private_data_interface[i].object = object; + private_data_interface[i].guid = guid; + private_data_interface[i].guid.Data4[7] = id; + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&private_data_interface[i].iface); + ok(hr == S_OK, "Failed to create fence %u, hr %#x.\n", i, hr); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i, ++id) + { + private_data[i].object = object; + private_data[i].guid = guid; + private_data[i].guid.Data4[7] = id; + private_data[i].value = id; + } + + for (i = 0; i < 4; ++i) + { + private_data_interface_thread[i] = create_thread(private_data_interface_thread_main, &private_data_interface[i]); + private_data_thread[i] = create_thread(private_data_thread_main, &private_data[i]); + } + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < 4; ++i) + { + ok(join_thread(private_data_interface_thread[i]), "Failed to join thread %u.\n", i); + ok(join_thread(private_data_thread[i]), "Failed to join thread %u.\n", i); + } + + for (i = 0; i < ARRAY_SIZE(private_data_interface); ++i) + { + size = sizeof(unk); + hr = ID3D12Object_GetPrivateData(object, &private_data_interface[i].guid, &size, &unk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(unk == private_data_interface[i].iface, "Got %p, expected %p.\n", unk, private_data_interface[i].iface); + IUnknown_Release(unk); + refcount = IUnknown_Release(private_data_interface[i].iface); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i) + { + size = sizeof(value); + hr = ID3D12Object_GetPrivateData(object, &private_data[i].guid, &size, &value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(value == private_data[i].value, "Got %u, expected %u.\n", value, private_data[i].value); + } + + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IUnknown_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Object_Release(object); + ok(!refcount, "Object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_reset_command_allocator(void) { ID3D12CommandAllocator *command_allocator, *command_allocator2; @@ -22327,6 +22480,7 @@ START_TEST(d3d12) run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); run_test(test_private_data); + run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); run_test(test_gpu_signal_fence); -- 2.19.2

3 2

[PATCH vkd3d v2 2/3] vkd3d: Protect private data with mutex.
by Józef Kucia 10 Jan '19

10 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Fix memory leak in d3d12_command_signature_create(). --- libs/vkd3d/command.c | 38 ++++++++++++++++++++++------ libs/vkd3d/device.c | 9 ++++--- libs/vkd3d/resource.c | 51 +++++++++++++++++++++++++++++++------- libs/vkd3d/state.c | 20 ++++++++++++--- libs/vkd3d/utils.c | 50 ++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 21 ++++++++++++---- 6 files changed, 156 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4bf11d4b9997..ce4af4e6a6fd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -578,6 +578,7 @@ static const struct ID3D12FenceVtbl d3d12_fence_vtbl = static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { + HRESULT hr; int rc; fence->ID3D12Fence_iface.lpVtbl = &d3d12_fence_vtbl; @@ -598,7 +599,11 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->events_size = 0; fence->event_count = 0; - vkd3d_private_store_init(&fence->private_store); + if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) + { + pthread_mutex_destroy(&fence->mutex); + return hr; + } fence->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1182,6 +1187,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo VkCommandPoolCreateInfo command_pool_info; struct vkd3d_queue *queue; VkResult vr; + HRESULT hr; + + if (FAILED(hr = vkd3d_private_store_init(&allocator->private_store))) + return hr; if (!(queue = d3d12_device_get_vkd3d_queue(device, type))) queue = device->direct_queue; @@ -1201,6 +1210,7 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo &allocator->vk_command_pool))) < 0) { WARN("Failed to create Vulkan command pool, vr %d.\n", vr); + vkd3d_private_store_destroy(&allocator->private_store); return hresult_from_vk_result(vr); } @@ -1240,8 +1250,6 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->current_command_list = NULL; - vkd3d_private_store_init(&allocator->private_store); - allocator->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -4287,17 +4295,24 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->refcount = 1; list->type = type; + + if (FAILED(hr = vkd3d_private_store_init(&list->private_store))) + return hr; + list->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); - vkd3d_private_store_init(&list->private_store); - list->allocator = allocator; if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) + { d3d12_command_list_reset_state(list, initial_pipeline_state); + } else + { + vkd3d_private_store_destroy(&list->private_store); ID3D12Device_Release(&device->ID3D12Device_iface); + } return hr; } @@ -4696,6 +4711,8 @@ static const struct ID3D12CommandQueueVtbl d3d12_command_queue_vtbl = static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, struct d3d12_device *device, const D3D12_COMMAND_QUEUE_DESC *desc) { + HRESULT hr; + queue->ID3D12CommandQueue_iface.lpVtbl = &d3d12_command_queue_vtbl; queue->refcount = 1; @@ -4711,7 +4728,8 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, if (desc->Flags) FIXME("Ignoring flags %#x.\n", desc->Flags); - vkd3d_private_store_init(&queue->private_store); + if (FAILED(hr = vkd3d_private_store_init(&queue->private_store))) + return hr; queue->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -4899,6 +4917,7 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ { struct d3d12_command_signature *object; unsigned int i; + HRESULT hr; for (i = 0; i < desc->NumArgumentDescs; ++i) { @@ -4934,7 +4953,12 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ memcpy((void *)object->desc.pArgumentDescs, desc->pArgumentDescs, desc->NumArgumentDescs * sizeof(*desc->pArgumentDescs)); - vkd3d_private_store_init(&object->private_store); + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free((void *)object->desc.pArgumentDescs); + vkd3d_free(object); + return hr; + } object->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7a7f4aaa143c..9b09f66b7251 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2526,18 +2526,21 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = d3d12_device_init_pipeline_cache(device))) goto out_free_vk_resources; - if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + if (FAILED(hr = vkd3d_private_store_init(&device->private_store))) goto out_free_pipeline_cache; + if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + goto out_free_private_store; + vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); - vkd3d_private_store_init(&device->private_store); - return S_OK; +out_free_private_store: + vkd3d_private_store_destroy(&device->private_store); out_free_pipeline_cache: d3d12_device_destroy_pipeline_cache(device); out_free_vk_resources: diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ffce926e476a..5b4110886299 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -379,15 +379,20 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hresult_from_errno(rc); } + if (FAILED(hr = vkd3d_private_store_init(&heap->private_store))) + { + pthread_mutex_destroy(&heap->mutex); + return hr; + } + if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, heap->desc.Flags, &memory_requirements, &heap->vk_memory, &heap->vk_memory_type))) { + vkd3d_private_store_destroy(&heap->private_store); pthread_mutex_destroy(&heap->mutex); return hr; } - vkd3d_private_store_init(&heap->private_store); - heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1179,7 +1184,11 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->heap = NULL; resource->heap_offset = 0; - vkd3d_private_store_init(&resource->private_store); + if (FAILED(hr = vkd3d_private_store_init(&resource->private_store))) + { + d3d12_resource_destroy(resource, device); + return hr; + } resource->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1325,6 +1334,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, { struct d3d12_device *d3d12_device = unsafe_impl_from_ID3D12Device(device); struct d3d12_resource *object; + HRESULT hr; TRACE("device %p, create_info %p, resource %p.\n", device, create_info, resource); @@ -1357,9 +1367,15 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->present_state = create_info->present_state; else object->present_state = D3D12_RESOURCE_STATE_COMMON; + + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free(object); + return hr; + } + object->device = d3d12_device; ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface); - vkd3d_private_store_init(&object->private_store); TRACE("Created resource %p.\n", object); @@ -2526,18 +2542,23 @@ static const struct ID3D12DescriptorHeapVtbl d3d12_descriptor_heap_vtbl = d3d12_descriptor_heap_GetGPUDescriptorHandleForHeapStart, }; -static void d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descriptor_heap, +static HRESULT d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descriptor_heap, struct d3d12_device *device, const D3D12_DESCRIPTOR_HEAP_DESC *desc) { + HRESULT hr; + descriptor_heap->ID3D12DescriptorHeap_iface.lpVtbl = &d3d12_descriptor_heap_vtbl; descriptor_heap->refcount = 1; descriptor_heap->desc = *desc; - vkd3d_private_store_init(&descriptor_heap->private_store); + if (FAILED(hr = vkd3d_private_store_init(&descriptor_heap->private_store))) + return hr; descriptor_heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); + + return S_OK; } HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, @@ -2545,6 +2566,7 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, { size_t max_descriptor_count, descriptor_size; struct d3d12_descriptor_heap *object; + HRESULT hr; if (!(descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, desc->Type))) { @@ -2570,7 +2592,12 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, descriptors[descriptor_size * desc->NumDescriptors])))) return E_OUTOFMEMORY; - d3d12_descriptor_heap_init(object, device, desc); + if (FAILED(hr = d3d12_descriptor_heap_init(object, device, desc))) + { + vkd3d_free(object); + return hr; + } + memset(object->descriptors, 0, descriptor_size * desc->NumDescriptors); TRACE("Created descriptor heap %p.\n", object); @@ -2722,6 +2749,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H VkQueryPoolCreateInfo pool_info; unsigned int element_count; VkResult vr; + HRESULT hr; element_count = DIV_ROUND_UP(desc->Count, sizeof(*object->availability_mask) * CHAR_BIT); if (!(object = vkd3d_malloc(offsetof(struct d3d12_query_heap, availability_mask[element_count])))) @@ -2775,15 +2803,20 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H return E_INVALIDARG; } + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free(object); + return hr; + } + if ((vr = VK_CALL(vkCreateQueryPool(device->vk_device, &pool_info, NULL, &object->vk_query_pool))) < 0) { WARN("Failed to create Vulkan query pool, vr %d.\n", vr); + vkd3d_private_store_destroy(&object->private_store); vkd3d_free(object); return hresult_from_vk_result(vr); } - vkd3d_private_store_init(&object->private_store); - ID3D12Device_AddRef(&device->ID3D12Device_iface); TRACE("Created query heap %p.\n", object); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ee91c725f75d..771ef241738a 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -999,7 +999,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa &root_signature->vk_pipeline_layout))) goto fail; - vkd3d_private_store_init(&root_signature->private_store); + if (FAILED(hr = vkd3d_private_store_init(&root_signature->private_store))) + goto fail; root_signature->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1516,7 +1517,16 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hresult_from_vk_result(vr); } - vkd3d_private_store_init(&state->private_store); + if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) + { + VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); + if (state->vk_set_layout) + VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); + if (state->vk_pipeline_layout) + VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); + vkd3d_free(state->uav_counters); + return hr; + } state->vk_bind_point = VK_PIPELINE_BIND_POINT_COMPUTE; state->device = device; @@ -2359,7 +2369,11 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s list_init(&graphics->compiled_pipelines); - vkd3d_private_store_init(&state->private_store); + if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) + { + VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL)); + goto fail; + } state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; state->device = device; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index ed4d77fea8cd..0144fdc1bd40 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -566,41 +566,79 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int *out_size, void *out) { const struct vkd3d_private_data *data; + HRESULT hr = S_OK; unsigned int size; + int rc; if (!out_size) return E_INVALIDARG; + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + if (!(data = vkd3d_private_store_get_private_data(store, tag))) { *out_size = 0; - return DXGI_ERROR_NOT_FOUND; + hr = DXGI_ERROR_NOT_FOUND; + goto done; } size = *out_size; *out_size = data->size; if (!out) - return S_OK; + goto done; if (size < data->size) - return DXGI_ERROR_MORE_DATA; + { + hr = DXGI_ERROR_MORE_DATA; + goto done; + } if (data->is_object) IUnknown_AddRef(data->u.object); memcpy(out, data->u.data, data->size); - return S_OK; +done: + pthread_mutex_unlock(&store->mutex); + return hr; } HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int data_size, const void *data) { - return vkd3d_private_store_set_private_data(store, tag, data, data_size, false); + HRESULT hr; + int rc; + + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + hr = vkd3d_private_store_set_private_data(store, tag, data, data_size, false); + + pthread_mutex_unlock(&store->mutex); + return hr; } HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, const GUID *tag, const IUnknown *object) { const void *data = object ? object : (void *)&object; - return vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); + HRESULT hr; + int rc; + + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + hr = vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); + + pthread_mutex_unlock(&store->mutex); + return hr; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c0c15b245902..9ffaa7920eb1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -76,6 +76,10 @@ struct vkd3d_vk_device_procs }; #undef DECLARE_VK_PFN +HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; +HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; +HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; + struct vkd3d_vulkan_info { /* instance extensions */ @@ -165,6 +169,8 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, struct vkd3d_private_store { + pthread_mutex_t mutex; + struct list content; }; @@ -190,9 +196,16 @@ static inline void vkd3d_private_data_destroy(struct vkd3d_private_data *data) vkd3d_free(data); } -static inline void vkd3d_private_store_init(struct vkd3d_private_store *store) +static inline HRESULT vkd3d_private_store_init(struct vkd3d_private_store *store) { + int rc; + list_init(&store->content); + + if ((rc = pthread_mutex_init(&store->mutex, NULL))) + ERR("Failed to initialize mutex, error %d.\n", rc); + + return hresult_from_errno(rc); } static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store) @@ -203,6 +216,8 @@ static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store { vkd3d_private_data_destroy(data); } + + pthread_mutex_destroy(&store->mutex); } HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, @@ -977,10 +992,6 @@ static inline void debug_ignored_node_mask(unsigned int mask) FIXME("Ignoring node mask 0x%08x.\n", mask); } -HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; -HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; -HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; - HRESULT vkd3d_load_vk_global_procs(struct vkd3d_vk_global_procs *procs, PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) DECLSPEC_HIDDEN; HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, -- 2.19.2

2 1

[PATCH] windowscodecs: Implement conversion to 32bppRGBA.
by Zhiyi Zhang 10 Jan '19

10 Jan '19

This fix Naruto Shippuden games crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/windowscodecs/converter.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6e7bb8e781..2444e3f3e6 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -55,6 +55,7 @@ enum pixelformat { format_32bppBGR, format_32bppBGRA, format_32bppPBGRA, + format_32bppRGBA, format_48bppRGB, format_64bppRGBA, format_32bppCMYK, @@ -907,6 +908,35 @@ static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICR } } +static HRESULT copypixels_to_32bppRGBA(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_32bppRGBA: + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + return S_OK; + default: + hr = copypixels_to_32bppBGRA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + + for (y=0; y<prc->Height; y++) + for (x=0; x<prc->Width; x++) + { + BYTE b = pbBuffer[cbStride*y+4*x]; + pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x+2]; + pbBuffer[cbStride*y+4*x+2] = b; + } + } + return hr; + } +} + static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { @@ -1237,6 +1267,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_32bppGrayFloat, &GUID_WICPixelFormat32bppGrayFloat, copypixels_to_32bppGrayFloat}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, + {format_32bppRGBA, &GUID_WICPixelFormat32bppRGBA, copypixels_to_32bppRGBA}, {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, copypixels_to_32bppPBGRA}, {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, -- 2.19.2

1 1

[PATCH] dsound: Trace ref in a consistent way
by Alistair Leslie-Hughes 10 Jan '19

10 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/buffer.c | 16 ++++++++-------- dlls/dsound/capture.c | 10 +++++----- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/primary.c | 4 ++-- dlls/dsound/propset.c | 4 ++-- dlls/dsound/sound3d.c | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index cb7ff78..7e4b57e 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -60,7 +60,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -344,7 +344,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_AddRef(IDirectSoundBuffer8 *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -361,7 +361,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) ref = capped_refcount_dec(&This->ref); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now: %d\n", This, ref); + TRACE("(%p) ref: %d\n", This, ref); return ref; } @@ -369,7 +369,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -1237,7 +1237,7 @@ static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&This->refiks); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1254,7 +1254,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) ref = capped_refcount_dec(&This->refiks); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now: %d\n", This, ref); + TRACE("(%p) ref: %d\n", This, ref); return ref; } @@ -1262,7 +1262,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index c849624..8fc2749 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -137,7 +137,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -150,7 +150,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -263,7 +263,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_AddRef(IDirectSoundCaptureBuff IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -276,7 +276,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_Release(IDirectSoundCaptureBuf IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -851,7 +851,7 @@ static ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) { ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref + 1); + TRACE("(%p) ref %d\n", device, ref); if (!ref) { TRACE("deleting object\n"); diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 71ede7d..2fbb3ce 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -189,7 +189,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) { ULONG ref = InterlockedIncrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref - 1); + TRACE("(%p) ref %d\n", device, ref); return ref; } @@ -197,7 +197,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) { HRESULT hr; ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref was %u\n", device, ref + 1); + TRACE("(%p) ref %d\n", device, ref); if (!ref) { int i; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f74db2f..a30fc5e 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -675,7 +675,7 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer8 *iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); return ref; @@ -704,7 +704,7 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer8 *iface) if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) primary ref is now %d\n", This, ref); + TRACE("(%p) primary ref %d\n", This, ref); return ref; } diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 0272ac0..92aae8f 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -81,7 +81,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -89,7 +89,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 118bb60..27fc416 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -396,7 +396,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(IDirectSound3DBuffer *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -409,7 +409,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -744,7 +744,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *if IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -761,7 +761,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(IDirectSound3DListener *i if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } -- 1.9.1

2 1

[PATCH] ntoskrnl.exe/tests: Zero-initialize test_input struct.
by Gijs Vermeulen 10 Jan '19

10 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46346 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5675818e28..387fe81633 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -156,6 +156,7 @@ static void main_test(void) pRtlDosPathNameToNtPathName_U( pathW, &pathU, NULL, NULL ); test_input = heap_alloc(sizeof(*test_input) + pathU.Length); + memset(test_input, 0, sizeof(*test_input) + pathU.Length); test_input->running_under_wine = !strcmp(winetest_platform, "wine"); test_input->winetest_report_success = winetest_report_success; test_input->winetest_debug = winetest_debug; -- 2.20.1

1 0

[PATCH] shell32: Rename SHELL32_714 to PathIsTemporaryW
by Alex Henrie 10 Jan '19

10 Jan '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This function is documented at http://undoc.airesoft.co.uk/shell32.dll/PathIsTemporaryW.php --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index bf8b5121d7..771f5e38d9 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -260,7 +260,7 @@ 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) 704 stdcall -noname GUIDFromStringW(wstr ptr) 709 stdcall SHGetSetFolderCustomSettings(ptr wstr long) - 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW + 714 stdcall -noname PathIsTemporaryW(wstr) 723 stdcall -noname SHCreateSessionKey(long ptr) 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall -noname RestartDialogEx(long wstr long long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 6ed0c9000f..b04a56e783 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1623,12 +1623,12 @@ BOOL WINAPI GUIDFromStringW(LPCWSTR str, LPGUID guid) } /************************************************************************* - * @ [SHELL32.714] + * PathIsTemporaryW [SHELL32.714] */ -DWORD WINAPI SHELL32_714(LPVOID x) +BOOL WINAPI PathIsTemporaryW(const WCHAR *path) { - FIXME("(%s)stub\n", debugstr_w(x)); - return 0; + FIXME("(%s) stub\n", debugstr_w(path)); + return FALSE; } typedef struct _PSXA -- 2.20.1

2 1

[PATCH] oledb32/tests: Add convert DBTYPE_DATE -> DBTYPE_DBTIMESTAMP test
by Alistair Leslie-Hughes 10 Jan '19

10 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/tests/convert.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 4a5c05e..e59c872 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3612,6 +3612,7 @@ static void test_converttotimestamp(void) '.','0','1','7','0','0','0','0','0','0',0}; DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; DBTIMESTAMP ts1 = {2013, 5, 14, 2, 4, 12, 17000000}; + DATE date; DBTIMESTAMP dst; DBSTATUS dst_status; DBLENGTH dst_len; @@ -3653,6 +3654,14 @@ static void test_converttotimestamp(void) ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 77, "got %ld\n", dst_len); + + dst_len = 0x1234; + date = 41408.086250; + hr = IDataConvert_DataConvert(convert, DBTYPE_DATE, DBTYPE_DBTIMESTAMP, 0, &dst_len, &date, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); } static void test_converttoiunknown(void) -- 1.9.1

1 0

Wine staging 4.0-rc5 release
by Alistair Leslie-Hughes 09 Jan '19

09 Jan '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 4.0-rc5 (830 patches are applied to wine vanilla) * Reviewed and upstreamed patches. No extra changes were made this week. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Steal 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 vkd3d 2/3] vkd3d: Protect private data with mutex.
by Józef Kucia 09 Jan '19

09 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 37 +++++++++++++++++++++------ libs/vkd3d/device.c | 9 ++++--- libs/vkd3d/resource.c | 51 +++++++++++++++++++++++++++++++------- libs/vkd3d/state.c | 20 ++++++++++++--- libs/vkd3d/utils.c | 50 ++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 21 ++++++++++++---- 6 files changed, 155 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4bf11d4b9997..986efb2d3b63 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -578,6 +578,7 @@ static const struct ID3D12FenceVtbl d3d12_fence_vtbl = static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { + HRESULT hr; int rc; fence->ID3D12Fence_iface.lpVtbl = &d3d12_fence_vtbl; @@ -598,7 +599,11 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->events_size = 0; fence->event_count = 0; - vkd3d_private_store_init(&fence->private_store); + if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) + { + pthread_mutex_destroy(&fence->mutex); + return hr; + } fence->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1182,6 +1187,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo VkCommandPoolCreateInfo command_pool_info; struct vkd3d_queue *queue; VkResult vr; + HRESULT hr; + + if (FAILED(hr = vkd3d_private_store_init(&allocator->private_store))) + return hr; if (!(queue = d3d12_device_get_vkd3d_queue(device, type))) queue = device->direct_queue; @@ -1201,6 +1210,7 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo &allocator->vk_command_pool))) < 0) { WARN("Failed to create Vulkan command pool, vr %d.\n", vr); + vkd3d_private_store_destroy(&allocator->private_store); return hresult_from_vk_result(vr); } @@ -1240,8 +1250,6 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->current_command_list = NULL; - vkd3d_private_store_init(&allocator->private_store); - allocator->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -4287,17 +4295,24 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->refcount = 1; list->type = type; + + if (FAILED(hr = vkd3d_private_store_init(&list->private_store))) + return hr; + list->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); - vkd3d_private_store_init(&list->private_store); - list->allocator = allocator; if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) + { d3d12_command_list_reset_state(list, initial_pipeline_state); + } else + { + vkd3d_private_store_destroy(&list->private_store); ID3D12Device_Release(&device->ID3D12Device_iface); + } return hr; } @@ -4696,6 +4711,8 @@ static const struct ID3D12CommandQueueVtbl d3d12_command_queue_vtbl = static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, struct d3d12_device *device, const D3D12_COMMAND_QUEUE_DESC *desc) { + HRESULT hr; + queue->ID3D12CommandQueue_iface.lpVtbl = &d3d12_command_queue_vtbl; queue->refcount = 1; @@ -4711,7 +4728,8 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, if (desc->Flags) FIXME("Ignoring flags %#x.\n", desc->Flags); - vkd3d_private_store_init(&queue->private_store); + if (FAILED(hr = vkd3d_private_store_init(&queue->private_store))) + return hr; queue->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -4899,6 +4917,7 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ { struct d3d12_command_signature *object; unsigned int i; + HRESULT hr; for (i = 0; i < desc->NumArgumentDescs; ++i) { @@ -4934,7 +4953,11 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ memcpy((void *)object->desc.pArgumentDescs, desc->pArgumentDescs, desc->NumArgumentDescs * sizeof(*desc->pArgumentDescs)); - vkd3d_private_store_init(&object->private_store); + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free(object); + return hr; + } object->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7a7f4aaa143c..9b09f66b7251 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2526,18 +2526,21 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = d3d12_device_init_pipeline_cache(device))) goto out_free_vk_resources; - if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + if (FAILED(hr = vkd3d_private_store_init(&device->private_store))) goto out_free_pipeline_cache; + if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + goto out_free_private_store; + vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); - vkd3d_private_store_init(&device->private_store); - return S_OK; +out_free_private_store: + vkd3d_private_store_destroy(&device->private_store); out_free_pipeline_cache: d3d12_device_destroy_pipeline_cache(device); out_free_vk_resources: diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ffce926e476a..5b4110886299 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -379,15 +379,20 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hresult_from_errno(rc); } + if (FAILED(hr = vkd3d_private_store_init(&heap->private_store))) + { + pthread_mutex_destroy(&heap->mutex); + return hr; + } + if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, heap->desc.Flags, &memory_requirements, &heap->vk_memory, &heap->vk_memory_type))) { + vkd3d_private_store_destroy(&heap->private_store); pthread_mutex_destroy(&heap->mutex); return hr; } - vkd3d_private_store_init(&heap->private_store); - heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1179,7 +1184,11 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->heap = NULL; resource->heap_offset = 0; - vkd3d_private_store_init(&resource->private_store); + if (FAILED(hr = vkd3d_private_store_init(&resource->private_store))) + { + d3d12_resource_destroy(resource, device); + return hr; + } resource->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1325,6 +1334,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, { struct d3d12_device *d3d12_device = unsafe_impl_from_ID3D12Device(device); struct d3d12_resource *object; + HRESULT hr; TRACE("device %p, create_info %p, resource %p.\n", device, create_info, resource); @@ -1357,9 +1367,15 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->present_state = create_info->present_state; else object->present_state = D3D12_RESOURCE_STATE_COMMON; + + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free(object); + return hr; + } + object->device = d3d12_device; ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface); - vkd3d_private_store_init(&object->private_store); TRACE("Created resource %p.\n", object); @@ -2526,18 +2542,23 @@ static const struct ID3D12DescriptorHeapVtbl d3d12_descriptor_heap_vtbl = d3d12_descriptor_heap_GetGPUDescriptorHandleForHeapStart, }; -static void d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descriptor_heap, +static HRESULT d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descriptor_heap, struct d3d12_device *device, const D3D12_DESCRIPTOR_HEAP_DESC *desc) { + HRESULT hr; + descriptor_heap->ID3D12DescriptorHeap_iface.lpVtbl = &d3d12_descriptor_heap_vtbl; descriptor_heap->refcount = 1; descriptor_heap->desc = *desc; - vkd3d_private_store_init(&descriptor_heap->private_store); + if (FAILED(hr = vkd3d_private_store_init(&descriptor_heap->private_store))) + return hr; descriptor_heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); + + return S_OK; } HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, @@ -2545,6 +2566,7 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, { size_t max_descriptor_count, descriptor_size; struct d3d12_descriptor_heap *object; + HRESULT hr; if (!(descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, desc->Type))) { @@ -2570,7 +2592,12 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, descriptors[descriptor_size * desc->NumDescriptors])))) return E_OUTOFMEMORY; - d3d12_descriptor_heap_init(object, device, desc); + if (FAILED(hr = d3d12_descriptor_heap_init(object, device, desc))) + { + vkd3d_free(object); + return hr; + } + memset(object->descriptors, 0, descriptor_size * desc->NumDescriptors); TRACE("Created descriptor heap %p.\n", object); @@ -2722,6 +2749,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H VkQueryPoolCreateInfo pool_info; unsigned int element_count; VkResult vr; + HRESULT hr; element_count = DIV_ROUND_UP(desc->Count, sizeof(*object->availability_mask) * CHAR_BIT); if (!(object = vkd3d_malloc(offsetof(struct d3d12_query_heap, availability_mask[element_count])))) @@ -2775,15 +2803,20 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H return E_INVALIDARG; } + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free(object); + return hr; + } + if ((vr = VK_CALL(vkCreateQueryPool(device->vk_device, &pool_info, NULL, &object->vk_query_pool))) < 0) { WARN("Failed to create Vulkan query pool, vr %d.\n", vr); + vkd3d_private_store_destroy(&object->private_store); vkd3d_free(object); return hresult_from_vk_result(vr); } - vkd3d_private_store_init(&object->private_store); - ID3D12Device_AddRef(&device->ID3D12Device_iface); TRACE("Created query heap %p.\n", object); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ee91c725f75d..771ef241738a 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -999,7 +999,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa &root_signature->vk_pipeline_layout))) goto fail; - vkd3d_private_store_init(&root_signature->private_store); + if (FAILED(hr = vkd3d_private_store_init(&root_signature->private_store))) + goto fail; root_signature->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1516,7 +1517,16 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hresult_from_vk_result(vr); } - vkd3d_private_store_init(&state->private_store); + if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) + { + VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); + if (state->vk_set_layout) + VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); + if (state->vk_pipeline_layout) + VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); + vkd3d_free(state->uav_counters); + return hr; + } state->vk_bind_point = VK_PIPELINE_BIND_POINT_COMPUTE; state->device = device; @@ -2359,7 +2369,11 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s list_init(&graphics->compiled_pipelines); - vkd3d_private_store_init(&state->private_store); + if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) + { + VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL)); + goto fail; + } state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; state->device = device; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index ed4d77fea8cd..0144fdc1bd40 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -566,41 +566,79 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int *out_size, void *out) { const struct vkd3d_private_data *data; + HRESULT hr = S_OK; unsigned int size; + int rc; if (!out_size) return E_INVALIDARG; + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + if (!(data = vkd3d_private_store_get_private_data(store, tag))) { *out_size = 0; - return DXGI_ERROR_NOT_FOUND; + hr = DXGI_ERROR_NOT_FOUND; + goto done; } size = *out_size; *out_size = data->size; if (!out) - return S_OK; + goto done; if (size < data->size) - return DXGI_ERROR_MORE_DATA; + { + hr = DXGI_ERROR_MORE_DATA; + goto done; + } if (data->is_object) IUnknown_AddRef(data->u.object); memcpy(out, data->u.data, data->size); - return S_OK; +done: + pthread_mutex_unlock(&store->mutex); + return hr; } HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int data_size, const void *data) { - return vkd3d_private_store_set_private_data(store, tag, data, data_size, false); + HRESULT hr; + int rc; + + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + hr = vkd3d_private_store_set_private_data(store, tag, data, data_size, false); + + pthread_mutex_unlock(&store->mutex); + return hr; } HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, const GUID *tag, const IUnknown *object) { const void *data = object ? object : (void *)&object; - return vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); + HRESULT hr; + int rc; + + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + hr = vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); + + pthread_mutex_unlock(&store->mutex); + return hr; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c0c15b245902..9ffaa7920eb1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -76,6 +76,10 @@ struct vkd3d_vk_device_procs }; #undef DECLARE_VK_PFN +HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; +HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; +HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; + struct vkd3d_vulkan_info { /* instance extensions */ @@ -165,6 +169,8 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, struct vkd3d_private_store { + pthread_mutex_t mutex; + struct list content; }; @@ -190,9 +196,16 @@ static inline void vkd3d_private_data_destroy(struct vkd3d_private_data *data) vkd3d_free(data); } -static inline void vkd3d_private_store_init(struct vkd3d_private_store *store) +static inline HRESULT vkd3d_private_store_init(struct vkd3d_private_store *store) { + int rc; + list_init(&store->content); + + if ((rc = pthread_mutex_init(&store->mutex, NULL))) + ERR("Failed to initialize mutex, error %d.\n", rc); + + return hresult_from_errno(rc); } static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store) @@ -203,6 +216,8 @@ static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store { vkd3d_private_data_destroy(data); } + + pthread_mutex_destroy(&store->mutex); } HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, @@ -977,10 +992,6 @@ static inline void debug_ignored_node_mask(unsigned int mask) FIXME("Ignoring node mask 0x%08x.\n", mask); } -HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; -HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; -HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; - HRESULT vkd3d_load_vk_global_procs(struct vkd3d_vk_global_procs *procs, PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) DECLSPEC_HIDDEN; HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, -- 2.19.2

2 2

[PATCH vkd3d 1/3] vkd3d: Handle NULL pointers in vkd3d_private_store_set_private_data().
by Józef Kucia 09 Jan '19

09 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 6841bfb180d2..ed4d77fea8cd 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -527,6 +527,17 @@ static HRESULT vkd3d_private_store_set_private_data(struct vkd3d_private_store * struct vkd3d_private_data *d, *old_data; const void *ptr = data; + if (!data) + { + if ((d = vkd3d_private_store_get_private_data(store, tag))) + { + vkd3d_private_data_destroy(d); + return S_OK; + } + + return S_FALSE; + } + if (is_object) { if (data_size != sizeof(IUnknown *)) @@ -584,25 +595,12 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int data_size, const void *data) { - struct vkd3d_private_data *d; - - if (!data) - { - if (!(d = vkd3d_private_store_get_private_data(store, tag))) - return S_FALSE; - - vkd3d_private_data_destroy(d); - return S_OK; - } - return vkd3d_private_store_set_private_data(store, tag, data, data_size, false); } HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, const GUID *tag, const IUnknown *object) { - if (!object) - return vkd3d_set_private_data(store, tag, sizeof(object), &object); - - return vkd3d_private_store_set_private_data(store, tag, object, sizeof(object), true); + const void *data = object ? object : (void *)&object; + return vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); } -- 2.19.2

2 1

[PATCH] d3dx9: Return correct comment length from get_instr_length().
by Matteo Bruni 09 Jan '19

09 Jan '19

From: Paul Gofman <gofmanp(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46435. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 8 +++++--- dlls/d3dx9_36/tests/shader.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index acbbf0718ad..e8ce3dd796c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2415,18 +2415,20 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { + DWORD opcode = *byte_code & 0xffff; unsigned int len = 0; + if (opcode == D3DSIO_COMMENT) + return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + if (major > 1) return (*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT; - switch (*byte_code & 0xffff) + switch (opcode) { case D3DSIO_END: ERR("Unexpected END token.\n"); return 0; - case D3DSIO_COMMENT: - return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; case D3DSIO_DEF: case D3DSIO_DEFI: return 5; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 74251d079da..a1a47ec357b 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6463,6 +6463,7 @@ static void test_shader_semantics(void) vs_3_0[] = { 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, 0x0200000f, 0x00000000, /* comment */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ -- 2.19.2

1 0

[PATCH] d3dcompiler_43: Define D3D_COMPILER_VERSION.
by Matteo Bruni 09 Jan '19

09 Jan '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Supersedes patch 156439. It turns out I tested the previous patch with d3dcompiler_43, which was the only one missing the define in the makefile... dlls/d3dcompiler_43/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index c31aa6c2a62..40f80150105 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,6 +1,7 @@ MODULE = d3dcompiler_43.dll IMPORTS = dxguid uuid EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asmparser.c \ -- 2.19.2

1 0

[PATCH] d3dx9: Return correct comment length from get_instr_length().
by Paul Gofman 09 Jan '19

09 Jan '19

For bug https://bugs.winehq.org/show_bug.cgi?id=46435. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- It is not a regression as this code did not change since December 2017. Still suggesting it now as the bug involves potential out of bounds (read) access and the fix looks pretty obvious. dlls/d3dx9_36/shader.c | 8 +++++--- dlls/d3dx9_36/tests/shader.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index acbbf0718a..e8ce3dd796 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2415,18 +2415,20 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { + DWORD opcode = *byte_code & 0xffff; unsigned int len = 0; + if (opcode == D3DSIO_COMMENT) + return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + if (major > 1) return (*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT; - switch (*byte_code & 0xffff) + switch (opcode) { case D3DSIO_END: ERR("Unexpected END token.\n"); return 0; - case D3DSIO_COMMENT: - return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; case D3DSIO_DEF: case D3DSIO_DEFI: return 5; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 1086e5e9d6..b67ffb209c 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6457,6 +6457,7 @@ static void test_shader_semantics(void) vs_3_0[] = { 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, 0x0200000f, 0x00000000, /* comment */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ -- 2.20.1

1 0

[PATCH 1/3] shell32/tests: Test that ShellView picks up external file changes
by Nigel Baillie 09 Jan '19

09 Jan '19

Signed-off-by: Nigel Baillie <metreckk(a)gmail.com> --- dlls/shell32/tests/shlview.c | 89 ++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f5d96c8d44..4d0cf641a7 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1502,6 +1502,94 @@ todo_wine IUnknown_Release(unk); } +static void do_events(void) +{ + MSG msg; + while(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)){ + TranslateMessage(&msg); + DispatchMessageA(&msg); + } +} + +static void test_external_change(void) +{ + IShellFolder *desktop, *folder; + FOLDERSETTINGS settings; + IShellView *view; + IShellBrowser *browser; + IFolderView *fv; + HWND hwnd_view; + LPITEMIDLIST pidl; + HRESULT hr; + HANDLE file; + INT count; + RECT r; + BOOLEAN b; + static const WCHAR test_folder_path[] = + {'C',':','\\','s','h','l','v','i','e','w','_','t','e','s','t',0}; + static const WCHAR test_file_path[] = + {'C',':','\\','s','h','l','v','i','e','w','_','t','e','s','t','\\','f','.','t','x','t',0}; + + /* create test folder, get a PIDL to it */ + b = CreateDirectoryW(test_folder_path, NULL); + ok(b, "failed to create test directory\n"); + + pidl = ILCreateFromPathW(test_folder_path); + ok(pidl != NULL, "couldn't get a PIDL to the test directory\n"); + + /* Get an IFolderView for the test folder */ + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got (0x%08x) when trying to grab desktop folder\n", hr); + + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder, (void**)&folder); + ok(hr == S_OK, "got (0x%08x) from BindToObject\n", hr); + + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IShellView, (void**)&view); + ok(hr == S_OK, "got (0x%08x) from CreateViewObject\n", hr); + + hr = IShellView_QueryInterface(view, &IID_IFolderView, (void**)&fv); + ok(hr == S_OK, "got (0x%08x) when trying to get an IFolderView interface\n", hr); + + /* create window */ + browser = IShellBrowserImpl_Construct(); + settings.ViewMode = FVM_ICON; + settings.fFlags = 0; + hwnd_view = (HWND)0xdeadbeef; + SetRect(&r, 0, 0, 100, 100); + hr = IShellView_CreateViewWindow(view, NULL, &settings, browser, &r, &hwnd_view); + ok(hr == S_OK, "got (0x%08x) when trying to create view window\n", hr); + ok(IsWindow(hwnd_view), "got %p instead of a valid HWND\n", hwnd_view); + + /* item count should be zero */ + IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); + ok(count == 0, "count should've been 0, but was %i\n", count); + + /* create test file */ + file = CreateFileW(test_file_path, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to create test file\n"); + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); /* we don't actually need the file open */ + + /* let the shlview figure out that it was created */ + Sleep(1000); + do_events(); + + /* it should now show the new file! */ + IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); + ok(count == 1, "count should've been 1, but was %i\n", count); + + /* cleanup */ + hr = IShellView_DestroyViewWindow(view); + DeleteFileW(test_file_path); + RemoveDirectoryW(test_folder_path); + IShellBrowser_Release(browser); + IFolderView_Release(fv); + IShellView_Release(view); + IShellFolder_Release(desktop); +} + START_TEST(shlview) { OleInitialize(NULL); @@ -1518,6 +1606,7 @@ START_TEST(shlview) test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx(); test_newmenu(); + test_external_change(); OleUninitialize(); } -- 2.19.1

4 11

[PATCH 3/5] wined3d: Simplify wined3d_cs_emit_clear() slightly.
by Józef Kucia 09 Jan '19

09 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5ea25e992aa5..aa8eef7a2e01 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -600,22 +600,20 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - unsigned int rt_count = cs->device->adapter->d3d_info.limits.max_rt_count; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; + unsigned int rt_count, i; RECT view_rect; - unsigned int i; + + rt_count = flags & WINED3DCLEAR_TARGET ? cs->device->adapter->d3d_info.limits.max_rt_count : 0; op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags; - if (flags & WINED3DCLEAR_TARGET) - op->rt_count = rt_count; - else - op->rt_count = 0; + op->rt_count = rt_count; op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) @@ -626,16 +624,13 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->rect_count = rect_count; memcpy(op->rects, rects, sizeof(*rects) * rect_count); - if (flags & WINED3DCLEAR_TARGET) + for (i = 0; i < rt_count; ++i) { - for (i = 0; i < rt_count; ++i) + if ((view = state->fb->render_targets[i])) { - if ((view = state->fb->render_targets[i])) - { - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); - wined3d_resource_acquire(view->resource); - } + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); + wined3d_resource_acquire(view->resource); } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) -- 2.19.2

2 1

[PATCH 2/5] ddraw/tests: Fix compilation on systems that don't support nameless unions.
by Józef Kucia 09 Jan '19

09 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 18 ++++++++-------- dlls/ddraw/tests/ddraw2.c | 22 ++++++++++---------- dlls/ddraw/tests/ddraw4.c | 44 +++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 44 +++++++++++++++++++-------------------- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9e562de5c44d..d36120426f92 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4368,7 +4368,7 @@ static void fill_surface(IDirectDrawSurface *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -9114,11 +9114,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -9184,7 +9184,7 @@ static void test_cross_device_blt(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_VIDEOMEMORY; - U5(surface_desc).dwBackBufferCount = 2; + surface_desc.dwBackBufferCount = 2; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -10610,7 +10610,7 @@ static void test_ck_operation(void) surface_desc.dwWidth = 4; surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; @@ -11266,10 +11266,10 @@ static void test_clear(void) /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; viewport_set_background(device, viewport, green); hr = IDirect3DViewport_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e4a866e23619..7cbfce056fdd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4977,7 +4977,7 @@ static void fill_surface(IDirectDrawSurface *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -10246,11 +10246,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -10316,7 +10316,7 @@ static void test_cross_device_blt(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_VIDEOMEMORY; - U5(surface_desc).dwBackBufferCount = 2; + surface_desc.dwBackBufferCount = 2; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -11965,7 +11965,7 @@ static void test_ck_operation(void) surface_desc.dwWidth = 4; surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; @@ -12688,10 +12688,10 @@ static void test_clear(void) /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; viewport_set_background(device, viewport, green); hr = IDirect3DViewport2_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); @@ -12993,7 +12993,7 @@ static void test_viewport(void) memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(ds, &surface_desc); - z_fmt = U4(surface_desc).ddpfPixelFormat; + z_fmt = surface_desc.ddpfPixelFormat; for (i = 0; i < ARRAY_SIZE(rt_sizes); ++i) { @@ -13010,7 +13010,7 @@ static void test_viewport(void) surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - U4(surface_desc).ddpfPixelFormat = z_fmt; + surface_desc.ddpfPixelFormat = z_fmt; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &ds, NULL); ok(SUCCEEDED(hr), "Failed to create depth buffer, hr %#x (i %u).\n", hr, i); hr = IDirectDrawSurface_AddAttachedSurface(rt, ds); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 92ca9f6eb4b1..9b47c2bd3ca9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6295,7 +6295,7 @@ static void fill_surface(IDirectDrawSurface4 *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -11714,11 +11714,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface4_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface4_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -11802,12 +11802,12 @@ static void test_cross_device_blt(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; - surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); - surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 16; - U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00007c00; - U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x000003e0; - U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000001f; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x0000001f; hr = IDirectDraw4_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -13695,10 +13695,10 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -13834,11 +13834,11 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; - U5(U4(surface_desc.ddpfPixelFormat)).dwRGBAlphaBitMask = 0xff000000; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + U5(U4(surface_desc).ddpfPixelFormat).dwRGBAlphaBitMask = 0xff000000; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &src, NULL); @@ -14807,10 +14807,10 @@ static void test_clear(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ccb22d538823..fbc27376a530 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6093,7 +6093,7 @@ static void fill_surface(IDirectDrawSurface7 *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -11624,11 +11624,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface7_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface7_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -11712,12 +11712,12 @@ static void test_cross_device_blt(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; - surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); - surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 16; - U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00007c00; - U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x000003e0; - U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000001f; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x0000001f; hr = IDirectDraw7_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -12952,10 +12952,10 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -13091,11 +13091,11 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; - U5(U4(surface_desc.ddpfPixelFormat)).dwRGBAlphaBitMask = 0xff000000; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + U5(U4(surface_desc).ddpfPixelFormat).dwRGBAlphaBitMask = 0xff000000; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src, NULL); @@ -14152,10 +14152,10 @@ static void test_clear(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); -- 2.19.2

3 2

[PATCH 1/5] ddraw/tests: Add tests for attaching depth buffers of different sizes.
by Józef Kucia 09 Jan '19

09 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 47 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 59d07b7d76fc..9e562de5c44d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4991,6 +4991,53 @@ static void test_surface_attachment(void) IDirectDrawSurface_Release(surface2); IDirectDrawSurface_Release(surface1); + /* Test depth surfaces of different sizes. */ + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(surface_desc.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(surface_desc.ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(surface4); + IDirectDrawSurface_Release(surface3); + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8b9b249a3a4e..e4a866e23619 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6015,6 +6015,53 @@ static void test_surface_attachment(void) IDirectDrawSurface_Release(surface2); IDirectDrawSurface_Release(surface1); + /* Test depth surfaces of different sizes. */ + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(surface_desc.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(surface_desc.ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface2_Release(surface4); + IDirectDrawSurface2_Release(surface3); + IDirectDrawSurface2_Release(surface2); + IDirectDrawSurface2_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1c4841891e40..92ca9f6eb4b1 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7327,6 +7327,53 @@ static void test_surface_attachment(void) IDirectDrawSurface4_Release(surface2); IDirectDrawSurface4_Release(surface1); + /* Test depth surfaces of different sizes. */ + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface4_Release(surface4); + IDirectDrawSurface4_Release(surface3); + IDirectDrawSurface4_Release(surface2); + IDirectDrawSurface4_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 9ab8644191f5..ccb22d538823 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7157,6 +7157,53 @@ static void test_surface_attachment(void) IDirectDrawSurface7_Release(surface2); IDirectDrawSurface7_Release(surface1); + /* Test depth surfaces of different sizes. */ + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(surface4); + IDirectDrawSurface7_Release(surface3); + IDirectDrawSurface7_Release(surface2); + IDirectDrawSurface7_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); -- 2.19.2

3 2

[PATCH 2/3] windowscodecs: Remove redundant checks from the TIFF decoder's CopyPixels implementation.
by Dmitry Timoshkov 09 Jan '19

09 Jan '19

Common copy_pixels() helper already performs theses checks, and the buffer size check is wrong. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 2 -- dlls/windowscodecs/tiffformat.c | 9 --------- 2 files changed, 11 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 8da843bdcc..ff9c4b9a74 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -598,11 +598,9 @@ static void test_tiff_24bpp(void) ok(hr == E_INVALIDARG, "CopyPixels(%u) should fail: %#x\n", stride, hr); else { -todo_wine_if(stride > 3) ok(hr == S_OK, "CopyPixels(%u) error %#x\n", stride, hr); for (i = 0; i < sizeof(data); i++) -todo_wine_if(stride > 3) ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); } } diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 93af5594a7..2d265e8694 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1080,7 +1080,6 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, WICRect rc; HRESULT hr=S_OK; BYTE *dst_tilepos; - UINT bytesperrow; WICRect rect; TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); @@ -1100,14 +1099,6 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, return E_INVALIDARG; } - bytesperrow = ((This->decode_info.bpp * prc->Width)+7)/8; - - if (cbStride < bytesperrow) - return E_INVALIDARG; - - if ((cbStride * prc->Height) > cbBufferSize) - return E_INVALIDARG; - min_tile_x = prc->X / This->decode_info.tile_width; min_tile_y = prc->Y / This->decode_info.tile_height; max_tile_x = (prc->X+prc->Width-1) / This->decode_info.tile_width; -- 2.20.1

2 2

[PATCH] d3dcompiler.h: Define D3DCOMPILER_DLL to d3dcompiler_47.dll.
by Jacek Caban 09 Jan '19

09 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is consistent with importlib. include/d3dcompiler.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

3 3

[PATCH 1/3] windowscodecs/tests: Add a test for copying pixels of a 24bpp TIFF format.
by Dmitry Timoshkov 09 Jan '19

09 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 103 ++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 36de69e467..8da843bdcc 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -219,6 +219,46 @@ static struct tiff_resolution_image_data { 72, 1 }, /* value will be filled with test data */ { 0x11, 0x22, 0x33, 0 } }; + +static const struct +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[13]; + ULONG next_IFD; + struct IFD_rational res; + BYTE pixel_data[3]; +} tiff_24bpp_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_1bpp_data, number_of_entries), + 13, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 1 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 8 }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_1bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 3 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* YRESOLUTION */ + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + }, + 0, + { 900, 3 }, + { 0x11, 0x22, 0x33 } +}; #include "poppack.h" static IWICImagingFactory *factory; @@ -509,6 +549,68 @@ static void test_tiff_resolution(void) } } +static void test_tiff_24bpp(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + UINT count, width, height, i, stride; + double dpi_x, dpi_y; + GUID format; + WICRect rc; + BYTE data[3]; + static const BYTE expected_data[] = { 0x33,0x22,0x11 }; + + decoder = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data)); + ok(decoder != NULL, "Failed to load TIFF image data\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(hr == S_OK, "GetFrameCount error %#x\n", hr); + ok(count == 1, "got %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %#x\n", hr); + ok(width == 1, "got %u\n", width); + ok(height == 1, "got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y); + ok(hr == S_OK, "GetResolution error %#x\n", hr); + ok(dpi_x == 300.0, "got %f\n", dpi_x); + ok(dpi_y == 300.0, "got %f\n", dpi_y); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat24bppBGR), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + for (stride = 0; stride <= 32; stride++) + { + memset(data, 0, sizeof(data)); + rc.X = 0; + rc.Y = 0; + rc.Width = 1; + rc.Height = 1; + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rc, stride, sizeof(data), data); + if (stride < 3) + ok(hr == E_INVALIDARG, "CopyPixels(%u) should fail: %#x\n", stride, hr); + else + { +todo_wine_if(stride > 3) + ok(hr == S_OK, "CopyPixels(%u) error %#x\n", stride, hr); + + for (i = 0; i < sizeof(data); i++) +todo_wine_if(stride > 3) + ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); + } + } + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(tiffformat) { HRESULT hr; @@ -524,6 +626,7 @@ START_TEST(tiffformat) test_QueryCapability(); test_tiff_8bpp_alpha(); test_tiff_resolution(); + test_tiff_24bpp(); IWICImagingFactory_Release(factory); CoUninitialize(); -- 2.20.1

2 1

[PATCH 1/5] user32/tests: Add test for 8 bit image stretch mode in CopyImage().
by Paul Gofman 09 Jan '19

09 Jan '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/cursoricon.c | 49 +++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index c598b232a0..f00d3f2a0c 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2755,17 +2755,19 @@ static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO unsigned int row, unsigned int column) { const BITMAPINFOHEADER *h = &bmi->bmiHeader; + unsigned int stride, shift, mask; const unsigned char *data; - unsigned int stride; RGBQUAD color; - ok(h->biBitCount == 1 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); + ok(h->biBitCount <= 8 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; data = bits + row * stride + column * h->biBitCount / 8; if (h->biBitCount >= 24) return RGB(data[2], data[1], data[0]); - color = bmi->bmiColors[!!(data[0] & (1u << (7 - (column % 8))))]; + shift = 8 - h->biBitCount - (column * h->biBitCount) % 8; + mask = ~(~0u << h->biBitCount); + color = bmi->bmiColors[(data[0] >> shift) & mask]; return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); } @@ -2783,6 +2785,18 @@ static void test_CopyImage_StretchMode(void) 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, }; + static const unsigned char test_bits_8[] = + { + 0x00, 0xff, 0x00, 0xff, + 0x00, 0x00, 0x00, 0x00, + 0xff, 0x55, 0x00, 0xff, + 0x00, 0xff, 0xff, 0x00, + }; + static const unsigned char expected_bits_8[] = + { + 0xff, 0xff, 0x00, 0x00, + 0x55, 0xff, 0x00, 0x00, + }; static const unsigned char test_bits_1[] = { 0x30, 0x0, 0x0, 0x0, @@ -2795,6 +2809,12 @@ static void test_CopyImage_StretchMode(void) 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, }; + static const RGBQUAD colors_bits_1[] = + { + {0, 0, 0}, + {0xff, 0xff, 0xff}, + }; + static RGBQUAD colors_bits_8[256]; static const struct { @@ -2802,19 +2822,25 @@ static void test_CopyImage_StretchMode(void) WORD bit_count; const unsigned char *test_bits, *expected_bits; size_t test_bits_size, result_bits_size; + const RGBQUAD *bmi_colors; + size_t bmi_colors_size; BOOL todo; } tests[] = { {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, - sizeof(test_bits_24), sizeof(expected_bits_24), TRUE}, + sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, TRUE}, {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, - sizeof(test_bits_1), sizeof(expected_bits_1), FALSE}, + sizeof(test_bits_1), sizeof(expected_bits_1), colors_bits_1, + sizeof(colors_bits_1), FALSE}, + {4, 4, 2, 2, 8, test_bits_8, expected_bits_8, + sizeof(test_bits_8), sizeof(expected_bits_8), colors_bits_8, + sizeof(colors_bits_8), TRUE}, }; HBITMAP bitmap, bitmap_copy; + unsigned int row, column, i; unsigned char *result_bits; - unsigned int row, column; unsigned int test_index; unsigned char *bits; BITMAPINFO *bmi; @@ -2825,14 +2851,19 @@ static void test_CopyImage_StretchMode(void) bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biCompression = BI_RGB; - bmi->bmiColors[1].rgbRed = 0xff; - bmi->bmiColors[1].rgbGreen = 0xff; - bmi->bmiColors[1].rgbBlue = 0xff; + + for (i = 0; i < 256; ++i) + colors_bits_8[i].rgbRed = colors_bits_8[i].rgbGreen = colors_bits_8[i].rgbBlue = i; hdc = GetDC(NULL); for (test_index = 0; test_index < ARRAY_SIZE(tests); ++test_index) { + if (tests[test_index].bmi_colors) + memcpy(bmi->bmiColors, tests[test_index].bmi_colors, tests[test_index].bmi_colors_size); + else + memset(bmi->bmiColors, 0, 256 * sizeof(RGBQUAD)); + bmi->bmiHeader.biWidth = tests[test_index].width; bmi->bmiHeader.biHeight = tests[test_index].height; bmi->bmiHeader.biBitCount = tests[test_index].bit_count; -- 2.20.1

3 7

[PATCH] po: Update German translation.
by Julian Rüger 09 Jan '19

09 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH vkd3d 3/3] tests: Add multithreaded private data test.
by Józef Kucia 09 Jan '19

09 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b8563b32e91e..f34b82c855d7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2832,6 +2832,159 @@ static void test_private_data(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +struct private_data +{ + ID3D12Object *object; + GUID guid; + unsigned int value; +}; + +static void private_data_thread_main(void *untyped_data) +{ + struct private_data *data = untyped_data; + unsigned int i; + HRESULT hr; + + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, 0, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +struct private_data_interface +{ + ID3D12Object *object; + GUID guid; + IUnknown *iface; +}; + +static void private_data_interface_thread_main(void *untyped_data) +{ + struct private_data_interface *data = untyped_data; + unsigned int i; + HRESULT hr; + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +static void test_multithread_private_data(void) +{ + static const GUID guid = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0x00}}; + struct private_data_interface private_data_interface[4]; + HANDLE private_data_interface_thread[4]; + struct private_data private_data[4]; + ID3D12RootSignature *root_signature; + HANDLE private_data_thread[4]; + IUnknown *test_object, *unk; + ID3D12Device *device; + ID3D12Object *object; + unsigned int value; + unsigned int size; + unsigned int id; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + root_signature = create_empty_root_signature(device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + hr = ID3D12RootSignature_QueryInterface(root_signature, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12RootSignature_Release(root_signature); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&test_object); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0, id = 1; i < ARRAY_SIZE(private_data_interface); ++i, ++id) + { + private_data_interface[i].object = object; + private_data_interface[i].guid = guid; + private_data_interface[i].guid.Data4[7] = id; + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&private_data_interface[i].iface); + ok(hr == S_OK, "Failed to create fence %u, hr %#x.\n", i, hr); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i, ++id) + { + private_data[i].object = object; + private_data[i].guid = guid; + private_data[i].guid.Data4[7] = id; + private_data[i].value = id; + } + + for (i = 0; i < 4; ++i) + { + private_data_interface_thread[i] = create_thread(private_data_interface_thread_main, &private_data_interface[i]); + private_data_thread[i] = create_thread(private_data_thread_main, &private_data[i]); + } + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < 4; ++i) + { + ok(join_thread(private_data_interface_thread[i]), "Failed to join thread %u.\n", i); + ok(join_thread(private_data_thread[i]), "Failed to join thread %u.\n", i); + } + + for (i = 0; i < ARRAY_SIZE(private_data_interface); ++i) + { + size = sizeof(unk); + hr = ID3D12Object_GetPrivateData(object, &private_data_interface[i].guid, &size, &unk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(unk == private_data_interface[i].iface, "Got %p, expected %p.\n", unk, private_data_interface[i].iface); + IUnknown_Release(unk); + refcount = IUnknown_Release(private_data_interface[i].iface); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i) + { + size = sizeof(value); + hr = ID3D12Object_GetPrivateData(object, &private_data[i].guid, &size, &value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(value == private_data[i].value, "Got %u, expected %u.\n", value, private_data[i].value); + } + + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IUnknown_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Object_Release(object); + ok(!refcount, "Object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_reset_command_allocator(void) { ID3D12CommandAllocator *command_allocator, *command_allocator2; @@ -22327,6 +22480,7 @@ START_TEST(d3d12) run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); run_test(test_private_data); + run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); run_test(test_gpu_signal_fence); -- 2.19.2

1 0

[PATCH v2] ntoskrnl.exe: fix handling relocations on page boundary
by Rafał H 09 Jan '19

09 Jan '19

Code is only used for non-page-aligned device drivers. Previously if relocation was happening on page boundary it crashed because only one page had changed protection in load_driver_module. Now code is copied from ntdll and changes protection for all module pages before actual relocation starts. Fixes running MTA: San Andreas game. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28254 Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 102 +++++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d8a87a6ad0..e130fac302 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -25,6 +25,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <assert.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -3295,6 +3296,84 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return ldr; } +/* convert PE image VirtualAddress to Real Address */ +static inline void *get_rva( HMODULE module, DWORD va ) +{ + return (void *)((char *)module + va); +} + +/* Copied from ntdll with checks for page alignment and characteristics removed */ +static NTSTATUS perform_relocations( void *module, SIZE_T len ) +{ + IMAGE_NT_HEADERS *nt; + char *base; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + INT_PTR delta; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + base = (char *)nt->OptionalHeader.ImageBase; + + assert( module != base ); + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + { + WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + if (!relocs->Size) return STATUS_SUCCESS; + if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; + + if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) + return STATUS_INVALID_IMAGE_FORMAT; + + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + + TRACE( "relocating from %p-%p to %p-%p\n", + base, base + len, module, (char *)module + len ); + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - base; + + while (rel < end - 1 && rel->SizeOfBlock) + { + if (rel->VirtualAddress >= len) + { + WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); + return STATUS_ACCESS_VIOLATION; + } + rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) return STATUS_INVALID_IMAGE_FORMAT; + } + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } + + return STATUS_SUCCESS; +} + /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { @@ -3318,28 +3397,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - DWORD old; - IMAGE_BASE_RELOCATION *rel, *end; - - if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) - { - TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); - end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); - while (rel < end && rel->SizeOfBlock) - { - void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); - rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), - (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); - if (!rel) goto error; - } - /* make sure we don't try again */ - size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; - VirtualProtect( nt, size, PAGE_READWRITE, &old ); - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, &old ); - } + perform_relocations(module, nt->OptionalHeader.SizeOfImage); } /* make sure imports are relocated too */ -- 2.17.1

1 0

[PATCH] testbot: There is no point unsetting $ENV.
by Francois Gouget 09 Jan '19

09 Jan '19

It is not a special environment variable or perl value and typically does not even exist. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 - testbot/bin/Janitor.pl | 1 - testbot/bin/LibvirtTool.pl | 2 -- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - testbot/bin/WineRunWineTest.pl | 1 - testbot/bin/WineSendLog.pl | 1 - testbot/bin/build/Build.pl | 1 - testbot/bin/build/Reconfig.pl | 1 - testbot/bin/build/WineReconfig.pl | 1 - testbot/bin/build/WineTest.pl | 1 - testbot/scripts/CheckWineTestBot.pl | 1 - 13 files changed, 14 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 79b25fac..9ffdf968 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -742,7 +742,6 @@ sub main() } $ENV{PATH} = "/usr/bin:/bin"; - delete $ENV{ENV}; $SIG{CHLD} = \&REAPER; $WineTestBot::Engine::Notify::RunningInEngine = 1; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 12084512..e7662852 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -77,7 +77,6 @@ sub Error(@) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; # Grab the command line options my ($Usage, $DryRun); diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index e6742f4c..a078fcbd 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -88,8 +88,6 @@ EOF # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; - # Grab the command line options my ($Usage, $Action, $VMKey); diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 68e6be4c..b1349f0d 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -73,7 +73,6 @@ sub Error(@) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9bb402a6..2c8acdd6 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -74,7 +74,6 @@ sub Error(@) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index fea8c03f..e6112fd8 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -104,7 +104,6 @@ sub TakeScreenshot($$) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 5ce1448e..8792be39 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -103,7 +103,6 @@ sub TakeScreenshot($$) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index a651c097..1d13454f 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -407,7 +407,6 @@ EOF # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index b50a25ca..894686da 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -115,7 +115,6 @@ sub BuildTestExecutables($$$) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my ($Usage, $PatchFile, $MissionStatement); while (@ARGV) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index b720788e..c43fbda3 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -111,7 +111,6 @@ sub UpdateWineBuilds($$) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $MissionStatement); while (@ARGV) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 77810958..4e03c314 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -143,7 +143,6 @@ sub UpdateWinePrefixes($) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $MissionStatement); while (@ARGV) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index b588b8d3..eb0012db 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -210,7 +210,6 @@ sub TestExe($$$) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my $Action = ""; my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index a0c0bda5..9c2e2911 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -39,7 +39,6 @@ use WineTestBot::Config; use WineTestBot::Engine::Notify; $ENV{PATH} = "/sbin:/usr/sbin:/usr/bin:/bin"; -delete $ENV{ENV}; my $rc = 0; if (! PingEngine()) -- 2.20.1

1 0

[PATCH] wininet/tests: Add some tests for GetUrlCacheConfigInfo.
by Dmitry Timoshkov 09 Jan '19

09 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/tests/Makefile.in | 2 +- dlls/wininet/tests/urlcache.c | 103 +++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in index cf1a86acd8..ae18bb72fa 100644 --- a/dlls/wininet/tests/Makefile.in +++ b/dlls/wininet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wininet.dll -IMPORTS = wininet crypt32 ws2_32 user32 advapi32 +IMPORTS = wininet crypt32 ws2_32 user32 advapi32 shell32 C_SRCS = \ ftp.c \ diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 3799500489..acd4ff247c 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -27,6 +30,7 @@ #include "winnls.h" #include "wininet.h" #include "winineti.h" +#include "shlobj.h" #include "wine/test.h" @@ -1100,6 +1104,104 @@ static void test_trailing_slash(void) DeleteFileA(filename); } +static void get_cache_path(DWORD flags, char path[MAX_PATH], char path_win8[MAX_PATH]) +{ + BOOL ret; + int folder = -1; + const char *suffix = ""; + const char *suffix_win8 = ""; + + switch (flags) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + folder = CSIDL_INTERNET_CACHE; + suffix = "\\Content.IE5\\"; + suffix_win8 = "\\IE\\"; + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + folder = CSIDL_COOKIES; + suffix = "\\"; + suffix_win8 = "\\"; + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + folder = CSIDL_HISTORY; + suffix = "\\History.IE5\\"; + suffix_win8 = "\\History.IE5\\"; + break; + + default: + ok(0, "unexpected flags %#x\n", flags); + break; + } + + ret = SHGetSpecialFolderPathA(0, path, folder, FALSE); + ok(ret, "SHGetSpecialFolderPath error %u\n", GetLastError()); + + strcpy(path_win8, path); + strcat(path_win8, suffix_win8); + + strcat(path, suffix); +} + +static void test_GetUrlCacheConfigInfo(void) +{ + INTERNET_CACHE_CONFIG_INFOA info; + struct + { + INTERNET_CACHE_CONFIG_INFOA *info; + DWORD dwStructSize; + DWORD flags; + BOOL ret; + DWORD error; + } td[] = + { +#if 0 /* crashes under Vista */ + { NULL, 0, 0, FALSE, ERROR_INVALID_PARAMETER }, +#endif + { &info, 0, 0, TRUE }, + { &info, sizeof(info) - 1, 0, TRUE }, + { &info, sizeof(info) + 1, 0, TRUE }, + { &info, 0, CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + }; + int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(td); i++) + { + if (td[i].info) + { + memset(&info, 0, sizeof(*td[i].info)); + info.dwStructSize = td[i].dwStructSize; + } + + SetLastError(0xdeadbeef); + ret = GetUrlCacheConfigInfoA(td[i].info, NULL, td[i].flags); +todo_wine + ok(ret == td[i].ret, "%d: expected %d, got %d\n", i, td[i].ret, ret); + if (!ret) +todo_wine + ok(GetLastError() == td[i].error, "%d: expected %u, got %u\n", i, td[i].error, GetLastError()); + else + { + char path[MAX_PATH], path_win8[MAX_PATH]; + + get_cache_path(td[i].flags, path, path_win8); + + ok(info.dwStructSize == td[i].dwStructSize, "got %u\n", info.dwStructSize); + ok(!lstrcmpA(info.u.s.CachePath, path) || !lstrcmpA(info.u.s.CachePath, path_win8), + "%d: expected %s or %s, got %s\n", i, path, path_win8, info.u.s.CachePath); + } + } +} + START_TEST(urlcache) { HMODULE hdll; @@ -1124,4 +1226,5 @@ START_TEST(urlcache) test_FindCloseUrlCache(); test_GetDiskInfoA(); test_trailing_slash(); + test_GetUrlCacheConfigInfo(); } -- 2.20.1

1 0

[PATCH] oledb32: Support Milliseconds when converting BSTR -> DBTIMESTAMP
by Alistair Leslie-Hughes 09 Jan '19

09 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 8 ++++---- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f18c756..9b909fd 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -527,6 +527,45 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->second = st.wSecond; d->fraction = st.wMilliseconds * 1000000; } + else + { + WCHAR *de = s; + DWORD len = SysStringLen(s); + + TRACE("String with Milliseconds: %s\n", debugstr_w(s)); + + VariantClear(&var); + + while (len && de[len] != '.') + { + len--; + } + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocStringLen(s, len); + if ((hr = VariantChangeType(&var, &var, 0, VT_DATE)) == S_OK) + { + SYSTEMTIME st; + + hr = (VariantTimeToSystemTime( V_DATE(&var), &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + d->hour = st.wHour; + d->minute = st.wMinute; + d->second = st.wSecond; + d->fraction = 0; + + VariantClear(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(de + (len+1)); + if(VariantChangeType(&var, &var, 0, VT_I4) == S_OK) + { + TRACE("Millseconds: %d\n", V_I4(&var)); + d->fraction = V_I4(&var); + } + } + } VariantClear(&var); } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 5dab9ff..4a5c05e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3641,10 +3641,10 @@ static void test_converttotimestamp(void) bstr = SysAllocString(strFullW); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); - todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); SysFreeString(bstr); V_VT(&var) = VT_NULL; -- 1.9.1

2 2

[PATCH v2 5/5] d3d9/tests: Add test for clearing surfaces with different sizes.
by Józef Kucia 08 Jan '19

08 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: * Use check_rt_color(). * Fix failures on testbot - use other depth stencil format when D16_LOCKABLE is not supported. --- dlls/d3d9/tests/visual.c | 107 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 51229f2b8268..00f15d3ef4c8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -214,10 +214,10 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) #define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color) { + D3DCOLOR color = 0xdeadbeef; struct surface_readback rb; D3DSURFACE_DESC desc; unsigned int x, y; - D3DCOLOR color; HRESULT hr; hr = IDirect3DSurface9_GetDesc(rt, &desc); @@ -236,7 +236,7 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR e break; } release_surface_readback(&rb); - ok_(__FILE__, line)(color == 0x000000ff, "Got unexpected color 0x%08x.\n", color); + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -1324,6 +1324,108 @@ done: DestroyWindow(window); } +static void test_clear_different_size_surfaces(void) +{ + IDirect3DSurface9 *ds, *rt, *rt2; + IDirect3DDevice9 *device; + D3DFORMAT ds_format; + D3DLOCKED_RECT lr; + unsigned int x, y; + D3DVIEWPORT9 vp; + IDirect3D9 *d3d; + D3DCAPS9 caps; + WORD *depth; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 1, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 2, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt2, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + + if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) + { + ds_format = D3DFMT_D16_LOCKABLE; + } + else + { + ds_format = D3DFMT_D24S8; + } + + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 4, 4, ds_format, + D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(hr == D3D_OK, "Failed to create depth surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(hr == D3D_OK, "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + if (caps.NumSimultaneousRTs >= 2) + { + hr = IDirect3DDevice9_SetRenderTarget(device, 1, rt2); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + } + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 640; + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.5f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + check_rt_color(rt, 0x00ff0000); + + if (caps.NumSimultaneousRTs >= 2) + check_rt_color(rt2, 0x00ff0000); + + if (ds_format == D3DFMT_D16_LOCKABLE) + { + hr = IDirect3DSurface9_LockRect(ds, &lr, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock rect, hr %#x.\n", hr); + for (y = 0; y < 4; ++y) + { + depth = (WORD *)((BYTE *)lr.pBits + y * lr.Pitch); + for (x = 0; x < 4; ++x) + { + ok(abs(depth[x] - 0x7fff) <= 2, "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); + } + } + hr = IDirect3DSurface9_UnlockRect(ds); + ok(hr == D3D_OK, "Failed to unlock rect, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + } + else + { + skip("D3DFMT_D16_LOCKABLE is not supported.\n"); + } + + IDirect3DSurface9_Release(rt); + IDirect3DSurface9_Release(rt2); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void color_fill_test(void) { IDirect3DSurface9 *surface; @@ -24420,6 +24522,7 @@ START_TEST(visual) lighting_test(); test_specular_lighting(); clear_test(); + test_clear_different_size_surfaces(); color_fill_test(); fog_test(); test_cube_wrap(); -- 2.19.2

1 0

[PATCH] rpcndr.h: Don't use unnamed struct for NDR_SCONTEXT declaration.
by Jacek Caban 08 Jan '19

08 Jan '19

Fixes C++ warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- mingw-w64 does the same as this patch. PSDK uses an unnamed struct (but cl doesn't emit a warning). The warning is: In file included from /home/jacek/wine/wine-git/include/wtypes.h:8:0, from /home/jacek/wine/wine-git/include/winscard.h:22, from /home/jacek/wine/wine-git/include/windows.h:70, from test.cpp:2: /home/jacek/wine/wine-git/include/rpcndr.h:188:16: warning: ‘_MIDL_STUB_MESSAGE’ has a field ‘_MIDL_STUB_MESSAGE::SavedContextHandles’ whose type depends on the type ‘<unnamed struct>’ which has no linkage [-Wsubobject-linkage] typedef struct _MIDL_STUB_MESSAGE ^~~~~~~~~~~~~~~~~~ /home/jacek/wine/wine-git/include/rpcndr.h:491:16: warning: ‘_SCONTEXT_QUEUE’ has a field ‘_SCONTEXT_QUEUE::ArrayOfObjects’ whose type depends on the type ‘<unnamed struct>’ which has no linkage [-Wsubobject-linkage] typedef struct _SCONTEXT_QUEUE { ^~~~~~~~~~~~~~~ include/rpcndr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] winnt.h: Avoid using attributes on elaborated type specifier.
by Jacek Caban 08 Jan '19

08 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes C++ warning: winnt.h:781:35: warning: attributes ignored on elaborated-type-specifier that is not a forward declaration [-Wattributes] typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY *PSLIST_ENTRY; ^~~~~~~~~~~~ include/winnt.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

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