October 2023 - Wine-Commits

Nikolay Sivov : d3d10/effect: Add support for 'or' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: fcfe2972111dc06af3c01b109111693ace9e084a URL: https://gitlab.winehq.org/wine/wine/-/commit/fcfe2972111dc06af3c01b10911169… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 21:47:57 2023 +0200 d3d10/effect: Add support for 'or' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 15 ++++ dlls/d3d10/tests/effect.c | 197 +++++++++++++++++++++++++++++----------------- 2 files changed, 139 insertions(+), 73 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'rsq' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 03e17a357235f7c8be52e65032e11b271f1be64e URL: https://gitlab.winehq.org/wine/wine/-/commit/03e17a357235f7c8be52e65032e11b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 15:34:14 2023 +0200 d3d10/effect: Add support for 'rsq' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 +++ dlls/d3d10/tests/effect.c | 169 ++++++++++++++++++++++++++++------------------ 2 files changed, 113 insertions(+), 66 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'sqrt' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: f72bb1f687eb4ce23c6f9e478503addeb34ae024 URL: https://gitlab.winehq.org/wine/wine/-/commit/f72bb1f687eb4ce23c6f9e478503ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 00:39:07 2023 +0200 d3d10/effect: Add support for 'sqrt' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 +++ dlls/d3d10/tests/effect.c | 161 ++++++++++++++++++++++++++++------------------ 2 files changed, 107 insertions(+), 64 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'imul' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 03c70387137765cefbb49bad423369d58fa25a39 URL: https://gitlab.winehq.org/wine/wine/-/commit/03c70387137765cefbb49bad423369… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 30 23:57:28 2023 +0200 d3d10/effect: Add support for 'imul' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 15 ++++ dlls/d3d10/tests/effect.c | 169 +++++++++++++++++++++++++++++----------------- 2 files changed, 121 insertions(+), 63 deletions(-)

1 0

Nikolay Sivov : d3d10/tests: Use vector helpers in more places.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: edbf2405fcbf40c9229bc8946d23eedb90a04af4 URL: https://gitlab.winehq.org/wine/wine/-/commit/edbf2405fcbf40c9229bc8946d23ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 00:27:49 2023 +0200 d3d10/tests: Use vector helpers in more places. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 114 ++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 69 deletions(-)

1 0

Nikolay Sivov : propsys: Handle VT_I4 type in VariantToString().
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 001e0543bfd5aea060053af0c76233bb90fbb43b URL: https://gitlab.winehq.org/wine/wine/-/commit/001e0543bfd5aea060053af0c76233… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 4 14:22:34 2023 +0200 propsys: Handle VT_I4 type in VariantToString(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55708 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/propsys/propvar.c | 20 +++++++++++--------- dlls/propsys/tests/propsys.c | 7 +++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index bf77e7d51e5..c6510f9f35d 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -436,7 +436,7 @@ PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, const WCHAR *defau */ HRESULT WINAPI VariantToString(REFVARIANT var, PWSTR ret, UINT cch) { - WCHAR *str = NULL; + WCHAR buffer[64], *str = buffer; TRACE("%p, %p, %u.\n", var, ret, cch); @@ -445,15 +445,17 @@ HRESULT WINAPI VariantToString(REFVARIANT var, PWSTR ret, UINT cch) if (!cch) return E_INVALIDARG; - if (V_VT(var) == VT_BSTR) + switch (V_VT(var)) { - str = V_BSTR(var); - } - else - { - FIXME("Unsupported type %d.\n", V_VT(var)); - - return E_NOTIMPL; + case VT_BSTR: + str = V_BSTR(var); + break; + case VT_I4: + swprintf(buffer, ARRAY_SIZE(buffer), L"%d", V_I4(var)); + break; + default: + FIXME("Unsupported type %d.\n", V_VT(var)); + return E_NOTIMPL; } if (wcslen(str) > cch - 1) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index dab0537991b..a2fbb619ef2 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -2290,6 +2290,13 @@ static void test_VariantToString(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!buff[0], "Unexpected buffer.\n"); + buff[0] = 0; + V_VT(&v) = VT_I4; + V_I4(&v) = 567; + hr = VariantToString(&v, buff, 64); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!wcscmp(buff, L"567"), "Unexpected buffer %s.\n", wine_dbgstr_w(buff)); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"test1");

1 0

