December 2023 - Wine-commits

Rémi Bernon : server: Ignore the capture window wrt desktop cursor changes.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: 2e90c016968612689cbbb3de114e27e0e32f8ce2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e90c016968612689cbbb3de114e27… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 18 09:54:42 2023 +0100 server: Ignore the capture window wrt desktop cursor changes. This partially reverts commit c3dcf1e2697b2cdf88dffdeb57feb0d5c7ff06cb. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56046 --- server/queue.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index 67249d06599..d3ca1172d91 100644 --- a/server/queue.c +++ b/server/queue.c @@ -454,8 +454,6 @@ static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win, int x, int y ) { - struct thread_input *input; - user_handle_t capture; int updated; x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); @@ -465,7 +463,6 @@ static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win desktop->cursor.y = y; desktop->cursor.last_change = get_tick_count(); - if ((input = desktop->foreground_input) && (capture = input->capture)) win = capture; if (!win || !is_window_visible( win ) || is_window_transparent( win )) win = shallow_window_from_point( desktop, x, y ); if (update_desktop_cursor_window( desktop, win )) updated = 1;

1 0

Eric Pouech : dbghelp/tests: Extend tests for module loading.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: f5e86cbea647c3a80fffd00bfc56fb0f24669b24 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5e86cbea647c3a80fffd00bfc56fb… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Dec 16 13:04:32 2023 +0100 dbghelp/tests: Extend tests for module loading. Basically, showing specific behavior when calling SymLoadModule() with a non-null base address, and that address is already the exact base address of a loaded module. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/dbghelp.c | 135 +++++++++++++++++++++++++++++++++---------- 1 file changed, 104 insertions(+), 31 deletions(-)

1 0

