wine-commits April 2023

wine-commits@winehq.org

1 participants
817 discussions

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

20 Apr '23

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

Jinoh Kang : riched20/tests: Test for word movement across paragraph boundary.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Eric Pouech : ntdll: Implement RtlAddressInSectionTable.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Alex Henrie : shell32: Add support for Program Manager icons with arguments.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Brendan Shanks : ntdll: Add a WARN when setting debug registers fails under Rosetta.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Brendan Shanks : server: On macOS, fake debug registers when running under Rosetta.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Brendan Shanks : loader: In macOS preloader, stop using mincore() to test if a region is empty.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 1883b78e906640718a23b9f2e10c9c6620054ebc URL: https://gitlab.winehq.org/wine/wine/-/commit/1883b78e906640718a23b9f2e10c9c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 28 12:31:25 2023 -0800 loader: In macOS preloader, stop using mincore() to test if a region is empty. (cherry picked from commit 93941d6ec67860778a2b26470ba06f7439b9992e) --- loader/preloader_mac.c | 58 +++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 934d6b2ed02..8986d234e62 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -48,6 +48,7 @@ #include "wine/asm.h" #include "main.h" +#if defined(__x86_64__) /* Rosetta on Apple Silicon allocates memory starting at 0x100000000 (the 4GB line) * before the preloader runs, which prevents any nonrelocatable EXEs with that * base address from running. @@ -55,8 +56,18 @@ * This empty linker section forces Rosetta's allocations (currently ~132 MB) * to start at 0x114000000, and they should end below 0x120000000. */ -#if defined(__x86_64__) __asm__(".zerofill WINE_4GB_RESERVE,WINE_4GB_RESERVE,___wine_4gb_reserve,0x14000000"); + +static const struct wine_preload_info zerofill_sections[] = +{ + { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ + { 0, 0 } /* end of list */ +}; +#else +static const struct wine_preload_info zerofill_sections[] = +{ + { 0, 0 } /* end of list */ +}; #endif #ifndef LC_MAIN @@ -144,7 +155,6 @@ void __stack_chk_fail(void) { return; } #ifdef __i386__ -static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header #define target_segment_command segment_command @@ -219,7 +229,6 @@ __ASM_GLOBAL_FUNC( start, #elif defined(__x86_64__) -static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header_64 #define target_segment_command segment_command_64 @@ -302,9 +311,6 @@ SYSCALL_FUNC( wld_mmap, 197 /* SYS_mmap */ ); void *wld_munmap( void *start, size_t len ); SYSCALL_FUNC( wld_munmap, 73 /* SYS_munmap */ ); -int wld_mincore( void *addr, size_t length, unsigned char *vec ); -SYSCALL_FUNC( wld_mincore, 78 /* SYS_mincore */ ); - static intptr_t (*p_dyld_get_image_slide)( const struct target_mach_header* mh ); #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -556,28 +562,17 @@ static void *get_entry_point( struct target_mach_header *mh, intptr_t slide, int return NULL; }; -static int is_region_empty( struct wine_preload_info *info ) +static int is_zerofill( struct wine_preload_info *info ) { - unsigned char vec[1024]; - size_t pos, size, block = 1024 * page_size; int i; - for (pos = 0; pos < info->size; pos += size) + for (i = 0; zerofill_sections[i].size; i++) { - size = (pos + block <= info->size) ? block : (info->size - pos); - if (wld_mincore( (char *)info->addr + pos, size, vec ) == -1) - { - if (size <= page_size) continue; - block = page_size; size = 0; /* retry with smaller block size */ - } - else - { - for (i = 0; i < size / page_size; i++) - if (vec[i] & 1) return 0; - } + if ((zerofill_sections[i].addr == info->addr) && + (zerofill_sections[i].size == info->size)) + return 1; } - - return 1; + return 0; } static int map_region( struct wine_preload_info *info ) @@ -585,20 +580,11 @@ static int map_region( struct wine_preload_info *info ) int flags = MAP_PRIVATE | MAP_ANON; void *ret; - if (!info->addr) flags |= MAP_FIXED; + if (!info->addr || is_zerofill( info )) flags |= MAP_FIXED; - for (;;) - { - ret = wld_mmap( info->addr, info->size, PROT_NONE, flags, -1, 0 ); - if (ret == info->addr) return 1; - if (ret != (void *)-1) wld_munmap( ret, info->size ); - if (flags & MAP_FIXED) break; - - /* Some versions of macOS ignore the address hint passed to mmap - - * use mincore() to check if its empty and then use MAP_FIXED */ - if (!is_region_empty( info )) break; - flags |= MAP_FIXED; - } + ret = wld_mmap( info->addr, info->size, PROT_NONE, flags, -1, 0 ); + if (ret == info->addr) return 1; + if (ret != (void *)-1) wld_munmap( ret, info->size ); /* don't warn for zero page */ if (info->addr >= (void *)0x1000)

1 0

Brendan Shanks : loader: In macOS preloader, move the top-down allocations area down.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 0c743ba055e3d4538ce040a03eb3dc6cb9cb022d URL: https://gitlab.winehq.org/wine/wine/-/commit/0c743ba055e3d4538ce040a03eb3dc… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 28 11:14:16 2023 -0800 loader: In macOS preloader, move the top-down allocations area down. On Ventura, the Rosetta runtime and dyld shared cache now reach down to 0x7ff7fffb8000 on my system. (cherry picked from commit c10207e2a7ed2d5fd8b7d3f5c35a632b209d442b) --- loader/preloader_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 5df185d0960..934d6b2ed02 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -85,7 +85,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ - { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ + { (void *)0x7ff000000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

Jason Millard : vbscript: Fix compile issue with non hex after concat without space.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Jason Millard : vbscript: Fix compile when statement after ElseIf or after separator.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 270c09ee8e03c79af4fbd1ca69870cb132b670c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/270c09ee8e03c79af4fbd1ca69870c… Author: Jason Millard <jsm174(a)gmail.com> Date: Tue Feb 14 10:02:09 2023 -0500 vbscript: Fix compile when statement after ElseIf or after separator. (cherry picked from commit 887e72b24ead813facc3bd2ec9fd90a268d0dcd8) --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 03415dc2b1c..9ae6c478bfa 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -314,7 +314,7 @@ ElseIfs | ElseIf ElseIfs { $1->next = $2; $$ = $1; } ElseIf - : tELSEIF Expression tTHEN tNL StatementsNl_opt + : tELSEIF Expression tTHEN StSep_opt StatementsNl_opt { $$ = new_elseif_decl(ctx, @$, $2, $5); } Else_opt diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1707cc9a92b..4a629627a16 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -337,6 +337,23 @@ ElseIf not False Then End If Call ok(x, "elseif not called?") +' ElseIf with statement on same line +x = false +If false Then + Call ok(false, "inside if false") +ElseIf not False Then x = true +End If +Call ok(x, "elseif not called?") + +' ElseIf with statement following statement separator +x = false +If false Then + Call ok(false, "inside if false") +ElseIf not False Then +: x = true +End If +Call ok(x, "elseif not called?") + x = false if 1 then x = true Call ok(x, "if 1 not run?")

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2023