Martin Storsjö : configure: Fix restoring CFLAGS after the test for -Wl,-z,defs.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 2c7524021ec862eba304c788274d6b49b7c1aca9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c7524021ec862eba304c788274d6b… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Oct 4 15:03:21 2023 +0300 configure: Fix restoring CFLAGS after the test for -Wl,-z,defs. This fixes a regression from 450c358881dbc6dcfb2692b8f4debb7db8fdc54b; after testing for -Wl,-z,defs, CFLAGS was restored from an incorrect variable, leaving CFLAGS essentially empty. This would break builds for e.g. arm with Clang, where -mthumb would be essential for being able to build some inline assembly snippets correctly. This also had the effect of dropping the default "-g -O2" arguments from CFLAGS. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index cbcc88d6626..a8139a60b10 100755 --- a/configure +++ b/configure @@ -10123,7 +10123,7 @@ else $as_nop fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS=$ac_save_cflags + CFLAGS=$ac_save_CFLAGS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wl_z_defs" >&5 printf "%s\n" "$ac_cv_wl_z_defs" >&6; } diff --git a/configure.ac b/configure.ac index d288c544dfd..4803b7abea4 100644 --- a/configure.ac +++ b/configure.ac @@ -771,7 +771,7 @@ case $host_os in dnl On FreeBSD, shared libraries using environ fail to link with -Wl,-z,defs AC_LINK_IFELSE([AC_LANG_SOURCE([[extern char **environ; char **envp; void myfunc(void) { envp = environ; }]])], [ac_cv_wl_z_defs=yes],[ac_cv_wl_z_defs=no]) - CFLAGS=$ac_save_cflags]) + CFLAGS=$ac_save_CFLAGS]) test $ac_cv_wl_z_defs != yes || AS_VAR_APPEND([UNIXLDFLAGS],[" -Wl,-z,defs"]) WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])

1 0

Alexandre Julliard : ntdll: Fix relocation of the 32-bit ntdll.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: e9b65e99b2ba47b48e298d136b97ced5524d528f URL: https://gitlab.winehq.org/wine/wine/-/commit/e9b65e99b2ba47b48e298d136b97ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 21:06:29 2023 +0200 ntdll: Fix relocation of the 32-bit ntdll. --- dlls/ntdll/unix/loader.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 7bf3ca22566..1f8d560ddfb 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1113,17 +1113,35 @@ static const IMAGE_BASE_RELOCATION *process_relocation_block( void *module, cons return (IMAGE_BASE_RELOCATION *)relocs; /* return address of next block */ } -static void relocate_ntdll( void *module ) + +/*********************************************************************** + * relocate_module + */ +static NTSTATUS relocate_module( void *module ) { const IMAGE_NT_HEADERS *nt = get_rva( module, ((IMAGE_DOS_HEADER *)module)->e_lfanew ); const IMAGE_BASE_RELOCATION *rel, *end; const IMAGE_SECTION_HEADER *sec; ULONG protect_old[96], i, size; + ULONG_PTR image_base; INT_PTR delta; - ERR( "ntdll could not be mapped at preferred address (%p), expect trouble\n", module ); + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + image_base = ((const IMAGE_NT_HEADERS64 *)nt)->OptionalHeader.ImageBase; + else + image_base = ((const IMAGE_NT_HEADERS32 *)nt)->OptionalHeader.ImageBase; - if (!(rel = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) return; + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + { + ERR( "Need to relocate module from %p to %p, but relocation records are stripped\n", + (void *)image_base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + TRACE( "%p -> %p\n", (void *)image_base, module ); + + if (!(rel = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) + return STATUS_SUCCESS; sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) @@ -1134,7 +1152,7 @@ static void relocate_ntdll( void *module ) } end = (IMAGE_BASE_RELOCATION *)((const char *)rel + size); - delta = (char *)module - (char *)nt->OptionalHeader.ImageBase; + delta = (ULONG_PTR)module - image_base; while (rel && rel < end - 1 && rel->SizeOfBlock) rel = process_relocation_block( module, rel, delta ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) @@ -1143,6 +1161,7 @@ static void relocate_ntdll( void *module ) SIZE_T size = sec[i].SizeOfRawData; NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, protect_old[i], &protect_old[i] ); } + return STATUS_SUCCESS; } @@ -1938,8 +1957,8 @@ static void load_ntdll(void) sprintf( name, "%s/ntdll.dll.so", ntdll_dir ); status = open_builtin_so_file( name, &attr, &module, &info, FALSE ); } - if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); - else if (status) fatal_error( "failed to load %s error %x\n", name, status ); + if (status == STATUS_IMAGE_NOT_AT_BASE) status = relocate_module( module ); + if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); load_ntdll_functions( module ); } @@ -2033,19 +2052,10 @@ static void load_wow64_ntdll( USHORT machine ) wcscat( path, ntdllW ); init_unicode_string( &nt_name, path ); status = find_builtin_dll( &nt_name, &module, &size, &info, 0, 0, machine, 0, FALSE ); - switch (status) - { - case STATUS_IMAGE_NOT_AT_BASE: - relocate_ntdll( module ); - /* fall through */ - case STATUS_SUCCESS: - load_ntdll_wow64_functions( module ); - TRACE("loaded %s at %p\n", debugstr_w(path), module ); - break; - default: - ERR( "failed to load %s error %x\n", debugstr_w(path), status ); - break; - } + if (status == STATUS_IMAGE_NOT_AT_BASE) status = relocate_module( module ); + if (status) fatal_error( "failed to load %s error %x\n", debugstr_w(path), status ); + load_ntdll_wow64_functions( module ); + TRACE("loaded %s at %p\n", debugstr_w(path), module ); free( path ); }