Eric Pouech : dbghelp: Fix some tests for SymLoadModule*().
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: 7b0d974439ed69f2323cd64685bc96d370ec6531 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b0d974439ed69f2323cd64685bc96… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Dec 16 15:25:51 2023 +0100 dbghelp: Fix some tests for SymLoadModule*(). On top of being closer to native behavior, this helps some games where: - they use dbghelp to gather information of where they generate exceptions, - they generate exception in the game play, - and refresh their list of loaded modules in dbghelp. This can generate some delays (~2ms per module), which affects game play (freeze, slugginess...). Credit to Paul Gofman for triaging this. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/module.c | 18 ++++++++++++++++-- dlls/dbghelp/tests/dbghelp.c | 1 - 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index b12007d270e..f21733c7be9 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -943,6 +943,19 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08lx for %s\n", Flags, debugstr_w(wImageName)); + /* Trying to load a new module at the same address of an existing one, + * native simply keeps the old one in place. + */ + if (BaseOfDll) + for (altmodule = pcs->lmodules; altmodule; altmodule = altmodule->next) + { + if (altmodule->type == DMT_PE && BaseOfDll == altmodule->module.BaseOfImage) + { + SetLastError(ERROR_SUCCESS); + return 0; + } + } + pcs->loader->synchronize_module_list(pcs); /* this is a Wine extension to the API just to redo the synchronisation */ @@ -974,6 +987,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (!module) { WARN("Couldn't locate %s\n", debugstr_w(wImageName)); + SetLastError(ERROR_NO_MORE_FILES); return 0; } /* by default module_new fills module.ModuleName from a derivation @@ -997,11 +1011,11 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam * (it's hidden by altmodule). * We need to decide which one the two modules we need to get rid of. */ - /* loading same module at same address... don't change anything */ + /* loading same module at same address... we can only get here when BaseOfDll is 0 */ if (module->module.BaseOfImage == altmodule->module.BaseOfImage) { module_remove(pcs, module); - SetLastError(ERROR_SUCCESS); + SetLastError(ERROR_INVALID_ADDRESS); return 0; } /* replace old module with new one */ diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 0259aaac81a..13cd173e761 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -605,7 +605,6 @@ static void test_modules_overlap(void) if (tests[i].error_code != ~0) { ok(base[1] == 0, "SymLoadModuleEx should have failed\n"); - todo_wine_if((i >= 8 && i < 12) || (i >= 20 && i < 32)) ok(GetLastError() == tests[i].error_code || /* Win8 returns this */ (tests[i].error_code == ERROR_NO_MORE_FILES && broken(GetLastError() == ERROR_INVALID_HANDLE)),

1 0

Paul Gofman : ntdll: Use position independent syscall thunk for NtQueryInformationProcess on i386.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: cbcfaab5191838f8738989fcad7fcb2c490fbe98 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbcfaab5191838f8738989fcad7fcb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Dec 15 16:20:54 2023 -0600 ntdll: Use position independent syscall thunk for NtQueryInformationProcess on i386. Fixes a regression introduced by commit efd03f40e6e315d89cd1d09c48180aae82033f9f. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55967 --- dlls/ntdll/signal_i386.c | 24 ++++++++++++++++++++++++ dlls/ntdll/tests/virtual.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4fff401c88d..37360929ba6 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -73,6 +73,30 @@ extern DWORD EXC_CallHandler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_R PEXCEPTION_HANDLER handler, PEXCEPTION_HANDLER nested_handler ); +#ifdef __WINE_PE_BUILD + +enum syscall_ids +{ +#define SYSCALL_ENTRY(id,name,args) __id_##name = id, +ALL_SYSCALLS32 +#undef SYSCALL_ENTRY +}; + +/******************************************************************* + * NtQueryInformationProcess + */ +void NtQueryInformationProcess_wrapper(void) +{ + asm( ".globl " __ASM_STDCALL("NtQueryInformationProcess", 20) "\n" + __ASM_STDCALL("NtQueryInformationProcess", 20) ":\n\t" + "movl %0,%%eax\n\t" + "call *%%fs:0xc0\n\t" + "ret $20" :: "i" (__id_NtQueryInformationProcess) ); +} +#define NtQueryInformationProcess syscall_NtQueryInformationProcess + +#endif /* __WINE_PE_BUILD */ + /******************************************************************* * syscalls */ diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index a9dec1b5a8a..011d3f1692f 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -2119,13 +2119,13 @@ static void test_syscalls(void) ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); ok( ptr != NULL, "MapViewOfFile failed err %lu\n", GetLastError() ); CloseHandle( mapping ); - CloseHandle( file ); delta = (char *)ptr - (char *)module; if (memcmp( ptr, module, 0x1000 )) { skip( "modules are not identical (non-PE build?)\n" ); UnmapViewOfFile( ptr ); + CloseHandle( file ); return; } perform_relocations( ptr, delta ); @@ -2152,12 +2152,40 @@ static void test_syscalls(void) } else { -#ifdef __x86_64__ +#ifdef __i386__ + NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, void *, ULONG, ULONG *); + PROCESS_BASIC_INFORMATION pbi; + void *exec_mem, *va_ptr; + ULONG size; + BOOL ret; + + exec_mem = VirtualAlloc( NULL, 4096, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + ok( !!exec_mem, "got NULL.\n" ); + + /* NtQueryInformationProcess is special. */ + pNtQueryInformationProcess = (void *)GetProcAddress( module, "NtQueryInformationProcess" ); + va_ptr = RtlImageRvaToVa( RtlImageNtHeader(module), module, + (char *)pNtQueryInformationProcess - (char *)module, NULL ); + ok( !!va_ptr, "offset not found %p / %p\n", pNtQueryInformationProcess, module ); + ret = SetFilePointer( file, (char *)va_ptr - (char *)module, NULL, FILE_BEGIN ); + ok( ret, "got %d, err %lu.\n", ret, GetLastError() ); + ret = ReadFile( file, exec_mem, 32, NULL, NULL ); + ok( ret, "got %d, err %lu.\n", ret, GetLastError() ); + pNtQueryInformationProcess = exec_mem; + /* The thunk still works without relocation. */ + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &size ); + ok( !status, "got %#lx.\n", status ); + ok( size == sizeof(pbi), "got %lu.\n", size ); + ok( pbi.PebBaseAddress == NtCurrentTeb()->Peb, "got %p, %p.\n", pbi.PebBaseAddress, NtCurrentTeb()->Peb ); + + VirtualFree( exec_mem, 0, MEM_RELEASE ); +#elif defined __x86_64__ ok( 0, "syscall thunk relocated\n" ); #else skip( "syscall thunk relocated\n" ); #endif } + CloseHandle( file ); UnmapViewOfFile( ptr ); }

1 0

Alexandre Julliard : Revert "oleaut32: Check that the 32/64 syskind matches when getting a typelib from the cache.".
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: 4ffc313d9da37c4bc6e577e680f673ff72b18c7d URL: https://gitlab.winehq.org/wine/wine/-/commit/4ffc313d9da37c4bc6e577e680f673… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 14:30:51 2023 +0100 Revert "oleaut32: Check that the 32/64 syskind matches when getting a typelib from the cache.". This reverts commit 43e5f9e4bfa65ccea633df244a7ec0c790ed8ffb. The proper fix is more complicated. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55962 --- dlls/oleaut32/tests/typelib.c | 34 ++++++++++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 3 +-- 2 files changed, 33 insertions(+), 4 deletions(-)

1 0

Alexandre Julliard : oleaut32: Fix loading a 64-bit typelib in 32-bit mode.
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: 613270d49fd3c25a17bbce37277a8b9a5713b692 URL: https://gitlab.winehq.org/wine/wine/-/commit/613270d49fd3c25a17bbce37277a8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 14:51:01 2023 +0100 oleaut32: Fix loading a 64-bit typelib in 32-bit mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55962 --- dlls/oleaut32/typelib.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9fe4cb65f99..f412074bd21 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -73,6 +73,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(typelib); +static const BOOL is_win64 = sizeof(void *) > sizeof(int); + typedef struct { WORD offset; @@ -392,13 +394,11 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, HRESULT WINAPI QueryPathOfRegTypeLib( REFGUID guid, WORD wMaj, WORD wMin, LCID lcid, LPBSTR path ) { BOOL redir = TRUE; -#ifdef _WIN64 - HRESULT hres = query_typelib_path( guid, wMaj, wMin, SYS_WIN64, lcid, path, TRUE ); + HRESULT hres = query_typelib_path( guid, wMaj, wMin, is_win64 ? SYS_WIN64 : SYS_WIN32, lcid, path, TRUE ); if(SUCCEEDED(hres)) return hres; redir = FALSE; -#endif - return query_typelib_path( guid, wMaj, wMin, SYS_WIN32, lcid, path, redir ); + return query_typelib_path( guid, wMaj, wMin, is_win64 ? SYS_WIN32 : SYS_WIN64, lcid, path, redir ); } /****************************************************************************** @@ -1978,10 +1978,8 @@ static HRESULT TLB_size_instance(ITypeInfoImpl *info, SYSKIND sys, break; case VT_VARIANT: *size = sizeof(VARIANT); -#ifdef _WIN64 - if(sys == SYS_WIN32) - *size -= 8; /* 32-bit VARIANT is 8 bytes smaller than 64-bit VARIANT */ -#endif + if(get_ptr_size(sys) != sizeof(void*)) + *size += is_win64 ? -8 : 8; /* 32-bit VARIANT is 8 bytes smaller than 64-bit VARIANT */ break; case VT_DECIMAL: *size = sizeof(DECIMAL); @@ -2433,7 +2431,7 @@ MSFT_DoFuncs(TLBContext* pcx, if (ptfd->funcdesc.funckind == FUNC_DISPATCH) ptfd->funcdesc.oVft = 0; else - ptfd->funcdesc.oVft = (pFuncRec->VtableOffset & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; + ptfd->funcdesc.oVft = (unsigned short)(pFuncRec->VtableOffset & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; ptfd->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; /* nameoffset is sometimes -1 on the second half of a propget/propput @@ -2611,10 +2609,9 @@ static void MSFT_DoImplTypes(TLBContext *pcx, ITypeInfoImpl *pTI, int count, } } -#ifdef _WIN64 -/* when a 32-bit typelib is loaded in 64-bit mode, we need to resize pointers +/* when a typelib is loaded in a different 32/64-bit mode, we need to resize pointers * and some structures, and fix the alignment */ -static void TLB_fix_32on64_typeinfo(ITypeInfoImpl *info) +static void TLB_fix_typeinfo_ptr_size(ITypeInfoImpl *info) { if(info->typeattr.typekind == TKIND_ALIAS){ switch(info->tdescAlias->vt){ @@ -2630,11 +2627,12 @@ static void TLB_fix_32on64_typeinfo(ITypeInfoImpl *info) break; case VT_CARRAY: case VT_USERDEFINED: - TLB_size_instance(info, SYS_WIN64, info->tdescAlias, &info->typeattr.cbSizeInstance, &info->typeattr.cbAlignment); + TLB_size_instance(info, is_win64 ? SYS_WIN64 : SYS_WIN32, info->tdescAlias, + &info->typeattr.cbSizeInstance, &info->typeattr.cbAlignment); break; case VT_VARIANT: info->typeattr.cbSizeInstance = sizeof(VARIANT); - info->typeattr.cbAlignment = 8; + info->typeattr.cbAlignment = sizeof(void *); default: if(info->typeattr.cbSizeInstance < sizeof(void*)) info->typeattr.cbAlignment = info->typeattr.cbSizeInstance; @@ -2649,7 +2647,6 @@ static void TLB_fix_32on64_typeinfo(ITypeInfoImpl *info) info->typeattr.cbAlignment = sizeof(void*); } } -#endif /* * process a typeinfo record @@ -3636,12 +3633,11 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) } } -#ifdef _WIN64 - if(pTypeLibImpl->syskind == SYS_WIN32){ + if (pTypeLibImpl->ptr_size != sizeof(void *)) + { for(i = 0; i < pTypeLibImpl->TypeInfoCount; ++i) - TLB_fix_32on64_typeinfo(pTypeLibImpl->typeinfos[i]); + TLB_fix_typeinfo_ptr_size(pTypeLibImpl->typeinfos[i]); } -#endif TRACE("(%p)\n", pTypeLibImpl); return &pTypeLibImpl->ITypeLib2_iface; @@ -4151,7 +4147,7 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, if (pFuncDesc->funcdesc.funckind == FUNC_DISPATCH) pFuncDesc->funcdesc.oVft = 0; else - pFuncDesc->funcdesc.oVft = (pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; + pFuncDesc->funcdesc.oVft = (unsigned short)(pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; if(pFunc->magic & SLTG_FUNCTION_FLAGS_PRESENT) pFuncDesc->funcdesc.wFuncFlags = pFunc->funcflags; @@ -10688,11 +10684,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(ICreateTypeInfo2 *iface, !funcDesc->cParams) return TYPE_E_INCONSISTENTPROPFUNCS; -#ifdef _WIN64 if(This->pTypeLib->syskind == SYS_WIN64 && funcDesc->oVft % 8 != 0) return E_INVALIDARG; -#endif memset(&tmp_func_desc, 0, sizeof(tmp_func_desc)); TLBFuncDesc_Constructor(&tmp_func_desc);

1 0

Alexandre Julliard : oleaut32/tests: Run the 64-bit typelib tests also on 32-bit platforms.
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: 206a7495abc14fd47dfd44c558002502799e97e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/206a7495abc14fd47dfd44c5580025… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 14:41:48 2023 +0100 oleaut32/tests: Run the 64-bit typelib tests also on 32-bit platforms. --- dlls/oleaut32/tests/typelib.c | 49 ++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 80e723b2349..d755729d9e9 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -94,6 +94,7 @@ static WCHAR wszGUID[] = {'G','U','I','D',0}; static WCHAR wszguid[] = {'g','u','i','d',0}; static const BOOL is_win64 = sizeof(void *) > sizeof(int); +static BOOL is_wow64; #ifdef __i386__ static const BOOL abi_supports_stdcall = TRUE; @@ -1613,17 +1614,25 @@ static void test_QueryPathOfRegTypeLib(DWORD arch) if (!do_typelib_reg_key(&uid, 3, 1, arch, base, FALSE)) return; if (!do_typelib_reg_key(&uid, 3, 37, arch, base, FALSE)) return; if (!do_typelib_reg_key(&uid, 5, 37, arch, base, FALSE)) return; - if (arch == 64 && !do_typelib_reg_key(&uid, 5, 37, 32, wrongW, FALSE)) return; + if (!do_typelib_reg_key(&uid, 5, 37, (arch == 32) ? 64 : 32, wrongW, FALSE)) return; for (i = 0; i < ARRAY_SIZE(td); i++) { + winetest_push_context( "win%lu: %u", arch, i ); ret = QueryPathOfRegTypeLib(&uid, td[i].maj, td[i].min, LOCALE_NEUTRAL, &path); - ok(ret == td[i].ret, "QueryPathOfRegTypeLib(%u.%u) returned %08lx\n", td[i].maj, td[i].min, ret); + ok(ret == td[i].ret || (ret == TYPE_E_LIBNOTREGISTERED && arch == 64 && !is_win64 && !is_wow64), + "QueryPathOfRegTypeLib(%u.%u) returned %08lx\n", td[i].maj, td[i].min, ret); if (ret == S_OK) { - ok(!lstrcmpW(td[i].path, path), "typelib %u.%u path doesn't match\n", td[i].maj, td[i].min); + if (i == 6 && arch == (is_win64 ? 32 : 64)) + ok( !lstrcmpW( path, L"wrong_5_37.dll" ), "typelib %u.%u path doesn't match: %s\n", + td[i].maj, td[i].min, debugstr_w(path)); + else + ok(!lstrcmpW(td[i].path, path), "typelib %u.%u path doesn't match: %s\n", + td[i].maj, td[i].min, debugstr_w(path)); SysFreeString(path); } + winetest_pop_context(); } do_typelib_reg_key(&uid, 0, 0, arch, NULL, TRUE); @@ -3716,7 +3725,8 @@ todo_wine { ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); ok(typeattr->cbSizeVft == 0xaab8 || typeattr->cbSizeVft == 0xaab0 || - typeattr->cbSizeVft == 0x5560, "cbSizeVft = 0x%x\n", typeattr->cbSizeVft); + typeattr->cbSizeVft == 0x555c || typeattr->cbSizeVft == 0x5560, + "cbSizeVft = 0x%x\n", typeattr->cbSizeVft); ok(typeattr->cbAlignment == alignment, "cbAlignment = %d\n", typeattr->cbAlignment); ok(typeattr->wTypeFlags == 0, "wTypeFlags = %d\n", typeattr->wTypeFlags); ok(typeattr->wMajorVerNum == 0, "wMajorVerNum = %d\n", typeattr->wMajorVerNum); @@ -7926,10 +7936,8 @@ static void testTDA(ITypeLib *tl, struct _TDATest *TDATest, }else if(TDATest->vt == VT_VARIANT){ if(create){ size = sizeof(VARIANT); -#ifdef _WIN64 if(ptr_size != sizeof(void*)) - size -= 8; /* 32-bit variant is 4 bytes smaller than 64-bit variant */ -#endif + size += (is_win64 ? -8 : 8); /* 32-bit variant is 8 bytes smaller than 64-bit variant */ }else size = sizeof(VARIANT); } @@ -8276,7 +8284,8 @@ static void test_stub(void) CoUninitialize(); } -static void test_dep(void) { +static void test_dep( SYSKIND sys ) +{ HRESULT hr; const WCHAR *refFilename; ITypeLib *preftLib; @@ -8295,7 +8304,7 @@ static void test_dep(void) { static const GUID libguid = {0xe0228f26,0x2946,0x478c,{0xb6,0x4a,0x93,0xfe,0xef,0xa5,0x05,0x32}}; static const GUID ifaceguid = {0x394376dd,0x3bb8,0x4804,{0x8c,0xcc,0x95,0x59,0x43,0x40,0x04,0xf3}}; - trace("Starting typelib dependency tests\n"); + winetest_push_context( "%s", sys == SYS_WIN32 ? "win32" : "win64" ); refFilename = create_test_typelib(4); hr = LoadTypeLibEx(refFilename, REGKIND_NONE, &preftLib); @@ -8307,13 +8316,8 @@ static void test_dep(void) { GetTempFileNameA(".", "tlb", 0, filename); MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, MAX_PATH); - if(sizeof(void*) == 8) { - hr = CreateTypeLib2(SYS_WIN64, filenameW, &pctLib); - ok(hr == S_OK, "got %08lx\n", hr); - } else { - hr = CreateTypeLib2(SYS_WIN32, filenameW, &pctLib); - ok(hr == S_OK, "got %08lx\n", hr); - } + hr = CreateTypeLib2(sys, filenameW, &pctLib); + ok(hr == S_OK, "got %08lx\n", hr); hr = ICreateTypeLib2_SetGuid(pctLib, &libguid); ok(hr == S_OK, "got %08lx\n", hr); @@ -8391,6 +8395,7 @@ static void test_dep(void) { ITypeLib_Release(ptLib); DeleteFileW(filenameW); + winetest_pop_context(); } static void test_DeleteImplType(void) @@ -8572,6 +8577,7 @@ START_TEST(typelib) const WCHAR *filename; init_function_pointers(); + if (!is_win64) IsWow64Process( GetCurrentProcess(), &is_wow64 ); ref_count_test(wszStdOle2); test_TypeComp(); @@ -8579,13 +8585,13 @@ START_TEST(typelib) test_TypeInfo(); test_DispCallFunc(); test_QueryPathOfRegTypeLib(32); - if(sizeof(void*) == 8){ - test_QueryPathOfRegTypeLib(64); - test_CreateTypeLib(SYS_WIN64); - test_SetTypeDescAlias(SYS_WIN64); - } + test_QueryPathOfRegTypeLib(64); + test_CreateTypeLib(SYS_WIN64); + test_SetTypeDescAlias(SYS_WIN64); + test_dep(SYS_WIN64); test_CreateTypeLib(SYS_WIN32); test_SetTypeDescAlias(SYS_WIN32); + test_dep(SYS_WIN32); test_inheritance(); test_SetVarHelpContext(); test_SetFuncAndParamNames(); @@ -8607,7 +8613,6 @@ START_TEST(typelib) test_LoadRegTypeLib(); test_GetLibAttr(); test_stub(); - test_dep(); test_DeleteImplType(); test_DeleteFuncDesc(); }

1 0

Hans Leidekker : kernel32/tests: Fix ProcessMachineTypeInfo tests.
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: 77b366251767a6bfa1f744257aa371bd6ed49254 URL: https://gitlab.winehq.org/wine/wine/-/commit/77b366251767a6bfa1f744257aa371… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 15 12:46:31 2023 +0100 kernel32/tests: Fix ProcessMachineTypeInfo tests. --- dlls/kernel32/tests/process.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 5f5327245fc..e0f1d210e58 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -5296,15 +5296,24 @@ static void test_GetProcessInformation(void) return; } + SetLastError(0xdeadbeef); ret = pGetProcessInformation(GetCurrentProcess(), ProcessMachineTypeInfo, NULL, 0); + if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) + { + win_skip("GetProcessInformation(ProcessMachineTypeInfo) is not supported.\n"); /* < win11 */ + return; + } ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_BAD_LENGTH, "Unexpected error %ld.\n", GetLastError()); + SetLastError(0xdeadbeef); ret = pGetProcessInformation(GetCurrentProcess(), ProcessMachineTypeInfo, &mi, 0); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_BAD_LENGTH, "Unexpected error %ld.\n", GetLastError()); + SetLastError(0xdeadbeef); ret = pGetProcessInformation(GetCurrentProcess(), ProcessMachineTypeInfo, &mi, sizeof(mi) - 1); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_BAD_LENGTH, "Unexpected error %ld.\n", GetLastError()); + SetLastError(0xdeadbeef); ret = pGetProcessInformation(GetCurrentProcess(), ProcessMachineTypeInfo, &mi, sizeof(mi) + 1); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_BAD_LENGTH, "Unexpected error %ld.\n", GetLastError()); @@ -5321,7 +5330,6 @@ static void test_GetProcessInformation(void) if (machines[i].Process) { ok(mi.ProcessMachine == machines[i].Machine, "Unexpected process machine %#x.\n", mi.ProcessMachine); - ok(!mi.Res0, "Unexpected process machine %#x.\n", mi.ProcessMachine); ok(!!(mi.MachineAttributes & UserEnabled) == machines[i].UserMode, "Unexpected attributes %#x.\n", mi.MachineAttributes); ok(!!(mi.MachineAttributes & KernelEnabled) == machines[i].KernelMode, "Unexpected attributes %#x.\n",

1 0

Rémi Bernon : server: Update the desktop cursor position / window on click.
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: 82642e34e1835e1eb600c766a2f0f321310a4aa9 URL: https://gitlab.winehq.org/wine/wine/-/commit/82642e34e1835e1eb600c766a2f0f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 25 16:33:57 2023 +0200 server: Update the desktop cursor position / window on click. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306 --- server/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/queue.c b/server/queue.c index 9007438e082..df5d96486fb 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1679,9 +1679,9 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg break; case QS_MOUSEMOVE: prepend_cursor_history( msg->x, msg->y, msg->time, msg_data->info ); - if (update_desktop_cursor_pos( desktop, msg->win, msg->x, msg->y )) always_queue = 1; /* fallthrough */ case QS_MOUSEBUTTON: + if (update_desktop_cursor_pos( desktop, msg->win, msg->x, msg->y )) always_queue = 1; if (desktop->keystate[VK_LBUTTON] & 0x80) msg->wparam |= MK_LBUTTON; if (desktop->keystate[VK_MBUTTON] & 0x80) msg->wparam |= MK_MBUTTON; if (desktop->keystate[VK_RBUTTON] & 0x80) msg->wparam |= MK_RBUTTON;

1 0

Rémi Bernon : server: Use the capture window as cursor window if it is set.
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: c3dcf1e2697b2cdf88dffdeb57feb0d5c7ff06cb URL: https://gitlab.winehq.org/wine/wine/-/commit/c3dcf1e2697b2cdf88dffdeb57feb0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 25 15:36:47 2023 +0200 server: Use the capture window as cursor window if it is set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306 --- server/queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/queue.c b/server/queue.c index df5d96486fb..15a63f880f1 100644 --- a/server/queue.c +++ b/server/queue.c @@ -455,6 +455,7 @@ static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win, int x, int y ) { struct thread_input *input; + user_handle_t capture; int updated; x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); @@ -464,7 +465,7 @@ static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win desktop->cursor.y = y; desktop->cursor.last_change = get_tick_count(); - if (!win && (input = desktop->foreground_input)) win = input->capture; + if ((input = desktop->foreground_input) && (capture = input->capture)) win = capture; if (!win || !is_window_visible( win ) || is_window_transparent( win )) win = shallow_window_from_point( desktop, x, y ); if (update_desktop_cursor_window( desktop, win )) updated = 1;

1 0