wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Alexandre Julliard : user32: Switch to the window DPI awareness for MDI scrolling.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 440484fc076d209dfd95bc63ed08fa141cee55fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=440484fc076d209dfd95bc63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 28 12:21:28 2018 +0200 user32: Switch to the window DPI awareness for MDI scrolling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index f990335..10a3882 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1688,11 +1688,14 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg ) */ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) { + DPI_AWARENESS_CONTEXT context; SCROLLINFO info; RECT childRect, clientRect; HWND *list; DWORD style; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + GetClientRect( hwnd, &clientRect ); SetRectEmpty( &childRect ); @@ -1748,6 +1751,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) } break; } + SetThreadDpiAwarenessContext( context ); } @@ -1757,10 +1761,12 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + DPI_AWARENESS_CONTEXT context; INT newPos = -1; INT curPos, length, minPos, maxPos, shift; RECT rect; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hWnd )); GetClientRect( hWnd, &rect ); switch(uMsg) @@ -1778,7 +1784,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, shift = GetSystemMetrics(SM_CXVSCROLL); break; default: - return; + goto done; } switch( wParam ) @@ -1801,7 +1807,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, break; case SB_THUMBTRACK: - return; + goto done; case SB_TOP: newPos = minPos; @@ -1811,7 +1817,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, break; case SB_ENDSCROLL: CalcChildScroll(hWnd,(uMsg == WM_VSCROLL)?SB_VERT:SB_HORZ); - return; + goto done; } if( newPos > maxPos ) @@ -1828,6 +1834,8 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, else ScrollWindowEx(hWnd ,curPos - newPos, 0, NULL, NULL, 0, NULL, SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); +done: + SetThreadDpiAwarenessContext( context ); }

1 0

