May 2016 - Wine-Commits - list.winehq.org

Francois Gouget : shell32: Spelling fixes.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: cc2a2b09703b391b02ec773eba8c55e98b383fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2a2b09703b391b02ec773eb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:41:31 2016 +0200 shell32: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 4549d5b..c3284a2 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -106,7 +106,7 @@ static int SIC_LoadOverlayIcon(int icon_idx); * SIC_OverlayShortcutImage [internal] * * NOTES - * Creates a new icon as a copy of the passed-in icon, overlayed with a + * Creates a new icon as a copy of the passed-in icon, overlaid with a * shortcut image. */ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large) @@ -332,7 +332,7 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) } else { - WARN("Failed to create shortcut overlayed icons\n"); + WARN("Failed to create shortcut overlaid icons\n"); if (NULL != hiconLargeShortcut) DestroyIcon(hiconLargeShortcut); if (NULL != hiconSmallShortcut) DestroyIcon(hiconSmallShortcut); dwFlags &= ~ GIL_FORSHORTCUT;

1 0

Nikolay Sivov : ntdll/tests: Fix some string leaks (Valgrind).
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: b10312d0780494550a091a238dce601750b5f580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b10312d0780494550a091a238… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 19:04:48 2016 +0300 ntdll/tests: Fix some string leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 3738301..0160869 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1694,6 +1694,7 @@ static void test_NtQueryKey(void) pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey"); status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + pRtlFreeUnicodeString(&str); status = pNtQueryKey(subkey, KeyCachedInformation, &cached_info, sizeof(cached_info), &len); ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); @@ -1714,11 +1715,13 @@ static void test_NtQueryKey(void) pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey2"); status = pNtCreateKey(&subkey2, GENERIC_ALL, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + pRtlFreeUnicodeString(&str); pRtlCreateUnicodeStringFromAsciiz(&str, "val"); dw = 64; status = pNtSetValueKey( subkey, &str, 0, REG_DWORD, &dw, sizeof(dw) ); ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); + pRtlFreeUnicodeString(&str); status = pNtQueryKey(subkey, KeyCachedInformation, &cached_info, sizeof(cached_info), &len); ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); @@ -1779,6 +1782,7 @@ static void test_notify(void) pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey"); status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + pRtlFreeUnicodeString(&str); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); @@ -1830,6 +1834,7 @@ static void test_notify(void) pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey"); status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + pRtlFreeUnicodeString(&str); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status);

1 0

Alexandre Julliard : winebrowser: Support browser and mailer commands with arguments.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: e27e733f69a69d3c352d434ee751688666a5d017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27e733f69a69d3c352d434ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 28 14:53:00 2016 +0900 winebrowser: Support browser and mailer commands with arguments. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winebrowser/Makefile.in | 2 +- programs/winebrowser/main.c | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in index 1e7a842..4a300a6 100644 --- a/programs/winebrowser/Makefile.in +++ b/programs/winebrowser/Makefile.in @@ -1,6 +1,6 @@ MODULE = winebrowser.exe APPMODE = -mwindows -municode -IMPORTS = urlmon oleaut32 user32 advapi32 +IMPORTS = urlmon oleaut32 shell32 user32 advapi32 C_SRCS = \ main.c diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 0a443c1..4ec1d14 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -45,6 +45,7 @@ #include <windows.h> #include <shlwapi.h> +#include <shellapi.h> #include <urlmon.h> #include <ddeml.h> #include <stdio.h> @@ -71,27 +72,31 @@ static char *strdup_unixcp( const WCHAR *str ) /* try to launch a unix app from a comma separated string of app names */ static int launch_app( const WCHAR *candidates, const WCHAR *argv1 ) { - char *app, *cmdline; - const char *argv_new[3]; + char *cmdline; + int i, count; + char **argv_new; if (!(cmdline = strdup_unixcp( argv1 ))) return 1; while (*candidates) { - if (!(app = strdup_unixcp( candidates ))) break; + WCHAR **args = CommandLineToArgvW( candidates, &count ); - WINE_TRACE( "Considering: %s\n", wine_dbgstr_a(app) ); - WINE_TRACE( "argv[1]: %s\n", wine_dbgstr_a(cmdline) ); + if (!(argv_new = HeapAlloc( GetProcessHeap(), 0, (count + 1) * sizeof(*argv_new) ))) break; + for (i = 0; i < count; i++) argv_new[i] = strdup_unixcp( args[i] ); + argv_new[count] = cmdline; + argv_new[count + 1] = NULL; - argv_new[0] = app; - argv_new[1] = cmdline; - argv_new[2] = NULL; + TRACE( "Trying" ); + for (i = 0; i <= count; i++) TRACE( " %s", wine_dbgstr_a( argv_new[i] )); + TRACE( "\n" ); - _spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */ - HeapFree( GetProcessHeap(), 0, app ); + _spawnvp( _P_OVERLAY, argv_new[0], (const char **)argv_new ); /* only returns on error */ + for (i = 0; i < count; i++) HeapFree( GetProcessHeap(), 0, argv_new[i] ); + HeapFree( GetProcessHeap(), 0, argv_new ); candidates += strlenW( candidates ) + 1; /* grab the next app */ } - WINE_ERR( "could not find a suitable app to run\n" ); + WINE_ERR( "could not find a suitable app to open %s\n", debugstr_w( argv1 )); HeapFree( GetProcessHeap(), 0, cmdline ); return 1;

