February 2019 - Wine-Commits

Alexandre Julliard : crypt32: Don' t build password_to_ascii without GnuTLS.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 5cfeed53974ed8d670170131b61fe17403f17e4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cfeed53974ed8d670170131… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 18:32:12 2019 +0100 crypt32: Don't build password_to_ascii without GnuTLS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index 46bf356..a515585 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -240,8 +240,6 @@ done: return prov; } -#endif - static char *password_to_ascii( const WCHAR *str ) { char *ret; @@ -257,6 +255,8 @@ static char *password_to_ascii( const WCHAR *str ) return ret; } +#endif + HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *password, DWORD flags ) { #ifdef SONAME_LIBGNUTLS

1 0

Nikolay Sivov : uiautomationcore: Return success from UiaRaiseAutomationEvent().
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: d0727decdedb5aba250038458e0a28dec5687e50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0727decdedb5aba25003845… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 11 18:00:57 2019 +0300 uiautomationcore: Return success from UiaRaiseAutomationEvent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 31b7d3e..0730846 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -91,5 +91,5 @@ LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id) { FIXME("(%p, %d): stub\n", provider, id); - return E_NOTIMPL; + return S_OK; }

1 0

Paul Gofman : d3d8/tests: Add test for MaxVertexW device capability.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: e70c4846ff4f7755f7c00b19947c0b2cc44665d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e70c4846ff4f7755f7c00b19… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Feb 11 14:04:55 2019 +0300 d3d8/tests: Add test for MaxVertexW device capability. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 315640d..39a2359 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8758,6 +8758,8 @@ static void test_device_caps(void) /* AMD gives 6, Nvidia returns 8. */ ok(caps.MaxUserClipPlanes <= 8, "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Andrey Gusev : msi: Remove duplicate condition in msi_dialog_destroy().
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 57dd594865b002205edb4e053102241bed72bd1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=57dd594865b002205edb4e05… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 11 16:28:38 2019 +0200 msi: Remove duplicate condition in msi_dialog_destroy(). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b6de1f5..a3e5481 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4129,10 +4129,10 @@ void msi_dialog_destroy( msi_dialog *dialog ) } if( dialog->hwnd ) + { ShowWindow( dialog->hwnd, SW_HIDE ); - - if( dialog->hwnd ) DestroyWindow( dialog->hwnd ); + } /* unsubscribe events */ event_cleanup_subscriptions( dialog->package, dialog->name );

1 0

