August 2016 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: Don' t disallow delayed rendering even when not the clipboard owner.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: d9df977006bceb883ccd68afb9b57a0da3ae4112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9df977006bceb883ccd68afb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 17:57:50 2016 +0900 user32: Don't disallow delayed rendering even when not the clipboard owner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 8 -------- dlls/user32/tests/clipboard.c | 2 +- dlls/winex11.drv/clipboard.c | 6 ++---- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index c72a76b..251eadb 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -352,14 +352,6 @@ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData) return 0; } - /* If it's not owned, data can only be set if the format isn't - available and its rendering is not delayed */ - if (!(flags & CB_OWNER) && !hData) - { - WARN("Clipboard not owned by calling task. Operation failed.\n"); - return 0; - } - if (USER_Driver->pSetClipboardData(wFormat, hData, flags & CB_OWNER)) { hResult = hData; diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 33a9c69..ddd8d1a 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -65,7 +65,7 @@ static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) if (GetClipboardOwner() == hwnd) { SetClipboardData( CF_WAVE, 0 ); - todo_wine ok( IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData failed\n", thread_from_line ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData failed\n", thread_from_line ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); ok( ret != 0, "%u: SetClipboardData failed err %u\n", thread_from_line, GetLastError() ); } diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 9b8ff65..b7c89cb 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -3016,16 +3016,14 @@ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) DWORD flags = 0; BOOL bResult = TRUE; - /* If it's not owned, data can only be set if the format data is not already owned - and its rendering is not delayed */ + /* If it's not owned, data can only be set if the format data is not already owned */ if (!owner) { LPWINE_CLIPDATA lpRender; X11DRV_CLIPBOARD_UpdateCache(); - if (!hData || - ((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat)) && + if (((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat)) && !(lpRender->wFlags & CF_FLAG_UNOWNED))) bResult = FALSE; else

1 0

Alexandre Julliard : winex11: Don't disallow replacing unowned formats.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 99d5b75c7d943270e93c5362ba1ecce0d99e20ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d5b75c7d943270e93c5362b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 17:59:36 2016 +0900 winex11: Don't disallow replacing unowned formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 1 - dlls/winex11.drv/clipboard.c | 21 ++------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index ddd8d1a..549a625 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -93,7 +93,6 @@ static void set_clipboard_data_process( int arg ) todo_wine_if( arg == 1 || arg == 3 ) ok( IsClipboardFormatAvailable( CF_WAVE ), "process %u: CF_WAVE not available\n", arg ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); - todo_wine_if( arg == 2 || arg == 4 ) ok( ret != 0, "process %u: SetClipboardData failed err %u\n", arg, GetLastError() ); } else diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b7c89cb..af8fa37 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -3013,26 +3013,9 @@ void CDECL X11DRV_EmptyClipboard(void) */ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) { - DWORD flags = 0; - BOOL bResult = TRUE; + if (!owner) X11DRV_CLIPBOARD_UpdateCache(); - /* If it's not owned, data can only be set if the format data is not already owned */ - if (!owner) - { - LPWINE_CLIPDATA lpRender; - - X11DRV_CLIPBOARD_UpdateCache(); - - if (((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat)) && - !(lpRender->wFlags & CF_FLAG_UNOWNED))) - bResult = FALSE; - else - flags = CF_FLAG_UNOWNED; - } - - bResult &= X11DRV_CLIPBOARD_InsertClipboardData(wFormat, hData, flags, NULL, TRUE); - - return bResult; + return X11DRV_CLIPBOARD_InsertClipboardData(wFormat, hData, 0, NULL, TRUE); }

1 0

Alexandre Julliard : winex11: Don't try to free custom GDI formats at all.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 13fbbfac1c06132575640ede90863c4860f933d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fbbfac1c06132575640ede9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 24 00:16:07 2016 +0900 winex11: Don't try to free custom GDI formats at all. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index af8fa37..5424c53 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -597,6 +597,7 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) DeleteEnhMetaFile(lpData->hData); break; default: + if (lpData->wFormatID >= CF_GDIOBJFIRST && lpData->wFormatID <= CF_GDIOBJLAST) break; if (lpData->wFormatID >= CF_PRIVATEFIRST && lpData->wFormatID <= CF_PRIVATELAST) break; GlobalFree(lpData->hData); break;

