wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Eric Pouech : winedbg: In gdb proxy mode, ignore ctrl-c.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 4a206a7ecb9d38fa6ef755d7b1cb47fc6ba81bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a206a7ecb9d38fa6ef755d7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 15 16:52:52 2021 +0100 winedbg: In gdb proxy mode, ignore ctrl-c. Let gdb handle the control-c instead of killing winedbg. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51766 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0fb27023957..8d8ae30fce5 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2499,6 +2499,8 @@ static int gdb_remote(unsigned flags, unsigned port) struct gdb_context gdbctx; if (!gdb_init_context(&gdbctx, flags, port)) return 0; + /* don't handle ctrl-c, but let gdb do the job */ + SetConsoleCtrlHandler(NULL, TRUE); for (;;) { fd_set read_fds, err_fds;

1 0

Eric Pouech : start: Ignore Ctrl-C and let the child decides what to do with it.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: ff7ff4d0b4deb40b4580fafca15bf3bbd0bf58d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff7ff4d0b4deb40b4580fafc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 15 16:52:46 2021 +0100 start: Ignore Ctrl-C and let the child decides what to do with it. Based on a patch from Bernhard Übelacker Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51766 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/start/start.c b/programs/start/start.c index e78968e2052..dcd0a113f59 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -676,6 +676,7 @@ done: if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { DWORD exitcode; + SetConsoleCtrlHandler(NULL, TRUE); WaitForSingleObject(sei.hProcess, INFINITE); GetExitCodeProcess(sei.hProcess, &exitcode); ExitProcess(exitcode);

1 0

Conor McCarthy : wined3d: Do not bind buffers in state_cb() if the shader is not set.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: d61c9998d921b7e4268275b0bed865f37be2bc42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61c9998d921b7e4268275b0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Dec 16 00:16:25 2021 +1000 wined3d: Do not bind buffers in state_cb() if the shader is not set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52020 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 +++ dlls/wined3d/state.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bb629d9b27f..009ad561be7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1768,6 +1768,9 @@ static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_shader *op = data; + /* CB binding may have been skipped earlier if the shader wasn't set, so make it happen. */ + if (!cs->state.shader[op->type] && op->shader) + device_invalidate_state(cs->c.device, STATE_CONSTANT_BUFFER(op->type)); cs->state.shader[op->type] = op->shader; device_invalidate_state(cs->c.device, STATE_SHADER(op->type)); if (op->type != WINED3D_SHADER_TYPE_COMPUTE) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 865c60d189e..208014e2073 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4579,6 +4579,10 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state else shader_type = WINED3D_SHADER_TYPE_COMPUTE; + /* If a shader has not been set, buffer objects are not yet initialised. */ + if (!state->shader[shader_type]) + return; + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, shader_type, &base, &count); for (i = 0; i < count; ++i) {

1 0

Dmitry Timoshkov : shell32: Add support for IDragSourceHelper2 interface.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: a6445025a3d6707a200e61e0852550c54056e192 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6445025a3d6707a200e61e0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 15 16:37:28 2021 +0300 shell32: Add support for IDragSourceHelper2 interface. The program that I have here fails if IDragSourceHelper2::SetFlags() returns E_NOTIMPL. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dragdrophelper.c | 56 +++++++++++++++++++++++++------------------ include/shobjidl.idl | 15 ++++++++++++ 2 files changed, 48 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 53bbe46cb14..00db2163750 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); typedef struct { IDropTargetHelper IDropTargetHelper_iface; - IDragSourceHelper IDragSourceHelper_iface; + IDragSourceHelper2 IDragSourceHelper2_iface; LONG ref; } dragdrophelper; @@ -56,9 +56,9 @@ static inline dragdrophelper *impl_from_IDropTargetHelper(IDropTargetHelper *ifa return CONTAINING_RECORD(iface, dragdrophelper, IDropTargetHelper_iface); } -static inline dragdrophelper *impl_from_IDragSourceHelper(IDragSourceHelper *iface) +static inline dragdrophelper *impl_from_IDragSourceHelper2(IDragSourceHelper2 *iface) { - return CONTAINING_RECORD(iface, dragdrophelper, IDragSourceHelper_iface); + return CONTAINING_RECORD(iface, dragdrophelper, IDragSourceHelper2_iface); } /************************************************************************** @@ -76,9 +76,9 @@ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * if { *ppvObj = &This->IDropTargetHelper_iface; } - else if (IsEqualIID (riid, &IID_IDragSourceHelper)) + else if (IsEqualIID (riid, &IID_IDragSourceHelper) || IsEqualIID (riid, &IID_IDragSourceHelper2)) { - *ppvObj = &This->IDragSourceHelper_iface; + *ppvObj = &This->IDragSourceHelper2_iface; } if (*ppvObj) { @@ -86,7 +86,7 @@ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * if TRACE ("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); return S_OK; } - FIXME ("-- Interface: E_NOINTERFACE\n"); + FIXME ("%s: E_NOINTERFACE\n", shdebugstr_guid (riid)); return E_NOINTERFACE; } @@ -167,51 +167,61 @@ static const IDropTargetHelperVtbl DropTargetHelperVtbl = IDropTargetHelper_fnShow }; -static HRESULT WINAPI DragSourceHelper_QueryInterface (IDragSourceHelper * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI DragSourceHelper2_QueryInterface (IDragSourceHelper2 * iface, REFIID riid, LPVOID * ppv) { - dragdrophelper *This = impl_from_IDragSourceHelper(iface); + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); return IDropTargetHelper_fnQueryInterface(&This->IDropTargetHelper_iface, riid, ppv); } -static ULONG WINAPI DragSourceHelper_AddRef (IDragSourceHelper * iface) +static ULONG WINAPI DragSourceHelper2_AddRef (IDragSourceHelper2 * iface) { - dragdrophelper *This = impl_from_IDragSourceHelper(iface); + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); return IDropTargetHelper_fnAddRef(&This->IDropTargetHelper_iface); } -static ULONG WINAPI DragSourceHelper_Release (IDragSourceHelper * iface) +static ULONG WINAPI DragSourceHelper2_Release (IDragSourceHelper2 * iface) { - dragdrophelper *This = impl_from_IDragSourceHelper(iface); + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); return IDropTargetHelper_fnRelease(&This->IDropTargetHelper_iface); } -static HRESULT WINAPI DragSourceHelper_InitializeFromBitmap(IDragSourceHelper *iface, +static HRESULT WINAPI DragSourceHelper2_InitializeFromBitmap(IDragSourceHelper2 *iface, SHDRAGIMAGE *dragimage, IDataObject *object) { - dragdrophelper *This = impl_from_IDragSourceHelper(iface); + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); FIXME("(%p)->(%p, %p): stub\n", This, dragimage, object); return E_NOTIMPL; } -static HRESULT WINAPI DragSourceHelper_InitializeFromWindow(IDragSourceHelper *iface, HWND hwnd, +static HRESULT WINAPI DragSourceHelper2_InitializeFromWindow(IDragSourceHelper2 *iface, HWND hwnd, POINT *pt, IDataObject *object) { - dragdrophelper *This = impl_from_IDragSourceHelper(iface); + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); FIXME("(%p)->(%p, %s, %p): stub\n", This, hwnd, wine_dbgstr_point(pt), object); return E_NOTIMPL; } -static const IDragSourceHelperVtbl DragSourceHelperVtbl = +static HRESULT WINAPI DragSourceHelper2_SetFlags(IDragSourceHelper2 *iface, DWORD flags) { - DragSourceHelper_QueryInterface, - DragSourceHelper_AddRef, - DragSourceHelper_Release, - DragSourceHelper_InitializeFromBitmap, - DragSourceHelper_InitializeFromWindow + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); + + FIXME("(%p)->(%08x): stub\n", This, flags); + + return S_OK; +} + +static const IDragSourceHelper2Vtbl DragSourceHelper2Vtbl = +{ + DragSourceHelper2_QueryInterface, + DragSourceHelper2_AddRef, + DragSourceHelper2_Release, + DragSourceHelper2_InitializeFromBitmap, + DragSourceHelper2_InitializeFromWindow, + DragSourceHelper2_SetFlags }; /************************************************************************** @@ -233,7 +243,7 @@ HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, if (!dth) return E_OUTOFMEMORY; dth->IDropTargetHelper_iface.lpVtbl = &DropTargetHelperVtbl; - dth->IDragSourceHelper_iface.lpVtbl = &DragSourceHelperVtbl; + dth->IDragSourceHelper2_iface.lpVtbl = &DragSourceHelper2Vtbl; dth->ref = 1; hr = IDropTargetHelper_QueryInterface (&dth->IDropTargetHelper_iface, riid, ppv); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 92e4da36c77..c1a36ab5e93 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1576,6 +1576,21 @@ interface IDragSourceHelper : IUnknown } +/***************************************************************************** + * IDragSourceHelper2 interface + */ +[ + object, + uuid(83e07d0d-0c5f-4163-bf1a-60b274051e40), + pointer_default(unique), + local +] +interface IDragSourceHelper2 : IDragSourceHelper +{ + HRESULT SetFlags([in] DWORD dwFlags); +} + + /***************************************************************************** * IDropTargetHelper interface */

1 0

Alexandre Julliard : ntdll/tests: Fix some wow64 test failures on Windows.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 311c0e91c0a17504357301597acc7adcd5fc2b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=311c0e91c0a1750435730159… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 17:01:53 2021 +0100 ntdll/tests: Fix some wow64 test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/wow64.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index be2f2138933..9e09c60c32c 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -874,7 +874,7 @@ static void test_nt_wow64(void) ok( status == STATUS_PARTIAL_COPY || broken( status == STATUS_ACCESS_VIOLATION ), "NtWow64WriteVirtualMemory64 failed %x\n", status ); todo_wine - ok( !res, "wrong size %s\n", wine_dbgstr_longlong(res) ); + ok( !res || broken(res) /* win10 1709 */, "wrong size %s\n", wine_dbgstr_longlong(res) ); } ptr = 0x9876543210ull; status = pNtWow64AllocateVirtualMemory64( process, &ptr, 0, &size, @@ -882,7 +882,8 @@ static void test_nt_wow64(void) todo_wine ok( !status || broken( status == STATUS_CONFLICTING_ADDRESSES ), "NtWow64AllocateVirtualMemory64 failed %x\n", status ); - if (!status) ok( ptr == 0x9876540000ull, "wrong ptr %s\n", wine_dbgstr_longlong(ptr) ); + if (!status) ok( ptr == 0x9876540000ull || broken(ptr == 0x76540000), /* win 8.1 */ + "wrong ptr %s\n", wine_dbgstr_longlong(ptr) ); ptr = 0; status = pNtWow64AllocateVirtualMemory64( GetCurrentProcess(), &ptr, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READONLY ); @@ -1027,15 +1028,27 @@ static void test_init_block(void) CHECK_FUNC( init_block[5], "KiUserExceptionDispatcher" ); CHECK_FUNC( init_block[6], "KiUserApcDispatcher" ); CHECK_FUNC( init_block[7], "KiUserCallbackDispatcher" ); - CHECK_FUNC( init_block[8], "ExpInterlockedPopEntrySListFault" ); - CHECK_FUNC( init_block[9], "ExpInterlockedPopEntrySListResume" ); - CHECK_FUNC( init_block[10], "ExpInterlockedPopEntrySListEnd" ); - CHECK_FUNC( init_block[11], "RtlUserThreadStart" ); - CHECK_FUNC( init_block[12], "RtlpQueryProcessDebugInformationRemote" ); - ok( init_block[13] == (ULONG_PTR)ntdll, "got %p for ntdll %p\n", - (void *)(ULONG_PTR)init_block[13], ntdll ); - CHECK_FUNC( init_block[14], "LdrSystemDllInitBlock" ); - size = 15 * sizeof(*init_block); + if (GetProcAddress( ntdll, "ExpInterlockedPopEntrySListFault" )) + { + CHECK_FUNC( init_block[8], "ExpInterlockedPopEntrySListFault" ); + CHECK_FUNC( init_block[9], "ExpInterlockedPopEntrySListResume" ); + CHECK_FUNC( init_block[10], "ExpInterlockedPopEntrySListEnd" ); + CHECK_FUNC( init_block[11], "RtlUserThreadStart" ); + CHECK_FUNC( init_block[12], "RtlpQueryProcessDebugInformationRemote" ); + ok( init_block[13] == (ULONG_PTR)ntdll, "got %p for ntdll %p\n", + (void *)(ULONG_PTR)init_block[13], ntdll ); + CHECK_FUNC( init_block[14], "LdrSystemDllInitBlock" ); + size = 15 * sizeof(*init_block); + } + else /* win10 1607 */ + { + CHECK_FUNC( init_block[8], "RtlUserThreadStart" ); + CHECK_FUNC( init_block[9], "RtlpQueryProcessDebugInformationRemote" ); + ok( init_block[10] == (ULONG_PTR)ntdll, "got %p for ntdll %p\n", + (void *)(ULONG_PTR)init_block[10], ntdll ); + CHECK_FUNC( init_block[11], "LdrSystemDllInitBlock" ); + size = 12 * sizeof(*init_block); + } break; case 0xe0: /* win10 1809 */ case 0xf0: /* win10 2004 */

1 0

Alexandre Julliard : ntdll/tests: Fix some directory test failures on Windows.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 1887df5cd8e86afeb21077b93b81031f75466bed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1887df5cd8e86afeb21077b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 16:19:08 2021 +0100 ntdll/tests: Fix some directory test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 6a423174664..8a8047c6392 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -381,8 +381,9 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma if (status == STATUS_BUFFER_OVERFLOW) { ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, U(io).Status ); - ok( U(io).Information == data_size, "%u: wrong info %lx\n", class, U(io).Information ); - ok(data[0] == 0, "%u: wrong offset %x\n", class, data[0] ); + ok( U(io).Information == data_size || broken(!U(io).Information), /* win10 1709 */ + "%u: wrong info %lx\n", class, U(io).Information ); + if (U(io).Information) ok(data[0] == 0, "%u: wrong offset %x\n", class, data[0] ); } else { @@ -653,11 +654,12 @@ static void test_NtQueryDirectoryFile(void) memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef; - status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size, + status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, (data_size + 7) & ~7, FileBothDirectoryInformation, FALSE, NULL, TRUE ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status ); - ok( U(io).Information == data_size, "wrong info %lx / %x\n", U(io).Information, data_size ); + ok( U(io).Information == data_size || U(io).Information == ((data_size + 7) & ~7), + "wrong info %lx / %x\n", U(io).Information, data_size ); ok( fbdi->NextEntryOffset == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7), "wrong offset %x\n", fbdi->NextEntryOffset ); ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %x\n", fbdi->FileNameLength );

