August 2018 - Wine-commits - list.winehq.org

Alex Henrie : shell32: Add shutdown icon.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 905685c383a49cfe9ef3f08a3a8492532fabbffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=905685c383a49cfe9ef3f08a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:44 2018 -0600 shell32: Add shutdown icon. Adapted from system-shutdown in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/shut_down.ico | Bin 0 -> 38405 bytes dlls/shell32/resources/shut_down.svg | 883 +++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 888 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=905685c383a49cfe9ef3…

1 0

Alex Henrie : shell32: Add "trash full" icon.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 8969e6f37f18407b0f2980b66695227212ee797f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8969e6f37f18407b0f2980b6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:45 2018 -0600 shell32: Add "trash full" icon. Adapted from user-trash-full in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/trash_full.ico | Bin 0 -> 73668 bytes dlls/shell32/resources/trash_full.svg | 1701 +++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 6 +- 4 files changed, 1705 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8969e6f37f18407b0f29…

1 0

Alex Henrie : shell32: Add modem folder icon.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 76e77535c2598fb1075c229489ce25ae1842a429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76e77535c2598fb1075c2294… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:46 2018 -0600 shell32: Add modem folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index a6f1346..5b4d13b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -516,6 +516,10 @@ IDI_SHELL_SHORTCUT ICON resources/shortcut.ico /* @makedep: resources/trash_full.ico */ IDI_SHELL_FULL_RECYCLE_BIN ICON resources/trash_full.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_MODEM_FOLDER ICON resources/folder.ico + /* @makedep: resources/desktop.ico */ IDI_SHELL_DESKTOP ICON resources/desktop.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e3dc728..aa86c4e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -202,6 +202,7 @@ #define IDI_SHELL_FOLDER_OPEN_SMALL 31 #define IDI_SHELL_EMPTY_RECYCLE_BIN 32 #define IDI_SHELL_FULL_RECYCLE_BIN 33 +#define IDI_SHELL_MODEM_FOLDER 34 #define IDI_SHELL_DESKTOP 35 #define IDI_SHELL_CONTROL_PANEL 36 #define IDI_SHELL_PRINTERS_FOLDER 38

1 0

Alex Henrie : shell32: Add application folder icon.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 694af9c6b78907c225e58c5a5de8bd8a4f3eb359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=694af9c6b78907c225e58c5a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:47 2018 -0600 shell32: Add application folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5b4d13b..e07dffe 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -526,6 +526,10 @@ IDI_SHELL_DESKTOP ICON resources/desktop.ico /* @makedep: resources/control.ico */ IDI_SHELL_CONTROL_PANEL ICON resources/control.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_APP_FOLDER ICON resources/folder.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index aa86c4e..178fa78 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -205,6 +205,7 @@ #define IDI_SHELL_MODEM_FOLDER 34 #define IDI_SHELL_DESKTOP 35 #define IDI_SHELL_CONTROL_PANEL 36 +#define IDI_SHELL_APP_FOLDER 37 #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_REMOTE_PRINTER 140

1 0

Alex Henrie : shell32: Add printer folder icon.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: dcf8525af3da4e9cd25428ea86e244e03de91477 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcf8525af3da4e9cd25428ea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:48 2018 -0600 shell32: Add printer folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index e07dffe..d76d395 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -530,6 +530,10 @@ IDI_SHELL_CONTROL_PANEL ICON resources/control.ico /* @makedep: resources/folder.ico */ IDI_APP_FOLDER ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_PRINTERS_FOLDER ICON resources/folder.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico

1 0

Alex Henrie : shell32: Add font folder icon.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: b722bae9c8aa9844dbe74f813e794308162493c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b722bae9c8aa9844dbe74f81… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:49 2018 -0600 shell32: Add font folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index d76d395..86ae802 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -534,6 +534,10 @@ IDI_APP_FOLDER ICON resources/folder.ico /* @makedep: resources/folder.ico */ IDI_PRINTERS_FOLDER ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_FONTS_FOLDER ICON resources/folder.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico

1 0