1 0

Alexandre Julliard : user32/tests: Add a few more clipboard tests.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 43e38153eed81d4c3aac41472192a0674afbcc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e38153eed81d4c3aac41472… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 18:00:02 2016 +0900 user32/tests: Add a few more clipboard tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 63 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 549a625..9893e8a 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -68,6 +68,11 @@ static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) ok( IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData failed\n", thread_from_line ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); ok( ret != 0, "%u: SetClipboardData failed err %u\n", thread_from_line, GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = GetClipboardData( CF_WAVE ); + ok( !ret, "%u: GetClipboardData succeeded\n", thread_from_line ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); } else { @@ -147,6 +152,24 @@ static void run_process( const char *args ) CloseHandle( info.hThread ); } +static WNDPROC old_proc; +static LRESULT CALLBACK winproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + static int destroyed; + + if (msg == WM_DESTROY) destroyed = TRUE; + + trace( "%p msg %04x\n", hwnd, msg ); + if (!destroyed) + ok( GetClipboardOwner() == hwnd, "%04x: wrong owner %p/%p\n", msg, GetClipboardOwner(), hwnd ); + else todo_wine_if (msg == WM_DESTROY) + ok( !GetClipboardOwner(), "%04x: wrong owner %p\n", msg, GetClipboardOwner() ); + ok( GetClipboardViewer() == hwnd, "%04x: wrong viewer %p/%p\n", msg, GetClipboardViewer(), hwnd ); + ok( GetOpenClipboardWindow() == hwnd, "%04x: wrong open win %p/%p\n", + msg, GetOpenClipboardWindow(), hwnd ); + return old_proc( hwnd, msg, wp, lp ); +} + static void test_ClipboardOwner(void) { HWND hWnd1, hWnd2; @@ -182,6 +205,8 @@ static void test_ClipboardOwner(void) run_thread( open_clipboard_thread, hWnd1, __LINE__ ); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + ok( !IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE available\n" ); + ok( !GetClipboardData( CF_WAVE ), "CF_WAVE data available\n" ); run_process( "set_clipboard_data 0" ); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -198,6 +223,8 @@ static void test_ClipboardOwner(void) ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 1" ); SetLastError(0xdeadbeef); @@ -217,6 +244,8 @@ static void test_ClipboardOwner(void) ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner %p/%p\n", GetClipboardOwner(), GetDesktopWindow() ); run_thread( set_clipboard_data_thread, GetDesktopWindow(), __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 2" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -225,20 +254,31 @@ static void test_ClipboardOwner(void) ok( ret, "OpenClipboard error %d\n", GetLastError()); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); + SetClipboardViewer( hWnd1 ); ok( GetClipboardOwner() == hWnd1, "wrong owner %p/%p\n", GetClipboardOwner(), hWnd1 ); - ret = CloseClipboard(); - ok( ret, "CloseClipboard error %d\n", GetLastError()); + ok( GetClipboardViewer() == hWnd1, "wrong viewer %p/%p\n", GetClipboardViewer(), hWnd1 ); + ok( GetOpenClipboardWindow() == hWnd1, "wrong open win %p/%p\n", GetOpenClipboardWindow(), hWnd1 ); + old_proc = (WNDPROC)SetWindowLongPtrA( hWnd1, GWLP_WNDPROC, (LONG_PTR)winproc_wrapper ); ret = DestroyWindow(hWnd1); ok( ret, "DestroyWindow error %d\n", GetLastError()); ret = DestroyWindow(hWnd2); ok( ret, "DestroyWindow error %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); + todo_wine ok(!GetClipboardViewer() && GetLastError() == 0xdeadbeef, "viewer still exists\n"); + todo_wine ok(!GetOpenClipboardWindow() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); + + SetLastError( 0xdeadbeef ); + ret = CloseClipboard(); + todo_wine ok( !ret, "CloseClipboard succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 3" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -248,6 +288,8 @@ static void test_ClipboardOwner(void) ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 4" ); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); @@ -459,6 +501,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA static UINT wm_drawclipboard; static UINT wm_clipboardupdate; static UINT wm_destroyclipboard; + static UINT nb_formats; LRESULT ret; switch(msg) { @@ -476,6 +519,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA case WM_DESTROYCLIPBOARD: wm_destroyclipboard++; ok( GetClipboardOwner() == hwnd, "WM_DESTROYCLIPBOARD owner %p\n", GetClipboardOwner() ); + nb_formats = CountClipboardFormats(); break; case WM_CLIPBOARDUPDATE: wm_clipboardupdate++; @@ -496,6 +540,8 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA ret = wm_destroyclipboard; wm_destroyclipboard = 0; return ret; + case WM_USER+4: + return nb_formats; } return DefWindowProcA(hwnd, msg, wp, lp); @@ -506,7 +552,7 @@ static DWORD WINAPI clipboard_thread(void *param) HWND win = param; BOOL r; HANDLE handle; - UINT count, old_seq = 0, seq; + UINT count, formats, old_seq = 0, seq; if (pGetClipboardSequenceNumber) old_seq = pGetClipboardSequenceNumber(); @@ -575,6 +621,8 @@ static DWORD WINAPI clipboard_thread(void *param) ok( !count, "WM_CLIPBOARDUPDATE received\n" ); count = SendMessageA( win, WM_USER+3, 0, 0 ); ok( count, "WM_DESTROYCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+4, 0, 0 ); + ok( !count, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); handle = SetClipboardData( CF_TEXT, create_text() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); @@ -686,6 +734,10 @@ static DWORD WINAPI clipboard_thread(void *param) count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + formats = CountClipboardFormats(); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( !count, "WM_DESTROYCLIPBOARD received\n" ); + r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = EmptyClipboard(); @@ -693,6 +745,11 @@ static DWORD WINAPI clipboard_thread(void *param) r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( count, "WM_DESTROYCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+4, 0, 0 ); + ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); + r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); return 0;

1 0

Alexandre Julliard : server: Cleanup clipboard information upon window destruction.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 5962df3a1e2e19545e5ad8e6be4c5ed3b1cb2e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5962df3a1e2e19545e5ad8e6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 20:58:44 2016 +0900 server: Cleanup clipboard information upon window destruction. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 8 ++++---- server/clipboard.c | 19 +++++++++++++++++++ server/user.h | 1 + server/window.c | 1 + 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 9893e8a..b6914da 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -266,13 +266,13 @@ static void test_ClipboardOwner(void) ok( ret, "DestroyWindow error %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); - todo_wine ok(!GetClipboardViewer() && GetLastError() == 0xdeadbeef, "viewer still exists\n"); - todo_wine ok(!GetOpenClipboardWindow() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); + ok(!GetClipboardViewer() && GetLastError() == 0xdeadbeef, "viewer still exists\n"); + ok(!GetOpenClipboardWindow() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); SetLastError( 0xdeadbeef ); ret = CloseClipboard(); - todo_wine ok( !ret, "CloseClipboard succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); + ok( !ret, "CloseClipboard succeeded\n" ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); diff --git a/server/clipboard.c b/server/clipboard.c index ca0067a..98df230 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -111,6 +111,25 @@ static struct clipboard *get_process_clipboard(void) return clipboard; } +/* cleanup clipboard information upon window destruction */ +void cleanup_clipboard_window( struct desktop *desktop, user_handle_t window ) +{ + struct clipboard *clipboard = desktop->winstation->clipboard; + + if (!clipboard) return; + + if (clipboard->open_win == window) + { + clipboard->open_win = 0; + clipboard->open_thread = NULL; + } + if (clipboard->owner_win == window) + { + clipboard->owner_win = 0; + clipboard->owner_thread = NULL; + } + if (clipboard->viewer == window) clipboard->viewer = 0; +} /* Called when thread terminates to allow release of clipboard */ void cleanup_clipboard_thread(struct thread *thread) diff --git a/server/user.h b/server/user.h index 89646f1..2f70674 100644 --- a/server/user.h +++ b/server/user.h @@ -91,6 +91,7 @@ extern void free_process_user_handles( struct process *process ); /* clipboard functions */ +extern void cleanup_clipboard_window( struct desktop *desktop, user_handle_t window ); extern void cleanup_clipboard_thread( struct thread *thread ); /* hook functions */ diff --git a/server/window.c b/server/window.c index 143b60c..4f30079 100644 --- a/server/window.c +++ b/server/window.c @@ -1855,6 +1855,7 @@ void destroy_window( struct window *win ) if (win == progman_window) progman_window = NULL; if (win == taskman_window) taskman_window = NULL; free_hotkeys( win->desktop, win->handle ); + cleanup_clipboard_window( win->desktop, win->handle ); free_user_handle( win->handle ); destroy_properties( win ); list_remove( &win->entry );