1 0

Alexandre Julliard : ntdll/tests: Fix some exception test failures on Windows.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: c372d155ece56073138d4f1d9e5694433a114a5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c372d155ece56073138d4f1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 15:31:42 2021 +0100 ntdll/tests: Fix some exception test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1a7993c75de..2bceca204be 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4367,7 +4367,8 @@ static void test_wow64_context(void) ok( ctx.Esp == context.Rsp, "cs32: esp %08x / %p\n", ctx.Esp, (void *)context.Rsp ); ok( ctx.Eax == context.Rax, "cs32: eax %08x / %p\n", ctx.Eax, (void *)context.Rax ); ok( ctx.Ebx == context.Rbx, "cs32: ebx %08x / %p\n", ctx.Ebx, (void *)context.Rbx ); - ok( ctx.Ecx == context.Rcx, "cs32: ecx %08x / %p\n", ctx.Ecx, (void *)context.Rcx ); + ok( ctx.Ecx == context.Rcx || broken(ctx.Ecx == (ULONG)context.Rcx), + "cs32: ecx %08x / %p\n", ctx.Ecx, (void *)context.Rcx ); ok( ctx.Edx == context.Rdx, "cs32: edx %08x / %p\n", ctx.Edx, (void *)context.Rdx ); ok( ctx.Esi == context.Rsi, "cs32: esi %08x / %p\n", ctx.Esi, (void *)context.Rsi ); ok( ctx.Edi == context.Rdi, "cs32: edi %08x / %p\n", ctx.Edi, (void *)context.Rdi ); @@ -4402,7 +4403,6 @@ static void test_wow64_context(void) ok( res == cpu_size, "wrong len %lx\n", res ); ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, "cs32: got context flags %#x\n", ctx_ptr->ContextFlags); - ok(ctx_ptr->Eip != ctx.Eip, "cs32: got eip %08x / %08x\n", ctx_ptr->Eip, ctx.Eip); /* changing either context changes the actual cpu context */ rcx = context.Rcx; @@ -4447,9 +4447,11 @@ static void test_wow64_context(void) ok( ctx.Esp >= teb32.DeallocationStack && ctx.Esp <= teb32.Tib.StackBase, "cs64: esp not inside 32-bit stack %08x / %08x-%08x\n", ctx.Esp, teb32.DeallocationStack, teb32.Tib.StackBase ); - ok( (void *)context.Rsp >= teb.DeallocationStack && (void *)context.Rsp <= teb.Tib.StackBase, - "cs64: rsp not inside 64-bit stack %p / %p-%p\n", (void *)context.Rsp, - teb.DeallocationStack, teb.Tib.StackBase ); + ok( ((void *)context.Rsp >= teb.DeallocationStack && (void *)context.Rsp <= teb.Tib.StackBase) || + (context.Rsp >= teb32.DeallocationStack && context.Rsp <= teb32.Tib.StackBase), + "cs64: rsp not inside stack %p / 64-bit %p-%p 32-bit %p-%p\n", (void *)context.Rsp, + teb.DeallocationStack, teb.Tib.StackBase, + ULongToPtr(teb32.DeallocationStack), ULongToPtr(teb32.Tib.StackBase) ); if (pRtlWow64GetCpuAreaInfo) { @@ -4669,7 +4671,6 @@ static void test_kiuserexceptiondispatcher(void) *(ULONG_PTR *)(hook_trampoline + 34) = (ULONG_PTR)pKiUserExceptionDispatcher; trampoline_ptr = (char *)code_mem + 1024; memcpy(trampoline_ptr, hook_trampoline, sizeof(hook_trampoline)); - ok(((ULONG64)trampoline_ptr & 0xffffffff) == (ULONG64)trampoline_ptr, "Address is too long.\n"); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), PAGE_EXECUTE_READWRITE, &old_protect); @@ -8907,7 +8908,7 @@ static void test_suspend_process(void) ok(!status, "Failed to resume a process, status %#x.\n", status); ResetEvent(event2); - ret = WaitForSingleObject(event2, 200); + ret = WaitForSingleObject(event2, 1000); ok(ret == WAIT_OBJECT_0, "Wait failed.\n"); SetEvent(event);

