April 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : winetest: Set the window small icon.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 5b32b11e106a41d292f96ac9d82b340268c3e2d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b32b11e106a41d292f96ac9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 20:12:57 2010 +0200 winetest: Set the window small icon. --- programs/winetest/gui.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index f13cc18..45b3232 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -433,8 +433,9 @@ DlgProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) switch (msg) { case WM_INITDIALOG: SendMessage (hwnd, WM_SETICON, ICON_SMALL, - (LPARAM)LoadIcon (GetModuleHandle (NULL), - MAKEINTRESOURCE (IDI_WINE))); + (LPARAM)LoadImage( GetModuleHandle (NULL), MAKEINTRESOURCE (IDI_WINE), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), + LR_SHARED )); SendMessage (hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon (GetModuleHandle (NULL), MAKEINTRESOURCE (IDI_WINE)));

1 0

Alexandre Julliard : taskmgr: Set the window small icon.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 80997b2f05c3f2917893983b65865cb93c3feca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80997b2f05c3f2917893983b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 20:12:39 2010 +0200 taskmgr: Set the window small icon. --- programs/taskmgr/taskmgr.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 01c6926..5958d5c 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -131,6 +131,10 @@ static BOOL OnCreate(HWND hWnd) LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, sizeof(wszPerformance)/sizeof(WCHAR)); SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER))); + SendMessageW(hMainWnd, WM_SETICON, ICON_SMALL, + (LPARAM)LoadImage(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), + LR_SHARED)); /* Initialize the Windows Common Controls DLL */ InitCommonControls();

1 0

André Hentschel : shlwapi: Fix comment typo.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 38e800f7c441d29beb5b239507f7242707ecc2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e800f7c441d29beb5b23950… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 19 20:05:37 2010 +0200 shlwapi: Fix comment typo. --- dlls/shlwapi/tests/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/thread.c b/dlls/shlwapi/tests/thread.c index ea89424..cb88036 100644 --- a/dlls/shlwapi/tests/thread.c +++ b/dlls/shlwapi/tests/thread.c @@ -132,7 +132,7 @@ static void test_SHSetThreadRef(void) "got 0x%x and %p with %d, %d (expected S_OK and %p with 2, 1)\n", hr, punk, refcount, AddRef_called, &ref); - /* clear the onject pointer */ + /* clear the object pointer */ hr = pSHSetThreadRef(NULL); ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr);

1 0

