- Wine-Commits - list.winehq.org

Piotr Caban : localspl: Ignore an empty output string.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: b1d190d66114462df8b2291bb742e12926980756 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1d190d66114462df8b2291bb742e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 21 14:45:16 2023 +0100 localspl: Ignore an empty output string. We should probably ignore all incorrect ports. This is a minimal change that restores 5dadeeb29d36a93b3bbeec8d7b1d237f29bf8f67 commit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54379 (cherry picked from commit 48d3271f963319b6e45eeaf18b44ac1a1bd3c190) --- dlls/localspl/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 790d9d64c00..f0f2a1deb44 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3697,7 +3697,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) } port = job->port; - if (!port) + if (!port || !*port) port = printer->info->port; TRACE("need to schedule job %ld filename %s to port %s\n", job->id, debugstr_w(job->filename), debugstr_w(port));

1 0

Illia Polishchuk : d3d9: Always draw only a single instance for non-indexed draws.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 89519338d1b26d767aec77369c36ffcdd809c0a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/89519338d1b26d767aec77369c36ff… Author: Illia Polishchuk <illia.a.polishchuk(a)globallogic.com> Date: Tue Feb 28 22:58:35 2023 +0200 d3d9: Always draw only a single instance for non-indexed draws. Windows d3d9 always draws only a single instance for non-indexed draws. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54570 (cherry picked from commit af65f0c9a09c040a615e4eaa4c290240c0a12847) --- dlls/d3d9/device.c | 16 ++++++++++++---- dlls/d3d9/tests/visual.c | 9 +++------ dlls/wined3d/adapter_vk.c | 2 -- dlls/wined3d/context_gl.c | 6 ------ dlls/wined3d/wined3d_private.h | 1 - 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index eddb2a0ebdd..bb3e0b8e6d4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3052,7 +3052,10 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, d3d9_generate_auto_mipmaps(device); wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); - wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0); + + /* Instancing is ignored for non-indexed draws. */ + wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 1); + d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3092,7 +3095,8 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d9_device_upload_sysmem_index_buffer(device, &start_idx, index_count); - wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, 0); + wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, + device->stateblock_state->streams[0].frequency); d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3144,7 +3148,10 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 0); + + /* Instancing is ignored for non-indexed draws. */ + wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 1); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); d3d9_rts_flag_auto_gen_mipmap(device); @@ -3211,7 +3218,8 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_context_draw_indexed(device->immediate_context, - vb_pos / vertex_stride - min_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, 0); + vb_pos / vertex_stride - min_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, + device->stateblock_state->streams[0].frequency); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cdc9ed11a00..2c83965f0cb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13101,14 +13101,11 @@ static void stream_test(void) color = getPixelColor(device, 200, 340); ok(color == act.color1, "has color 0x%08x, expected 0x%08x (case %i)\n", color, act.color1, i); color = getPixelColor(device, 400, 340); - todo_wine_if(color != 0x00ffffff) - ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); color = getPixelColor(device, 400, 180); - todo_wine_if(color != 0x00ffffff) - ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); color = getPixelColor(device, 200, 180); - todo_wine_if(color != 0x00ffffff) - ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 713aaec9e39..ff8a5ee2675 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1821,8 +1821,6 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, else { instance_count = parameters->u.direct.instance_count; - if (context_vk->c.instance_count) - instance_count = context_vk->c.instance_count; if (!instance_count) instance_count = 1; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0217e12d903..c7442514788 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5321,8 +5321,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s else { unsigned int instance_count = parameters->u.direct.instance_count; - if (context->instance_count) - instance_count = context->instance_count; if (context->use_immediate_mode_draw || emulation) draw_primitive_immediate_mode(wined3d_context_gl(context), state, stream_info, idx_data, @@ -5466,7 +5464,6 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte /* This is used for the fixed-function pipeline only, and the * fixed-function pipeline doesn't do instancing. */ - context_gl->c.instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; /* Blend data */ @@ -5680,7 +5677,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c unsigned int i; /* Default to no instancing. */ - context->instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; if (stream_info->use_map & ~wined3d_mask_from_size(gl_info->limits.vertex_attribs)) @@ -5726,8 +5722,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c stream = &state->streams[element->stream_idx]; stream->buffer->bo_user.valid = true; - if ((stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) && !context->instance_count) - context->instance_count = state->streams[0].frequency; if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7abf77bb445..9e06a7c14d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2292,7 +2292,6 @@ struct wined3d_context DWORD numbered_array_mask; enum fogsource fog_source; - UINT instance_count; void *shader_backend_data; void *fragment_pipe_data;

1 0

Eric Pouech : ntdll: Implement RtlAddressInSectionTable.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 079e5eabdb76e8e19a322e9994398255af818cf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/079e5eabdb76e8e19a322e99943982… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 17:07:17 2023 +0100 ntdll: Implement RtlAddressInSectionTable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54432 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> (cherry picked from commit 89d42d64d768d27e44408533d8fee9218dfa087d) --- dlls/ntdll/loader.c | 9 +++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 61aeb25898b..7eb72034cb9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4310,6 +4310,15 @@ PVOID WINAPI RtlImageRvaToVa( const IMAGE_NT_HEADERS *nt, HMODULE module, } +/*********************************************************************** + * RtlAddressInSectionTable (NTDLL.@) + */ +PVOID WINAPI RtlAddressInSectionTable( const IMAGE_NT_HEADERS *nt, HMODULE module, + DWORD rva ) +{ + return RtlImageRvaToVa( nt, module, rva, NULL ); +} + /*********************************************************************** * RtlPcToFileHeader (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b41e29c0ff5..254ac2e4592 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -487,7 +487,7 @@ # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) @ stdcall RtlAddVectoredExceptionHandler(long ptr) -# @ stub RtlAddressInSectionTable +@ stdcall RtlAddressInSectionTable(ptr long long) @ stdcall RtlAdjustPrivilege(long long long ptr) @ stdcall RtlAllocateAndInitializeSid (ptr long long long long long long long long long ptr) @ stdcall RtlAllocateHandle(ptr ptr) diff --git a/include/winternl.h b/include/winternl.h index c720d962933..b6222159016 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4251,6 +4251,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID NTSYSAPI NTSTATUS WINAPI RtlAddMandatoryAce(PACL,DWORD,DWORD,DWORD,DWORD,PSID); NTSYSAPI void WINAPI RtlAddRefActivationContext(HANDLE); NTSYSAPI PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); +NTSYSAPI PVOID WINAPI RtlAddressInSectionTable(const IMAGE_NT_HEADERS*,HMODULE,DWORD); NTSYSAPI NTSTATUS WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *); NTSYSAPI RTL_HANDLE * WINAPI RtlAllocateHandle(RTL_HANDLE_TABLE *,ULONG *);

1 0

Brendan Shanks : server: On macOS, fake debug registers when running under Rosetta.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: a1dc9c90ede5c4c91d01e54583f70229013987f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1dc9c90ede5c4c91d01e54583f702… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Feb 8 15:51:29 2023 -0800 server: On macOS, fake debug registers when running under Rosetta. Based on a patch by Tim Clem <tclem(a)codeweavers.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54367 (cherry picked from commit 93fde56b494151f5e4bdfc560f930867bda52514) --- server/mach.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/server/mach.c b/server/mach.c index 6051396a1bf..3852bb3ee5b 100644 --- a/server/mach.c +++ b/server/mach.c @@ -31,6 +31,9 @@ #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -74,6 +77,25 @@ static mach_port_t get_process_port( struct process *process ) return process->trace_data; } +static int is_rosetta( void ) +{ + static int rosetta_status, did_check = 0; + if (!did_check) + { + /* returns 0 for native process or on error, 1 for translated */ + int ret = 0; + size_t size = sizeof(ret); + if (sysctlbyname( "sysctl.proc_translated", &ret, &size, NULL, 0 ) == -1) + rosetta_status = 0; + else + rosetta_status = ret; + + did_check = 1; + } + + return rosetta_status; +} + /* initialize the process control mechanism */ void init_tracing_mechanism(void) { @@ -165,6 +187,14 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); + if (is_rosetta()) + { + /* getting debug registers of a translated process is not supported cross-process, return all zeroes */ + memset( &context->debug, 0, sizeof(context->debug) ); + context->flags |= SERVER_CTX_DEBUG_REGISTERS; + return; + } + if (thread->unix_pid == -1 || !process_port || mach_port_extract_right( process_port, thread->unix_tid, MACH_MSG_TYPE_COPY_SEND, &port, &type )) @@ -251,6 +281,15 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign return; } + if (is_rosetta()) + { + /* Setting debug registers of a translated process is not supported cross-process + * (and even in-process, setting debug registers never has the desired effect). + */ + set_error( STATUS_UNSUCCESSFUL ); + return; + } + /* get the debug state to determine which flavor to use */ ret = thread_get_state(port, x86_DEBUG_STATE, (thread_state_t)&state, &count); if (ret)

