- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : kernel32: Fix GetNumberFormatA when input length is 0.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: c55f8f3518c1ed6759de9078831956898b007d08 URL: https://gitlab.winehq.org/wine/wine/-/commit/c55f8f3518c1ed6759de9078831956… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 20:31:29 2023 +0200 kernel32: Fix GetNumberFormatA when input length is 0. Fixes a regression introduced by b6bf69ef804146f81b803719a72d8c6afde184ba. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/locale.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 16aa0bdd2aa..3783cf6505f 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -430,8 +430,6 @@ int WINAPI GetNumberFormatA( LCID lcid, DWORD flags, const char *value, } MultiByteToWideChar( cp, 0, value, -1, input, ARRAY_SIZE(input) ); - if (len > (int)ARRAY_SIZE(output)) len = ARRAY_SIZE(output); - if (format) { NUMBERFMTW fmt; @@ -455,9 +453,9 @@ int WINAPI GetNumberFormatA( LCID lcid, DWORD flags, const char *value, fmt.NegativeOrder = format->NegativeOrder; fmt.lpDecimalSep = fmt_decimal; fmt.lpThousandSep = fmt_thousand; - ret = GetNumberFormatW( lcid, flags, input, &fmt, output, len ); + ret = GetNumberFormatW( lcid, flags, input, &fmt, output, ARRAY_SIZE(output) ); } - else ret = GetNumberFormatW( lcid, flags, input, NULL, output, len ); + else ret = GetNumberFormatW( lcid, flags, input, NULL, output, ARRAY_SIZE(output) ); if (ret) ret = WideCharToMultiByte( cp, 0, output, -1, buffer, len, 0, 0 ); return ret;

1 0

Eric Pouech : dbghelp/tests: Use msinfo32.exe instead of notepad.exe.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 13afaa7c16a1acea62935ea634f5278d15d12464 URL: https://gitlab.winehq.org/wine/wine/-/commit/13afaa7c16a1acea62935ea634f527… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 21 17:35:00 2023 +0100 dbghelp/tests: Use msinfo32.exe instead of notepad.exe. Under Windows 11, notepad.exe has been migrated into the UWP framework, and can no longer be launched as a 32bit process: - even if c:\windows\syswow64\notepad.exe is still a 32 bit PE file - the process created from c:\windows\syswow64\notepad.exe is not a wow64 process. So use msinfo32.exe instead. Like notepad.exe, it's a gui application, present on Wine and all test-bot:ed windows platforms. But unlike notepad.exe, it's not an UWP app on Windows 11. (May not fully fix all the bugs below, but will get rid of a bunch of errors). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54535 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54536 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54537 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 339585993e0..276faf0101a 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -381,7 +381,7 @@ static BOOL test_modules(void) ok(ret, "SymInitialize failed: %lu\n", GetLastError()); GetSystemWow64DirectoryA(file_wow64, MAX_PATH); - strcat(file_wow64, "\\notepad.exe"); + strcat(file_wow64, "\\msinfo32.exe"); /* not always present */ machine_wow = get_module_machine(file_wow64); @@ -397,7 +397,7 @@ static BOOL test_modules(void) } GetSystemDirectoryA(file_system, MAX_PATH); - strcat(file_system, "\\notepad.exe"); + strcat(file_system, "\\msinfo32.exe"); base = SymLoadModule(GetCurrentProcess(), NULL, file_system, NULL, base1, 0); ok(base == base1, "SymLoadModule failed: %lu\n", GetLastError()); @@ -676,7 +676,7 @@ static void test_loaded_modules(void) ret = GetSystemDirectoryA(buffer, sizeof(buffer)); ok(ret, "got error %lu\n", GetLastError()); - strcat(buffer, "\\notepad.exe"); + strcat(buffer, "\\msinfo32.exe"); /* testing with child process of different machines */ ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); @@ -744,7 +744,7 @@ static void test_loaded_modules(void) { ret = GetSystemWow64DirectoryA(buffer, sizeof(buffer)); ok(ret, "got error %lu\n", GetLastError()); - strcat(buffer, "\\notepad.exe"); + strcat(buffer, "\\msinfo32.exe"); SymSetOptions(SymGetOptions() & ~SYMOPT_INCLUDE_32BIT_MODULES);

1 0