Alexandre Julliard : wordpad: Set the window small icon, and get rid of old icons.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: b2e7e5c3530a77d9af5819643e458e0fa0e32b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e7e5c3530a77d9af5819643… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 20:13:34 2010 +0200 wordpad: Set the window small icon, and get rid of old icons. --- programs/wordpad/rsrc.rc | 9 --------- programs/wordpad/rtf.ico | Bin 2238 -> 0 bytes programs/wordpad/txt.ico | Bin 2238 -> 0 bytes programs/wordpad/wordpad.c | 18 ++++++------------ programs/wordpad/wordpad.h | 5 +---- programs/wordpad/wri.ico | Bin 2238 -> 0 bytes 6 files changed, 7 insertions(+), 25 deletions(-) diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index c074e3d..60d0792 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -52,14 +52,5 @@ IDB_FORMATBAR BITMAP "formatbar.bmp" /* @makedep: wordpad.ico */ IDI_WORDPAD ICON "wordpad.ico" -/* @makedep: rtf.ico */ -IDI_RTF ICON "rtf.ico" - -/* @makedep: wri.ico */ -IDI_WRI ICON "wri.ico" - -/* @makedep: txt.ico */ -IDI_TXT ICON "txt.ico" - /* @makedep: zoom.cur */ IDC_ZOOM CURSOR "zoom.cur" diff --git a/programs/wordpad/rtf.ico b/programs/wordpad/rtf.ico deleted file mode 100644 index 653a5cf..0000000 Binary files a/programs/wordpad/rtf.ico and /dev/null differ diff --git a/programs/wordpad/txt.ico b/programs/wordpad/txt.ico deleted file mode 100644 index 39a9f90..0000000 Binary files a/programs/wordpad/txt.ico and /dev/null differ diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index b9e6f37..d5f9af5 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -703,17 +703,8 @@ static void preview_exit(HWND hMainWnd) static void set_fileformat(WPARAM format) { - HICON hIcon; - HINSTANCE hInstance = GetModuleHandleW(0); fileFormat = format; - if(format & SF_TEXT) - hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_TXT)); - else - hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_RTF)); - - SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon); - set_bar_states(); set_default_font(); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]); @@ -2618,7 +2609,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar { INITCOMMONCONTROLSEX classes = {8, ICC_BAR_CLASSES|ICC_COOL_CLASSES|ICC_USEREX_CLASSES}; HACCEL hAccel; - WNDCLASSW wc; + WNDCLASSEXW wc; MSG msg; RECT rc; UINT_PTR hPrevRulerProc; @@ -2638,11 +2629,13 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.cbWndExtra = 4; wc.hInstance = hInstance; wc.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD)); + wc.hIconSm = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); wc.hCursor = LoadCursor(NULL, IDC_IBEAM); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MAINMENU); wc.lpszClassName = wszMainWndClass; - RegisterClassW(&wc); + RegisterClassExW(&wc); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = preview_proc; @@ -2650,11 +2643,12 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.cbWndExtra = 0; wc.hInstance = hInstance; wc.hIcon = NULL; + wc.hIconSm = NULL; wc.hCursor = LoadCursor(NULL, IDC_IBEAM); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = wszPreviewWndClass; - RegisterClassW(&wc); + RegisterClassExW(&wc); registry_read_winrect(&rc); hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_CLIPCHILDREN|WS_OVERLAPPEDWINDOW, diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 2f774c3..2067299 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -185,11 +185,8 @@ #define IDB_FORMATBAR 101 #define IDI_WORDPAD 102 -#define IDI_RTF 103 -#define IDI_WRI 104 -#define IDI_TXT 105 -#define IDC_ZOOM 106 +#define IDC_ZOOM 103 #define STRING_ALL_FILES 1400 #define STRING_TEXT_FILES_TXT 1401 diff --git a/programs/wordpad/wri.ico b/programs/wordpad/wri.ico deleted file mode 100644 index d011356..0000000 Binary files a/programs/wordpad/wri.ico and /dev/null differ

1 0

