wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Jacek Caban : msctf: Added Push/Pop context tests.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: bc645ca71a7e2575e9808d54b78a97f84f9ffe66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc645ca71a7e2575e9808d54b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:35 2016 +0200 msctf: Added Push/Pop context tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 16df012..98d88ba 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -74,6 +74,7 @@ static INT test_OnPushContext = SINK_UNEXPECTED; static INT test_OnPopContext = SINK_UNEXPECTED; static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; static INT test_ACP_AdviseSink = SINK_UNEXPECTED; +static INT test_ACP_UnadviseSink = SINK_UNEXPECTED; static INT test_ACP_GetStatus = SINK_UNEXPECTED; static INT test_ACP_RequestLock = SINK_UNEXPECTED; static INT test_ACP_GetEndACP = SINK_UNEXPECTED; @@ -232,6 +233,9 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + if(ACPSink) + return S_OK; + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); @@ -245,7 +249,7 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, IUnknown *punk) { - trace("\n"); + sink_fire_ok(&test_ACP_UnadviseSink,"TextStoreACP_UnadviseSink"); return S_OK; } @@ -1474,7 +1478,7 @@ static void test_startSession(void) DWORD editCookie; ITfDocumentMgr *dmtest; ITfContext *cxt,*cxt2,*cxt3,*cxtTest; - ITextStoreACP *ts; + ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1641,6 +1645,8 @@ static void test_startSession(void) ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr); ok(dmtest == NULL,"returned documentmgr should be null\n"); + ITfContext_Release(cxt2); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1651,6 +1657,25 @@ static void test_startSession(void) ok(cxtTest == cxt, "Wrong context on base\n"); ITfContext_Release(cxtTest); + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt2, &editCookie); + ok(hr == S_OK,"CreateContext Failed\n"); + + test_OnPushContext = SINK_EXPECTED; + test_ACP_AdviseSink = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt2); + ok(hr == S_OK,"Push Failed\n"); + sink_check_ok(&test_OnPushContext,"OnPushContext"); + sink_check_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + + test_ACP_UnadviseSink = SINK_EXPECTED; + cnt = check_context_refcount(cxt2); + test_OnPopContext = SINK_EXPECTED; + hr = ITfDocumentMgr_Pop(g_dm, 0); + ok(hr == S_OK,"Pop Failed\n"); + ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n"); + sink_check_ok(&test_OnPopContext,"OnPopContext"); + sink_check_ok(&test_ACP_UnadviseSink,"TextStoreACP_AdviseSink"); + hr = ITfDocumentMgr_Pop(g_dm, 0); ok(FAILED(hr),"Pop Succeeded\n");

1 0

Jacek Caban : msctf: Don't call ITextStoreACP:: UnadviseSink in context destructor.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 79025d0e6af8189fd6c3360c5bd335954124c205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79025d0e6af8189fd6c3360c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:24 2016 +0200 msctf: Don't call ITextStoreACP::UnadviseSink in context destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 597706e..54052f6 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -119,10 +119,7 @@ static void Context_Destructor(Context *This) TRACE("destroying %p\n", This); if (This->pITextStoreACP) - { - ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)&This->ITextStoreACPSink_iface); ITextStoreACP_Release(This->pITextStoreACP); - } if (This->pITfContextOwnerCompositionSink) ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink);

1 0

Alexandre Julliard : winebrowser: Support browser and mailer commands with arguments.
by Alexandre Julliard 30 May '16

30 May '16

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 30 May '16

30 May '16

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 27 May '16

27 May '16

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 27 May '16

27 May '16

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 27 May '16

27 May '16

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 : tools: Ensure that everything is stored in UTF-8 in the ANNOUNCE file.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: b6a091a2b189b9974a21d7457dc9915e12f90919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a091a2b189b9974a21d7457… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 23:18:05 2016 +0900 tools: Ensure that everything is stored in UTF-8 in the ANNOUNCE file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_announce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_announce b/tools/make_announce index fedbc37..c65f900 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -25,7 +25,7 @@ use strict; use locale; use POSIX; use Text::CSV::Encoded; -binmode STDOUT, ':utf8'; +use open ':encoding(utf8)'; sub unescape($) {

1 0

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

27 May '16

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

Alexandre Julliard : explorer: Vertically center the system tray icons.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 3c33d6d32c508e516248ab7cb61e96cdcb8ca952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c33d6d32c508e516248ab7cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 21:16:40 2016 +0900 explorer: Vertically center the system tray icons. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 40e03e9..daaae87 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -125,8 +125,8 @@ static RECT get_icon_rect( struct icon *icon ) rect.right = tray_width - icon_cx * icon->display; rect.left = rect.right - icon_cx; - rect.top = 0; - rect.bottom = icon_cy; + rect.top = (tray_height - icon_cy) / 2; + rect.bottom = rect.top + icon_cy; return rect; } @@ -297,9 +297,9 @@ static void invalidate_icons( unsigned int start, unsigned int end ) RECT rect; rect.left = tray_width - (end + 1) * icon_cx; - rect.top = 0; + rect.top = (tray_height - icon_cy) / 2; rect.right = tray_width - start * icon_cx; - rect.bottom = icon_cy; + rect.bottom = rect.top + icon_cy; InvalidateRect( tray_window, &rect, TRUE ); }

1 0

← Newer
1
2
3
4
5
6
7
8
...
55
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 May 2016