1 0

Frédéric Delanoy : French translation for release 1.9.17
by Jeremy Newman 22 Aug '16

22 Aug '16

Module: website Branch: master Commit: 723e946a8c7508cf1e77be29422bd59adc408d98 URL: http://source.winehq.org/git/website.git/?a=commit;h=723e946a8c7508cf1e77be… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 22 10:42:32 2016 +0200 French translation for release 1.9.17 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016081901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2016081901.xml b/news/fr/2016081901.xml new file mode 100644 index 0000000..6d7b820 --- /dev/null +++ b/news/fr/2016081901.xml @@ -0,0 +1,16 @@ +<news> +<date>19 août 2016</date> +<title>Sortie de Wine 1.9.17</title> +<body> +La version de développement 1.9.17 de Wine est disponible. +<a href="{$root}/announce/1.9.17">Nouveautés</a> de cette version : +<ul> + <li>Meilleur traitement des exceptions en mode 64 bits.</li> + <li>Diverses améliorations dans la prise en charge des joysticks.</li> + <li>Prise en charge additionnelle des flux dans le moteur d'exécution C++.</li> + <li>Améliorations dans l'incorporation de polices de caractères.</li> + <li>Prise en charge améliorée des métafichiers dans GDI+.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.17.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Marcus Meissner : winemenubuilder: Avoid double free (Coverity).
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 2e32c0c6572a0da72164196715781940c38aa352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e32c0c6572a0da7216419671… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Aug 21 20:38:18 2016 +0200 winemenubuilder: Avoid double free (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 2b7340f..e0c6ba2 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1005,13 +1005,8 @@ static HRESULT write_native_icon(IStream *iconStream, ICONDIRENTRY *pIconDirEntr position.QuadPart = 0; hr = IStream_Seek(iconStream, position, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - goto end; - hr = convert_to_native_icon(iconStream, &nIndex, 1, &CLSID_WICPngEncoder, icon_name, szFileName); - -end: - HeapFree(GetProcessHeap(), 0, pIconDirEntry); - return hr; + if (FAILED(hr)) return hr; + return convert_to_native_icon(iconStream, &nIndex, 1, &CLSID_WICPngEncoder, icon_name, szFileName); } static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra)

1 0

Huw Davies : user32: Scale the edge thickness of check boxes drawn with DrawFrameControl().
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: e06f3cd12c2a773f15323dc2ce96f7d22d8098b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06f3cd12c2a773f15323dc2c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 22 08:58:28 2016 +0100 user32: Scale the edge thickness of check boxes drawn with DrawFrameControl(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/uitools.c | 105 +++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 56 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index c3cd755..c0a5629 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -392,6 +392,7 @@ static BOOL UITOOLS95_DrawDiagEdge(HDC hdc, LPRECT rc, * UITOOLS_DrawRectEdge * * Same as DrawEdge invoked without BF_DIAGONAL + * The width parameter sets the width of each outer and inner edge. * * 23-Nov-1997: Changed by Bertho Stultiens * @@ -463,26 +464,18 @@ static BOOL UITOOLS95_DrawDiagEdge(HDC hdc, LPRECT rc, static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, - UINT uType, UINT uFlags) + UINT uType, UINT uFlags, UINT width) { signed char LTInnerI, LTOuterI; signed char RBInnerI, RBOuterI; - HPEN LTInnerPen, LTOuterPen; - HPEN RBInnerPen, RBOuterPen; - RECT InnerRect = *rc; - POINT SavePoint; - HPEN SavePen; - int LBpenplus = 0; - int LTpenplus = 0; - int RTpenplus = 0; - int RBpenplus = 0; + HBRUSH lti_brush, lto_brush, rbi_brush, rbo_brush; + RECT InnerRect = *rc, fill_rect; + int lbi_offset = 0, lti_offset = 0, rti_offset = 0, rbi_offset = 0; BOOL retval = !( ((uType & BDR_INNER) == BDR_INNER || (uType & BDR_OUTER) == BDR_OUTER) && !(uFlags & (BF_FLAT|BF_MONO)) ); - /* Init some vars */ - LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = GetStockObject(NULL_PEN); - SavePen = SelectObject(hdc, LTInnerPen); + lti_brush = lto_brush = rbi_brush = rbo_brush = GetStockObject(NULL_BRUSH); /* Determine the colors of the edges */ if(uFlags & BF_MONO) @@ -512,70 +505,72 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, RBOuterI = RBOuterNormal[uType & (BDR_INNER|BDR_OUTER)]; } - if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) LBpenplus = 1; - if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) RTpenplus = 1; - if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) RBpenplus = 1; - if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) LTpenplus = 1; + if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) lbi_offset = width; + if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) rti_offset = width; + if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) rbi_offset = width; + if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) lti_offset = width; - if(LTInnerI != -1) LTInnerPen = SYSCOLOR_GetPen(LTInnerI); - if(LTOuterI != -1) LTOuterPen = SYSCOLOR_GetPen(LTOuterI); - if(RBInnerI != -1) RBInnerPen = SYSCOLOR_GetPen(RBInnerI); - if(RBOuterI != -1) RBOuterPen = SYSCOLOR_GetPen(RBOuterI); - - MoveToEx(hdc, 0, 0, &SavePoint); + if(LTInnerI != -1) lti_brush = GetSysColorBrush(LTInnerI); + if(LTOuterI != -1) lto_brush = GetSysColorBrush(LTOuterI); + if(RBInnerI != -1) rbi_brush = GetSysColorBrush(RBInnerI); + if(RBOuterI != -1) rbo_brush = GetSysColorBrush(RBOuterI); /* Draw the outer edge */ - SelectObject(hdc, LTOuterPen); if(uFlags & BF_TOP) { - MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL); - LineTo(hdc, InnerRect.right, InnerRect.top); + fill_rect = InnerRect; + fill_rect.bottom = fill_rect.top + width; + FillRect( hdc, &fill_rect, lto_brush ); } if(uFlags & BF_LEFT) { - MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL); - LineTo(hdc, InnerRect.left, InnerRect.bottom); + fill_rect = InnerRect; + fill_rect.right = fill_rect.left + width; + FillRect( hdc, &fill_rect, lto_brush ); } - SelectObject(hdc, RBOuterPen); if(uFlags & BF_BOTTOM) { - MoveToEx(hdc, InnerRect.left, InnerRect.bottom-1, NULL); - LineTo(hdc, InnerRect.right, InnerRect.bottom-1); + fill_rect = InnerRect; + fill_rect.top = fill_rect.bottom - width; + FillRect( hdc, &fill_rect, rbo_brush ); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-1, InnerRect.top, NULL); - LineTo(hdc, InnerRect.right-1, InnerRect.bottom); + fill_rect = InnerRect; + fill_rect.left = fill_rect.right - width; + FillRect( hdc, &fill_rect, rbo_brush ); } /* Draw the inner edge */ - SelectObject(hdc, LTInnerPen); if(uFlags & BF_TOP) { - MoveToEx(hdc, InnerRect.left+LTpenplus, InnerRect.top+1, NULL); - LineTo(hdc, InnerRect.right-RTpenplus, InnerRect.top+1); + SetRect( &fill_rect, InnerRect.left + lti_offset, InnerRect.top + width, + InnerRect.right - rti_offset, InnerRect.top + 2 * width ); + FillRect( hdc, &fill_rect, lti_brush ); } if(uFlags & BF_LEFT) { - MoveToEx(hdc, InnerRect.left+1, InnerRect.top+LTpenplus, NULL); - LineTo(hdc, InnerRect.left+1, InnerRect.bottom-LBpenplus); + SetRect( &fill_rect, InnerRect.left + width, InnerRect.top + lti_offset, + InnerRect.left + 2 * width, InnerRect.bottom - lbi_offset ); + FillRect( hdc, &fill_rect, lti_brush ); } - SelectObject(hdc, RBInnerPen); if(uFlags & BF_BOTTOM) { - MoveToEx(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL); - LineTo(hdc, InnerRect.right-RBpenplus, InnerRect.bottom-2); + SetRect( &fill_rect, InnerRect.left + lbi_offset, InnerRect.bottom - 2 * width, + InnerRect.right - rbi_offset, InnerRect.bottom - width ); + FillRect( hdc, &fill_rect, rbi_brush ); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-2, InnerRect.top+RTpenplus, NULL); - LineTo(hdc, InnerRect.right-2, InnerRect.bottom-RBpenplus); + SetRect( &fill_rect, InnerRect.right - 2 * width, InnerRect.top + rti_offset, + InnerRect.right - width, InnerRect.bottom - rbi_offset ); + FillRect( hdc, &fill_rect, rbi_brush ); } if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) ) { - int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0) - + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); + int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? width : 0) + + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? width : 0); if(uFlags & BF_LEFT) InnerRect.left += add; if(uFlags & BF_RIGHT) InnerRect.right -= add; @@ -592,9 +587,6 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, *rc = InnerRect; } - /* Cleanup */ - SelectObject(hdc, SavePen); - MoveToEx(hdc, SavePoint.x, SavePoint.y, NULL); return retval; } @@ -609,7 +601,7 @@ BOOL WINAPI DrawEdge( HDC hdc, LPRECT rc, UINT edge, UINT flags ) if(flags & BF_DIAGONAL) return UITOOLS95_DrawDiagEdge(hdc, rc, edge, flags); else - return UITOOLS95_DrawRectEdge(hdc, rc, edge, flags); + return UITOOLS95_DrawRectEdge(hdc, rc, edge, flags, 1); } @@ -683,9 +675,9 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags) if(uFlags & DFCS_CHECKED) { if(uFlags & DFCS_MONO) - UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST); + UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST, 1); else - UITOOLS95_DrawRectEdge(dc, &myr, edge, (uFlags&DFCS_FLAT)|BF_RECT|BF_SOFT|BF_ADJUST); + UITOOLS95_DrawRectEdge(dc, &myr, edge, (uFlags&DFCS_FLAT)|BF_RECT|BF_SOFT|BF_ADJUST, 1); if (!(uFlags & DFCS_TRANSPARENT)) UITOOLS_DrawCheckedRect( dc, &myr ); @@ -694,13 +686,14 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags) { if(uFlags & DFCS_MONO) { - UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST); + UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST, 1); if (!(uFlags & DFCS_TRANSPARENT)) FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE)); } else { - UITOOLS95_DrawRectEdge(dc, r, edge, (uFlags & DFCS_FLAT) | ((uFlags & DFCS_TRANSPARENT) ? 0 : BF_MIDDLE) | BF_RECT | BF_SOFT); + UITOOLS95_DrawRectEdge(dc, r, edge, (uFlags & DFCS_FLAT) | + ((uFlags & DFCS_TRANSPARENT) ? 0 : BF_MIDDLE) | BF_RECT | BF_SOFT, 1); } } @@ -732,7 +725,7 @@ static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags) if(uFlags & DFCS_FLAT) flags |= BF_FLAT; else if(uFlags & DFCS_MONO) flags |= BF_MONO; - UITOOLS95_DrawRectEdge( dc, &myr, EDGE_SUNKEN, flags ); + UITOOLS95_DrawRectEdge( dc, &myr, EDGE_SUNKEN, flags, max( (myr.right - myr.left + 8) / 16, 1) ); if (!(uFlags & DFCS_TRANSPARENT)) { @@ -1023,7 +1016,7 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) case DFCS_SCROLLSIZEGRIP: /* This one breaks the flow... */ - UITOOLS95_DrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0)); + UITOOLS95_DrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0), 1); hpsave = SelectObject(dc, GetStockObject(NULL_PEN)); hbsave = SelectObject(dc, GetStockObject(NULL_BRUSH)); if(uFlags & (DFCS_MONO|DFCS_FLAT)) @@ -1104,7 +1097,7 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) if( ! (uFlags & (0xff00 & ~DFCS_ADJUSTRECT)) ) /* UITOOLS95_DFC_ButtonPush always uses BF_SOFT which we don't */ /* want for the normal scroll-arrow button. */ - UITOOLS95_DrawRectEdge( dc, r, EDGE_RAISED, (uFlags&DFCS_ADJUSTRECT) | BF_MIDDLE | BF_RECT); + UITOOLS95_DrawRectEdge( dc, r, EDGE_RAISED, (uFlags&DFCS_ADJUSTRECT) | BF_MIDDLE | BF_RECT, 1); else UITOOLS95_DFC_ButtonPush(dc, r, (uFlags & 0xff00) );