1 0

Alexandre Julliard : ntdll: Support relocating the main exe.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 526b9fc89bc3aea2e972a5541a0f09766cd773c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/526b9fc89bc3aea2e972a5541a0f09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 15:19:12 2023 +0200 ntdll: Support relocating the main exe. --- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/loader.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5b2f9bdce0d..cfb1e833cc6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2041,7 +2041,8 @@ static NTSTATUS perform_relocations( void *module, IMAGE_NT_HEADERS *nt, SIZE_T if (nt->OptionalHeader.SectionAlignment < page_size) return STATUS_SUCCESS; - if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && NtCurrentTeb()->Peb->ImageBaseAddress) + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && + module != NtCurrentTeb()->Peb->ImageBaseAddress) return STATUS_SUCCESS; relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index feae7d4b954..80f151c4cb9 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2116,7 +2116,7 @@ void init_startup_info(void) status = load_main_exe( params->ImagePathName.Buffer, NULL, params->CommandLine.Buffer, machine, &image, &module ); - if (status) + if (!NT_SUCCESS(status)) { MESSAGE( "wine: failed to start %s\n", debugstr_us(&params->ImagePathName) ); NtTerminateProcess( GetCurrentProcess(), status ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5eab3d519c8..0b83d11d373 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1743,7 +1743,7 @@ NTSTATUS load_start_exe( WCHAR **image, void **module ) wcscat( *image, startW ); init_unicode_string( &nt_name, *image ); status = find_builtin_dll( &nt_name, module, &size, &main_image_info, 0, 0, current_machine, 0, FALSE ); - if (status) + if (!NT_SUCCESS(status)) { MESSAGE( "wine: failed to load start.exe: %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status );

1 0

Alistair Leslie-Hughes : wpcap: Return NULL on error in get_broadcast.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 16217163d9ef575c7dab9498cba63a2351fdc09e URL: https://gitlab.winehq.org/wine/wine/-/commit/16217163d9ef575c7dab9498cba63a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 4 16:55:21 2023 +1100 wpcap: Return NULL on error in get_broadcast. --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 6ad4fc5f04f..de4bac33871 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -519,7 +519,7 @@ static struct sockaddr *get_broadcast( const IP_ADAPTER_UNICAST_ADDRESS *addr ) struct sockaddr_in *broadcast_addr_in, *addr_in = (struct sockaddr_in *)addr->Address.lpSockaddr; ULONG netmask; - if (!(broadcast_addr_in = calloc( 1, sizeof(*broadcast_addr_in) ))) return FALSE; + if (!(broadcast_addr_in = calloc( 1, sizeof(*broadcast_addr_in) ))) return NULL; broadcast_addr_in->sin_family = AF_INET; ConvertLengthToIpv4Mask( addr->OnLinkPrefixLength, &netmask ); broadcast_addr_in->sin_addr.S_un.S_addr = addr_in->sin_addr.S_un.S_addr | ~netmask;

1 0