Gabriel Ivăncescu : kernel32: Fix GetCurrencyFormatA when input length is 0.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 606e0c191ed8fc26544c04f236c560b2f5e3e835 URL: https://gitlab.winehq.org/wine/wine/-/commit/606e0c191ed8fc26544c04f236c560… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 20:31:29 2023 +0200 kernel32: Fix GetCurrencyFormatA when input length is 0. Fixes a regression introduced by 42afb693b10dee9a06fcadb204560490a24f1754. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/locale.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 3783cf6505f..235034f6117 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -481,8 +481,6 @@ int WINAPI GetCurrencyFormatA( LCID lcid, DWORD flags, const char *value, } MultiByteToWideChar( cp, 0, value, -1, input, ARRAY_SIZE(input) ); - if (len > (int)ARRAY_SIZE(output)) len = ARRAY_SIZE(output); - if (format) { CURRENCYFMTW fmt; @@ -509,9 +507,9 @@ int WINAPI GetCurrencyFormatA( LCID lcid, DWORD flags, const char *value, fmt.lpDecimalSep = fmt_decimal; fmt.lpThousandSep = fmt_thousand; fmt.lpCurrencySymbol = fmt_symbol; - ret = GetCurrencyFormatW( lcid, flags, input, &fmt, output, len ); + ret = GetCurrencyFormatW( lcid, flags, input, &fmt, output, ARRAY_SIZE(output) ); } - else ret = GetCurrencyFormatW( lcid, flags, input, NULL, output, len ); + else ret = GetCurrencyFormatW( lcid, flags, input, NULL, output, ARRAY_SIZE(output) ); if (ret) ret = WideCharToMultiByte( cp, 0, output, -1, buffer, len, 0, 0 ); return ret;

1 0

Eric Pouech : psapi/tests: Use msinfo32.exe instead of notepad.exe.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 38e3a92e21220a6e8a97ba3e472a704d6a4f6664 URL: https://gitlab.winehq.org/wine/wine/-/commit/38e3a92e21220a6e8a97ba3e472a70… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 21 17:34:58 2023 +0100 psapi/tests: Use msinfo32.exe instead of notepad.exe. Under Windows 11, notepad.exe has been migrated into the UWP framework, and can no longer be launched as a 32bit process: - even if c:\windows\syswow64\notepad.exe is still a 32 bit PE file - the process created from c:\windows\syswow64\notepad.exe is not a wow64 process. So use msinfo32.exe instead. Like notepad.exe, it's a gui application, present on Wine and all test-bot:ed windows platforms. But unlike notepad.exe, it's not an UWP app on Windows 11. (May not fix all the issues in the following bug list, but will remove a lot of errors). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54504 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54505 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54506 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54507 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54508 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54509 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/psapi/tests/psapi_main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 227fc52c2ad..860598c39c5 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -76,7 +76,7 @@ static void test_EnumProcesses(void) static void test_EnumProcessModules(void) { - char buffer[200] = "C:\\windows\\system32\\notepad.exe"; + char buffer[200] = "C:\\windows\\system32\\msinfo32.exe"; PROCESS_INFORMATION pi = {0}; STARTUPINFOA si = {0}; void *cookie; @@ -143,7 +143,7 @@ static void test_EnumProcessModules(void) char name[40]; HMODULE hmods[3]; - strcpy(buffer, "C:\\windows\\syswow64\\notepad.exe"); + strcpy(buffer, "C:\\windows\\syswow64\\msinfo32.exe"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); if (ret) { @@ -160,7 +160,7 @@ static void test_EnumProcessModules(void) ret = GetModuleBaseNameA(pi.hProcess, hmods[0], name, sizeof(name)); ok(ret, "got error %lu\n", GetLastError()); - ok(!strcmp(name, "notepad.exe"), "got %s\n", name); + ok(!strcmp(name, "msinfo32.exe"), "got %s\n", name); ret = GetModuleFileNameExA(pi.hProcess, hmods[0], name, sizeof(name)); ok(ret, "got error %lu\n", GetLastError()); @@ -341,7 +341,7 @@ static unsigned int snapshot_count_in_dir(const struct moduleex_snapshot* snap, static void test_EnumProcessModulesEx(void) { - char buffer[200] = "C:\\windows\\system32\\notepad.exe"; + char buffer[200] = "C:\\windows\\system32\\msinfo32.exe"; PROCESS_INFORMATION pi = {0}; STARTUPINFOA si = {0}; void *cookie; @@ -449,9 +449,9 @@ static void test_EnumProcessModulesEx(void) ok(snapshot_is_subset(&snap[0], &snap[2]), "32bit and default module lists should match\n"); ok(snapshot_is_subset(&snap[2], &snap[3]), "default and all module lists should match\n"); - snapshot_check_first_main_module(&snap[0], pi.hProcess, "c:\\windows\\syswow64\\notepad.exe"); - snapshot_check_first_main_module(&snap[2], pi.hProcess, "c:\\windows\\syswow64\\notepad.exe"); - snapshot_check_first_main_module(&snap[3], pi.hProcess, "c:\\windows\\syswow64\\notepad.exe"); + snapshot_check_first_main_module(&snap[0], pi.hProcess, "c:\\windows\\syswow64\\msinfo32.exe"); + snapshot_check_first_main_module(&snap[2], pi.hProcess, "c:\\windows\\syswow64\\msinfo32.exe"); + snapshot_check_first_main_module(&snap[3], pi.hProcess, "c:\\windows\\syswow64\\msinfo32.exe"); winetest_pop_context(); } @@ -461,7 +461,7 @@ static void test_EnumProcessModulesEx(void) { unsigned int count; - strcpy(buffer, "C:\\windows\\syswow64\\notepad.exe"); + strcpy(buffer, "C:\\windows\\syswow64\\msinfo32.exe"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); if (ret) { @@ -492,7 +492,7 @@ static void test_EnumProcessModulesEx(void) ok(ret, "GetSystemWow64DirectoryA failed: %lu\n", GetLastError()); count = snapshot_count_in_dir(snap, pi.hProcess, buffer); todo_wine - ok(count <= 1, "Wrong count %u in %s\n", count, buffer); /* notepad can be from system wow64 */ + ok(count <= 1, "Wrong count %u in %s\n", count, buffer); /* msinfo32 can be from system wow64 */ ret = GetSystemDirectoryA(buffer, sizeof(buffer)); ok(ret, "GetSystemDirectoryA failed: %lu\n", GetLastError()); count = snapshot_count_in_dir(snap, pi.hProcess, buffer);