Alexandre Julliard : winhlp32: Set the window class small icon for all classes.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 0763861873428d00a2fc39af6da729cef7831730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0763861873428d00a2fc39af6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 20:13:11 2010 +0200 winhlp32: Set the window class small icon for all classes. --- programs/winhlp32/winhelp.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index fb05aeb..c5176ca 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -817,7 +817,8 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe } hIcon = (wpage->page) ? wpage->page->file->hIcon : NULL; - if (!hIcon) hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP)); + if (!hIcon) hIcon = LoadImage(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); SendMessage(win->hMainWnd, WM_SETICON, ICON_SMALL, (DWORD_PTR)hIcon); /* Initialize file specific pushbuttons */ @@ -1633,8 +1634,9 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search) */ static BOOL WINHELP_RegisterWinClasses(void) { - WNDCLASS class_main, class_button_box, class_shadow, class_history; + WNDCLASSEX class_main, class_button_box, class_shadow, class_history; + class_main.cbSize = sizeof(class_main); class_main.style = CS_HREDRAW | CS_VREDRAW; class_main.lpfnWndProc = WINHELP_MainWndProc; class_main.cbClsExtra = 0; @@ -1645,6 +1647,9 @@ static BOOL WINHELP_RegisterWinClasses(void) class_main.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); class_main.lpszMenuName = 0; class_main.lpszClassName = MAIN_WIN_CLASS_NAME; + class_main.hIconSm = LoadImage(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), + LR_SHARED); class_button_box = class_main; class_button_box.lpfnWndProc = WINHELP_ButtonBoxWndProc; @@ -1662,10 +1667,10 @@ static BOOL WINHELP_RegisterWinClasses(void) class_history.lpfnWndProc = WINHELP_HistoryWndProc; class_history.lpszClassName = HISTORY_WIN_CLASS_NAME; - return (RegisterClass(&class_main) && - RegisterClass(&class_button_box) && - RegisterClass(&class_shadow) && - RegisterClass(&class_history)); + return (RegisterClassEx(&class_main) && + RegisterClassEx(&class_button_box) && + RegisterClassEx(&class_shadow) && + RegisterClassEx(&class_history)); } /***********************************************************************

1 0

Alexandre Julliard : notepad: Set the window class small icon.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 4c917904aeaa51290d5b71aebd79005ddcaeab42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c917904aeaa51290d5b71aeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 20:12:34 2010 +0200 notepad: Set the window class small icon. --- programs/notepad/main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 1ddd95c..841da37 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -743,6 +743,9 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) class.lpfnWndProc = NOTEPAD_WndProc; class.hInstance = Globals.hInstance; class.hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD)); + class.hIconSm = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), + LR_SHARED); class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); class.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU);

1 0

Alexandre Julliard : winemine: Set the window class small icon.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 099890106c3a6672565dd3f6fc27753ac6cde236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099890106c3a6672565dd3f6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 20:12:51 2010 +0200 winemine: Set the window class small icon. --- programs/winemine/main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index be544e8..582f2cb 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -1008,7 +1008,7 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow ) { MSG msg; - WNDCLASS wc; + WNDCLASSEX wc; HWND hWnd; HACCEL haccel; char appname[20]; @@ -1025,8 +1025,10 @@ int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmd wc.hbrBackground = GetStockObject( BLACK_BRUSH ); wc.lpszMenuName = "MENU_WINEMINE"; wc.lpszClassName = appname; + wc.hIconSm = LoadImage( hInst, "WINEMINE", IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED ); - if (!RegisterClass(&wc)) ExitProcess(1); + if (!RegisterClassEx(&wc)) ExitProcess(1); hWnd = CreateWindow( appname, appname, wnd_style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,

1 0

Michael Stefaniuc : transl: Add more kernel32/nls empty string exceptions.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: tools Branch: master Commit: 9aa7bc4c3272deddeacf7df1540a70daf847f00d URL: http://source.winehq.org/git/tools.git/?a=commit;h=9aa7bc4c3272deddeacf7df1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 20 02:36:43 2010 +0200 transl: Add more kernel32/nls empty string exceptions. - LOCALE_SPOSITIVESIGN, LOCALE_SMONTHNAME13 and LOCALE_SABBREVMONTHNAME13 are empty in English (US) but can be set in the translations. This fixes the false positive in the Syriac translation. - Empty LOCALE_S1159 and LOCALE_S2359 aren't warnings either. This removes a few pedantic warnings for missing AM/PM strings. --- transl/parse_resfiles.php | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/transl/parse_resfiles.php b/transl/parse_resfiles.php index a6ec479..ac62342 100644 --- a/transl/parse_resfiles.php +++ b/transl/parse_resfiles.php @@ -157,18 +157,32 @@ function res_callback($header, $file) $errwarncount[$langid][$resource] = $basic_res->getcounts($master_res); // A .rc file can contain empty strings (""). There is however no distinction in a - // resource file between empty strings and missing ones. The following is the only + // resource file between empty strings and missing ones. The following are the only // exception to the rule that a translation should exist for strings that are - // available in English (United States). - if (($resdir == "dlls/kernel32") && ($header["type"] == 6) && ($header["name"] == 3)) + // available in English (United States) and vice versa. + if (($resdir == "dlls/kernel32") && ($header["type"] == 6)) { - // LOCALE_S1159 and LOCALE_S2359 can be empty and are to be ignored as errors - $LOCALE_S1159 = $basic_res->GetString(8); - $LOCALE_S2359 = $basic_res->GetString(9); - if (!$LOCALE_S1159) - $errwarncount[$langid][$resource]['errors']--; - if (!$LOCALE_S2359) - $errwarncount[$langid][$resource]['errors']--; + // STRINGTABLE => (string_pos => (empty=0 or non-empty=1), ...) + $exceptions = array( + 3 => array( 8 => 0, // LOCALE_S1159 + 9 => 0), // LOCALE_S2359 + 6 => array( 0 => 1), // LOCALE_SPOSITIVESIGN + 257 => array(14 => 1, // LOCALE_SMONTHNAME13 + 15 => 1) // LOCALE_SABBREVMONTHNAME13 + ); + + if (array_key_exists($header["name"], $exceptions)) + { + foreach ($exceptions[$header["name"]] as $string_pos => $expect) + { + $string = $basic_res->GetString($string_pos); + if (!!$string == $expect) + { + $errwarncount[$langid][$resource]['errors']--; + $errwarncount[$langid][$resource]['warnings']--; + } + } + } } }

1 0

Michael Stefaniuc : transl: Print a newline after each table row.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: tools Branch: master Commit: e44436161e92e706b45a1988f8d311fe8272bf04 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e44436161e92e706b45a1988… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 20 02:36:18 2010 +0200 transl: Print a newline after each table row. This makes the generated HTML more pleasing to the eye when troubleshooting. --- transl/index.php | 2 +- transl/lib.php | 2 +- transl/resource.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/transl/index.php b/transl/index.php index 66071ad..7c4ce00 100644 --- a/transl/index.php +++ b/transl/index.php @@ -76,7 +76,7 @@ function draw_bar($tr, $err, $warn, $sum) echo "<img src=\"img/bar5.gif\" height=\"15\" width=\"$warn_len\" alt=\"warnings\">"; if ($err_len > 0) echo "<img src=\"img/bar1.gif\" height=\"15\" width=\"$err_len\" alt=\"errors\">"; - echo "</td></tr>"; + echo "</td></tr>\n"; } function nicesort($a, $b) diff --git a/transl/lib.php b/transl/lib.php index aceee55..14da399 100644 --- a/transl/lib.php +++ b/transl/lib.php @@ -149,7 +149,7 @@ function show_sublangs($id) $sublangs = get_sublangs($id); foreach ($sublangs as $key => $value) { - echo "<tr><td>".gen_lang_a($key).get_lang_name($key)."</a></td></tr>"; + echo "<tr><td>".gen_lang_a($key).get_lang_name($key)."</a></td></tr>\n"; } echo "</table>\n"; echo "</div>"; diff --git a/transl/resource.php b/transl/resource.php index 4d3b61f..c54c115 100644 --- a/transl/resource.php +++ b/transl/resource.php @@ -53,11 +53,11 @@ if ($compare || ($pedantic && $warnings != 0)) echo "<tr class=\"subheader\"><td colspan=\"5\" style=\"text-align: right\">"; echo "<small>".gen_resource_a($lang, $resfile, $type, $id, FALSE); echo "<< Hide compare with ".get_locale_name($MASTER_LANGUAGE)."</a></small>"; - echo "</td></tr>"; + echo "</td></tr>\n"; } echo "<tr class=\"subheader\"><td>id</td><td> </td><td>".get_lang_name($lang). - "</td><td> </td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>"; + "</td><td> </td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>\n"; $res->dump($master_res); } @@ -68,7 +68,7 @@ else echo "<tr class=\"subheader\"><td colspan=\"3\" style=\"text-align: right\">"; echo "<small>".gen_resource_a($lang, $resfile, $type, $id, TRUE); echo "Compare with ".get_locale_name($MASTER_LANGUAGE)." >></a></small>"; - echo "</td></tr>"; + echo "</td></tr>\n"; } $res->dump(NULL);

1 0

Alexandre Julliard : winex11: Add the small icon to the NET_WM_ICON hint.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: a551dfe311a845071b2adde3af3e5e66e3589036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a551dfe311a845071b2adde3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 17:51:44 2010 +0200 winex11: Add the small icon to the NET_WM_ICON hint. --- dlls/winex11.drv/window.c | 64 +++++++++++++++++++++++++++++++++------------ 1 files changed, 47 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 73c45ff..dac2874 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -880,16 +880,28 @@ failed: * * Set the icon wm hints */ -static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICON hIcon ) +static void set_icon_hints( Display *display, struct x11drv_win_data *data, + HICON icon_big, HICON icon_small ) { XWMHints *hints = data->wm_hints; + if (!icon_big) + { + icon_big = (HICON)SendMessageW( data->hwnd, WM_GETICON, ICON_BIG, 0 ); + if (!icon_big) icon_big = (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ); + } + if (!icon_small) + { + icon_small = (HICON)SendMessageW( data->hwnd, WM_GETICON, ICON_SMALL, 0 ); + if (!icon_small) icon_small = (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICONSM ); + } + if (data->hWMIconBitmap) DeleteObject( data->hWMIconBitmap ); if (data->hWMIconMask) DeleteObject( data->hWMIconMask); data->hWMIconBitmap = 0; data->hWMIconMask = 0; - if (!hIcon) + if (!icon_big) { if (!data->icon_window) create_icon_window( display, data ); hints->icon_window = data->icon_window; @@ -905,7 +917,7 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICO unsigned int size; unsigned long *bits; - GetIconInfo(hIcon, &ii); + GetIconInfo(icon_big, &ii); GetObjectW(ii.hbmMask, sizeof(bm), &bm); rcMask.top = 0; @@ -917,8 +929,36 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICO hbmOrig = SelectObject(hDC, ii.hbmMask); InvertRect(hDC, &rcMask); SelectObject(hDC, ii.hbmColor); /* force the color bitmap to x11drv mode too */ + SelectObject(hDC, hbmOrig); + + data->hWMIconBitmap = ii.hbmColor; + data->hWMIconMask = ii.hbmMask; + + hints->icon_pixmap = X11DRV_get_pixmap(data->hWMIconBitmap); + hints->icon_mask = X11DRV_get_pixmap(data->hWMIconMask); + destroy_icon_window( display, data ); + hints->flags = (hints->flags & ~IconWindowHint) | IconPixmapHint | IconMaskHint; bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); + if (GetIconInfo( icon_small, &ii )) + { + unsigned int size_small; + unsigned long *bits_small, *new; + + if ((bits_small = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size_small ))) + { + if ((new = HeapReAlloc( GetProcessHeap(), 0, bits, + (size + size_small) * sizeof(unsigned long) ))) + { + bits = new; + memcpy( bits + size, bits_small, size_small * sizeof(unsigned long) ); + size += size_small; + } + HeapFree( GetProcessHeap(), 0, bits_small ); + } + DeleteObject( ii.hbmColor ); + DeleteObject( ii.hbmMask ); + } wine_tsx11_lock(); if (bits) XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON), @@ -927,16 +967,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICO XDeleteProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON) ); wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, bits ); - SelectObject(hDC, hbmOrig); - DeleteDC(hDC); - - data->hWMIconBitmap = ii.hbmColor; - data->hWMIconMask = ii.hbmMask; - hints->icon_pixmap = X11DRV_get_pixmap(data->hWMIconBitmap); - hints->icon_mask = X11DRV_get_pixmap(data->hWMIconMask); - destroy_icon_window( display, data ); - hints->flags = (hints->flags & ~IconWindowHint) | IconPixmapHint | IconMaskHint; + DeleteDC(hDC); } } @@ -1060,10 +1092,8 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data if (data->wm_hints) { - HICON icon = (HICON)SendMessageW( data->hwnd, WM_GETICON, ICON_BIG, 0 ); - if (!icon) icon = (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ); data->wm_hints->flags = 0; - set_icon_hints( display, data, icon ); + set_icon_hints( display, data, 0, 0 ); } } @@ -2388,7 +2418,6 @@ void CDECL X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) Display *display = thread_display(); struct x11drv_win_data *data; - if (type != ICON_BIG) return; /* nothing to do here */ if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->whole_window) return; @@ -2396,7 +2425,8 @@ void CDECL X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) if (data->wm_hints) { - set_icon_hints( display, data, icon ); + if (type == ICON_BIG) set_icon_hints( display, data, icon, 0 ); + else set_icon_hints( display, data, 0, icon ); wine_tsx11_lock(); XSetWMHints( display, data->whole_window, data->wm_hints ); wine_tsx11_unlock();

1 0