wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Julian Rüger : Fix typo in German about page
by Jeremy Newman 03 May '17

03 May '17

Module: website Branch: master Commit: 62b1e4530cccc518b02b4902f0cfb36070a2f206 URL: http://source.winehq.org/git/website.git/?a=commit;h=62b1e4530cccc518b02b49… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed May 3 13:51:27 2017 +0200 Fix typo in German about page Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/about.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index a70cc54..4ddbe41 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -4,12 +4,12 @@ <p>Wine (ursprünglich ein Akronym für "Wine Is Not an Emulator") ist eine Kompatibilitätsschicht, die es ermöglicht, Windows-Anwendungen unter -einigen POSIX-konformen Betriebssystemen auszuführen, wie z.B. Linux, +POSIX-konformen Betriebssystemen auszuführen, wie z.B. Linux, macOS und BSD. Statt interne Windows-Logik zu simulieren, wie eine virtuelle Maschine oder ein Emulator, übersetzt Wine die Windows-API-Aufrufe in Echtzeit zu entsprechenden POSIX-Aufrufen und eliminiert somit die Performance- und Speichereinbußen, die andere Methoden nach sich ziehen. -Wine erlaubt es auf diese Weise, Windows-Anwendung sauber in Ihre +Wine erlaubt es auf diese Weise, Windows-Anwendungen sauber in Ihre Desktopumgebung zu integrieren.</p> <p>Das Projekt begann 1993, unter der anfänglichen Koordinierung durch Bob Amstadt,

1 0

Alex Henrie : mountmgr: Create devices and registry entries for parallel ports.
by Alexandre Julliard 02 May '17

02 May '17