1 0

Alexandre Julliard : winebrowser: Support MULTI_SZ strings for browsers and mailers configuration.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: 01cc315b91f774641b9a5bf64b0f5a03681f3cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01cc315b91f774641b9a5bf64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 28 14:42:36 2016 +0900 winebrowser: Support MULTI_SZ strings for browsers and mailers configuration. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winebrowser/main.c | 73 ++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index cb9ea73..0a443c1 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -69,20 +69,17 @@ static char *strdup_unixcp( const WCHAR *str ) } /* try to launch a unix app from a comma separated string of app names */ -static int launch_app( WCHAR *candidates, const WCHAR *argv1 ) +static int launch_app( const WCHAR *candidates, const WCHAR *argv1 ) { - char *app, *applist, *cmdline; + char *app, *cmdline; const char *argv_new[3]; - if (!(applist = strdup_unixcp( candidates ))) return 1; - if (!(cmdline = strdup_unixcp( argv1 ))) - { - HeapFree( GetProcessHeap(), 0, applist ); - return 1; - } - app = strtok( applist, "," ); - while (app) + if (!(cmdline = strdup_unixcp( argv1 ))) return 1; + + while (*candidates) { + if (!(app = strdup_unixcp( candidates ))) break; + WINE_TRACE( "Considering: %s\n", wine_dbgstr_a(app) ); WINE_TRACE( "argv[1]: %s\n", wine_dbgstr_a(cmdline) ); @@ -91,44 +88,62 @@ static int launch_app( WCHAR *candidates, const WCHAR *argv1 ) argv_new[2] = NULL; _spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */ - app = strtok( NULL, "," ); /* grab the next app */ + HeapFree( GetProcessHeap(), 0, app ); + candidates += strlenW( candidates ) + 1; /* grab the next app */ } WINE_ERR( "could not find a suitable app to run\n" ); - HeapFree( GetProcessHeap(), 0, applist ); HeapFree( GetProcessHeap(), 0, cmdline ); return 1; } +static LSTATUS get_commands( HKEY key, const WCHAR *value, WCHAR *buffer, DWORD size ) +{ + DWORD type; + LSTATUS res; + + size -= sizeof(WCHAR); + if (!(res = RegQueryValueExW( key, value, 0, &type, (LPBYTE)buffer, &size )) && (type == REG_SZ)) + { + /* convert to REG_MULTI_SZ type */ + WCHAR *p = buffer; + p[strlenW(p) + 1] = 0; + while ((p = strchrW( p, ',' ))) *p++ = 0; + } + return res; +} + static int open_http_url( const WCHAR *url ) { #ifdef __APPLE__ static const WCHAR defaultbrowsers[] = - { '/', 'u', 's', 'r', '/', 'b', 'i', 'n', '/', 'o', 'p', 'e', 'n', 0 }; + { '/','u','s','r','/','b','i','n','/','o','p','e','n',0,0 }; #else static const WCHAR defaultbrowsers[] = - {'x','d','g','-','o','p','e','n',',','f','i','r','e','f','o','x',',', - 'k','o','n','q','u','e','r','o','r',',','m','o','z','i','l','l','a',',', - 'n','e','t','s','c','a','p','e',',','g','a','l','e','o','n',',', - 'o','p','e','r','a',',','d','i','l','l','o',0}; + {'x','d','g','-','o','p','e','n',0, + 'f','i','r','e','f','o','x',0, + 'k','o','n','q','u','e','r','o','r',0, + 'm','o','z','i','l','l','a',0, + 'n','e','t','s','c','a','p','e',0, + 'g','a','l','e','o','n',0, + 'o','p','e','r','a',0, + 'd','i','l','l','o',0,0}; #endif static const WCHAR browsersW[] = {'B','r','o','w','s','e','r','s',0}; WCHAR browsers[256]; - DWORD length, type; HKEY key; LONG r; - length = sizeof(browsers); /* @@ Wine registry key: HKCU\Software\Wine\WineBrowser */ if (!(r = RegOpenKeyW( HKEY_CURRENT_USER, browser_key, &key ))) { - r = RegQueryValueExW( key, browsersW, 0, &type, (LPBYTE)browsers, &length ); + r = get_commands( key, browsersW, browsers, sizeof(browsers) ); RegCloseKey( key ); } if (r != ERROR_SUCCESS) - strcpyW( browsers, defaultbrowsers ); + memcpy( browsers, defaultbrowsers, sizeof(defaultbrowsers) ); return launch_app( browsers, url ); } @@ -137,31 +152,29 @@ static int open_mailto_url( const WCHAR *url ) { #ifdef __APPLE__ static const WCHAR defaultmailers[] = - { '/', 'u', 's', 'r', '/', 'b', 'i', 'n', '/', 'o', 'p', 'e', 'n', 0 }; + { '/','u','s','r','/','b','i','n','/','o','p','e','n',0,0 }; #else static const WCHAR defaultmailers[] = - {'x','d','g','-','e','m','a','i','l',',', - 'm','o','z','i','l','l','a','-','t','h','u','n','d','e','r','b','i','r','d',',', - 't','h','u','n','d','e','r','b','i','r','d',',', - 'e','v','o','l','u','t','i','o','n',0}; + {'x','d','g','-','e','m','a','i','l',0, + 'm','o','z','i','l','l','a','-','t','h','u','n','d','e','r','b','i','r','d',0, + 't','h','u','n','d','e','r','b','i','r','d',0, + 'e','v','o','l','u','t','i','o','n',0,0 }; #endif static const WCHAR mailersW[] = {'M','a','i','l','e','r','s',0}; WCHAR mailers[256]; - DWORD length, type; HKEY key; LONG r; - length = sizeof(mailers); /* @@ Wine registry key: HKCU\Software\Wine\WineBrowser */ if (!(r = RegOpenKeyW( HKEY_CURRENT_USER, browser_key, &key ))) { - r = RegQueryValueExW( key, mailersW, 0, &type, (LPBYTE)mailers, &length ); + r = get_commands( key, mailersW, mailers, sizeof(mailers) ); RegCloseKey( key ); } if (r != ERROR_SUCCESS) - strcpyW( mailers, defaultmailers ); + memcpy( mailers, defaultmailers, sizeof(defaultmailers) ); return launch_app( mailers, url ); }

1 0

Alexandre Julliard : Wine release 1.9.11
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: website Branch: master Commit: 1be115550ed800912d1a3c9ad0ae7d4d9afcf81b URL: http://source.winehq.org/git/website.git/?a=commit;h=1be115550ed800912d1a3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 23:42:42 2016 +0900 Wine release 1.9.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016052701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016052701.xml b/news/en/2016052701.xml new file mode 100644 index 0000000..1cf01c4 --- /dev/null +++ b/news/en/2016052701.xml @@ -0,0 +1,16 @@ +<news> +<date>May 27, 2016</date> +<title>Wine 1.9.11 Released</title> +<body> + The Wine development release 1.9.11 is now available. + <a href="{$root}/announce/1.9.11">What's new</a> in this release: +<ul> + <li>Better support for long URLs in WinInet.</li> + <li>Various Direct3D 11 improvements.</li> + <li>Down-mixing support in DirectSound.</li> + <li>Some cosmetic improvements in desktop mode.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.11.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.9.11 : Alexandre Julliard : Release 1.9.11
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: refs/tags/wine-1.9.11 Tag: 8f7b62e2a23f54dc199508d0c135f5677ebad007 URL: http://source.winehq.org/git/wine.git/?a=tag;h=8f7b62e2a23f54dc199508d0c135… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 23:40:02 2016 +0900 Release 1.9.11

1 0

Alexandre Julliard : Release 1.9.11.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 81c700e0f8f8670f9c3b05a4baab2b2cffaeff89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c700e0f8f8670f9c3b05a4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 23:40:02 2016 +0900 Release 1.9.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 654 +++++++++++++++++++++++++++++++++++++------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 402 insertions(+), 276 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81c700e0f8f8670f9c3b0…

1 0

Alexandre Julliard : explorer: Add a helper function to resize and display the tray window.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 45b2b1f09b30b01726685983dd8e3edb42c1fd1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b2b1f09b30b01726685983d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 21:08:44 2016 +0900 explorer: Add a helper function to resize and display the tray window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 57 +++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index beb0a88..4f94ba6 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -87,7 +87,8 @@ static unsigned int nb_displayed; static struct icon **displayed; /* array of currently displayed icons */ static BOOL hide_systray, enable_shell; -static int icon_cx, icon_cy, tray_width; +static int icon_cx, icon_cy, tray_width, tray_height; +static WCHAR start_label[50]; static struct icon *balloon_icon; static HWND balloon_window; @@ -104,6 +105,8 @@ static HWND start_button; #define BALLOON_SHOW_MIN_TIMEOUT 10000 #define BALLOON_SHOW_MAX_TIMEOUT 30000 +static void do_show_systray(void); + /* Retrieves icon record by owner window and ID */ static struct icon *get_icon(HWND owner, UINT id) { @@ -323,7 +326,7 @@ static BOOL show_icon(struct icon *icon) update_tooltip_position( icon ); invalidate_icons( nb_displayed-1, nb_displayed-1 ); - if (nb_displayed == 1 && !hide_systray) ShowWindow( tray_window, SW_SHOWNA ); + if (nb_displayed == 1 && !hide_systray) do_show_systray(); create_tooltip(icon); update_balloon( icon ); @@ -543,6 +546,26 @@ static void do_hide_systray(void) 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); } +static void do_show_systray(void) +{ + SIZE start_button_size; + HDC hdc = GetDC( 0 ); + + /* FIXME: Implement BCM_GETIDEALSIZE and use that instead. */ + GetTextExtentPointW( hdc, start_label, lstrlenW(start_label), &start_button_size ); + /* add some margins (FIXME) */ + start_button_size.cx += 8; + start_button_size.cy += 4; + ReleaseDC( 0, hdc ); + + tray_width = GetSystemMetrics( SM_CXSCREEN ); + tray_height = max( icon_cy, start_button_size.cy ); + SetWindowPos( start_button, 0, 0, 0, start_button_size.cx, tray_height, + SWP_NOACTIVATE | SWP_NOZORDER ); + SetWindowPos( tray_window, HWND_TOPMOST, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, + tray_width, tray_height, SWP_NOACTIVATE | SWP_SHOWWINDOW ); +} + static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -552,12 +575,7 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_DISPLAYCHANGE: if (hide_systray) do_hide_systray(); - else - { - tray_width = GetSystemMetrics( SM_CXSCREEN ); - SetWindowPos( tray_window, 0, 0, GetSystemMetrics( SM_CYSCREEN ) - icon_cy, - tray_width, icon_cy, SWP_NOZORDER | SWP_NOACTIVATE ); - } + else do_show_systray(); break; case WM_TIMER: @@ -641,24 +659,12 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l return 0; } -static void get_system_text_size( const WCHAR *text, SIZE *size ) -{ - /* FIXME: Implement BCM_GETIDEALSIZE and use that instead. */ - HDC hdc = GetDC( 0 ); - - GetTextExtentPointW(hdc, text, lstrlenW(text), size); - - ReleaseDC( 0, hdc ); -} - /* this function creates the listener window */ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enable_shell ) { WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; static const WCHAR button_class[] = {'B','u','t','t','o','n',0}; - WCHAR start_label[50]; - SIZE start_text_size; wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); @@ -684,10 +690,8 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab return; } - tray_width = GetSystemMetrics( SM_CXSCREEN ); tray_window = CreateWindowExW( WS_EX_NOACTIVATE, classname, NULL, WS_POPUP, - 0, GetSystemMetrics( SM_CYSCREEN ) - icon_cy, - tray_width, icon_cy, 0, 0, 0, 0 ); + 0, GetSystemMetrics( SM_CYSCREEN ), 0, 0, 0, 0, 0, 0 ); if (!tray_window) { WINE_ERR("Could not create tray window\n"); @@ -696,12 +700,9 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab LoadStringW( NULL, IDS_START_LABEL, start_label, sizeof(start_label)/sizeof(WCHAR) ); - get_system_text_size( start_label, &start_text_size ); - start_button = CreateWindowW( button_class, start_label, WS_CHILD|WS_VISIBLE|BS_PUSHBUTTON, - 0, 0, start_text_size.cx + 8, icon_cy, tray_window, 0, 0, 0 ); - - if (enable_shell && !hide_systray) ShowWindow( tray_window, SW_SHOWNA ); + 0, 0, 0, 0, tray_window, 0, 0, 0 ); if (hide_systray) do_hide_systray(); + else if (enable_shell) do_show_systray(); }

1 0

Józef Kucia : wined3d: Replace WINED3D_BUFFER_CREATEBO with WINED3D_BUFFER_USE_BO.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: aa0cdc51461fcf3fc35f66502091e4e5812f6d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa0cdc51461fcf3fc35f66502… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:55 2016 +0200 wined3d: Replace WINED3D_BUFFER_CREATEBO with WINED3D_BUFFER_USE_BO. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 62a1921..6f66b97 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ -#define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */ +#define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ #define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ #define WINED3D_BUFFER_DISCARD 0x08 /* A DISCARD lock has occurred since the last preload. */ #define WINED3D_BUFFER_SYNC 0x10 /* There has been at least one synchronized map since the last preload. */ @@ -199,8 +199,9 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine return; fail: - /* Clean up all vbo init, but continue because we can work without a vbo :-) */ + /* Clean up all VBO init, but continue because we can work without a VBO :-) */ ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur\n"); + This->flags &= ~WINED3D_BUFFER_USE_BO; delete_gl_buffer(This, gl_info); buffer_clear_dirty_areas(This); } @@ -457,10 +458,9 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co data->buffer_object = buffer->buffer_object; if (!buffer->buffer_object) { - if ((buffer->flags & WINED3D_BUFFER_CREATEBO) && !buffer->resource.map_count) + if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) { buffer_create_buffer_object(buffer, context); - buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->buffer_object) { data->buffer_object = buffer->buffer_object; @@ -526,7 +526,6 @@ static void buffer_unload(struct wined3d_resource *resource) } delete_gl_buffer(buffer, context->gl_info); - buffer->flags |= WINED3D_BUFFER_CREATEBO; /* Recreate the buffer object next load */ buffer_clear_dirty_areas(buffer); context_release(context); @@ -739,10 +738,9 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (!buffer->buffer_object) { /* TODO: Make converting independent from VBOs */ - if (buffer->flags & WINED3D_BUFFER_CREATEBO) + if (buffer->flags & WINED3D_BUFFER_USE_BO) { buffer_create_buffer_object(buffer, context); - buffer->flags &= ~WINED3D_BUFFER_CREATEBO; } else { @@ -793,8 +791,8 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte { FIXME("Too many declaration changes or converting dynamic buffer, stopping converting\n"); + buffer->flags &= ~WINED3D_BUFFER_USE_BO; buffer_unload(&buffer->resource); - buffer->flags &= ~WINED3D_BUFFER_CREATEBO; /* The stream source state handler might have read the memory of * the vertex buffer already and got the memory in the vbo which @@ -826,8 +824,8 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (buffer->full_conversion_count > VB_MAXFULLCONVERSIONS) { FIXME("Too many full buffer conversions, stopping converting.\n"); + buffer->flags &= ~WINED3D_BUFFER_USE_BO; buffer_unload(&buffer->resource); - buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->resource.bind_count) device_invalidate_state(device, STATE_STREAMSRC); return; @@ -1008,8 +1006,8 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN * that returns unaligned pointers */ TRACE("Dynamic buffer, dropping VBO\n"); + buffer->flags &= ~WINED3D_BUFFER_USE_BO; buffer_unload(&buffer->resource); - buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->resource.bind_count) device_invalidate_state(device, STATE_STREAMSRC); } @@ -1278,7 +1276,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (!size) { - WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL\n"); + WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; } @@ -1292,7 +1290,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device WINED3D_MULTISAMPLE_NONE, 0, usage, pool, size, 1, 1, size, parent, parent_ops, &buffer_resource_ops); if (FAILED(hr)) { - WARN("Failed to initialize resource, hr %#x\n", hr); + WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } buffer->buffer_type_hint = bind_hint; @@ -1305,7 +1303,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device /* SWvp always returns the same pointer in buffer maps and retains data in DISCARD maps. * Keep a system memory copy of the buffer to provide the same behavior to the application. * Still use a VBO to support OpenGL 3 core contexts. */ - TRACE("Using doublebuffer mode because of software vertex processing\n"); + TRACE("Using doublebuffer mode because of software vertex processing.\n"); buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; } @@ -1316,19 +1314,19 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) { - TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n"); + TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); } - else if(buffer->resource.pool == WINED3D_POOL_SYSTEM_MEM) + else if (buffer->resource.pool == WINED3D_POOL_SYSTEM_MEM) { - TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); + TRACE("Not creating a BO because the buffer is in system memory.\n"); } - else if(!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) + else if (!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) { - TRACE("Not creating a vbo because the buffer has dynamic usage and no GL support\n"); + TRACE("Not creating a BO because the buffer has dynamic usage and no GL support.\n"); } else { - buffer->flags |= WINED3D_BUFFER_CREATEBO; + buffer->flags |= WINED3D_BUFFER_USE_BO; } if (!(buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps))))

1 0

Alexandre Julliard : explorer: Add a Wine icon to the Start button.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 28834b5508488ce1927cf2f136a7fc82f2bcbc4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=28834b5508488ce1927cf2f13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 21:26:17 2016 +0900 explorer: Add a Wine icon to the Start button. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index daaae87..eca49f7 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -538,6 +538,16 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) return ret; } +static void paint_taskbar_button( const DRAWITEMSTRUCT *dis ) +{ + RECT rect; + + GetClientRect( dis->hwndItem, &rect ); + DrawFrameControl( dis->hDC, &rect, DFC_BUTTON, DFCS_BUTTONPUSH | DFCS_ADJUSTRECT | + ((dis->itemState & ODS_SELECTED) ? DFCS_PUSHED : 0 )); + DrawCaptionTempW( 0, dis->hDC, &rect, 0, 0, start_label, DC_TEXT | DC_INBUTTON | DC_ICON ); +} + static void do_hide_systray(void) { SetWindowPos( tray_window, 0, @@ -560,10 +570,10 @@ static void do_show_systray(void) SelectObject( hdc, font ); GetTextExtentPointW( hdc, start_label, lstrlenW(start_label), &start_button_size ); /* add some margins (FIXME) */ - start_button_size.cx += 8; + start_button_size.cx += 12 + GetSystemMetrics( SM_CXSMICON ); start_button_size.cy += 4; ReleaseDC( 0, hdc ); - SendMessageW( start_button, WM_SETFONT, (WPARAM)font, 0 ); + DeleteObject( font ); tray_width = GetSystemMetrics( SM_CXSCREEN ); tray_height = max( icon_cy, start_button_size.cy ); @@ -651,6 +661,10 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l ShowWindow( hwnd, SW_HIDE ); return 0; + case WM_DRAWITEM: + paint_taskbar_button( (const DRAWITEMSTRUCT *)lparam ); + break; + case WM_COMMAND: if ((HWND)lparam == start_button && HIWORD(wparam) == BN_CLICKED) do_startmenu(hwnd); @@ -707,7 +721,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab LoadStringW( NULL, IDS_START_LABEL, start_label, sizeof(start_label)/sizeof(WCHAR) ); - start_button = CreateWindowW( button_class, start_label, WS_CHILD|WS_VISIBLE|BS_PUSHBUTTON, + start_button = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE | BS_OWNERDRAW, 0, 0, 0, 0, tray_window, 0, 0, 0 ); if (hide_systray) do_hide_systray();

1 0