Paul Gofman : d3d9/tests: Add test for MaxVertexW device capability.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 2416578e32d0181f548582cce322874ee17d358c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2416578e32d0181f548582cc… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Feb 11 14:04:54 2019 +0300 d3d9/tests: Add test for MaxVertexW device capability. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ad1d289..2217569 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12643,6 +12643,8 @@ static void test_device_caps(void) /* AMD gives 6, Nvidia returns 8. */ ok(caps.MaxUserClipPlanes <= 8, "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Paul Gofman : wined3d: Return 1e10f for MaxVertexW from wined3d_get_device_caps().
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 91b43bca94750baf683cdb5852e9bc259a81e1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=91b43bca94750baf683cdb58… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Feb 11 14:04:53 2019 +0300 wined3d: Return 1e10f for MaxVertexW from wined3d_get_device_caps(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23863 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 75622be..827d4f6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2179,7 +2179,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxTextureRepeat = 32768; caps->MaxTextureAspectRatio = d3d_info->limits.texture_size; - caps->MaxVertexW = 1.0f; + caps->MaxVertexW = 1e10f; caps->GuardBandLeft = 0.0f; caps->GuardBandTop = 0.0f;

1 0

Alexandre Julliard : ntdll: Skip dlls of the wrong machine type when searching through the load path.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 9839bb7691a1b1c57a4ca501d03825420c1609d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9839bb7691a1b1c57a4ca501… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 9 21:21:47 2019 +0100 ntdll: Skip dlls of the wrong machine type when searching through the load path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 2 +- dlls/ntdll/loader.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 165c05e..7046afc 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -685,7 +685,7 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG /* some dlls with invalid entry point will crash, but this means we loaded the test dll */ ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); } - else todo_wine_if( !expect_status ) + else { ok( ldr_status == expect_status || broken(il_only && !expect_status && ldr_status == STATUS_INVALID_IMAGE_FORMAT), diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index dd6f437..56a6c2d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1999,12 +1999,6 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam TRACE("Trying native dll %s\n", debugstr_us(nt_name)); - if (!is_valid_binary( module, image_info )) - { - NtUnmapViewOfSection( NtCurrentProcess(), module ); - return STATUS_INVALID_IMAGE_FORMAT; - } - /* perform base relocation, if necessary */ if ((status = perform_relocations( module, nt, image_info->map_size ))) @@ -2363,6 +2357,12 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); } + if (!status && !is_valid_binary( *module, image_info )) + { + TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->machine ); + NtUnmapViewOfSection( NtCurrentProcess(), *module ); + status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + } return status; } @@ -2377,6 +2377,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * struct stat *st ) { WCHAR *name; + BOOL found_image = FALSE; NTSTATUS status = STATUS_DLL_NOT_FOUND; ULONG len = strlenW( paths ); @@ -2397,15 +2398,20 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * if (len && name[len - 1] != '\\') name[len++] = '\\'; strcpyW( name + len, search ); status = open_dll_file( name, nt_name, pwm, module, image_info, st ); - if (status != STATUS_DLL_NOT_FOUND) goto done; + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; + else if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( nt_name ); paths = ptr; } - /* not found, return file in the system dir to be loaded as builtin */ - strcpyW( name, system_dir ); - strcatW( name, search ); - if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; + if (!found_image) + { + /* not found, return file in the system dir to be loaded as builtin */ + strcpyW( name, system_dir ); + strcatW( name, search ); + if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; + } + else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; done: RtlFreeHeap( GetProcessHeap(), 0, name ); @@ -2463,6 +2469,8 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, else status = open_dll_file( libname, nt_name, pwm, module, image_info, st ); + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) status = STATUS_INVALID_IMAGE_FORMAT; + done: RtlFreeHeap( GetProcessHeap(), 0, dllname ); return status;

1 0

Alexandre Julliard : ntdll: Create the memory mapping for a dll directly at open time.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: f1bb3580e3676d5e389689a475a0faab576ea9cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1bb3580e3676d5e389689a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 9 10:59:47 2019 +0100 ntdll: Create the memory mapping for a dll directly at open time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 214 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 124 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1bb3580e3676d5e3896…

1 0

