May 2020 - Wine-devel - list.winehq.org

[PATCH 2/2] kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle.
by Erich E. Hoover 24 May '20

24 May '20

This patch removes the volume querying information duplication in kernelbase by re-implementing GetVolumeInformation using GetVolumeInformationByHandle (itself implemented with NtQueryVolumeInformationFile). Best, Erich

1 0

[PATCH 1/2] ntdll: Allow NtQueryVolumeInformationFile to query volume information from the mountmgr.
by Erich E. Hoover 24 May '20

24 May '20

This patch allows NtQueryVolumeInformationFile to pass FileFsVolumeInformation and FileFsAttributeInformation requests to the mountmgr. These requests currently do not work for NT device paths, which results in a bunch of duplication in kernelbase. Best, Erich

1 0

[PATCH] server: Fail if non-empty directory marked for deletion.
by Daniel Lehman 24 May '20

24 May '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- needed by std::filesystem::remove_all, which removes files with: - CreateFileW - SetFileInformationByHandle(FileDispositionInfoEx) // currently unimplemented - SetFileInformationByHandle(FileDispositionInfo) - DeleteFile = TRUE - CloseHandle --- dlls/ntdll/tests/file.c | 3 --- server/fd.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31c18454f0..1d0682a633 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3185,17 +3185,14 @@ todo_wine CloseHandle( handle2 ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_DIRECTORY_NOT_EMPTY, "unexpected FileDispositionInformation result (expected STATUS_DIRECTORY_NOT_EMPTY, got %x)\n", res ); fileDeleted = DeleteFileA( buffer ); ok( fileDeleted, "File should have been deleted\n" ); buffer[dirpos] = '\0'; CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); fileDeleted = RemoveDirectoryA( buffer ); -todo_wine ok( fileDeleted, "Directory should have been deleted\n" ); } diff --git a/server/fd.c b/server/fd.c index 39fb419f25..db1559865b 100644 --- a/server/fd.c +++ b/server/fd.c @@ -93,6 +93,9 @@ #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif +#ifdef HAVE_DIRENT_H +#include <dirent.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2359,6 +2362,37 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } +#ifdef HAVE_DIRENT_H + /* can't remove non-empty directories */ + if (unlink && S_ISDIR(st.st_mode)) + { + DIR *dir; + int empty; + struct dirent *de; + + if (!(dir = fdopendir( fd->unix_fd ))) + { + file_set_error(); + return; + } + + empty = 1; + while ((de = readdir( dir ))) + { + if (!strcmp( de->d_name, "." ) || !strcmp( de->d_name, ".." )) continue; + empty = 0; + break; + } + closedir( dir ); + + if (!empty) + { + set_error( STATUS_DIRECTORY_NOT_EMPTY ); + return; + } + } +#endif + fd->closed->unlink = unlink ? 1 : 0; if (fd->options & FILE_DELETE_ON_CLOSE) fd->closed->unlink = -1; -- 2.25.1

2 2

[PATCH resend 2/2] gdi32: Support LUID in D3DKMTOpenAdapterFromGdiDisplayName().
by Zhiyi Zhang 24 May '20

