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

Henri Verbeet : wined3d: Introduce a slab allocator for small buffers.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: f31a29b8d1ea478af28f14cdaf3db1515a932853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f31a29b8d1ea478af28f14cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 20 23:48:26 2020 +0430 wined3d: Introduce a slab allocator for small buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 29 ++++++- dlls/wined3d/context_vk.c | 192 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/texture.c | 4 +- dlls/wined3d/wined3d_private.h | 29 +++++++ include/wine/rbtree.h | 16 ++++ 5 files changed, 264 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f31a29b8d1ea478af28f…

1 0

Roman Pišl : user32/edit: Avoid division by zero in EDIT_EM_LineScroll_internal.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: f04d8a270e903a4772cdc39107a5aba5d1cb32ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=f04d8a270e903a4772cdc391… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Apr 20 12:20:15 2020 +0200 user32/edit: Avoid division by zero in EDIT_EM_LineScroll_internal. 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 | 8 ++++++-- dlls/user32/tests/edit.c | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index aba6a084a2..683c2faea3 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1674,8 +1674,12 @@ static BOOL EDIT_EM_LineScroll_internal(EDITSTATE *es, INT dx, INT dy) { INT nyoff; INT x_offset_in_pixels; - INT lines_per_page = (es->format_rect.bottom - es->format_rect.top) / - es->line_height; + INT lines_per_page; + + if (!es->line_height || !es->char_width) + return TRUE; + + lines_per_page = (es->format_rect.bottom - es->format_rect.top) / es->line_height; if (es->style & ES_MULTILINE) { diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 2289bbf03f..34bb1e5a76 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1765,6 +1765,8 @@ static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, 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); + r = SendMessageA(hwnd, EM_LINESCROLL, 1, 1); + ok(r == 1, "Returned %ld, expected 1.\n", r); return result; @@ -1775,6 +1777,8 @@ static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, 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); + r = SendMessageA(hwnd, EM_LINESCROLL, 1, 1); + ok(r == 1, "Returned %ld, expected 1.\n", r); break; }

1 0

Francois Gouget : adsldp: Fix typos and spelling issues in FIXME() messages.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: d452578185755d609ee743d1ae20094241996e86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d452578185755d609ee743d1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 20 03:57:05 2020 +0200 adsldp: Fix typos and spelling issues in FIXME() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c39221ec02..13bd73c129 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1150,7 +1150,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_SEARCH_SCOPE: if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) { - FIXME("ADS_SEARCHPREF_SEACH_SCOPE: not supported dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_SEARCH_SCOPE: unsupported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1224,7 +1224,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_PAGESIZE: if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) { - FIXME("ADS_SEARCHPREF_PAGESIZE: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_PAGESIZE: unsupported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1237,7 +1237,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_CACHE_RESULTS: if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) { - FIXME("ADS_SEARCHPREF_CACHE_RESULTS: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_CACHE_RESULTS: unsupported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1250,7 +1250,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_ATTRIBTYPES_ONLY: if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) { - FIXME("ADS_SEARCHPREF_ATTRIBTYPES_ONLY: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_ATTRIBTYPES_ONLY: unsupported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1263,7 +1263,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_TOMBSTONE: if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) { - FIXME("ADS_SEARCHPREF_TOMBSTONE: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_TOMBSTONE: unsupported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; }

1 0

Paul Gofman : quartz/filesource: Check for past EOF read in _Request().
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: f71deb066f010bebad9ef1941c22666b029af00b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f71deb066f010bebad9ef194… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 20 02:05:59 2020 +0300 quartz/filesource: Check for past EOF read in _Request(). On Vista+ ReadFile() returns FALSE and sets ERROR_IO_PENDING even if the requested read results in ERROR_HANDLE_EOF. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 8983f7317b..a553b8517e 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -723,6 +723,9 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader *iface, IMediaSample if (FAILED(hr = IMediaSample_GetTime(sample, &start, &end))) return hr; + if (BYTES_FROM_MEDIATIME(start) >= filter->file_size.QuadPart) + return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF); + if (FAILED(hr = IMediaSample_GetPointer(sample, &data))) return hr;

1 0

Sven Baars : ntdll: Fix a string leak in init_user_process_params (Valgrind).
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 9ce4383128562eeab60297f661f4e596d493d309 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ce4383128562eeab60297f6… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 18 22:06:47 2020 +0200 ntdll: Fix a string leak in init_user_process_params (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index b15a425556..6670786def 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1471,6 +1471,7 @@ void init_user_process_params( SIZE_T data_size ) params->Environment = env; NtCurrentTeb()->Peb->ProcessParameters = params; + RtlFreeUnicodeString( &initial_params.ImagePathName ); RtlFreeUnicodeString( &cmdline ); RtlReleasePath( load_path );

1 0

Roman Pišl : comctl32/edit: Avoid division by zero during initialization.
by Alexandre Julliard April 20, 2020

April 20, 2020

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 April 20, 2020

April 20, 2020

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 April 20, 2020

April 20, 2020

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

Jacek Caban : kernel32/tests: Avoid arithmetic on pointer to stack variable.
by Alexandre Julliard April 20, 2020

April 20, 2020

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

Alexandre Julliard : ntdll: Also ignore missing directories in NtGetNlsSectionPtr().
by Alexandre Julliard April 20, 2020

April 20, 2020

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