Module: wine Branch: master Commit: b1203af6ba44ff8858ee9ca50fc05f4f3f633892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1203af6ba44ff8858ee9ca50… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Apr 25 21:18:36 2017 -0600 mountmgr: Create devices and registry entries for parallel ports. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 66 ++++++++++++++++++++++++++++++++++++-------- dlls/mountmgr.sys/mountmgr.c | 4 +++ dlls/mountmgr.sys/mountmgr.h | 1 + dlls/ntdll/directory.c | 21 -------------- 4 files changed, 60 insertions(+), 32 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 5295988..ee25999 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -95,6 +95,7 @@ static struct list volumes_list = LIST_INIT(volumes_list); static DRIVER_OBJECT *harddisk_driver; static DRIVER_OBJECT *serial_driver; +static DRIVER_OBJECT *parallel_driver; static CRITICAL_SECTION device_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -998,7 +999,10 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p HKEY wine_ports_key, HKEY windows_ports_key ) { static const WCHAR comW[] = {'C','O','M','%','u',0}; + static const WCHAR lptW[] = {'L','P','T','%','u',0}; static const WCHAR device_serialW[] = {'\\','D','e','v','i','c','e','\\','S','e','r','i','a','l','%','u',0}; + static const WCHAR device_parallelW[] = {'\\','D','e','v','i','c','e','\\','P','a','r','a','l','l','e','l','%','u',0}; + static const WCHAR dosdevices_lptW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','L','P','T','%','u',0}; const WCHAR *dos_name_format, *nt_name_format, *reg_value_format; WCHAR dos_name[7], reg_value[256], nt_buffer[32]; DWORD type, size; @@ -1007,10 +1011,18 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p DEVICE_OBJECT *dev_obj; NTSTATUS status; - dos_name_format = comW; - nt_name_format = device_serialW; - reg_value_format = comW; - /* TODO: support parallel ports */ + if (driver == serial_driver) + { + dos_name_format = comW; + nt_name_format = device_serialW; + reg_value_format = comW; + } + else + { + dos_name_format = lptW; + nt_name_format = device_parallelW; + reg_value_format = dosdevices_lptW; + } sprintfW( dos_name, dos_name_format, n ); @@ -1065,9 +1077,19 @@ static void create_port_devices( DRIVER_OBJECT *driver ) "", #endif }; + static const char *parallel_search_paths[] = { +#ifdef linux + "/dev/lp%u", +#else + "", +#endif + }; static const WCHAR serialcomm_keyW[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', 'S','E','R','I','A','L','C','O','M','M',0}; + static const WCHAR parallel_ports_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'P','A','R','A','L','L','E','L',' ','P','O','R','T','S',0}; const char **search_paths; const WCHAR *windows_ports_key_name; char *dosdevices_path, *p; @@ -1078,13 +1100,24 @@ static void create_port_devices( DRIVER_OBJECT *driver ) if (!(dosdevices_path = get_dosdevices_path( &p ))) return; - p[0] = 'c'; - p[1] = 'o'; - p[2] = 'm'; - search_paths = serial_search_paths; - num_search_paths = sizeof(serial_search_paths)/sizeof(serial_search_paths[0]); - windows_ports_key_name = serialcomm_keyW; - /* TODO: support parallel ports */ + if (driver == serial_driver) + { + p[0] = 'c'; + p[1] = 'o'; + p[2] = 'm'; + search_paths = serial_search_paths; + num_search_paths = sizeof(serial_search_paths)/sizeof(serial_search_paths[0]); + windows_ports_key_name = serialcomm_keyW; + } + else + { + p[0] = 'l'; + p[1] = 'p'; + p[2] = 't'; + search_paths = parallel_search_paths; + num_search_paths = sizeof(parallel_search_paths)/sizeof(parallel_search_paths[0]); + windows_ports_key_name = parallel_ports_keyW; + } p += 3; RegOpenKeyExW( HKEY_LOCAL_MACHINE, ports_keyW, 0, KEY_QUERY_VALUE, &wine_ports_key ); @@ -1136,3 +1169,14 @@ NTSTATUS WINAPI serial_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path return STATUS_SUCCESS; } + +/* driver entry point for the parallel port driver */ +NTSTATUS WINAPI parallel_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + parallel_driver = driver; + /* TODO: fill in driver->MajorFunction */ + + create_port_devices( driver ); + + return STATUS_SUCCESS; +} diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index d40b8fc..d3f774a 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -420,6 +420,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) static const WCHAR link_mountmgrW[] = {'\\','?','?','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}; static const WCHAR harddiskW[] = {'\\','D','r','i','v','e','r','\\','H','a','r','d','d','i','s','k',0}; static const WCHAR driver_serialW[] = {'\\','D','r','i','v','e','r','\\','S','e','r','i','a','l',0}; + static const WCHAR driver_parallelW[] = {'\\','D','r','i','v','e','r','\\','P','a','r','a','l','l','e','l',0}; static const WCHAR devicemapW[] = {'H','A','R','D','W','A','R','E','\\','D','E','V','I','C','E','M','A','P',0}; static const WCHAR parallelW[] = {'P','A','R','A','L','L','E','L',' ','P','O','R','T','S',0}; static const WCHAR serialW[] = {'S','E','R','I','A','L','C','O','M','M',0}; @@ -467,5 +468,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RtlInitUnicodeString( &nameW, driver_serialW ); IoCreateDriver( &nameW, serial_driver_entry ); + RtlInitUnicodeString( &nameW, driver_parallelW ); + IoCreateDriver( &nameW, parallel_driver_entry ); + return status; } diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 4ef36a1..79f72a3 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -58,6 +58,7 @@ extern NTSTATUS remove_dos_device( int letter, const char *udi ) DECLSPEC_HIDDEN extern NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, char **mount_point ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI serial_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI parallel_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; /* mount point functions */ diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8c87a57..9d5cf92 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -434,26 +434,6 @@ static void flush_dir_queue(void) } -/*********************************************************************** - * get_default_lpt_device - * - * Return the default device to use for parallel ports. - */ -static char *get_default_lpt_device( int num ) -{ - char *ret = NULL; - - if (num < 1 || num > 256) return NULL; -#ifdef linux - ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/lp256") ); - if (!ret) return NULL; - sprintf( ret, "/dev/lp%d", num - 1 ); -#else - FIXME( "no known default for device lpt%d\n", num ); -#endif - return ret; -} - #ifdef __ANDROID__ static char *unescape_field( char *str ) @@ -2476,7 +2456,6 @@ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, ANSI_STRING *u dev[2] = 0; /* remove last ':' to get the drive mount point symlink */ new_name = get_default_drive_device( unix_name ); } - else if (!strncmp( dev, "lpt", 3 )) new_name = get_default_lpt_device( atoi(dev + 3 )); if (!new_name) break;

1 0

Alex Henrie : mountmgr: Create devices and registry entries for serial ports.
by Alexandre Julliard 02 May '17

02 May '17

Module: wine Branch: master Commit: a6cdfea1c1afa064e8d352935c4ce8b2140a4294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6cdfea1c1afa064e8d352935… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Apr 25 21:18:35 2017 -0600 mountmgr: Create devices and registry entries for serial ports. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 155 ++++++++++++++++++++++++++++++++++++++++++- dlls/mountmgr.sys/mountmgr.c | 4 ++ dlls/mountmgr.sys/mountmgr.h | 1 + dlls/ntdll/directory.c | 30 --------- 4 files changed, 157 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6cdfea1c1afa064e8d35…

1 0

Jacek Caban : ntdll/tests: Added more completion port tests.
by Alexandre Julliard 02 May '17

02 May '17

Module: wine Branch: master Commit: 4bf58b6e100f18dbb348738b6ed94aa47e4cc894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf58b6e100f18dbb348738b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 2 17:51:33 2017 +0200 ntdll/tests: Added more completion port tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 0a8e110..9de9009 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1023,6 +1023,7 @@ static void test_iocp_fileio(HANDLE h) { OVERLAPPED o = {0,}; BYTE send_buf[TEST_BUF_LEN], recv_buf[TEST_BUF_LEN]; + int apc_count = 0; DWORD read; long count; @@ -1051,6 +1052,60 @@ static void test_iocp_fileio(HANDLE h) } count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); + + /* using APCs on handle with associated completion port is not allowed */ + res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + todo_wine + ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); + } + + CloseHandle( hPipeSrv ); + CloseHandle( hPipeClt ); + + /* test associating a completion port with a handle after an async using APC is queued */ + hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); + ok( hPipeSrv != INVALID_HANDLE_VALUE, "Cannot create named pipe\n" ); + if (hPipeSrv == INVALID_HANDLE_VALUE ) + return; + hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); + ok( hPipeClt != INVALID_HANDLE_VALUE, "Cannot connect to pipe\n" ); + if (hPipeClt != INVALID_HANDLE_VALUE) + { + BYTE send_buf[TEST_BUF_LEN], recv_buf[TEST_BUF_LEN]; + int apc_count = 0; + DWORD read; + long count; + + memset( send_buf, 0, TEST_BUF_LEN ); + memset( recv_buf, 0xde, TEST_BUF_LEN ); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + + res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + ok(res == STATUS_PENDING, "NtReadFile returned %x\n", res); + + U(iosb).Status = 0xdeadbeef; + res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation ); + ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); + ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status ); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + + WriteFile( hPipeClt, send_buf, TEST_BUF_LEN, &read, NULL ); + + ok(!apc_count, "apc_count = %u\n", apc_count); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + + SleepEx(1, TRUE); /* alertable sleep */ + ok(apc_count == 1, "apc was not called\n"); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + + /* using APCs on handle with associated completion port is not allowed */ + res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + todo_wine + ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } CloseHandle( hPipeSrv );