1 0

Rémi Bernon : user32: Throttle device list updates from GetRawInputDeviceList.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: a80f76819cf0e173ba17808336c0feb45254f9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a80f76819cf0e173ba178083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 14 21:24:23 2021 +0100 user32: Throttle device list updates from GetRawInputDeviceList. Up to once every 2s. This fixes a regression from c2c78a2fe0ac13e4fca7ab4c17977b65e358485c, which caused severe FPS drop in Samurai Shodown. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51282 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 2660874d12c..f3dc4ae67de 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -418,7 +418,8 @@ BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_ms */ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_count, UINT size) { - UINT i; + static UINT last_check; + UINT i, ticks = GetTickCount(); TRACE("devices %p, device_count %p, size %u.\n", devices, device_count, size); @@ -434,7 +435,11 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; } - rawinput_update_device_list(); + if (ticks - last_check > 2000) + { + last_check = ticks; + rawinput_update_device_list(); + } if (!devices) {

1 0

Rémi Bernon : user32: Update rawinput devices on WM_INPUT_DEVICE_CHANGE reception.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 6a30f12eeffb2a80d2f2579e5f37dd088fbb25f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a30f12eeffb2a80d2f2579e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 14 21:24:22 2021 +0100 user32: Update rawinput devices on WM_INPUT_DEVICE_CHANGE reception. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51282 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 4 +++- dlls/user32/rawinput.c | 8 +++++--- dlls/user32/user_private.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 03fa42f0ae5..d7dbc64d796 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2290,7 +2290,9 @@ static BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardwar { struct rawinput_thread_data *thread_data = rawinput_thread_data(); - if (msg->message == WM_INPUT) + if (msg->message == WM_INPUT_DEVICE_CHANGE) + rawinput_update_device_list(); + else { thread_data->buffer->header.dwSize = RAWINPUT_BUFFER_SIZE; if (!rawinput_from_hardware_message( thread_data->buffer, msg_data )) return FALSE; diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 3a316024656..2660874d12c 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -168,7 +168,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return device; } -static void find_devices(void) +void rawinput_update_device_list(void) { SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; @@ -178,6 +178,8 @@ static void find_devices(void) HDEVINFO set; DWORD idx; + TRACE("\n"); + HidD_GetHidGuid(&hid_guid); EnterCriticalSection(&rawinput_devices_cs); @@ -259,7 +261,7 @@ static struct device *find_device_from_handle(HANDLE handle) for (i = 0; i < rawinput_devices_count; ++i) if (rawinput_devices[i].handle == handle) return rawinput_devices + i; - find_devices(); + rawinput_update_device_list(); for (i = 0; i < rawinput_devices_count; ++i) if (rawinput_devices[i].handle == handle) return rawinput_devices + i; @@ -432,7 +434,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; } - find_devices(); + rawinput_update_device_list(); if (!devices) { diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 96704ac68ae..6923ddb2906 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -160,6 +160,7 @@ struct hardware_msg_data; extern BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_msg_data *msg_data); extern BOOL rawinput_device_get_usages(HANDLE handle, USAGE *usage_page, USAGE *usage); extern struct rawinput_thread_data *rawinput_thread_data(void); +extern void rawinput_update_device_list(void); extern void create_offscreen_window_surface( const RECT *visible_rect, struct window_surface **surface ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mfplat/tests: Handle ResetDevice() failure when used with D3D12 device.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 1e1e9463114039fc83e3407cad601e7c7855258a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e1e9463114039fc83e3407c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 15 11:12:43 2021 +0300 mfplat/tests: Handle ResetDevice() failure when used with D3D12 device. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52165 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 33b93852e2a..21eab6d1172 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7467,6 +7467,11 @@ static void test_sample_allocator_d3d12(void) ok(hr == S_OK, "Failed to create device manager, hr %#x.\n", hr); hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)device, token); + if (FAILED(hr)) + { + win_skip("Device manager does not support D3D12 devices.\n"); + goto done; + } ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocator, (void **)&allocator);

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
57
Older →

Jump to page:

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-commits December 2021