1 0

Alex Henrie : shell32: Add support for Program Manager icons with arguments.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 4fc905841a89a9e175700c2900c48478931d1c32 URL: https://gitlab.winehq.org/wine/wine/-/commit/4fc905841a89a9e175700c2900c484… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 24 19:55:12 2023 -0700 shell32: Add support for Program Manager icons with arguments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 (cherry picked from commit aa21d1acb28839177e8d7e74bab65bf1886d6596) --- dlls/shell32/dde.c | 21 +++++++++++++++------ dlls/shell32/tests/progman_dde.c | 17 ++++++++++++++++- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 96b5a243f93..4fbc6898d38 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -251,7 +251,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } else if (!wcsicmp(command, L"AddItem")) { - WCHAR *path, *name; + WCHAR *target, *space = NULL, *path, *name; IShellLinkW *link; IPersistFile *file; HRESULT hres; @@ -262,15 +262,24 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) &IID_IShellLinkW, (void **)&link); if (FAILED(hres)) return DDE_FNOTPROCESSED; - len = SearchPathW(NULL, argv[0], L".exe", 0, NULL, NULL); - if (len == 0) + target = wcsdup(argv[0]); + while (!(len = SearchPathW(NULL, target, L".exe", 0, NULL, NULL))) { - IShellLinkW_Release(link); - return DDE_FNOTPROCESSED; + /* progressively remove words from the end of the command line until we get a valid file name */ + space = wcsrchr(target, ' '); + if (!space) + { + IShellLinkW_Release(link); + free(target); + return DDE_FNOTPROCESSED; + } + *space = 0; } path = malloc(len * sizeof(WCHAR)); - SearchPathW(NULL, argv[0], L".exe", len, path, NULL); + SearchPathW(NULL, target, L".exe", len, path, NULL); IShellLinkW_SetPath(link, path); + if (space) IShellLinkW_SetArguments(link, argv[0] + (space - target) + 1); + free(target); free(path); if (argc >= 2) IShellLinkW_SetDescription(link, argv[1]); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 5a7e8c912e5..b15295c5a21 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -231,10 +231,25 @@ static void test_parser(DWORD instance, HCONV hConv) ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("test/foobar.lnk"), "link not created\n"); - error = dde_execute(instance, hConv, "[AddItem(notepad,foo bar)]"); + error = dde_execute(instance, hConv, "[AddItem(notepad\tfoo.txt,foo)]"); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); + + error = dde_execute(instance, hConv, "[AddItem(notepad foo.txt,foo)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("test/foo.lnk"), "link not created\n"); + + error = dde_execute(instance, hConv, "[AddItem(notepad foo.txt bar.txt,foo bar)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("test/foo bar.lnk"), "link not created\n"); + error = dde_execute(instance, hConv, "[AddItem(C:\\Program Files\\Internet Explorer\\iexplore.exe,IE)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("test/IE.lnk"), "link not created\n"); + + error = dde_execute(instance, hConv, "[AddItem(C:\\Program Files\\Internet Explorer\\iexplore.exe https://www.winehq.org/,WineHQ)"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("test/WineHQ.lnk"), "link not created\n"); + error = dde_execute(instance, hConv, "[AddItem(notepad,a[b,c]d)]"); ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error);

