November 2023 - Wine-Commits

Piotr Caban : msvcrt: Factor out env_get_index helper.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: ca7a1139a8f690d4a6c130b2233092aa977939f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca7a1139a8f690d4a6c130b2233092… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt: Factor out env_get_index helper. --- dlls/msvcrt/environ.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 2c2a3353582..f0c3705a030 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -25,25 +25,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -static char * getenv_helper(const char *name) +static int env_get_index(const char *name) { - char **env; - size_t len; + int i, len; - if (!name) return NULL; len = strlen(name); - - for (env = MSVCRT__environ; *env; env++) + for (i = 0; MSVCRT__environ[i]; i++) { - char *str = *env; - char *pos = strchr(str,'='); - if (pos && ((pos - str) == len) && !_strnicmp(str, name, len)) - { - TRACE("(%s): got %s\n", debugstr_a(name), debugstr_a(pos + 1)); - return pos + 1; - } + if (!strncmp(name, MSVCRT__environ[i], len) && MSVCRT__environ[i][len] == '=') + return i; } - return NULL; + return i; +} + +static char * getenv_helper(const char *name) +{ + int idx; + + if (!name) return NULL; + + idx = env_get_index(name); + if (!MSVCRT__environ[idx]) return NULL; + return strchr(MSVCRT__environ[idx], '=') + 1; } /*********************************************************************

1 0

Eric Pouech : msvcrt/tests: Test passing environment in child process.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 1c4897ec8a0273329dc9fe5f66745eb1ebbe6336 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c4897ec8a0273329dc9fe5f66745e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt/tests: Test passing environment in child process. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/environ.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index f14764ea5a0..17d75733c85 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -393,12 +393,61 @@ static void test_environment_manipulation(void) ok( count == env_get_entry_countA( *p_environ ), "Unexpected modification of _environ[]\n" ); } +static void test_child_env(char** argv) +{ + STARTUPINFOA si = {sizeof(si)}; + WCHAR *cur_env, *env, *p, *q; + PROCESS_INFORMATION pi; + char tmp[1024]; + BOOL ret; + int len; + + cur_env = GetEnvironmentStringsW(); + ok( cur_env != NULL, "GetEnvironemntStrings failed\n" ); + + p = cur_env; + while (*p) p += wcslen( p ) + 1; + len = p - cur_env; + env = malloc( (len + 1024) * sizeof(*env) ); + memcpy(env, cur_env, len * sizeof(*env) ); + q = env + len; + FreeEnvironmentStringsW( cur_env ); + + wcscpy( q, L"__winetest_dog=bark" ); + q += wcslen( L"__winetest_dog=bark" ) + 1; + wcscpy( q, L"__winetest_\u263a=\u03b2" ); + q += wcslen( L"__winetest_\u263a=\u03b2" ) + 1; + *q = 0; + + snprintf( tmp, sizeof(tmp), "%s %s create", argv[0], argv[1] ); + ret = CreateProcessA( NULL, tmp, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, env, NULL, &si, &pi ); + ok( ret, "Couldn't create child process %s\n", tmp ); + winetest_wait_child_process( pi.hProcess ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + free( env ); +} + START_TEST(environ) { + char **argv; + int argc; + init(); + argc = winetest_get_mainargs( &argv ); + if (argc == 3 && !strcmp( argv[2], "create" )) + { + ok( getenv( "__winetest_dog" ) && !strcmp( getenv( "__winetest_dog" ), "bark" ), + "Couldn't find env var\n" ); + ok( _wgetenv( L"__winetest_\u263a" ) && !wcscmp( _wgetenv( L"__winetest_\u263a" ), L"\u03b2" ), + "Couldn't find unicode env var\n" ); + return; + } + test__environ(); test__wenviron(); test_environment_manipulation(); + test_child_env(argv); test_system(); }

1 0

Alexandre Julliard : faudio: Fix a few printf formats.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 30f3a61af26428f59532cd203d893e0d9f2f9c11 URL: https://gitlab.winehq.org/wine/wine/-/commit/30f3a61af26428f59532cd203d893e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 11:17:41 2023 +0100 faudio: Fix a few printf formats. --- libs/faudio/src/FAudio_platform_win32.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index d3ded665df9..c45b4a2f4f2 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -1096,7 +1096,7 @@ static HRESULT FAudio_WMAMF_ProcessInput( copy_size = min(buffer->AudioBytes - impl->input_pos, impl->input_size); if (!copy_size) return S_FALSE; - LOG_INFO(voice->audio, "pushing %x bytes at %x", copy_size, impl->input_pos); + LOG_INFO(voice->audio, "pushing %lx bytes at %Ix", copy_size, impl->input_pos); hr = MFCreateSample(&sample); FAudio_assert(!FAILED(hr) && "Failed to create sample!"); @@ -1124,7 +1124,7 @@ static HRESULT FAudio_WMAMF_ProcessInput( if (hr == MF_E_NOTACCEPTING) return S_OK; if (FAILED(hr)) { - LOG_ERROR(voice->audio, "IMFTransform_ProcessInput returned %#x", hr); + LOG_ERROR(voice->audio, "IMFTransform_ProcessInput returned %#lx", hr); return hr; } @@ -1151,7 +1151,7 @@ static HRESULT FAudio_WMAMF_ProcessOutput( if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) return S_FALSE; if (FAILED(hr)) { - LOG_ERROR(voice->audio, "IMFTransform_ProcessInput returned %#x", hr); + LOG_ERROR(voice->audio, "IMFTransform_ProcessInput returned %#lx", hr); return hr; } @@ -1183,7 +1183,7 @@ static HRESULT FAudio_WMAMF_ProcessOutput( } FAudio_memcpy(impl->output_buf + impl->output_pos, copy_buf, copy_size); impl->output_pos += copy_size; - LOG_INFO(voice->audio, "pulled %x bytes at %x", copy_size, impl->output_pos); + LOG_INFO(voice->audio, "pulled %lx bytes at %Ix", copy_size, impl->output_pos); hr = IMFMediaBuffer_Unlock(media_buffer); FAudio_assert(!FAILED(hr) && "Failed to unlock buffer bytes!"); @@ -1282,7 +1282,7 @@ static void FAudio_INTERNAL_DecodeWMAMF( FAudio_zero(decodeCache + copy_size, samples_size - copy_size); LOG_INFO( voice->audio, - "decoded %x / %x bytes, copied %x / %x bytes", + "decoded %Ix / %Ix bytes, copied %Ix / %Ix bytes", impl->output_pos, impl->output_size, copy_size,

1 0

Alistair Leslie-Hughes : msado15: Correct logic when setting field value.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 78ba84e3c58b8c90d22cdd56da484f40d78c3ae0 URL: https://gitlab.winehq.org/wine/wine/-/commit/78ba84e3c58b8c90d22cdd56da484f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 21 09:21:51 2023 +1100 msado15: Correct logic when setting field value. --- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index d64ccdeee3d..36938db88cc 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -299,7 +299,7 @@ static HRESULT WINAPI field_put_Value( Field *iface, VARIANT val ) field->recordset->data[row * col_count + col] = copy; - if (field->recordset->editmode != adEditNone) + if (field->recordset->editmode == adEditNone) field->recordset->editmode = adEditInProgress; return S_OK;

1 0

Tim Clem : winemac.drv: Return success from query_ime_char_rect.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 8e9c6e29d01f744d85a96023e9b574f64b4039b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e9c6e29d01f744d85a96023e9b574… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Nov 20 14:46:50 2023 -0800 winemac.drv: Return success from query_ime_char_rect. Fixes misplaced IME windows. --- dlls/winemac.drv/event.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 9241a7a3326..2fc699e3f77 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -414,6 +414,7 @@ BOOL query_ime_char_rect(macdrv_query* query) NtUserMapWindowPoints(info.hwndCaret, 0, (POINT*)&info.rcCaret, 2); if (range->length && info.rcCaret.left == info.rcCaret.right) info.rcCaret.right++; query->ime_char_rect.rect = cgrect_from_rect(info.rcCaret); + ret = TRUE; } TRACE_(imm)(" -> %s range %ld-%ld rect %s\n", ret ? "TRUE" : "FALSE", range->location,

1 0

Alexandre Julliard : ntdll: Add syscall entries for ARM64EC.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 9c85c8591c59ebfb5a188aec3c2d9a126d78d40f URL: https://gitlab.winehq.org/wine/wine/-/commit/9c85c8591c59ebfb5a188aec3c2d9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 11:13:54 2023 +0100 ntdll: Add syscall entries for ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 1371 ++++++++++++++++++++++++++++++++++++++++++- include/wine/asm.h | 8 + 2 files changed, 1378 insertions(+), 1 deletion(-)

1 0

Fabian Maurer : winex11: Free correct pointer when using xf86vm.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 18522a0594b1dc63880063520ae48707738ed346 URL: https://gitlab.winehq.org/wine/wine/-/commit/18522a0594b1dc63880063520ae487… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 19 22:26:55 2023 +0100 winex11: Free correct pointer when using xf86vm. After allocation the pointer gets shifted by sizeof(xf86vm_modes), so we have to undo that before calling free. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55909 --- dlls/winex11.drv/xvidmode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 399d5e90e1e..fd9b1e7e8b1 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -159,11 +159,12 @@ static void xf86vm_free_modes(DEVMODEW *modes) if (modes) { + BYTE *ptr = (BYTE *)modes - sizeof(xf86vm_modes); assert(modes[0].dmDriverExtra == sizeof(XF86VidModeModeInfo *)); - memcpy(&xf86vm_modes, (BYTE *)modes - sizeof(xf86vm_modes), sizeof(xf86vm_modes)); + memcpy(&xf86vm_modes, ptr, sizeof(xf86vm_modes)); XFree(xf86vm_modes); + free(ptr); } - free(modes); } static BOOL xf86vm_get_current_mode(x11drv_settings_id id, DEVMODEW *mode)

1 0

Nikolay Sivov : d3dcompiler/tests: Do not crash on device creation.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: f341a693f4caa6804e068142d8850a943beda6a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f341a693f4caa6804e068142d8850a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 18 23:55:33 2023 +0100 d3dcompiler/tests: Do not crash on device creation. Fixes crashes running with a null driver. --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index eed96db7248..a6ecb6a37ee 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -134,7 +134,11 @@ static IDirect3DDevice9 *create_device(HWND window) HRESULT hr; d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); + if (!d3d) + { + skip("Failed to create a D3D object.\n"); + return NULL; + } hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device);

1 0

Alexandre Julliard : win32u: Add syscall entries for ARM64EC.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 97ebd9f1ac9b246046054ec68a9707dab0382be1 URL: https://gitlab.winehq.org/wine/wine/-/commit/97ebd9f1ac9b246046054ec68a9707… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 11:14:21 2023 +0100 win32u: Add syscall entries for ARM64EC. --- dlls/win32u/main.c | 2124 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2124 insertions(+)

1 0

Louis Lenders : wbemprox: Add StandardCimv2 namespace.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 1e1d18a44484a595b7a519f26d9189ef1866ea37 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e1d18a44484a595b7a519f26d9189… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Nov 21 09:19:34 2023 +0100 wbemprox: Add StandardCimv2 namespace. --- dlls/wbemprox/builtin.c | 1 + dlls/wbemprox/tests/services.c | 1 + dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fe496bdde41..e751299e4e6 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4369,6 +4369,7 @@ builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { {L"cimv2", cimv2_builtin_classes, ARRAY_SIZE(cimv2_builtin_classes)}, {L"Microsoft\\Windows\\Storage", NULL, 0}, + {L"StandardCimv2", NULL, 0}, {L"wmi", wmi_builtin_classes, ARRAY_SIZE(wmi_builtin_classes)}, }; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index e7fbc90cf61..4881cee745d 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -256,6 +256,7 @@ static void test_namespaces(void) { {L"ROOT\\CIMV2"}, {L"ROOT\\Microsoft\\Windows\\Storage", TRUE /* Before Win8. */}, + {L"ROOT\\StandardCimv2", TRUE /* Before Win8. */}, {L"ROOT\\WMI"}, }; IWbemLocator *locator; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 2701c725c89..3c8fa403c57 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -23,6 +23,7 @@ enum wbm_namespace { WBEMPROX_NAMESPACE_CIMV2, WBEMPROX_NAMESPACE_MS_WINDOWS_STORAGE, + WBEMPROX_NAMESPACE_STANDARDCIMV2, WBEMPROX_NAMESPACE_WMI, WBEMPROX_NAMESPACE_LAST, };

1 0