Henri Verbeet : wined3d: Make the adapter responsible for creating GL contexts.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: f7904211a20672d35e89c40d6298a1f81e120c0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7904211a20672d35e89c40d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 22 22:31:00 2018 +0430 wined3d: Make the adapter responsible for creating GL contexts. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 + dlls/wined3d/context.c | 298 ++++++++++++++++++++++------------------- dlls/wined3d/directx.c | 12 ++ dlls/wined3d/wined3d_private.h | 10 ++ 4 files changed, 188 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7904211a20672d35e89…

1 0

Zebediah Figura : ntoskrnl.exe: Broadcast WM_DEVICECHANGE when a PnP device is added or removed.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 6a4be7155d77c972e0c63a50f45be864584ccf87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a4be7155d77c972e0c63a50… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 16 18:37:43 2018 -0500 ntoskrnl.exe: Broadcast WM_DEVICECHANGE when a PnP device is added or removed. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 1 + dlls/ntoskrnl.exe/ntoskrnl.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index b459c54..5b03c59 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,6 +1,7 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl IMPORTS = advapi32 +DELAYIMPORTS = user32 C_SRCS = \ instr.c \ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f92dd58..280bf27 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -36,6 +36,9 @@ #include "winternl.h" #include "excpt.h" #include "winioctl.h" +#include "winbase.h" +#include "winuser.h" +#include "dbt.h" #include "ddk/csq.h" #include "ddk/ntddk.h" #include "ddk/ntifs.h" @@ -145,6 +148,77 @@ static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); } +static inline BOOL is_valid_hex(WCHAR c) +{ + if (!(((c >= '0') && (c <= '9')) || + ((c >= 'a') && (c <= 'f')) || + ((c >= 'A') && (c <= 'F')))) + return FALSE; + return TRUE; +} + +static const BYTE guid_conv_table[256] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ +}; + +static BOOL guid_from_string(const WCHAR *s, GUID *id) +{ + int i; + + if (!s || s[0] != '{') + { + memset( id, 0, sizeof (CLSID) ); + return FALSE; + } + + id->Data1 = 0; + for (i = 1; i < 9; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; + } + if (s[9] != '-') return FALSE; + + id->Data2 = 0; + for (i = 10; i < 14; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; + } + if (s[14] != '-') return FALSE; + + id->Data3 = 0; + for (i = 15; i < 19; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; + } + if (s[19] != '-') return FALSE; + + for (i = 20; i < 37; i += 2) + { + if (i == 24) + { + if (s[i] != '-') return FALSE; + i++; + } + if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; + id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; + } + + if (s[37] == '}') + return TRUE; + + return FALSE; +} + static HANDLE get_device_manager(void) { static HANDLE device_manager; @@ -1208,17 +1282,22 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable const WCHAR hashW[] = {'#',0}; size_t namelen = name->Length / sizeof(WCHAR); + DEV_BROADCAST_DEVICEINTERFACE_W *broadcast; HANDLE iface_key, control_key; OBJECT_ATTRIBUTES attr = {0}; WCHAR *path, *refstr, *p; UNICODE_STRING string; NTSTATUS ret; size_t len; + GUID class; TRACE("(%s, %d)\n", debugstr_us(name), enable); refstr = memrchrW(name->Buffer + 4, '\\', namelen - 4); + if (!guid_from_string( (refstr ? refstr : name->Buffer + namelen) - 38, &class )) + return STATUS_INVALID_PARAMETER; + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2; if (!(path = heap_alloc( len * sizeof(WCHAR) ))) @@ -1255,6 +1334,20 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable } heap_free( path ); + + len = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[namelen + 1]); + + if ((broadcast = heap_alloc( len ))) + { + broadcast->dbcc_size = len; + broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; + broadcast->dbcc_classguid = class; + lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); + BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, + enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast ); + + heap_free( broadcast ); + } return ret; }

1 0

Andrew Eikum : winex11.drv: Fix indentation for focus_out.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 18564c76fc613f61a3e13b7497dde4b29b35194e URL: https://source.winehq.org/git/wine.git/?a=commit;h=18564c76fc613f61a3e13b74… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 22 13:49:00 2018 -0500 winex11.drv: Fix indentation for focus_out. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 4aee415..8fe6b36 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -786,7 +786,7 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) /********************************************************************** * focus_out */ - static void focus_out( Display *display , HWND hwnd ) +static void focus_out( Display *display , HWND hwnd ) { HWND hwnd_tmp; Window focus_win;