1 0

Alexandre Julliard : preloader: Add a fallback to the old mmap syscall just in case.
by Alexandre Julliard 02 May '17

02 May '17

Module: wine Branch: master Commit: 9f06a197c8c156acf21d8d809ce80cdcde9b6f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f06a197c8c156acf21d8d809… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 2 20:06:25 2017 +0200 preloader: Add a fallback to the old mmap syscall just in case. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index a21efc9..5e6add7 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -311,9 +311,16 @@ __ASM_GLOBAL_FUNC(wld_mmap, "\tshrl $12,%ebp\n" "\tint $0x80\n" "\tcmpl $-4096,%eax\n" - "\tjbe 1f\n" - "\tmovl $-1,%eax\n" - "1:\tpopl %edi\n" + "\tjbe 2f\n" + "\tcmpl $-38,%eax\n" /* ENOSYS */ + "\tjne 1f\n" + "\tmovl $90,%eax\n" /* SYS_mmap */ + "\tleal 20(%esp),%ebx\n" + "\tint $0x80\n" + "\tcmpl $-4096,%eax\n" + "\tjbe 2f\n" + "1:\tmovl $-1,%eax\n" + "2:\tpopl %edi\n" __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "\tpopl %esi\n" __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t")

1 0

Huw Davies : user32: Change IsProcessDPIAware() to always return TRUE.
by Alexandre Julliard 02 May '17

02 May '17

Module: wine Branch: master Commit: ee3f060262d85d0ed523beea1c20ae31f4747dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3f060262d85d0ed523beea1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 2 16:12:39 2017 +0100 user32: Change IsProcessDPIAware() to always return TRUE. This mimics Windows' behaviour when the 'Use Windows XP style DPI scaling' box is ticked. Since we don't have a DPI scaler, this makes most sense. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 9 ++++----- dlls/user32/tests/sysparams.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 35565f1..bec4d66 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2910,10 +2910,9 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, /*********************************************************************** * SetProcessDPIAware (USER32.@) */ -BOOL WINAPI SetProcessDPIAware( VOID ) +BOOL WINAPI SetProcessDPIAware(void) { - FIXME( "stub!\n"); - + TRACE("\n"); return TRUE; } @@ -2922,8 +2921,8 @@ BOOL WINAPI SetProcessDPIAware( VOID ) */ BOOL WINAPI IsProcessDPIAware(void) { - FIXME( "stub!\n"); - return FALSE; + TRACE("returning TRUE\n"); + return TRUE; } /********************************************************************** diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 1e738ab..b5ab784 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2976,6 +2976,26 @@ static void test_GetSysColorBrush(void) win_skip("COLOR_MENUBAR unsupported\n"); } +static void test_dpi_aware(void) +{ + BOOL ret; + + if (!pIsProcessDPIAware) + { + win_skip("IsProcessDPIAware not available\n"); + return; + } + + ret = pSetProcessDPIAware(); + ok(ret, "got %d\n", ret); + + ret = pIsProcessDPIAware(); + ok(ret, "got %d\n", ret); + + dpi = real_dpi; + test_GetSystemMetrics(); +} + START_TEST(sysparams) { int argc; @@ -3040,4 +3060,5 @@ START_TEST(sysparams) } ReleaseDC( 0, hdc); + test_dpi_aware(); }

1 0

Huw Davies : user32: Fix icon spacing minimium values.
by Alexandre Julliard 02 May '17

02 May '17

Module: wine Branch: master Commit: 3d47809acad82b253b7d43d034e04cb9ed4add82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d47809acad82b253b7d43d03… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 2 16:12:38 2017 +0100 user32: Fix icon spacing minimium values. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 48fd145..35565f1 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1487,7 +1487,12 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, if (pvParam != NULL) ret = get_entry( &entry_ICONHORIZONTALSPACING, uiParam, pvParam ); else - ret = set_entry( &entry_ICONHORIZONTALSPACING, max( 32, uiParam ), pvParam, fWinIni ); + { + int min_val = 32; + if (IsProcessDPIAware()) + min_val = MulDiv( min_val, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ); + ret = set_entry( &entry_ICONHORIZONTALSPACING, max( min_val, uiParam ), pvParam, fWinIni ); + } break; case SPI_GETSCREENSAVETIMEOUT: ret = get_entry( &entry_SCREENSAVETIMEOUT, uiParam, pvParam ); @@ -1525,7 +1530,12 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, if (pvParam != NULL) ret = get_entry( &entry_ICONVERTICALSPACING, uiParam, pvParam ); else - ret = set_entry( &entry_ICONVERTICALSPACING, max( 32, uiParam ), pvParam, fWinIni ); + { + int min_val = 32; + if (IsProcessDPIAware()) + min_val = MulDiv( min_val, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ); + ret = set_entry( &entry_ICONVERTICALSPACING, max( min_val, uiParam ), pvParam, fWinIni ); + } break; case SPI_GETICONTITLEWRAP: ret = get_entry( &entry_ICONTITLEWRAP, uiParam, pvParam );

1 0

Huw Davies : user32: Fix the calculation of system metrics icon sizes.
by Alexandre Julliard 02 May '17

02 May '17

Module: wine Branch: master Commit: fb118b222a900364a631dee279b54c43d41da545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb118b222a900364a631dee27… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 2 16:12:37 2017 +0100 user32: Fix the calculation of system metrics icon sizes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 12 +++++++----- dlls/user32/tests/sysparams.c | 41 +++++++++++++++++++++++++++++++++++------ 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab3d717..48fd145 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -174,7 +174,6 @@ static const WCHAR SMCAPTIONWIDTH_VALNAME[]= {METRICS_KEY,'S','m','C', static const WCHAR SMCAPTIONHEIGHT_VALNAME[]= {METRICS_KEY,'S','m','C','a','p','t','i','o','n','H','e','i','g','h','t',0}; static const WCHAR MENUWIDTH_VALNAME[]= {METRICS_KEY,'M','e','n','u','W','i','d','t','h',0}; static const WCHAR MENUHEIGHT_VALNAME[]= {METRICS_KEY,'M','e','n','u','H','e','i','g','h','t',0}; -static const WCHAR ICONSIZE_VALNAME[]= {METRICS_KEY,'S','h','e','l','l',' ','I','c','o','n',' ','S','i','z','e',0}; static const WCHAR PADDEDBORDERWIDTH_VALNAME[]= {METRICS_KEY,'P','a','d','d','e','d','B','o','r','d','e','r','W','i','d','t','h',0}; static const WCHAR CAPTIONLOGFONT_VALNAME[]= {METRICS_KEY,'C','a','p','t','i','o','n','F','o','n','t',0}; static const WCHAR SMCAPTIONLOGFONT_VALNAME[]= {METRICS_KEY,'S','m','C','a','p','t','i','o','n','F','o','n','t',0}; @@ -1158,7 +1157,6 @@ static UINT_ENTRY( DRAGHEIGHT, 4 ); static UINT_ENTRY( DOUBLECLICKTIME, 500 ); static UINT_ENTRY( FONTSMOOTHING, 2 ); static UINT_ENTRY( GRIDGRANULARITY, 0 ); -static UINT_ENTRY( ICONSIZE, 32 ); static UINT_ENTRY( KEYBOARDDELAY, 1 ); static UINT_ENTRY( KEYBOARDSPEED, 31 ); static UINT_ENTRY( MENUSHOWDELAY, 400 ); @@ -1323,7 +1321,6 @@ static union sysparam_all_entry * const default_entries[] = (union sysparam_all_entry *)&entry_FOREGROUNDFLASHCOUNT, (union sysparam_all_entry *)&entry_FOREGROUNDLOCKTIMEOUT, (union sysparam_all_entry *)&entry_ICONHORIZONTALSPACING, - (union sysparam_all_entry *)&entry_ICONSIZE, (union sysparam_all_entry *)&entry_ICONTITLEWRAP, (union sysparam_all_entry *)&entry_ICONVERTICALSPACING, (union sysparam_all_entry *)&entry_KEYBOARDDELAY, @@ -2400,7 +2397,9 @@ INT WINAPI GetSystemMetrics( INT index ) return max( 8, ret ); case SM_CXICON: case SM_CYICON: - get_entry( &entry_ICONSIZE, 0, &ret ); + ret = 32; + if (IsProcessDPIAware()) + ret = MulDiv( ret, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ); return ret; case SM_CXCURSOR: case SM_CYCURSOR: @@ -2492,7 +2491,10 @@ INT WINAPI GetSystemMetrics( INT index ) return GetSystemMetrics(SM_CYMINIMIZED) + max( 0, (INT)ret ); case SM_CXSMICON: case SM_CYSMICON: - return 16; + ret = 16; + if (IsProcessDPIAware()) + ret = MulDiv( ret, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ) & ~1; + return ret; case SM_CYSMCAPTION: return GetSystemMetrics(SM_CYSMSIZE) + 1; case SM_CXSMSIZE: diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d879036..1e738ab 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -39,6 +39,8 @@ #endif static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); +static BOOL (WINAPI *pIsProcessDPIAware)(void); +static BOOL (WINAPI *pSetProcessDPIAware)(void); static BOOL strict; static int dpi, real_dpi; @@ -2702,7 +2704,7 @@ static void test_GetSystemMetrics( void) HDC hdc = CreateICA( "Display", 0, 0, 0); UINT avcwCaption; - INT CaptionWidthfromreg; + INT CaptionWidthfromreg, smicon, broken_val; MINIMIZEDMETRICS minim; NONCLIENTMETRICSA ncm; SIZE screen; @@ -2769,8 +2771,9 @@ static void test_GetSystemMetrics( void) ok_gsm( SM_CYDLGFRAME, 3); ok_gsm( SM_CYVTHUMB, ncm.iScrollHeight); ok_gsm( SM_CXHTHUMB, ncm.iScrollHeight); - /* SM_CXICON */ - /* SM_CYICON */ + /* These don't depend on the Shell Icon Size registry value */ + ok_gsm( SM_CXICON, MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ) ); + ok_gsm( SM_CYICON, MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ) ); /* SM_CXCURSOR */ /* SM_CYCURSOR */ ok_gsm( SM_CYMENU, ncm.iMenuHeight + 1); @@ -2815,8 +2818,32 @@ static void test_GetSystemMetrics( void) /* sign-extension for iHorzGap/iVertGap is broken on Win9x */ ok_gsm( SM_CXMINSPACING, GetSystemMetrics( SM_CXMINIMIZED) + (short)minim.iHorzGap ); ok_gsm( SM_CYMINSPACING, GetSystemMetrics( SM_CYMINIMIZED) + (short)minim.iVertGap ); - /* SM_CXSMICON */ - /* SM_CYSMICON */ + + smicon = MulDiv( 16, dpi, USER_DEFAULT_SCREEN_DPI ); + if (!pIsProcessDPIAware || pIsProcessDPIAware()) + smicon = max( min( smicon, CaptionWidthfromreg - 2), 4 ) & ~1; + todo_wine_if( real_dpi == dpi && smicon != (MulDiv( 16, dpi, USER_DEFAULT_SCREEN_DPI) & ~1) ) + { + broken_val = (min( ncm.iCaptionHeight, CaptionWidthfromreg ) - 2) & ~1; + broken_val = min( broken_val, 20 ); + + if (smicon == 4) + { + ok_gsm_2( SM_CXSMICON, smicon, 6 ); + ok_gsm_2( SM_CYSMICON, smicon, 6 ); + } + else if (smicon < broken_val) + { + ok_gsm_2( SM_CXSMICON, smicon, broken_val ); + ok_gsm_2( SM_CYSMICON, smicon, broken_val ); + } + else + { + ok_gsm( SM_CXSMICON, smicon ); + ok_gsm( SM_CYSMICON, smicon ); + } + } + ok_gsm( SM_CYSMCAPTION, ncm.iSmCaptionHeight + 1); ok_gsm_3( SM_CXSMSIZE, ncm.iSmCaptionWidth, /* classic/standard windows style */ @@ -2960,7 +2987,9 @@ START_TEST(sysparams) HANDLE hInstance, hdll; hdll = GetModuleHandleA("user32.dll"); - pChangeDisplaySettingsExA=(void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); + pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); + pIsProcessDPIAware = (void*)GetProcAddress(hdll, "IsProcessDPIAware"); + pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware"); hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0);