1 0

Eric Pouech : ntdll/tests: Use msinfo32.exe instead of notepad.exe.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: de3ecada243b6cf5fc65afc89634142a8de76401 URL: https://gitlab.winehq.org/wine/wine/-/commit/de3ecada243b6cf5fc65afc8963414… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 21 17:34:55 2023 +0100 ntdll/tests: Use msinfo32.exe instead of notepad.exe. Under Windows 11, notepad.exe has been migrated into the UWP framework, and can no longer be launched as a 32bit process: - even if c:\windows\syswow64\notepad.exe is still a 32 bit PE file - the process created from c:\windows\syswow64\notepad.exe is not a wow64 process. So use msinfo32.exe instead. Like notepad.exe, it's a gui application, present on Wine and all test-bot:ed windows platforms. But unlike notepad.exe, it's not an UWP app on Windows 11. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/wow64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index b8f28f6215c..08660b608b4 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -244,7 +244,7 @@ static void test_peb_teb(void) Wow64DisableWow64FsRedirection( &redir ); - if (CreateProcessA( "C:\\windows\\syswow64\\notepad.exe", NULL, NULL, NULL, + if (CreateProcessA( "C:\\windows\\syswow64\\msinfo32.exe", NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi )) { memset( &info, 0xcc, sizeof(info) ); @@ -344,7 +344,7 @@ static void test_peb_teb(void) CloseHandle( pi.hThread ); } - if (CreateProcessA( "C:\\windows\\system32\\notepad.exe", NULL, NULL, NULL, + if (CreateProcessA( "C:\\windows\\system32\\msinfo32.exe", NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi )) { memset( &info, 0xcc, sizeof(info) );

1 0

Zebediah Figura : ddraw: Move wined3d_resource_desc translation to ddraw_surface_create_wined3d_texture().
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: b826e1eb3d7d7076b84576781baaff099d2ca5d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b826e1eb3d7d7076b84576781baaff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 16:58:03 2022 -0600 ddraw: Move wined3d_resource_desc translation to ddraw_surface_create_wined3d_texture(). --- dlls/ddraw/surface.c | 165 ++++++++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 80 deletions(-)

1 0