1 0

Jinoh Kang : riched20/tests: Test for word movement across paragraph boundary.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 10425906a9c7965577b1b5dbdc2a936e11da76ad URL: https://gitlab.winehq.org/wine/wine/-/commit/10425906a9c7965577b1b5dbdc2a93… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Feb 25 21:43:31 2023 +0900 riched20/tests: Test for word movement across paragraph boundary. (cherry picked from commit 21d25b17c2cae8eb2d2376ce42b76e3f61eb0bba) --- dlls/riched20/tests/editor.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 07af9ab5dbd..c34d30c6cbd 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7205,6 +7205,54 @@ static void test_word_movement(void) DestroyWindow(hwnd); } +static void test_word_movement_multiline(void) +{ + DWORD sel_start, sel_end; + LRESULT result; + HWND hwnd; + + /* multi-line control inserts CR normally */ + hwnd = new_richedit(NULL); + + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Lorem ipsum\rdolor sit\rnamet"); + ok(result == TRUE, "WM_SETTEXT returned %Iu.\n", result); + SendMessageA(hwnd, EM_SETSEL, 0, 0); + /* [|Lorem ipsum] [dolor sit] [amet] */ + + send_ctrl_key(hwnd, VK_RIGHT); + /* [Lorem |ipsum] [dolor sit] [amet] */ + sel_start = sel_end = 0xdeadbeefUL; + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); + ok(sel_start == 6, "expected sel_start to be %u, got %lu.\n", 6, sel_start); + + send_ctrl_key(hwnd, VK_RIGHT); + /* [Lorem ipsum|] [dolor sit] [amet] */ + sel_start = sel_end = 0xdeadbeefUL; + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); + todo_wine + ok(sel_start == 11, "expected sel_start to be %u, got %lu.\n", 11, sel_start); + + send_ctrl_key(hwnd, VK_RIGHT); + /* [Lorem ipsum] [|dolor sit] [amet] */ + sel_start = sel_end = 0xdeadbeefUL; + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); + todo_wine + ok(sel_start == 12, "expected sel_start to be %u, got %lu.\n", 12, sel_start); + + send_ctrl_key(hwnd, VK_LEFT); + /* [Lorem ipsum|] [dolor sit] [amet] */ + sel_start = sel_end = 0xdeadbeefUL; + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); + todo_wine + ok(sel_start == 11, "expected sel_start to be %u, got %lu.\n", 11, sel_start); + + DestroyWindow(hwnd); +} + static void test_EM_CHARFROMPOS(void) { HWND hwnd; @@ -9113,6 +9161,7 @@ START_TEST( editor ) test_eventMask(); test_undo_coalescing(); test_word_movement(); + test_word_movement_multiline(); test_EM_CHARFROMPOS(); test_SETPARAFORMAT(); test_word_wrap();

