April 2020 - Wine-commits - list.winehq.org

Jacek Caban : appwiz.cpl: Explicitly compare strcmp result to 0.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: a2b08874cc2fc805558d416c3499d7cbe36a2170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2b08874cc2fc805558d416c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 14:40:11 2020 +0200 appwiz.cpl: Explicitly compare strcmp result to 0. Fixes clang warning: addons.c:318:29: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand] Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index c1405d5ec8..d73b72a773 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -321,7 +321,7 @@ static enum install_res install_from_default_dir(void) if (ret == INSTALL_NEXT) ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name); - if (ret == INSTALL_NEXT && strcmp(INSTALL_DATADIR, "/usr/share")) + if (ret == INSTALL_NEXT && strcmp(INSTALL_DATADIR, "/usr/share") != 0) ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name); if (ret == INSTALL_NEXT) ret = install_from_unix_file("/opt/wine/", addon->subdir_name, addon->file_name);

1 0

Paul Gofman : quartz/filesource: Store file size on load.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: e0049050445896a79e1e0a15b1ae6215535c8f2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0049050445896a79e1e0a15… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 20 03:53:20 2020 +0300 quartz/filesource: Store file size on load. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 3b19d6e7df..8983f7317b 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -64,6 +64,7 @@ struct async_reader LPOLESTR pszFileName; AM_MEDIA_TYPE mt; HANDLE file, port, io_thread; + LARGE_INTEGER file_size; CRITICAL_SECTION sample_cs; BOOL flushing; struct request *requests; @@ -474,6 +475,12 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi return HRESULT_FROM_WIN32(GetLastError()); } + if (!GetFileSizeEx(hFile, &This->file_size)) + { + WARN("Could not get file size.\n"); + return HRESULT_FROM_WIN32(GetLastError()); + } + if (This->pszFileName) { free(This->pszFileName); @@ -883,14 +890,10 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface, static HRESULT WINAPI FileAsyncReader_Length(IAsyncReader *iface, LONGLONG *total, LONGLONG *available) { struct async_reader *filter = impl_from_IAsyncReader(iface); - DWORD low, high; TRACE("iface %p, total %p, available %p.\n", iface, total, available); - if ((low = GetFileSize(filter->file, &high)) == -1 && GetLastError() != NO_ERROR) - return HRESULT_FROM_WIN32(GetLastError()); - - *available = *total = (LONGLONG)low | (LONGLONG)high << (sizeof(DWORD) * 8); + *available = *total = filter->file_size.QuadPart; return S_OK; }

1 0

Roman Pišl : user32/edit: Avoid division by zero during initialization.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: d5e591d3cb55530cab33e5f6114b1519ec286d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5e591d3cb55530cab33e5f6… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Apr 20 12:20:13 2020 +0200 user32/edit: Avoid division by zero during initialization. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19239 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 4 +-- dlls/user32/tests/edit.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 557a091c0d..aba6a084a2 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -465,7 +465,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, IN static inline INT get_vertical_line_count(EDITSTATE *es) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = es->line_height ? (es->format_rect.bottom - es->format_rect.top) / es->line_height : 0; return max(1,vlc); } @@ -1638,7 +1638,7 @@ static void EDIT_UpdateScrollInfo(EDITSTATE *es) si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE | SIF_DISABLENOSCROLL; si.nMin = 0; si.nMax = es->line_count - 1; - si.nPage = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + si.nPage = es->line_height ? (es->format_rect.bottom - es->format_rect.top) / es->line_height : 0; si.nPos = es->y_offset; TRACE("SB_VERT, nMin=%d, nMax=%d, nPage=%d, nPos=%d\n", si.nMin, si.nMax, si.nPage, si.nPos); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index e3ed3341d6..2289bbf03f 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1743,6 +1743,71 @@ static BOOL is_font_installed(const char*name) return ret; } +static WNDPROC orig_class_proc; + +static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + RECT rect; + LRESULT result, r; + + switch (message) + { + case WM_NCCREATE: + result = CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); + + memset(&rect, 0, sizeof(rect)); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rect); + ok(!rect.right && !rect.bottom, "Invalid size after NCCREATE: %d x %d\n", rect.right, rect.bottom); + + /* test that messages between WM_NCCREATE and WM_CREATE + don't crash or cause unexpected behavior */ + r = SendMessageA(hwnd, EM_SETSEL, 0, 0); + ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); + todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + + return result; + + case WM_CREATE: + /* test that messages between WM_NCCREATE and WM_CREATE + don't crash or cause unexpected behavior */ + r = SendMessageA(hwnd, EM_SETSEL, 0, 0); + ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); + todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + + break; + } + + return CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); +} + +static void test_initialization(void) +{ + BOOL ret; + ATOM atom; + HWND hwEdit; + WNDCLASSA cls; + + ret = GetClassInfoA(NULL, "Edit", &cls); + ok(ret, "Failed to get class info.\n"); + + orig_class_proc = cls.lpfnWndProc; + cls.lpfnWndProc = test_class_proc; + cls.lpszClassName = "TestClassName"; + + atom = RegisterClassA(&cls); + ok(atom != 0, "Failed to register class.\n"); + + hwEdit = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atom), "Text Text", + ES_MULTILINE | WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL | WS_VSCROLL, + 10, 10, 300, 300, NULL, NULL, hinst, NULL); + ok(hwEdit != NULL, "Failed to create a window.\n"); + + DestroyWindow(hwEdit); + UnregisterClassA((LPCSTR)MAKEINTATOM(atom), hinst); +} + static void test_margins(void) { HWND hwEdit; @@ -3268,6 +3333,7 @@ START_TEST(edit) test_edit_control_6(); test_edit_control_limittext(); test_edit_control_scroll(); + test_initialization(); test_margins(); test_margins_font_change(); test_text_position();

1 0

Gerald Pfeifer : ntdll: Fix call_constructor build on FreeBSD.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 973138c06891b9ec36c0c6cd6ca593554bb69043 URL: https://source.winehq.org/git/wine.git/?a=commit;h=973138c06891b9ec36c0c6cd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Apr 19 10:43:44 2020 +0200 ntdll: Fix call_constructor build on FreeBSD. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c713a5d0a6..b0d5cf46a5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1324,17 +1324,21 @@ static void call_constructors( WINE_MODREF *wm ) void (*init_func)(int, char **, char **) = NULL; void (**init_array)(int, char **, char **) = NULL; ULONG_PTR i, init_arraysz = 0; +#ifdef _WIN64 + const Elf64_Dyn *dyn; +#else + const Elf32_Dyn *dyn; +#endif if (dlinfo( wm->so_handle, RTLD_DI_LINKMAP, &map ) == -1) return; - while (map->l_ld->d_tag) + for (dyn = map->l_ld; dyn->d_tag; dyn++) { - switch (map->l_ld->d_tag) + switch (dyn->d_tag) { - case 0x60009990: init_array = (void *)((char *)map->l_addr + map->l_ld->d_un.d_val); break; - case 0x60009991: init_arraysz = map->l_ld->d_un.d_val; break; - case 0x60009992: init_func = (void *)((char *)map->l_addr + map->l_ld->d_un.d_val); break; + case 0x60009990: init_array = (void *)((char *)map->l_addr + dyn->d_un.d_val); break; + case 0x60009991: init_arraysz = dyn->d_un.d_val; break; + case 0x60009992: init_func = (void *)((char *)map->l_addr + dyn->d_un.d_val); break; } - map->l_ld++; } TRACE( "%s: got init_func %p init_array %p %lu\n", debugstr_us( &wm->ldr.BaseDllName ),

1 0

Alexandre Julliard : ntdll: Don't abort directory search in single entry mode when a file is ignored.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: fecaa443b5c60f00cbac7116781a396807f416a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fecaa443b5c60f00cbac7116… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 20 17:41:12 2020 +0200 ntdll: Don't abort directory search in single entry mode when a file is ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48960 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index be55a5a8c1..b8cfe507ed 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2008,7 +2008,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH NtQueryDirectoryFile( HANDLE handle, HANDLE ev { status = get_dir_data_entry( data, buffer, io, length, info_class, &last_info ); if (!status || status == STATUS_BUFFER_OVERFLOW) data->pos++; - if (single_entry) break; + if (single_entry && last_info) break; } if (!last_info) status = STATUS_NO_MORE_FILES;

1 0

Roman Pišl : comctl32/edit: Avoid division by zero during initialization.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 571489fde199368ec7bcf367a8ab2af347a37b7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=571489fde199368ec7bcf367… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Apr 20 12:20:12 2020 +0200 comctl32/edit: Avoid division by zero during initialization. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48803 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 4 +-- dlls/comctl32/tests/edit.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index d02d7af7b9..b0c32445b0 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -406,7 +406,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, IN static inline INT get_vertical_line_count(EDITSTATE *es) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = es->line_height ? (es->format_rect.bottom - es->format_rect.top) / es->line_height : 0; return max(1,vlc); } @@ -1543,7 +1543,7 @@ static void EDIT_UpdateScrollInfo(EDITSTATE *es) si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE | SIF_DISABLENOSCROLL; si.nMin = 0; si.nMax = es->line_count - 1; - si.nPage = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + si.nPage = es->line_height ? (es->format_rect.bottom - es->format_rect.top) / es->line_height : 0; si.nPos = es->y_offset; TRACE("SB_VERT, nMin=%d, nMax=%d, nPage=%d, nPos=%d\n", si.nMin, si.nMax, si.nPage, si.nPos); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index cec6025077..763ade4831 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1768,6 +1768,71 @@ static BOOL is_font_installed(const char*name) return ret; } +static WNDPROC orig_class_proc; + +static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + RECT rect; + LRESULT result, r; + + switch (message) + { + case WM_NCCREATE: + result = CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); + + memset(&rect, 0, sizeof(rect)); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rect); + ok(!rect.right && !rect.bottom, "Invalid size after NCCREATE: %d x %d\n", rect.right, rect.bottom); + + /* test that messages between WM_NCCREATE and WM_CREATE + don't crash or cause unexpected behavior */ + r = SendMessageA(hwnd, EM_SETSEL, 0, 0); + ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); + todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + + return result; + + case WM_CREATE: + /* test that messages between WM_NCCREATE and WM_CREATE + don't crash or cause unexpected behavior */ + r = SendMessageA(hwnd, EM_SETSEL, 0, 0); + ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); + todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + + break; + } + + return CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); +} + +static void test_initialization(void) +{ + BOOL ret; + ATOM atom; + HWND hwEdit; + WNDCLASSA cls; + + ret = GetClassInfoA(NULL, "Edit", &cls); + ok(ret, "Failed to get class info.\n"); + + orig_class_proc = cls.lpfnWndProc; + cls.lpfnWndProc = test_class_proc; + cls.lpszClassName = "TestClassName"; + + atom = RegisterClassA(&cls); + ok(atom != 0, "Failed to register class.\n"); + + hwEdit = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atom), "Text Text", + ES_MULTILINE | WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL | WS_VSCROLL, + 10, 10, 300, 300, NULL, NULL, hinst, NULL); + ok(hwEdit != NULL, "Failed to create a window.\n"); + + DestroyWindow(hwEdit); + UnregisterClassA((LPCSTR)MAKEINTATOM(atom), hinst); +} + static void test_margins(void) { DWORD old_margins, new_margins; @@ -3393,6 +3458,7 @@ START_TEST(edit) test_edit_control_6(); test_edit_control_limittext(); test_edit_control_scroll(); + test_initialization(); test_margins(); test_margins_font_change(); test_text_position();

1 0

Alexandre Julliard : include: Also undefine PAGE_SHIFT to avoid compiler warnings.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: e2bcbdebd6dcc36aff1a7e6dd6a41eed1bb82eb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2bcbdebd6dcc36aff1a7e6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 20 12:53:56 2020 +0200 include: Also undefine PAGE_SHIFT to avoid compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5afd274e22..b180d11556 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -30,6 +30,7 @@ /* FIXME: We suppose that page size is 4096 */ #undef PAGE_SIZE +#undef PAGE_SHIFT #define PAGE_SIZE 0x1000 #define PAGE_SHIFT 12

1 0

Sven Baars : kernel32: Fix a memory leak in MoveFileWithProgressW (Valgrind).
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 1b6b0cda7aee8fc47f61c212bc22d305725b277d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b6b0cda7aee8fc47f61c212… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 18 16:13:21 2020 +0200 kernel32: Fix a memory leak in MoveFileWithProgressW (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 334fc25e87..93759592c4 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -502,6 +502,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, memcpy( rename_info->FileName, nt_name.Buffer, nt_name.Length ); RtlFreeUnicodeString( &nt_name ); status = NtSetInformationFile( source_handle, &io, rename_info, size, FileRenameInformation ); + HeapFree( GetProcessHeap(), 0, rename_info ); if (status == STATUS_NOT_SAME_DEVICE && (flag & MOVEFILE_COPY_ALLOWED)) { NtClose( source_handle );

1 0

Alexandre Julliard : ntdll: Also ignore missing directories in NtGetNlsSectionPtr().
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: abb33fb90edadb3bef834c25e876fd43e7d8229b URL: https://source.winehq.org/git/wine.git/?a=commit;h=abb33fb90edadb3bef834c25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 20 20:15:56 2020 +0200 ntdll: Also ignore missing directories in NtGetNlsSectionPtr(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48966 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index ff9d713624..a28f5d0f58 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -665,7 +665,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); if (!status) TRACE( "found %s\n", debugstr_w( valueW.Buffer )); RtlFreeUnicodeString( &valueW ); - if (status != STATUS_OBJECT_NAME_NOT_FOUND) return status; + if (status != STATUS_OBJECT_NAME_NOT_FOUND && status != STATUS_OBJECT_PATH_NOT_FOUND) return status; /* not found, try in build or data dir */

1 0

Jacek Caban : kernel32/tests: Avoid arithmetic on pointer to stack variable.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 25ed1d9e820ff997574d38092859298051e5cd35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25ed1d9e820ff997574d3809… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 14:13:40 2020 +0200 kernel32/tests: Avoid arithmetic on pointer to stack variable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 99dde34396..f576d132d8 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2865,8 +2865,8 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) success = VirtualProtect( base, size, PAGE_READWRITE, &old_prot ); ok( success, "VirtualProtect failed %u\n", GetLastError() ); - ret = (DWORD_PTR)atl5_test_func; - ret = call_proc_excpt( (void *)base, &ret - 1 ); + results[1] = atl5_test_func; + ret = call_proc_excpt( (void *)base, results ); /* FIXME: We don't check the content of the registers EAX/ECX yet */ ok( ret == 44, "call returned wrong result, expected 44, got %d\n", ret ); ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls );

1 0