Alexandre Julliard : user32: Scale dialog base units based on DPI awareness.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: a525631920d74e9d797f38305b89e63aed1c5c41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a525631920d74e9d797f3830… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 28 12:05:55 2018 +0200 user32: Scale dialog base units based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 14 +++++++------- dlls/user32/tests/sysparams.c | 10 +++++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index e584cc1..7b91819 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1505,22 +1505,22 @@ BOOL WINAPI CheckRadioButton( HWND hwndDlg, int firstID, */ DWORD WINAPI GetDialogBaseUnits(void) { - static DWORD units; + static LONG cx, cy; - if (!units) + if (!cx) { HDC hdc; - SIZE size; if ((hdc = GetDC(0))) { - size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); - if (size.cx) units = MAKELONG( size.cx, size.cy ); + cx = GdiGetCharDimensions( hdc, NULL, &cy ); ReleaseDC( 0, hdc ); } - TRACE("base units = %d,%d\n", LOWORD(units), HIWORD(units) ); + TRACE( "base units = %d,%d\n", cx, cy ); } - return units; + + return MAKELONG( MulDiv( cx, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ), + MulDiv( cy, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI )); } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 846551e..8f9defc 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3217,7 +3217,7 @@ static void test_dpi_mapping(void) { HWND hwnd, child; HDC hdc; - UINT win_dpi; + UINT win_dpi, units; POINT point; BOOL ret; HRGN rgn, update; @@ -3292,6 +3292,7 @@ static void test_dpi_mapping(void) ShowWindow( hwnd, SW_MINIMIZE ); ShowWindow( hwnd, SW_RESTORE ); GetWindowPlacement( hwnd, &wpl_orig ); + units = GetDialogBaseUnits(); for (j = DPI_AWARENESS_UNAWARE; j <= DPI_AWARENESS_PER_MONITOR_AWARE; j++) { @@ -3407,6 +3408,13 @@ static void test_dpi_mapping(void) i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); UpdateWindow( hwnd ); DeleteObject( update ); + /* test dialog units */ + ret = GetDialogBaseUnits(); + point.x = LOWORD( units ); + point.y = HIWORD( units ); + scale_point_dpi_aware( &point, i, j ); + ok( LOWORD(ret) == point.x && HIWORD(ret) == point.y, "%lu/%lu: wrong units %d,%d / %d,%d\n", + i, j, LOWORD(ret), HIWORD(ret), point.x, point.y ); /* test window points mapping */ SetRect( &rect, 0, 0, 100, 100 ); rect.right = rect.left + 100;

1 0

Alex Henrie : shell32: Add network connections icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 19c364bd0d19a8b3f546e1936c66792f42847bd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c364bd0d19a8b3f546e193… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:59 2018 -0600 shell32: Add network connections icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 9004ebb..06b483e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -704,6 +704,9 @@ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico /* @makedep: resources/folder.ico */ IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.ico +/* @makedep: resources/network.ico */ +IDI_SHELL_NET_CONNECTIONS ICON resources/network.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e623b94..6761596 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -262,6 +262,7 @@ #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_CHECKLIST_FOLDER 174 +#define IDI_SHELL_NET_CONNECTIONS 175 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243

1 0

Alex Henrie : shell32: Add checklist folder icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: fa1bf3b30faeed315d2a4e4d8fbc3a6699275e52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa1bf3b30faeed315d2a4e4d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:58 2018 -0600 shell32: Add checklist 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 047d09d..9004ebb 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -700,6 +700,10 @@ IDI_SHELL_NETWORK_FOLDER ICON resources/folder.ico /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index a785c35..e623b94 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -261,6 +261,7 @@ #define IDI_SHELL_TREEVIEW 171 #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 +#define IDI_SHELL_CHECKLIST_FOLDER 174 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243

1 0

Alex Henrie : shell32: Add network folder icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 5e8803ace482757ee583c63722fddfafbcbcd38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e8803ace482757ee583c637… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:57 2018 -0600 shell32: Add network 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 d34555b..047d09d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -693,6 +693,10 @@ IDI_SHELL_DEFRAGMENT ICON resources/drive.ico /* @makedep: resources/menu.ico */ IDI_SHELL_TREEVIEW ICON resources/menu.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NETWORK_FOLDER ICON resources/folder.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 5531240..a785c35 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -259,6 +259,7 @@ #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 #define IDI_SHELL_TREEVIEW 171 +#define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add treeview icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 4504557787112306ff8361fa181ecd93050af58e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4504557787112306ff8361fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:56 2018 -0600 shell32: Add treeview 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 9924083..d34555b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -689,6 +689,10 @@ IDI_SHELL_DISK_CHECK ICON resources/drive.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DEFRAGMENT ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/menu.ico */ +IDI_SHELL_TREEVIEW ICON resources/menu.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2810028..5531240 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -258,6 +258,7 @@ #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 +#define IDI_SHELL_TREEVIEW 171 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add defragment icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: ffa4ce525805f956889c0ef6735995ac73c3a326 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffa4ce525805f956889c0ef6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:55 2018 -0600 shell32: Add defragment 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 af65307..9924083 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -685,6 +685,10 @@ IDI_SHELL_BACKUP ICON resources/copy.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DISK_CHECK ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_DEFRAGMENT ICON resources/drive.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b401a39..2810028 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -254,6 +254,7 @@ /* 162 - 164 not used on Windows */ #define IDI_SHELL_BACKUP 165 #define IDI_SHELL_DISK_CHECK 166 +#define IDI_SHELL_DEFRAGMENT 167 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

Alex Henrie : shell32: Add disk check icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: a7a50c148741e040f61722fb5cdad5d8a5ab0452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a50c148741e040f61722fb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:54 2018 -0600 shell32: Add disk check 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 3435448..af65307 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -681,6 +681,10 @@ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico /* @makedep: resources/copy.ico */ IDI_SHELL_BACKUP ICON resources/copy.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_DISK_CHECK ICON resources/drive.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b77c5fc..b401a39 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -253,6 +253,7 @@ #define IDI_SHELL_CONFIRM_DELETE 161 /* 162 - 164 not used on Windows */ #define IDI_SHELL_BACKUP 165 +#define IDI_SHELL_DISK_CHECK 166 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

Alex Henrie : shell32: Add backup icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: bcbfaf0b00a45f2c93ffdc82fac057b23b4faf8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcbfaf0b00a45f2c93ffdc82… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:53 2018 -0600 shell32: Add backup 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 | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index b84a280..3435448 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -677,6 +677,10 @@ IDI_SHELL_RUN2 ICON resources/window.ico /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/copy.ico */ +IDI_SHELL_BACKUP ICON resources/copy.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2e161dc..b77c5fc 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -251,6 +251,8 @@ /* 158 - 159 not used on Windows */ #define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 +/* 162 - 164 not used on Windows */ +#define IDI_SHELL_BACKUP 165 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

Alex Henrie : shell32: Add copy icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 4f5c8253d33de851aab5111a9042612c0aa1878f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f5c8253d33de851aab5111a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:52 2018 -0600 shell32: Add copy icon. Adapted from edit-copy 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/copy.ico | Bin 0 -> 34090 bytes dlls/shell32/resources/copy.svg | 811 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 816 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f5c8253d33de851aab5…

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
62
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 August 2018