Alexandre Julliard : ntdll: Pass a flag instead of a file handle to load_builtin_dll().
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 4880a5a0f40f1007bc48b9e5a41c73a11eb4b63f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4880a5a0f40f1007bc48b9e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 9 09:48:00 2019 +0100 ntdll: Pass a flag instead of a file handle to load_builtin_dll(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e7a9c2c..701692a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2127,7 +2127,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam /*********************************************************************** * load_builtin_dll */ -static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, HANDLE file, +static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, BOOL has_file, DWORD flags, WINE_MODREF** pwm ) { char error[256], dllname[MAX_PATH]; @@ -2151,7 +2151,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_na info.status = STATUS_SUCCESS; info.wm = NULL; - if (file) /* we have a real file, try to load it */ + if (has_file) /* we have a real file, try to load it */ { ANSI_STRING unix_name; @@ -2565,19 +2565,19 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ nts = load_native_dll( load_path, &nt_name, handle, flags, pwm, &st ); if (nts == STATUS_INVALID_IMAGE_NOT_MZ) /* not in PE format, maybe it's a builtin */ - nts = load_builtin_dll( load_path, &nt_name, handle, flags, pwm ); + nts = load_builtin_dll( load_path, &nt_name, TRUE, flags, pwm ); } if (nts == STATUS_DLL_NOT_FOUND && loadorder == LO_NATIVE_BUILTIN) - nts = load_builtin_dll( load_path, &nt_name, 0, flags, pwm ); + nts = load_builtin_dll( load_path, &nt_name, FALSE, flags, pwm ); break; case LO_BUILTIN: case LO_BUILTIN_NATIVE: case LO_DEFAULT: /* default is builtin,native */ - nts = load_builtin_dll( load_path, &nt_name, handle, flags, pwm ); + nts = load_builtin_dll( load_path, &nt_name, handle != 0, flags, pwm ); if (!handle) break; /* nothing else we can try */ /* file is not a builtin library, try without using the specified file */ if (nts != STATUS_SUCCESS) - nts = load_builtin_dll( load_path, &nt_name, 0, flags, pwm ); + nts = load_builtin_dll( load_path, &nt_name, FALSE, flags, pwm ); if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) { @@ -3576,7 +3576,7 @@ void __wine_process_init(void) wine_dll_set_callback( load_builtin_callback ); RtlInitUnicodeString( &nt_name, kernel32W ); - if ((status = load_builtin_dll( NULL, &nt_name, 0, 0, &wm )) != STATUS_SUCCESS) + if ((status = load_builtin_dll( NULL, &nt_name, FALSE, 0, &wm )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); exit(1);

1 0

Gabriel Ivăncescu : user32/tests: Add tests for LB_INITSTORAGE.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 0d19628ef5511d23e2d793af4ad5adca0aede884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d19628ef5511d23e2d793af… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 8 13:17:22 2019 +0200 user32/tests: Add tests for LB_INITSTORAGE. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index b87acd7..7f1e9cf 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1824,6 +1824,69 @@ todo_wine DestroyWindow(parent); } +static void test_init_storage( void ) +{ + static const DWORD styles[] = + { + LBS_HASSTRINGS, + LBS_NODATA | LBS_OWNERDRAWFIXED, + }; + HWND parent, listbox; + LONG ret, items_size; + int i, j; + + parent = create_parent(); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + listbox = CreateWindowA("listbox", "TestList", styles[i] | WS_CHILD, + 0, 0, 100, 100, parent, (HMENU)1, NULL, 0); + + items_size = SendMessageA(listbox, LB_INITSTORAGE, 100, 0); + ok(items_size >= 100, "expected at least 100, got %d\n", items_size); + + ret = SendMessageA(listbox, LB_INITSTORAGE, 0, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* it doesn't grow since the space was already reserved */ + ret = SendMessageA(listbox, LB_INITSTORAGE, items_size, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* it doesn't shrink the reserved space */ + ret = SendMessageA(listbox, LB_INITSTORAGE, 42, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* now populate almost all of it so it's not reserved anymore */ + if (styles[i] & LBS_NODATA) + { + ret = SendMessageA(listbox, LB_SETCOUNT, items_size - 1, 0); + ok(ret == 0, "unexpected return value %d\n", ret); + } + else + { + for (j = 0; j < items_size - 1; j++) + { + ret = SendMessageA(listbox, LB_INSERTSTRING, -1, (LPARAM)""); + ok(ret == j, "expected %d, got %d\n", j, ret); + } + } + + /* we still have one more reserved slot, so it doesn't grow yet */ + ret = SendMessageA(listbox, LB_INITSTORAGE, 1, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* fill the slot and check again, it should grow this time */ + ret = SendMessageA(listbox, LB_INSERTSTRING, -1, (LPARAM)""); + ok(ret == items_size - 1, "expected %d, got %d\n", items_size - 1, ret); + ret = SendMessageA(listbox, LB_INITSTORAGE, 0, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + ret = SendMessageA(listbox, LB_INITSTORAGE, 1, 0); + ok(ret > items_size, "expected it to grow past %d, got %d\n", items_size, ret); + + DestroyWindow(listbox); + } + DestroyWindow(parent); +} + static void test_missing_lbuttonup( void ) { HWND listbox, parent, capture; @@ -2251,6 +2314,7 @@ START_TEST(listbox) test_listbox_LB_DIR(); test_listbox_dlgdir(); test_set_count(); + test_init_storage(); test_GetListBoxInfo(); test_missing_lbuttonup(); test_extents();

1 0