1 0

Huw Davies : user32: Scale the check mark drawn with DrawFrameControl().
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 94a87819c5266323f15c3fee461222bdf2d14762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a87819c5266323f15c3fee4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 22 08:58:29 2016 +0100 user32: Scale the check mark drawn with DrawFrameControl(). Based on a patch by Alexandre Julliard. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/uitools.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index c0a5629..73ec34b 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -717,7 +717,7 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags) static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags) { - RECT myr, bar; + RECT myr; UINT flags = BF_RECT | BF_ADJUST; UITOOLS_MakeSquareRect(r, &myr); @@ -739,20 +739,30 @@ static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags) if(uFlags & DFCS_CHECKED) { - int i, k; - i = (uFlags & DFCS_INACTIVE) || (uFlags & 0xff) == DFCS_BUTTON3STATE ? - COLOR_BTNSHADOW : COLOR_WINDOWTEXT; - - /* draw 7 bars, with h=3w to form the check */ - bar.left = myr.left; - bar.top = myr.top + 2; - for (k = 0; k < 7; k++) { - bar.left = bar.left + 1; - bar.top = (k < 3) ? bar.top + 1 : bar.top - 1; - bar.bottom = bar.top + 3; - bar.right = bar.left + 1; - FillRect(dc, &bar, GetSysColorBrush(i)); - } + POINT pt[6]; + HPEN old_pen; + HBRUSH old_brush; + int color = (uFlags & DFCS_INACTIVE) || (uFlags & 0xff) == DFCS_BUTTON3STATE ? + COLOR_BTNSHADOW : COLOR_WINDOWTEXT; + + pt[0].x = myr.right - 1; + pt[0].y = myr.top; + pt[1].x = pt[0].x; + pt[1].y = pt[0].y + (myr.bottom - myr.top) / 3; + pt[2].x = myr.left + (myr.right - myr.left) / 3; + pt[2].y = myr.bottom - 1; + pt[3].x = myr.left + 1; + pt[3].y = pt[2].y - (pt[2].x - pt[3].x); + pt[4].x = pt[3].x; + pt[4].y = pt[3].y - (myr.bottom - myr.top) / 3; + pt[5].x = pt[2].x; + pt[5].y = pt[2].y - (myr.bottom - myr.top) / 3; + + old_brush = SelectObject( dc, GetSysColorBrush( color ) ); + old_pen = SelectObject( dc, GetStockObject( NULL_PEN )); + Polygon( dc, pt, 6 ); + SelectObject( dc, old_brush ); + SelectObject( dc, old_pen ); } return TRUE; }

1 0

Huw Davies : user32: The offset between the button and the text is half the digit width.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: b0ec8a6675d4e49f4b779137328abb62b21ffa08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ec8a6675d4e49f4b7791373… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 22 08:58:30 2016 +0100 user32: The offset between the button and the text is half the digit width. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 5ed9c92..b8a1cee 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -851,7 +851,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) { RECT rbox, rtext, client; HBRUSH hBrush; - int delta; + int delta, text_offset; UINT dtFlags; HFONT hFont; LONG state = get_button_state( hwnd ); @@ -869,6 +869,8 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) rbox = rtext = client; if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont ); + GetCharWidthW( hDC, '0', '0', &text_offset ); + text_offset /= 2; parent = GetParent(hwnd); if (!parent) parent = hwnd; @@ -881,14 +883,12 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) if (style & BS_LEFTTEXT) { - /* magic +4 is what CTL3D expects */ - - rtext.right -= checkBoxWidth + 4; + rtext.right -= checkBoxWidth + text_offset; rbox.left = rbox.right - checkBoxWidth; } else { - rtext.left += checkBoxWidth + 4; + rtext.left += checkBoxWidth + text_offset; rbox.right = checkBoxWidth; }

1 0