- wine-devel - winehq.org

[PATCH 1/2] winhttp/tests: Add tests for WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS.
by Owen Rudge 03 Jul '20

03 Jul '20

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 52 ++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

2 1

[PATCH v3 1/2] ntdll: Fix KiUserExceptionDispatcher ABI on x86.
by Paul Gofman 03 Jul '20

03 Jul '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - pass dispatcher function address to call_user_exception_dispatcher. dlls/ntdll/signal_i386.c | 9 ++- dlls/ntdll/tests/exception.c | 111 +++++++++++++++++++++++++++++++- dlls/ntdll/unix/signal_i386.c | 10 ++- dlls/ntdll/unix/signal_x86_64.c | 6 +- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 3 +- 6 files changed, 129 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 676329c5bd2..594c6f9a1d1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -198,7 +198,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) /******************************************************************* * KiUserExceptionDispatcher (NTDLL.@) */ -NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { NTSTATUS status; DWORD c; @@ -243,6 +243,13 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte return NtRaiseException( rec, context, FALSE ); } +__ASM_STDCALL_FUNC( KiUserExceptionDispatcher, 8, + /* hotpatch prologue. */ + "push %ebp\n\t" + "mov %esp,%ebp\n\t" + "pop %ebp\n\t" + "call " __ASM_NAME("dispatch_exception") "\n\t" + "int3") /*********************************************************************** * save_fpu diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 95d25375f77..a27dee21f00 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1660,6 +1660,114 @@ static void test_thread_context(void) #undef COMPARE } +static BYTE saved_KiUserExceptionDispatcher_bytes[7]; +static void *pKiUserExceptionDispatcher; +static BOOL hook_called; +static void *hook_KiUserExceptionDispatcher_eip; +static void *dbg_except_continue_handler_eip; +static void *hook_exception_address; + +static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + ok(hook_called, "Hook was not called.\n"); + got_exception = 1; + dbg_except_continue_handler_eip = (void *)context->Eip; + ++context->Eip; + return ExceptionContinueExecution; +} + +/* Use CDECL to leave arguments on stack. */ +void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) +{ + trace("rec %p, context %p.\n", rec, context); + trace("context->Eip %#x, context->Esp %#x, ContextFlags %#x.\n", + context->Eip, context->Esp, context->ContextFlags); + + hook_called = TRUE; + /* Broken on Win2008, probably rec offset in stack is different. */ + ok(rec->ExceptionCode == 0x80000003 || broken(!rec->ExceptionCode), + "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + + hook_KiUserExceptionDispatcher_eip = (void *)context->Eip; + hook_exception_address = rec->ExceptionAddress; + memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, + sizeof(saved_KiUserExceptionDispatcher_bytes)); +} + +static void test_kiuserexceptiondispatcher(void) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + static const BYTE except_code[] = + { + 0xcc, /* int3 */ + 0xc3, /* ret */ + }; + static BYTE hook_trampoline[] = + { + 0xff, 0x15, + /* offset: 2 bytes */ + 0x00, 0x00, 0x00, 0x00, /* callq *addr */ /* call hook implementation. */ + + 0xff, 0x25, + /* offset: 8 bytes */ + 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ + }; + void *phook_KiUserExceptionDispatcher = hook_KiUserExceptionDispatcher; + void *phook_trampoline = hook_trampoline; + DWORD old_protect1, old_protect2; + BYTE *ptr; + BOOL ret; + + pKiUserExceptionDispatcher = (void *)GetProcAddress(hntdll, "KiUserExceptionDispatcher"); + if (!pKiUserExceptionDispatcher) + { + win_skip("KiUserExceptionDispatcher is not available.\n"); + return; + } + + *(unsigned int *)(hook_trampoline + 2) = (ULONG_PTR)&phook_KiUserExceptionDispatcher; + *(unsigned int *)(hook_trampoline + 8) = (ULONG_PTR)&pKiUserExceptionDispatcher; + + ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), + PAGE_EXECUTE_READWRITE, &old_protect2); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, + sizeof(saved_KiUserExceptionDispatcher_bytes)); + ptr = (BYTE *)pKiUserExceptionDispatcher; + /* mov hook_trampoline, %eax */ + *ptr++ = 0xa1; + *(void **)ptr = &phook_trampoline; + ptr += sizeof(void *); + /* jmp *eax */ + *ptr++ = 0xff; + *ptr++ = 0xe0; + + got_exception = 0; + run_exception_test(dbg_except_continue_handler, NULL, except_code, ARRAY_SIZE(except_code), + PAGE_EXECUTE_READ); + ok(got_exception, "Handler was not called.\n"); + ok(hook_called, "Hook was not called.\n"); + + ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, + "Got unexpected exception address %p, expected %p.\n", + hook_exception_address, code_mem); + todo_wine ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_eip, code_mem); + ok(dbg_except_continue_handler_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_eip, code_mem); + + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), + old_protect2, &old_protect2); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), old_protect1, &old_protect1); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); +} + #elif defined(__x86_64__) #define is_wow64 0 @@ -3751,7 +3859,6 @@ START_TEST(exception) test_suspend_thread(); test_suspend_process(); test_unload_trace(); - test_kiuserexceptiondispatcher(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); @@ -3766,5 +3873,7 @@ START_TEST(exception) #endif + test_kiuserexceptiondispatcher(); + VirtualFree(code_mem, 0, MEM_RELEASE); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 730d0b1cb32..d9cbec2c811 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -428,7 +428,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) /* stack layout when calling an exception raise function */ struct stack_layout { - void *ret_addr; /* return address from raise_generic_exception */ EXCEPTION_RECORD *rec_ptr; /* first arg for raise_generic_exception */ CONTEXT *context_ptr; /* second arg for raise_generic_exception */ CONTEXT context; @@ -1583,15 +1582,14 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * FS_sig(sigcontext) = get_fs(); GS_sig(sigcontext) = get_gs(); SS_sig(sigcontext) = get_ds(); - stack->ret_addr = (void *)0xdeadbabe; /* KiUserExceptionDispatcher must not return */ stack->rec_ptr = &stack->rec; /* arguments for KiUserExceptionDispatcher */ stack->context_ptr = &stack->context; } -void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - pKiUserExceptionDispatcher( rec, context ); -} +__ASM_GLOBAL_FUNC( call_user_exception_dispatcher, + "add $4,%esp\n\t" + "mov 0x8(%esp),%eax\n\t" + "jmp *%eax") /********************************************************************** * get_fpu_code diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index cb0fdfb00f1..406a4dacf3c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1977,15 +1977,17 @@ __ASM_GLOBAL_FUNC( user_exception_dispatcher_trampoline, "movq 0xb0(%rsp),%rdi\n\t" "jmpq *%rdx") -void WINAPI do_call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context, struct stack_layout *stack) +void WINAPI do_call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context, + struct stack_layout *stack, void *dispatcher_func) { memmove(&stack->context, context, sizeof(*context)); memcpy(&stack->rec, rec, sizeof(*rec)); - user_exception_dispatcher_trampoline( stack, pKiUserExceptionDispatcher ); + user_exception_dispatcher_trampoline( stack, dispatcher_func ); } __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, + "movq %r8,%r9\n\t" /* dispatcher_func parameter */ "movq 0x98(%rdx),%r8\n\t" /* context->Rsp */ "andq $~0xf,%r8\n\t" "subq $0x630,%r8\n\t" /* sizeof(struct stack_layout) */ diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 686d3991b7d..41d4fe296e6 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -415,7 +415,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) NtSetContextThread( GetCurrentThread(), context ); - if (first_chance) call_user_exception_dispatcher( rec, context ); + if (first_chance) call_user_exception_dispatcher( rec, context, pKiUserExceptionDispatcher ); if (rec->ExceptionFlags & EH_STACK_INVALID) ERR("Exception frame is not in stack limits => unable to dispatch exception.\n"); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index e6c8d5764ed..fbf550c60bd 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -241,7 +241,8 @@ extern void init_cpu_info(void) DECLSPEC_HIDDEN; extern void dbg_init(void) DECLSPEC_HIDDEN; -extern void WINAPI call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) DECLSPEC_HIDDEN; +extern void WINAPI call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context, + void *dispatcher_func) DECLSPEC_HIDDEN; #define TICKSPERSEC 10000000 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)86400) -- 2.26.2

1 1

[PATCH v2 1/2] ntdll: Fix KiUserExceptionDispatcher ABI on x86.
by Paul Gofman 03 Jul '20

03 Jul '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - Use __ASM_STDCALL_FUNC instead of coding linker name; - Use helper function to get KiUserDispactherAddress to properly handle PIC. dlls/ntdll/signal_i386.c | 9 ++- dlls/ntdll/tests/exception.c | 111 +++++++++++++++++++++++++++++++++- dlls/ntdll/unix/signal_i386.c | 11 ++-- 3 files changed, 125 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 676329c5bd2..594c6f9a1d1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -198,7 +198,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) /******************************************************************* * KiUserExceptionDispatcher (NTDLL.@) */ -NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { NTSTATUS status; DWORD c; @@ -243,6 +243,13 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte return NtRaiseException( rec, context, FALSE ); } +__ASM_STDCALL_FUNC( KiUserExceptionDispatcher, 8, + /* hotpatch prologue. */ + "push %ebp\n\t" + "mov %esp,%ebp\n\t" + "pop %ebp\n\t" + "call " __ASM_NAME("dispatch_exception") "\n\t" + "int3") /*********************************************************************** * save_fpu diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 95d25375f77..a27dee21f00 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1660,6 +1660,114 @@ static void test_thread_context(void) #undef COMPARE } +static BYTE saved_KiUserExceptionDispatcher_bytes[7]; +static void *pKiUserExceptionDispatcher; +static BOOL hook_called; +static void *hook_KiUserExceptionDispatcher_eip; +static void *dbg_except_continue_handler_eip; +static void *hook_exception_address; + +static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + ok(hook_called, "Hook was not called.\n"); + got_exception = 1; + dbg_except_continue_handler_eip = (void *)context->Eip; + ++context->Eip; + return ExceptionContinueExecution; +} + +/* Use CDECL to leave arguments on stack. */ +void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) +{ + trace("rec %p, context %p.\n", rec, context); + trace("context->Eip %#x, context->Esp %#x, ContextFlags %#x.\n", + context->Eip, context->Esp, context->ContextFlags); + + hook_called = TRUE; + /* Broken on Win2008, probably rec offset in stack is different. */ + ok(rec->ExceptionCode == 0x80000003 || broken(!rec->ExceptionCode), + "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + + hook_KiUserExceptionDispatcher_eip = (void *)context->Eip; + hook_exception_address = rec->ExceptionAddress; + memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, + sizeof(saved_KiUserExceptionDispatcher_bytes)); +} + +static void test_kiuserexceptiondispatcher(void) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + static const BYTE except_code[] = + { + 0xcc, /* int3 */ + 0xc3, /* ret */ + }; + static BYTE hook_trampoline[] = + { + 0xff, 0x15, + /* offset: 2 bytes */ + 0x00, 0x00, 0x00, 0x00, /* callq *addr */ /* call hook implementation. */ + + 0xff, 0x25, + /* offset: 8 bytes */ + 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ + }; + void *phook_KiUserExceptionDispatcher = hook_KiUserExceptionDispatcher; + void *phook_trampoline = hook_trampoline; + DWORD old_protect1, old_protect2; + BYTE *ptr; + BOOL ret; + + pKiUserExceptionDispatcher = (void *)GetProcAddress(hntdll, "KiUserExceptionDispatcher"); + if (!pKiUserExceptionDispatcher) + { + win_skip("KiUserExceptionDispatcher is not available.\n"); + return; + } + + *(unsigned int *)(hook_trampoline + 2) = (ULONG_PTR)&phook_KiUserExceptionDispatcher; + *(unsigned int *)(hook_trampoline + 8) = (ULONG_PTR)&pKiUserExceptionDispatcher; + + ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), + PAGE_EXECUTE_READWRITE, &old_protect2); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, + sizeof(saved_KiUserExceptionDispatcher_bytes)); + ptr = (BYTE *)pKiUserExceptionDispatcher; + /* mov hook_trampoline, %eax */ + *ptr++ = 0xa1; + *(void **)ptr = &phook_trampoline; + ptr += sizeof(void *); + /* jmp *eax */ + *ptr++ = 0xff; + *ptr++ = 0xe0; + + got_exception = 0; + run_exception_test(dbg_except_continue_handler, NULL, except_code, ARRAY_SIZE(except_code), + PAGE_EXECUTE_READ); + ok(got_exception, "Handler was not called.\n"); + ok(hook_called, "Hook was not called.\n"); + + ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, + "Got unexpected exception address %p, expected %p.\n", + hook_exception_address, code_mem); + todo_wine ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_eip, code_mem); + ok(dbg_except_continue_handler_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_eip, code_mem); + + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), + old_protect2, &old_protect2); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), old_protect1, &old_protect1); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); +} + #elif defined(__x86_64__) #define is_wow64 0 @@ -3751,7 +3859,6 @@ START_TEST(exception) test_suspend_thread(); test_suspend_process(); test_unload_trace(); - test_kiuserexceptiondispatcher(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); @@ -3766,5 +3873,7 @@ START_TEST(exception) #endif + test_kiuserexceptiondispatcher(); + VirtualFree(code_mem, 0, MEM_RELEASE); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 730d0b1cb32..46fc1df43f6 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -428,7 +428,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) /* stack layout when calling an exception raise function */ struct stack_layout { - void *ret_addr; /* return address from raise_generic_exception */ EXCEPTION_RECORD *rec_ptr; /* first arg for raise_generic_exception */ CONTEXT *context_ptr; /* second arg for raise_generic_exception */ CONTEXT context; @@ -1583,16 +1582,20 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * FS_sig(sigcontext) = get_fs(); GS_sig(sigcontext) = get_gs(); SS_sig(sigcontext) = get_ds(); - stack->ret_addr = (void *)0xdeadbabe; /* KiUserExceptionDispatcher must not return */ stack->rec_ptr = &stack->rec; /* arguments for KiUserExceptionDispatcher */ stack->context_ptr = &stack->context; } -void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +void *get_KiUserExceptionDispatcher_address(void) { - pKiUserExceptionDispatcher( rec, context ); + return pKiUserExceptionDispatcher; } +__ASM_GLOBAL_FUNC( call_user_exception_dispatcher, + "add $4,%esp\n\t" + "call " __ASM_NAME("get_KiUserExceptionDispatcher_address") "\n\t" + "jmp *%eax") + /********************************************************************** * get_fpu_code * -- 2.26.2

3 3

[PATCH v2 1/3] ntdll: Reimplement NtQuerySystemInformation(SystemProcessInformation) using a single server call.
by Zebediah Figura 03 Jul '20

03 Jul '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Properly align variables (thanks Alexandre); adjust variable names a bit. This decreases CPU usage by wineserver from about 65% to about 45% for me in Street Fighter V, which for some reason calls this 15-20 times per second. dlls/ntdll/unix/system.c | 182 +++++++++++++++++---------------------- server/process.c | 68 +++++++++++++++ server/protocol.def | 30 +++++++ server/trace.c | 39 +++++++++ 4 files changed, 215 insertions(+), 104 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 7045bc1550b..3a53a764d03 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1998,6 +1998,11 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) RtlLeaveCriticalSection( &TIME_tz_section ); } +static unsigned int align_offset(unsigned int offset, unsigned int alignment) +{ + return (offset + (alignment - 1)) & ~(alignment - 1); +} + /****************************************************************************** * NtQuerySystemInformation (NTDLL.@) @@ -2083,132 +2088,101 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemProcessInformation: { - SYSTEM_PROCESS_INFORMATION *spi = info; - SYSTEM_PROCESS_INFORMATION *last = NULL; - HANDLE handle = 0; - WCHAR procname[1024]; - WCHAR* exename; - DWORD wlen = 0; - DWORD procstructlen = 0; + unsigned int process_count, i, j; + char *buffer = NULL; + unsigned int pos = 0; - SERVER_START_REQ( create_snapshot ) + if (size && !(buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { - req->flags = SNAP_PROCESS | SNAP_THREAD; - if (!(ret = wine_server_call( req ))) handle = wine_server_ptr_handle( reply->handle ); + ret = STATUS_NO_MEMORY; + break; } - SERVER_END_REQ; - len = 0; - while (ret == STATUS_SUCCESS) + SERVER_START_REQ( list_processes ) { - int unix_pid = -1; - SERVER_START_REQ( next_process ) - { - req->handle = wine_server_obj_handle( handle ); - req->reset = (len == 0); - wine_server_set_reply( req, procname, sizeof(procname) - sizeof(WCHAR) ); - if (!(ret = wine_server_call( req ))) - { - unix_pid = reply->unix_pid; - - /* Make sure procname is 0 terminated */ - procname[wine_server_reply_size(reply) / sizeof(WCHAR)] = 0; - - /* Get only the executable name, not the path */ - if ((exename = wcsrchr(procname, '\\')) != NULL) exename++; - else exename = procname; + wine_server_set_reply( req, buffer, size ); + ret = wine_server_call( req ); + len = reply->info_size; + process_count = reply->process_count; + } + SERVER_END_REQ; - wlen = (wcslen(exename) + 1) * sizeof(WCHAR); - procstructlen = sizeof(*spi) + wlen + ((reply->threads - 1) * sizeof(SYSTEM_THREAD_INFORMATION)); + if (ret) + { + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + break; + } - if (size >= len + procstructlen) - { - /* ftCreationTime, ftUserTime, ftKernelTime; - * vmCounters, ioCounters - */ - memset(spi, 0, sizeof(*spi)); + len = 0; - spi->NextEntryOffset = procstructlen - wlen; - spi->dwThreadCount = reply->threads; + for (i = 0; i < process_count; i++) + { + SYSTEM_PROCESS_INFORMATION *nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)info + len); + const struct process_info *server_process; + const WCHAR *server_name, *file_part; + ULONG proc_len; + ULONG name_len = 0; - /* spi->pszProcessName will be set later on */ + pos = align_offset( pos, TYPE_ALIGNMENT(struct process_info) ); + server_process = (const struct process_info *)(buffer + pos); + pos += sizeof(*server_process); - spi->dwBasePriority = reply->priority; - spi->UniqueProcessId = UlongToHandle(reply->pid); - spi->ParentProcessId = UlongToHandle(reply->ppid); - spi->HandleCount = reply->handles; + server_name = (const WCHAR *)(buffer + pos); + file_part = server_name + (server_process->name_len / sizeof(WCHAR)); + pos += server_process->name_len; + while (file_part > server_name && file_part[-1] != '\\') + { + file_part--; + name_len++; + } - /* spi->ti will be set later on */ + proc_len = sizeof(*nt_process) + server_process->thread_count * sizeof(SYSTEM_THREAD_INFORMATION) + + (name_len + 1) * sizeof(WCHAR); + len += proc_len; - } - len += procstructlen; - } - } - SERVER_END_REQ; - if (ret != STATUS_SUCCESS) + if (len <= size) { - if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; - break; + memset(nt_process, 0, sizeof(*nt_process)); + if (i < process_count - 1) + nt_process->NextEntryOffset = proc_len; + nt_process->dwThreadCount = server_process->thread_count; + nt_process->dwBasePriority = server_process->priority; + nt_process->UniqueProcessId = UlongToHandle(server_process->pid); + nt_process->ParentProcessId = UlongToHandle(server_process->parent_pid); + nt_process->HandleCount = server_process->handle_count; + get_thread_times( server_process->unix_pid, -1, &nt_process->KernelTime, &nt_process->UserTime ); } - if (size >= len) + pos = align_offset( pos, TYPE_ALIGNMENT(struct thread_info) ); + for (j = 0; j < server_process->thread_count; j++) { - int i, j; + const struct thread_info *server_thread = (const struct thread_info *)(buffer + pos); - get_thread_times(unix_pid, -1, &spi->KernelTime, &spi->UserTime); - - /* set thread info */ - i = j = 0; - while (ret == STATUS_SUCCESS) + if (len <= size) { - int unix_tid, pid, tid, base_pri, delta_pri; - SERVER_START_REQ( next_thread ) - { - req->handle = wine_server_obj_handle( handle ); - req->reset = (j == 0); - if (!(ret = wine_server_call( req ))) - { - unix_tid = reply->unix_tid; - pid = reply->pid; - tid = reply->tid; - base_pri = reply->base_pri; - delta_pri = reply->delta_pri; - j++; - } - } - SERVER_END_REQ; - - if (!ret) - { - if (UlongToHandle(pid) == spi->UniqueProcessId) - { - memset(&spi->ti[i], 0, sizeof(spi->ti)); - - spi->ti[i].CreateTime.QuadPart = 0xdeadbeef; - spi->ti[i].ClientId.UniqueProcess = UlongToHandle(pid); - spi->ti[i].ClientId.UniqueThread = UlongToHandle(tid); - spi->ti[i].dwCurrentPriority = base_pri + delta_pri; - spi->ti[i].dwBasePriority = base_pri; - get_thread_times(unix_pid, unix_tid, &spi->ti[i].KernelTime, &spi->ti[i].UserTime); - i++; - } - } + nt_process->ti[j].CreateTime.QuadPart = 0xdeadbeef; + nt_process->ti[j].ClientId.UniqueProcess = UlongToHandle(server_process->pid); + nt_process->ti[j].ClientId.UniqueThread = UlongToHandle(server_thread->tid); + nt_process->ti[j].dwCurrentPriority = server_thread->current_priority; + nt_process->ti[j].dwBasePriority = server_thread->base_priority; + get_thread_times( server_process->unix_pid, server_thread->unix_tid, + &nt_process->ti[j].KernelTime, &nt_process->ti[j].UserTime ); } - if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; - - /* now append process name */ - spi->ProcessName.Buffer = (WCHAR*)((char*)spi + spi->NextEntryOffset); - spi->ProcessName.Length = wlen - sizeof(WCHAR); - spi->ProcessName.MaximumLength = wlen; - memcpy( spi->ProcessName.Buffer, exename, wlen ); - spi->NextEntryOffset += wlen; - last = spi; - spi = (SYSTEM_PROCESS_INFORMATION*)((char*)spi + spi->NextEntryOffset); + + pos += sizeof(*server_thread); + } + + if (len <= size) + { + nt_process->ProcessName.Buffer = (WCHAR *)&nt_process->ti[server_process->thread_count]; + nt_process->ProcessName.Length = name_len * sizeof(WCHAR); + nt_process->ProcessName.MaximumLength = (name_len + 1) * sizeof(WCHAR); + memcpy(nt_process->ProcessName.Buffer, file_part, name_len * sizeof(WCHAR)); + nt_process->ProcessName.Buffer[name_len] = 0; } } - if (ret == STATUS_SUCCESS && last) last->NextEntryOffset = 0; + if (len > size) ret = STATUS_INFO_LENGTH_MISMATCH; - if (handle) NtClose( handle ); break; } diff --git a/server/process.c b/server/process.c index 283edc09c5e..6b9557ceb60 100644 --- a/server/process.c +++ b/server/process.c @@ -22,6 +22,7 @@ #include "wine/port.h" #include <assert.h> +#include <errno.h> #include <limits.h> #include <signal.h> #include <string.h> @@ -1819,3 +1820,70 @@ DECL_HANDLER(resume_process) release_object( process ); } } + +static unsigned int align_offset(unsigned int offset, unsigned int alignment) +{ + return (offset + (alignment - 1)) & ~(alignment - 1); +} + +/* Get a list of processes and threads currently running */ +DECL_HANDLER(list_processes) +{ + struct process *process; + struct thread *thread; + unsigned int pos = 0; + char *buffer; + + reply->process_count = 0; + reply->info_size = 0; + + LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) + { + struct process_dll *exe = get_process_exe_module( process ); + reply->info_size = align_offset( reply->info_size, TYPE_ALIGNMENT(struct process_info) ); + reply->info_size += sizeof(struct process_info) + exe->namelen; + reply->info_size = align_offset( reply->info_size, TYPE_ALIGNMENT(struct thread_info) ); + reply->info_size += process->running_threads * sizeof(struct thread_info); + reply->process_count++; + } + + if (reply->info_size > get_reply_max_size()) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + + if (!(buffer = set_reply_data_size( reply->info_size ))) return; + + LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) + { + struct process_info *process_info; + struct process_dll *exe = get_process_exe_module( process ); + + pos = align_offset( pos, TYPE_ALIGNMENT(struct process_info) ); + process_info = (struct process_info *)(buffer + pos); + process_info->name_len = exe->namelen; + process_info->thread_count = process->running_threads; + process_info->priority = process->priority; + process_info->pid = process->id; + process_info->parent_pid = process->parent_id; + process_info->handle_count = get_handle_table_count(process); + process_info->unix_pid = process->unix_pid; + pos += sizeof(*process_info); + + memcpy( buffer + pos, exe->filename, exe->namelen ); + pos += exe->namelen; + + pos = align_offset( pos, TYPE_ALIGNMENT(struct thread_info) ); + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { + struct thread_info *thread_info = (struct thread_info *)(buffer + pos); + + thread_info->tid = thread->id; + thread_info->base_priority = thread->priority; + thread_info->current_priority = thread->priority; /* FIXME */ + thread_info->unix_tid = thread->unix_tid; + pos += sizeof(*thread_info); + } + } +} diff --git a/server/protocol.def b/server/protocol.def index 6416306c0a1..2737cd6fddd 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1919,6 +1919,36 @@ enum char_info_mode @END +struct thread_info +{ + thread_id_t tid; + int base_priority; + int current_priority; + int unix_tid; +}; + +struct process_info +{ + data_size_t name_len; + unsigned int thread_count; + int priority; + process_id_t pid; + process_id_t parent_pid; + unsigned int handle_count; + int unix_pid; + /* VARARG(name,unicode_str,name_len); */ + /* VARARG(threads,struct thread_info,thread_count); */ +}; + +/* Get a list of processes and threads currently running */ +@REQ(list_processes) +@REPLY + data_size_t info_size; + unsigned int process_count; + VARARG(data,process_info,info_size); +@END + + /* Wait for a debug event */ @REQ(wait_debug_event) int get_handle; /* should we alloc a handle for waiting? */ diff --git a/server/trace.c b/server/trace.c index 2fb5afd5ef1..d47e1260255 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1115,6 +1115,45 @@ static void dump_varargs_token_groups( const char *prefix, data_size_t size ) fputc( '}', stderr ); } +static unsigned int align_offset(unsigned int offset, unsigned int alignment) +{ + return (offset + (alignment - 1)) & ~(alignment - 1); +} + +static void dump_varargs_process_info( const char *prefix, data_size_t size ) +{ + data_size_t pos = 0; + unsigned int i; + + fprintf( stderr,"%s{", prefix ); + + while (size - pos >= sizeof(struct process_info)) + { + const struct process_info *process = (const struct process_info *)((const char *)cur_data + pos); + pos = align_offset( pos, TYPE_ALIGNMENT(struct process_info) ); + fprintf( stderr, "[thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%08x,unix_pid=%d,", + process->thread_count, process->priority, process->pid, + process->parent_pid, process->handle_count, process->unix_pid ); + pos += sizeof(*process); + + pos = dump_inline_unicode_string( "name=L\"", pos, process->name_len, size ); + + pos = align_offset( pos, TYPE_ALIGNMENT(struct thread_info) ); + fprintf( stderr, "\",threads={" ); + for (i = 0; i < process->thread_count; i++) + { + const struct thread_info *thread = (const struct thread_info *)((const char *)cur_data + pos); + if (size - pos < sizeof(*thread)) break; + fprintf( stderr, "[tid=%04x,base_priority=%d,current_priority=%d,unix_tid=%d],", + thread->tid, thread->base_priority, thread->current_priority, thread->unix_tid ); + pos += sizeof(*thread); + } + fprintf( stderr, "}," ); + } + + fputc( '}', stderr ); +} + static void dump_varargs_object_attributes( const char *prefix, data_size_t size ) { const struct object_attributes *objattr = cur_data; -- 2.27.0

2 3

Re: [PATCH] ntdll: Initialize StatusWord and TagWord in i386 init_thread_context.
by Jefferson Carpenter 03 Jul '20

03 Jul '20

This does not resolve the bug, but moves toward resolving it. I have not been able to get a consistent read on what to initialize the remaining members to. Thanks, Jefferson

2 3

[PATCH v2 1/6] user32/tests: Add basic GetRegisteredRawInputDevices tests.
by Rémi Bernon 03 Jul '20

03 Jul '20

There's already some in dinput, but this is a more appropriate location. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index bab0fd97536..52fd31501f8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1765,6 +1765,7 @@ static void test_RegisterRawInputDevices(void) { HWND hwnd; RAWINPUTDEVICE raw_devices[1]; + UINT count, raw_devices_count; BOOL res; raw_devices[0].usUsagePage = 0x01; @@ -1791,6 +1792,42 @@ static void test_RegisterRawInputDevices(void) ok(res == TRUE, "RegisterRawInputDevices failed\n"); ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = GetRegisteredRawInputDevices(NULL, NULL, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(count == 0, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 1, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(raw_devices, 0, sizeof(raw_devices)); + raw_devices_count = ARRAY_SIZE(raw_devices); + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == 1, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 1, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + todo_wine + ok(raw_devices[0].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 0x05, "Unexpected usage: %x\n", raw_devices[0].usUsage); /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; -- 2.27.0

2 6

[RFC] Trying to fix desktop switches
by Rafał Mużyło 03 Jul '20

03 Jul '20

This is yet another attempt at fixing the way wine handles X11 wm desktop switches. Currently, wine minimizes the windows on switch away, then restores them. That's the wrong thing to do. For example, that unpauses apps that pause on focus loss. First part of the problem is quite simple. Adding a check for NET_WM_STATE_HIDDEN and returning early if it's not set while the wmstate is iconic deals with that. The other part is a pain though. As the windows on other desktops are invisible, they shouldn't be considered valid input sinks by wine. The problem is two-fold: - can_activate_window is a static function both in winex11.drv and user32.dll; what's more one in user32.dll doesn't handle WS_EX_NOACTIVATE the way one in winex11.drv does - x11drv_win_data is (for obvious reasons) an internal detail of winex11.drv As such, it's hard to come up with something that would reach user32.dll and didn't have some nasty side effects. I'm trying to use WS_EX_NOACTIVATE in this version, but (as already mentioned) that isn't working with user32.dll *and* has some undesirable side-effects. Trying to use either WS_VISIBLE or WS_DISABLED doesn't work at all or at least I'm not able to use that properly. So, better ideas welcomed.

1 0

[PATCH] kernel32: Catch process creation breakpoint exceptions.
by Rémi Bernon 03 Jul '20

03 Jul '20

Metal Gear Solid V: Ground Zeroes attaches itself and continues this specific breakpoint with DBG_EXCEPTION_NOT_HANDLED. It crashes the child process and the game terminates. It is correct for old Windows versions, but more recent versions are apparently catching exceptions here, and the process should continue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44127 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/process.c | 9 +++++++++ dlls/kernel32/tests/debugger.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8f506fcf132..cfc11c867ae 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -155,6 +155,15 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) SetLastError( 0 ); /* clear error code */ if (being_debugged) DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + + __TRY + { ExitThread( call_process_entry( peb, entry )); } __EXCEPT(UnhandledExceptionFilter) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 33e18d82e62..0a43fe91e64 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1062,15 +1062,46 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, if (flag) { + DWORD last_thread; + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.ev.dwProcessId == ctx.pid); next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + last_thread = ctx.ev.dwThreadId; wait_for_breakpoint(&ctx); ok(ctx.dll_cnt > 2, "dll_cnt = %d\n", ctx.dll_cnt); + + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); + + /* Except for wxppro and w2008, the initial breakpoint is now somewhere else, possibly within LdrInitShimEngineDynamic, + * It's also catching exceptions and ContinueDebugEvent(DBG_EXCEPTION_NOT_HANDLED) should not crash the child now */ + if (broken(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint)) + { + win_skip("Ignoring initial breakpoint address check\n"); + pass_exception = FALSE; + } + else + { + todo_wine + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress != pDbgBreakPoint, "ExceptionAddress == pDbgBreakPoint\n"); + } + + if (pass_exception) + { + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); + ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ctx.ev.dwDebugEventCode = -1; + + next_event(&ctx, WAIT_EVENT_TIMEOUT); + ok(ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + } } else { @@ -1713,6 +1744,7 @@ START_TEST(debugger) test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, TRUE); + test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE, TRUE); test_debugger(myARGV[0]); } } -- 2.27.0

2 1

[PATCH] msvcrt: Don't set MXCSR in _control87.
by Myah Caron 03 Jul '20

03 Jul '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27594 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This appears to match native MSVCRT's behavior, at least the one provided by vcrun6. I'm not sure if the style is correct (the helper being directly below the __control87_2 comment). --- dlls/msvcrt/math.c | 61 +++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index eae917076f..7ad79a07e5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1101,6 +1101,41 @@ double CDECL MSVCRT__chgsign(double num) * Not exported by native msvcrt, added in msvcr80. */ #ifdef __i386__ +static unsigned int get_flags_from_mxcsr(void) { +#ifdef __GNUC__ + unsigned long fpword; + unsigned int flags; + + __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); + + /* Convert into mask constants */ + flags = 0; + if (fpword & 0x80) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x100) flags |= MSVCRT__EM_DENORMAL; + if (fpword & 0x200) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x400) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x800) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x1000) flags |= MSVCRT__EM_INEXACT; + switch (fpword & 0x6000) + { + case 0x6000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x4000: flags |= MSVCRT__RC_UP; break; + case 0x2000: flags |= MSVCRT__RC_DOWN; break; + } + switch (fpword & 0x8040) + { + case 0x0040: flags |= MSVCRT__DN_FLUSH_OPERANDS_SAVE_RESULTS; break; + case 0x8000: flags |= MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS; break; + case 0x8040: flags |= MSVCRT__DN_FLUSH; break; + } + + return flags; +#else + FIXME( "not implemented\n" ); + return 0; +#endif +} + int CDECL __control87_2( unsigned int newval, unsigned int mask, unsigned int *x86_cw, unsigned int *sse2_cw ) { @@ -1170,28 +1205,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, if (sse2_supported) { - __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); - - /* Convert into mask constants */ - flags = 0; - if (fpword & 0x80) flags |= MSVCRT__EM_INVALID; - if (fpword & 0x100) flags |= MSVCRT__EM_DENORMAL; - if (fpword & 0x200) flags |= MSVCRT__EM_ZERODIVIDE; - if (fpword & 0x400) flags |= MSVCRT__EM_OVERFLOW; - if (fpword & 0x800) flags |= MSVCRT__EM_UNDERFLOW; - if (fpword & 0x1000) flags |= MSVCRT__EM_INEXACT; - switch (fpword & 0x6000) - { - case 0x6000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; - case 0x4000: flags |= MSVCRT__RC_UP; break; - case 0x2000: flags |= MSVCRT__RC_DOWN; break; - } - switch (fpword & 0x8040) - { - case 0x0040: flags |= MSVCRT__DN_FLUSH_OPERANDS_SAVE_RESULTS; break; - case 0x8000: flags |= MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS; break; - case 0x8040: flags |= MSVCRT__DN_FLUSH; break; - } + flags = get_flags_from_mxcsr(); TRACE( "sse2 flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); if (mask) @@ -1241,7 +1255,8 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) #ifdef __i386__ unsigned int sse2_cw; - __control87_2( newval, mask, &flags, &sse2_cw ); + __control87_2( newval, mask, &flags, 0 ); + sse2_cw = get_flags_from_mxcsr(); if ((flags ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) flags |= MSVCRT__EM_AMBIGUOUS; #elif defined(__x86_64__) -- 2.26.2

2 2

[PATCH] ntdll: Initialize StatusWord and TagWord in i386 init_thread_context.
by Jefferson Carpenter 03 Jul '20

03 Jul '20

This does not resolve the bug, but moves toward resolving it. I have not been able to get a consistent read on what to initialize the remaining members to. Thanks, Jefferson

1 0

[PATCH V3 1/2] xactengine3_7: Add new dll.
by Vijay Kiran Kamuju 03 Jul '20

03 Jul '20

Based on original patch from Ethan Lee Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/2] d3dx10: Implement D3DX10GetImageInfoFromMemory().
by Ziqing Hui 03 Jul '20

03 Jul '20

According to our tests, except for DDS image, the "Format" field of the result will be set to DXGI_FORMAT_R8G8B8A8_UNORM no matter what its actual format is. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43_main.c | 142 +++++++++++++++++++++++++++++++- dlls/d3dx10_43/tests/d3dx10.c | 7 +- 3 files changed, 143 insertions(+), 7 deletions(-)

1 0

[PATCH 1/2] d3dx10/tests: Add more test images.
by Ziqing Hui 03 Jul '20

03 Jul '20

CoInitialize() is required for WMP format, see https://docs.microsoft.com/en-us/windows/win32/direct3d10/d3dx10-image-file… Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/d3dx10.c | 155 ++++++++++++++++++++++++++++++- 2 files changed, 153 insertions(+), 4 deletions(-)

1 0

crypt32: Add parameter validation.
by Zhipeng Zhao 03 Jul '20

03 Jul '20

3 4

[PATCH V2 2/2] xactengine3_7: Implement IXACT3Engine interface.
by Vijay Kiran Kamuju 03 Jul '20

03 Jul '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH vkd3d 3/5] vkd3d-compiler: Add an explicit --help option.
by Henri Verbeet 02 Jul '20

02 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 8fa4d4f..e975572 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -31,7 +31,8 @@ enum { - OPTION_STRIP_DEBUG = CHAR_MAX + 1, + OPTION_HELP = CHAR_MAX + 1, + OPTION_STRIP_DEBUG, }; static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) @@ -97,6 +98,7 @@ static void print_usage(const char *program_name) static const char usage[] = "[options...] file\n" "Options:\n" + " -h, --help Display this information and exit.\n" " -o <file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -- Stop option processing. Any subsequent argument is\n" @@ -109,6 +111,7 @@ struct options { const char *filename; const char *output_filename; + struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; }; @@ -147,6 +150,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { + {"help", no_argument, NULL, OPTION_HELP}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {NULL, 0, NULL, 0}, }; @@ -155,7 +159,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "o:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ho:", long_options, NULL)) == -1) break; switch (option) -- 2.11.0

3 2

[PATCH V2 1/2] xactengine3_7: Add new dll.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Based on original patch from Ethan Lee Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/4] xactengine3_7: Implement IXACT3Engine interface.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 3

[PATCH 1/4] xactengine3_7: Add new dll.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Based on original patch from Ethan Lee Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

3 3

[PATCH 4/4] xactengine3_7: Implement classfactory for IXACT3Engine.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/4] xactengine3_7: Register the com classes.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] mlang: Fix a MSVC warning C4334.
by Serge Gautherie 02 Jul '20

02 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- '...\mlang.c(3568): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)' --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1b1aed3..a209cc4 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3565,7 +3565,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, { if (j >= *puiFonts) break; - pScriptFont[j].scripts = 1 << mlang_data[i].sid; + pScriptFont[j].scripts = 1LL << mlang_data[i].sid; if (dwFlags == SCRIPTCONTF_FIXED_FONT) { MultiByteToWideChar(CP_ACP, 0, mlang_data[i].fixed_font, -1, -- 2.10.0.windows.1

1 0

[PATCH 1/5] d3dcompiler: Track def-use chains for anonymous nodes.
by Zebediah Figura 02 Jul '20

02 Jul '20

This is useful for replacing one instruction with another of a different type, which is useful for some optimizations such as constant folding. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 33 ++++++++++++--- dlls/d3dcompiler_43/hlsl.y | 49 +++++++++++----------- dlls/d3dcompiler_43/utils.c | 50 ++++++++++++++--------- 3 files changed, 83 insertions(+), 49 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 50457b2e64e..23eff210940 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -662,6 +662,8 @@ struct hlsl_ir_node enum hlsl_ir_node_type type; struct hlsl_type *data_type; + struct list uses; + struct source_location loc; /* Liveness ranges. "index" is the index of this instruction. Since this is @@ -671,6 +673,12 @@ struct hlsl_ir_node unsigned int index, last_read; }; +struct hlsl_src +{ + struct hlsl_ir_node *node; + struct list entry; +}; + #define HLSL_STORAGE_EXTERN 0x00000001 #define HLSL_STORAGE_NOINTERPOLATION 0x00000002 #define HLSL_MODIFIER_PRECISE 0x00000004 @@ -733,7 +741,7 @@ struct hlsl_ir_function_decl struct hlsl_ir_if { struct hlsl_ir_node node; - struct hlsl_ir_node *condition; + struct hlsl_src condition; struct list *then_instrs; struct list *else_instrs; }; @@ -817,7 +825,7 @@ struct hlsl_ir_expr { struct hlsl_ir_node node; enum hlsl_ir_expr_op op; - struct hlsl_ir_node *operands[3]; + struct hlsl_src operands[3]; }; enum hlsl_ir_jump_type @@ -837,14 +845,14 @@ struct hlsl_ir_jump struct hlsl_ir_swizzle { struct hlsl_ir_node node; - struct hlsl_ir_node *val; + struct hlsl_src val; DWORD swizzle; }; struct hlsl_deref { struct hlsl_ir_var *var; - struct hlsl_ir_node *offset; + struct hlsl_src offset; }; struct hlsl_ir_load @@ -857,7 +865,7 @@ struct hlsl_ir_assignment { struct hlsl_ir_node node; struct hlsl_deref lhs; - struct hlsl_ir_node *rhs; + struct hlsl_src rhs; unsigned char writemask; }; @@ -1055,6 +1063,21 @@ static inline void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type t node->type = type; node->data_type = data_type; node->loc = loc; + list_init(&node->uses); +} + +static inline void hlsl_src_from_node(struct hlsl_src *src, struct hlsl_ir_node *node) +{ + src->node = node; + if (node) + list_add_tail(&node->uses, &src->entry); +} + +static inline void hlsl_src_remove(struct hlsl_src *src) +{ + if (src->node) + list_remove(&src->entry); + src->node = NULL; } struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 21828337939..475fd414fd7 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -308,7 +308,7 @@ static BOOL append_conditional_break(struct list *cond_list) return FALSE; } init_node(&iff->node, HLSL_IR_IF, NULL, condition->loc); - iff->condition = not; + hlsl_src_from_node(&iff->condition, not); list_add_tail(cond_list, &iff->node.entry); if (!(iff->then_instrs = d3dcompiler_alloc(sizeof(*iff->then_instrs)))) @@ -421,7 +421,7 @@ static struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, return NULL; init_node(&swizzle->node, HLSL_IR_SWIZZLE, new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); - swizzle->val = val; + hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; } @@ -551,8 +551,8 @@ static struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, loc); assign->lhs.var = var; - assign->lhs.offset = offset; - assign->rhs = rhs; + hlsl_src_from_node(&assign->lhs.offset, offset); + hlsl_src_from_node(&assign->rhs, rhs); assign->writemask = writemask; return assign; } @@ -616,7 +616,7 @@ struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node return NULL; init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); expr->op = op; - expr->operands[0] = arg; + hlsl_src_from_node(&expr->operands[0], arg); return &expr->node; } @@ -631,8 +631,8 @@ struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, return NULL; init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); expr->op = op; - expr->operands[0] = arg1; - expr->operands[1] = arg2; + hlsl_src_from_node(&expr->operands[0], arg1); + hlsl_src_from_node(&expr->operands[1], arg2); return &expr->node; } @@ -662,9 +662,9 @@ static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *v const struct hlsl_deref *src = &load_from_node(var_node)->src; var = src->var; - if (src->offset) + if (src->offset.node) { - if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset, offset))) + if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset.node, offset))) return NULL; list_add_tail(instrs, &add->entry); offset = add; @@ -691,7 +691,7 @@ static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *v return NULL; init_node(&load->node, HLSL_IR_LOAD, data_type, loc); load->src.var = var; - load->src.offset = offset; + hlsl_src_from_node(&load->src.offset, offset); list_add_tail(instrs, &load->node.entry); return load; } @@ -2212,16 +2212,18 @@ jump_statement: selection_statement: KW_IF '(' expr ')' if_body { struct hlsl_ir_if *instr = d3dcompiler_alloc(sizeof(*instr)); + struct hlsl_ir_node *condition = node_from_list($3); + if (!instr) { ERR("Out of memory\n"); YYABORT; } init_node(&instr->node, HLSL_IR_IF, NULL, get_location(&@1)); - instr->condition = node_from_list($3); + hlsl_src_from_node(&instr->condition, condition); instr->then_instrs = $5.then_instrs; instr->else_instrs = $5.else_instrs; - if (instr->condition->data_type->dimx > 1 || instr->condition->data_type->dimy > 1) + if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) { hlsl_report_message(instr->node.loc, HLSL_LEVEL_ERROR, "if condition requires a scalar"); @@ -2883,19 +2885,18 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs var = assignment->lhs.var; if (!var->first_write) var->first_write = loop_first ? min(instr->index, loop_first) : instr->index; - assignment->rhs->last_read = instr->index; - if (assignment->lhs.offset) - assignment->lhs.offset->last_read = instr->index; + assignment->rhs.node->last_read = instr->index; + if (assignment->lhs.offset.node) + assignment->lhs.offset.node->last_read = instr->index; break; } case HLSL_IR_EXPR: { struct hlsl_ir_expr *expr = expr_from_node(instr); - expr->operands[0]->last_read = instr->index; - if (expr->operands[1]) - expr->operands[1]->last_read = instr->index; - if (expr->operands[2]) - expr->operands[2]->last_read = instr->index; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(expr->operands) && expr->operands[i].node; ++i) + expr->operands[i].node->last_read = instr->index; break; } case HLSL_IR_IF: @@ -2904,7 +2905,7 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs compute_liveness_recurse(iff->then_instrs, loop_first, loop_last); if (iff->else_instrs) compute_liveness_recurse(iff->else_instrs, loop_first, loop_last); - iff->condition->last_read = instr->index; + iff->condition.node->last_read = instr->index; break; } case HLSL_IR_LOAD: @@ -2912,8 +2913,8 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs struct hlsl_ir_load *load = load_from_node(instr); var = load->src.var; var->last_read = loop_last ? max(instr->index, loop_last) : instr->index; - if (load->src.offset) - load->src.offset->last_read = instr->index; + if (load->src.offset.node) + load->src.offset.node->last_read = instr->index; break; } case HLSL_IR_LOOP: @@ -2926,7 +2927,7 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs case HLSL_IR_SWIZZLE: { struct hlsl_ir_swizzle *swizzle = swizzle_from_node(instr); - swizzle->val->last_read = instr->index; + swizzle->val.node->last_read = instr->index; break; } case HLSL_IR_CONSTANT: diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 30aa9de1dd4..4bc3b9b0a64 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1369,9 +1369,8 @@ struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, stru return NULL; init_node(&expr->node, HLSL_IR_EXPR, type, *loc); expr->op = op; - expr->operands[0] = operands[0]; - expr->operands[1] = operands[1]; - expr->operands[2] = operands[2]; + for (i = 0; i <= 2; ++i) + hlsl_src_from_node(&expr->operands[i], operands[i]); list_add_tail(instrs, &expr->node.entry); return expr; @@ -1485,11 +1484,12 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh if (lhs->data_type->type == HLSL_CLASS_MATRIX) FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); - lhs_inner = swizzle->val; + lhs_inner = swizzle->val.node; + hlsl_src_remove(&swizzle->val); list_remove(&lhs->entry); list_add_after(&rhs->entry, &lhs->entry); - swizzle->val = rhs; + hlsl_src_from_node(&swizzle->val, rhs); if (!invert_swizzle(&swizzle->swizzle, &writemask, &width)) { hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid writemask"); @@ -1513,7 +1513,8 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh init_node(&assign->node, HLSL_IR_ASSIGNMENT, lhs_type, lhs->loc); assign->writemask = writemask; - assign->lhs = load_from_node(lhs)->src; + assign->lhs.var = load_from_node(lhs)->src.var; + hlsl_src_from_node(&assign->lhs.offset, load_from_node(lhs)->src.offset.node); if (assign_op != ASSIGN_OP_ASSIGN) { enum hlsl_ir_expr_op op = op_from_assignment(assign_op); @@ -1524,7 +1525,7 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh list_add_after(&rhs->entry, &expr->entry); rhs = expr; } - assign->rhs = rhs; + hlsl_src_from_node(&assign->rhs, rhs); list_add_tail(instrs, &assign->node.entry); return &assign->node; @@ -1787,12 +1788,12 @@ static void debug_dump_instr_list(const struct list *list) } } -static void debug_dump_src(const struct hlsl_ir_node *node) +static void debug_dump_src(const struct hlsl_src *src) { - if (node->index) - wine_dbg_printf("@%u", node->index); + if (src->node->index) + wine_dbg_printf("@%u", src->node->index); else - wine_dbg_printf("%p", node); + wine_dbg_printf("%p", src->node); } static void debug_dump_ir_var(const struct hlsl_ir_var *var) @@ -1806,15 +1807,15 @@ static void debug_dump_ir_var(const struct hlsl_ir_var *var) static void debug_dump_deref(const struct hlsl_deref *deref) { - if (deref->offset) + if (deref->offset.node) /* Print the variable's type for convenience. */ wine_dbg_printf("(%s %s)", debug_hlsl_type(deref->var->data_type), deref->var->name); else wine_dbg_printf("%s", deref->var->name); - if (deref->offset) + if (deref->offset.node) { wine_dbg_printf("["); - debug_dump_src(deref->offset); + debug_dump_src(&deref->offset); wine_dbg_printf("]"); } } @@ -1942,9 +1943,9 @@ static void debug_dump_ir_expr(const struct hlsl_ir_expr *expr) unsigned int i; wine_dbg_printf("%s (", debug_expr_op(expr)); - for (i = 0; i < 3 && expr->operands[i]; ++i) + for (i = 0; i < 3 && expr->operands[i].node; ++i) { - debug_dump_src(expr->operands[i]); + debug_dump_src(&expr->operands[i]); wine_dbg_printf(" "); } wine_dbg_printf(")"); @@ -1976,7 +1977,7 @@ static void debug_dump_ir_assignment(const struct hlsl_ir_assignment *assign) if (assign->writemask != BWRITERSP_WRITEMASK_ALL) wine_dbg_printf("%s", debug_writemask(assign->writemask)); wine_dbg_printf(" "); - debug_dump_src(assign->rhs); + debug_dump_src(&assign->rhs); wine_dbg_printf(")"); } @@ -1984,9 +1985,9 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) { unsigned int i; - debug_dump_src(swizzle->val); + debug_dump_src(&swizzle->val); wine_dbg_printf("."); - if (swizzle->val->data_type->dimy > 1) + if (swizzle->val.node->data_type->dimy > 1) { for (i = 0; i < swizzle->node.data_type->dimx; ++i) wine_dbg_printf("_m%u%u", (swizzle->swizzle >> i * 8) & 0xf, (swizzle->swizzle >> (i * 8 + 4)) & 0xf); @@ -2022,7 +2023,7 @@ static void debug_dump_ir_jump(const struct hlsl_ir_jump *jump) static void debug_dump_ir_if(const struct hlsl_ir_if *if_node) { wine_dbg_printf("if ("); - debug_dump_src(if_node->condition); + debug_dump_src(&if_node->condition); wine_dbg_printf(")\n{\n"); debug_dump_instr_list(if_node->then_instrs); wine_dbg_printf("}\n"); @@ -2135,21 +2136,29 @@ static void free_ir_constant(struct hlsl_ir_constant *constant) static void free_ir_load(struct hlsl_ir_load *load) { + hlsl_src_remove(&load->src.offset); d3dcompiler_free(load); } static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) { + hlsl_src_remove(&swizzle->val); d3dcompiler_free(swizzle); } static void free_ir_expr(struct hlsl_ir_expr *expr) { + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) + hlsl_src_remove(&expr->operands[i]); d3dcompiler_free(expr); } static void free_ir_assignment(struct hlsl_ir_assignment *assignment) { + hlsl_src_remove(&assignment->rhs); + hlsl_src_remove(&assignment->lhs.offset); d3dcompiler_free(assignment); } @@ -2157,6 +2166,7 @@ static void free_ir_if(struct hlsl_ir_if *if_node) { free_instr_list(if_node->then_instrs); free_instr_list(if_node->else_instrs); + hlsl_src_remove(&if_node->condition); d3dcompiler_free(if_node); } -- 2.27.0

4 11

[PATCH 1/3] ntdll: Reimplement NtQuerySystemInformation(SystemProcessInformation) using a single server call.
by Zebediah Figura 02 Jul '20

02 Jul '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This decreases CPU usage by wineserver from about 65% to about 45% for me in Street Fighter V, which for some reason calls this 15-20 times per second. dlls/ntdll/unix/system.c | 177 ++++++++++++++++----------------------- server/process.c | 56 +++++++++++++ server/protocol.def | 30 +++++++ server/trace.c | 34 ++++++++ 4 files changed, 191 insertions(+), 106 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 7045bc1550b..f89208997e2 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2083,132 +2083,97 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemProcessInformation: { - SYSTEM_PROCESS_INFORMATION *spi = info; - SYSTEM_PROCESS_INFORMATION *last = NULL; - HANDLE handle = 0; - WCHAR procname[1024]; - WCHAR* exename; - DWORD wlen = 0; - DWORD procstructlen = 0; + unsigned int process_count, i, j; + const struct process_info *server_process; + void *buffer = NULL; - SERVER_START_REQ( create_snapshot ) + if (size && !(buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { - req->flags = SNAP_PROCESS | SNAP_THREAD; - if (!(ret = wine_server_call( req ))) handle = wine_server_ptr_handle( reply->handle ); + ret = STATUS_NO_MEMORY; + break; } - SERVER_END_REQ; - len = 0; - while (ret == STATUS_SUCCESS) + SERVER_START_REQ( list_processes ) { - int unix_pid = -1; - SERVER_START_REQ( next_process ) - { - req->handle = wine_server_obj_handle( handle ); - req->reset = (len == 0); - wine_server_set_reply( req, procname, sizeof(procname) - sizeof(WCHAR) ); - if (!(ret = wine_server_call( req ))) - { - unix_pid = reply->unix_pid; - - /* Make sure procname is 0 terminated */ - procname[wine_server_reply_size(reply) / sizeof(WCHAR)] = 0; - - /* Get only the executable name, not the path */ - if ((exename = wcsrchr(procname, '\\')) != NULL) exename++; - else exename = procname; - - wlen = (wcslen(exename) + 1) * sizeof(WCHAR); - procstructlen = sizeof(*spi) + wlen + ((reply->threads - 1) * sizeof(SYSTEM_THREAD_INFORMATION)); + wine_server_set_reply( req, buffer, size ); + ret = wine_server_call( req ); + len = reply->user_len; + process_count = reply->process_count; + } + SERVER_END_REQ; - if (size >= len + procstructlen) - { - /* ftCreationTime, ftUserTime, ftKernelTime; - * vmCounters, ioCounters - */ - memset(spi, 0, sizeof(*spi)); + if (ret) + { + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + break; + } - spi->NextEntryOffset = procstructlen - wlen; - spi->dwThreadCount = reply->threads; + server_process = buffer; + len = 0; - /* spi->pszProcessName will be set later on */ + for (i = 0; i < process_count; i++) + { + const WCHAR *server_name = (const WCHAR *)(server_process + 1); + SYSTEM_PROCESS_INFORMATION *nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)info + len); + const struct thread_info *server_thread; + const WCHAR *file_part; + ULONG proc_len; + ULONG name_len = 0; - spi->dwBasePriority = reply->priority; - spi->UniqueProcessId = UlongToHandle(reply->pid); - spi->ParentProcessId = UlongToHandle(reply->ppid); - spi->HandleCount = reply->handles; + file_part = server_name + (server_process->name_len / sizeof(WCHAR)); + while (file_part > server_name && file_part[-1] != '\\') + { + file_part--; + name_len++; + } - /* spi->ti will be set later on */ + proc_len = sizeof(*nt_process) + server_process->thread_count * sizeof(SYSTEM_THREAD_INFORMATION) + + (name_len + 1) * sizeof(WCHAR); + len += proc_len; - } - len += procstructlen; - } - } - SERVER_END_REQ; - if (ret != STATUS_SUCCESS) + if (len <= size) { - if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; - break; + memset(nt_process, 0, sizeof(*nt_process)); + if (i < process_count - 1) + nt_process->NextEntryOffset = proc_len; + nt_process->dwThreadCount = server_process->thread_count; + nt_process->dwBasePriority = server_process->priority; + nt_process->UniqueProcessId = UlongToHandle(server_process->pid); + nt_process->ParentProcessId = UlongToHandle(server_process->parent_pid); + nt_process->HandleCount = server_process->handle_count; + get_thread_times( server_process->unix_pid, -1, &nt_process->KernelTime, &nt_process->UserTime ); } - if (size >= len) + server_thread = (const struct thread_info *)((const char *)server_name + server_process->name_len); + for (j = 0; j < server_process->thread_count; j++) { - int i, j; - - get_thread_times(unix_pid, -1, &spi->KernelTime, &spi->UserTime); - - /* set thread info */ - i = j = 0; - while (ret == STATUS_SUCCESS) + if (len <= size) { - int unix_tid, pid, tid, base_pri, delta_pri; - SERVER_START_REQ( next_thread ) - { - req->handle = wine_server_obj_handle( handle ); - req->reset = (j == 0); - if (!(ret = wine_server_call( req ))) - { - unix_tid = reply->unix_tid; - pid = reply->pid; - tid = reply->tid; - base_pri = reply->base_pri; - delta_pri = reply->delta_pri; - j++; - } - } - SERVER_END_REQ; - - if (!ret) - { - if (UlongToHandle(pid) == spi->UniqueProcessId) - { - memset(&spi->ti[i], 0, sizeof(spi->ti)); - - spi->ti[i].CreateTime.QuadPart = 0xdeadbeef; - spi->ti[i].ClientId.UniqueProcess = UlongToHandle(pid); - spi->ti[i].ClientId.UniqueThread = UlongToHandle(tid); - spi->ti[i].dwCurrentPriority = base_pri + delta_pri; - spi->ti[i].dwBasePriority = base_pri; - get_thread_times(unix_pid, unix_tid, &spi->ti[i].KernelTime, &spi->ti[i].UserTime); - i++; - } - } + nt_process->ti[j].CreateTime.QuadPart = 0xdeadbeef; + nt_process->ti[j].ClientId.UniqueProcess = UlongToHandle(server_process->pid); + nt_process->ti[j].ClientId.UniqueThread = UlongToHandle(server_thread->tid); + nt_process->ti[j].dwCurrentPriority = server_thread->current_priority; + nt_process->ti[j].dwBasePriority = server_thread->base_priority; + get_thread_times( server_process->unix_pid, server_thread->unix_tid, + &nt_process->ti[j].KernelTime, &nt_process->ti[j].UserTime ); } - if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; - - /* now append process name */ - spi->ProcessName.Buffer = (WCHAR*)((char*)spi + spi->NextEntryOffset); - spi->ProcessName.Length = wlen - sizeof(WCHAR); - spi->ProcessName.MaximumLength = wlen; - memcpy( spi->ProcessName.Buffer, exename, wlen ); - spi->NextEntryOffset += wlen; - last = spi; - spi = (SYSTEM_PROCESS_INFORMATION*)((char*)spi + spi->NextEntryOffset); + + server_thread++; } + + if (len <= size) + { + nt_process->ProcessName.Buffer = (WCHAR *)&nt_process->ti[server_process->thread_count]; + nt_process->ProcessName.Length = name_len * sizeof(WCHAR); + nt_process->ProcessName.MaximumLength = (name_len + 1) * sizeof(WCHAR); + memcpy(nt_process->ProcessName.Buffer, file_part, name_len * sizeof(WCHAR)); + nt_process->ProcessName.Buffer[name_len] = 0; + } + + server_process = (const struct process_info *)server_thread; } - if (ret == STATUS_SUCCESS && last) last->NextEntryOffset = 0; + if (len > size) ret = STATUS_INFO_LENGTH_MISMATCH; - if (handle) NtClose( handle ); break; } diff --git a/server/process.c b/server/process.c index 283edc09c5e..452861491f8 100644 --- a/server/process.c +++ b/server/process.c @@ -22,6 +22,7 @@ #include "wine/port.h" #include <assert.h> +#include <errno.h> #include <limits.h> #include <signal.h> #include <string.h> @@ -1819,3 +1820,58 @@ DECL_HANDLER(resume_process) release_object( process ); } } + +/* Get a list of processes and threads currently running */ +DECL_HANDLER(list_processes) +{ + struct process_info *process_info; + struct process *process; + struct thread *thread; + + reply->process_count = 0; + reply->user_len = 0; + + LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) + { + struct process_dll *exe = get_process_exe_module( process ); + reply->user_len += sizeof(struct process_info) + exe->namelen; + reply->user_len += process->running_threads * sizeof(struct thread_info); + reply->process_count++; + } + + if (reply->user_len > get_reply_max_size()) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + + process_info = set_reply_data_size( reply->user_len ); + if (!process_info) return; + + LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) + { + struct process_dll *exe = get_process_exe_module( process ); + WCHAR *name = (WCHAR *)(process_info + 1); + struct thread_info *thread_info = (struct thread_info *)((char *)name + exe->namelen); + + process_info->name_len = exe->namelen; + process_info->thread_count = process->running_threads; + process_info->priority = process->priority; + process_info->pid = process->id; + process_info->parent_pid = process->parent_id; + process_info->handle_count = get_handle_table_count(process); + process_info->unix_pid = process->unix_pid; + memcpy( name, exe->filename, exe->namelen ); + + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { + thread_info->tid = thread->id; + thread_info->base_priority = thread->priority; + thread_info->current_priority = thread->priority; /* FIXME */ + thread_info->unix_tid = thread->unix_tid; + thread_info++; + } + + process_info = (struct process_info *)thread_info; + } +} diff --git a/server/protocol.def b/server/protocol.def index 6416306c0a1..bd531a1a727 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1919,6 +1919,36 @@ enum char_info_mode @END +struct thread_info +{ + thread_id_t tid; + int base_priority; + int current_priority; + int unix_tid; +}; + +struct process_info +{ + data_size_t name_len; + unsigned int thread_count; + int priority; + process_id_t pid; + process_id_t parent_pid; + unsigned int handle_count; + int unix_pid; + /* VARARG(name,unicode_str,name_len); */ + /* VARARG(threads,struct thread_info,thread_count); */ +}; + +/* Get a list of processes and threads currently running */ +@REQ(list_processes) +@REPLY + data_size_t user_len; /* length needed to store user */ + unsigned int process_count; + VARARG(data,process_info); +@END + + /* Wait for a debug event */ @REQ(wait_debug_event) int get_handle; /* should we alloc a handle for waiting? */ diff --git a/server/trace.c b/server/trace.c index 2fb5afd5ef1..f39c7402d41 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1115,6 +1115,40 @@ static void dump_varargs_token_groups( const char *prefix, data_size_t size ) fputc( '}', stderr ); } +static void dump_varargs_process_info( const char *prefix, data_size_t size ) +{ + const struct process_info *process = cur_data; + const struct thread_info *thread; + data_size_t pos = 0; + unsigned int i; + + fprintf( stderr,"%s{", prefix ); + + while (size - pos >= sizeof(*process)) + { + fprintf( stderr, "[thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%08x,unix_pid=%d,", + process->thread_count, process->priority, process->pid, + process->parent_pid, process->handle_count, process->unix_pid ); + pos += sizeof(*process); + pos = dump_inline_unicode_string( "name=L\"", pos, process->name_len, size ); + fprintf( stderr, "\",threads={" ); + thread = (const struct thread_info *)((const char *)cur_data + pos); + for (i = 0; i < process->thread_count; i++) + { + if (size - pos < sizeof(*thread)) break; + fprintf( stderr, "[tid=%04x,base_priority=%d,current_priority=%d,unix_tid=%d],", + thread->tid, thread->base_priority, thread->current_priority, thread->unix_tid ); + pos += sizeof(*thread); + thread++; + } + fprintf( stderr, "}," ); + + process = (const struct process_info *)thread; + } + + fputc( '}', stderr ); +} + static void dump_varargs_object_attributes( const char *prefix, data_size_t size ) { const struct object_attributes *objattr = cur_data; -- 2.27.0

4 5

[PATCH 4/4] setupapi: Fix parameters of SPFILENOTIFY_FILEINCABINET handler.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Bug 42827 references the setup application that depends on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42827 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/4] setupapi/tests: Add tests for cabinet name passed to SPFILENOTIFY_FILEEXTRACTED.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/4] setupapi: Fix CabinetName passed to SPFILENOTIFY_CABINETINFO handler.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/4] setupapi/tests: Add more tests for SPFILENOTIFY_FILEINCABINET handler.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 4/4] mshtml: Add IMarkupServices::CreateMarkupPointer implementation.
by Jacek Caban 02 Jul '20

02 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 6 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/range.c | 294 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 22 +++ 4 files changed, 321 insertions(+), 2 deletions(-)

2 1

[PATCH 3/4] mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2.
by Jacek Caban 02 Jul '20

02 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtml.idl | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[PATCH 2/4] mshtml: Add IHTMLDocument4::namespaces property implementation.
by Jacek Caban 02 Jul '20

02 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 25 +++++- dlls/mshtml/mshtml_private.h | 4 + dlls/mshtml/omnavigator.c | 154 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 23 ++++++ 4 files changed, 202 insertions(+), 4 deletions(-)

2 1

[PATCH 1/4] mshtml.idl: Add IHTMLNamespaceCollection declaration.
by Jacek Caban 02 Jul '20

02 Jul '20

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

1 0

[PATCH vkd3d 5/5] vkd3d-compiler: Add a long option to specify the output file.
by Henri Verbeet 02 Jul '20

02 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 1586b45..da03df2 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -32,6 +32,7 @@ enum { OPTION_HELP = CHAR_MAX + 1, + OPTION_OUTPUT, OPTION_STRIP_DEBUG, OPTION_VERSION, }; @@ -100,7 +101,7 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" - " -o <file> Write the output to <file>.\n" + " -o, --output=<file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -- Stop option processing. Any subsequent argument is\n" @@ -153,10 +154,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { - {"help", no_argument, NULL, OPTION_HELP}, - {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, - {"version", no_argument, NULL, OPTION_VERSION}, - {NULL, 0, NULL, 0}, + {"help", no_argument, NULL, OPTION_HELP}, + {"output", required_argument, NULL, OPTION_OUTPUT}, + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, + {NULL, 0, NULL, 0}, }; memset(options, 0, sizeof(*options)); @@ -168,6 +170,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) switch (option) { + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; break; -- 2.11.0

2 1

[PATCH vkd3d 4/5] vkd3d-compiler: Add a --version option.
by Henri Verbeet 02 Jul '20

02 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index e975572..1586b45 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -33,6 +33,7 @@ enum { OPTION_HELP = CHAR_MAX + 1, OPTION_STRIP_DEBUG, + OPTION_VERSION, }; static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) @@ -101,6 +102,7 @@ static void print_usage(const char *program_name) " -h, --help Display this information and exit.\n" " -o <file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" + " -V, --version Display version information and exit.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n"; @@ -111,6 +113,7 @@ struct options { const char *filename; const char *output_filename; + bool print_version; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -152,6 +155,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { {"help", no_argument, NULL, OPTION_HELP}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, }; @@ -159,7 +163,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "ho:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ho:V", long_options, NULL)) == -1) break; switch (option) @@ -172,6 +176,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; + case OPTION_VERSION: + case 'V': + options->print_version = true; + return true; + default: return false; } @@ -198,6 +207,12 @@ int main(int argc, char **argv) return 1; } + if (options.print_version) + { + fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION "\n"); + return 0; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; -- 2.11.0

2 1

[PATCH vkd3d 2/5] vkd3d-compiler: Use getopt to parse command-line options.
by Henri Verbeet 02 Jul '20

02 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 61 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 03dc322..8fa4d4f 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -22,12 +22,18 @@ #include <stdlib.h> #include <sys/stat.h> #include <unistd.h> +#include <getopt.h> #include "vkd3d_common.h" #include "vkd3d_shader.h" #define MAX_COMPILE_OPTIONS 1 +enum +{ + OPTION_STRIP_DEBUG = CHAR_MAX + 1, +}; + static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) { struct stat st; @@ -86,23 +92,15 @@ static bool write_shader(const struct vkd3d_shader_code *shader, const char *fil return true; } -static const struct -{ - const char *name; - enum vkd3d_shader_compile_option_name compile_option; -} -compiler_options[] = -{ - {"--strip-debug", VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG}, -}; - static void print_usage(const char *program_name) { static const char usage[] = "[options...] file\n" "Options:\n" " -o <file> Write the output to <file>.\n" - " --strip-debug Strip debug information from the output.\n"; + " --strip-debug Strip debug information from the output.\n" + " -- Stop option processing. Any subsequent argument is\n" + " interpreted as a filename.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -145,36 +143,41 @@ static void add_compile_option(struct options *options, static bool parse_command_line(int argc, char **argv, struct options *options) { - unsigned int i, j; + int option; - if (argc < 2) - return false; + static struct option long_options[] = + { + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {NULL, 0, NULL, 0}, + }; memset(options, 0, sizeof(*options)); - for (i = 1; i < argc - 1; ++i) + for (;;) { - if (!strcmp(argv[i], "-o")) - { - if (i + 1 >= argc - 1) - return false; - options->output_filename = argv[++i]; - continue; - } + if ((option = getopt_long(argc, argv, "o:", long_options, NULL)) == -1) + break; - for (j = 0; j < ARRAY_SIZE(compiler_options); ++j) + switch (option) { - if (!strcmp(argv[i], compiler_options[j].name)) - { - add_compile_option(options, compiler_options[j].compile_option, 1); + case 'o': + options->output_filename = optarg; + break; + + case OPTION_STRIP_DEBUG: + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; - } + + default: + return false; } - if (j == ARRAY_SIZE(compiler_options)) - return false; } + if (optind >= argc) + return false; + options->filename = argv[argc - 1]; + return true; } -- 2.11.0

2 1

[PATCH vkd3d 1/5] vkd3d-compiler: Print a slightly more elaborate usage message.
by Henri Verbeet 02 Jul '20

02 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 48ca42a..03dc322 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -98,12 +98,13 @@ compiler_options[] = static void print_usage(const char *program_name) { - unsigned int i; + static const char usage[] = + "[options...] file\n" + "Options:\n" + " -o <file> Write the output to <file>.\n" + " --strip-debug Strip debug information from the output.\n"; - fprintf(stderr, "usage: %s", program_name); - for (i = 0; i < ARRAY_SIZE(compiler_options); ++i) - fprintf(stderr, " [%s]", compiler_options[i].name); - fprintf(stderr, " [-o <out_spirv_filename>] <dxbc_filename>\n"); + fprintf(stderr, "Usage: %s %s", program_name, usage); } struct options -- 2.11.0

2 1

[PATCH] ntdll: Add PE frame handling to KiUserExceptionDispatcher() on x64.
by Paul Gofman 02 Jul '20

02 Jul '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b575d638571..dde0bb7339e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -588,15 +588,22 @@ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, "mov %rbp,-0x10(%rcx)\n\t" "mov %rdi,-0x18(%rcx)\n\t" "mov %rsi,-0x20(%rcx)\n\t" - "mov %rcx,%rbp\n\t" + "lea -0x10(%rcx),%rbp\n\t" "mov %rsp,%rdx\n\t" /* context */ "lea 0x4f0(%rsp),%rcx\n\t" /* rec */ + __ASM_SEH(".seh_pushreg %rbp\n\t") + __ASM_SEH(".seh_setframe %rbp,0\n\t") + __ASM_SEH(".seh_pushreg %rdi\n\t") + __ASM_SEH(".seh_pushreg %rsi\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_signal_frame\n\t") - __ASM_CFI(".cfi_def_cfa %rbp,0\n\t") - __ASM_CFI(".cfi_rel_offset %rip,-0x8\n\t") - __ASM_CFI(".cfi_rel_offset %rbp,-0x10\n\t") - __ASM_CFI(".cfi_rel_offset %rdi,-0x18\n\t") - __ASM_CFI(".cfi_rel_offset %rsi,-0x20\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x10\n\t") + __ASM_CFI(".cfi_def_cfa %rbp,0x10\n\t") + __ASM_CFI(".cfi_rel_offset %rip,0x8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0x0\n\t") + __ASM_CFI(".cfi_rel_offset %rdi,-0x8\n\t") + __ASM_CFI(".cfi_rel_offset %rsi,-0x10\n\t") "call " __ASM_NAME("dispatch_exception") "\n\t" "int3") -- 2.26.2

1 0

[PATCH] ntdll: Don't reset rsp to context->Rsp until exception data is copied.
by Paul Gofman 02 Jul '20

02 Jul '20

Context record may be stored on stack below context stack. This happens, e. g., with RtlRaiseException(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 5334a4d7cc6..264d20de0cd 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1979,17 +1979,21 @@ __ASM_GLOBAL_FUNC( user_exception_dispatcher_trampoline, void WINAPI do_call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context, struct stack_layout *stack) { - memcpy(&stack->context, context, sizeof(*context)); + memmove(&stack->context, context, sizeof(*context)); memcpy(&stack->rec, rec, sizeof(*rec)); user_exception_dispatcher_trampoline( stack, pKiUserExceptionDispatcher ); } __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, - "movq 0x98(%rdx),%rsp\n\t" /* context->Rsp */ - "and $~0xf,%rsp\n\t" - "sub $0x630,%rsp\n\t" /* sizeof(struct stack_layout) */ - "movq %rsp,%r8\n\t" + "movq 0x98(%rdx),%r8\n\t" /* context->Rsp */ + "andq $~0xf,%r8\n\t" + "subq $0x630,%r8\n\t" /* sizeof(struct stack_layout) */ + "cmpq %r8,%rsp\n\t" + "jae done\n\t" + "movq %r8,%rsp\n\t" + + "done:" "jmp " __ASM_NAME("do_call_user_exception_dispatcher") "\n\t") /*********************************************************************** -- 2.26.2

3 5

[PATCH 1/2] ntdll: Fix KiUserExceptionDispatcher ABI on x86.
by Paul Gofman 02 Jul '20

02 Jul '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/signal_i386.c | 9 ++- dlls/ntdll/tests/exception.c | 111 +++++++++++++++++++++++++++++++++- dlls/ntdll/unix/signal_i386.c | 9 +-- 3 files changed, 121 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 676329c5bd2..aa19c632be2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -198,7 +198,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) /******************************************************************* * KiUserExceptionDispatcher (NTDLL.@) */ -NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { NTSTATUS status; DWORD c; @@ -243,6 +243,13 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte return NtRaiseException( rec, context, FALSE ); } +__ASM_GLOBAL_FUNC( KiUserExceptionDispatcher@8, + /* hotpatch prologue. */ + "push %ebp\n\t" + "mov %esp,%ebp\n\t" + "pop %ebp\n\t" + "call " __ASM_NAME("dispatch_exception") "\n\t" + "int3") /*********************************************************************** * save_fpu diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 95d25375f77..a27dee21f00 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1660,6 +1660,114 @@ static void test_thread_context(void) #undef COMPARE } +static BYTE saved_KiUserExceptionDispatcher_bytes[7]; +static void *pKiUserExceptionDispatcher; +static BOOL hook_called; +static void *hook_KiUserExceptionDispatcher_eip; +static void *dbg_except_continue_handler_eip; +static void *hook_exception_address; + +static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + ok(hook_called, "Hook was not called.\n"); + got_exception = 1; + dbg_except_continue_handler_eip = (void *)context->Eip; + ++context->Eip; + return ExceptionContinueExecution; +} + +/* Use CDECL to leave arguments on stack. */ +void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) +{ + trace("rec %p, context %p.\n", rec, context); + trace("context->Eip %#x, context->Esp %#x, ContextFlags %#x.\n", + context->Eip, context->Esp, context->ContextFlags); + + hook_called = TRUE; + /* Broken on Win2008, probably rec offset in stack is different. */ + ok(rec->ExceptionCode == 0x80000003 || broken(!rec->ExceptionCode), + "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + + hook_KiUserExceptionDispatcher_eip = (void *)context->Eip; + hook_exception_address = rec->ExceptionAddress; + memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, + sizeof(saved_KiUserExceptionDispatcher_bytes)); +} + +static void test_kiuserexceptiondispatcher(void) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + static const BYTE except_code[] = + { + 0xcc, /* int3 */ + 0xc3, /* ret */ + }; + static BYTE hook_trampoline[] = + { + 0xff, 0x15, + /* offset: 2 bytes */ + 0x00, 0x00, 0x00, 0x00, /* callq *addr */ /* call hook implementation. */ + + 0xff, 0x25, + /* offset: 8 bytes */ + 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ + }; + void *phook_KiUserExceptionDispatcher = hook_KiUserExceptionDispatcher; + void *phook_trampoline = hook_trampoline; + DWORD old_protect1, old_protect2; + BYTE *ptr; + BOOL ret; + + pKiUserExceptionDispatcher = (void *)GetProcAddress(hntdll, "KiUserExceptionDispatcher"); + if (!pKiUserExceptionDispatcher) + { + win_skip("KiUserExceptionDispatcher is not available.\n"); + return; + } + + *(unsigned int *)(hook_trampoline + 2) = (ULONG_PTR)&phook_KiUserExceptionDispatcher; + *(unsigned int *)(hook_trampoline + 8) = (ULONG_PTR)&pKiUserExceptionDispatcher; + + ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), + PAGE_EXECUTE_READWRITE, &old_protect2); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, + sizeof(saved_KiUserExceptionDispatcher_bytes)); + ptr = (BYTE *)pKiUserExceptionDispatcher; + /* mov hook_trampoline, %eax */ + *ptr++ = 0xa1; + *(void **)ptr = &phook_trampoline; + ptr += sizeof(void *); + /* jmp *eax */ + *ptr++ = 0xff; + *ptr++ = 0xe0; + + got_exception = 0; + run_exception_test(dbg_except_continue_handler, NULL, except_code, ARRAY_SIZE(except_code), + PAGE_EXECUTE_READ); + ok(got_exception, "Handler was not called.\n"); + ok(hook_called, "Hook was not called.\n"); + + ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, + "Got unexpected exception address %p, expected %p.\n", + hook_exception_address, code_mem); + todo_wine ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_eip, code_mem); + ok(dbg_except_continue_handler_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_eip, code_mem); + + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), + old_protect2, &old_protect2); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), old_protect1, &old_protect1); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); +} + #elif defined(__x86_64__) #define is_wow64 0 @@ -3751,7 +3859,6 @@ START_TEST(exception) test_suspend_thread(); test_suspend_process(); test_unload_trace(); - test_kiuserexceptiondispatcher(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); @@ -3766,5 +3873,7 @@ START_TEST(exception) #endif + test_kiuserexceptiondispatcher(); + VirtualFree(code_mem, 0, MEM_RELEASE); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 730d0b1cb32..29d0e2adeaf 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -428,7 +428,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) /* stack layout when calling an exception raise function */ struct stack_layout { - void *ret_addr; /* return address from raise_generic_exception */ EXCEPTION_RECORD *rec_ptr; /* first arg for raise_generic_exception */ CONTEXT *context_ptr; /* second arg for raise_generic_exception */ CONTEXT context; @@ -1583,15 +1582,13 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * FS_sig(sigcontext) = get_fs(); GS_sig(sigcontext) = get_gs(); SS_sig(sigcontext) = get_ds(); - stack->ret_addr = (void *)0xdeadbabe; /* KiUserExceptionDispatcher must not return */ stack->rec_ptr = &stack->rec; /* arguments for KiUserExceptionDispatcher */ stack->context_ptr = &stack->context; } -void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - pKiUserExceptionDispatcher( rec, context ); -} +__ASM_GLOBAL_FUNC( call_user_exception_dispatcher, + "add $4,%esp\n\t" + "jmp *pKiUserExceptionDispatcher\n\t") /********************************************************************** * get_fpu_code -- 2.26.2

3 3

[PATCH 6/6] msi: Install feature when new component is added.
by Piotr Caban 02 Jul '20

02 Jul '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49350 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/action.c | 112 +++++++++++++++++++++++++++++++++++++---- dlls/msi/msipriv.h | 2 + dlls/msi/patch.c | 5 ++ dlls/msi/tests/patch.c | 2 +- 4 files changed, 110 insertions(+), 11 deletions(-)

2 1

[PATCH 5/6] msi: Add disabled feature to show that it's not getting installed by patch.
by Piotr Caban 02 Jul '20

02 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/patch.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)

2 1

[PATCH 4/6] msi: Test adding new feature in patch.
by Piotr Caban 02 Jul '20

02 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/patch.c | 126 +++++++++++++++++++++++++---------------- 1 file changed, 77 insertions(+), 49 deletions(-)

2 1

[PATCH 3/6] msi: Add support for appending data to _TransformView table.
by Piotr Caban 02 Jul '20

02 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/table.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-)

2 1

[PATCH 2/6] msi: Remove no longer needed parameter from TABLE_remove_column.
by Piotr Caban 02 Jul '20

02 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/table.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)

2 1

[PATCH 1/6] msi: Fix use after free error in TransformView_set_row.
by Piotr Caban 02 Jul '20

02 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/table.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

2 1

[PATCH] ntdll: Pass the start of the string to compose_string().
by Huw Davies 02 Jul '20

02 Jul '20

Fixes a regression caused by 520040dc4a287fd62d7d5161c083cee990c3d6e6. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 789a3984052..eb75e6e949a 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -557,7 +557,7 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) } reslen = dstlen - (dstend - dst); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces NFD */ - if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen ); + if (reslen && nfc_table) reslen = compose_string( nfc_table, dst - reslen, reslen ); #endif } return reslen; -- 2.23.0

1 0

[PATCH] iphlpapi: Return gateway address 0.0.0.0/255.255.255.255 from GetAdaptersInfo if it's not set.
by Hans Leidekker 02 Jul '20

02 Jul '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ dlls/iphlpapi/tests/iphlpapi.c | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ff9d0d3a53..c039086229 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -742,6 +742,8 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) } /* Find first router through this interface, which we'll assume * is the default gateway for this adapter */ + strcpy(ptr->GatewayList.IpAddress.String, "0.0.0.0"); + strcpy(ptr->GatewayList.IpMask.String, "255.255.255.255"); for (i = 0; i < routeTable->dwNumEntries; i++) if (routeTable->table[i].dwForwardIfIndex == ptr->Index && routeTable->table[i].u1.ForwardType == diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d5690c11ee..6965ae8457 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1120,10 +1120,13 @@ static void testGetAdaptersInfo(void) apiReturn); ptr = buf; while (ptr) { - ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP address must be present\n"); ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); - trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, - ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + ok(ptr->GatewayList.IpAddress.String[0], "A valid IP address must be present\n"); + ok(ptr->GatewayList.IpMask.String[0], "A valid mask must be present\n"); + trace("adapter '%s', address %s/%s gateway %s/%s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String, + ptr->GatewayList.IpAddress.String, ptr->GatewayList.IpMask.String); ptr = ptr->Next; } HeapFree(GetProcessHeap(), 0, buf); -- 2.20.1

1 0

[PATCH v6 4/4] server: Make that subwindows shouldn`t change existing WS_EX_TOPMOST extended styles
by Jiajin Cui 02 Jul '20

02 Jul '20

2 1

[PATCH v6 4/4] server: Make that subwindows shouldn't change existing WS_EX_TOPMOST extended styles.
by Jiajin Cui 02 Jul '20

02 Jul '20

1 0

[PATCH v6 3/4] user32: Make that subwindows shouldn't change z-order when calling SetWindowPos with TOPMOST/NOTOPMOST.
by Jiajin Cui 02 Jul '20

02 Jul '20

1 0

[PATCH v6 3/4] user32: Make that subwindows shouldn`t change z-order when calling SetWindowPos with TOPMOST/NOTOPMOST.
by Jiajin Cui 02 Jul '20

02 Jul '20

2 1

[PATCH v6 2/4] user32/tests: Add test to check z-order for child window call SetWindowPos.
by Jiajin Cui 02 Jul '20

02 Jul '20

2 1

[PATCH v6 4/4] server: Make that subwindows shouldn`t change existing WS_EX_TOPMOST extended styles.
by Jiajin Cui 02 Jul '20

02 Jul '20

1 0

[PATCH v6 1/4] user32/tests: Add test to check message for child window call SetWindowPos with TOPMOST/TOP/NOTOPMOST.
by Jiajin Cui 02 Jul '20

02 Jul '20

1 0

[PATCH] user32/tests: Fix test that has been successful.
by Jiajin Cui 02 Jul '20

02 Jul '20

3 4

[PATCH] advapi32: Add RegRenameKey stub.
by Shawn M. Chapla 01 Jul '20

01 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 64b0288dc9..fcef859a7c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -676,7 +676,7 @@ @ stdcall -import RegQueryValueExW(long wstr ptr ptr ptr ptr) @ stdcall RegQueryValueW(long wstr ptr ptr) @ stub RegRemapPreDefKey -# @ stub RegRenameKey +@ stdcall RegRenameKey(long wstr wstr) @ stdcall RegReplaceKeyA(long str str str) @ stdcall RegReplaceKeyW(long wstr wstr wstr) @ stdcall -import RegRestoreKeyA(long str long) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7cfdbaa53b..ba24d648ff 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -507,6 +507,17 @@ LSTATUS WINAPI RegReplaceKeyW( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewFile, } +/****************************************************************************** + * RegRenameKey [ADVAPI32.@] + * + */ +LSTATUS WINAPI RegRenameKey( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewName ) +{ + FIXME("(%p,%s,%s): stub\n", hkey, debugstr_w(lpSubKey), debugstr_w(lpNewName)); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + /****************************************************************************** * RegReplaceKeyA [ADVAPI32.@] * -- 2.27.0

1 0

[PATCH 5/5] include: Add IXACT3WaveBank definition.
by Vijay Kiran Kamuju 01 Jul '20

01 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 4/5] include: Add IXACT3SoundBank definition.
by Vijay Kiran Kamuju 01 Jul '20

01 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 3/5] include: Add IXACT3Wave definition.
by Vijay Kiran Kamuju 01 Jul '20

01 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 2/5] include: Add IXACT3Cue definition.
by Vijay Kiran Kamuju 01 Jul '20

01 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 1/5] include: Add xact3.h
by Vijay Kiran Kamuju 01 Jul '20

01 Jul '20

Based on work by Ethan Lee and Alistair Leslie-Hughes Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH] configure: Increase Wine loader address.
by Paul Gofman 01 Jul '20

01 Jul '20

PE ntdll.dll does not fit in 0x7bc00000-0x7c000000 range with certain builds with debug info. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3c03bad292e..6e6c9da3951 100644 --- a/configure.ac +++ b/configure.ac @@ -965,7 +965,7 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,--export-dynamic], [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" WINE_TRY_CFLAGS([-Wl,--rpath,\$ORIGIN/../lib], [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" @@ -982,12 +982,12 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; - *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7c000000" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; esac], - [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7c000400], + [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7d000400], [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; - *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7c000400" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; esac]) AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) if test "x$PRELINK" = xfalse -- 2.26.2

2 4

[PATCH] winegstreamer: Append a deinterlace element to the video post-processing chain.
by Zebediah Figura 01 Jul '20

01 Jul '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30366 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5697d2c0e0c..e6f00842df5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -995,7 +995,16 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * if (!strcmp(typename, "video/x-raw")) { - GstElement *vconv, *flip; + GstElement *vconv, *flip, *deinterlace; + + /* DirectShow can express interlaced video, but downstream filters can't + * necessarily consume it. In particular, the video renderer can't. */ + if (!(deinterlace = gst_element_factory_make("deinterlace", NULL))) + { + ERR("Failed to create deinterlace, are %u-bit GStreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + goto out; + } /* decodebin considers many YUV formats to be "raw", but some quartz * filters can't handle those. Also, videoflip can't handle all "raw" @@ -1018,14 +1027,18 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto out; } - gst_bin_add(GST_BIN(This->container), vconv); /* bin takes ownership */ + /* The bin takes ownership of these elements. */ + gst_bin_add(GST_BIN(This->container), deinterlace); + gst_element_sync_state_with_parent(deinterlace); + gst_bin_add(GST_BIN(This->container), vconv); gst_element_sync_state_with_parent(vconv); - gst_bin_add(GST_BIN(This->container), flip); /* bin takes ownership */ + gst_bin_add(GST_BIN(This->container), flip); gst_element_sync_state_with_parent(flip); + gst_element_link(deinterlace, vconv); gst_element_link(vconv, flip); - pin->post_sink = gst_element_get_static_pad(vconv, "sink"); + pin->post_sink = gst_element_get_static_pad(deinterlace, "sink"); pin->post_src = gst_element_get_static_pad(flip, "src"); pin->flip = flip; } -- 2.27.0

1 0

[PATCH] wininet: Increase user size to 'UNLEN + 1' in create_cookie_url().
by Serge Gautherie 01 Jul '20

01 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/wininet/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index b5f779b..4d0967b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -147,7 +147,7 @@ static cookie_domain_t *get_cookie_domain(substr_t domain, BOOL create) static WCHAR *create_cookie_url(substr_t domain, substr_t path, substr_t *ret_path) { - WCHAR user[UNLEN], *p, *url; + WCHAR user[UNLEN + 1], *p, *url; DWORD len, user_len, i; static const WCHAR cookie_prefix[] = {'C','o','o','k','i','e',':'}; -- 2.10.0.windows.1

2 2

[PATCH 4/4] kernel32: Move AllocConsole to kernelbase.
by Jacek Caban 01 Jul '20

01 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 170 -------------------------------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/console.c | 106 ++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 108 insertions(+), 172 deletions(-)

2 1

[PATCH 2/4] kernel32: Import FreeConsole from kernelbase.
by Jacek Caban 01 Jul '20

01 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 22 ++-------------------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 23 +---------------------- 3 files changed, 4 insertions(+), 43 deletions(-)

2 1

[PATCH 3/4] kernel32: Return standard input handle in GetConsoleInputWaitHandle.
by Jacek Caban 01 Jul '20

01 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 17 +---------------- dlls/kernel32/tests/console.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 17 deletions(-)

1 0

[PATCH 1/4] kernelbase: Invalidate console wait handle in FreeConsole.
by Jacek Caban 01 Jul '20

01 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- That's how kernel32 handles it. I think this will need to be reimplemented, but to do it incrementally, it would be very useful to have alloc, free and attach console functionality in one place first. dlls/kernelbase/console.c | 22 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.h | 1 + dlls/kernelbase/sync.c | 20 +------------------- 3 files changed, 24 insertions(+), 19 deletions(-)

1 0

[PATCH v2 1/4] gdiplus/tests: Add metafile playback test for EMR_RESTOREDC.
by Shawn M. Chapla 01 Jul '20

01 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- v2: - Use L"description" rather than explicitly spelling out a WCHAR string. dlls/gdiplus/tests/metafile.c | 122 ++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 3ffdb7b0e9..c8bb89a776 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2832,6 +2832,127 @@ static void test_fillpath(void) expect(GenericError, stat); } +static const emfplus_record restoredc_records[] = { + { EMR_HEADER }, + { EMR_CREATEBRUSHINDIRECT }, + { EMR_SELECTOBJECT }, + + { EMR_SAVEDC }, + { EMR_SETVIEWPORTORGEX }, + { EMR_SAVEDC }, + { EMR_SETVIEWPORTORGEX }, + { EMR_SAVEDC }, + { EMR_SETVIEWPORTORGEX }, + + { EMR_RECTANGLE }, + + { EMR_RESTOREDC }, + { EMR_RECTANGLE }, + + { EMR_RESTOREDC }, + { EMR_RECTANGLE }, + + { EMR_SELECTOBJECT }, + { EMR_DELETEOBJECT }, + { EMR_EOF }, + { 0 } +}; + +static void test_restoredc(void) +{ + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + + GpBitmap *bitmap; + GpGraphics *graphics; + GpMetafile *metafile; + GpStatus stat; + HDC hdc, metafile_dc; + HBRUSH hbrush, holdbrush; + ARGB color; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel, + L"winetest", &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + hbrush = CreateSolidBrush(0xff0000); + holdbrush = SelectObject(metafile_dc, hbrush); + + SaveDC(metafile_dc); + SetViewportOrgEx(metafile_dc, 20, 20, NULL); + + SaveDC(metafile_dc); + SetViewportOrgEx(metafile_dc, 40, 40, NULL); + + SaveDC(metafile_dc); + SetViewportOrgEx(metafile_dc, 60, 60, NULL); + + Rectangle(metafile_dc, 0, 0, 3, 3); + RestoreDC(metafile_dc, -2); + + Rectangle(metafile_dc, 0, 0, 3, 3); + RestoreDC(metafile_dc, -1); + + Rectangle(metafile_dc, 0, 0, 3, 3); + + SelectObject(metafile_dc, holdbrush); + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, restoredc_records, "restoredc metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "restoredc.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, restoredc_records, "restoredc playback", dst_points, + &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 1, 1, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 21, 21, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 41, 41, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 61, 61, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2880,6 +3001,7 @@ START_TEST(metafile) test_properties(); test_drawpath(); test_fillpath(); + test_restoredc(); GdiplusShutdown(gdiplusToken); } -- 2.27.0

2 8

[PATCH] ntdll: Add missing strcpy in unix_to_win_locale().
by Gijs Vermeulen 01 Jul '20

01 Jul '20

Fixes a regression introduced by b6722aa7527abc71cb46ab75e4b875c288408d52 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49494 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/unix/env.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e57b625689..955563be20 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -661,6 +661,8 @@ static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) if (!unix_name || !unix_name[0]) return FALSE; } + strcpy( buffer, unix_name ); + if (!(p = strpbrk( buffer, sep ))) { if (!strcmp( buffer, "POSIX" ) || !strcmp( buffer, "C" )) -- 2.27.0

1 0

[v2 PATCH 1/5] evr: Add a stub for default presenter.
by Nikolay Sivov 01 Jul '20

01 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/Makefile.in | 3 +- dlls/evr/evr.spec | 2 +- dlls/evr/evr_classes.idl | 7 ++ dlls/evr/evr_private.h | 23 +++++ dlls/evr/main.c | 1 + dlls/evr/presenter.c | 218 +++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 35 +++++++ include/evr.idl | 1 + 8 files changed, 288 insertions(+), 2 deletions(-) create mode 100644 dlls/evr/presenter.c diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 5671511f6ae..daaf9cc872a 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -8,6 +8,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ evr.c \ main.c \ - mixer.c + mixer.c \ + presenter.c IDL_SRCS = evr_classes.idl diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index 214f2b81d85..e46cb04f644 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -17,7 +17,7 @@ @ stub MFCreateVideoMixerAndPresenter @ stub MFCreateVideoOTA @ stub MFCreateVideoPresenter2 -@ stub MFCreateVideoPresenter +@ stdcall MFCreateVideoPresenter(ptr ptr ptr ptr) @ stub MFCreateVideoSampleAllocator @ stdcall MFCreateVideoSampleFromSurface(ptr ptr) @ stub MFGetPlaneSize diff --git a/dlls/evr/evr_classes.idl b/dlls/evr/evr_classes.idl index 31f0d34fe75..1885a34d77f 100644 --- a/dlls/evr/evr_classes.idl +++ b/dlls/evr/evr_classes.idl @@ -31,3 +31,10 @@ coclass EnhancedVideoRenderer { interface IBaseFilter; } uuid(e474e05a-ab65-4f6a-827c-218b1baaf31f) ] coclass MFVideoMixer9 { interface IMFTransform; } + +[ + helpstring("MF Video Presenter"), + threading(both), + uuid(98455561-5136-4d28-ab08-4cee40ea2781) +] +coclass MFVideoPresenter9 { interface IMFVideoPresenter; } diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 5698eb0c21e..7ae83140579 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -22,8 +22,31 @@ #include "dshow.h" #include "evr.h" #include "wine/strmbase.h" +#include "wine/debug.h" + +static inline const char *debugstr_time(LONGLONG time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; +HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; #endif /* __EVR_PRIVATE_INCLUDED__ */ diff --git a/dlls/evr/main.c b/dlls/evr/main.c index 85c81f13604..2c6db8430ba 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -72,6 +72,7 @@ static const struct object_creation_info object_creation[] = { { &CLSID_EnhancedVideoRenderer, evr_filter_create }, { &CLSID_MFVideoMixer9, evr_mixer_create }, + { &CLSID_MFVideoPresenter9, evr_presenter_create }, }; static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c new file mode 100644 index 00000000000..234c1f076ca --- /dev/null +++ b/dlls/evr/presenter.c @@ -0,0 +1,218 @@ +/* + * Copyright 2020 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "evr.h" +#include "d3d9.h" +#include "mfapi.h" +#include "mferror.h" + +#include "evr_classes.h" +#include "evr_private.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(evr); + +struct video_presenter +{ + IMFVideoPresenter IMFVideoPresenter_iface; + IUnknown IUnknown_inner; + IUnknown *outer_unk; + LONG refcount; +}; + +static struct video_presenter *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IUnknown_inner); +} + +static struct video_presenter *impl_from_IMFVideoPresenter(IMFVideoPresenter *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IUnknown(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + } + else if (IsEqualIID(riid, &IID_IMFClockStateSink) + || IsEqualIID(riid, &IID_IMFVideoPresenter)) + { + *obj = &presenter->IMFVideoPresenter_iface; + } + else + { + WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static ULONG WINAPI video_presenter_inner_AddRef(IUnknown *iface) +{ + struct video_presenter *presenter = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&presenter->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) +{ + struct video_presenter *presenter = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&presenter->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(presenter); + } + + return refcount; +} + +static const IUnknownVtbl video_presenter_inner_vtbl = +{ + video_presenter_inner_QueryInterface, + video_presenter_inner_AddRef, + video_presenter_inner_Release, +}; + +static HRESULT WINAPI video_presenter_QueryInterface(IMFVideoPresenter *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + return IUnknown_QueryInterface(presenter->outer_unk, riid, obj); +} + +static ULONG WINAPI video_presenter_AddRef(IMFVideoPresenter *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + return IUnknown_AddRef(presenter->outer_unk); +} + +static ULONG WINAPI video_presenter_Release(IMFVideoPresenter *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + return IUnknown_Release(presenter->outer_unk); +} + +static HRESULT WINAPI video_presenter_OnClockStart(IMFVideoPresenter *iface, MFTIME systime, LONGLONG offset) +{ + FIXME("%p, %s, %s.\n", iface, debugstr_time(systime), wine_dbgstr_longlong(offset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_OnClockStop(IMFVideoPresenter *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_OnClockPause(IMFVideoPresenter *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_OnClockRestart(IMFVideoPresenter *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_OnClockSetRate(IMFVideoPresenter *iface, MFTIME systime, float rate) +{ + FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, MFVP_MESSAGE_TYPE message, ULONG_PTR param) +{ + FIXME("%p, %d, %lu.\n", iface, message, param); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_GetCurrentMediaType(IMFVideoPresenter *iface, IMFVideoMediaType **media_type) +{ + FIXME("%p, %p.\n", iface, media_type); + + return E_NOTIMPL; +} + +static const IMFVideoPresenterVtbl video_presenter_vtbl = +{ + video_presenter_QueryInterface, + video_presenter_AddRef, + video_presenter_Release, + video_presenter_OnClockStart, + video_presenter_OnClockStop, + video_presenter_OnClockPause, + video_presenter_OnClockRestart, + video_presenter_OnClockSetRate, + video_presenter_ProcessMessage, + video_presenter_GetCurrentMediaType, +}; + +HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) +{ + TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); + + *obj = NULL; + + if (!IsEqualIID(riid_device, &IID_IDirect3DDevice9)) + return E_INVALIDARG; + + return CoCreateInstance(&CLSID_MFVideoPresenter9, owner, CLSCTX_INPROC_SERVER, riid, obj); +} + +HRESULT evr_presenter_create(IUnknown *outer, void **out) +{ + struct video_presenter *object; + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IMFVideoPresenter_iface.lpVtbl = &video_presenter_vtbl; + object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; + object->outer_unk = outer ? outer : &object->IUnknown_inner; + object->refcount = 1; + + *out = &object->IUnknown_inner; + + return S_OK; +} diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 70fc6b18e2f..6805a7ae2b7 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -117,6 +117,7 @@ static IUnknown test_outer = {&outer_vtbl}; static void test_aggregation(void) { IBaseFilter *filter, *filter2; + IMFVideoPresenter *presenter; IUnknown *unk, *unk2; HRESULT hr; ULONG ref; @@ -171,6 +172,25 @@ static void test_aggregation(void) ref = IUnknown_Release(unk); ok(!ref, "Got unexpected refcount %d.\n", ref); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + /* Default presenter. */ + presenter = (void *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_MFVideoPresenter9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, + (void **)&presenter); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(!presenter, "Got interface %p.\n", presenter); + + hr = CoCreateInstance(&CLSID_MFVideoPresenter9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + IUnknown_Release(unk); + } } #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) @@ -846,6 +866,20 @@ done: DestroyWindow(window); } +static void test_default_presenter(void) +{ + IMFVideoPresenter *presenter; + HRESULT hr; + + hr = MFCreateVideoPresenter(NULL, &IID_IMFVideoPresenter, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Failed to create default presenter, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFVideoPresenter_Release(presenter); +} + START_TEST(evr) { CoInitialize(NULL); @@ -860,6 +894,7 @@ START_TEST(evr) test_default_mixer(); test_default_mixer_type_negotiation(); test_surface_sample(); + test_default_presenter(); CoUninitialize(); } diff --git a/include/evr.idl b/include/evr.idl index 4599e298790..5a623c2c29c 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -225,4 +225,5 @@ cpp_quote("DEFINE_GUID(MR_BUFFER_SERVICE, 0xa562248c, 0x9ac6, 0x4ffc, 0x9f, 0xba cpp_quote("DEFINE_GUID(VIDEO_ZOOM_RECT, 0x7aaa1638, 0x1b7f, 0x4c93, 0xbd, 0x89, 0x5b, 0x9c, 0x9f, 0xb6, 0xfc, 0xf0);") cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") +cpp_quote("HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") cpp_quote("HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample);") -- 2.27.0

2 10

[PATCH] mfplat/tests: Add some tests for d3d9 surface buffer.
by Nikolay Sivov 01 Jul '20

01 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 185 ++++++++++++++++++++++++++++++++++ include/mfapi.h | 1 + 3 files changed, 187 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index c58a0463e51..4e9413e8da0 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat mfuuid propsys uuid +IMPORTS = ole32 mfplat user32 d3d9 mfuuid propsys uuid strmiids C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index aac6f734583..8b4012f8087 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -34,6 +34,7 @@ #include "mfreadwrite.h" #include "propvarutil.h" #include "strsafe.h" +#include "evr.h" #include "wine/test.h" #include "wine/heap.h" @@ -41,6 +42,7 @@ #define D3D11_INIT_GUID #include "initguid.h" #include "d3d11_4.h" +#include "d3d9.h" #include "d3d9types.h" #include "ks.h" #include "ksmedia.h" @@ -104,6 +106,38 @@ static HRESULT (WINAPI *pMFCreate2DMediaBuffer)(DWORD width, DWORD height, DWORD IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, DWORD min_alignment, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); + +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device = NULL; + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = focus_window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; + + IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + + return device; +} static const WCHAR fileschemeW[] = L"file://"; @@ -677,6 +711,7 @@ static void init_functions(void) X(MFCopyImage); X(MFCreate2DMediaBuffer); X(MFCreateDXGIDeviceManager); + X(MFCreateDXSurfaceBuffer); X(MFCreateSourceResolver); X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); @@ -5281,6 +5316,155 @@ static void test_MFCreateMFVideoFormatFromMFMediaType(void) IMFMediaType_Release(media_type); } +static void test_MFCreateDXSurfaceBuffer(void) +{ + IDirect3DSurface9 *backbuffer = NULL, *surface; + IDirect3DSwapChain9 *swapchain; + IDirect3DDevice9 *device; + IMF2DBuffer2 *_2dbuffer2; + IMFMediaBuffer *buffer; + IMF2DBuffer *_2dbuffer; + BYTE *data, *data2; + IMFGetService *gs; + IDirect3D9 *d3d; + DWORD length; + HWND window; + HRESULT hr; + LONG pitch; + BOOL value; + + if (!pMFCreateDXSurfaceBuffer) + { + skip("MFCreateDXSurfaceBuffer is not available.\n"); + return; + } + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x)\n", hr); + + hr = IDirect3DSwapChain9_GetBackBuffer(swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer (%08x)\n", hr); + ok(backbuffer != NULL, "The back buffer is NULL\n"); + + IDirect3DSwapChain9_Release(swapchain); + + hr = pMFCreateDXSurfaceBuffer(&IID_IDirect3DSurface9, (IUnknown *)backbuffer, FALSE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + /* Surface is accessible. */ + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(surface == backbuffer, "Unexpected surface pointer.\n"); + IDirect3DSurface9_Release(surface); + IMFGetService_Release(gs); + + length = 0; + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!length, "Unexpected length %u.\n", length); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(!length, "Unexpected length %u.\n", length); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Unlock twice. */ + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#x.\n", hr); + + /* Lock twice. */ + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data2, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(data == data2, "Unexpected pointer.\n"); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Unlocked. */ + hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data, &pitch); + ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data2, NULL, NULL); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_IsContiguousFormat(_2dbuffer, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!value, "Unexpected return value %d.\n", value); + + IMF2DBuffer_Release(_2dbuffer); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(data == data2, "Unexpected scanline pointer.\n"); + memset(data, 0xab, 4); + IMF2DBuffer2_Unlock2D(_2dbuffer2); + + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Write, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(data[0] == 0xab, "Unexpected leading byte.\n"); + IMF2DBuffer2_Unlock2D(_2dbuffer2); + + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_ReadWrite, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMF2DBuffer2_Unlock2D(_2dbuffer2); + + IMF2DBuffer2_Release(_2dbuffer2); + + IMFMediaBuffer_Release(buffer); + +done: + if (backbuffer) + IDirect3DSurface9_Release(backbuffer); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(mfplat) { char **argv; @@ -5337,6 +5521,7 @@ START_TEST(mfplat) test_MFCreateMediaBufferFromMediaType(); test_MFInitMediaTypeFromWaveFormatEx(); test_MFCreateMFVideoFormatFromMFMediaType(); + test_MFCreateDXSurfaceBuffer(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 06a5412cbc5..b1edeac02f6 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -502,6 +502,7 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **result); HRESULT WINAPI MFCreateCollection(IMFCollection **collection); HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager); +HRESULT WINAPI MFCreateDXSurfaceBuffer(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, LPCWSTR url, IMFByteStream **bytestream); -- 2.27.0

1 0

[PATCH 1/5] evr: Add IMFRateSupport stub for the presenter.
by Nikolay Sivov 01 Jul '20

01 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 28 ++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index cbe8b0d2ff4..29167d364df 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -37,6 +37,7 @@ struct video_presenter IMFVideoDeviceID IMFVideoDeviceID_iface; IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; IMFVideoDisplayControl IMFVideoDisplayControl_iface; + IMFRateSupport IMFRateSupport_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -67,6 +68,11 @@ static struct video_presenter *impl_from_IMFVideoDisplayControl(IMFVideoDisplayC return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoDisplayControl_iface); } +static struct video_presenter *impl_from_IMFRateSupport(IMFRateSupport *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFRateSupport_iface); +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -94,6 +100,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFVideoDisplayControl_iface; } + else if (IsEqualIID(riid, &IID_IMFRateSupport)) + { + *obj = &presenter->IMFRateSupport_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -409,6 +419,56 @@ static const IMFVideoDisplayControlVtbl video_presenter_control_vtbl = video_presenter_control_GetCurrentImage, }; +static HRESULT WINAPI video_presenter_rate_support_QueryInterface(IMFRateSupport *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFRateSupport(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_rate_support_AddRef(IMFRateSupport *iface) +{ + struct video_presenter *presenter = impl_from_IMFRateSupport(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_rate_support_Release(IMFRateSupport *iface) +{ + struct video_presenter *presenter = impl_from_IMFRateSupport(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + *rate = 0.0f; + + return S_OK; +} + +static HRESULT WINAPI video_presenter_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *nearest_supported_rate) +{ + return E_NOTIMPL; +} + +static const IMFRateSupportVtbl video_presenter_rate_support_vtbl = +{ + video_presenter_rate_support_QueryInterface, + video_presenter_rate_support_AddRef, + video_presenter_rate_support_Release, + video_presenter_rate_support_GetSlowestRate, + video_presenter_rate_support_GetFastestRate, + video_presenter_rate_support_IsRateSupported, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -432,6 +492,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFVideoDeviceID_iface.lpVtbl = &video_presenter_device_id_vtbl; object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_presenter_service_client_vtbl; object->IMFVideoDisplayControl_iface.lpVtbl = &video_presenter_control_vtbl; + object->IMFRateSupport_iface.lpVtbl = &video_presenter_rate_support_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 037916fc4e1..dd3fbbe0289 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -869,8 +869,10 @@ done: static void test_default_presenter(void) { IMFVideoPresenter *presenter; + IMFRateSupport *rate_support; IMFVideoDeviceID *deviceid; IUnknown *unk; + float rate; HRESULT hr; GUID iid; @@ -902,6 +904,32 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + /* Rate support. */ + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFRateSupport, (void **)&rate_support); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + IMFRateSupport_Release(rate_support); + IMFVideoPresenter_Release(presenter); } -- 2.27.0

1 4

[PATCH] where.exe: add stub program (now with bugreport reference)
by Louis Lenders 01 Jul '20

01 Jul '20

https://bugs.winehq.org/show_bug.cgi?id=49460 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + programs/where/Makefile.in | 6 ++++++ programs/where/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 programs/where/Makefile.in create mode 100644 programs/where/main.c diff --git a/configure b/configure index ee0439425a..b6e42b4c86 100755 --- a/configure +++ b/configure @@ -1807,6 +1807,7 @@ enable_uninstaller enable_unlodctr enable_view enable_wevtutil +enable_where enable_whoami enable_wineboot enable_winebrowser @@ -21426,6 +21427,7 @@ wine_fn_config_makefile programs/uninstaller enable_uninstaller wine_fn_config_makefile programs/unlodctr enable_unlodctr wine_fn_config_makefile programs/view enable_view wine_fn_config_makefile programs/wevtutil enable_wevtutil +wine_fn_config_makefile programs/where enable_where wine_fn_config_makefile programs/whoami enable_whoami wine_fn_config_makefile programs/wineboot enable_wineboot wine_fn_config_makefile programs/winebrowser enable_winebrowser diff --git a/configure.ac b/configure.ac index 3c03bad292..272f2e2a93 100644 --- a/configure.ac +++ b/configure.ac @@ -4011,6 +4011,7 @@ WINE_CONFIG_MAKEFILE(programs/uninstaller) WINE_CONFIG_MAKEFILE(programs/unlodctr) WINE_CONFIG_MAKEFILE(programs/view) WINE_CONFIG_MAKEFILE(programs/wevtutil) +WINE_CONFIG_MAKEFILE(programs/where) WINE_CONFIG_MAKEFILE(programs/whoami) WINE_CONFIG_MAKEFILE(programs/wineboot) WINE_CONFIG_MAKEFILE(programs/winebrowser) diff --git a/programs/where/Makefile.in b/programs/where/Makefile.in new file mode 100644 index 0000000000..109261c379 --- /dev/null +++ b/programs/where/Makefile.in @@ -0,0 +1,6 @@ +MODULE = where.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/where/main.c b/programs/where/main.c new file mode 100644 index 0000000000..84daac8220 --- /dev/null +++ b/programs/where/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(where); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} -- 2.27.0

1 0

[PATCH] where.exe: add stub program
by Louis Lenders 01 Jul '20

01 Jul '20

Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + programs/where/Makefile.in | 6 ++++++ programs/where/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 programs/where/Makefile.in create mode 100644 programs/where/main.c diff --git a/configure b/configure index ee0439425a..b6e42b4c86 100755 --- a/configure +++ b/configure @@ -1807,6 +1807,7 @@ enable_uninstaller enable_unlodctr enable_view enable_wevtutil +enable_where enable_whoami enable_wineboot enable_winebrowser @@ -21426,6 +21427,7 @@ wine_fn_config_makefile programs/uninstaller enable_uninstaller wine_fn_config_makefile programs/unlodctr enable_unlodctr wine_fn_config_makefile programs/view enable_view wine_fn_config_makefile programs/wevtutil enable_wevtutil +wine_fn_config_makefile programs/where enable_where wine_fn_config_makefile programs/whoami enable_whoami wine_fn_config_makefile programs/wineboot enable_wineboot wine_fn_config_makefile programs/winebrowser enable_winebrowser diff --git a/configure.ac b/configure.ac index 3c03bad292..272f2e2a93 100644 --- a/configure.ac +++ b/configure.ac @@ -4011,6 +4011,7 @@ WINE_CONFIG_MAKEFILE(programs/uninstaller) WINE_CONFIG_MAKEFILE(programs/unlodctr) WINE_CONFIG_MAKEFILE(programs/view) WINE_CONFIG_MAKEFILE(programs/wevtutil) +WINE_CONFIG_MAKEFILE(programs/where) WINE_CONFIG_MAKEFILE(programs/whoami) WINE_CONFIG_MAKEFILE(programs/wineboot) WINE_CONFIG_MAKEFILE(programs/winebrowser) diff --git a/programs/where/Makefile.in b/programs/where/Makefile.in new file mode 100644 index 0000000000..109261c379 --- /dev/null +++ b/programs/where/Makefile.in @@ -0,0 +1,6 @@ +MODULE = where.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/where/main.c b/programs/where/main.c new file mode 100644 index 0000000000..84daac8220 --- /dev/null +++ b/programs/where/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(where); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} -- 2.27.0

1 0

[PATCH] ntdll: Don't use WCHAR in unix_to_win_locale().
by Gijs Vermeulen 01 Jul '20

01 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/unix/env.c | 49 +++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e260e5c338..e57b625689 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -74,8 +74,8 @@ char **main_envp = NULL; static WCHAR **main_wargv; static CPTABLEINFO unix_table; -static WCHAR system_locale[LOCALE_NAME_MAX_LENGTH]; -static WCHAR user_locale[LOCALE_NAME_MAX_LENGTH]; +static char system_locale[LOCALE_NAME_MAX_LENGTH]; +static char user_locale[LOCALE_NAME_MAX_LENGTH]; static void *read_nls_file( const char *name ) { @@ -649,18 +649,11 @@ static WCHAR **build_wargv( char **argv ) /* Unix format is: lang[_country][.charset][@modifier] * Windows format is: lang[-script][-country][_modifier] */ -static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) +static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) { - static const WCHAR sepW[] = {'_','.','@',0}; - static const WCHAR posixW[] = {'P','O','S','I','X',0}; - static const WCHAR cW[] = {'C',0}; - static const WCHAR euroW[] = {'e','u','r','o',0}; - static const WCHAR latinW[] = {'l','a','t','i','n',0}; - static const WCHAR latnW[] = {'-','L','a','t','n',0}; - static const WCHAR enUSW[] = {'e','n','-','U','S',0}; - WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; - WCHAR *p, *country = NULL, *modifier = NULL; - DWORD len; + static const char sep[] = "_.@"; + char buffer[LOCALE_NAME_MAX_LENGTH]; + char *p, *country = NULL, *modifier = NULL; if (!unix_name || !unix_name[0] || !strcmp( unix_name, "C" )) { @@ -668,16 +661,12 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) if (!unix_name || !unix_name[0]) return FALSE; } - len = ntdll_umbstowcs( unix_name, strlen(unix_name), buffer, ARRAY_SIZE(buffer) ); - if (len == ARRAY_SIZE(buffer)) return FALSE; - buffer[len] = 0; - - if (!(p = wcspbrk( buffer, sepW ))) + if (!(p = strpbrk( buffer, sep ))) { - if (!wcscmp( buffer, posixW ) || !wcscmp( buffer, cW )) - wcscpy( win_name, enUSW ); + if (!strcmp( buffer, "POSIX" ) || !strcmp( buffer, "C" )) + strcpy( win_name, "en-US" ); else - wcscpy( win_name, buffer ); + strcpy( win_name, buffer ); return TRUE; } @@ -685,13 +674,13 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) { *p++ = 0; country = p; - p = wcspbrk( p, sepW + 1 ); + p = strpbrk( p, sep + 1 ); } if (p && *p == '.') { *p++ = 0; /* charset, ignore */ - p = wcschr( p, '@' ); + p = strchr( p, '@' ); } if (p) { @@ -701,18 +690,18 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) /* rebuild a Windows name */ - wcscpy( win_name, buffer ); + strcpy( win_name, buffer ); if (modifier) { - if (!wcscmp( modifier, latinW )) wcscat( win_name, latnW ); - else if (!wcscmp( modifier, euroW )) {} /* ignore */ + if (!strcmp( modifier, "latin" )) strcat( win_name, "-Latn" ); + else if (!strcmp( modifier, "euro" )) {} /* ignore */ else return FALSE; } if (country) { - p = win_name + wcslen(win_name); + p = win_name + strlen(win_name); *p++ = '-'; - wcscpy( p, country ); + strcpy( p, country ); } return TRUE; } @@ -1083,6 +1072,6 @@ void CDECL get_unix_codepage( CPTABLEINFO *table ) */ void CDECL get_locales( WCHAR *sys, WCHAR *user ) { - wcscpy( sys, system_locale ); - wcscpy( user, user_locale ); + ntdll_umbstowcs( system_locale, ARRAY_SIZE(system_locale), sys, LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR) ); + ntdll_umbstowcs( user_locale, ARRAY_SIZE(user_locale), user, LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR) ); } -- 2.27.0

2 1

[PATCH v2 2/2] kernel32: Fix GetPrivateProfileIntW() if section and filename are both NULL.
by Jiajin Cui 01 Jul '20

01 Jul '20

1 0

[PATCH v3 1/2] include: Use the public VM_COUNTERS and VM_COUNTERS_EX structure definitions.
by Zebediah Figura 01 Jul '20

01 Jul '20

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 20 +++++++------------- dlls/ntdll/unix/process.c | 12 ++++++------ include/winternl.h | 26 ++++++++++++++++++++------ 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7475fcf56ee..35e4b834c42 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -342,7 +342,7 @@ static void test_query_process(void) ULONG HandleCount; DWORD dwUnknown3; DWORD dwUnknown4; - VM_COUNTERS vmCounters; + VM_COUNTERS_EX vmCounters; IO_COUNTERS ioCounters; SYSTEM_THREAD_INFORMATION ti[1]; } SYSTEM_PROCESS_INFORMATION_PRIVATE; @@ -1399,7 +1399,7 @@ static void test_query_process_basic(void) ok( pbi.UniqueProcessId > 0, "Expected a ProcessID > 0, got 0\n"); } -static void dump_vm_counters(const char *header, const VM_COUNTERS *pvi) +static void dump_vm_counters(const char *header, const VM_COUNTERS_EX *pvi) { trace("%s:\n", header); trace("PeakVirtualSize : %lu\n", pvi->PeakVirtualSize); @@ -1419,8 +1419,7 @@ static void test_query_process_vm(void) { NTSTATUS status; ULONG ReturnLength; - VM_COUNTERS pvi; - ULONG old_size = FIELD_OFFSET(VM_COUNTERS,PrivatePageCount); + VM_COUNTERS_EX pvi; HANDLE process; SIZE_T prev_size; const SIZE_T alloc_size = 16 * 1024 * 1024; @@ -1430,24 +1429,19 @@ static void test_query_process_vm(void) ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); - status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, old_size, NULL); + status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), NULL); ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); - /* Windows XP and W2K3 will report success for a size of 44 AND 48 ! - Windows W2K will only report success for 44. - For now we only care for 44, which is FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) - */ - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 24, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, old_size, &ReturnLength); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( old_size == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %d\n", ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 46, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( ReturnLength == old_size || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(VM_COUNTERS) || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ dump_vm_counters("VM counters for GetCurrentProcess", &pvi); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 578c79bf89a..c39d8fb23a4 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1170,13 +1170,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class { VM_COUNTERS pvmi; - /* older Windows versions don't have the PrivatePageCount field */ - if (size >= FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) + /* older Windows versions don't have the PrivateUsage field */ + if (size >= sizeof(VM_COUNTERS)) { if (!info) ret = STATUS_ACCESS_VIOLATION; else { - memset(&pvmi, 0 , sizeof(VM_COUNTERS)); + memset(&pvmi, 0, sizeof(pvmi)); if (handle == GetCurrentProcess()) fill_VM_COUNTERS(&pvmi); else { @@ -1197,10 +1197,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class if (ret) break; } len = size; - if (len != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) len = sizeof(VM_COUNTERS); - memcpy(info, &pvmi, min(size,sizeof(VM_COUNTERS))); + if (len != sizeof(VM_COUNTERS)) len = sizeof(VM_COUNTERS_EX); + memcpy(info, &pvmi, min(size, sizeof(pvmi))); } - if (size != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount) && size != sizeof(VM_COUNTERS)) + if (size != sizeof(VM_COUNTERS) && size != sizeof(VM_COUNTERS_EX)) ret = STATUS_INFO_LENGTH_MISMATCH; } else diff --git a/include/winternl.h b/include/winternl.h index 9a70a2014f1..5b5a5f32c6f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1584,12 +1584,11 @@ typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION { BOOLEAN DebuggerNotPresent; } SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION; -/* System Information Class 0x05 */ - -typedef struct _VM_COUNTERS_ { +typedef struct _VM_COUNTERS +{ SIZE_T PeakVirtualSize; SIZE_T VirtualSize; - ULONG PageFaultCount; + ULONG PageFaultCount; SIZE_T PeakWorkingSetSize; SIZE_T WorkingSetSize; SIZE_T QuotaPeakPagedPoolUsage; @@ -1598,9 +1597,24 @@ typedef struct _VM_COUNTERS_ { SIZE_T QuotaNonPagedPoolUsage; SIZE_T PagefileUsage; SIZE_T PeakPagefileUsage; - SIZE_T PrivatePageCount; } VM_COUNTERS, *PVM_COUNTERS; +typedef struct _VM_COUNTERS_EX +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivateUsage; +} VM_COUNTERS_EX, *PVM_COUNTERS_EX; + typedef struct _SYSTEM_PROCESS_INFORMATION { #ifdef __WINESRC__ /* win32/win64 */ ULONG NextEntryOffset; /* 00/00 */ @@ -1616,7 +1630,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { ULONG HandleCount; /* 4c/60 */ ULONG SessionId; /* 50/64 */ DWORD dwUnknown4; /* 54/68 */ - VM_COUNTERS vmCounters; /* 58/70 */ + VM_COUNTERS_EX vmCounters; /* 58/70 */ IO_COUNTERS ioCounters; /* 88/d0 */ SYSTEM_THREAD_INFORMATION ti[1]; /* b8/100 */ #else -- 2.27.0

1 1

[PATCH] windowscodecs: Implement DdsFrameDecode_GetPixelFormat().
by Ziqing Hui 01 Jul '20

01 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 15 +++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 10 +++++----- 2 files changed, 18 insertions(+), 7 deletions(-)

2 1

[PATCH v2 1/6] amstream: Decrement "sample_refs" only when the object is being released.
by Zebediah Figura 01 Jul '20

01 Jul '20

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Fixes: 51fce87c607d92300bb6b3f7674e7e6c775c86ff Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: reword subject to be a bit more specific. dlls/amstream/ddrawstream.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 56230ca4e63..b7196d9fc9e 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -980,7 +980,6 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IMemInputPin_iface.lpVtbl = &ddraw_meminput_vtbl; object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; - object->sample_refs = 0; InitializeCriticalSection(&object->cs); @@ -1043,12 +1042,12 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); - EnterCriticalSection(&sample->parent->cs); - InterlockedDecrement(&sample->parent->sample_refs); - LeaveCriticalSection(&sample->parent->cs); - if (!ref) { + EnterCriticalSection(&sample->parent->cs); + --sample->parent->sample_refs; + LeaveCriticalSection(&sample->parent->cs); + if (sample->surface) IDirectDrawSurface_Release(sample->surface); HeapFree(GetProcessHeap(), 0, sample); @@ -1166,7 +1165,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->parent = parent; EnterCriticalSection(&parent->cs); - InterlockedIncrement(&parent->sample_refs); + ++parent->sample_refs; LeaveCriticalSection(&parent->cs); if (surface) -- 2.27.0

1 5

[PATCH vkd3d 1/2] vkd3d: Expose vkd3d_create_blob() as a public API.
by Zebediah Figura 01 Jul '20

01 Jul '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/vkd3d.h | 4 ++++ libs/vkd3d/vkd3d.map | 1 + libs/vkd3d/vkd3d_main.c | 14 ++++---------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 0ef8105..f05eb56 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -193,6 +193,8 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +HRESULT vkd3d_create_blob(void *buffer, SIZE_T size, ID3DBlob **blob); + #endif /* VKD3D_NO_PROTOTYPES */ /* @@ -236,6 +238,8 @@ typedef HRESULT (*PFN_vkd3d_serialize_versioned_root_signature)(const D3D12_VERS typedef HRESULT (*PFN_vkd3d_create_versioned_root_signature_deserializer)(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +typedef HRESULT (*PFN_vkd3d_create_blob)(void *buffer, SIZE_T size, ID3DBlob **blob); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 6f1f376..d1515d9 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -2,6 +2,7 @@ VKD3D_1_0 { global: vkd3d_acquire_vk_queue; + vkd3d_create_blob; vkd3d_create_device; vkd3d_create_image_resource; vkd3d_create_instance; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 7775077..9e05f11 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -520,7 +520,7 @@ static void d3d_blob_init(struct d3d_blob *blob, void *buffer, SIZE_T size) blob->size = size; } -static HRESULT d3d_blob_create(void *buffer, SIZE_T size, struct d3d_blob **blob) +HRESULT vkd3d_create_blob(void *buffer, SIZE_T size, ID3DBlob **blob) { struct d3d_blob *object; @@ -531,7 +531,7 @@ static HRESULT d3d_blob_create(void *buffer, SIZE_T size, struct d3d_blob **blob TRACE("Created blob object %p.\n", object); - *blob = object; + *blob = &object->ID3DBlob_iface; return S_OK; } @@ -541,7 +541,6 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, { struct vkd3d_versioned_root_signature_desc vkd3d_desc; struct vkd3d_shader_code dxbc; - struct d3d_blob *blob_object; HRESULT hr; int ret; @@ -572,15 +571,13 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, return hresult_from_vkd3d_result(ret); } - if (FAILED(hr = d3d_blob_create((void *)dxbc.code, dxbc.size, &blob_object))) + if (FAILED(hr = vkd3d_create_blob((void *)dxbc.code, dxbc.size, blob))) { WARN("Failed to create blob object, hr %#x.\n", hr); vkd3d_shader_free_shader_code(&dxbc); return hr; } - *blob = &blob_object->ID3DBlob_iface; - return S_OK; } @@ -589,7 +586,6 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN { const struct vkd3d_versioned_root_signature_desc *vkd3d_desc; struct vkd3d_shader_code dxbc; - struct d3d_blob *blob_object; HRESULT hr; int ret; @@ -613,14 +609,12 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN return hresult_from_vkd3d_result(ret); } - if (FAILED(hr = d3d_blob_create((void *)dxbc.code, dxbc.size, &blob_object))) + if (FAILED(hr = vkd3d_create_blob((void *)dxbc.code, dxbc.size, blob))) { WARN("Failed to create blob object, hr %#x.\n", hr); vkd3d_shader_free_shader_code(&dxbc); return hr; } - *blob = &blob_object->ID3DBlob_iface; - return S_OK; } -- 2.27.0

1 1

[PATCH v2 0/2] Improved file association desktop integration
by Alex Henrie 30 Jun '20

30 Jun '20

The big change here is rewriting the patches to avoid the term "blacklist", which I have replaced with "naughty list". I like "naughty list" and "nice list" because (thanks to Santa Claus) they are already familiar to English speakers, much like the words "needle" and "haystack" that have become accepted technical terms due to the popular expression "it's like finding a needle in a haystack". Alex Henrie (2): ntdll: Add RtlGetElementGenericTable stub ntdll: Add RtlLookupElementGenericTable stub dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 18 ++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 3 files changed, 22 insertions(+), 4 deletions(-) -- 2.27.0

5 14

[PATCH v2 1/2] include: Use the public VM_COUNTERS and VM_COUNTERS_EX structure definitions.
by Zebediah Figura 30 Jun '20

30 Jun '20

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/info.c | 20 +++++++------------- dlls/ntdll/unix/process.c | 12 ++++++------ include/winternl.h | 26 ++++++++++++++++++++------ 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7475fcf56ee..35e4b834c42 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -342,7 +342,7 @@ static void test_query_process(void) ULONG HandleCount; DWORD dwUnknown3; DWORD dwUnknown4; - VM_COUNTERS vmCounters; + VM_COUNTERS_EX vmCounters; IO_COUNTERS ioCounters; SYSTEM_THREAD_INFORMATION ti[1]; } SYSTEM_PROCESS_INFORMATION_PRIVATE; @@ -1399,7 +1399,7 @@ static void test_query_process_basic(void) ok( pbi.UniqueProcessId > 0, "Expected a ProcessID > 0, got 0\n"); } -static void dump_vm_counters(const char *header, const VM_COUNTERS *pvi) +static void dump_vm_counters(const char *header, const VM_COUNTERS_EX *pvi) { trace("%s:\n", header); trace("PeakVirtualSize : %lu\n", pvi->PeakVirtualSize); @@ -1419,8 +1419,7 @@ static void test_query_process_vm(void) { NTSTATUS status; ULONG ReturnLength; - VM_COUNTERS pvi; - ULONG old_size = FIELD_OFFSET(VM_COUNTERS,PrivatePageCount); + VM_COUNTERS_EX pvi; HANDLE process; SIZE_T prev_size; const SIZE_T alloc_size = 16 * 1024 * 1024; @@ -1430,24 +1429,19 @@ static void test_query_process_vm(void) ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); - status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, old_size, NULL); + status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), NULL); ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); - /* Windows XP and W2K3 will report success for a size of 44 AND 48 ! - Windows W2K will only report success for 44. - For now we only care for 44, which is FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) - */ - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 24, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, old_size, &ReturnLength); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( old_size == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %d\n", ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 46, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( ReturnLength == old_size || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(VM_COUNTERS) || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ dump_vm_counters("VM counters for GetCurrentProcess", &pvi); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 578c79bf89a..c39d8fb23a4 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1170,13 +1170,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class { VM_COUNTERS pvmi; - /* older Windows versions don't have the PrivatePageCount field */ - if (size >= FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) + /* older Windows versions don't have the PrivateUsage field */ + if (size >= sizeof(VM_COUNTERS)) { if (!info) ret = STATUS_ACCESS_VIOLATION; else { - memset(&pvmi, 0 , sizeof(VM_COUNTERS)); + memset(&pvmi, 0, sizeof(pvmi)); if (handle == GetCurrentProcess()) fill_VM_COUNTERS(&pvmi); else { @@ -1197,10 +1197,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class if (ret) break; } len = size; - if (len != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) len = sizeof(VM_COUNTERS); - memcpy(info, &pvmi, min(size,sizeof(VM_COUNTERS))); + if (len != sizeof(VM_COUNTERS)) len = sizeof(VM_COUNTERS_EX); + memcpy(info, &pvmi, min(size, sizeof(pvmi))); } - if (size != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount) && size != sizeof(VM_COUNTERS)) + if (size != sizeof(VM_COUNTERS) && size != sizeof(VM_COUNTERS_EX)) ret = STATUS_INFO_LENGTH_MISMATCH; } else diff --git a/include/winternl.h b/include/winternl.h index 9a70a2014f1..5b5a5f32c6f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1584,12 +1584,11 @@ typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION { BOOLEAN DebuggerNotPresent; } SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION; -/* System Information Class 0x05 */ - -typedef struct _VM_COUNTERS_ { +typedef struct _VM_COUNTERS +{ SIZE_T PeakVirtualSize; SIZE_T VirtualSize; - ULONG PageFaultCount; + ULONG PageFaultCount; SIZE_T PeakWorkingSetSize; SIZE_T WorkingSetSize; SIZE_T QuotaPeakPagedPoolUsage; @@ -1598,9 +1597,24 @@ typedef struct _VM_COUNTERS_ { SIZE_T QuotaNonPagedPoolUsage; SIZE_T PagefileUsage; SIZE_T PeakPagefileUsage; - SIZE_T PrivatePageCount; } VM_COUNTERS, *PVM_COUNTERS; +typedef struct _VM_COUNTERS_EX +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivateUsage; +} VM_COUNTERS_EX, *PVM_COUNTERS_EX; + typedef struct _SYSTEM_PROCESS_INFORMATION { #ifdef __WINESRC__ /* win32/win64 */ ULONG NextEntryOffset; /* 00/00 */ @@ -1616,7 +1630,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { ULONG HandleCount; /* 4c/60 */ ULONG SessionId; /* 50/64 */ DWORD dwUnknown4; /* 54/68 */ - VM_COUNTERS vmCounters; /* 58/70 */ + VM_COUNTERS_EX vmCounters; /* 58/70 */ IO_COUNTERS ioCounters; /* 88/d0 */ SYSTEM_THREAD_INFORMATION ti[1]; /* b8/100 */ #else -- 2.27.0

1 1

[PATCH 1/2] include: Use the public VM_COUNTERS and VM_COUNTERS_EX structure definitions.
by Zebediah Figura 30 Jun '20

30 Jun '20

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/info.c | 18 ++++++------------ dlls/ntdll/unix/process.c | 12 ++++++------ include/winternl.h | 26 ++++++++++++++++++++------ 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7475fcf56ee..04dba380615 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1399,7 +1399,7 @@ static void test_query_process_basic(void) ok( pbi.UniqueProcessId > 0, "Expected a ProcessID > 0, got 0\n"); } -static void dump_vm_counters(const char *header, const VM_COUNTERS *pvi) +static void dump_vm_counters(const char *header, const VM_COUNTERS_EX *pvi) { trace("%s:\n", header); trace("PeakVirtualSize : %lu\n", pvi->PeakVirtualSize); @@ -1419,8 +1419,7 @@ static void test_query_process_vm(void) { NTSTATUS status; ULONG ReturnLength; - VM_COUNTERS pvi; - ULONG old_size = FIELD_OFFSET(VM_COUNTERS,PrivatePageCount); + VM_COUNTERS_EX pvi; HANDLE process; SIZE_T prev_size; const SIZE_T alloc_size = 16 * 1024 * 1024; @@ -1430,24 +1429,19 @@ static void test_query_process_vm(void) ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); - status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, old_size, NULL); + status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), NULL); ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); - /* Windows XP and W2K3 will report success for a size of 44 AND 48 ! - Windows W2K will only report success for 44. - For now we only care for 44, which is FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) - */ - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 24, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, old_size, &ReturnLength); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( old_size == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %d\n", ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 46, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( ReturnLength == old_size || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(VM_COUNTERS) || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ dump_vm_counters("VM counters for GetCurrentProcess", &pvi); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 578c79bf89a..c39d8fb23a4 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1170,13 +1170,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class { VM_COUNTERS pvmi; - /* older Windows versions don't have the PrivatePageCount field */ - if (size >= FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) + /* older Windows versions don't have the PrivateUsage field */ + if (size >= sizeof(VM_COUNTERS)) { if (!info) ret = STATUS_ACCESS_VIOLATION; else { - memset(&pvmi, 0 , sizeof(VM_COUNTERS)); + memset(&pvmi, 0, sizeof(pvmi)); if (handle == GetCurrentProcess()) fill_VM_COUNTERS(&pvmi); else { @@ -1197,10 +1197,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class if (ret) break; } len = size; - if (len != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) len = sizeof(VM_COUNTERS); - memcpy(info, &pvmi, min(size,sizeof(VM_COUNTERS))); + if (len != sizeof(VM_COUNTERS)) len = sizeof(VM_COUNTERS_EX); + memcpy(info, &pvmi, min(size, sizeof(pvmi))); } - if (size != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount) && size != sizeof(VM_COUNTERS)) + if (size != sizeof(VM_COUNTERS) && size != sizeof(VM_COUNTERS_EX)) ret = STATUS_INFO_LENGTH_MISMATCH; } else diff --git a/include/winternl.h b/include/winternl.h index 9a70a2014f1..5b5a5f32c6f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1584,12 +1584,11 @@ typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION { BOOLEAN DebuggerNotPresent; } SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION; -/* System Information Class 0x05 */ - -typedef struct _VM_COUNTERS_ { +typedef struct _VM_COUNTERS +{ SIZE_T PeakVirtualSize; SIZE_T VirtualSize; - ULONG PageFaultCount; + ULONG PageFaultCount; SIZE_T PeakWorkingSetSize; SIZE_T WorkingSetSize; SIZE_T QuotaPeakPagedPoolUsage; @@ -1598,9 +1597,24 @@ typedef struct _VM_COUNTERS_ { SIZE_T QuotaNonPagedPoolUsage; SIZE_T PagefileUsage; SIZE_T PeakPagefileUsage; - SIZE_T PrivatePageCount; } VM_COUNTERS, *PVM_COUNTERS; +typedef struct _VM_COUNTERS_EX +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivateUsage; +} VM_COUNTERS_EX, *PVM_COUNTERS_EX; + typedef struct _SYSTEM_PROCESS_INFORMATION { #ifdef __WINESRC__ /* win32/win64 */ ULONG NextEntryOffset; /* 00/00 */ @@ -1616,7 +1630,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { ULONG HandleCount; /* 4c/60 */ ULONG SessionId; /* 50/64 */ DWORD dwUnknown4; /* 54/68 */ - VM_COUNTERS vmCounters; /* 58/70 */ + VM_COUNTERS_EX vmCounters; /* 58/70 */ IO_COUNTERS ioCounters; /* 88/d0 */ SYSTEM_THREAD_INFORMATION ti[1]; /* b8/100 */ #else -- 2.27.0

2 3

[PATCH 1/2] ntdll: Fix KiUserExceptionDispatcher ABI on x86_64.
by Paul Gofman 30 Jun '20

30 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49436 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 23 ++++++++++++--- dlls/ntdll/unix/signal_arm.c | 4 +++ dlls/ntdll/unix/signal_arm64.c | 5 ++++ dlls/ntdll/unix/signal_i386.c | 4 +++ dlls/ntdll/unix/signal_x86_64.c | 51 ++++++++++++++++++++------------- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 ++ 7 files changed, 66 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 89ddd87f16d..5d29b675361 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -533,10 +533,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex } -/******************************************************************* - * KiUserExceptionDispatcher (NTDLL.@) - */ -NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +NTSTATUS WINAPI impl_KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) { NTSTATUS status; DWORD c; @@ -583,6 +580,24 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte return NtRaiseException( rec, context, FALSE ); } +__ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, + "mov 0x98(%rsp),%rcx\n\t" /* context->Rsp */ + "mov 0xf8(%rsp),%rdx\n\t" /* context->Rip */ + "mov %rdx,-0x8(%rcx)\n\t" + "mov %rbp,-0x10(%rcx)\n\t" + "mov %rdi,-0x18(%rcx)\n\t" + "mov %rsi,-0x20(%rcx)\n\t" + "mov %rcx,%rbp\n\t" + "mov %rsp,%rdx\n\t" /* context */ + "lea 0x4f0(%rsp),%rcx\n\t" /* rec */ + __ASM_CFI(".cfi_signal_frame\n\t") + __ASM_CFI(".cfi_def_cfa %rbp,0\n\t") + __ASM_CFI(".cfi_rel_offset %rip,-0x8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,-0x10\n\t") + __ASM_CFI(".cfi_rel_offset %rdi,-0x18\n\t") + __ASM_CFI(".cfi_rel_offset %rsi,-0x20\n\t") + "call impl_KiUserExceptionDispatcher\n\t" + "int3") static ULONG64 get_int_reg( CONTEXT *context, int reg ) { diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 265836499d5..611d1ab8197 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -531,6 +531,10 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun return &stack->rec; } +void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + pKiUserExceptionDispatcher( rec, context ); +} /********************************************************************** * raise_segv_exception diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 2bd6deb04f1..1d512a5ed9f 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -602,6 +602,11 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * REGn_sig(18, sigcontext) = (ULONG_PTR)NtCurrentTeb(); } +void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + pKiUserExceptionDispatcher( rec, context ); +} + /********************************************************************** * segv_handler * diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index ea9bfbeb3b9..730d0b1cb32 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1588,6 +1588,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * stack->context_ptr = &stack->context; } +void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + pKiUserExceptionDispatcher( rec, context ); +} /********************************************************************** * get_fpu_code diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 47f3650b428..128f9dad8db 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -233,6 +233,7 @@ typedef void (*raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); struct stack_layout { CONTEXT context; + ULONG64 unknown[4]; EXCEPTION_RECORD rec; ULONG64 rsi; ULONG64 rdi; @@ -241,6 +242,8 @@ struct stack_layout ULONG64 red_zone[16]; }; +C_ASSERT( sizeof(struct stack_layout) == 0x630 ); /* Should match the size in call_user_exception_dispatcher(). */ + struct amd64_thread_data { DWORD_PTR dr0; /* debug registers */ @@ -1843,16 +1846,10 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } -extern void CDECL raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); +extern void CDECL raise_func_trampoline( raise_func func ); + __ASM_GLOBAL_FUNC( raise_func_trampoline, - __ASM_CFI(".cfi_signal_frame\n\t") - __ASM_CFI(".cfi_def_cfa %rbp,160\n\t") /* red zone + rip + rbp + rdi + rsi */ - __ASM_CFI(".cfi_rel_offset %rip,24\n\t") - __ASM_CFI(".cfi_rel_offset %rbp,16\n\t") - __ASM_CFI(".cfi_rel_offset %rdi,8\n\t") - __ASM_CFI(".cfi_rel_offset %rsi,0\n\t") - "call *%r8\n\t" - "int $3") + "jmpq *%r8\n\t") /*********************************************************************** * setup_exception @@ -1934,7 +1931,6 @@ static struct stack_layout *setup_exception( ucontext_t *sigcontext ) static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack ) { - ULONG64 *rsp_ptr; NTSTATUS status; if (stack->rec.ExceptionCode == EXCEPTION_SINGLE_STEP) @@ -1962,24 +1958,39 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * return; } - /* store return address and %rbp without aligning, so that the offset is fixed */ - rsp_ptr = (ULONG64 *)RSP_sig(sigcontext) - 16; - *(--rsp_ptr) = stack->context.Rip; - *(--rsp_ptr) = stack->context.Rbp; - *(--rsp_ptr) = stack->context.Rdi; - *(--rsp_ptr) = stack->context.Rsi; - /* now modify the sigcontext to return to the raise function */ RIP_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; - RCX_sig(sigcontext) = (ULONG_PTR)&stack->rec; - RDX_sig(sigcontext) = (ULONG_PTR)&stack->context; R8_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; - RBP_sig(sigcontext) = (ULONG_PTR)rsp_ptr; RSP_sig(sigcontext) = (ULONG_PTR)stack; /* clear single-step, direction, and align check flag */ EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); } +extern void WINAPI user_exception_dispatcher_trampoline( struct stack_layout *stack, + void *pKiUserExceptionDispatcher ); + +__ASM_GLOBAL_FUNC( user_exception_dispatcher_trampoline, + "movq %rcx,%rsp\n\t" + "movq 0x98(%rsp),%rcx\n\t" /* context->Rsp */ + "movq 0xa0(%rsp),%rbp\n\t" + "movq 0xa8(%rsp),%rsi\n\t" + "movq 0xb0(%rsp),%rdi\n\t" + "jmpq *%rdx") + +void WINAPI do_call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context, struct stack_layout *stack) +{ + memcpy(&stack->context, context, sizeof(*context)); + memcpy(&stack->rec, rec, sizeof(*rec)); + + user_exception_dispatcher_trampoline( stack, pKiUserExceptionDispatcher ); +} + +__ASM_GLOBAL_FUNC( call_user_exception_dispatcher, + "movq 0x98(%rdx),%rsp\n\t" /* context->Rsp */ + "and $~0xf,%rsp\n\t" + "sub $0x630,%rsp\n\t" /* sizeof(struct stack_layout) */ + "movq %rsp,%r8\n\t" + "jmp do_call_user_exception_dispatcher\n\t") /*********************************************************************** * is_privileged_instr diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 1bf660ed917..8bbdee50f12 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -415,7 +415,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) NtSetContextThread( GetCurrentThread(), context ); - if (first_chance) pKiUserExceptionDispatcher( rec, context ); + if (first_chance) call_user_exception_dispatcher( rec, context ); if (rec->ExceptionFlags & EH_STACK_INVALID) ERR("Exception frame is not in stack limits => unable to dispatch exception.\n"); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 57c33c5027a..e68fc45271b 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -241,6 +241,8 @@ extern void init_cpu_info(void) DECLSPEC_HIDDEN; extern void dbg_init(void) DECLSPEC_HIDDEN; +extern void WINAPI call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) DECLSPEC_HIDDEN; + #define TICKSPERSEC 10000000 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)86400) #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) -- 2.26.2

1 1

[PATCH 1/4] gdiplus/tests: Add metafile playback test for EMR_RESTOREDC.
by Shawn M. Chapla 30 Jun '20

30 Jun '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/metafile.c | 123 ++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 3ffdb7b0e9..3788575309 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2832,6 +2832,128 @@ static void test_fillpath(void) expect(GenericError, stat); } +static const emfplus_record restoredc_records[] = { + { EMR_HEADER }, + { EMR_CREATEBRUSHINDIRECT }, + { EMR_SELECTOBJECT }, + + { EMR_SAVEDC }, + { EMR_SETVIEWPORTORGEX }, + { EMR_SAVEDC }, + { EMR_SETVIEWPORTORGEX }, + { EMR_SAVEDC }, + { EMR_SETVIEWPORTORGEX }, + + { EMR_RECTANGLE }, + + { EMR_RESTOREDC }, + { EMR_RECTANGLE }, + + { EMR_RESTOREDC }, + { EMR_RECTANGLE }, + + { EMR_SELECTOBJECT }, + { EMR_DELETEOBJECT }, + { EMR_EOF }, + { 0 } +}; + +static void test_restoredc(void) +{ + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + + GpBitmap *bitmap; + GpGraphics *graphics; + GpMetafile *metafile; + GpStatus stat; + HDC hdc, metafile_dc; + HBRUSH hbrush, holdbrush; + ARGB color; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel, + description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + hbrush = CreateSolidBrush(0xff0000); + holdbrush = SelectObject(metafile_dc, hbrush); + + SaveDC(metafile_dc); + SetViewportOrgEx(metafile_dc, 20, 20, NULL); + + SaveDC(metafile_dc); + SetViewportOrgEx(metafile_dc, 40, 40, NULL); + + SaveDC(metafile_dc); + SetViewportOrgEx(metafile_dc, 60, 60, NULL); + + Rectangle(metafile_dc, 0, 0, 3, 3); + RestoreDC(metafile_dc, -2); + + Rectangle(metafile_dc, 0, 0, 3, 3); + RestoreDC(metafile_dc, -1); + + Rectangle(metafile_dc, 0, 0, 3, 3); + + SelectObject(metafile_dc, holdbrush); + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, restoredc_records, "restoredc metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "restoredc.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, restoredc_records, "restoredc playback", dst_points, + &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 1, 1, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 21, 21, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 41, 41, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 61, 61, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2880,6 +3002,7 @@ START_TEST(metafile) test_properties(); test_drawpath(); test_fillpath(); + test_restoredc(); GdiplusShutdown(gdiplusToken); } -- 2.27.0

3 9

[PATCH] ntoskrnl.exe: Set reserved to 0 in pnp WM_DEVICECHANGE broadcast.
by Jefferson Carpenter 30 Jun '20

30 Jun '20

1 0

[PATCH 1/5] amstream: Fix sample refcounting in parent ddraw stream.
by Gijs Vermeulen 30 Jun '20

30 Jun '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 56230ca4e6..ca9826b14a 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -980,7 +980,6 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IMemInputPin_iface.lpVtbl = &ddraw_meminput_vtbl; object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; - object->sample_refs = 0; InitializeCriticalSection(&object->cs); @@ -1043,12 +1042,11 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); - EnterCriticalSection(&sample->parent->cs); - InterlockedDecrement(&sample->parent->sample_refs); - LeaveCriticalSection(&sample->parent->cs); - if (!ref) { + EnterCriticalSection(&sample->parent->cs); + sample->parent->sample_refs--; + LeaveCriticalSection(&sample->parent->cs); if (sample->surface) IDirectDrawSurface_Release(sample->surface); HeapFree(GetProcessHeap(), 0, sample); @@ -1166,7 +1164,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->parent = parent; EnterCriticalSection(&parent->cs); - InterlockedIncrement(&parent->sample_refs); + parent->sample_refs++; LeaveCriticalSection(&parent->cs); if (surface) -- 2.27.0

1 4

[PATCH resend] ntoskrnl.exe/tests: Fix some minor case issues in comments.
by Francois Gouget 30 Jun '20

30 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- The patch failed to apply yesterday because it got mangled in the mail due to the non-ASCII characters. Putting it as an attachment should avoid that. dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] ntdll/unix: use Pc instead of Rip in signal_arm64
by Biswapriyo Nath 30 Jun '20

30 Jun '20

1 0

[PATCH v7 1/9] msscript.ocx: Move IScriptControl::AddObject implementation into a helper.
by Gabriel Ivăncescu 30 Jun '20

30 Jun '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 59 +++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index df63220..bc1811b 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -250,6 +250,40 @@ static HRESULT start_script(ScriptHost *host) return hr; } +static HRESULT add_script_object(ScriptHost *host, BSTR name, IDispatch *object, DWORD flags) +{ + struct named_item *item; + HRESULT hr; + + if (host_get_named_item(host, name)) + return E_INVALIDARG; + + item = heap_alloc(sizeof(*item)); + if (!item) + return E_OUTOFMEMORY; + + item->name = SysAllocString(name); + if (!item->name) + { + heap_free(item); + return E_OUTOFMEMORY; + } + IDispatch_AddRef(item->disp = object); + list_add_tail(&host->named_items, &item->entry); + + hr = IActiveScript_AddNamedItem(host->script, name, flags); + if (FAILED(hr)) + { + list_remove(&item->entry); + IDispatch_Release(item->disp); + SysFreeString(item->name); + heap_free(item); + return hr; + } + + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -1392,8 +1426,6 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, { ScriptControl *This = impl_from_IScriptControl(iface); DWORD flags = SCRIPTITEM_ISVISIBLE | SCRIPTITEM_ISSOURCE; - struct named_item *item; - HRESULT hr; TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(name), object, add_members); @@ -1403,30 +1435,9 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, if (!This->host) return E_FAIL; - if (host_get_named_item(This->host, name)) - return E_INVALIDARG; - - item = heap_alloc(sizeof(*item)); - if (!item) - return E_OUTOFMEMORY; - - item->name = SysAllocString(name); - IDispatch_AddRef(item->disp = object); - list_add_tail(&This->host->named_items, &item->entry); - if (add_members) flags |= SCRIPTITEM_GLOBALMEMBERS; - hr = IActiveScript_AddNamedItem(This->host->script, name, flags); - if (FAILED(hr)) { - list_remove(&item->entry); - IDispatch_Release(item->disp); - SysFreeString(item->name); - heap_free(item); - return hr; - } - - - return hr; + return add_script_object(This->host, name, object, flags); } static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) -- 2.21.0

2 18

[PATCH 8/8 v2] msi: Remove MSICOLUMNINFO.temporary field.
by Piotr Caban 30 Jun '20

30 Jun '20

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

2 1

[PATCH 7/8 v2] msi: Remove column_info.temporary field.
by Piotr Caban 30 Jun '20

30 Jun '20

2 1

[PATCH 6/8 v2] msi: Fix adding temporary columns.
by Piotr Caban 30 Jun '20

30 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/alter.c | 82 +--------------------------------- dlls/msi/msipriv.h | 2 +- dlls/msi/table.c | 105 ++++++++++++++++++++++++++++++++++---------- dlls/msi/tests/db.c | 10 ++++- 4 files changed, 95 insertions(+), 104 deletions(-)

2 1

[PATCH 5/8 v2] msi: Add table existance tests for tables with temporary columns.
by Piotr Caban 30 Jun '20

30 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/db.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

4 3

[PATCH 4/8 v2] msi: Test freeing _TransformView table.
by Piotr Caban 30 Jun '20

30 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/db.c | 6 ++++++ 1 file changed, 6 insertions(+)

2 1

[PATCH 3/8 v2] msi: Remove ref_count from MSICOLUMNINFO.
by Piotr Caban 30 Jun '20

30 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/alter.c | 6 +++--- dlls/msi/table.c | 50 ++++++++++++++++-------------------------------- 2 files changed, 19 insertions(+), 37 deletions(-)

2 1

[PATCH 2/8 v2] msi: Fix table ref count on create.
by Piotr Caban 30 Jun '20

30 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/create.c | 2 +- dlls/msi/query.h | 2 +- dlls/msi/table.c | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-)

2 1

[PATCH 1/8 v2] msi: Support removing temporary columns in TABLE_remove_column.
by Piotr Caban 30 Jun '20

30 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - patches 1-6 are the same as in v1 - last 2 patches get rid of temporary field instead of using it more dlls/msi/table.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)

2 1

[PATCH 1/5] user32/tests: Add GetRawInputBuffer tests.
by Rémi Bernon 30 Jun '20

30 Jun '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This should apply and work independently from the other server rawinput patch series.. dlls/user32/tests/input.c | 247 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3dde3ce3c08..8b98c3f5c57 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -82,6 +82,7 @@ static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEP static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *); static UINT (WINAPI *pGetRawInputDeviceInfoA) (HANDLE, UINT, void *, UINT *); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); #define MAXKEYEVENTS 12 #define MAXKEYMESSAGES MAXKEYEVENTS /* assuming a key event generates one @@ -144,6 +145,7 @@ static BYTE InputKeyStateTable[256]; static BYTE AsyncKeyStateTable[256]; static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYSKEYUP or a WM_KEYUP message */ +static BOOL is_wow64; static void init_function_pointers(void) { @@ -159,7 +161,13 @@ static void init_function_pointers(void) GET_PROC(GetRawInputDeviceList); GET_PROC(GetRawInputDeviceInfoW); GET_PROC(GetRawInputDeviceInfoA); + + hdll = GetModuleHandleA("kernel32"); + GET_PROC(IsWow64Process); #undef GET_PROC + + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) + is_wow64 = FALSE; } static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam ) @@ -1819,6 +1827,244 @@ static void test_RegisterRawInputDevices(void) DestroyWindow(hwnd); } +static int rawinputbuffer_wndproc_count; + +#ifdef _WIN64 +typedef RAWINPUT RAWINPUT64; +#else +typedef struct +{ + RAWINPUTHEADER header; + char pad[8]; + union { + RAWMOUSE mouse; + RAWKEYBOARD keyboard; + RAWHID hid; + } data; +} RAWINPUT64; +#endif + +static int rawinput_buffer_mouse_x(void *buffer, size_t index) +{ + if (is_wow64) return ((RAWINPUT64 *)buffer)[index].data.mouse.lLastX; + return ((RAWINPUT *)buffer)[index].data.mouse.lLastX; +} + +static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + RAWINPUT ri; + char buffer[16 * sizeof(RAWINPUT64)]; + UINT size, count, rawinput_size, iteration = rawinputbuffer_wndproc_count++; + MSG message; + + if (is_wow64) rawinput_size = sizeof(RAWINPUT64); + else rawinput_size = sizeof(RAWINPUT); + + if (msg == WM_INPUT) + { + count = GetRawInputBuffer(NULL, NULL, sizeof(RAWINPUTHEADER)); + todo_wine + ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + + size = sizeof(buffer); + count = GetRawInputBuffer(NULL, &size, sizeof(RAWINPUTHEADER)); + ok(count == 0, "GetRawInputBuffer returned %u\n", count); + todo_wine + ok(size == rawinput_size, "GetRawInputBuffer returned unexpected size: %u\n", size); + + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); + todo_wine + ok(count == 3, "GetRawInputBuffer returned %u\n", count); + ok(size == sizeof(buffer), "GetRawInputBuffer returned unexpected size: %u\n", size); + todo_wine + ok(rawinput_buffer_mouse_x(buffer, 0) == 2, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 0)); + todo_wine + ok(rawinput_buffer_mouse_x(buffer, 1) == 3, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 1)); + todo_wine + ok(rawinput_buffer_mouse_x(buffer, 2) == 4, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 2)); + + /* the first event should be removed by the next GetRawInputBuffer call + * and the others should do another round through the message loop but not more */ + if (iteration == 0) + { + mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); + mouse_event(MOUSEEVENTF_MOVE, 6, 0, 0, 0); + mouse_event(MOUSEEVENTF_MOVE, 2, 0, 0, 0); + mouse_event(MOUSEEVENTF_MOVE, 3, 0, 0, 0); + mouse_event(MOUSEEVENTF_MOVE, 4, 0, 0, 0); + + /* even though rawinput_size is the minimum required size, + * it needs one more byte to return success */ + size = rawinput_size + 1; + memset(buffer, 0, sizeof(buffer)); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); + todo_wine + ok(count == 1, "GetRawInputBuffer returned %u\n", count); + todo_wine + ok(rawinput_buffer_mouse_x(buffer, 0) == 5, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 0)); + + /* peek the messages now, they should still arrive in the correct order */ + while (PeekMessageA(&message, 0, WM_INPUT, WM_INPUT, PM_REMOVE)) DispatchMessageA(&message); + } + + /* reading the message data now should fail on the second iteration, the data + * from the first message has been overwritten. */ + size = sizeof(ri); + memset(&ri, 0, sizeof(ri)); + count = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &ri, &size, sizeof(RAWINPUTHEADER)); + if (iteration == 1) + { + ok(count == sizeof(ri), "GetRawInputData failed\n"); + todo_wine + ok(ri.data.mouse.lLastX == 6, "Unexpected rawinput data: %d\n", ri.data.mouse.lLastX); + } + else + { + todo_wine + ok(count == ~0U, "GetRawInputData succeeded\n"); + } + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void test_GetRawInputBuffer(void) +{ + RAWINPUTDEVICE raw_devices[1]; + char buffer[16 * sizeof(RAWINPUT64)]; + UINT size, count, rawinput_size; + HWND hwnd; + BOOL ret; + + if (is_wow64) rawinput_size = sizeof(RAWINPUT64); + else rawinput_size = sizeof(RAWINPUT); + + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinputbuffer_wndproc); + ok(hwnd != 0, "CreateWindow failed\n"); + empty_message_queue(); + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x02; + raw_devices[0].dwFlags = RIDEV_INPUTSINK; + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = GetRawInputBuffer(NULL, NULL, sizeof(RAWINPUTHEADER)); + todo_wine + ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputBuffer returned %08x\n", GetLastError()); + + size = sizeof(buffer); + count = GetRawInputBuffer(NULL, &size, sizeof(RAWINPUTHEADER)); + ok(count == 0U, "GetRawInputBuffer returned %u\n", count); + todo_wine + ok(size == 0U, "GetRawInputBuffer returned unexpected size: %u\n", size); + + size = 0; + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); + ok(count == 0U, "GetRawInputBuffer returned %u\n", count); + ok(size == 0U, "GetRawInputBuffer returned unexpected size: %u\n", size); + + SetLastError(0xdeadbeef); + size = sizeof(buffer); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, 0); + todo_wine + ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputBuffer returned %08x\n", GetLastError()); + + size = sizeof(buffer); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); + ok(count == 0U, "GetRawInputBuffer returned %u\n", count); + todo_wine + ok(size == 0U, "GetRawInputBuffer returned unexpected size: %u\n", size); + + mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); + + SetLastError(0xdeadbeef); + size = 0; + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); + todo_wine + ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + todo_wine + ok(size == rawinput_size, "GetRawInputBuffer returned unexpected size: %u\n", size); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetRawInputBuffer returned %08x\n", GetLastError()); + + size = 0; + count = GetRawInputBuffer(NULL, &size, sizeof(RAWINPUTHEADER)); + ok(count == 0, "GetRawInputBuffer returned %u\n", count); + todo_wine + ok(size == rawinput_size, "GetRawInputBuffer returned unexpected size: %u\n", size); + + SetLastError(0xdeadbeef); + size = sizeof(buffer); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, 0); + todo_wine + ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputBuffer returned %08x\n", GetLastError()); + + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); + todo_wine + ok(count == 1U, "GetRawInputBuffer returned %u\n", count); + ok(size == sizeof(buffer), "GetRawInputBuffer returned unexpected size: %u\n", size); + todo_wine + ok(rawinput_buffer_mouse_x(buffer, 0) == 5, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 0)); + + + /* NOTE: calling with size == rawinput_size returns an error, */ + /* BUT it fills the buffer nonetheless and empties the internal buffer (!!) */ + mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); + + SetLastError(0xdeadbeef); + size = rawinput_size; + memset(buffer, 0, sizeof(buffer)); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); + todo_wine + ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetRawInputBuffer returned %08x\n", GetLastError()); + todo_wine + ok(rawinput_buffer_mouse_x(buffer, 0) == 5, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 0)); + + size = sizeof(buffer); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); + ok(count == 0U, "GetRawInputBuffer returned %u\n", count); + + + rawinputbuffer_wndproc_count = 0; + mouse_event(MOUSEEVENTF_MOVE, 1, 0, 0, 0); + mouse_event(MOUSEEVENTF_MOVE, 2, 0, 0, 0); + mouse_event(MOUSEEVENTF_MOVE, 3, 0, 0, 0); + mouse_event(MOUSEEVENTF_MOVE, 4, 0, 0, 0); + empty_message_queue(); + todo_wine + ok(rawinputbuffer_wndproc_count == 2, "Spurious WM_INPUT messages\n"); + + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + DestroyWindow(hwnd); +} + static BOOL rawinput_test_received_legacy; static BOOL rawinput_test_received_raw; static BOOL rawinput_test_received_rawfg; @@ -3417,6 +3663,7 @@ START_TEST(input) test_GetKeyState(); test_OemKeyScan(); test_GetRawInputData(); + test_GetRawInputBuffer(); test_RegisterRawInputDevices(); test_rawinput(argv[0]); -- 2.27.0

3 12

[PATCH vkd3d 6/6] vkd3d: Require VKD3D_API_VERSION_1_2 for version 1.1 root signatures.
by Henri Verbeet 30 Jun '20

30 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/device.c | 2 ++ tests/vkd3d_api.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c53856a..d88fde9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2766,6 +2766,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * TRACE("Root signature requested %#x.\n", data->HighestVersion); data->HighestVersion = min(data->HighestVersion, D3D_ROOT_SIGNATURE_VERSION_1_1); + if (device->vkd3d_instance->api_version < VKD3D_API_VERSION_1_2) + data->HighestVersion = min(data->HighestVersion, D3D_ROOT_SIGNATURE_VERSION_1_0); TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 13fa3d6..8195c06 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -1073,12 +1073,28 @@ static void test_formats(void) static void test_application_info(void) { + D3D12_FEATURE_DATA_ROOT_SIGNATURE root_signature; struct vkd3d_instance_create_info create_info; + struct vkd3d_device_create_info device_info; struct vkd3d_application_info app_info; struct vkd3d_instance *instance; + ID3D12Device *device; + unsigned int i; ULONG refcount; HRESULT hr; + static const struct + { + enum vkd3d_api_version api_version; + D3D_ROOT_SIGNATURE_VERSION rs_version; + } + root_signature_versions[] = + { + {VKD3D_API_VERSION_1_0, D3D_ROOT_SIGNATURE_VERSION_1_0}, + {VKD3D_API_VERSION_1_1, D3D_ROOT_SIGNATURE_VERSION_1_0}, + {VKD3D_API_VERSION_1_2, D3D_ROOT_SIGNATURE_VERSION_1_1}, + }; + app_info.type = VKD3D_STRUCTURE_TYPE_APPLICATION_INFO; app_info.next = NULL; app_info.engine_name = NULL; @@ -1113,6 +1129,44 @@ static void test_application_info(void) ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); refcount = vkd3d_instance_decref(instance); ok(!refcount, "Instance has %u references left.\n", refcount); + + device_info = device_default_create_info; + device_info.instance_create_info = &create_info; + for (i = 0; i < ARRAY_SIZE(root_signature_versions); ++i) + { + app_info.api_version = root_signature_versions[i].api_version; + hr = vkd3d_create_device(&device_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0, + "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion); + + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(root_signature.HighestVersion == root_signature_versions[i].rs_version, + "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion); + + ID3D12Device_Release(device); + } + + create_info.next = NULL; + hr = vkd3d_create_device(&device_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0, + "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion); + + ID3D12Device_Release(device); } static bool have_d3d12_device(void) -- 2.11.0

1 0

[PATCH vkd3d 5/6] vkd3d: Introduce API versions.
by Henri Verbeet 30 Jun '20

30 Jun '20

For backwards compatibility. Newer vkd3d versions may report more capabilities, but some of those may also require newer vkd3d APIs in order to use them. That's an issue for a vkd3d user like Wine, where reporting more capabilities may cause the application to try to use APIs that are not implemented in that version of Wine. Note that using ELF symbol versioning would have solved the issue for existing binaries compiled against older versions of vkd3d, but not for older source compiled against newer versions of vkd3d. Users of vkd3d-utils should define VKD3D_UTILS_API_VERSION to the vkd3d API version they wish to target. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- demos/demo_xcb.h | 1 + include/vkd3d.h | 9 +++++++++ include/vkd3d_utils.h | 8 +++++++- libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 21 +++++++++++++++++---- libs/vkd3d/device.c | 8 +++++++- libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12_crosstest.h | 1 + tests/vkd3d_api.c | 8 ++++++++ 9 files changed, 52 insertions(+), 6 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 6fae790..6ce02ed 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -18,6 +18,7 @@ */ #define VK_USE_PLATFORM_XCB_KHR +#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_2 #include <vkd3d.h> #include <vkd3d_utils.h> #include <xcb/xcb_event.h> diff --git a/include/vkd3d.h b/include/vkd3d.h index e2d9ec8..0ef8105 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -51,6 +51,13 @@ enum vkd3d_structure_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), }; +enum vkd3d_api_version +{ + VKD3D_API_VERSION_1_0, + VKD3D_API_VERSION_1_1, + VKD3D_API_VERSION_1_2, +}; + typedef HRESULT (*PFN_vkd3d_signal_event)(HANDLE event); typedef void * (*PFN_vkd3d_thread)(void *data); @@ -98,6 +105,8 @@ struct vkd3d_application_info const char *engine_name; /* "vkd3d" if NULL */ uint32_t engine_version; /* vkd3d version if engine_name is NULL */ + + enum vkd3d_api_version api_version; }; struct vkd3d_device_create_info diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 4a5ee5d..02687ed 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -21,6 +21,10 @@ #include <vkd3d.h> +#ifndef VKD3D_UTILS_API_VERSION +#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_0 +#endif + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -36,13 +40,15 @@ HRESULT vkd3d_signal_event(HANDLE event); unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); void vkd3d_destroy_event(HANDLE event); -HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, REFIID iid, void **device); +#define D3D12CreateDevice(a, b, c, d) D3D12CreateDeviceVKD3D(a, b, c, d, VKD3D_UTILS_API_VERSION) HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug); HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); /* 1.2 */ +HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, + REFIID iid, void **device, enum vkd3d_api_version api_version); HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 9d95a84..fb39124 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -2,6 +2,7 @@ VKD3D_1_0 { global: D3D12CreateDevice; + D3D12CreateDeviceVKD3D; D3D12CreateRootSignatureDeserializer; D3D12CreateVersionedRootSignatureDeserializer; D3D12GetDebugInterface; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index d06a750..c19fe7f 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -17,6 +17,7 @@ */ #include "vkd3d_utils_private.h" +#undef D3D12CreateDevice VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); @@ -27,8 +28,8 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) return E_NOTIMPL; } -HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, - D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, + REFIID iid, void **device, enum vkd3d_api_version api_version) { struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; @@ -47,15 +48,21 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, { VK_KHR_SWAPCHAIN_EXTENSION_NAME, }; + struct vkd3d_application_info application_info = + { + .type = VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, + .api_version = api_version, + }; - TRACE("adapter %p, minimum_feature_level %#x, iid %s, device %p.\n", - adapter, minimum_feature_level, debugstr_guid(iid), device); + TRACE("adapter %p, minimum_feature_level %#x, iid %s, device %p, api_version %#x.\n", + adapter, minimum_feature_level, debugstr_guid(iid), device, api_version); if (adapter) FIXME("Ignoring adapter %p.\n", adapter); memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.next = &application_info; optional_extensions_info.extensions = optional_instance_extensions; optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); @@ -78,6 +85,12 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, return vkd3d_create_device(&device_create_info, iid, device); } +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, + D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +{ + return D3D12CreateDeviceVKD3D(adapter, minimum_feature_level, iid, device, VKD3D_API_VERSION_1_0); +} + HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 437454d..c53856a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -506,16 +506,21 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.pEngineName = PACKAGE_NAME; application_info.engineVersion = vkd3d_get_vk_version(); application_info.apiVersion = VK_API_VERSION_1_0; + instance->api_version = VKD3D_API_VERSION_1_0; if ((vkd3d_application_info = vkd3d_find_struct(create_info->next, APPLICATION_INFO))) { - application_info.pApplicationName = vkd3d_application_info->application_name; + if (vkd3d_application_info->application_name) + application_info.pApplicationName = vkd3d_application_info->application_name; + else if (vkd3d_get_program_name(application_name)) + application_info.pApplicationName = application_name; application_info.applicationVersion = vkd3d_application_info->application_version; if (vkd3d_application_info->engine_name) { application_info.pEngineName = vkd3d_application_info->engine_name; application_info.engineVersion = vkd3d_application_info->engine_version; } + instance->api_version = vkd3d_application_info->api_version; } else if (vkd3d_get_program_name(application_name)) { @@ -523,6 +528,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, } TRACE("Application: %s.\n", debugstr_a(application_info.pApplicationName)); + TRACE("vkd3d API version: %u.\n", instance->api_version); if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 97cae22..1c36b24 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -147,6 +147,7 @@ struct vkd3d_instance void *libvulkan; uint64_t config_flags; + enum vkd3d_api_version api_version; VkDebugReportCallbackEXT vk_debug_callback; diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 7b59471..7ff835a 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -55,6 +55,7 @@ typedef int HRESULT; #ifdef _WIN32 # include "vkd3d_dxgi1_4.h" #else +# define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_2 # include <pthread.h> # include "vkd3d.h" # include "vkd3d_utils.h" diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index d4fe79a..13fa3d6 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -58,9 +58,16 @@ static HRESULT signal_event(HANDLE event) return S_OK; } +static const struct vkd3d_application_info instance_default_application_info = +{ + .type = VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, + .api_version = VKD3D_API_VERSION_1_2, +}; + static const struct vkd3d_instance_create_info instance_default_create_info = { .type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, + .next = &instance_default_application_info, .wchar_size = sizeof(WCHAR), .pfn_signal_event = signal_event, }; @@ -1078,6 +1085,7 @@ static void test_application_info(void) app_info.engine_version = 0; app_info.application_name = NULL; app_info.application_version = 0; + app_info.api_version = VKD3D_API_VERSION_1_0; create_info = instance_default_create_info; create_info.next = &app_info; -- 2.11.0

1 0

[PATCH vkd3d 4/6] vkd3d-shader: Introduce struct vkd3d_shader_resource.
by Henri Verbeet 30 Jun '20

30 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 58 ++++++++++++++------------- libs/vkd3d-shader/spirv.c | 21 +++++----- libs/vkd3d-shader/trace.c | 32 ++++++++------- libs/vkd3d-shader/vkd3d_shader_main.c | 69 +++++++++++--------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 16 +++++--- 5 files changed, 91 insertions(+), 105 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index de6aea3..6a63fd6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -594,6 +594,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { + struct vkd3d_shader_semantic *semantic = &ins->declaration.semantic; enum vkd3d_sm4_resource_type resource_type; const DWORD *end = &tokens[token_count]; enum vkd3d_sm4_data_type data_type; @@ -604,15 +605,15 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, if (!resource_type || (resource_type >= ARRAY_SIZE(resource_type_table))) { FIXME("Unhandled resource type %#x.\n", resource_type); - ins->declaration.semantic.resource_type = VKD3D_SHADER_RESOURCE_NONE; + semantic->resource_type = VKD3D_SHADER_RESOURCE_NONE; } else { - ins->declaration.semantic.resource_type = resource_type_table[resource_type]; + semantic->resource_type = resource_type_table[resource_type]; } reg_data_type = opcode == VKD3D_SM4_OP_DCL_RESOURCE ? VKD3D_DATA_RESOURCE : VKD3D_DATA_UAV; - shader_sm4_read_dst_param(priv, &tokens, end, reg_data_type, &ins->declaration.semantic.reg); - ins->declaration.semantic.register_index = shader_sm4_map_resource_idx(&ins->declaration.semantic.reg.reg, priv); + shader_sm4_read_dst_param(priv, &tokens, end, reg_data_type, &semantic->resource.reg); + semantic->resource.register_index = shader_sm4_map_resource_idx(&semantic->resource.reg.reg, priv); components = *tokens++; if ((components & 0xfff0) != (components & 0xf) * 0x1110) @@ -622,17 +623,17 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, if (!data_type || (data_type >= ARRAY_SIZE(data_type_table))) { FIXME("Unhandled data type %#x.\n", data_type); - ins->declaration.semantic.resource_data_type = VKD3D_DATA_FLOAT; + semantic->resource_data_type = VKD3D_DATA_FLOAT; } else { - ins->declaration.semantic.resource_data_type = data_type_table[data_type]; + semantic->resource_data_type = data_type_table[data_type]; } if (reg_data_type == VKD3D_DATA_UAV) ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.semantic.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &semantic->resource.register_space); } static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, @@ -869,29 +870,29 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { + struct vkd3d_shader_raw_resource *resource = &ins->declaration.raw_resource; const DWORD *end = &tokens[token_count]; - shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &ins->declaration.raw_resource.dst); - ins->declaration.raw_resource.register_index = shader_sm4_map_resource_idx( - &ins->declaration.raw_resource.dst.reg, priv); + shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); + resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.raw_resource.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); } static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { + struct vkd3d_shader_structured_resource *resource = &ins->declaration.structured_resource; const DWORD *end = &tokens[token_count]; - shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &ins->declaration.structured_resource.reg); - ins->declaration.structured_resource.register_index = shader_sm4_map_resource_idx( - &ins->declaration.structured_resource.reg.reg, priv); + shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); + resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - ins->declaration.structured_resource.byte_stride = *tokens++; - if (ins->declaration.structured_resource.byte_stride % 4) - FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); - shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.structured_resource.register_space); + resource->byte_stride = *tokens++; + if (resource->byte_stride % 4) + FIXME("Byte stride %u is not multiple of 4.\n", resource->byte_stride); + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); } static void shader_sm5_read_dcl_tgsm_raw(struct vkd3d_shader_instruction *ins, @@ -920,26 +921,27 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { + struct vkd3d_shader_structured_resource *resource = &ins->declaration.structured_resource; const DWORD *end = &tokens[token_count]; - shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &ins->declaration.structured_resource.reg); - ins->declaration.structured_resource.register_index = shader_sm4_map_resource_idx( - &ins->declaration.structured_resource.reg.reg, priv); - ins->declaration.structured_resource.byte_stride = *tokens++; - if (ins->declaration.structured_resource.byte_stride % 4) - FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); - shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.structured_resource.register_space); + shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); + resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->byte_stride = *tokens++; + if (resource->byte_stride % 4) + FIXME("Byte stride %u is not multiple of 4.\n", resource->byte_stride); + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); } static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { + struct vkd3d_shader_raw_resource *resource = &ins->declaration.raw_resource; const DWORD *end = &tokens[token_count]; - shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &ins->declaration.dst); - ins->declaration.raw_resource.register_index = shader_sm4_map_resource_idx(&ins->declaration.dst.reg, priv); - shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.raw_resource.register_space); + shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); + resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); } static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f058c24..a04645c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5280,14 +5280,16 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ } static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, unsigned int register_space, unsigned int register_index, - enum vkd3d_shader_resource_type resource_type, enum vkd3d_data_type resource_data_type, - unsigned int structure_stride, bool raw) + const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, + enum vkd3d_data_type resource_data_type, unsigned int structure_stride, bool raw) { uint32_t counter_type_id, type_id, ptr_type_id, var_id, counter_var_id = 0; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; SpvStorageClass storage_class = SpvStorageClassUniformConstant; + const struct vkd3d_shader_register *reg = &resource->reg.reg; const struct vkd3d_spirv_resource_type *resource_type_info; + unsigned int register_space = resource->register_space; + unsigned int register_index = resource->register_index; enum vkd3d_component_type sampled_type; struct vkd3d_symbol resource_symbol; bool is_uav; @@ -5373,8 +5375,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->reg.reg, semantic->register_space, - semantic->register_index, semantic->resource_type, semantic->resource_data_type, 0, false); + vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->resource, + semantic->resource_type, semantic->resource_data_type, 0, false); } static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler *compiler, @@ -5385,22 +5387,21 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->dst.reg, resource->register_space, - resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true); + vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->resource, + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true); } static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_structured_resource *resource = &instruction->declaration.structured_resource; - const struct vkd3d_shader_register *reg = &resource->reg.reg; unsigned int stride = resource->byte_stride; if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, reg, resource->register_space, - resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false); + vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->resource, + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false); } static void vkd3d_dxbc_compiler_emit_workgroup_memory(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 1b59e4c..8ea2d0c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -569,7 +569,7 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, { shader_addline(buffer, "dcl"); - if (semantic->reg.reg.type == VKD3DSPR_SAMPLER) + if (semantic->resource.reg.reg.type == VKD3DSPR_SAMPLER) { switch (semantic->resource_type) { @@ -590,9 +590,9 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, break; } } - else if (semantic->reg.reg.type == VKD3DSPR_RESOURCE || semantic->reg.reg.type == VKD3DSPR_UAV) + else if (semantic->resource.reg.reg.type == VKD3DSPR_RESOURCE || semantic->resource.reg.reg.type == VKD3DSPR_UAV) { - if (semantic->reg.reg.type == VKD3DSPR_RESOURCE) + if (semantic->resource.reg.reg.type == VKD3DSPR_RESOURCE) shader_addline(buffer, "_resource_"); else shader_addline(buffer, "_uav_"); @@ -642,7 +642,7 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "unknown"); break; } - if (semantic->reg.reg.type == VKD3DSPR_UAV) + if (semantic->resource.reg.reg.type == VKD3DSPR_UAV) shader_dump_uav_flags(buffer, flags); switch (semantic->resource_data_type) { @@ -1361,10 +1361,10 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL: case VKD3DSIH_DCL_UAV_TYPED: shader_dump_decl_usage(buffer, &ins->declaration.semantic, ins->flags, shader_version); - shader_dump_ins_modifiers(buffer, &ins->declaration.semantic.reg); + shader_dump_ins_modifiers(buffer, &ins->declaration.semantic.resource.reg); shader_addline(buffer, " "); - shader_dump_dst_param(buffer, &ins->declaration.semantic.reg, shader_version); - shader_dump_register_space(buffer, ins->declaration.semantic.register_space, shader_version); + shader_dump_dst_param(buffer, &ins->declaration.semantic.resource.reg, shader_version); + shader_dump_register_space(buffer, ins->declaration.semantic.resource.register_space, shader_version); break; case VKD3DSIH_DCL_CONSTANT_BUFFER: @@ -1469,15 +1469,16 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_RESOURCE_RAW: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_dst_param(buffer, &ins->declaration.raw_resource.dst, shader_version); - shader_dump_register_space(buffer, ins->declaration.raw_resource.register_space, shader_version); + shader_dump_dst_param(buffer, &ins->declaration.raw_resource.resource.reg, shader_version); + shader_dump_register_space(buffer, ins->declaration.raw_resource.resource.register_space, shader_version); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_dst_param(buffer, &ins->declaration.structured_resource.reg, shader_version); + shader_dump_dst_param(buffer, &ins->declaration.structured_resource.resource.reg, shader_version); shader_addline(buffer, ", %u", ins->declaration.structured_resource.byte_stride); - shader_dump_register_space(buffer, ins->declaration.structured_resource.register_space, shader_version); + shader_dump_register_space(buffer, + ins->declaration.structured_resource.resource.register_space, shader_version); break; case VKD3DSIH_DCL_SAMPLER: @@ -1537,17 +1538,18 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "%s", shader_opcode_names[ins->handler_idx]); shader_dump_uav_flags(buffer, ins->flags); shader_addline(buffer, " "); - shader_dump_dst_param(buffer, &ins->declaration.raw_resource.dst, shader_version); - shader_dump_register_space(buffer, ins->declaration.raw_resource.register_space, shader_version); + shader_dump_dst_param(buffer, &ins->declaration.raw_resource.resource.reg, shader_version); + shader_dump_register_space(buffer, ins->declaration.raw_resource.resource.register_space, shader_version); break; case VKD3DSIH_DCL_UAV_STRUCTURED: shader_addline(buffer, "%s", shader_opcode_names[ins->handler_idx]); shader_dump_uav_flags(buffer, ins->flags); shader_addline(buffer, " "); - shader_dump_dst_param(buffer, &ins->declaration.structured_resource.reg, shader_version); + shader_dump_dst_param(buffer, &ins->declaration.structured_resource.resource.reg, shader_version); shader_addline(buffer, ", %u", ins->declaration.structured_resource.byte_stride); - shader_dump_register_space(buffer, ins->declaration.structured_resource.register_space, shader_version); + shader_dump_register_space(buffer, + ins->declaration.structured_resource.resource.register_space, shader_version); break; case VKD3DSIH_DEF: diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0ef3035..b9caac7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -320,16 +320,28 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte } static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, - const struct vkd3d_shader_instruction *instruction) + const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, + enum vkd3d_shader_resource_data_type resource_data_type) { - const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; - enum vkd3d_shader_resource_data_type resource_data_type; enum vkd3d_shader_descriptor_type type; - if (semantic->reg.reg.type == VKD3DSPR_UAV) + if (resource->reg.reg.type == VKD3DSPR_UAV) type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; + vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, + resource->register_index, resource_type, resource_data_type, 0); + if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) + vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset, + context->scan_info->descriptor_count - 1); +} + +static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; + enum vkd3d_shader_resource_data_type resource_data_type; + switch (semantic->resource_data_type) { case VKD3D_DATA_UNORM: @@ -352,45 +364,8 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; break; } - vkd3d_shader_scan_add_descriptor(context, type, semantic->register_space, - semantic->register_index, semantic->resource_type, resource_data_type, 0); - if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) - vkd3d_shader_scan_add_uav_range(context, semantic->reg.reg.idx[0].offset, - context->scan_info->descriptor_count - 1); -} - -static void vkd3d_shader_scan_resource_declaration_raw(struct vkd3d_shader_scan_context *context, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; - enum vkd3d_shader_descriptor_type type; - - if (resource->dst.reg.type == VKD3DSPR_UAV) - type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; - else - type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, - resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); - if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) - vkd3d_shader_scan_add_uav_range(context, resource->dst.reg.idx[0].offset, - context->scan_info->descriptor_count - 1); -} - -static void vkd3d_shader_scan_resource_declaration_structured(struct vkd3d_shader_scan_context *context, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_structured_resource *resource = &instruction->declaration.structured_resource; - enum vkd3d_shader_descriptor_type type; - - if (resource->reg.reg.type == VKD3DSPR_UAV) - type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; - else - type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, - resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); - if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) - vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset, - context->scan_info->descriptor_count - 1); + vkd3d_shader_scan_resource_declaration(context, &semantic->resource, + semantic->resource_type, resource_data_type); } static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, @@ -408,15 +383,17 @@ static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *cont break; case VKD3DSIH_DCL: case VKD3DSIH_DCL_UAV_TYPED: - vkd3d_shader_scan_resource_declaration(context, instruction); + vkd3d_shader_scan_typed_resource_declaration(context, instruction); break; case VKD3DSIH_DCL_RESOURCE_RAW: case VKD3DSIH_DCL_UAV_RAW: - vkd3d_shader_scan_resource_declaration_raw(context, instruction); + vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.raw_resource.resource, + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: case VKD3DSIH_DCL_UAV_STRUCTURED: - vkd3d_shader_scan_resource_declaration_structured(context, instruction); + vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.structured_resource.resource, + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); break; default: break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a9a0c52..e4ff267 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -574,6 +574,13 @@ struct vkd3d_shader_index_range unsigned int register_count; }; +struct vkd3d_shader_resource +{ + struct vkd3d_shader_dst_param reg; + unsigned int register_space; + unsigned int register_index; +}; + enum vkd3d_decl_usage { VKD3D_DECL_USAGE_POSITION = 0, @@ -598,8 +605,7 @@ struct vkd3d_shader_semantic unsigned int usage_idx; enum vkd3d_shader_resource_type resource_type; enum vkd3d_data_type resource_data_type; - struct vkd3d_shader_dst_param reg; - unsigned int register_space, register_index; + struct vkd3d_shader_resource resource; }; enum vkd3d_shader_input_sysval_semantic @@ -659,15 +665,13 @@ struct vkd3d_shader_constant_buffer struct vkd3d_shader_structured_resource { - struct vkd3d_shader_dst_param reg; + struct vkd3d_shader_resource resource; unsigned int byte_stride; - unsigned int register_space, register_index; }; struct vkd3d_shader_raw_resource { - struct vkd3d_shader_dst_param dst; - unsigned int register_space, register_index; + struct vkd3d_shader_resource resource; }; struct vkd3d_shader_tgsm -- 2.11.0

1 0

[PATCH vkd3d 3/6] vkd3d-shader: Support more than 8 UAV counters.
by Henri Verbeet 30 Jun '20

30 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 3 --- libs/vkd3d/command.c | 30 ++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 3 ++- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e7bb925..701a312 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -582,9 +582,6 @@ struct vkd3d_versioned_root_signature_desc } u; }; -/* FIXME: Add support for 64 UAV bind slots. */ -#define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 - enum vkd3d_shader_resource_type { VKD3D_SHADER_RESOURCE_NONE = 0x0, diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 647431a..e5c6791 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1865,7 +1865,11 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li if (state && state->uav_counter_count) { enum vkd3d_pipeline_bind_point bind_point = (enum vkd3d_pipeline_bind_point)state->vk_bind_point; - list->pipeline_bindings[bind_point].uav_counters_dirty = true; + struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + + vkd3d_array_reserve((void **)&bindings->vk_uav_counter_views, &bindings->vk_uav_counter_views_size, + state->uav_counter_count, sizeof(*bindings->vk_uav_counter_views)); + bindings->uav_counters_dirty = true; } } @@ -2190,6 +2194,11 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_AddRef(ID3D12GraphicsCommandLi return refcount; } +static void vkd3d_pipeline_bindings_cleanup(struct vkd3d_pipeline_bindings *bindings) +{ + vkd3d_free(bindings->vk_uav_counter_views); +} + static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandList2 *iface) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); @@ -2207,6 +2216,9 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL if (list->allocator) d3d12_command_allocator_free_command_buffer(list->allocator, list); + vkd3d_pipeline_bindings_cleanup(&list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COMPUTE]); + vkd3d_pipeline_bindings_cleanup(&list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_GRAPHICS]); + vkd3d_free(list); d3d12_device_release(device); @@ -2341,6 +2353,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->pso_render_pass = VK_NULL_HANDLE; list->current_render_pass = VK_NULL_HANDLE; + vkd3d_pipeline_bindings_cleanup(&list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COMPUTE]); + vkd3d_pipeline_bindings_cleanup(&list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_GRAPHICS]); memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_GRAPHICS].vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COMPUTE].vk_bind_point = VK_PIPELINE_BIND_POINT_COMPUTE; @@ -2824,11 +2838,11 @@ done: static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list, enum vkd3d_pipeline_bind_point bind_point) { - VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct d3d12_pipeline_state *state = list->state; VkDevice vk_device = list->device->vk_device; + VkWriteDescriptorSet *vk_descriptor_writes; VkDescriptorSet vk_descriptor_set; unsigned int uav_counter_count; unsigned int i; @@ -2837,11 +2851,10 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma return; uav_counter_count = state->uav_counter_count; - assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes)); - - vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); - if (!vk_descriptor_set) + if (!(vk_descriptor_writes = vkd3d_calloc(uav_counter_count, sizeof(*vk_descriptor_writes)))) return; + if (!(vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout))) + goto done; for (i = 0; i < uav_counter_count; ++i) { @@ -2868,6 +2881,9 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL)); bindings->uav_counters_dirty = false; + +done: + vkd3d_free(vk_descriptor_writes); } static void d3d12_command_list_update_descriptors(struct d3d12_command_list *list, @@ -5619,6 +5635,8 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) { + list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_GRAPHICS].vk_uav_counter_views = NULL; + list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COMPUTE].vk_uav_counter_views = NULL; d3d12_command_list_reset_state(list, initial_pipeline_state); } else diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d7da7f1..97cae22 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -921,7 +921,8 @@ struct vkd3d_pipeline_bindings uint64_t descriptor_table_dirty_mask; uint64_t descriptor_table_active_mask; - VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; + VkBufferView *vk_uav_counter_views; + size_t vk_uav_counter_views_size; bool uav_counters_dirty; /* Needed when VK_KHR_push_descriptor is not available. */ -- 2.11.0

1 0

[PATCH vkd3d 2/6] tests: Test using UAV counters with multiple register spaces.
by Henri Verbeet 30 Jun '20

30 Jun '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c4ec41a..ec7be9d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32825,7 +32825,7 @@ static void test_write_buffer_immediate(void) static void test_register_space(void) { - ID3D12Resource *input_buffers[6], *output_buffers[8]; + ID3D12Resource *input_buffers[6], *output_buffers[8], *counter_buffers[2]; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; @@ -32834,6 +32834,7 @@ static void test_register_space(void) ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; ID3D12Device *device; + uint32_t counter; unsigned int i; HRESULT hr; @@ -32907,11 +32908,13 @@ static void test_register_space(void) u6[0] = t6.Load(0); u7[0] = c1; u8[0] = c2; + u7.IncrementCounter(); + u8.DecrementCounter(); } #endif - 0x43425844, 0x073b3de1, 0x527d26fc, 0xa46f417c, 0x4d9f338c, 0x00000001, 0x00000444, 0x00000003, + 0x43425844, 0x2a87323a, 0x4f83d345, 0x707e5d14, 0xdf41ce4a, 0x00000001, 0x00000474, 0x00000003, 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, - 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000003f0, 0x00050051, 0x000000fc, 0x0100086a, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000420, 0x00050051, 0x00000108, 0x0100086a, 0x07000059, 0x00308e46, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x07000059, 0x00308e46, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000002, 0x060000a1, 0x00307e46, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x07000858, 0x00307e46, 0x00000001, 0x00000002, @@ -32923,8 +32926,8 @@ static void test_register_space(void) 0x00000002, 0x00000001, 0x0700089c, 0x0031ee46, 0x00000002, 0x00000003, 0x00000003, 0x00004444, 0x00000001, 0x0600009d, 0x0031ee46, 0x00000003, 0x00000001, 0x00000001, 0x00000002, 0x0600009d, 0x0031ee46, 0x00000004, 0x00000002, 0x00000002, 0x00000002, 0x0700089c, 0x0031ee46, 0x00000005, - 0x00000003, 0x00000003, 0x00004444, 0x00000002, 0x0700009e, 0x0031ee46, 0x00000006, 0x00000003, - 0x00000003, 0x00000004, 0x00000003, 0x0700009e, 0x0031ee46, 0x00000007, 0x00000003, 0x00000003, + 0x00000003, 0x00000003, 0x00004444, 0x00000002, 0x0780009e, 0x0031ee46, 0x00000006, 0x00000003, + 0x00000003, 0x00000004, 0x00000003, 0x0780009e, 0x0031ee46, 0x00000007, 0x00000003, 0x00000003, 0x00000004, 0x00000004, 0x02000068, 0x00000001, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x080000a5, 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x00207006, 0x00000003, 0x00000001, 0x080000a6, 0x0021e012, 0x00000000, 0x00000001, 0x00004001, 0x00000000, 0x0010000a, 0x00000000, @@ -32943,7 +32946,8 @@ static void test_register_space(void) 0x0c0000a8, 0x0021e012, 0x00000007, 0x00000003, 0x00004001, 0x00000000, 0x00004001, 0x00000000, 0x0030800a, 0x00000000, 0x00000001, 0x00000000, 0x0c0000a8, 0x0021e012, 0x00000006, 0x00000003, 0x00004001, 0x00000000, 0x00004001, 0x00000000, 0x0030800a, 0x00000001, 0x00000001, 0x00000000, - 0x0100003e, + 0x060000b2, 0x00100012, 0x00000000, 0x0021e000, 0x00000007, 0x00000003, 0x060000b3, 0x00100012, + 0x00000000, 0x0021e000, 0x00000006, 0x00000003, 0x0100003e, }; static const uint32_t srv_data[] = {100, 200, 300, 400, 500, 600}; @@ -32980,18 +32984,37 @@ static void test_register_space(void) get_cpu_descriptor_handle(&context, heap, i)); } + for (i = 0; i < ARRAY_SIZE(counter_buffers); ++i) + { + counter_buffers[i] = create_default_buffer(device, sizeof(uint32_t), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + counter = 2; + upload_buffer_data(counter_buffers[i], 0, sizeof(counter), &counter, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, counter_buffers[i], 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + } + for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) { output_buffers[i] = create_default_buffer(device, sizeof(uint32_t), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); memset(&uav_desc, 0, sizeof(uav_desc)); - uav_desc.Format = DXGI_FORMAT_R32_UINT; uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; uav_desc.Buffer.FirstElement = 0; uav_desc.Buffer.NumElements = 1; - ID3D12Device_CreateUnorderedAccessView(device, output_buffers[i], NULL, &uav_desc, - get_cpu_descriptor_handle(&context, heap, ARRAY_SIZE(input_buffers) + i)); + if (i < 6) + { + uav_desc.Format = DXGI_FORMAT_R32_UINT; + } + else + { + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); + } + ID3D12Device_CreateUnorderedAccessView(device, output_buffers[i], i >= 6 ? counter_buffers[i - 6] : NULL, + &uav_desc, get_cpu_descriptor_handle(&context, heap, ARRAY_SIZE(input_buffers) + i)); } context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, @@ -33014,10 +33037,17 @@ static void test_register_space(void) reset_command_list(command_list, context.allocator); } + counter = read_uav_counter(&context, counter_buffers[0], 0); + ok(counter == 3, "Got unexpected value %d.\n", counter); + counter = read_uav_counter(&context, counter_buffers[1], 0); + ok(counter == 1, "Got unexpected value %d.\n", counter); + for (i = 0; i < ARRAY_SIZE(input_buffers); ++i) ID3D12Resource_Release(input_buffers[i]); for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) ID3D12Resource_Release(output_buffers[i]); + for (i = 0; i < ARRAY_SIZE(counter_buffers); ++i) + ID3D12Resource_Release(counter_buffers[i]); ID3D12DescriptorHeap_Release(heap); destroy_test_context(&context); } -- 2.11.0

1 0

[PATCH vkd3d 1/6] vkd3d-shader: Get rid of the "use_vocp" field in the vkd3d_shader_scan_info structure.
by Henri Verbeet 30 Jun '20

30 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 -- libs/vkd3d-shader/spirv.c | 7 +++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 12 ------------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e155663..e7bb925 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -640,8 +640,6 @@ struct vkd3d_shader_scan_info struct vkd3d_shader_descriptor_info *descriptors; unsigned int descriptor_count; - - bool use_vocp; }; enum vkd3d_component_type diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0baa191..f058c24 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2106,6 +2106,7 @@ struct vkd3d_dxbc_compiler const struct vkd3d_shader_scan_info *scan_info; unsigned int input_control_point_count; unsigned int output_control_point_count; + bool use_vocp; unsigned int shader_phase_count; struct vkd3d_shader_phase *shader_phases; @@ -5456,6 +5457,9 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); else vkd3d_dxbc_compiler_emit_input_register(compiler, dst); + + if (dst->reg.type == VKD3DSPR_OUTCONTROLPOINT) + compiler->use_vocp = true; } static void vkd3d_dxbc_compiler_emit_dcl_input_ps(struct vkd3d_dxbc_compiler *compiler, @@ -5987,7 +5991,6 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_barrier(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { - const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *control_point_phase, *phase; uint32_t phase_instance_id; @@ -6003,7 +6006,7 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler else vkd3d_dxbc_compiler_emit_default_control_point_phase(compiler); - if (scan_info->use_vocp) + if (compiler->use_vocp) vkd3d_dxbc_compiler_emit_hull_shader_barrier(compiler); for (i = 0; i < compiler->shader_phase_count; ++i) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ed67350..0ef3035 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -305,15 +305,6 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc cb->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); } -static void vkd3d_shader_scan_input_declaration(struct vkd3d_shader_scan_info *scan_info, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; - - if (dst->reg.type == VKD3DSPR_OUTCONTROLPOINT) - scan_info->use_vocp = true; -} - static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { @@ -412,9 +403,6 @@ static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *cont case VKD3DSIH_DCL_CONSTANT_BUFFER: vkd3d_shader_scan_constant_buffer_declaration(context, instruction); break; - case VKD3DSIH_DCL_INPUT: - vkd3d_shader_scan_input_declaration(context->scan_info, instruction); - break; case VKD3DSIH_DCL_SAMPLER: vkd3d_shader_scan_sampler_declaration(context, instruction); break; -- 2.11.0

1 0

[PATCH 2/2] winex11.drv: Use _GTK_WORKAREAS to get work areas if it is available.
by Zhiyi Zhang 30 Jun '20

30 Jun '20

_NET_WORKAREA reports a single rectangle as intersected work areas of all monitors. So work areas on non-primary monitors may be incorrect. For example, a dock only shown on the primary monitor reduces the work areas on non-primary monitors. There were attempts to extend _NET_WORKAREA to support work areas of multiple monitors but they were rejected as EWMH is no longer being maintained and _GTK_WORKAREAS was introduced instead. Fix Office 2010 missing title bar on non-primary monitors on GNOME. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- For the merge request to extend _NET_WORKAREA, see https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/22 dlls/winex11.drv/display.c | 29 ++++++++++++++++++++++++++++- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 625e8be4f47..262127367db 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -263,10 +263,37 @@ RECT get_work_area(RECT *monitor_rect) { Atom type; int format; - unsigned long count, remaining; + unsigned long count, remaining, i; long *work_area; RECT work_rect; + /* Try _GTK_WORKAREAS first as _NET_WORKAREA may be incorrect on multi-monitor systems */ + if (!XGetWindowProperty(gdi_display, DefaultRootWindow(gdi_display), + x11drv_atom(_GTK_WORKAREAS_D0), 0, ~0, False, XA_CARDINAL, &type, + &format, &count, &remaining, (unsigned char **)&work_area)) + { + if (type == XA_CARDINAL && format == 32 && count >= 4) + { + for (i = 0; i + 3 < count; i += 4) + { + work_rect.left = work_area[i * 4]; + work_rect.top = work_area[i * 4 + 1]; + work_rect.right = work_rect.left + work_area[i * 4 + 2]; + work_rect.bottom = work_rect.top + work_area[i * 4 + 3]; + + if (IntersectRect(&work_rect, &work_rect, monitor_rect)) + { + TRACE("work_rect:%s.\n", wine_dbgstr_rect(&work_rect)); + XFree(work_area); + return work_rect; + } + } + } + XFree(work_area); + } + + WARN("_GTK_WORKAREAS is not supported, fallback to _NET_WORKAREA. " + "Work areas may be incorrect on multi-monitor systems.\n"); if (!XGetWindowProperty(gdi_display, DefaultRootWindow(gdi_display), x11drv_atom(_NET_WORKAREA), 0, ~0, False, XA_CARDINAL, &type, &format, &count, &remaining, (unsigned char **)&work_area)) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index bfc9aee027c..1efdac7064c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -464,6 +464,7 @@ enum x11drv_atoms XATOM__NET_WM_WINDOW_TYPE_NORMAL, XATOM__NET_WM_WINDOW_TYPE_UTILITY, XATOM__NET_WORKAREA, + XATOM__GTK_WORKAREAS_D0, XATOM__XEMBED, XATOM__XEMBED_INFO, XATOM_XdndAware, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e6e61e801e1..9ec4c7a98f6 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -177,6 +177,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_WM_WINDOW_TYPE_NORMAL", "_NET_WM_WINDOW_TYPE_UTILITY", "_NET_WORKAREA", + "_GTK_WORKAREAS_D0", "_XEMBED", "_XEMBED_INFO", "XdndAware", -- 2.25.1

1 0

[PATCH 1/2] winex11.drv: Refactor query_work_area() to get intersected work area directly.
by Zhiyi Zhang 30 Jun '20

30 Jun '20

Refactor query_work_area() to pass in a monitor rectangle and check if the resulting work area intersects with the monitor rectangle in the function rather than doing it in the callers. Also move the function to display.c and rename it to get_work_area(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 32 ++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xinerama.c | 30 +++--------------------------- dlls/winex11.drv/xrandr.c | 6 ++---- 4 files changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a6fe23ea68a..625e8be4f47 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -259,6 +259,38 @@ RECT get_host_primary_monitor_rect(void) return rect; } +RECT get_work_area(RECT *monitor_rect) +{ + Atom type; + int format; + unsigned long count, remaining; + long *work_area; + RECT work_rect; + + if (!XGetWindowProperty(gdi_display, DefaultRootWindow(gdi_display), x11drv_atom(_NET_WORKAREA), + 0, ~0, False, XA_CARDINAL, &type, &format, &count, &remaining, + (unsigned char **)&work_area)) + { + if (type == XA_CARDINAL && format == 32 && count >= 4) + { + SetRect(&work_rect, work_area[0], work_area[1], work_area[0] + work_area[2], + work_area[1] + work_area[3]); + + if (IntersectRect(&work_rect, &work_rect, monitor_rect)) + { + TRACE("work_rect:%s.\n", wine_dbgstr_rect(&work_rect)); + XFree(work_area); + return work_rect; + } + } + XFree(work_area); + } + + WARN("_NET_WORKAREA is not supported, Work areas may be incorrect.\n"); + TRACE("work_rect:%s.\n", wine_dbgstr_rect(monitor_rect)); + return *monitor_rect; +} + void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) { if (new_handler->priority > host_handler.priority) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index cfce09bf11d..bfc9aee027c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -645,7 +645,7 @@ extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; -extern void query_work_area( RECT *rc_work ) DECLSPEC_HIDDEN; +extern RECT get_work_area( RECT *monitor_rect ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; struct x11drv_mode_info diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 7e79fdeed77..c9863482534 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -54,26 +54,6 @@ static inline MONITORINFOEXW *get_primary(void) return &monitors[idx]; } -void query_work_area( RECT *rc_work ) -{ - Atom type; - int format; - unsigned long count, remaining; - long *work_area; - - if (!XGetWindowProperty( gdi_display, DefaultRootWindow(gdi_display), x11drv_atom(_NET_WORKAREA), 0, - ~0, False, XA_CARDINAL, &type, &format, &count, - &remaining, (unsigned char **)&work_area )) - { - if (type == XA_CARDINAL && format == 32 && count >= 4) - { - SetRect( rc_work, work_area[0], work_area[1], - work_area[0] + work_area[2], work_area[1] + work_area[3] ); - } - XFree( work_area ); - } -} - #ifdef SONAME_LIBXINERAMA #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -100,13 +80,10 @@ static int query_screens(void) { int i, count, event_base, error_base; XineramaScreenInfo *screens; - RECT rc_work = {0, 0, 0, 0}; if (!monitors) /* first time around */ load_xinerama(); - query_work_area( &rc_work ); - if (!pXineramaQueryExtension || !pXineramaQueryScreens || !pXineramaQueryExtension( gdi_display, &event_base, &error_base ) || !(screens = pXineramaQueryScreens( gdi_display, &count ))) return 0; @@ -123,8 +100,7 @@ static int query_screens(void) monitors[i].rcMonitor.right = screens[i].x_org + screens[i].width; monitors[i].rcMonitor.bottom = screens[i].y_org + screens[i].height; monitors[i].dwFlags = 0; - if (!IntersectRect( &monitors[i].rcWork, &rc_work, &monitors[i].rcMonitor )) - monitors[i].rcWork = monitors[i].rcMonitor; + monitors[i].rcWork = get_work_area( &monitors[i].rcMonitor ); } get_primary()->dwFlags |= MONITORINFOF_PRIMARY; @@ -298,8 +274,8 @@ void xinerama_init( unsigned int width, unsigned int height ) SetRect( &rect, 0, 0, width, height ); if (!query_screens()) { - default_monitor.rcWork = default_monitor.rcMonitor = rect; - query_work_area( &default_monitor.rcWork ); + default_monitor.rcMonitor = rect; + default_monitor.rcWork = get_work_area( &default_monitor.rcMonitor ); nb_monitors = 1; monitors = &default_monitor; } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index dce4e6739e4..14574e198f5 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1054,7 +1054,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * XRROutputInfo *output_info = NULL, *enum_output_info = NULL; XRRCrtcInfo *crtc_info = NULL, *enum_crtc_info; INT primary_index = 0, monitor_count = 0, capacity; - RECT work_rect, primary_rect; + RECT primary_rect; BOOL ret = FALSE; INT i; @@ -1089,7 +1089,6 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * /* Active monitors, need to find other monitors with the same coordinates as mirrored */ else { - query_work_area( &work_rect ); primary_rect = get_primary_rect( screen_resources ); for (i = 0; i < screen_resources->noutput; ++i) @@ -1132,8 +1131,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * SetRect( &monitors[monitor_count].rc_monitor, crtc_info->x, crtc_info->y, crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height ); - if (!IntersectRect( &monitors[monitor_count].rc_work, &work_rect, &monitors[monitor_count].rc_monitor )) - monitors[monitor_count].rc_work = monitors[monitor_count].rc_monitor; + monitors[monitor_count].rc_work = get_work_area( &monitors[monitor_count].rc_monitor ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[monitor_count].rc_monitor )) -- 2.25.1

1 0

[PATCH] dxva2: Implement locking functionality in device manager.
by Nikolay Sivov 30 Jun '20

30 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 94 +++++++++++++++++++++++++++++++-- dlls/dxva2/tests/dxva2.c | 110 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 199 insertions(+), 5 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 4a51410d4b6..dd949b3d316 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -42,6 +42,7 @@ enum device_handle_flags struct device_handle { unsigned int flags; + IDirect3DStateBlock9 *state_block; }; struct device_manager @@ -57,7 +58,10 @@ struct device_manager size_t count; size_t capacity; + HANDLE locking_handle; + CRITICAL_SECTION cs; + CONDITION_VARIABLE lock; }; static BOOL dxva_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) @@ -254,6 +258,7 @@ static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) { struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); ULONG refcount = InterlockedDecrement(&manager->refcount); + size_t i; TRACE("%p, refcount %u.\n", iface, refcount); @@ -262,6 +267,11 @@ static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) if (manager->device) IDirect3DDevice9_Release(manager->device); DeleteCriticalSection(&manager->cs); + for (i = 0; i < manager->count; ++i) + { + if (manager->handles[i].state_block) + IDirect3DStateBlock9_Release(manager->handles[i].state_block); + } heap_free(manager->handles); heap_free(manager); } @@ -284,13 +294,21 @@ static HRESULT WINAPI device_manager_ResetDevice(IDirect3DDeviceManager9 *iface, if (manager->device) { for (i = 0; i < manager->count; ++i) + { + if (manager->handles[i].state_block) + IDirect3DStateBlock9_Release(manager->handles[i].state_block); + manager->handles[i].state_block = NULL; manager->handles[i].flags |= HANDLE_FLAG_INVALID; + } + manager->locking_handle = NULL; IDirect3DDevice9_Release(manager->device); } manager->device = device; IDirect3DDevice9_AddRef(manager->device); LeaveCriticalSection(&manager->cs); + WakeAllConditionVariable(&manager->lock); + return S_OK; } @@ -324,6 +342,7 @@ static HRESULT WINAPI device_manager_OpenDeviceHandle(IDirect3DDeviceManager9 *i { *hdevice = ULongToHandle(manager->count + 1); manager->handles[manager->count].flags |= HANDLE_FLAG_OPEN; + manager->handles[manager->count].state_block = NULL; manager->count++; } else @@ -355,15 +374,22 @@ static HRESULT WINAPI device_manager_CloseDeviceHandle(IDirect3DDeviceManager9 * { if (manager->handles[idx].flags & HANDLE_FLAG_OPEN) { + if (manager->locking_handle == hdevice) + manager->locking_handle = NULL; manager->handles[idx].flags = 0; if (idx == manager->count - 1) manager->count--; + if (manager->handles[idx].state_block) + IDirect3DStateBlock9_Release(manager->handles[idx].state_block); + manager->handles[idx].state_block = NULL; } else hr = E_HANDLE; } LeaveCriticalSection(&manager->cs); + WakeAllConditionVariable(&manager->lock); + return hr; } @@ -393,16 +419,75 @@ static HRESULT WINAPI device_manager_TestDevice(IDirect3DDeviceManager9 *iface, static HRESULT WINAPI device_manager_LockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, IDirect3DDevice9 **device, BOOL block) { - FIXME("%p, %p, %p, %d.\n", iface, hdevice, device, block); + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + HRESULT hr; + size_t idx; - return E_NOTIMPL; + TRACE("%p, %p, %p, %d.\n", iface, hdevice, device, block); + + EnterCriticalSection(&manager->cs); + if (!manager->device) + hr = DXVA2_E_NOT_INITIALIZED; + else if (SUCCEEDED(hr = device_manager_get_handle_index(manager, hdevice, &idx))) + { + if (manager->locking_handle && !block) + hr = DXVA2_E_VIDEO_DEVICE_LOCKED; + else + { + while (manager->locking_handle && block) + { + SleepConditionVariableCS(&manager->lock, &manager->cs, INFINITE); + } + + if (SUCCEEDED(hr = device_manager_get_handle_index(manager, hdevice, &idx))) + { + if (manager->handles[idx].flags & HANDLE_FLAG_INVALID) + hr = DXVA2_E_NEW_VIDEO_DEVICE; + else + { + if (manager->handles[idx].state_block) + { + if (FAILED(IDirect3DStateBlock9_Apply(manager->handles[idx].state_block))) + WARN("Failed to apply state.\n"); + IDirect3DStateBlock9_Release(manager->handles[idx].state_block); + manager->handles[idx].state_block = NULL; + } + *device = manager->device; + IDirect3DDevice9_AddRef(*device); + manager->locking_handle = hdevice; + } + } + } + } + LeaveCriticalSection(&manager->cs); + + return hr; } static HRESULT WINAPI device_manager_UnlockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, BOOL savestate) { - FIXME("%p, %p, %d.\n", iface, hdevice, savestate); + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + HRESULT hr; + size_t idx; - return E_NOTIMPL; + TRACE("%p, %p, %d.\n", iface, hdevice, savestate); + + EnterCriticalSection(&manager->cs); + + if (hdevice != manager->locking_handle) + hr = E_INVALIDARG; + else if (SUCCEEDED(hr = device_manager_get_handle_index(manager, hdevice, &idx))) + { + manager->locking_handle = NULL; + if (savestate) + IDirect3DDevice9_CreateStateBlock(manager->device, D3DSBT_ALL, &manager->handles[idx].state_block); + } + + LeaveCriticalSection(&manager->cs); + + WakeAllConditionVariable(&manager->lock); + + return hr; } static HRESULT WINAPI device_manager_GetVideoService(IDirect3DDeviceManager9 *iface, HANDLE hdevice, REFIID riid, @@ -470,6 +555,7 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceMan object->refcount = 1; object->token = GetTickCount(); InitializeCriticalSection(&object->cs); + InitializeConditionVariable(&object->lock); *token = object->token; *manager = &object->IDirect3DDeviceManager9_iface; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index e3e8dd2e66c..49b192a1fad 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -72,6 +72,7 @@ static void test_device_manager(void) HWND window; UINT token; HRESULT hr; + RECT rect; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -88,13 +89,15 @@ static void test_device_manager(void) hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_LockDevice(manager, 0, &device2, FALSE); + ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + /* Invalid token. */ hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token + 1); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - refcount = get_refcount((IUnknown *)device); handle1 = NULL; @@ -140,6 +143,7 @@ static void test_device_manager(void) IDirectXVideoProcessorService_Release(processor_service); device2 = create_device(d3d, window); + hr = IDirect3DDeviceManager9_ResetDevice(manager, device2, token); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -150,6 +154,110 @@ static void test_device_manager(void) hr = IDirect3DDeviceManager9_TestDevice(manager, handle); ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Lock/Unlock. */ + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device3, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device pointer.\n"); + IDirect3DDevice9_Release(device3); + + hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, FALSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_UnlockDevice(manager, (HANDLE)((ULONG_PTR)handle + 100), FALSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Locked with one handle, unlock with another. */ + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device3, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device pointer.\n"); + IDirect3DDevice9_Release(device3); + + hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle1, FALSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Closing unlocks the device. */ + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_LockDevice(manager, handle1, &device3, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device pointer.\n"); + IDirect3DDevice9_Release(device3); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Open two handles. */ + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device3, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device pointer.\n"); + IDirect3DDevice9_Release(device3); + + hr = IDirect3DDeviceManager9_LockDevice(manager, handle1, &device3, FALSE); + ok(hr == DXVA2_E_VIDEO_DEVICE_LOCKED, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* State saving function. */ + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device3, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device pointer.\n"); + + SetRect(&rect, 50, 60, 70, 80); + hr = IDirect3DDevice9_SetScissorRect(device3, &rect); + ok(SUCCEEDED(hr), "Failed to set scissor rect, hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + SetRect(&rect, 30, 60, 70, 80); + hr = IDirect3DDevice9_SetScissorRect(device3, &rect); + ok(SUCCEEDED(hr), "Failed to set scissor rect, hr %#x.\n", hr); + + IDirect3DDevice9_Release(device3); + + hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device3, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device pointer.\n"); + + hr = IDirect3DDevice9_GetScissorRect(device3, &rect); + ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(rect.left == 50 && rect.top == 60 && rect.right == 70 && rect.bottom == 80, + "Got unexpected scissor rect %s.\n", wine_dbgstr_rect(&rect)); + + IDirect3DDevice9_Release(device3); + + hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Acceleration service. */ hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoAccelerationService, (void **)&accel_service); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.27.0

1 0

TestBot vs. the power spike
by Francois Gouget 30 Jun '20

30 Jun '20

There was some sort of power spike and now the power is wonky including for the rack where the TestBot VM hosts are hosted :-(. So for now they are powered off until the power issues are sorted out. So if you wonder why the TestBot VMs are offline that's why. I'll post an update when we know more. -- Francois Gouget <fgouget(a)codeweavers.com>

1 1

[PATCH 0/6] Implement QueryDisplayConfig() and GetDisplayConfigBufferSizes().
by Brendan Shanks 30 Jun '20

30 Jun '20

Implement QueryDisplayConfig() and the closely related GetDisplayConfigBufferSizes(). Thanks to Zhiyi Zhang for reviewing earlier versions of this patchset. Brendan Shanks (6): include: Add d3dkmdt.h. user32/tests: Mark DisplayConfigGetDeviceInfo() tests returning success as todo_wine. user32: Implement GetDisplayConfigBufferSizes(). user32/tests: Test additional flag values with GetDisplayConfigBufferSizes(). user32: Implement QueryDisplayConfig(). user32/tests: Add more QueryDisplayConfig() tests. dlls/user32/sysparams.c | 287 +++++++++++++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 92 ++++++++++-- include/Makefile.in | 1 + include/d3dkmdt.h | 59 ++++++++ 4 files changed, 422 insertions(+), 17 deletions(-) create mode 100644 include/d3dkmdt.h -- 2.26.2

2 7

[PATCH] msvcrt: Print assertion failure messages to stderr.
by Zebediah Figura 30 Jun '20

30 Jun '20

This matches Windows behaviour. In particular, redirecting stderr with freopen() followed by assert(0) will print the failure message to the relevant file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- The motivation for this patch is that WriteConsoleW() and therefore _cwprintf() consistently swallow messages when I try to run Wine tests. I don't know if this is a bug, but it turns out there was an easier fix than trying to delve into console code... dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/scanf.c | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index f631d4d727b..cb38b35de9a 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -305,7 +305,7 @@ void CDECL MSVCRT__wassert(const MSVCRT_wchar_t* str, const MSVCRT_wchar_t* file DoMessageBoxW(assertion_failed, text); } else - _cwprintf(format_console, str, file, line); + MSVCRT_fwprintf(MSVCRT_stderr, format_console, str, file, line); MSVCRT_raise(MSVCRT_SIGABRT); MSVCRT__exit(3); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3ffc785d065..dc89c6af23e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -447,6 +447,8 @@ struct MSVCRT__iobuf { typedef struct MSVCRT__iobuf MSVCRT_FILE; +extern MSVCRT_FILE MSVCRT__iob[]; + struct MSVCRT_lconv { char* decimal_point; char* thousands_sep; @@ -1107,6 +1109,7 @@ MSVCRT___time32_t __cdecl MSVCRT__time32(MSVCRT___time32_t*); MSVCRT___time64_t __cdecl MSVCRT__time64(MSVCRT___time64_t*); MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *); MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); +int WINAPIV MSVCRT_fwprintf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...); int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 04f87077e16..4b2ac2ed4a1 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -35,8 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -extern MSVCRT_FILE MSVCRT__iob[]; - /* helper function for *scanf. Returns the value of character c in the * given base, or -1 if the given character is not a digit of the base. */ -- 2.27.0

2 1

[PATCH] winegstreamer: Don't store DirectShow caps.
by Zebediah Figura 30 Jun '20

30 Jun '20

Primarily so that we can connect using video caps that can't be translated into DirectShow caps. They will later be converted into translatable caps once the DirectShow source pin is connected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47642 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 162 ++++++++++++++++++++-------------- 1 file changed, 94 insertions(+), 68 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8f89935b82..5697d2c0e0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -78,7 +78,6 @@ struct gstdemux_source GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; - AM_MEDIA_TYPE mt; HANDLE caps_event, eos_event; GstSegment *segment; SourceSeeking seek; @@ -99,15 +98,11 @@ static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface); -static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE *amt) +static gboolean amt_from_gst_audio_info(const GstAudioInfo *info, AM_MEDIA_TYPE *amt) { WAVEFORMATEXTENSIBLE *wfe; WAVEFORMATEX *wfx; gint32 depth, bpp; - GstAudioInfo ainfo; - - if (!gst_audio_info_from_caps (&ainfo, caps)) - return FALSE; wfe = CoTaskMemAlloc(sizeof(*wfe)); wfx = (WAVEFORMATEX*)wfe; @@ -122,10 +117,10 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE; - wfx->nChannels = ainfo.channels; - wfx->nSamplesPerSec = ainfo.rate; - depth = GST_AUDIO_INFO_WIDTH(&ainfo); - bpp = GST_AUDIO_INFO_DEPTH(&ainfo); + wfx->nChannels = info->channels; + wfx->nSamplesPerSec = info->rate; + depth = GST_AUDIO_INFO_WIDTH(info); + bpp = GST_AUDIO_INFO_DEPTH(info); if (!depth || depth > 32 || depth % 8) depth = bpp; @@ -144,7 +139,8 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * default: wfe->dwChannelMask = 0; } - if (GST_AUDIO_INFO_IS_FLOAT(&ainfo)) { + if (GST_AUDIO_INFO_IS_FLOAT(info)) + { amt->subtype = MEDIASUBTYPE_IEEE_FLOAT; wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; } else { @@ -207,7 +203,7 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE bih->biBitCount = 16; break; default: - FIXME("Unhandled type %s.\n", GST_VIDEO_INFO_NAME(info)); + WARN("Cannot convert %s to a DirectShow type.\n", GST_VIDEO_INFO_NAME(info)); CoTaskMemFree(vih); return FALSE; } @@ -314,8 +310,16 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); GstStructure *structure = gst_caps_get_structure(caps, 0); + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + if (!strcmp(type, "audio/x-raw")) - return amt_from_gst_caps_audio_raw(caps, mt); + { + GstAudioInfo info; + + if (!(gst_audio_info_from_caps(&info, caps))) + return FALSE; + return amt_from_gst_audio_info(&info, mt); + } else if (!strcmp(type, "video/x-raw")) { GstVideoInfo info; @@ -331,7 +335,6 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) VIDEOINFOHEADER *vih; gint i; - memset(mt, 0, sizeof(AM_MEDIA_TYPE)); mt->majortype = MEDIATYPE_Video; mt->subtype = MEDIASUBTYPE_CVID; mt->bTemporalCompression = TRUE; @@ -466,24 +469,6 @@ static GstCaps *amt_to_gst_caps(const AM_MEDIA_TYPE *mt) return NULL; } -static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) -{ - struct gstdemux_source *pin = gst_pad_get_element_private(pad); - struct gstdemux *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - gchar *caps_str = gst_caps_to_string(caps); - - TRACE("filter %p, caps %s.\n", filter, debugstr_a(caps_str)); - g_free(caps_str); - - FreeMediaType(&pin->mt); - - if (!amt_from_gst_caps(caps, &pin->mt)) - return FALSE; - - SetEvent(pin->caps_event); - return TRUE; -} - static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) { struct gstdemux_source *pin = gst_pad_get_element_private(pad); @@ -662,6 +647,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { struct gstdemux_source *pin = gst_pad_get_element_private(pad); + gboolean ret; TRACE("pin %p, type \"%s\".\n", pin, GST_EVENT_TYPE_NAME(event)); @@ -722,11 +708,10 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (pin->pin.pin.peer) IPin_EndFlush(pin->pin.pin.peer); return TRUE; - case GST_EVENT_CAPS: { - GstCaps *caps; - gst_event_parse_caps(event, &caps); - return setcaps_sink(pad, caps); - } + case GST_EVENT_CAPS: + ret = gst_pad_event_default(pad, parent, event); + SetEvent(pin->caps_event); + return ret; default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); return gst_pad_event_default(pad, parent, event); @@ -1678,6 +1663,10 @@ static HRESULT gstdecoder_source_query_accept(struct gstdemux_source *pin, const static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { + GstCaps *caps = gst_pad_get_current_caps(pin->my_sink); + const GstStructure *structure; + const char *type; + static const GstVideoFormat video_formats[] = { /* Try to prefer YUV formats over RGB ones. Most decoders output in the @@ -1695,42 +1684,48 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, GST_VIDEO_FORMAT_BGR, }; - if (!index) + assert(caps); /* We shouldn't be able to get here if caps haven't been set. */ + structure = gst_caps_get_structure(caps, 0); + type = gst_structure_get_name(structure); + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + + if (amt_from_gst_caps(caps, mt)) { - CopyMediaType(mt, &pin->mt); - return S_OK; + if (!index--) + { + gst_caps_unref(caps); + return S_OK; + } } - else if (IsEqualGUID(&pin->mt.majortype, &MEDIATYPE_Video) - && index - 1 < ARRAY_SIZE(video_formats)) + + if (!strcmp(type, "video/x-raw") && index < ARRAY_SIZE(video_formats)) { - const VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; + gint width, height; GstVideoInfo info; - gst_video_info_set_format(&info, video_formats[index - 1], - vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); + gst_caps_unref(caps); + gst_structure_get_int(structure, "width", &width); + gst_structure_get_int(structure, "height", &height); + gst_video_info_set_format(&info, video_formats[index], width, height); if (!amt_from_gst_video_info(&info, mt)) return E_OUTOFMEMORY; return S_OK; } - else if (IsEqualGUID(&pin->mt.majortype, &MEDIATYPE_Audio) && index == 1) - { - const WAVEFORMATEX *our_format = (WAVEFORMATEX *)pin->mt.pbFormat; - WAVEFORMATEX *format; - - *mt = pin->mt; - mt->subtype = MEDIASUBTYPE_PCM; - mt->pbFormat = CoTaskMemAlloc(sizeof(WAVEFORMATEX)); - format = (WAVEFORMATEX *)mt->pbFormat; - format->wFormatTag = WAVE_FORMAT_PCM; - format->nChannels = 2; - format->nSamplesPerSec = our_format->nSamplesPerSec; - format->wBitsPerSample = 16; - format->nBlockAlign = 4; - format->nAvgBytesPerSec = format->nSamplesPerSec * 4; - format->cbSize = 0; + else if (!strcmp(type, "audio/x-raw") && !index) + { + GstAudioInfo info; + gint rate; + + gst_caps_unref(caps); + gst_structure_get_int(structure, "rate", &rate); + gst_audio_info_set_format(&info, GST_AUDIO_FORMAT_S16LE, rate, 2, NULL); + if (!amt_from_gst_audio_info(&info, mt)) + return E_OUTOFMEMORY; return S_OK; } + gst_caps_unref(caps); return VFW_S_NO_MORE_ITEMS; } @@ -2137,7 +2132,6 @@ static void free_source_pin(struct gstdemux_source *pin) gst_object_unref(pin->my_sink); CloseHandle(pin->caps_event); CloseHandle(pin->eos_event); - FreeMediaType(&pin->mt); gst_segment_free(pin->segment); strmbase_seeking_cleanup(&pin->seek); @@ -2394,9 +2388,24 @@ static BOOL wave_parser_init_gst(struct gstdemux *filter) return TRUE; } +static gboolean get_source_amt(const struct gstdemux_source *pin, AM_MEDIA_TYPE *mt) +{ + GstCaps *caps = gst_pad_get_current_caps(pin->my_sink); + gboolean ret = amt_from_gst_caps(caps, mt); + gst_caps_unref(caps); + return ret; +} + static HRESULT wave_parser_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) { - return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; + AM_MEDIA_TYPE pad_mt; + HRESULT hr; + + if (!get_source_amt(pin, &pad_mt)) + return E_OUTOFMEMORY; + hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; + FreeMediaType(&pad_mt); + return hr; } static HRESULT wave_parser_source_get_media_type(struct gstdemux_source *pin, @@ -2404,7 +2413,8 @@ static HRESULT wave_parser_source_get_media_type(struct gstdemux_source *pin, { if (index > 0) return VFW_S_NO_MORE_ITEMS; - CopyMediaType(mt, &pin->mt); + if (!get_source_amt(pin, mt)) + return E_OUTOFMEMORY; return S_OK; } @@ -2507,7 +2517,14 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) static HRESULT avi_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) { - return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; + AM_MEDIA_TYPE pad_mt; + HRESULT hr; + + if (!get_source_amt(pin, &pad_mt)) + return E_OUTOFMEMORY; + hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; + FreeMediaType(&pad_mt); + return hr; } static HRESULT avi_splitter_source_get_media_type(struct gstdemux_source *pin, @@ -2515,7 +2532,8 @@ static HRESULT avi_splitter_source_get_media_type(struct gstdemux_source *pin, { if (index > 0) return VFW_S_NO_MORE_ITEMS; - CopyMediaType(mt, &pin->mt); + if (!get_source_amt(pin, mt)) + return E_OUTOFMEMORY; return S_OK; } @@ -2632,7 +2650,14 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) static HRESULT mpeg_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) { - return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; + AM_MEDIA_TYPE pad_mt; + HRESULT hr; + + if (!get_source_amt(pin, &pad_mt)) + return E_OUTOFMEMORY; + hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; + FreeMediaType(&pad_mt); + return hr; } static HRESULT mpeg_splitter_source_get_media_type(struct gstdemux_source *pin, @@ -2640,7 +2665,8 @@ static HRESULT mpeg_splitter_source_get_media_type(struct gstdemux_source *pin, { if (index > 0) return VFW_S_NO_MORE_ITEMS; - CopyMediaType(mt, &pin->mt); + if (!get_source_amt(pin, mt)) + return E_OUTOFMEMORY; return S_OK; } -- 2.27.0

1 0

[tools] winetest: Add a script to test HTTP redirection limits.
by Owen Rudge 29 Jun '20

29 Jun '20

I've written patches to implement support for WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS in winhttp; this script will be required for the tests. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- winetest/tests/redirecttest.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 winetest/tests/redirecttest.php

1 0

[PATCH] netio.sys: Remove WINAPI on static functions where not needed.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/netio.sys/netio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 53d74f994db..fe73b06b978 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -605,7 +605,7 @@ static void WINAPI send_receive_callback(TP_CALLBACK_INSTANCE *instance, void *s unlock_socket(socket); } -static NTSTATUS WINAPI do_send_receive(WSK_SOCKET *socket, WSK_BUF *wsk_buf, ULONG flags, IRP *irp, BOOL is_send) +static NTSTATUS do_send_receive(WSK_SOCKET *socket, WSK_BUF *wsk_buf, ULONG flags, IRP *irp, BOOL is_send) { struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(socket); struct wsk_pending_io *io; -- 2.20.1

3 3

[PATCH 1/6] user32/tests: Add basic GetRegisteredRawInputDevices tests.
by Rémi Bernon 29 Jun '20

29 Jun '20

There's already some in dinput, but this is a more appropriate location. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- With the Sekiro test from last time, but injecting 2kHz mouse events to better show the differences, brings the normal FPS from ~=50fps (the missing esync series hurts badly here) down to ~=20fps on average with some catch up moments, probably when LL hooks start to timeout in batch. Patch #4 helps by doing less work in the LL hooks and using rawinput messages instead, and bring it up to ~=30fps on average, but still with the catch up moments. And with patch #5 it holds the load much better, with a steady ~=45fps thanks to the ll-hook removal. dlls/user32/tests/input.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3130f3987e3..0607f300871 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1757,6 +1757,7 @@ static void test_RegisterRawInputDevices(void) { HWND hwnd; RAWINPUTDEVICE raw_devices[1]; + UINT count, raw_devices_count; BOOL res; raw_devices[0].usUsagePage = 0x01; @@ -1783,6 +1784,42 @@ static void test_RegisterRawInputDevices(void) ok(res == TRUE, "RegisterRawInputDevices failed\n"); ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = GetRegisteredRawInputDevices(NULL, NULL, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(count == 0, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 1, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(raw_devices, 0, sizeof(raw_devices)); + raw_devices_count = ARRAY_SIZE(raw_devices); + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == 1, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 1, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + todo_wine + ok(raw_devices[0].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 0x05, "Unexpected usage: %x\n", raw_devices[0].usUsage); /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; -- 2.27.0

2 9

[PATCH] netio.sys: Fix some minor case issues in comments.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/netio.sys/netio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index b0ca6801799..53d74f994db 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -1,7 +1,7 @@ /* * WSK (Winsock Kernel) driver library. * - * Copyright 2020 Paul Gofman <pgofman(a)codeweavers.com> for Codeweavers + * Copyright 2020 Paul Gofman <pgofman(a)codeweavers.com> for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- 2.20.1

2 2

[PATCH] ntoskrnl.exe/tests: Fix some minor case issues in comments.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 48de151f31f..45ea90260a8 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -1,7 +1,7 @@ /* * ntoskrnl.exe testing framework * - * Copyright 2020 Paul Gofman for Codeweavers + * Copyright 2020 Paul Gofman for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index da0b02ac006..be0f58f837c 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -4,7 +4,7 @@ * Copyright 2015 Sebastian Lackner * Copyright 2015 Michael M??ller * Copyright 2015 Christian Costa - * Copyright 2020 Paul Gofman for Codeweavers + * Copyright 2020 Paul Gofman for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- 2.20.1

2 1

[PATCH] mshtml: Add a trailing '\n' to a TRACE().
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 57ec662de84..d267fa6de52 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -726,7 +726,7 @@ static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p nsres = nsIDOMHTMLDocument_GetBgColor(This->doc_node->nsdoc, &nsstr); hres = return_nsstr_variant(nsres, &nsstr, NSSTR_COLOR, p); if(hres == S_OK && V_VT(p) == VT_BSTR && !V_BSTR(p)) { - TRACE("default #ffffff"); + TRACE("default #ffffff\n"); if(!(V_BSTR(p) = SysAllocString(L"#ffffff"))) hres = E_OUTOFMEMORY; } -- 2.20.1

2 1

[PATCH] mshtml: Fix the spelling of a parameter name.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/mshtml.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index e202dfff1ae..ba7ef0db165 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28242,7 +28242,7 @@ interface IMarkupServices2 : IMarkupServices [in] IMarkupPointer *pPointerFinish, [in] IMarkupPointer *pPointerTarget, [in, out] IMarkupPointer *pPointerStatus, - [out] IHTMLElement **ppElemFailBotton, + [out] IHTMLElement **ppElemFailBottom, [out] IHTMLElement **ppElemFailTop); HRESULT SaveSegmentsToClipboard( -- 2.20.1

2 1

[PATCH] ntdll: Fix wording of a comment.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 9dd2f745b67..2d8c2edea04 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -310,7 +310,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrFindResource_U( HMODULE hmod, const LDR_RES } -/* don't penalize other platforms stuff needed on i386 for compatibility */ +/* don't penalize other platforms with stuff needed on i386 for compatibility */ #ifdef __i386__ NTSTATUS WINAPI DECLSPEC_HIDDEN access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry, void **ptr, ULONG *size ) -- 2.20.1

2 1

[PATCH] ntdll: Make close_handle() static.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/om.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b5b08fc47ef..23b7fd30c0c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -46,7 +46,6 @@ static const UINT_PTR page_size = 0x1000; extern UINT_PTR page_size DECLSPEC_HIDDEN; #endif -extern NTSTATUS close_handle( HANDLE ) DECLSPEC_HIDDEN; /* exceptions */ extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index f14e969652a..164f3fce3c4 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -362,7 +362,7 @@ static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) } /* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ -NTSTATUS close_handle( HANDLE handle ) +static NTSTATUS close_handle( HANDLE handle ) { DWORD_PTR debug_port; NTSTATUS ret = unix_funcs->NtClose( handle ); -- 2.20.1

1 0

[PATCH] mountmgr.sys: Make get_mountmgr_fs_type() static.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index d99a096c612..40176131ca9 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1678,7 +1678,7 @@ NTSTATUS remove_dos_device( int letter, const char *udi ) return status; } -enum mountmgr_fs_type get_mountmgr_fs_type(enum fs_type fs_type) +static enum mountmgr_fs_type get_mountmgr_fs_type(enum fs_type fs_type) { switch (fs_type) { -- 2.20.1

1 0

[PATCH 7/7] msi: Use colinfo.temporary in TABLE_release.
by Piotr Caban 29 Jun '20

29 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 6/7] msi: Fix adding temporary columns.
by Piotr Caban 29 Jun '20

29 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/alter.c | 82 +--------------------------------- dlls/msi/msipriv.h | 2 +- dlls/msi/table.c | 105 ++++++++++++++++++++++++++++++++++---------- dlls/msi/tests/db.c | 10 ++++- 4 files changed, 95 insertions(+), 104 deletions(-)

1 0

[PATCH 5/7] msi: Add table existance tests for tables with temporary columns.
by Piotr Caban 29 Jun '20

29 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/db.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[PATCH 4/7] msi: Test freeing _TransformView table.
by Piotr Caban 29 Jun '20

29 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/db.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[PATCH 3/7] msi: Remove ref_count from MSICOLUMNINFO.
by Piotr Caban 29 Jun '20

29 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/alter.c | 6 +++--- dlls/msi/table.c | 50 ++++++++++++++++-------------------------------- 2 files changed, 19 insertions(+), 37 deletions(-)

1 0

[PATCH 2/7] msi: Fix table ref count on create.
by Piotr Caban 29 Jun '20

29 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/create.c | 2 +- dlls/msi/query.h | 2 +- dlls/msi/table.c | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-)

1 0

[PATCH 1/7] msi: Support removing temporary columns in TABLE_remove_column.
by Piotr Caban 29 Jun '20

29 Jun '20

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

1 0

[PATCH] qcap: Fix always wait for ReadThread to end when fiter_Stop.
by Jiajin Cui 29 Jun '20

29 Jun '20

There is a very small probability that the ReadThread will always wait for run_event signal after filet_Stop calls qcap_driver_stop_stream, and then filter_Stop is stuck waiting for the ReadThread to exit when calling qcap_driver_cleanup_stream. This issue was found in the video call hang up of Tencent QQ application. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com> --- dlls/qcap/v4l.c | 1 + 1 file changed, 1 insertion(+)

2 4

[PATCH v2 1/4] qcap: Combine the internal header files.
by Zebediah Figura 29 Jun '20

29 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/audiorecord.c | 15 +-------- dlls/qcap/avico.c | 13 +------- dlls/qcap/avimux.c | 14 +-------- dlls/qcap/capture.h | 42 -------------------------- dlls/qcap/capturegraph.c | 28 +---------------- dlls/qcap/filewriter.c | 6 +--- dlls/qcap/qcap_main.c | 23 ++------------ dlls/qcap/qcap_main.h | 36 ---------------------- dlls/qcap/qcap_private.h | 62 ++++++++++++++++++++++++++++++++++++++ dlls/qcap/smartteefilter.c | 15 +-------- dlls/qcap/v4l.c | 15 +-------- dlls/qcap/vfwcapture.c | 24 +-------------- 12 files changed, 72 insertions(+), 221 deletions(-) delete mode 100644 dlls/qcap/capture.h delete mode 100644 dlls/qcap/qcap_main.h create mode 100644 dlls/qcap/qcap_private.h diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 48be64b63f..7477cca6d6 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -17,20 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" - -#include "wine/debug.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index fc5826b16f..7b3c1ea369 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -16,21 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "dshow.h" +#include "qcap_private.h" #include "vfw.h" #include "aviriff.h" -#include "qcap_main.h" - -#include "wine/debug.h" -#include "wine/heap.h" - WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index f1e703bfb6..ea73e42040 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -16,22 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "dshow.h" +#include "qcap_private.h" #include "vfw.h" #include "aviriff.h" -#include "qcap_main.h" - -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(qcap); #define MAX_PIN_NO 128 diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h deleted file mode 100644 index 615988bda3..0000000000 --- a/dlls/qcap/capture.h +++ /dev/null @@ -1,42 +0,0 @@ -/* DirectShow private capture header (QCAP.DLL) - * - * Copyright 2005 Maarten Lankhorst - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __QCAP_CAPTURE_H__ -#define __QCAP_CAPTURE_H__ - -struct _Capture; -typedef struct _Capture Capture; - -Capture *qcap_driver_init(struct strmbase_source *,USHORT) DECLSPEC_HIDDEN; -HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **pmt, - VIDEO_STREAM_CONFIG_CAPS *vscc) DECLSPEC_HIDDEN; -LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_prop(Capture*,VideoProcAmpProperty,LONG*,LONG*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_set_prop(Capture*,VideoProcAmpProperty,LONG,LONG) DECLSPEC_HIDDEN; -void qcap_driver_init_stream(Capture *device) DECLSPEC_HIDDEN; -void qcap_driver_start_stream(Capture *device) DECLSPEC_HIDDEN; -void qcap_driver_stop_stream(Capture *device) DECLSPEC_HIDDEN; -void qcap_driver_cleanup_stream(Capture *device) DECLSPEC_HIDDEN; - -#endif /* __QCAP_CAPTURE_H__ */ diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 822f68754e..b4f83956f0 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -17,34 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdio.h> -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winerror.h" -#include "objbase.h" - -#include "evcode.h" -#include "strmif.h" -#include "control.h" -#include "vfwmsgs.h" -/* - *#include "amvideo.h" - *#include "mmreg.h" - *#include "dshow.h" - *#include "ddraw.h" - */ -#include "uuids.h" -#include "qcap_main.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index af148d4aa1..be1e4e773a 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -18,11 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#include "dshow.h" -#include "qcap_main.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 00e0a9671f..411ef41ea2 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -19,28 +19,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <assert.h> -#include <stdio.h> -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winerror.h" -#include "objbase.h" -#include "uuids.h" -#include "strmif.h" -#include "rpcproxy.h" - -#include "qcap_main.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include "qcap_private.h" +#include "rpcproxy.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h deleted file mode 100644 index 4197771c78..0000000000 --- a/dlls/qcap/qcap_main.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Qcap main header file - * - * Copyright (C) 2005 Rolf Kalbermatter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef _QCAP_MAIN_H_DEFINED -#define _QCAP_MAIN_H_DEFINED - -#include "wine/heap.h" -#include "wine/strmbase.h" - -extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; - -HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT file_writer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; - -#endif /* _QCAP_MAIN_H_DEFINED */ diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h new file mode 100644 index 0000000000..688bebb201 --- /dev/null +++ b/dlls/qcap/qcap_private.h @@ -0,0 +1,62 @@ +/* + * DirectShow capture + * + * Copyright (C) 2005 Rolf Kalbermatter + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _QCAP_PRIVATE_H_DEFINED +#define _QCAP_PRIVATE_H_DEFINED + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "dshow.h" +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/strmbase.h" +#include "wine/unicode.h" + +extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; + +HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT file_writer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; + +typedef struct _Capture Capture; + +Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) DECLSPEC_HIDDEN; +HRESULT qcap_driver_destroy(Capture *device) DECLSPEC_HIDDEN; +HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) DECLSPEC_HIDDEN; +HRESULT qcap_driver_set_format(Capture *device, AM_MEDIA_TYPE *mt) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **mt, + VIDEO_STREAM_CONFIG_CAPS *vscc) DECLSPEC_HIDDEN; +LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_format(const Capture *device, AM_MEDIA_TYPE **mt) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_prop_range(Capture *device, VideoProcAmpProperty property, + LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_prop(Capture *device, VideoProcAmpProperty property, LONG *value, LONG *flags) DECLSPEC_HIDDEN; +HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, LONG value, LONG flags) DECLSPEC_HIDDEN; +void qcap_driver_init_stream(Capture *device) DECLSPEC_HIDDEN; +void qcap_driver_start_stream(Capture *device) DECLSPEC_HIDDEN; +void qcap_driver_stop_stream(Capture *device) DECLSPEC_HIDDEN; +void qcap_driver_cleanup_stream(Capture *device) DECLSPEC_HIDDEN; + +#endif diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 46ec09ca7e..5b4add0b5d 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" - -#include "wine/debug.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 449951ad53..a8841272a3 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -24,8 +24,6 @@ #include "config.h" #include "wine/port.h" -#define COBJMACROS - #include <stdarg.h> #include <stdio.h> #include <fcntl.h> @@ -49,18 +47,7 @@ #include <unistd.h> #endif -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "wine/debug.h" - -#include "qcap_main.h" -#include "capture.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 9430533ea1..b48b2316d7 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -18,29 +18,7 @@ * */ -#define COBJMACROS - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" -#include "wine/debug.h" - -#include "capture.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "strmif.h" -#include "ddraw.h" -#include "ocidl.h" -#include "oleauto.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); -- 2.27.0

1 3

[PATCH 1/3] mshtml: Return NULL in IHTMLDocument2::get_cookie if InternetGetCookieExW failes.
by Jacek Caban 29 Jun '20

29 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 15 ++++----------- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 9 insertions(+), 11 deletions(-)

2 1

[PATCH v2 1/3] ntdll: Implement NtQueryInformationThread(ThreadTimes) using procfs.
by Zebediah Figura 29 Jun '20

29 Jun '20

From: Sebastian Lackner <sebastian(a)fds-team.de> Based on a patch by Ray Hinchliffe <ray(a)pobox.co.uk>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20230 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Rebase onto current git (i.e. onto ntdll.so). This patch lets System Information Viewer, Ollydbg 1.x/2.x, and x64dbg display accurate values. While these values are available through host utilities such as ps(1), it is sometimes more useful to access them from within debuggers and utilities running under Wine. I have omitted NtQueryInformationProcess(ProcessTimes), since the obvious solution needs the server to pass back more data than it currently can, and I don't know what the preferred way to handle that is. dlls/ntdll/unix/thread.c | 82 +++++++++++++++++++++++++++++++--------- server/protocol.def | 2 + server/thread.c | 2 + 3 files changed, 69 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index f3dddd2b02..54483e1f99 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -29,6 +29,8 @@ #include <errno.h> #include <limits.h> #include <stdarg.h> +#include <stdio.h> +#include <string.h> #include <pthread.h> #include <signal.h> #include <sys/types.h> @@ -821,6 +823,59 @@ static void wow64_context_to_server( context_t *to, const WOW64_CONTEXT *from ) #endif /* __x86_64__ */ +#ifdef linux +static BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) +{ + unsigned long clocks_per_sec = sysconf( _SC_CLK_TCK ); + unsigned long usr, sys; + const char *pos; + char buf[512]; + FILE *f; + int i; + + sprintf( buf, "/proc/%u/task/%u/stat", unix_pid, unix_tid ); + if (!(f = fopen( buf, "r" ))) + { + ERR("Failed to open %s: %s\n", buf, strerror(errno)); + return FALSE; + } + + pos = fgets( buf, sizeof(buf), f ); + fclose( f ); + + /* the process name is printed unescaped, so we have to skip to the last ')' + * to avoid misinterpreting the string */ + if (pos) pos = strrchr( pos, ')' ); + if (pos) pos = strchr( pos + 1, ' ' ); + if (pos) pos++; + + /* skip over the following fields: state, ppid, pgid, sid, tty_nr, tty_pgrp, + * task->flags, min_flt, cmin_flt, maj_flt, cmaj_flt */ + for (i = 0; i < 11 && pos; i++) + { + pos = strchr( pos + 1, ' ' ); + if (pos) pos++; + } + + /* the next two values are user and system time */ + if (pos && (sscanf( pos, "%lu %lu", &usr, &sys ) == 2)) + { + kernel_time->QuadPart = (ULONGLONG)sys * 10000000 / clocks_per_sec; + user_time->QuadPart = (ULONGLONG)usr * 10000000 / clocks_per_sec; + return TRUE; + } + + ERR("Failed to parse %s\n", debugstr_a(buf)); + return FALSE; +} +#else +static BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) +{ + static int once; + if (!once++) FIXME("not implemented on this platform\n"); + return FALSE; +} +#endif /****************************************************************************** * NtQueryInformationThread (NTDLL.@) @@ -886,6 +941,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadTimes: { KERNEL_USER_TIMES kusrt; + int unix_pid, unix_tid; SERVER_START_REQ( get_thread_times ) { @@ -895,15 +951,21 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, { kusrt.CreateTime.QuadPart = reply->creation_time; kusrt.ExitTime.QuadPart = reply->exit_time; + unix_pid = reply->unix_pid; + unix_tid = reply->unix_tid; } } SERVER_END_REQ; if (status == STATUS_SUCCESS) { - /* We call times(2) for kernel time or user time */ - /* We can only (portably) do this for the current thread */ - if (handle == GetCurrentThread()) + BOOL ret = FALSE; + + kusrt.KernelTime.QuadPart = kusrt.UserTime.QuadPart = 0; + if (unix_pid != -1 && unix_tid != -1) + ret = get_thread_times( unix_pid, unix_tid, &kusrt.KernelTime, &kusrt.UserTime ); + if (!ret && handle == GetCurrentThread()) { + /* fall back to process times */ struct tms time_buf; long clocks_per_sec = sysconf(_SC_CLK_TCK); @@ -911,20 +973,6 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, kusrt.KernelTime.QuadPart = (ULONGLONG)time_buf.tms_stime * 10000000 / clocks_per_sec; kusrt.UserTime.QuadPart = (ULONGLONG)time_buf.tms_utime * 10000000 / clocks_per_sec; } - else - { - static BOOL reported = FALSE; - - kusrt.KernelTime.QuadPart = 0; - kusrt.UserTime.QuadPart = 0; - if (reported) - TRACE("Cannot get kerneltime or usertime of other threads\n"); - else - { - FIXME("Cannot get kerneltime or usertime of other threads\n"); - reported = TRUE; - } - } if (data) memcpy( data, &kusrt, min( length, sizeof(kusrt) )); if (ret_len) *ret_len = min( length, sizeof(kusrt) ); } diff --git a/server/protocol.def b/server/protocol.def index c3442c06e9..54668a8cdc 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -967,6 +967,8 @@ struct rawinput_device @REPLY timeout_t creation_time; /* thread creation time */ timeout_t exit_time; /* thread exit time */ + int unix_pid; /* thread native pid */ + int unix_tid; /* thread native pid */ @END diff --git a/server/thread.c b/server/thread.c index e2bfa50c7b..3cf447b1a0 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1554,6 +1554,8 @@ DECL_HANDLER(get_thread_times) { reply->creation_time = thread->creation_time; reply->exit_time = thread->exit_time; + reply->unix_pid = thread->unix_pid; + reply->unix_tid = thread->unix_tid; release_object( thread ); } -- 2.27.0

2 6

[PATCH 3/3] mshtml: Return success in :HTMLStyle3::scrollbar* setters.
by Jacek Caban 29 Jun '20

29 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH 2/3] mshtml: Add IHTMLRectCollection::item implementation.
by Jacek Caban 29 Jun '20

29 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 30 ++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 14 ++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] evr: Add IMFVideoProcessor stub.
by Nikolay Sivov 29 Jun '20

29 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 134 +++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 8 +-- include/evr9.idl | 2 +- 3 files changed, 137 insertions(+), 7 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 006427b77af..e8905f633ab 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -49,6 +49,7 @@ struct video_mixer IMFGetService IMFGetService_iface; IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; + IMFVideoProcessor IMFVideoProcessor_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -95,6 +96,11 @@ static struct video_mixer *impl_from_IMFVideoPositionMapper(IMFVideoPositionMapp return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoPositionMapper_iface); } +static struct video_mixer *impl_from_IMFVideoProcessor(IMFVideoProcessor *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoProcessor_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -152,6 +158,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFVideoPositionMapper_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoProcessor)) + { + *obj = &mixer->IMFVideoProcessor_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -914,6 +924,129 @@ static const IMFVideoPositionMapperVtbl video_mixer_position_mapper_vtbl = video_mixer_position_mapper_MapOutputCoordinateToInputStream, }; +static HRESULT WINAPI video_mixer_processor_QueryInterface(IMFVideoProcessor *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_processor_AddRef(IMFVideoProcessor *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_processor_Release(IMFVideoProcessor *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_processor_GetAvailableVideoProcessorModes(IMFVideoProcessor *iface, UINT *count, + GUID **modes) +{ + FIXME("%p, %p, %p.\n", iface, count, modes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetVideoProcessorCaps(IMFVideoProcessor *iface, GUID *mode, + DXVA2_VideoProcessorCaps *caps) +{ + FIXME("%p, %s, %p.\n", iface, debugstr_guid(mode), caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetVideoProcessorMode(IMFVideoProcessor *iface, GUID *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetVideoProcessorMode(IMFVideoProcessor *iface, GUID *mode) +{ + FIXME("%p, %s.\n", iface, debugstr_guid(mode)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetProcAmpRange(IMFVideoProcessor *iface, DWORD prop, DXVA2_ValueRange *range) +{ + FIXME("%p, %#x, %p.\n", iface, prop, range); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetProcAmpValues(IMFVideoProcessor *iface, DWORD flags, DXVA2_ProcAmpValues *values) +{ + FIXME("%p, %#x, %p.\n", iface, flags, values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetProcAmpValues(IMFVideoProcessor *iface, DWORD flags, DXVA2_ProcAmpValues *values) +{ + FIXME("%p, %#x, %p.\n", iface, flags, values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetFilteringRange(IMFVideoProcessor *iface, DWORD prop, DXVA2_ValueRange *range) +{ + FIXME("%p, %#x, %p.\n", iface, prop, range); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetFilteringValue(IMFVideoProcessor *iface, DWORD prop, DXVA2_Fixed32 *value) +{ + FIXME("%p, %#x, %p.\n", iface, prop, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetFilteringValue(IMFVideoProcessor *iface, DWORD prop, DXVA2_Fixed32 *value) +{ + FIXME("%p, %#x, %p.\n", iface, prop, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetBackgroundColor(IMFVideoProcessor *iface, COLORREF *color) +{ + FIXME("%p, %p.\n", iface, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor *iface, COLORREF color) +{ + FIXME("%p, %#x.\n", iface, color); + + return E_NOTIMPL; +} + +static const IMFVideoProcessorVtbl video_mixer_processor_vtbl = +{ + video_mixer_processor_QueryInterface, + video_mixer_processor_AddRef, + video_mixer_processor_Release, + video_mixer_processor_GetAvailableVideoProcessorModes, + video_mixer_processor_GetVideoProcessorCaps, + video_mixer_processor_GetVideoProcessorMode, + video_mixer_processor_SetVideoProcessorMode, + video_mixer_processor_GetProcAmpRange, + video_mixer_processor_GetProcAmpValues, + video_mixer_processor_SetProcAmpValues, + video_mixer_processor_GetFilteringRange, + video_mixer_processor_GetFilteringValue, + video_mixer_processor_SetFilteringValue, + video_mixer_processor_GetBackgroundColor, + video_mixer_processor_SetBackgroundColor, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -943,6 +1076,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFGetService_iface.lpVtbl = &video_mixer_getservice_vtbl; object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_mixer_position_mapper_vtbl; + object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5bfa87014d8..c37f921b09e 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -405,10 +405,8 @@ static void test_default_mixer(void) IUnknown_Release(unk); hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoPositionMapper, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -425,10 +423,8 @@ todo_wine IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerControl, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/evr9.idl b/include/evr9.idl index 1572d878387..b3d363cdee9 100644 --- a/include/evr9.idl +++ b/include/evr9.idl @@ -62,7 +62,7 @@ interface IMFVideoMixerBitmap : IUnknown [ object, - uuid(6AB0000C-FECE-4d1f-A2AC-A9573530656E), + uuid(6ab0000c-fece-4d1f-a2ac-a9573530656e), pointer_default(unique) ] interface IMFVideoProcessor : IUnknown -- 2.27.0

2 7

[PATCH 4/4] winhttp: Stop the send queue before sending the close message.
by Hans Leidekker 29 Jun '20

29 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 14 ++++++++++++-- dlls/winhttp/session.c | 2 +- dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7cb07b5c10..e31803ccfe 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -138,6 +138,14 @@ static DWORD start_queue( struct queue *queue ) return ERROR_SUCCESS; } +void stop_queue( struct queue *queue ) +{ + if (!queue->pool) return; + CloseThreadpool( queue->pool ); + queue->pool = NULL; + TRACE("stopped %p\n", queue); +} + static DWORD queue_task( struct queue *queue, PTP_WORK_CALLBACK task, void *ctx ) { TP_WORK *work; @@ -3037,8 +3045,8 @@ static void socket_destroy( struct object_header *hdr ) TRACE("%p\n", socket); - if (socket->send_q.pool) CloseThreadpool( socket->send_q.pool ); - if (socket->recv_q.pool) CloseThreadpool( socket->recv_q.pool ); + stop_queue( &socket->send_q ); + stop_queue( &socket->recv_q ); release_object( &socket->request->hdr ); heap_free( socket ); @@ -3526,6 +3534,7 @@ static DWORD socket_shutdown( struct socket *socket, USHORT status, const void * struct netconn *netconn = socket->request->netconn; DWORD ret; + stop_queue( &socket->send_q ); if (!(ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) { socket->state = SOCKET_STATE_SHUTDOWN; @@ -3609,6 +3618,7 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea if (socket->state < SOCKET_STATE_SHUTDOWN) { + stop_queue( &socket->send_q ); if ((ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) goto done; socket->state = SOCKET_STATE_SHUTDOWN; } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f3ab8c9b95..080837eb1e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -578,7 +578,7 @@ static void request_destroy( struct object_header *hdr ) TRACE("%p\n", request); - if (request->queue.pool) CloseThreadpool( request->queue.pool ); + stop_queue( &request->queue ); release_object( &request->connect->hdr ); if (request->cred_handle_initialized) FreeCredentialsHandle( &request->cred_handle ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 9d0b9c308a..23aba00780 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -317,6 +317,7 @@ BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( struct request * ) DECLSPEC_HIDDEN; +void stop_queue( struct queue * ) DECLSPEC_HIDDEN; void netconn_close( struct netconn * ) DECLSPEC_HIDDEN; DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH 3/4] winhttp: Add support for ping and pong messages.
by Hans Leidekker 29 Jun '20

29 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 177 +++++++++++++++++++++++++++++++---------- 1 file changed, 136 insertions(+), 41 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 06588d6f60..7cb07b5c10 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3112,29 +3112,18 @@ static DWORD send_bytes( struct netconn *netconn, char *bytes, int len ) return (count == len) ? ERROR_SUCCESS : ERROR_INTERNAL_ERROR; } -static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) -{ - switch (type) - { - case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_TEXT; - case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_BINARY; - case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return SOCKET_OPCODE_CLOSE; - default: - FIXME("buffer type %u not supported\n", type); - return SOCKET_OPCODE_INVALID; - } -} - #define FIN_BIT (1 << 7) #define MASK_BIT (1 << 7) #define RESERVED_BIT (7 << 4) +#define CONTROL_BIT (1 << 3) -static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, USHORT status, const char *buf, +static DWORD send_frame( struct netconn *netconn, enum socket_opcode opcode, USHORT status, const char *buf, DWORD buflen, BOOL final ) { DWORD i = 0, j, ret, offset = 2, len = buflen; - enum socket_opcode opcode = map_buffer_type( type ); - char hdr[14], byte, *mask; + char hdr[14], byte, *mask = NULL; + + TRACE("sending %02x frame\n", opcode); if (opcode == SOCKET_OPCODE_CLOSE) len += sizeof(status); @@ -3159,9 +3148,14 @@ static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE hdr[9] = len & 0xff; offset += 8; } - mask = &hdr[offset]; - RtlGenRandom( mask, 4 ); - if ((ret = send_bytes( netconn, hdr, offset + 4 ))) return ret; + + if ((ret = send_bytes( netconn, hdr, offset ))) return ret; + if (len) + { + mask = &hdr[offset]; + RtlGenRandom( mask, 4 ); + if ((ret = send_bytes( netconn, mask, 4 ))) return ret; + } if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ { @@ -3181,12 +3175,26 @@ static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE return ERROR_SUCCESS; } +static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) +{ + switch (type) + { + case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_TEXT; + case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_BINARY; + case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return SOCKET_OPCODE_CLOSE; + default: + FIXME("buffer type %u not supported\n", type); + return SOCKET_OPCODE_INVALID; + } +} + static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, const void *buf, DWORD len, BOOL async ) { + enum socket_opcode opcode = map_buffer_type( type ); DWORD ret; - ret = send_frame( socket->request->netconn, type, 0, buf, len, TRUE ); + ret = send_frame( socket->request->netconn, opcode, 0, buf, len, TRUE ); if (async) { if (!ret) @@ -3276,24 +3284,19 @@ static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD return ERROR_SUCCESS; } -static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOOL fragment ) +static BOOL is_supported_opcode( enum socket_opcode opcode ) { switch (opcode) { case SOCKET_OPCODE_TEXT: - if (fragment) return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; - return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; - case SOCKET_OPCODE_BINARY: - if (fragment) return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; - return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; - case SOCKET_OPCODE_CLOSE: - return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; - + case SOCKET_OPCODE_PING: + case SOCKET_OPCODE_PONG: + return TRUE; default: - FIXME("opcode %u not handled\n", opcode); - return ~0u; + FIXME( "opcode %02x not handled\n", opcode ); + return FALSE; } } @@ -3303,11 +3306,12 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket char hdr[2]; if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; - if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) + if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || !is_supported_opcode( hdr[0] & 0xf )) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } *opcode = hdr[0] & 0xf; + TRACE("received %02x frame\n", *opcode); len = hdr[1] & ~MASK_BIT; if (len == 126) @@ -3328,13 +3332,109 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket return ERROR_SUCCESS; } +static void CALLBACK task_socket_send_pong( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +{ + struct socket_send *s = ctx; + + TRACE("running %p\n", work); + send_frame( s->socket->request->netconn, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); + + release_object( &s->socket->hdr ); + heap_free( s ); +} + +static DWORD socket_send_pong( struct socket *socket ) +{ + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + struct socket_send *s; + DWORD ret; + + if (!(s = heap_alloc( sizeof(*s) ))) return ERROR_OUTOFMEMORY; + s->socket = socket; + + addref_object( &socket->hdr ); + if ((ret = queue_task( &socket->send_q, task_socket_send_pong, s ))) + { + release_object( &socket->hdr ); + heap_free( s ); + } + return ret; + } + return send_frame( socket->request->netconn, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); +} + +static DWORD socket_drain( struct socket *socket ) +{ + struct netconn *netconn = socket->request->netconn; + DWORD ret, count; + + while (socket->read_size) + { + char buf[1024]; + if ((ret = receive_bytes( netconn, buf, min(socket->read_size, sizeof(buf)), &count ))) return ret; + socket->read_size -= count; + } + return ERROR_SUCCESS; +} + +static DWORD handle_control_frame( struct socket *socket ) +{ + switch (socket->opcode) + { + case SOCKET_OPCODE_PING: + return socket_send_pong( socket ); + + case SOCKET_OPCODE_PONG: + return socket_drain( socket ); + + default: + ERR("unhandled control opcode %02x\n", socket->opcode); + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + } + + return ERROR_SUCCESS; +} + +static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOOL fragment ) +{ + switch (opcode) + { + case SOCKET_OPCODE_TEXT: + if (fragment) return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; + + case SOCKET_OPCODE_BINARY: + if (fragment) return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; + return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; + + case SOCKET_OPCODE_CLOSE: + return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; + + default: + FIXME("opcode %02x not handled\n", opcode); + return ~0u; + } +} + static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type, BOOL async ) { struct netconn *netconn = socket->request->netconn; DWORD count, ret = ERROR_SUCCESS; - if (!socket->read_size) ret = receive_frame( netconn, &socket->read_size, &socket->opcode ); + if (!socket->read_size) + { + for (;;) + { + if (!(ret = receive_frame( netconn, &socket->read_size, &socket->opcode ))) + { + if (!(socket->opcode & CONTROL_BIT) || (ret = handle_control_frame( socket ))) break; + } + else if (ret == WSAETIMEDOUT) ret = socket_send_pong( socket ); + if (ret) break; + } + } if (!ret) ret = receive_bytes( netconn, buf, min(len, socket->read_size), &count ); if (!ret) { @@ -3426,7 +3526,7 @@ static DWORD socket_shutdown( struct socket *socket, USHORT status, const void * struct netconn *netconn = socket->request->netconn; DWORD ret; - if (!(ret = send_frame( netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ))) + if (!(ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) { socket->state = SOCKET_STATE_SHUTDOWN; } @@ -3505,16 +3605,11 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea struct netconn *netconn = socket->request->netconn; DWORD ret, count; - while (socket->read_size) /* drain any pending data */ - { - char buf[1024]; - if ((ret = receive_bytes( netconn, buf, min(socket->read_size, sizeof(buf)), &count ))) goto done; - socket->read_size -= count; - } + if ((ret = socket_drain( socket ))) goto done; if (socket->state < SOCKET_STATE_SHUTDOWN) { - if ((ret = send_frame( netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ))) goto done; + if ((ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) goto done; socket->state = SOCKET_STATE_SHUTDOWN; } -- 2.20.1

1 0

[PATCH 2/4] winhttp: Copy the reason buffer.
by Hans Leidekker 29 Jun '20

29 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 8 ++++---- dlls/winhttp/tests/winhttp.c | 6 ++++++ dlls/winhttp/winhttp_private.h | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index bc3d365f7c..06588d6f60 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3463,7 +3463,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); - if (len && !reason) return ERROR_INVALID_PARAMETER; + if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) @@ -3484,7 +3484,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->status = status; - s->reason = reason; + memcpy( s->reason, reason, len ); s->len = len; addref_object( &socket->hdr ); @@ -3569,7 +3569,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); - if (len && !reason) return ERROR_INVALID_PARAMETER; + if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) @@ -3590,7 +3590,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->status = status; - s->reason = reason; + memcpy( s->reason, reason, len ); s->len = len; addref_object( &socket->hdr ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 12f5136973..84063fdc82 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3356,6 +3356,9 @@ static void test_websocket(int port) error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success", sizeof("success")); ok(!error, "got %u\n", error); @@ -3363,6 +3366,9 @@ static void test_websocket(int port) error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success2", sizeof("success2")); ok(!error, "got %u\n", error); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index ac7e9ff09b..9d0b9c308a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -244,7 +244,7 @@ struct socket enum socket_opcode opcode; DWORD read_size; USHORT status; - char reason[128]; + char reason[123]; DWORD reason_len; }; @@ -305,7 +305,7 @@ struct socket_shutdown { struct socket *socket; USHORT status; - const void *reason; + char reason[123]; DWORD len; }; -- 2.20.1

1 0

[PATCH 1/4] winhttp: Reimplement the task queue using thread pool work objects.
by Hans Leidekker 29 Jun '20

29 Jun '20

Simplifies cleanup. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 336 ++++++++++++++++----------------- dlls/winhttp/session.c | 12 +- dlls/winhttp/winhttp_private.h | 31 +-- 3 files changed, 169 insertions(+), 210 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c15be38592..bc3d365f7c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -122,92 +122,34 @@ static const WCHAR *attribute_table[] = NULL /* WINHTTP_QUERY_PASSPORT_CONFIG = 78 */ }; -static struct task_header *dequeue_task( struct queue *queue ) +static DWORD start_queue( struct queue *queue ) { - struct task_header *task; + if (queue->pool) return ERROR_SUCCESS; - EnterCriticalSection( &queue->cs ); - TRACE("%u tasks queued in %p\n", list_count(&queue->tasks), queue); - task = LIST_ENTRY( list_head( &queue->tasks ), struct task_header, entry ); - if (task) list_remove( &task->entry ); - LeaveCriticalSection( &queue->cs ); + if (!(queue->pool = CreateThreadpool( NULL ))) return GetLastError(); + SetThreadpoolThreadMinimum( queue->pool, 1 ); + SetThreadpoolThreadMaximum( queue->pool, 1 ); - TRACE("returning task %p\n", task); - return task; -} - -static void CALLBACK run_queue( TP_CALLBACK_INSTANCE *instance, void *ctx ) -{ - struct queue *queue = ctx; - HANDLE handles[] = { queue->wait, queue->cancel }; - - for (;;) - { - DWORD err = WaitForMultipleObjects( 2, handles, FALSE, INFINITE ); - switch (err) - { - case WAIT_OBJECT_0: - { - struct task_header *task; - while ((task = dequeue_task( queue ))) - { - task->proc( task ); - release_object( task->object ); - heap_free( task ); - } - break; - } - case WAIT_OBJECT_0 + 1: - TRACE("exiting\n"); - CloseHandle( queue->wait ); - CloseHandle( queue->cancel ); - queue->object->vtbl->destroy( queue->object ); - return; - - default: - ERR("wait failed %u (%u)\n", err, GetLastError()); - break; - } - } -} + memset( &queue->env, 0, sizeof(queue->env) ); + queue->env.Version = 1; + queue->env.Pool = queue->pool; -static DWORD start_queue( struct object_header *object, struct queue *queue ) -{ - DWORD ret = ERROR_OUTOFMEMORY; - - if (queue->wait) return ERROR_SUCCESS; - - queue->object = object; - list_init( &queue->tasks ); - if (!(queue->wait = CreateEventW( NULL, FALSE, FALSE, NULL ))) goto error; - if (!(queue->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ))) goto error; - if (!TrySubmitThreadpoolCallback( run_queue, queue, NULL )) ret = GetLastError(); - else - { - queue->proc_running = TRUE; - TRACE("started %p\n", queue); - return ERROR_SUCCESS; - } - -error: - CloseHandle( queue->wait ); - queue->wait = NULL; - CloseHandle( queue->cancel ); - queue->cancel = NULL; - return ret; + TRACE("started %p\n", queue); + return ERROR_SUCCESS; } -static DWORD queue_task( struct object_header *object, struct queue *queue, struct task_header *task ) +static DWORD queue_task( struct queue *queue, PTP_WORK_CALLBACK task, void *ctx ) { + TP_WORK *work; DWORD ret; - if ((ret = start_queue( object, queue ))) return ret; - EnterCriticalSection( &queue->cs ); - TRACE("queueing task %p in %p\n", task, queue); - list_add_tail( &queue->tasks, &task->entry ); - LeaveCriticalSection( &queue->cs ); + if ((ret = start_queue( queue ))) return ret; + + if (!(work = CreateThreadpoolWork( task, ctx, &queue->env ))) return GetLastError(); + TRACE("queueing %p in %p\n", work, queue); + SubmitThreadpoolWork( work ); + CloseThreadpoolWork( work ); - SetEvent( queue->wait ); return ERROR_SUCCESS; } @@ -2216,13 +2158,16 @@ end: return ret; } -static void task_send_request( struct task_header *task ) +static void CALLBACK task_send_request( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { - struct request *request = (struct request *)task->object; - struct send_request *s = (struct send_request *)task; + struct send_request *s = ctx; + + TRACE("running %p\n", work); + send_request( s->request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE ); - send_request( request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE ); + release_object( &s->request->hdr ); heap_free( s->headers ); + heap_free( s ); } /*********************************************************************** @@ -2256,8 +2201,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade struct send_request *s; if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; - s->hdr.object = &request->hdr; - s->hdr.proc = task_send_request; + s->request = request; s->headers = strdupW( headers ); s->headers_len = headers_len; s->optional = optional; @@ -2266,7 +2210,12 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade s->context = context; addref_object( &request->hdr ); - ret = queue_task( &request->hdr, &request->queue, (struct task_header *)s ); + if ((ret = queue_task( &request->queue, task_send_request, s ))) + { + release_object( &request->hdr ); + heap_free( s->headers ); + heap_free( s ); + } } else ret = send_request( request, headers, headers_len, optional, optional_len, total_len, context, FALSE ); @@ -2797,10 +2746,15 @@ static DWORD receive_response( struct request *request, BOOL async ) return ret; } -static void task_receive_response( struct task_header *task ) +static void CALLBACK task_receive_response( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { - struct request *request = (struct request *)task->object; - receive_response( request, TRUE ); + struct receive_response *r = ctx; + + TRACE("running %p\n", work); + receive_response( r->request, TRUE ); + + release_object( &r->request->hdr ); + heap_free( r ); } /*********************************************************************** @@ -2830,11 +2784,14 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) struct receive_response *r; if (!(r = heap_alloc( sizeof(*r) ))) return FALSE; - r->hdr.object = &request->hdr; - r->hdr.proc = task_receive_response; + r->request = request; addref_object( &request->hdr ); - ret = queue_task( &request->hdr, &request->queue, (struct task_header *)r ); + if ((ret = queue_task( &request->queue, task_receive_response, r ))) + { + release_object( &request->hdr ); + heap_free( r ); + } } else ret = receive_response( request, FALSE ); @@ -2876,12 +2833,15 @@ done: return ret; } -static void task_query_data_available( struct task_header *task ) +static void CALLBACK task_query_data_available( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { - struct request *request = (struct request *)task->object; - struct query_data *q = (struct query_data *)task; + struct query_data *q = ctx; - query_data_available( request, q->available, TRUE ); + TRACE("running %p\n", work); + query_data_available( q->request, q->available, TRUE ); + + release_object( &q->request->hdr ); + heap_free( q ); } /*********************************************************************** @@ -2911,12 +2871,15 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) struct query_data *q; if (!(q = heap_alloc( sizeof(*q) ))) return FALSE; - q->hdr.object = &request->hdr; - q->hdr.proc = task_query_data_available; - q->available = available; + q->request = request; + q->available = available; addref_object( &request->hdr ); - ret = queue_task( &request->hdr, &request->queue, (struct task_header *)q ); + if ((ret = queue_task( &request->queue, task_query_data_available, q ))) + { + release_object( &request->hdr ); + heap_free( q ); + } } else ret = query_data_available( request, available, FALSE ); @@ -2925,12 +2888,15 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return !ret; } -static void task_read_data( struct task_header *task ) +static void CALLBACK task_read_data( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { - struct request *request = (struct request *)task->object; - struct read_data *r = (struct read_data *)task; + struct read_data *r = ctx; + + TRACE("running %p\n", work); + read_data( r->request, r->buffer, r->to_read, r->read, TRUE ); - read_data( request, r->buffer, r->to_read, r->read, TRUE ); + release_object( &r->request->hdr ); + heap_free( r ); } /*********************************************************************** @@ -2960,14 +2926,17 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L struct read_data *r; if (!(r = heap_alloc( sizeof(*r) ))) return FALSE; - r->hdr.object = &request->hdr; - r->hdr.proc = task_read_data; - r->buffer = buffer; - r->to_read = to_read; - r->read = read; + r->request = request; + r->buffer = buffer; + r->to_read = to_read; + r->read = read; addref_object( &request->hdr ); - ret = queue_task( &request->hdr, &request->queue, (struct task_header *)r ); + if ((ret = queue_task( &request->queue, task_read_data, r ))) + { + release_object( &request->hdr ); + heap_free( r ); + } } else ret = read_data( request, buffer, to_read, read, FALSE ); @@ -2998,12 +2967,15 @@ static DWORD write_data( struct request *request, const void *buffer, DWORD to_w return ret; } -static void task_write_data( struct task_header *task ) +static void CALLBACK task_write_data( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { - struct request *request = (struct request *)task->object; - struct write_data *w = (struct write_data *)task; + struct write_data *w = ctx; - write_data( request, w->buffer, w->to_write, w->written, TRUE ); + TRACE("running %p\n", work); + write_data( w->request, w->buffer, w->to_write, w->written, TRUE ); + + release_object( &w->request->hdr ); + heap_free( w ); } /*********************************************************************** @@ -3033,14 +3005,17 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write struct write_data *w; if (!(w = heap_alloc( sizeof(*w) ))) return FALSE; - w->hdr.object = &request->hdr; - w->hdr.proc = task_write_data; - w->buffer = buffer; - w->to_write = to_write; - w->written = written; + w->request = request; + w->buffer = buffer; + w->to_write = to_write; + w->written = written; addref_object( &request->hdr ); - ret = queue_task( &request->hdr, &request->queue, (struct task_header *)w ); + if ((ret = queue_task( &request->queue, task_write_data, w ))) + { + release_object( &request->hdr ); + heap_free( w ); + } } else ret = write_data( request, buffer, to_write, written, FALSE ); @@ -3062,25 +3037,10 @@ static void socket_destroy( struct object_header *hdr ) TRACE("%p\n", socket); - if (socket->send_q.proc_running) - { - socket->send_q.proc_running = FALSE; - SetEvent( socket->send_q.cancel ); - return; - } - if (socket->recv_q.proc_running) - { - socket->recv_q.proc_running = FALSE; - SetEvent( socket->recv_q.cancel ); - return; - } - release_object( &socket->request->hdr ); - - socket->send_q.cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &socket->send_q.cs ); + if (socket->send_q.pool) CloseThreadpool( socket->send_q.pool ); + if (socket->recv_q.pool) CloseThreadpool( socket->recv_q.pool ); - socket->recv_q.cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &socket->recv_q.cs ); + release_object( &socket->request->hdr ); heap_free( socket ); } @@ -3128,10 +3088,6 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.callback = request->hdr.callback; socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; - InitializeCriticalSection( &socket->send_q.cs ); - socket->send_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": socket.send_q.cs"); - InitializeCriticalSection( &socket->recv_q.cs ); - socket->recv_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": socket.recv_q.cs"); addref_object( &request->hdr ); socket->request = request; @@ -3252,12 +3208,15 @@ static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE return ret; } -static void task_socket_send( struct task_header *task ) +static void CALLBACK task_socket_send( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { - struct socket *socket = (struct socket *)task->object; - struct socket_send *s = (struct socket_send *)task; + struct socket_send *s = ctx; - socket_send( socket, s->type, s->buf, s->len, TRUE ); + TRACE("running %p\n", work); + socket_send( s->socket, s->type, s->buf, s->len, TRUE ); + + release_object( &s->socket->hdr ); + heap_free( s ); } DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, void *buf, DWORD len ) @@ -3291,14 +3250,17 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ struct socket_send *s; if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; - s->hdr.object = &socket->hdr; - s->hdr.proc = task_socket_send; - s->type = type; - s->buf = buf; - s->len = len; + s->socket = socket; + s->type = type; + s->buf = buf; + s->len = len; addref_object( &socket->hdr ); - ret = queue_task( &socket->hdr, &socket->send_q, (struct task_header *)s ); + if ((ret = queue_task( &socket->send_q, task_socket_send, s ))) + { + release_object( &socket->hdr ); + heap_free( s ); + } } else ret = socket_send( socket, type, buf, len, FALSE ); @@ -3404,12 +3366,15 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD return ret; } -static void task_socket_receive( struct task_header *task ) +static void CALLBACK task_socket_receive( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { - struct socket *socket = (struct socket *)task->object; - struct socket_receive *r = (struct socket_receive *)task; + struct socket_receive *r = ctx; + + TRACE("running %p\n", work); + socket_receive( r->socket, r->buf, r->len, NULL, NULL, TRUE ); - socket_receive( socket, r->buf, r->len, NULL, NULL, TRUE ); + release_object( &r->socket->hdr ); + heap_free( r ); } DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *ret_len, @@ -3439,13 +3404,16 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D struct socket_receive *r; if (!(r = heap_alloc( sizeof(*r) ))) return FALSE; - r->hdr.object = &socket->hdr; - r->hdr.proc = task_socket_receive; - r->buf = buf; - r->len = len; + r->socket = socket; + r->buf = buf; + r->len = len; addref_object( &socket->hdr ); - ret = queue_task( &socket->hdr, &socket->recv_q, (struct task_header *)r ); + if ((ret = queue_task( &socket->recv_q, task_socket_receive, r ))) + { + release_object( &socket->hdr ); + heap_free( r ); + } } else ret = socket_receive( socket, buf, len, ret_len, ret_type, FALSE ); @@ -3477,12 +3445,15 @@ static DWORD socket_shutdown( struct socket *socket, USHORT status, const void * return ret; } -static void task_socket_shutdown( struct task_header *task ) +static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { - struct socket *socket = (struct socket *)task->object; - struct socket_shutdown *s = (struct socket_shutdown *)task; + struct socket_shutdown *s = ctx; - socket_shutdown( socket, s->status, s->reason, s->len, TRUE ); + socket_shutdown( s->socket, s->status, s->reason, s->len, TRUE ); + + TRACE("running %p\n", work); + release_object( &s->socket->hdr ); + heap_free( s ); } DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) @@ -3511,14 +3482,17 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r struct socket_shutdown *s; if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; - s->hdr.object = &socket->hdr; - s->hdr.proc = task_socket_shutdown; - s->status = status; - s->reason = reason; - s->len = len; + s->socket = socket; + s->status = status; + s->reason = reason; + s->len = len; addref_object( &socket->hdr ); - ret = queue_task( &socket->hdr, &socket->send_q, (struct task_header *)s ); + if ((ret = queue_task( &socket->send_q, task_socket_shutdown, s ))) + { + release_object( &socket->hdr ); + heap_free( s ); + } } else ret = socket_shutdown( socket, status, reason, len, FALSE ); @@ -3577,12 +3551,15 @@ done: return ret; } -static void task_socket_close( struct task_header *task ) +static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { - struct socket *socket = (struct socket *)task->object; - struct socket_shutdown *s = (struct socket_shutdown *)task; + struct socket_shutdown *s = ctx; + + socket_close( s->socket, s->status, s->reason, s->len, TRUE ); - socket_close( socket, s->status, s->reason, s->len, TRUE ); + TRACE("running %p\n", work); + release_object( &s->socket->hdr ); + heap_free( s ); } DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) @@ -3611,14 +3588,17 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas struct socket_shutdown *s; if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; - s->hdr.object = &socket->hdr; - s->hdr.proc = task_socket_close; - s->status = status; - s->reason = reason; - s->len = len; + s->socket = socket; + s->status = status; + s->reason = reason; + s->len = len; addref_object( &socket->hdr ); - ret = queue_task( &socket->hdr, &socket->recv_q, (struct task_header *)s ); + if ((ret = queue_task( &socket->recv_q, task_socket_close, s ))) + { + release_object( &socket->hdr ); + heap_free( s ); + } } else ret = socket_close( socket, status, reason, len, FALSE ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 228eb646ae..f3ab8c9b95 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -578,13 +578,7 @@ static void request_destroy( struct object_header *hdr ) TRACE("%p\n", request); - if (request->queue.proc_running) - { - /* Signal to the task proc to quit. It will call this again when it does. */ - request->queue.proc_running = FALSE; - SetEvent( request->queue.cancel ); - return; - } + if (request->queue.pool) CloseThreadpool( request->queue.pool ); release_object( &request->connect->hdr ); if (request->cred_handle_initialized) FreeCredentialsHandle( &request->cred_handle ); @@ -614,8 +608,6 @@ static void request_destroy( struct object_header *hdr ) } } - request->queue.cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &request->queue.cs ); heap_free( request ); } @@ -1120,8 +1112,6 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; request->hdr.redirect_policy = connect->hdr.redirect_policy; - InitializeCriticalSection( &request->queue.cs ); - request->queue.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": request.queue.cs"); addref_object( &connect->hdr ); request->connect = connect; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 4a94375006..ac7e9ff09b 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -157,12 +157,8 @@ struct authinfo struct queue { - struct object_header *object; - CRITICAL_SECTION cs; - BOOL proc_running; - HANDLE wait; - HANDLE cancel; - struct list tasks; + TP_POOL *pool; + TP_CALLBACK_ENVIRON env; }; enum request_flags @@ -252,16 +248,9 @@ struct socket DWORD reason_len; }; -struct task_header -{ - struct list entry; - struct object_header *object; - void (*proc)( struct task_header * ); -}; - struct send_request { - struct task_header hdr; + struct request *request; WCHAR *headers; DWORD headers_len; void *optional; @@ -272,18 +261,18 @@ struct send_request struct receive_response { - struct task_header hdr; + struct request *request; }; struct query_data { - struct task_header hdr; + struct request *request; DWORD *available; }; struct read_data { - struct task_header hdr; + struct request *request; void *buffer; DWORD to_read; DWORD *read; @@ -291,7 +280,7 @@ struct read_data struct write_data { - struct task_header hdr; + struct request *request; const void *buffer; DWORD to_write; DWORD *written; @@ -299,7 +288,7 @@ struct write_data struct socket_send { - struct task_header hdr; + struct socket *socket; WINHTTP_WEB_SOCKET_BUFFER_TYPE type; const void *buf; DWORD len; @@ -307,14 +296,14 @@ struct socket_send struct socket_receive { - struct task_header hdr; + struct socket *socket; void *buf; DWORD len; }; struct socket_shutdown { - struct task_header hdr; + struct socket *socket; USHORT status; const void *reason; DWORD len; -- 2.20.1

1 0

[PATCH] include: Fix typo in DS3DALG_DEFAULT
by Vijay Kiran Kamuju 29 Jun '20

29 Jun '20

Spotted by Ozkan Sezer Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v6 2/2] kernel32: Adjust thread creation insertion order to make it the same as windows.
by Changping Yu 29 Jun '20

29 Jun '20

2 1

[PATCH v6 1/2] kernel32/tests: Add test about toolhelp to get thread order.
by Changping Yu 29 Jun '20

29 Jun '20

2 1

[PATCH v6 1/2] kernel32/tests: Add test about toolhelp to get thread order.
by Changping Yu 29 Jun '20

29 Jun '20

2 1

[PATCH v6 2/2] kernel32: Adjust thread creation insertion order to make it the same as windows.
by Changping Yu 29 Jun '20

29 Jun '20

2 1

[PATCH 1/2] kernel32/tests: Add test for ini filename is NULL.
by Jiajin Cui 29 Jun '20

29 Jun '20

2 1

[PATCH 2/2] kernel32: Make GetPrivateProfileIntW() return the correct value.
by Jiajin Cui 29 Jun '20

29 Jun '20

2 1

[PATCH 1/4] qcap: Combine the internal header files.
by Zebediah Figura 28 Jun '20

28 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/audiorecord.c | 15 +-------- dlls/qcap/avico.c | 13 +------- dlls/qcap/avimux.c | 14 +-------- dlls/qcap/capture.h | 42 -------------------------- dlls/qcap/capturegraph.c | 28 +---------------- dlls/qcap/filewriter.c | 6 +--- dlls/qcap/qcap_main.c | 23 ++------------ dlls/qcap/qcap_main.h | 36 ---------------------- dlls/qcap/qcap_private.h | 62 ++++++++++++++++++++++++++++++++++++++ dlls/qcap/smartteefilter.c | 15 +-------- dlls/qcap/v4l.c | 15 +-------- dlls/qcap/vfwcapture.c | 24 +-------------- 12 files changed, 72 insertions(+), 221 deletions(-) delete mode 100644 dlls/qcap/capture.h delete mode 100644 dlls/qcap/qcap_main.h create mode 100644 dlls/qcap/qcap_private.h diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 48be64b63f..7477cca6d6 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -17,20 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" - -#include "wine/debug.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index fc5826b16f..7b3c1ea369 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -16,21 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "dshow.h" +#include "qcap_private.h" #include "vfw.h" #include "aviriff.h" -#include "qcap_main.h" - -#include "wine/debug.h" -#include "wine/heap.h" - WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index f1e703bfb6..ea73e42040 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -16,22 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "dshow.h" +#include "qcap_private.h" #include "vfw.h" #include "aviriff.h" -#include "qcap_main.h" - -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(qcap); #define MAX_PIN_NO 128 diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h deleted file mode 100644 index 615988bda3..0000000000 --- a/dlls/qcap/capture.h +++ /dev/null @@ -1,42 +0,0 @@ -/* DirectShow private capture header (QCAP.DLL) - * - * Copyright 2005 Maarten Lankhorst - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __QCAP_CAPTURE_H__ -#define __QCAP_CAPTURE_H__ - -struct _Capture; -typedef struct _Capture Capture; - -Capture *qcap_driver_init(struct strmbase_source *,USHORT) DECLSPEC_HIDDEN; -HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **pmt, - VIDEO_STREAM_CONFIG_CAPS *vscc) DECLSPEC_HIDDEN; -LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_prop(Capture*,VideoProcAmpProperty,LONG*,LONG*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_set_prop(Capture*,VideoProcAmpProperty,LONG,LONG) DECLSPEC_HIDDEN; -void qcap_driver_init_stream(Capture *device) DECLSPEC_HIDDEN; -void qcap_driver_start_stream(Capture *device) DECLSPEC_HIDDEN; -void qcap_driver_stop_stream(Capture *device) DECLSPEC_HIDDEN; -void qcap_driver_cleanup_stream(Capture *device) DECLSPEC_HIDDEN; - -#endif /* __QCAP_CAPTURE_H__ */ diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 822f68754e..b4f83956f0 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -17,34 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdio.h> -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winerror.h" -#include "objbase.h" - -#include "evcode.h" -#include "strmif.h" -#include "control.h" -#include "vfwmsgs.h" -/* - *#include "amvideo.h" - *#include "mmreg.h" - *#include "dshow.h" - *#include "ddraw.h" - */ -#include "uuids.h" -#include "qcap_main.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index af148d4aa1..be1e4e773a 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -18,11 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#include "dshow.h" -#include "qcap_main.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 00e0a9671f..411ef41ea2 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -19,28 +19,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <assert.h> -#include <stdio.h> -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winerror.h" -#include "objbase.h" -#include "uuids.h" -#include "strmif.h" -#include "rpcproxy.h" - -#include "qcap_main.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include "qcap_private.h" +#include "rpcproxy.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h deleted file mode 100644 index 4197771c78..0000000000 --- a/dlls/qcap/qcap_main.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Qcap main header file - * - * Copyright (C) 2005 Rolf Kalbermatter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef _QCAP_MAIN_H_DEFINED -#define _QCAP_MAIN_H_DEFINED - -#include "wine/heap.h" -#include "wine/strmbase.h" - -extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; - -HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT file_writer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; - -#endif /* _QCAP_MAIN_H_DEFINED */ diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h new file mode 100644 index 0000000000..688bebb201 --- /dev/null +++ b/dlls/qcap/qcap_private.h @@ -0,0 +1,62 @@ +/* + * DirectShow capture + * + * Copyright (C) 2005 Rolf Kalbermatter + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _QCAP_PRIVATE_H_DEFINED +#define _QCAP_PRIVATE_H_DEFINED + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "dshow.h" +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/strmbase.h" +#include "wine/unicode.h" + +extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; + +HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT file_writer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; + +typedef struct _Capture Capture; + +Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) DECLSPEC_HIDDEN; +HRESULT qcap_driver_destroy(Capture *device) DECLSPEC_HIDDEN; +HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) DECLSPEC_HIDDEN; +HRESULT qcap_driver_set_format(Capture *device, AM_MEDIA_TYPE *mt) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **mt, + VIDEO_STREAM_CONFIG_CAPS *vscc) DECLSPEC_HIDDEN; +LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_format(const Capture *device, AM_MEDIA_TYPE **mt) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_prop_range(Capture *device, VideoProcAmpProperty property, + LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_prop(Capture *device, VideoProcAmpProperty property, LONG *value, LONG *flags) DECLSPEC_HIDDEN; +HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, LONG value, LONG flags) DECLSPEC_HIDDEN; +void qcap_driver_init_stream(Capture *device) DECLSPEC_HIDDEN; +void qcap_driver_start_stream(Capture *device) DECLSPEC_HIDDEN; +void qcap_driver_stop_stream(Capture *device) DECLSPEC_HIDDEN; +void qcap_driver_cleanup_stream(Capture *device) DECLSPEC_HIDDEN; + +#endif diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 46ec09ca7e..5b4add0b5d 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" - -#include "wine/debug.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 449951ad53..a8841272a3 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -24,8 +24,6 @@ #include "config.h" #include "wine/port.h" -#define COBJMACROS - #include <stdarg.h> #include <stdio.h> #include <fcntl.h> @@ -49,18 +47,7 @@ #include <unistd.h> #endif -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "wine/debug.h" - -#include "qcap_main.h" -#include "capture.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 9430533ea1..b48b2316d7 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -18,29 +18,7 @@ * */ -#define COBJMACROS - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" -#include "wine/debug.h" - -#include "capture.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "strmif.h" -#include "ddraw.h" -#include "ocidl.h" -#include "oleauto.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); -- 2.27.0

1 3

[PATCH v2] qdvd: Register the DvdGraphBuilder coclass.
by Zebediah Figura 28 Jun '20

28 Jun '20

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49458 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qdvd/Makefile.in | 3 +++ dlls/qdvd/qdvd.spec | 4 ++-- dlls/qdvd/qdvd_classes.idl | 26 ++++++++++++++++++++++++++ dlls/qdvd/qdvd_main.c | 17 +++++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 dlls/qdvd/qdvd_classes.idl diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index c4b7dcce1f..b3b13486ed 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -4,3 +4,6 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ qdvd_main.c + +IDL_SRCS = \ + qdvd_classes.idl diff --git a/dlls/qdvd/qdvd.spec b/dlls/qdvd/qdvd.spec index c534b4fbf4..b16365d0c9 100644 --- a/dlls/qdvd/qdvd.spec +++ b/dlls/qdvd/qdvd.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/qdvd/qdvd_classes.idl b/dlls/qdvd/qdvd_classes.idl new file mode 100644 index 0000000000..7fd2a081ba --- /dev/null +++ b/dlls/qdvd/qdvd_classes.idl @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + helpstring("DVD Graph Builder"), + threading(both), + uuid(fcc152b7-f372-11d0-8e00-00c04fd7c08b), +] +coclass DvdGraphBuilder {} diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index 5c7368ce90..72dcda7c91 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -21,17 +21,24 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "oleidl.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qdvd); +static HINSTANCE qdvd_instance; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ if (reason == DLL_PROCESS_ATTACH) + { + qdvd_instance = instance; DisableThreadLibraryCalls(instance); + } return TRUE; } @@ -41,6 +48,16 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) return CLASS_E_CLASSNOTAVAILABLE; } +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(qdvd_instance); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(qdvd_instance); +} + HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; -- 2.27.0

1 0

[PATCH v2 1/2] kernel32: Call PROFILE_DeleteSection directly from WritePrivateProfile* functions.
by Zebediah Figura 28 Jun '20

28 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/profile.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index dfda24446cb..63a400cce64 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -503,11 +503,12 @@ static BOOL PROFILE_DeleteSection( PROFILESECTION **section, LPCWSTR name ) *section = to_del->next; to_del->next = NULL; PROFILE_Free( to_del ); + CurProfile->changed = TRUE; return TRUE; } section = &(*section)->next; } - return FALSE; + return TRUE; } @@ -971,15 +972,7 @@ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name, LPCWSTR value, BOOL create_always ) { - if (!key_name) /* Delete a whole section */ - { - TRACE("(%s)\n", debugstr_w(section_name)); - CurProfile->changed |= PROFILE_DeleteSection( &CurProfile->section, - section_name ); - return TRUE; /* Even if PROFILE_DeleteSection() has failed, - this is not an error on application's level.*/ - } - else if (!value) /* Delete a key */ + if (!value) /* Delete a key */ { TRACE("(%s,%s)\n", debugstr_w(section_name), debugstr_w(key_name) ); CurProfile->changed |= PROFILE_DeleteKey( &CurProfile->section, @@ -1335,12 +1328,13 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, } else if (PROFILE_Open( filename, TRUE )) { - if (!section) { + if (!section) SetLastError(ERROR_FILE_NOT_FOUND); - } else { + else if (!entry) + ret = PROFILE_DeleteSection( &CurProfile->section, section ); + else ret = PROFILE_SetString( section, entry, string, FALSE); - if (ret) ret = PROFILE_FlushFile(); - } + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1393,8 +1387,9 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, } } else if (PROFILE_Open( filename, TRUE )) { - if (!string) {/* delete the named section*/ - ret = PROFILE_SetString(section,NULL,NULL, FALSE); + if (!string) + { + ret = PROFILE_DeleteSection( &CurProfile->section, section ); } else { PROFILE_DeleteAllKeys(section); ret = TRUE; -- 2.27.0

2 3

[PATCH v5 2/2] user32:Fix z order error when WS_CHILD window want to be topmost windows.【请注意，邮件由wine-devel-bounces@winehq.org代发】
by Jiajin Cui 28 Jun '20

28 Jun '20

Window with WS_CHILD does not need to change Z order when SetWindowPos param hwndInsertAfter is HWND_TOPMOST or HWND_NOTOPMOST. Solve the problems mentioned in the previous patch, and Remove todo_wine on test_child_topmost_zorder. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[PATCH v5 1/2], and optimize fixup_flags[PATCH v5 2/2]. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com>

3 2

[PATCH v5 1/2] kernel32/tests: Add test suite to modify the thread, order of toolhelp.
by Changping Yu 28 Jun '20

28 Jun '20

2 1

[PATCH v5 2/2] kernel32: Adjust toolhelp thread return order.
by Changping Yu 28 Jun '20

28 Jun '20

1 0

[PATCH v2 1/2] user32/tests: Add test for ShowWindow with SW_SHOWNOACTIVATE option.
by Haidong Yu 28 Jun '20

28 Jun '20

2 1

[PATCH v2 2/2] user32: Fix a pop-up window is not visible when its owned window showed with SW_SHOWNOACTIVATE option.
by Haidong Yu 28 Jun '20

28 Jun '20

2 1

[PATCH] winecfg: Pass correct font family through to font chooser.
by Mark Harmstone 27 Jun '20

27 Jun '20

GetSystemMetrics returns the "full name" of the font, which is not necessarily what appears in the font picker, causing it to default to the first entry in the list. See for example the family "Renner*", which calls its Regular version "Renner* Book". Signed-off-by: Mark Harmstone <mark(a)harmstone.com> --- programs/winecfg/theme.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index b38b2ff26d..1f004c7e0e 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1151,20 +1151,43 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) } } +static INT CALLBACK fontname_proc(const LOGFONTW *lf, const TEXTMETRICW *ntm, DWORD type, LPARAM lparam) +{ + LOGFONTW *orig_lf = (LOGFONTW *)lparam; + + memcpy(orig_lf->lfFaceName, lf->lfFaceName, sizeof(lf->lfFaceName)); + + return 0; +} + static void on_select_font(HWND hDlg) { CHOOSEFONTW cf; + LOGFONTW lf; + HDC hdc; + int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0); index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); + memcpy(&lf, &metrics[index].lf, sizeof(LOGFONTW)); + + /* GetSystemMetrics returns the "full name" of the font - run it through + * EnumFontFamiliesExW in order to get the family name, which is what + * appears in the font chooser list. */ + hdc = GetDC(hDlg); + EnumFontFamiliesExW(hdc, &lf, fontname_proc, (LPARAM)&lf, 0); + ReleaseDC(hDlg, hdc); + ZeroMemory(&cf, sizeof(cf)); cf.lStructSize = sizeof(CHOOSEFONTW); cf.hwndOwner = hDlg; - cf.lpLogFont = &(metrics[index].lf); + cf.lpLogFont = &lf; cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOSCRIPTSEL | CF_NOVERTFONTS; - if (ChooseFontW(&cf)) + if (ChooseFontW(&cf)) { + memcpy(&(metrics[index].lf), &lf, sizeof(LOGFONTW)); SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); + } } static void init_mime_types(HWND hDlg) -- 2.26.2

1 0

[PATCH] ntoskrnl.exe: null initialize context.handle and context.irp
by Jefferson Carpenter 27 Jun '20

27 Jun '20

Should prevent close_handle getting called with random data from the stack. thanks, Jefferson

1 0

[PATCH] wuaueng: Add stub DllRegisterServer and DllUnregisterServer functions.
by Vijay Kiran Kamuju 27 Jun '20

27 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49459 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH 1/3] include: Add xact3.h
by Vijay Kiran Kamuju 27 Jun '20

27 Jun '20

Based on work by Ethan Lee and Alistair Leslie-Hughes Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 4

[PATCH 3/3] xactengine3_7:Register the com classes.
by Vijay Kiran Kamuju 27 Jun '20

27 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/3] xactengine3_7: Add new dll.
by Vijay Kiran Kamuju 27 Jun '20

27 Jun '20

Based on original patch from Ethan Lee Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] winevulkan: Don't initialize the Vulkan driver in DllMain().
by Brendan Shanks 26 Jun '20

26 Jun '20

Fixes an issue where winevulkan would not be registered if no Vulkan driver was present during prefix creation (such as in a build VM). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- As a side benefit, this also better matches the official Vulkan loader's behavior (it never returns FALSE from DllMain: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/loader.c#L…) VK_ERROR_INITIALIZATION_FAILED is what the official Windows loader returns for vkCreateInstance() and vkEnumerateInstanceExtensionProperties() when no ICDs are present. Note that for vkEnumerateInstanceExtensionProperties(), VK_ERROR_INITIALIZATION_FAILED is not listed in the spec as a possible return code. I've opened an issue for the loader to get clarification: https://github.com/KhronosGroup/Vulkan-Loader/issues/421 dlls/winevulkan/vulkan.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index eb22e72ae36..d2da92cfa26 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -306,7 +306,7 @@ static void wine_vk_device_free(struct VkDevice_T *device) heap_free(device); } -static BOOL wine_vk_init(void) +static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { HDC hdc; @@ -314,16 +314,20 @@ static BOOL wine_vk_init(void) vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); ReleaseDC(0, hdc); if (!vk_funcs) - { ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); - return FALSE; - } - - p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); + else + p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); return TRUE; } +static void wine_vk_init_once(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); +} + /* Helper function for converting between win32 and host compatible VkInstanceCreateInfo. * This function takes care of extensions handled at winevulkan layer, a Wine graphics * driver is responsible for handling e.g. surface extensions. @@ -653,6 +657,10 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); + wine_vk_init_once(); + if (!vk_funcs) + return VK_ERROR_INITIALIZATION_FAILED; + if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -779,6 +787,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na return VK_ERROR_LAYER_NOT_PRESENT; } + wine_vk_init_once(); + if (!vk_funcs) + return VK_ERROR_INITIALIZATION_FAILED; + res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, NULL); if (res != VK_SUCCESS) return res; @@ -847,6 +859,8 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) TRACE("%p\n", version); + wine_vk_init_once(); + if (p_vkEnumerateInstanceVersion) { res = p_vkEnumerateInstanceVersion(version); @@ -1367,13 +1381,14 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) case DLL_PROCESS_ATTACH: hinstance = hinst; DisableThreadLibraryCalls(hinst); - return wine_vk_init(); + break; } return TRUE; } static const struct vulkan_func vk_global_dispatch_table[] = { + /* These functions must call wine_vk_init_once() before accessing vk_funcs. */ {"vkCreateInstance", &wine_vkCreateInstance}, {"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties}, {"vkEnumerateInstanceLayerProperties", &wine_vkEnumerateInstanceLayerProperties}, -- 2.26.2

1 0

[PATCH V2] qdvd: Register DvdGraphBuilder class.
by Vijay Kiran Kamuju 26 Jun '20

26 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49458 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] qdvd: Register DvdGraphBuilder class.
by Vijay Kiran Kamuju 26 Jun '20

26 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49458 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/5] d3dcompiler: Create the expression in append_binop().
by Zebediah Figura 26 Jun '20

26 Jun '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/hlsl.y | 139 +++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 76 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 96a27d6a30d..43ffa43a02a 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1193,12 +1193,14 @@ static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) return list; } -static struct list *append_binop(struct list *first, struct list *second, struct hlsl_ir_node *node) +static struct list *add_binary_expr(struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, struct source_location loc) { - list_move_tail(first, second); - d3dcompiler_free(second); - list_add_tail(first, &node->entry); - return first; + struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); + list_move_tail(list1, list2); + d3dcompiler_free(list2); + list_add_tail(list1, &new_binary_expr(op, arg1, arg2, loc)->entry); + return list1; } static struct list *make_list(struct hlsl_ir_node *node) @@ -2578,40 +2580,33 @@ unary_op: '+' $$ = UNARY_OP_BITNOT; } -mul_expr: unary_expr - { - $$ = $1; - } - | mul_expr '*' unary_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_MUL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | mul_expr '/' unary_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_DIV, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | mul_expr '%' unary_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_MOD, - node_from_list($1), node_from_list($3), get_location(&@2))); - } +mul_expr: -add_expr: mul_expr - { - $$ = $1; - } - | add_expr '+' mul_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_ADD, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | add_expr '-' mul_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_SUB, - node_from_list($1), node_from_list($3), get_location(&@2))); - } + unary_expr + | mul_expr '*' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_MUL, get_location(&@2)); + } + | mul_expr '/' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_DIV, get_location(&@2)); + } + | mul_expr '%' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_MOD, get_location(&@2)); + } + +add_expr: + + mul_expr + | add_expr '+' mul_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_ADD, get_location(&@2)); + } + | add_expr '-' mul_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_SUB, get_location(&@2)); + } shift_expr: add_expr { @@ -2626,45 +2621,37 @@ shift_expr: add_expr FIXME("Right shift\n"); } -relational_expr: shift_expr - { - $$ = $1; - } - | relational_expr '<' shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_LESS, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | relational_expr '>' shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_GREATER, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | relational_expr OP_LE shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_LEQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | relational_expr OP_GE shift_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_GEQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } +relational_expr: -equality_expr: relational_expr - { - $$ = $1; - } - | equality_expr OP_EQ relational_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_EQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } - | equality_expr OP_NE relational_expr - { - $$ = append_binop($1, $3, new_binary_expr(HLSL_IR_BINOP_NEQUAL, - node_from_list($1), node_from_list($3), get_location(&@2))); - } + shift_expr + | relational_expr '<' shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_LESS, get_location(&@2)); + } + | relational_expr '>' shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_GREATER, get_location(&@2)); + } + | relational_expr OP_LE shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_LEQUAL, get_location(&@2)); + } + | relational_expr OP_GE shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_GEQUAL, get_location(&@2)); + } + +equality_expr: + + relational_expr + | equality_expr OP_EQ relational_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_EQUAL, get_location(&@2)); + } + | equality_expr OP_NE relational_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_NEQUAL, get_location(&@2)); + } bitand_expr: equality_expr { -- 2.27.0

5 21

[PATCH 2/2] mshtml: Use variant_to_nsstr in IHTMLIFrameElement2::put_width.
by Jacek Caban 26 Jun '20

26 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlframe.c | 9 ++++----- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 10 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] mshtml: Use variant_to_nsstr in IHTMLIFrameElement2::put_height.
by Jacek Caban 26 Jun '20

26 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlframe.c | 9 ++++----- dlls/mshtml/tests/dom.c | 12 +++++++++++- 2 files changed, 15 insertions(+), 6 deletions(-)

1 0

[PATCH] dxva2: Add missing processor service method stubs.
by Nikolay Sivov 26 Jun '20

26 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index bbee697674f..4a51410d4b6 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -188,6 +188,25 @@ static HRESULT WINAPI device_manager_processor_service_GetProcAmpRange( return E_NOTIMPL; } +static HRESULT WINAPI device_manager_processor_service_GetFilterPropertyRange( + IDirectXVideoProcessorService *iface, REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, + D3DFORMAT rt_format, UINT filter_setting, DXVA2_ValueRange *range) +{ + FIXME("%p, %s, %p, %d, %d, %p.\n", iface, debugstr_guid(deviceguid), video_desc, rt_format, filter_setting, range); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_processor_service_CreateVideoProcessor(IDirectXVideoProcessorService *iface, + REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, D3DFORMAT rt_format, UINT max_substreams, + IDirectXVideoProcessor **processor) +{ + FIXME("%p, %s, %p, %d, %u, %p.\n", iface, debugstr_guid(deviceguid), video_desc, rt_format, max_substreams, + processor); + + return E_NOTIMPL; +} + static const IDirectXVideoProcessorServiceVtbl device_manager_processor_service_vtbl = { device_manager_processor_service_QueryInterface, @@ -200,6 +219,8 @@ static const IDirectXVideoProcessorServiceVtbl device_manager_processor_service_ device_manager_processor_service_GetVideoProcessorSubStreamFormats, device_manager_processor_service_GetVideoProcessorCaps, device_manager_processor_service_GetProcAmpRange, + device_manager_processor_service_GetFilterPropertyRange, + device_manager_processor_service_CreateVideoProcessor, }; static HRESULT WINAPI device_manager_QueryInterface(IDirect3DDeviceManager9 *iface, REFIID riid, void **obj) -- 2.27.0

1 0

[PATCH] evr: Forward some known interface queries for MR_VIDEO_MIXER_SERVICE.
by Nikolay Sivov 26 Jun '20

26 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 14 +++++++++++++- dlls/evr/tests/evr.c | 18 +++++++++++++++++- include/evr.idl | 6 ++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 7663a28ab10..006427b77af 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -797,7 +797,19 @@ static ULONG WINAPI video_mixer_getservice_Release(IMFGetService *iface) static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { - FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + if (IsEqualGUID(service, &MR_VIDEO_MIXER_SERVICE)) + { + if (IsEqualIID(riid, &IID_IMFVideoMixerBitmap) || + IsEqualIID(riid, &IID_IMFVideoProcessor) || + IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + { + return IMFGetService_QueryInterface(iface, riid, obj); + } + } + + FIXME("Unsupported service %s, riid %s.\n", debugstr_guid(service), debugstr_guid(riid)); return E_NOTIMPL; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 4f954d868a6..5bfa87014d8 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -383,6 +383,7 @@ static void test_default_mixer(void) DWORD input_id, output_id; IMFAttributes *attributes, *attributes2; IMFTransform *transform; + IMFGetService *gs; unsigned int i; DWORD ids[16]; IUnknown *unk; @@ -396,10 +397,25 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); - hr = IMFTransform_QueryInterface(transform, &IID_IMFGetService, (void **)&unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerBitmap, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoPositionMapper, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + IMFGetService_Release(gs); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerBitmap, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); diff --git a/include/evr.idl b/include/evr.idl index 43afca1201a..4599e298790 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -218,5 +218,11 @@ interface IMFDesiredSample : IUnknown void Clear(); } +cpp_quote("DEFINE_GUID(MR_VIDEO_RENDER_SERVICE, 0x1092a86c, 0xab1a, 0x459a, 0xa3, 0x36, 0x83, 0x1f, 0xbc, 0x4d, 0x11, 0xff);") +cpp_quote("DEFINE_GUID(MR_VIDEO_MIXER_SERVICE, 0x073cd2fc, 0x6cf4, 0x40b7, 0x88, 0x59, 0xe8, 0x95, 0x52, 0xc8, 0x41, 0xf8);") +cpp_quote("DEFINE_GUID(MR_VIDEO_ACCELERATION_SERVICE, 0xefef5175, 0x5c7d, 0x4ce2, 0xbb, 0xbd, 0x34, 0xff, 0x8b, 0xca, 0x65, 0x54);") +cpp_quote("DEFINE_GUID(MR_BUFFER_SERVICE, 0xa562248c, 0x9ac6, 0x4ffc, 0x9f, 0xba, 0x3a, 0xf8, 0xf8, 0xad, 0x1a, 0x4d);") +cpp_quote("DEFINE_GUID(VIDEO_ZOOM_RECT, 0x7aaa1638, 0x1b7f, 0x4c93, 0xbd, 0x89, 0x5b, 0x9c, 0x9f, 0xb6, 0xfc, 0xf0);") + cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") cpp_quote("HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample);") -- 2.27.0

1 0

[resend PATCH 1/3] Avoid undefined result in ntdll_wcstoumbs() in case of error.
by Paul Gofman 26 Jun '20

26 Jun '20

Undefined result is due to RtlUnicodeToUTF8N() not setting output length on error which is a correct behaviour according to existing tests. 'Planet Zoo' is affected which passes NULL object name buffer to NtCreateFile(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 187879 - 187880. dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index d6bde700e42..4f03e3881f0 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -769,7 +769,7 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) */ int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) { - DWORD i, reslen; + DWORD i, reslen = 0; if (!unix_table.CodePage) RtlUnicodeToUTF8N( dst, dstlen, &reslen, src, srclen * sizeof(WCHAR) ); -- 2.26.2

2 3

[RFC PATCH 0/5] Add MPEG video parser to MPEG splitter filter.
by Akihiro Sagawa 26 Jun '20

26 Jun '20

This is my work in progress patchset which adds MPEG video parser to MPEG splitter filter. Mainly, fix for bug 9127. Before moving on the farther step, I'd like to request for comments on this implementation (function name, patch order, GStreamer usage, etc.). I'll work on MPEG video decoder filter, next. Because, at this point, we can't build a pipeline for MPEG video files with the MPEG splitter. After finishing up the decoder, I'll submit both of patchset. Supporting system stream (audio+video) will be the subsequent development. Akihiro Sagawa (5): quartz/tests: Factor out MP3 audio tests. winegstreamer: Implement listing of sink media types. winegstreamer: Pass the AM_MEDIA_TYPE parameter to the handler. winegstreamer: Add MPEG video parser to MPEG splitter. quartz/tests: Add MPEG video parser tests for MPEG splitter. dlls/quartz/tests/mpegsplit.c | 894 +++++++++++++++++++++++++--------- dlls/quartz/tests/rsrc.rc | 4 + dlls/quartz/tests/video.mpg | Bin 0 -> 617 bytes dlls/winegstreamer/gstdemux.c | 192 +++++++- 4 files changed, 838 insertions(+), 252 deletions(-) create mode 100644 dlls/quartz/tests/video.mpg -- 2.25.1

3 4

[resend PATCH 1/2] Avoid undefined result in ntdll_wcstoumbs() in case of error.
by Paul Gofman 26 Jun '20

26 Jun '20

Undefined result is due to RtlUnicodeToUTF8N() not setting output length on error which is a correct behaviour according to existing tests. 'Planet Zoo' is affected which passes NULL object name buffer to NtCreateFile(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index d6bde700e42..4f03e3881f0 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -769,7 +769,7 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) */ int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) { - DWORD i, reslen; + DWORD i, reslen = 0; if (!unix_table.CodePage) RtlUnicodeToUTF8N( dst, dstlen, &reslen, src, srclen * sizeof(WCHAR) ); -- 2.26.2

2 2

[PATCH 10/10] msi: Add MsiDatabaseApplyTransformA MSITRANSFORM_ERROR_VIEWTRANSFORM test.
by Piotr Caban 26 Jun '20

26 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/db.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)

2 1

[PATCH 09/10] msi: Support DELETE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Piotr Caban 26 Jun '20

26 Jun '20

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

2 1

[PATCH 08/10] msi: Support DROP when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Piotr Caban 26 Jun '20

26 Jun '20

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

2 1

[PATCH 07/10] msi: Support INSERT INTO when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Piotr Caban 26 Jun '20

26 Jun '20

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

2 1

[PATCH 06/10] msi: Support ALTER TABLE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Piotr Caban 26 Jun '20

26 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/table.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 149 insertions(+), 3 deletions(-)

2 1

[PATCH 05/10] msi: Support CREATE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Piotr Caban 26 Jun '20

26 Jun '20

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

2 1

[PATCH 04/10] msi: Support UPDATE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Piotr Caban 26 Jun '20

26 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/table.c | 183 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 173 insertions(+), 10 deletions(-)

2 1

[PATCH 03/10] msi: Add stub support for MSITRANSFORM_ERROR_VIEWTRANSFORM flag in MsiApplyTransform.
by Piotr Caban 26 Jun '20

26 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/msipriv.h | 2 +- dlls/msi/msiquery.c | 4 +- dlls/msi/patch.c | 2 +- dlls/msi/table.c | 168 +++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 161 insertions(+), 15 deletions(-)

2 1

[PATCH 02/10] msi: Introduce msi_record_stream_name helper.
by Piotr Caban 26 Jun '20

26 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/table.c | 93 ++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 46 deletions(-)

2 1

[PATCH 01/10] include: Add MSITRANSFORM_ERROR enum definition.
by Piotr Caban 26 Jun '20

26 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- include/msiquery.h | 11 +++++++++++ 1 file changed, 11 insertions(+)

2 1

[PATCH 1/2] ntdll/tests: Add more HideFromDebugger tests.
by Rémi Bernon 26 Jun '20

26 Jun '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- 537bb7a8aee278d285cb77669fd9258dfaa3222f was potentially involved in a Diablo III regression, where NtSetInformationThread previously returned success for any thread, where it then only succeeded with the current thread. This series should implement the HideFromDebugger request correctly, checking handles and access rights on the server side. The hiding part is still not implemented, but it could then use the dbg_hidden field on the thread structure if we want to implement the debugger side. According to the kernel32 thread test, HideFromDebugger can only be queried with QUERY_INFORMATION rights, and not QUERY_LIMITED_INFORMATION thus the additional field in the get_thread_info request. dlls/ntdll/tests/info.c | 46 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index eaf2f1a45b7..b91d54375ce 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2346,7 +2346,6 @@ static void test_affinity(void) DWORD_PTR proc_affinity, thread_affinity; THREAD_BASIC_INFORMATION tbi; SYSTEM_INFO si; - ULONG dummy; GetSystemInfo(&si); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); @@ -2451,6 +2450,20 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); +} + +static DWORD WINAPI hide_from_debugger_thread(void *arg) +{ + HANDLE stop_event = arg; + WaitForSingleObject( stop_event, INFINITE ); + return 0; +} + +static void test_HideFromDebugger(void) +{ + NTSTATUS status; + HANDLE thread, stop_event; + ULONG dummy; dummy = 0; status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG) ); @@ -2477,6 +2490,34 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); } + + stop_event = CreateEventA( NULL, FALSE, FALSE, NULL ); + ok( stop_event != NULL, "CreateEvent failed\n" ); + thread = CreateThread( NULL, 0, hide_from_debugger_thread, stop_event, 0, NULL ); + ok( thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError() ); + + dummy = 0; + status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL ); + todo_wine + ok( status == STATUS_SUCCESS || status == STATUS_INVALID_INFO_CLASS, + "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) ok( dummy == 0, "Expected dummy == 0, got %08x\n", dummy ); + + status = pNtSetInformationThread( thread, ThreadHideFromDebugger, NULL, 0 ); + todo_wine + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + + dummy = 0; + status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL ); + todo_wine + ok( status == STATUS_SUCCESS || status == STATUS_INVALID_INFO_CLASS, + "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + + SetEvent( stop_event ); + WaitForSingleObject( thread, INFINITE ); + CloseHandle( thread ); + CloseHandle( stop_event ); } static void test_NtGetCurrentProcessorNumber(void) @@ -2817,6 +2858,9 @@ START_TEST(info) trace("Starting test_affinity()\n"); test_affinity(); + trace("Starting test_HideFromDebugger()\n"); + test_HideFromDebugger(); + trace("Starting test_NtGetCurrentProcessorNumber()\n"); test_NtGetCurrentProcessorNumber(); -- 2.27.0

2 2

[PATCH] include: Add new fields for SYSTEM_PEFORMANCE_INFORMATION
by Vijay Kiran Kamuju 26 Jun '20

26 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] winebuild: Correct hotpatching prologue in import thunks for x86_64.
by Paul Gofman 26 Jun '20

26 Jun '20

https://bugs.winehq.org/show_bug.cgi?id=48938 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- tools/winebuild/spec32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index b1e20e0484d..5f74d2f29be 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -576,7 +576,7 @@ void output_exports( DLLSPEC *spec ) else output( "\tjmp *__imp_%s\n", asm_name( get_link_name( odp ))); break; case CPU_x86_64: - output( "\t.byte 0x48\n" ); /* hotpatch prolog */ + output( "\t.byte 0x48,0x8d,0xa4,0x24,0x00,0x00,0x00,0x00\n" ); /* hotpatch prolog */ output( "\tjmp *__imp_%s(%%rip)\n", asm_name( get_link_name( odp ))); break; default: -- 2.26.2

1 0

[PATCH] include: Add svcguid.h
by Vijay Kiran Kamuju 26 Jun '20

26 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[resend PATCH] include: Add xact3.h
by Vijay Kiran Kamuju 26 Jun '20

26 Jun '20

Based on work by Ethan Lee and Alistair Leslie-Hughes Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 2/2] kernel32: Implement IsWow64Process2.
by Dmitry Timoshkov 26 Jun '20

26 Jun '20

v2: Add tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- .../api-ms-win-core-wow64-l1-1-1.spec | 1 + dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/process.c | 114 ++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 92 ++++++++++++++ include/winbase.h | 1 + 6 files changed, 210 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec b/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec index 08fa02c3fc..99ba713409 100644 --- a/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec +++ b/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec @@ -1,5 +1,6 @@ @ stdcall GetSystemWow64DirectoryA(ptr long) kernel32.GetSystemWow64DirectoryA @ stdcall GetSystemWow64DirectoryW(ptr long) kernel32.GetSystemWow64DirectoryW @ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process +@ stdcall IsWow64Process2(ptr ptr ptr) kernel32.IsWow64Process2 @ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection @ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 17322bcd90..e7a7f162b7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -999,6 +999,7 @@ @ stdcall -import IsValidNLSVersion(long wstr ptr) # @ stub IsValidUILanguage @ stdcall -import IsWow64Process(ptr ptr) +@ stdcall -import IsWow64Process2(ptr ptr ptr) @ stdcall -import K32EmptyWorkingSet(long) @ stdcall -import K32EnumDeviceDrivers(ptr long ptr) @ stdcall -import K32EnumPageFilesA(ptr ptr) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 82a5bdd85d..af585c4415 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -66,6 +66,7 @@ static HINSTANCE hkernel32, hntdll; static void (WINAPI *pGetNativeSystemInfo)(LPSYSTEM_INFO); static BOOL (WINAPI *pGetSystemRegistryQuota)(PDWORD, PDWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); +static BOOL (WINAPI *pIsWow64Process2)(HANDLE, USHORT *, USHORT *); static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD lpdwSize); @@ -249,6 +250,7 @@ static BOOL init(void) pGetNativeSystemInfo = (void *) GetProcAddress(hkernel32, "GetNativeSystemInfo"); pGetSystemRegistryQuota = (void *) GetProcAddress(hkernel32, "GetSystemRegistryQuota"); pIsWow64Process = (void *) GetProcAddress(hkernel32, "IsWow64Process"); + pIsWow64Process2 = (void *) GetProcAddress(hkernel32, "IsWow64Process2"); pVirtualAllocEx = (void *) GetProcAddress(hkernel32, "VirtualAllocEx"); pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA"); @@ -2166,6 +2168,117 @@ static void test_IsWow64Process(void) } } +static void test_IsWow64Process2(void) +{ + PROCESS_INFORMATION pi; + STARTUPINFOA si; + BOOL ret, is_wow64, is_win64; + USHORT machine, native_machine; + static char cmdline[] = "C:\\Program Files\\Internet Explorer\\iexplore.exe"; + static char cmdline_wow64[] = "C:\\Program Files (x86)\\Internet Explorer\\iexplore.exe"; + + if (!pIsWow64Process2) + { + skip("IsWow64Process2 is not available\n"); + return; + } + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + SetLastError(0xdeadbeef); + ret = CreateProcessA(cmdline_wow64, NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); + if (ret) + { + is_win64 = TRUE; + + SetLastError(0xdeadbeef); + machine = native_machine = 0xdead; + ret = pIsWow64Process2(pi.hProcess, &machine, &native_machine); + ok(ret, "IsWow64Process2 error %u\n", GetLastError()); + +#if defined(__i386__) || defined(__x86_64__) + ok(machine == IMAGE_FILE_MACHINE_I386, "got %#x\n", machine); + ok(native_machine == IMAGE_FILE_MACHINE_AMD64, "got %#x\n", native_machine); +#else + skip("not supportted architecture\n"); +#endif + + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess error\n"); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + else + is_win64 = FALSE; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + SetLastError(0xdeadbeef); + ret = CreateProcessA(cmdline, NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pIsWow64Process(pi.hProcess, &is_wow64); + ok(ret, "IsWow64Process error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + machine = native_machine = 0xdead; + ret = pIsWow64Process2(pi.hProcess, &machine, &native_machine); + ok(ret, "IsWow64Process2 error %u\n", GetLastError()); + + ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); +#ifdef __i386__ + if (is_win64) + ok(native_machine == IMAGE_FILE_MACHINE_AMD64, "got %#x\n", native_machine); + else + ok(native_machine == IMAGE_FILE_MACHINE_I386, "got %#x\n", native_machine); +#elif defined __x86_64__ + ok(native_machine == IMAGE_FILE_MACHINE_AMD64, "got %#x\n", native_machine); +#else + skip("not supportted architecture\n"); +#endif + + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess error\n"); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + SetLastError(0xdeadbeef); + ret = pIsWow64Process(GetCurrentProcess(), &is_wow64); + ok(ret, "IsWow64Process error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + machine = native_machine = 0xdead; + ret = pIsWow64Process2(GetCurrentProcess(), &machine, &native_machine); + ok(ret, "IsWow64Process2 error %u\n", GetLastError()); + + if (is_wow64) + { +#if defined(__i386__) || defined(__x86_64__) + ok(machine == IMAGE_FILE_MACHINE_I386, "got %#x\n", machine); + ok(native_machine == IMAGE_FILE_MACHINE_AMD64, "got %#x\n", native_machine); +#else + skip("not supportted architecture\n"); +#endif + } + else + { + ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); +#ifdef __i386__ + if (is_win64) + ok(native_machine == IMAGE_FILE_MACHINE_AMD64, "got %#x\n", native_machine); + else + ok(native_machine == IMAGE_FILE_MACHINE_I386, "got %#x\n", native_machine); +#elif defined __x86_64__ + ok(native_machine == IMAGE_FILE_MACHINE_AMD64, "got %#x\n", native_machine); +#else + skip("not supportted architecture\n"); +#endif + } +} + static void test_SystemInfo(void) { SYSTEM_INFO si, nsi; @@ -4065,6 +4178,7 @@ START_TEST(process) test_QueryFullProcessImageNameW(); test_Handles(); test_IsWow64Process(); + test_IsWow64Process2(); test_SystemInfo(); test_RegistryQuota(); test_DuplicateHandle(); diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 5e177a4932..a05bf223e8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -884,7 +884,7 @@ @ stdcall IsValidSid(ptr) @ stdcall IsWellKnownSid(ptr long) @ stdcall IsWow64Process(ptr ptr) -# @ stub IsWow64Process2 +@ stdcall IsWow64Process2(ptr ptr ptr) @ stdcall K32EmptyWorkingSet(long) @ stdcall K32EnumDeviceDrivers(ptr long ptr) @ stdcall K32EnumPageFilesA(ptr ptr) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a3b168543f..1076e2ea82 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -24,6 +24,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -882,6 +883,97 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsProcessorFeaturePresent ( DWORD feature ) } +/********************************************************************** + * IsWow64Process2 (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, USHORT *native_machine ) +{ + BOOL wow64; + SYSTEM_INFO si; + + TRACE( "(%p,%p,%p)\n", process, machine, native_machine ); + + if (!IsWow64Process( process, &wow64 )) + return FALSE; + + if (wow64) + { + GetNativeSystemInfo( &si ); + + if (process != GetCurrentProcess()) + { +#if defined(__i386__) || defined(__x86_64__) + *machine = IMAGE_FILE_MACHINE_I386; +#else + FIXME("not implemented for other process\n"); + *machine = IMAGE_FILE_MACHINE_UNKNOWN; +#endif + } + else + { + IMAGE_NT_HEADERS *nt; + nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + *machine = nt->FileHeader.Machine; + } + } + else + { +#ifdef _WIN64 + GetSystemInfo( &si ); +#else + GetNativeSystemInfo( &si ); +#endif + *machine = IMAGE_FILE_MACHINE_UNKNOWN; + } + + switch (si.u.s.wProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + *native_machine = IMAGE_FILE_MACHINE_I386; + break; + + case PROCESSOR_ARCHITECTURE_ALPHA: + *native_machine = IMAGE_FILE_MACHINE_ALPHA; + break; + + case PROCESSOR_ARCHITECTURE_ARM: + *native_machine = IMAGE_FILE_MACHINE_ARM; + break; + + case PROCESSOR_ARCHITECTURE_IA64: + *native_machine = IMAGE_FILE_MACHINE_IA64; + break; + + case PROCESSOR_ARCHITECTURE_ALPHA64: + *native_machine = IMAGE_FILE_MACHINE_ALPHA64; + break; + + case PROCESSOR_ARCHITECTURE_AMD64: + *native_machine = IMAGE_FILE_MACHINE_AMD64; + break; + + case PROCESSOR_ARCHITECTURE_ARM64: + *native_machine = IMAGE_FILE_MACHINE_ARM64; + break; + + case PROCESSOR_ARCHITECTURE_MIPS: + case PROCESSOR_ARCHITECTURE_PPC: + case PROCESSOR_ARCHITECTURE_SHX: + case PROCESSOR_ARCHITECTURE_MSIL: + case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64: + case PROCESSOR_ARCHITECTURE_NEUTRAL: + case PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64: + case PROCESSOR_ARCHITECTURE_IA32_ON_ARM64: + default: + FIXME("unknown architecture %u\n", si.u.s.wProcessorArchitecture); + *native_machine = IMAGE_FILE_MACHINE_UNKNOWN; + break; + } + + return TRUE; +} + + /********************************************************************** * IsWow64Process (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index 39a4a9c9ac..981d4ea76a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2406,6 +2406,7 @@ WINADVAPI BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR); WINADVAPI BOOL WINAPI IsValidSid(PSID); WINADVAPI BOOL WINAPI IsWellKnownSid(PSID,WELL_KNOWN_SID_TYPE); WINBASEAPI BOOL WINAPI IsWow64Process(HANDLE,PBOOL); +WINBASEAPI BOOL WINAPI IsWow64Process2(HANDLE,USHORT*,USHORT*); WINADVAPI BOOL WINAPI ImpersonateLoggedOnUser(HANDLE); WINADVAPI BOOL WINAPI ImpersonateNamedPipeClient(HANDLE); WINADVAPI BOOL WINAPI ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL); -- 2.26.2

2 1

[PATCH v2 1/2] kernel32/tests: Fix compilation with PSDK.
by Dmitry Timoshkov 26 Jun '20

26 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8454e64265..82a5bdd85d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3828,7 +3828,7 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) } else { - status = NtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &pbi_size); + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &pbi_size); ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); parent_id = pbi.InheritedFromUniqueProcessId; -- 2.26.2

1 0

winevulkan DllMain() behavior
by Brendan Shanks 26 Jun '20

26 Jun '20

Hi all, On DLL_PROCESS_ATTACH, winevulkan’s DllMain() calls wine_vk_init(), which initializes the Vulkan driver and then returns whether that succeeded or failed. Now that winevulkan implements DllRegisterServer() (to create a JSON manifest and registry key to register with the official Vulkan loader), this has led to some undesirable behavior: - if the prefix is created in an environment where no Vulkan library is available (such as Proton’s build VM), DllMain() returns FALSE and the DLL registration fails. The manifest and registry key are not created, and if the official Vulkan loader is installed, Vulkan won't work until the prefix is updated (with Vulkan available). - on platforms (like older macOS) where Vulkan is available for 64-bit but not 32-bit, a “Failed to load Wine graphics driver supporting Vulkan” message is logged during prefix creation, which could be confusing for users. - prefix creation/update is unnecessarily slowed by having to load Vulkan. The fix I’m thinking of is that DllMain() shouldn’t call wine_vk_init(), and should always return TRUE. wine_vk_init() should be called (with an InitOnce) at the top of the five global Vulkan functions (vkGetInstanceProcAddr, vkEnumerateInstanceVersion, vkEnumerateInstanceExtensionProperties, vkEnumerateInstanceLayerProperties, vkCreateInstance), and also the two ICD entry points (vk_icdGetInstanceProcAddr, vk_icdNegotiateLoaderICDInterfaceVersion). All of those functions will need to correctly handle the case where wine_vk_init() has failed and vk_funcs is NULL. I think this behavior change will also match the official Vulkan loader better: on a Windows machine with no Vulkan hardware, vulkan-1.dll loads successfully, but vkCreateInstance() returns VK_ERROR_INITIALIZATION_FAILED. Any feedback or thoughts are appreciated. Thanks, Brendan

1 0

[PATCH v3 1/3] amstream: Use IDirectDraw instead of IDirectDraw7 internally.
by Gijs Vermeulen 25 Jun '20

25 Jun '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 35 ++++++++++++++++++---------------- dlls/amstream/tests/amstream.c | 12 ++++++------ 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index ca6a910f3f..f1b6d37d08 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -39,7 +39,7 @@ struct ddraw_stream IMultiMediaStream* parent; MSPID purpose_id; STREAM_TYPE stream_type; - IDirectDraw7 *ddraw; + IDirectDraw *ddraw; CRITICAL_SECTION cs; IMediaStreamFilter *filter; @@ -107,17 +107,17 @@ static ULONG WINAPI ddraw_IAMMediaStream_AddRef(IAMMediaStream *iface) static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); + ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + TRACE("%p decreasing refcount to %u.\n", stream, ref); if (!ref) { - DeleteCriticalSection(&This->cs); - if (This->ddraw) - IDirectDraw7_Release(This->ddraw); - HeapFree(GetProcessHeap(), 0, This); + DeleteCriticalSection(&stream->cs); + if (stream->ddraw) + IDirectDraw_Release(stream->ddraw); + HeapFree(GetProcessHeap(), 0, stream); } return ref; @@ -214,8 +214,8 @@ static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn stream->stream_type = stream_type; if (source_object - && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw7, (void **)&stream->ddraw))) - FIXME("Stream object doesn't implement IDirectDraw7 interface, hr %#x.\n", hr); + && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw, (void **)&stream->ddraw))) + FIXME("Stream object doesn't implement IDirectDraw interface, hr %#x.\n", hr); return S_OK; } @@ -373,23 +373,26 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMediaStream *iface, IDirectDraw **ddraw) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); - TRACE("(%p)->(%p)\n", iface, ddraw); + TRACE("stream %p, ddraw %p.\n", stream, ddraw); if (!ddraw) return E_POINTER; *ddraw = NULL; - if (!This->ddraw) + if (!stream->ddraw) { - HRESULT hr = DirectDrawCreateEx(NULL, (void**)&This->ddraw, &IID_IDirectDraw7, NULL); + HRESULT hr = DirectDrawCreate(NULL, &stream->ddraw, NULL); if (FAILED(hr)) return hr; - IDirectDraw7_SetCooperativeLevel(This->ddraw, NULL, DDSCL_NORMAL); + IDirectDraw_SetCooperativeLevel(stream->ddraw, NULL, DDSCL_NORMAL); } - return IDirectDraw7_QueryInterface(This->ddraw, &IID_IDirectDraw, (void**)ddraw); + IDirectDraw_AddRef(stream->ddraw); + *ddraw = stream->ddraw; + + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 03c8660a42..5aedfa4680 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4776,7 +4776,7 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw7, &MSPID_PrimaryVideo, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(ddraw, 2); + EXPECT_REF(ddraw, 2); hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4787,19 +4787,19 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ddraw2 == ddraw, "Expected ddraw %p, got %p.\n", ddraw, ddraw2); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); - todo_wine EXPECT_REF(ddraw, 4); + EXPECT_REF(ddraw, 4); IDirectDraw_Release(ddraw3); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); /* The current ddraw is released when SetDirectDraw() is called. */ hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw, 2); + todo_wine EXPECT_REF(ddraw, 2); hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4808,7 +4808,7 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); if (hr == S_OK) { -- 2.27.0

4 6

[PATCH v2 1/3] quartz/videorenderer: Set the destination rect to the whole client area when connecting.
by Zebediah Figura 25 Jun '20

25 Jun '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 18 ++++++++++++++++++ dlls/quartz/videorenderer.c | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ab2b4f9e0d4..b157700a92b 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2606,6 +2606,7 @@ static void test_basic_video(void) UINT count; ULONG ref; IPin *pin; + RECT rect; IBaseFilter_QueryInterface(filter, &IID_IBasicVideo, (void **)&video); IBaseFilter_FindPin(filter, L"In", &pin); @@ -2722,6 +2723,23 @@ static void test_basic_video(void) test_basic_video_source(video); test_basic_video_destination(video); + hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + vih.bmiHeader.biWidth = 16; + vih.bmiHeader.biHeight = 16; + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_source_position(video, 0, 0, 16, 16); + + SetRect(&rect, 0, 0, 0, 0); + AdjustWindowRectEx(&rect, WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW, FALSE, 0); + check_destination_position(video, 0, 0, max(16, GetSystemMetrics(SM_CXMIN) - (rect.right - rect.left)), + max(16, GetSystemMetrics(SM_CYMIN) - (rect.bottom - rect.top))); + ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); IBasicVideo_Release(video); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e004d0fc214..f6eebc9ef9d 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -225,12 +225,13 @@ static HRESULT video_renderer_connect(struct strmbase_renderer *iface, const AM_ filter->VideoWidth = bitmap_header->biWidth; filter->VideoHeight = abs(bitmap_header->biHeight); SetRect(&rect, 0, 0, filter->VideoWidth, filter->VideoHeight); - filter->window.src = filter->window.dst = rect; + filter->window.src = rect; AdjustWindowRectEx(&rect, GetWindowLongW(window, GWL_STYLE), FALSE, GetWindowLongW(window, GWL_EXSTYLE)); SetWindowPos(window, NULL, 0, 0, rect.right - rect.left, rect.bottom - rect.top, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); + GetClientRect(window, &filter->window.dst); return S_OK; } -- 2.27.0

2 3

[PATCH v2 9/9] server: Remove no longer needed support for opening current console in open_console request.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 15 ++------------- server/protocol.def | 3 +-- 2 files changed, 3 insertions(+), 15 deletions(-)

2 1

[PATCH 1/5] quartz/vmr9: Return VFW_E_TYPE_NOT_ACCEPTED when connection fails.
by Zebediah Figura 25 Jun '20

25 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 8 ++------ dlls/quartz/tests/vmr9.c | 14 ++------------ dlls/quartz/vmr9.c | 4 ++-- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 1f0af817f0b..4422a1f9140 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1366,12 +1366,8 @@ static void test_connect_pin(void) vih.bmiHeader.biBitCount = 16; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + vih.bmiHeader.biBitCount = 32; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); if (hr == VFW_E_TYPE_NOT_ACCEPTED) /* w7u */ diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index fae824b827d..69065d35761 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1618,20 +1618,10 @@ static void test_connect_pin(void) req_mt.subtype = MEDIASUBTYPE_RGB8; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_WAVE; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_RGB32; peer = (IPin *)0xdeadbeef; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 09d63b6a71c..e49266c30c2 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -424,7 +424,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE default: FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount); free(filter->surfaces); - return E_INVALIDARG; + return VFW_E_TYPE_NOT_ACCEPTED; } info.dwFlags = VMR9AllocFlag_TextureSurface; @@ -456,7 +456,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE } free(filter->surfaces); - return hr; + return VFW_E_TYPE_NOT_ACCEPTED; } static void vmr_start_stream(struct strmbase_renderer *iface) -- 2.27.0

3 6

[PATCH v2 8/9] kernel32: Reimplement OpenConsoleW on top of CreateFileW.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-)

2 1

[PATCH 2/9] server: Introduce CurrentIn device.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ server/directory.c | 9 ++++++- server/file.h | 1 + 3 files changed, 69 insertions(+), 1 deletion(-)

2 2

[PATCH v2 7/9] kernelbase: Use NtCreateFile for console handles in CreateFileW.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 5 ----- dlls/kernelbase/console.c | 26 -------------------------- dlls/kernelbase/file.c | 31 ++++++------------------------- dlls/kernelbase/kernelbase.h | 2 -- 4 files changed, 6 insertions(+), 58 deletions(-)

1 0

[PATCH v2 6/9] ntdll: Support CONIN$ and CONOUT$ in RtlIsDosDeviceName_U.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/path.c | 8 ++++++++ dlls/ntdll/tests/path.c | 44 +++++++++++++++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 8 deletions(-)

1 0

[PATCH v2 5/9] server: Support console global symlinks.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/directory.c | 22 ++++++++++++++++++++++ server/object.h | 3 +++ server/symlink.c | 26 ++++++++++---------------- 3 files changed, 35 insertions(+), 16 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