Eric Pouech : ntdll/tests: Use msinfo32.exe instead of notepad.exe.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 0e41777a44340006a25f207948001d6bc4ffb419 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e41777a44340006a25f207948001d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 21 17:34:57 2023 +0100 ntdll/tests: Use msinfo32.exe instead of notepad.exe. Under Windows 11, notepad.exe has been migrated into the UWP framework, and can no longer be launched as a 32bit process: - even if c:\windows\syswow64\notepad.exe is still a 32 bit PE file - the process created from c:\windows\syswow64\notepad.exe is not a wow64 process. So use msinfo32.exe instead. Like notepad.exe, it's a gui application, present on Wine and all test-bot:ed windows platforms. But unlike notepad.exe, it's not an UWP app on Windows 11. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 90d90f3b64a..a70faef6676 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8068,7 +8068,7 @@ static void test_debug_registers(void) static void test_debug_registers_wow64(void) { - char cmdline[] = "C:\\windows\\syswow64\\notepad.exe"; + char cmdline[] = "C:\\windows\\syswow64\\msinfo32.exe"; PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; WOW64_CONTEXT wow64_ctx;

1 0

Zebediah Figura : ddraw: Separate a need_draw_texture() helper.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 5ba3c4af7cc46913d928ab118adff22eff4d6346 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ba3c4af7cc46913d928ab118adff2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 24 16:23:56 2022 -0600 ddraw: Separate a need_draw_texture() helper. --- dlls/ddraw/surface.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d01ab5294a1..3825a9d4075 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5995,6 +5995,19 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text return hr; } +static bool need_draw_texture(unsigned int draw_bind_flags, const struct wined3d_resource_desc *desc) +{ + if (!draw_bind_flags) + return false; + + /* If we have a GPU texture that includes all the necessary bind flags, we + * don't need a separate draw texture. */ + if ((desc->access & WINED3D_RESOURCE_ACCESS_GPU) && ((desc->bind_flags & draw_bind_flags) == draw_bind_flags)) + return false; + + return true; +} + static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, const struct wined3d_resource_desc *wined3d_desc, unsigned int layers, unsigned int levels, struct ddraw_texture *texture, struct wined3d_texture **wined3d_texture) @@ -6042,7 +6055,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) bind_flags |= WINED3D_BIND_RENDER_TARGET; - if (!bind_flags || (wined3d_desc->access & WINED3D_RESOURCE_ACCESS_GPU && !(bind_flags & ~wined3d_desc->bind_flags))) + if (!need_draw_texture(bind_flags, wined3d_desc)) goto no_draw_texture; draw_texture_desc = *wined3d_desc;

1 0

Zebediah Figura : ddraw: Move pitch validation to ddraw_surface_create_wined3d_texture().
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 655af198dfbac077dea1fbbba6a55b2ee619f344 URL: https://gitlab.winehq.org/wine/wine/-/commit/655af198dfbac077dea1fbbba6a55b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 16:19:36 2022 -0600 ddraw: Move pitch validation to ddraw_surface_create_wined3d_texture(). It makes use of the wined3d_format, and we want to move wined3d desc creation to ddraw_surface_create_wined3d_texture() so that we can use it to recreate the wined3d texture in SetSurfaceDesc(). --- dlls/ddraw/surface.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index aec0bba8dc3..d01ab5294a1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5995,10 +5995,11 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text return hr; } -static HRESULT ddraw_surface_create_wined3d_texture(struct wined3d_device *wined3d_device, +static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, const struct wined3d_resource_desc *wined3d_desc, unsigned int layers, unsigned int levels, struct ddraw_texture *texture, struct wined3d_texture **wined3d_texture) { + struct wined3d_device *wined3d_device = ddraw->wined3d_device; const DDSURFACEDESC2 *desc = &texture->surface_desc; struct wined3d_resource_desc draw_texture_desc; struct wined3d_texture *draw_texture; @@ -6007,6 +6008,30 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct wined3d_device *wined unsigned int i; HRESULT hr; + /* Validate the pitch. */ + if (desc->dwFlags & DDSD_LPSURFACE) + { + if (format_is_compressed(&desc->u4.ddpfPixelFormat)) + { + if ((desc->dwFlags & DDSD_LINEARSIZE) + && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, + wined3d_desc->format, wined3d_desc->width) * ((wined3d_desc->height + 3) / 4)) + { + WARN("Invalid linear size %lu specified.\n", desc->u1.dwLinearSize); + return DDERR_INVALIDPARAMS; + } + } + else + { + if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, + wined3d_desc->format, wined3d_desc->width) || desc->u1.lPitch & 3) + { + WARN("Invalid pitch %lu specified.\n", desc->u1.lPitch); + return DDERR_INVALIDPARAMS; + } + } + } + bind_flags = 0; if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) || (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) @@ -6526,15 +6551,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ heap_free(texture); return DDERR_INVALIDPARAMS; } - - if ((desc->dwFlags & DDSD_LINEARSIZE) - && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, - wined3d_desc.format, wined3d_desc.width) * ((desc->dwHeight + 3) / 4)) - { - WARN("Invalid linear size %lu specified.\n", desc->u1.dwLinearSize); - heap_free(texture); - return DDERR_INVALIDPARAMS; - } } else { @@ -6545,14 +6561,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDPARAMS; } - if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, - wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) - { - WARN("Invalid pitch %lu specified.\n", desc->u1.lPitch); - heap_free(texture); - return DDERR_INVALIDPARAMS; - } - pitch = desc->u1.lPitch; } } @@ -6590,7 +6598,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ layers = 6; } - if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw->wined3d_device, &wined3d_desc, layers, levels, + if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, &wined3d_desc, layers, levels, texture, &wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); @@ -6724,7 +6732,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; desc->u5.dwBackBufferCount = 0; - if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw->wined3d_device, &wined3d_desc, 1, 1, + if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, &wined3d_desc, 1, 1, texture, &wined3d_texture))) { heap_free(texture);