1 0

Jinoh Kang : riched20: Don't set para unless committing cursor move in ME_MoveCursorWords.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: a598f9176465d3b87e6d4a422b1114620a209813 URL: https://gitlab.winehq.org/wine/wine/-/commit/a598f9176465d3b87e6d4a422b1114… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Feb 25 02:14:36 2023 +0900 riched20: Don't set para unless committing cursor move in ME_MoveCursorWords. Introduce a temporary variable, `other_para`, so that we don't end up returning incorrect para (with stale run) inside the output cursor. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54564 (cherry picked from commit 7e28fa5c558f1417f8f033cb843424778bbfb8b8) --- dlls/riched20/caret.c | 11 +++++++---- dlls/riched20/tests/editor.c | 3 --- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index c9fd327e87e..f89770ccc75 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -802,15 +802,18 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) } else { - para = para_next( para ); - if (!para_next( para )) + ME_Paragraph *other_para = para_next( para ); + if (!para_next( other_para )) { if (cursor->run == run) return FALSE; nOffset = 0; break; } - if (para->nFlags & MEPF_ROWSTART) para = para_next( para ); - if (cursor->run == run) run = para_first_run( para ); + if (other_para->nFlags & MEPF_ROWSTART) other_para = para_next( other_para ); + if (cursor->run == run) { + para = other_para; + run = para_first_run( para ); + } nOffset = 0; break; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c34d30c6cbd..d142d66f04f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7231,7 +7231,6 @@ static void test_word_movement_multiline(void) sel_start = sel_end = 0xdeadbeefUL; SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); - todo_wine ok(sel_start == 11, "expected sel_start to be %u, got %lu.\n", 11, sel_start); send_ctrl_key(hwnd, VK_RIGHT); @@ -7239,7 +7238,6 @@ static void test_word_movement_multiline(void) sel_start = sel_end = 0xdeadbeefUL; SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); - todo_wine ok(sel_start == 12, "expected sel_start to be %u, got %lu.\n", 12, sel_start); send_ctrl_key(hwnd, VK_LEFT); @@ -7247,7 +7245,6 @@ static void test_word_movement_multiline(void) sel_start = sel_end = 0xdeadbeefUL; SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); - todo_wine ok(sel_start == 11, "expected sel_start to be %u, got %lu.\n", 11, sel_start); DestroyWindow(hwnd);

1 0