1 0

Huw Davies : shell32: Load icons with the correct size.
by Alexandre Julliard 02 May '17

02 May '17

Module: wine Branch: master Commit: a7d79fe4458039fc4cbed97860234ac70755020c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d79fe4458039fc4cbed9786… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 2 16:12:36 2017 +0100 shell32: Load icons with the correct size. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 44 +++++++++++++++++++++++++ dlls/shell32/shell32_main.c | 75 ++++++++++++++++++++++-------------------- dlls/shell32/shell32_main.h | 1 + dlls/shell32/tests/shlfileop.c | 7 ++-- 4 files changed, 86 insertions(+), 41 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 59fd8fb..0ea2eb9 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -78,6 +78,8 @@ static const WCHAR WindowMetrics[] = {'C','o','n','t','r','o','l',' ','P','a','n 'W','i','n','d','o','w','M','e','t','r','i','c','s',0}; static const WCHAR ShellIconSize[] = {'S','h','e','l','l',' ','I','c','o','n',' ','S','i','z','e',0}; +#define SIC_COMPARE_LISTINDEX 1 + /***************************************************************************** * SIC_CompareEntries * @@ -94,6 +96,10 @@ static INT CALLBACK SIC_CompareEntries( LPVOID p1, LPVOID p2, LPARAM lparam) * loaded from, their resource index and the fact if they have a shortcut * icon overlay or not. */ + + if (lparam & SIC_COMPARE_LISTINDEX) + return e1->dwListIndex != e2->dwListIndex; + if (e1->dwSourceIndex != e2->dwSourceIndex || /* first the faster one */ (e1->dwFlags & GIL_FORSHORTCUT) != (e2->dwFlags & GIL_FORSHORTCUT)) return 1; @@ -104,6 +110,44 @@ static INT CALLBACK SIC_CompareEntries( LPVOID p1, LPVOID p2, LPARAM lparam) return 0; } +/************************************************************************************** + * SIC_get_location + * + * Returns the source file and resource index of an icon with the given imagelist index + */ +HRESULT SIC_get_location( int list_idx, WCHAR *file, DWORD *size, int *res_idx ) +{ + SIC_ENTRY seek, *found; + DWORD needed; + HRESULT hr = E_INVALIDARG; + int dpa_idx; + + seek.dwListIndex = list_idx; + + EnterCriticalSection( &SHELL32_SicCS ); + + dpa_idx = DPA_Search( sic_hdpa, &seek, 0, SIC_CompareEntries, SIC_COMPARE_LISTINDEX, 0 ); + if (dpa_idx != -1) + { + found = (SIC_ENTRY *)DPA_GetPtr( sic_hdpa, dpa_idx ); + needed = (strlenW( found->sSourceFile ) + 1) * sizeof(WCHAR); + if (needed <= *size) + { + memcpy( file, found->sSourceFile, needed ); + *res_idx = found->dwSourceIndex; + hr = S_OK; + } + else + { + *size = needed; + hr = E_NOT_SUFFICIENT_BUFFER; + } + } + LeaveCriticalSection( &SHELL32_SicCS ); + + return hr; +} + /* declare SIC_LoadOverlayIcon() */ static int SIC_LoadOverlayIcon(int icon_idx); diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 7122591..04924c0 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -427,7 +427,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, IExtractIconW * pei = NULL; LPITEMIDLIST pidlLast = NULL, pidl = NULL; HRESULT hr = S_OK; - BOOL IconNotYetLoaded=TRUE; UINT uGilFlags = 0; TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n", @@ -598,9 +597,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, if (flags & SHGFI_SELECTED) FIXME("set icon to selected, stub\n"); - if (flags & SHGFI_SHELLICONSIZE) - FIXME("set icon to shell size, stub\n"); - /* get the iconlocation */ if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION )) { @@ -667,17 +663,16 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL)) { - WCHAR sTemp [MAX_PATH]; - WCHAR * szExt; - int icon_idx=0; - - lstrcpynW(sTemp, szFullPath, MAX_PATH); - if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) psfi->iIcon = SIC_GetIconIndex(swShell32Name, -IDI_SHELL_FOLDER, 0); else { static const WCHAR p1W[] = {'%','1',0}; + WCHAR sTemp[MAX_PATH]; + WCHAR *szExt; + int icon_idx = 0; + + lstrcpynW(sTemp, szFullPath, MAX_PATH); psfi->iIcon = 0; szExt = PathFindExtensionW(sTemp); @@ -688,31 +683,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, if (!lstrcmpW(p1W,sTemp)) /* icon is in the file */ strcpyW(sTemp, szFullPath); - if (flags & SHGFI_SYSICONINDEX) - { - psfi->iIcon = SIC_GetIconIndex(sTemp,icon_idx,0); - if (psfi->iIcon == -1) - psfi->iIcon = 0; - } - else - { - UINT ret; - if (flags & SHGFI_SMALLICON) - ret = PrivateExtractIconsW( sTemp,icon_idx, - GetSystemMetrics( SM_CXSMICON ), - GetSystemMetrics( SM_CYSMICON ), - &psfi->hIcon, 0, 1, 0); - else - ret = PrivateExtractIconsW( sTemp, icon_idx, - GetSystemMetrics( SM_CXICON), - GetSystemMetrics( SM_CYICON), - &psfi->hIcon, 0, 1, 0); - if (ret != 0 && ret != (UINT)-1) - { - IconNotYetLoaded=FALSE; - psfi->iIcon = icon_idx; - } - } + psfi->iIcon = SIC_GetIconIndex(sTemp, icon_idx, 0); + if (psfi->iIcon == -1) + psfi->iIcon = 0; } } } @@ -731,7 +704,37 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, } if (ret && (flags & SHGFI_ICON)) { - hr = IImageList_GetIcon( icon_list, psfi->iIcon, ILD_NORMAL, &psfi->hIcon ); + if (flags & SHGFI_SHELLICONSIZE) + hr = IImageList_GetIcon( icon_list, psfi->iIcon, ILD_NORMAL, &psfi->hIcon ); + else + { + int width = GetSystemMetrics( (flags & SHGFI_SMALLICON) ? SM_CXSMICON : SM_CXICON ); + int height = GetSystemMetrics( (flags & SHGFI_SMALLICON) ? SM_CYSMICON : SM_CYICON ); + int list_width, list_height; + + IImageList_GetIconSize( icon_list, &list_width, &list_height ); + if (list_width == width && list_height == height) + hr = IImageList_GetIcon( icon_list, psfi->iIcon, ILD_NORMAL, &psfi->hIcon ); + else /* Use SHIL_SYSSMALL for SHFI_SMALLICONS when we implement it */ + { + WCHAR buf[MAX_PATH], *file = buf; + DWORD size = sizeof(buf); + int icon_idx; + + while ((hr = SIC_get_location( psfi->iIcon, file, &size, &icon_idx ) == E_NOT_SUFFICIENT_BUFFER)) + { + if (file == buf) file = HeapAlloc( GetProcessHeap(), 0, size ); + else file = HeapReAlloc( GetProcessHeap(), 0, file, size ); + if (!file) break; + } + if (SUCCEEDED(hr)) + { + ret = PrivateExtractIconsW( file, icon_idx, width, height, &psfi->hIcon, 0, 1, 0); + if (ret == 0 || ret == (UINT)-1) hr = E_FAIL; + } + if (file != buf) HeapFree( GetProcessHeap(), 0, file ); + } + } } IImageList_Release( icon_list ); } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index bdebcba..941ca74 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -51,6 +51,7 @@ extern CLSID CLSID_ShellImageDataFactory; void SIC_Destroy(void) DECLSPEC_HIDDEN; BOOL PidlToSicIndex (IShellFolder * sh, LPCITEMIDLIST pidl, BOOL bBigIcon, UINT uFlags, int * pIndex) DECLSPEC_HIDDEN; INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) DECLSPEC_HIDDEN; +HRESULT SIC_get_location( int list_idx, WCHAR *file, DWORD *size, int *res_idx ) DECLSPEC_HIDDEN; /* Classes Root */ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 8f637f6..dd933f6 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -338,11 +338,8 @@ static void check_icon_size( HICON icon, DWORD flags ) if (flags & SHGFI_SHELLICONSIZE) { - todo_wine_if(list_size.cx != metrics_size.cx) - { - ok( bm.bmWidth == list_size.cx, "got %d expected %d\n", bm.bmWidth, list_size.cx ); - ok( bm.bmHeight == list_size.cy, "got %d expected %d\n", bm.bmHeight, list_size.cy ); - } + ok( bm.bmWidth == list_size.cx, "got %d expected %d\n", bm.bmWidth, list_size.cx ); + ok( bm.bmHeight == list_size.cy, "got %d expected %d\n", bm.bmHeight, list_size.cy ); } else {

1 0

Huw Davies : shell32: Simplify imagelist handling.
by Alexandre Julliard 02 May '17

02 May '17

Module: wine Branch: master Commit: b8bf0c2628d69952aca59855e155807b6011d5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bf0c2628d69952aca59855e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 2 16:12:35 2017 +0100 shell32: Simplify imagelist handling. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 0ccde93..7122591 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -429,7 +429,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, HRESULT hr = S_OK; BOOL IconNotYetLoaded=TRUE; UINT uGilFlags = 0; - HIMAGELIST big_icons, small_icons; TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n", (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, @@ -581,9 +580,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, } /* ### icons ###*/ - - Shell_GetImageLists( &big_icons, &small_icons ); - if (flags & SHGFI_OPENICON) uGilFlags |= GIL_OPENICON; @@ -666,6 +662,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, /* get icon index (or load icon)*/ if (SUCCEEDED(hr) && (flags & (SHGFI_ICON | SHGFI_SYSICONINDEX))) { + IImageList *icon_list; + SHGetImageList( (flags & SHGFI_SMALLICON) ? SHIL_SMALL : SHIL_LARGE, &IID_IImageList, (void **)&icon_list ); + if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL)) { WCHAR sTemp [MAX_PATH]; @@ -727,21 +726,14 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, } if (ret && (flags & SHGFI_SYSICONINDEX)) { - if (flags & SHGFI_SMALLICON) - ret = (DWORD_PTR)small_icons; - else - ret = (DWORD_PTR)big_icons; - IImageList_AddRef((IImageList*)ret); + IImageList_AddRef( icon_list ); + ret = (DWORD_PTR)icon_list; } - } - - /* icon handle */ - if (SUCCEEDED(hr) && (flags & SHGFI_ICON) && IconNotYetLoaded) - { - if (flags & SHGFI_SMALLICON) - psfi->hIcon = ImageList_GetIcon( small_icons, psfi->iIcon, ILD_NORMAL); - else - psfi->hIcon = ImageList_GetIcon( big_icons, psfi->iIcon, ILD_NORMAL); + if (ret && (flags & SHGFI_ICON)) + { + hr = IImageList_GetIcon( icon_list, psfi->iIcon, ILD_NORMAL, &psfi->hIcon ); + } + IImageList_Release( icon_list ); } if (flags & ~SHGFI_KNOWN_FLAGS)

1 0

← Newer
1
...
57
58
59
60
61
62
63
64
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 May 2017