24 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/driver.c | 97 +++++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 2 + 3 files changed, 96 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index e1ac922ce52..32b2e6959c1 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -4,7 +4,7 @@ IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) -DELAYIMPORTS = usp10 +DELAYIMPORTS = usp10 setupapi C_SRCS = \ bidi.c \ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 90977383a58..0b9b4610ce8 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -31,10 +31,14 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winreg.h" #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" #include "winternl.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "ddk/d3dkmthk.h" #include "gdi_private.h" @@ -45,6 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(driver); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + struct graphics_driver { struct list entry; @@ -84,6 +90,7 @@ static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static HWND (WINAPI *pGetDesktopWindow)(void); static INT (WINAPI *pGetSystemMetrics)(INT); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); +static BOOL (WINAPI *pEnumDisplayDevicesW)(LPCWSTR, DWORD, DISPLAY_DEVICEW *, DWORD); /********************************************************************** * create_driver @@ -159,6 +166,20 @@ static BOOL is_display_device( LPCWSTR name ) return TRUE; } +static HANDLE get_display_device_init_mutex( void ) +{ + static const WCHAR init_mutex[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW( NULL, FALSE, init_mutex ); + + WaitForSingleObject( mutex, INFINITE ); + return mutex; +} + +static void release_display_device_init_mutex( HANDLE mutex ) +{ + ReleaseMutex( mutex ); + CloseHandle( mutex ); +} /********************************************************************** * DRIVER_load_driver @@ -1351,14 +1372,84 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) { static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; + static const WCHAR pciW[] = {'P','C','I',0}; static D3DKMT_HANDLE handle_start = 0; + DWORD size, type, device_index = 0; + DISPLAY_DEVICEW display_device; struct d3dkmt_adapter *adapter; + SP_DEVINFO_DATA device_data; + WCHAR buffer[MAX_PATH]; + BOOL found = FALSE; + HDEVINFO devinfo; + HMODULE user32; + HANDLE mutex; + LSTATUS ls; WCHAR *end; + HKEY hkey; + LUID luid; int id; TRACE("(%p) semi-stub\n", desc); - if (!desc || strncmpiW( desc->DeviceName, displayW, ARRAY_SIZE(displayW) )) + if (!desc) + return STATUS_UNSUCCESSFUL; + + if (!pEnumDisplayDevicesW) + { + user32 = LoadLibraryA( "user32.dll" ); + pEnumDisplayDevicesW = (void *)GetProcAddress( user32, "EnumDisplayDevicesW" ); + } + + display_device.cb = sizeof( display_device ); + while (pEnumDisplayDevicesW( NULL, device_index++, &display_device, 0 )) + { + if (!lstrcmpiW( display_device.DeviceName, desc->DeviceName ) && + display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + { + found = TRUE; + break; + } + } + + if (!found) + return STATUS_UNSUCCESSFUL; + + /* Get GPU LUID from SetupAPI */ + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_DISPLAY, pciW, NULL, 0 ); + + found = FALSE; + device_index = 0; + device_data.cbSize = sizeof(device_data); + while (SetupDiEnumDeviceInfo( devinfo, device_index++, &device_data )) + { + hkey = SetupDiOpenDevRegKey( devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ ); + if (hkey == INVALID_HANDLE_VALUE) + continue; + + size = sizeof(buffer); + ls = RegQueryValueExW( hkey, video_idW, 0, NULL, (BYTE *)buffer, &size ); + RegCloseKey( hkey ); + if (ls) + continue; + + /* Compare GPU GUID. The DeviceKey field from EnumDisplayDevicesW() is of form + * \Registry\Machine\System\CurrentControlSet\Control\Video\{GPU GUID}\0000 */ + if (strncmpiW( buffer, display_device.DeviceKey + 57, 38 )) + continue; + + if (SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof(luid), NULL, 0) ) + { + found = TRUE; + break; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + + if (!found) return STATUS_UNSUCCESSFUL; id = strtolW( desc->DeviceName + ARRAY_SIZE(displayW), &end, 10 ) - 1; @@ -1376,9 +1467,7 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); desc->hAdapter = handle_start; - /* FIXME: Support AdapterLuid */ - desc->AdapterLuid.LowPart = 0; - desc->AdapterLuid.HighPart = 0; + desc->AdapterLuid = luid; desc->VidPnSourceId = id; return STATUS_SUCCESS; } diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 6172d4a7983..c656eb4245a 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -86,6 +86,8 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); + ok(open_adapter_gdi_desc.AdapterLuid.LowPart || open_adapter_gdi_desc.AdapterLuid.HighPart, + "Expect LUID not zero.\n"); close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; status = pD3DKMTCloseAdapter(&close_adapter_desc); -- 2.25.1

1 0

[PATCH] gdi32: Automatically add vertical font family mappings.
by Akihiro Sagawa 24 May '20

24 May '20

For example, if you map MS Gothic to another font, Wine also maps @MS Gothic to the font for vertical writing. This only happens if the original is DBCS font. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)

1 0

[PATCH] gdi32: Also consider whether the face is vertical when using FontConfig.
by Akihiro Sagawa 24 May '20

24 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48440 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)

1 0

[PATCH] user32: Fix NULL dereference in UnregisterDeviceNotification
by Arkadiusz Hiler 23 May '20

23 May '20