Brendan Shanks : ntdll: Add a WARN when setting debug registers fails under Rosetta.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: eb52b68270cd6fde3150e4b0c3a272ec1b638eb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb52b68270cd6fde3150e4b0c3a272… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 16 21:58:26 2023 -0800 ntdll: Add a WARN when setting debug registers fails under Rosetta. (cherry picked from commit 39655dade3c802557754439451279c5b59b31ce8) --- dlls/ntdll/unix/signal_x86_64.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 94d79b9cdd1..391f244cbb2 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1001,6 +1001,10 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (!self) { ret = set_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_AMD64 ); +#ifdef __APPLE__ + if ((flags & CONTEXT_DEBUG_REGISTERS) && (ret == STATUS_UNSUCCESSFUL)) + WARN_(seh)( "Setting debug registers is not supported under Rosetta\n" ); +#endif if (ret || !self) return ret; if (flags & CONTEXT_DEBUG_REGISTERS) {

1 0

Illia Polishchuk : d3d9/tests: Add test for non-indexed instancing drawing.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 37731bb0a40ea5fe27c4d01e6936ca49c6cc649e URL: https://gitlab.winehq.org/wine/wine/-/commit/37731bb0a40ea5fe27c4d01e6936ca… Author: Illia Polishchuk <illia.a.polishchuk(a)globallogic.com> Date: Tue Feb 28 23:10:24 2023 +0200 d3d9/tests: Add test for non-indexed instancing drawing. Windows d3d9 always draws only a single instance for non-indexed draws. (cherry picked from commit 6df6c7fe0cf026ddd3b8c9a7246906d3c0c438c7) --- dlls/d3d9/tests/visual.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 230f7deabb2..cdc9ed11a00 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13090,6 +13090,36 @@ static void stream_test(void) hr = IDirect3DDevice9_SetStreamSource(device, act.strInstance, vb3, 0, sizeof(instancepos[0])); ok(SUCCEEDED(hr), "Failed to set stream source, hr %#lx.\n", hr); + /* Non-indexed draw test. Only a single instance should be drawn. */ + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 1); + ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr); + + /* Check that only single triangle instance has beed drawn with non-indexed draw. */ + color = getPixelColor(device, 200, 340); + ok(color == act.color1, "has color 0x%08x, expected 0x%08x (case %i)\n", color, act.color1, i); + color = getPixelColor(device, 400, 340); + todo_wine_if(color != 0x00ffffff) + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + color = getPixelColor(device, 400, 180); + todo_wine_if(color != 0x00ffffff) + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + color = getPixelColor(device, 200, 180); + todo_wine_if(color != 0x00ffffff) + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#lx.\n", hr); + + /* Indexed draw test. */ hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr); hr = IDirect3DDevice9_EndScene(device);

1 0

Jason Millard : vbscript: Fix compile issue with non hex after concat without space.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: b2cbc264c93677e106cfd59a2b52db16024b2ad7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2cbc264c93677e106cfd59a2b52db… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Feb 15 16:56:28 2023 -0500 vbscript: Fix compile issue with non hex after concat without space. (cherry picked from commit e8bd066514fb343790b3831d3e62709f80366d61) --- dlls/vbscript/lex.c | 2 +- dlls/vbscript/tests/lang.vbs | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 38ee4a5fd4b..8c5c69ea429 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -473,7 +473,7 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) case '#': return parse_date_literal(ctx, lval); case '&': - if(*++ctx->ptr == 'h' || *ctx->ptr == 'H') + if((*++ctx->ptr == 'h' || *ctx->ptr == 'H') && hex_to_int(ctx->ptr[1]) != -1) return parse_hex_literal(ctx, lval); return '&'; case '=': diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4a629627a16..77e132133b0 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -18,7 +18,7 @@ OPTION EXPLICIT : : DIM W -dim x, y, z, e +dim x, y, z, e, hi Dim obj call ok(true, "true is not true?") @@ -62,6 +62,11 @@ Call ok(&hfffe& = 65534, "&hfffe& <> -2") Call ok(&hffffffff& = -1, "&hffffffff& <> -1") Call ok((&h01or&h02)=3,"&h01or&h02 <> 3") +' Test concat when no space and var begins with h +hi = "y" +x = "x" &hi +Call ok(x = "xy", "x = " & x & " expected ""xy""") + W = 5 Call ok(W = 5, "W = " & W & " expected " & 5)

1 0