1 0

Alexandre Julliard : user32/tests: Add tests for desktop size and DPI scaling.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 98146e1bce568b1755922d4840ae312ebc4480c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98146e1bce568b1755922d48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 11:43:08 2018 +0200 user32/tests: Add tests for desktop size and DPI scaling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 48 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 7903c9a..36a9ef8 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3193,11 +3193,14 @@ static void scale_rect_dpi( RECT *rect, UINT src_dpi, UINT target_dpi ) static void test_dpi_mapping(void) { HWND hwnd; + HDC hdc; UINT win_dpi; POINT point; BOOL ret, todo; - RECT rect, orig, client, expect; + RECT rect, orig, client, desktop, expect; ULONG_PTR i, j; + HMONITOR monitor; + MONITORINFO mon_info; DPI_AWARENESS_CONTEXT context; if (!pLogicalToPhysicalPointForPerMonitorDPI) @@ -3205,7 +3208,48 @@ static void test_dpi_mapping(void) win_skip( "LogicalToPhysicalPointForPerMonitorDPI not supported\n" ); return; } - context = pGetThreadDpiAwarenessContext(); + context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + GetWindowRect( GetDesktopWindow(), &desktop ); + for (i = DPI_AWARENESS_UNAWARE; i <= DPI_AWARENESS_PER_MONITOR_AWARE; i++) + { + pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); + /* test desktop rect */ + GetWindowRect( GetDesktopWindow(), &rect ); + expect = desktop; + if (i == DPI_AWARENESS_UNAWARE) scale_rect_dpi( &expect, real_dpi, USER_DEFAULT_SCREEN_DPI ); + ok( EqualRect( &expect, &rect ), "%lu: wrong desktop rect %s expected %s\n", + i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN )); + ok( EqualRect( &expect, &rect ), "%lu: wrong desktop rect %s expected %s\n", + i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXVIRTUALSCREEN ), GetSystemMetrics( SM_CYVIRTUALSCREEN )); + ok( EqualRect( &expect, &rect ), "%lu: wrong virt desktop rect %s expected %s\n", + i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + SetRect( &rect, 0, 0, 1, 1 ); + monitor = MonitorFromRect( &rect, MONITOR_DEFAULTTOPRIMARY ); + ok( monitor != 0, "failed to get monitor\n" ); + mon_info.cbSize = sizeof(mon_info); + ok( GetMonitorInfoW( monitor, &mon_info ), "GetMonitorInfoExW failed\n" ); + ok( EqualRect( &expect, &mon_info.rcMonitor ), "%lu: wrong monitor rect %s expected %s\n", + i, wine_dbgstr_rect(&mon_info.rcMonitor), wine_dbgstr_rect(&expect) ); + hdc = CreateDCA( "display", NULL, NULL, NULL ); + SetRect( &rect, 0, 0, GetDeviceCaps( hdc, HORZRES ), GetDeviceCaps( hdc, VERTRES )); + ok( EqualRect( &expect, &rect ), "%lu: wrong caps desktop rect %s expected %s\n", + i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES )); + ok( EqualRect( &desktop, &rect ), "%lu: wrong caps virt desktop rect %s expected %s\n", + i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) ); + DeleteDC( hdc ); + /* test message window rect */ + hwnd = CreateWindowA( "SysParamsTestClass", "test", WS_CHILD, + 10, 10, 20, 20, HWND_MESSAGE, 0, GetModuleHandleA(0), NULL ); + GetWindowRect( GetAncestor( hwnd, GA_PARENT ), &rect ); + SetRect( &expect, 0, 0, 100, 100 ); + if (i == DPI_AWARENESS_UNAWARE) scale_rect_dpi( &expect, real_dpi, USER_DEFAULT_SCREEN_DPI ); + ok( EqualRect( &expect, &rect ), "%lu: wrong message rect %s expected %s\n", + i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + DestroyWindow( hwnd ); + } for (i = DPI_AWARENESS_UNAWARE; i <= DPI_AWARENESS_PER_MONITOR_AWARE; i++) { pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i );

1 0