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

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

Aug. 22, 2018

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

Alex Henrie : shell32: Add printer folder icon.
by Alexandre Julliard Aug. 22, 2018

Aug. 22, 2018

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

Nikolay Sivov : user32/listbox: Fix multicolumn navigation on VK_RIGHT.
by Alexandre Julliard Aug. 22, 2018

Aug. 22, 2018

Module: wine Branch: master Commit: c9b6dd83a372c87c99594ecc5c111e1ae669a13c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9b6dd83a372c87c99594ecc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 22 16:50:18 2018 +0300 user32/listbox: Fix multicolumn navigation on VK_RIGHT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3f1396d..05fcc44 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2354,8 +2354,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key ) if (descr->style & LBS_MULTICOLUMN) { bForceSelection = FALSE; - if (descr->focus_item + descr->page_size < descr->nb_items) - caret = descr->focus_item + descr->page_size; + caret = min(descr->focus_item + descr->page_size, descr->nb_items - 1); break; } /* fall through */

1 0

Andrew Eikum : winex11.drv: Fix indentation for focus_out.
by Alexandre Julliard Aug. 22, 2018

Aug. 22, 2018

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

Alex Henrie : shell32: Add eject icon.
by Alexandre Julliard Aug. 22, 2018

Aug. 22, 2018

Module: wine Branch: master Commit: f9c7dbd55e265cab4ed0b207b1d8bac0f973b825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9c7dbd55e265cab4ed0b207… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:43 2018 -0600 shell32: Add eject icon. Adapted from media-eject 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/eject.ico | Bin 0 -> 41496 bytes dlls/shell32/resources/eject.svg | 596 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 601 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c7dbd55e265cab4ed0…

1 0

Alex Henrie : shell32: Add "trash full" icon.
by Alexandre Julliard Aug. 22, 2018

Aug. 22, 2018

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 application folder icon.
by Alexandre Julliard Aug. 22, 2018

Aug. 22, 2018

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 modem folder icon.
by Alexandre Julliard Aug. 22, 2018

Aug. 22, 2018

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

Nikolay Sivov : comctl32/listbox: Fix multicolumn navigation on VK_RIGHT.
by Alexandre Julliard Aug. 22, 2018

Aug. 22, 2018

Module: wine Branch: master Commit: da75153eae8f76727e518b81f17609838b982070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da75153eae8f76727e518b81… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 22 16:50:19 2018 +0300 comctl32/listbox: Fix multicolumn navigation on VK_RIGHT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 5235ffd..4d389b1 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2349,8 +2349,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key ) if (descr->style & LBS_MULTICOLUMN) { bForceSelection = FALSE; - if (descr->focus_item + descr->page_size < descr->nb_items) - caret = descr->focus_item + descr->page_size; + caret = min(descr->focus_item + descr->page_size, descr->nb_items - 1); break; } /* fall through */

1 0

Alexandre Julliard : winex11: Use fallback implementation for screen dimensions in GetDeviceCaps().
by Alexandre Julliard Aug. 22, 2018

Aug. 22, 2018

Module: wine Branch: master Commit: 0cbb08634781048c46d0b7348b12edfa15427d5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cbb08634781048c46d0b734… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 11:42:43 2018 +0200 winex11: Use fallback implementation for screen dimensions in GetDeviceCaps(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index fc7972c..3268733 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -162,26 +162,6 @@ static INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case HORZRES: - { - RECT primary_rect = get_primary_monitor_rect(); - return primary_rect.right - primary_rect.left; - } - case VERTRES: - { - RECT primary_rect = get_primary_monitor_rect(); - return primary_rect.bottom - primary_rect.top; - } - case DESKTOPHORZRES: - { - RECT virtual_rect = get_virtual_screen_rect(); - return virtual_rect.right - virtual_rect.left; - } - case DESKTOPVERTRES: - { - RECT virtual_rect = get_virtual_screen_rect(); - return virtual_rect.bottom - virtual_rect.top; - } case BITSPIXEL: return screen_bpp; case SIZEPALETTE:

1 0