1 0

Rémi Bernon : win32u: Send WM_INPUTLANGCHANGE when activating new layout.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: fee5eaecb47aca10cd17d5f84e2bbc3ca60bfa44 URL: https://gitlab.winehq.org/wine/wine/-/commit/fee5eaecb47aca10cd17d5f84e2bbc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 13:39:26 2023 +0100 win32u: Send WM_INPUTLANGCHANGE when activating new layout. --- dlls/win32u/input.c | 18 +++++++++++++++++- dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/win32u_private.h | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 8735dc9fa74..c11d542037d 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1193,6 +1193,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) { struct user_thread_info *info = get_user_thread_info(); HKL old_layout; + HWND focus; TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags ); @@ -1210,7 +1211,22 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) old_layout = info->kbd_layout; info->kbd_layout = layout; - if (old_layout != layout) info->kbd_layout_id = 0; + if (old_layout != layout) + { + const NLS_LOCALE_DATA *data; + CHARSETINFO cs = {0}; + + if (HIWORD(layout) & 0x8000) + FIXME( "Aliased keyboard layout not yet implemented\n" ); + else if (!(data = get_locale_data( HIWORD(layout) ))) + WARN( "Failed to find locale data for %04x\n", HIWORD(layout) ); + else + translate_charset_info( ULongToPtr(data->idefaultansicodepage), &cs, TCI_SRCCODEPAGE ); + + info->kbd_layout_id = 0; + if ((focus = get_focus()) && get_window_thread( focus, NULL ) == GetCurrentThreadId()) + send_message( focus, WM_INPUTLANGCHANGE, cs.ciCharset, (LPARAM)layout ); + } if (!old_layout) return get_locale_kbd_layout(); return old_layout; diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index ce5e30ab07d..93be59c9d7e 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -368,7 +368,6 @@ extern BOOL opentype_enum_full_names( const struct tt_name_v0 *tt_name_v0, extern BOOL opentype_get_properties( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, DWORD *version, FONTSIGNATURE *fs, DWORD *ntm_flags ) DECLSPEC_HIDDEN; -extern BOOL translate_charset_info( DWORD *src, CHARSETINFO *cs, DWORD flags ) DECLSPEC_HIDDEN; /* gdiobj.c */ extern HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 44847829b75..32c6c2b905b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -456,6 +456,7 @@ extern CPTABLEINFO ansi_cp DECLSPEC_HIDDEN; CPTABLEINFO *get_cptable( WORD cp ) DECLSPEC_HIDDEN; const NLS_LOCALE_DATA *get_locale_data( LCID lcid ) DECLSPEC_HIDDEN; +extern BOOL translate_charset_info( DWORD *src, CHARSETINFO *cs, DWORD flags ) DECLSPEC_HIDDEN; DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, DWORD srclen ) DECLSPEC_HIDDEN; DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src,

1 0