UnregisterDeviceNotification when provided with NULL should not try to dereference it and just return FALSE. This fixes crashes in BandLab Cakewalk and Glorious Model O control software. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49211 Signed-off-by: Arkadiusz Hiler <arek(a)hiler.eu> --- dlls/sechost/service.c | 3 +++ dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/misc.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 dlls/user32/tests/misc.c diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 924a6c9264..68d2b9e78e 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -2109,6 +2109,9 @@ BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ) TRACE("%p\n", handle); + if (!handle) + return FALSE; + EnterCriticalSection( &service_cs ); list_remove( &registration->entry ); LeaveCriticalSection(&service_cs); diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index dd101d69f3..43f843bd09 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ input.c \ listbox.c \ menu.c \ + misc.c \ monitor.c \ msg.c \ resource.c \ diff --git a/dlls/user32/tests/misc.c b/dlls/user32/tests/misc.c new file mode 100644 index 0000000000..1f55a65a3e --- /dev/null +++ b/dlls/user32/tests/misc.c @@ -0,0 +1,33 @@ +/* + * Unit test suite for misc functions. + * + * Copyright 2020 Arkadiusz Hiler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include "winuser.h" + +static void test_UnregisterDeviceNotification(void) +{ + BOOL ret = UnregisterDeviceNotification(NULL); + ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret); +} + +START_TEST(misc) +{ + test_UnregisterDeviceNotification(); +} -- 2.26.2

1 0

[PATCH] user32: Fix NULL dereference in UnregisterDeviceNotification
by Arkadiusz Hiler 23 May '20

23 May '20

UnregisterDeviceNotification when provided with NULL should not try to dereference it and just return FALSE. Signed-off-by: Arkadiusz Hiler <arek(a)hiler.eu> --- dlls/sechost/service.c | 3 +++ dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/misc.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 dlls/user32/tests/misc.c diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 924a6c9264..68d2b9e78e 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -2109,6 +2109,9 @@ BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ) TRACE("%p\n", handle); + if (!handle) + return FALSE; + EnterCriticalSection( &service_cs ); list_remove( &registration->entry ); LeaveCriticalSection(&service_cs); diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index dd101d69f3..43f843bd09 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ input.c \ listbox.c \ menu.c \ + misc.c \ monitor.c \ msg.c \ resource.c \ diff --git a/dlls/user32/tests/misc.c b/dlls/user32/tests/misc.c new file mode 100644 index 0000000000..1f55a65a3e --- /dev/null +++ b/dlls/user32/tests/misc.c @@ -0,0 +1,33 @@ +/* + * Unit test suite for misc functions. + * + * Copyright 2020 Arkadiusz Hiler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include "winuser.h" + +static void test_UnregisterDeviceNotification(void) +{ + BOOL ret = UnregisterDeviceNotification(NULL); + ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret); +} + +START_TEST(misc) +{ + test_UnregisterDeviceNotification(); +} -- 2.26.2

4 6

[PATCH 1/2] wuapi: Add UpdateInstaller coclass.
by Gijs Vermeulen 23 May '20

23 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wuapi/main.c | 5 +++++ include/wuapi.idl | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index c2ed95ed42..63392b3660 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -111,6 +111,7 @@ static const struct IClassFactoryVtbl wucf_vtbl = static wucf sessioncf = { { &wucf_vtbl }, UpdateSession_create }; static wucf updatescf = { { &wucf_vtbl }, AutomaticUpdates_create }; static wucf sysinfocf = { { &wucf_vtbl }, SystemInformation_create }; +static wucf installercf = { { &wucf_vtbl }, UpdateInstaller_create }; static HINSTANCE instance; @@ -146,6 +147,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &sysinfocf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_UpdateInstaller )) + { + cf = &installercf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); } diff --git a/include/wuapi.idl b/include/wuapi.idl index d1a3593084..a0a8e4359a 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -1329,6 +1329,15 @@ interface ISystemInformation : IDispatch ] coclass AutomaticUpdates { interface IAutomaticUpdates; } +[ + helpstring("UpdateInstaller Class"), + threading(both), + progid("Microsoft.Update.Installer.1"), + vi_progid("Microsoft.Update.Installer"), + uuid(d2e0fe7f-d23e-48e1-93c0-6fa8cc346474) +] +coclass UpdateInstaller { interface IUpdateInstaller; } + [ helpstring("UpdateSession Class"), threading(both), -- 2.26.2

1 1

[PATCH] ntdll/tests: Fix a test failure on Server 2003.
by Thomas Faber 23 May '20

23 May '20

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- On my test machine, Eip is at KiFastSystemCallRet, which is not close enough to NtGetContextThread to pass the test: exception.c:1643: Test failed: wrong Eip 7c9493a4/7c91ee0c dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 72afb0a376..213cebb657 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1640,8 +1640,8 @@ static void test_thread_context(void) ok( context.Esp == expect.Esp - 12 || context.Esp == expect.Esp - 16, "wrong Esp %08x/%08x\n", context.Esp, expect.Esp ); /* Eip is somewhere close to the NtGetContextThread implementation */ - ok( (char *)context.Eip >= (char *)pNtGetContextThread - 0x10000 && - (char *)context.Eip <= (char *)pNtGetContextThread + 0x10000, + ok( (char *)context.Eip >= (char *)pNtGetContextThread - 0x40000 && + (char *)context.Eip <= (char *)pNtGetContextThread + 0x40000, "wrong Eip %08x/%08x\n", context.Eip, (DWORD)pNtGetContextThread ); /* segment registers clear the high word */ ok( context.SegCs == LOWORD(expect.SegCs), "wrong SegCs %08x/%08x\n", context.SegCs, expect.SegCs ); -- 2.25.0.windows.1

1 0