wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Alexandre Julliard : user32: Setup system menu even when used through TrackPopupMenu.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 83ed0a636b334b9c5175ad897270eb8d990dba01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ed0a636b334b9c5175ad897… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 16:12:26 2016 +0900 user32: Setup system menu even when used through TrackPopupMenu. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index e42d8f7..52d09ce 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3479,6 +3479,10 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, if (!(wFlags & TPM_NONOTIFY)) SendMessageW( hWnd, WM_INITMENUPOPUP, (WPARAM)hMenu, 0); + if (menu->wFlags & MF_SYSMENU) + MENU_InitSysMenuPopup( hMenu, GetWindowLongW( hWnd, GWL_STYLE ), + GetClassLongW( hWnd, GCL_STYLE)); + if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpTpm ? &lpTpm->rcExclude : NULL );

1 0

Alexandre Julliard : explorer: Show the application system menu on taskbar right clicks.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 552555cf8ca6e457b22c6f900fce290770c67eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=552555cf8ca6e457b22c6f900… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 15:35:38 2016 +0900 explorer: Show the application system menu on taskbar right clicks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 1ed16ed..94ba74b 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -116,6 +116,8 @@ static HWND balloon_window; #define BALLOON_SHOW_MIN_TIMEOUT 10000 #define BALLOON_SHOW_MAX_TIMEOUT 30000 +#define WM_POPUPSYSTEMMENU 0x0313 + static void do_show_systray(void); /* Retrieves icon record by owner window and ID */ @@ -689,6 +691,13 @@ static void click_taskbar_button( HWND button ) SetForegroundWindow( hwnd ); } +static void show_taskbar_contextmenu( HWND button, LPARAM lparam ) +{ + ULONG_PTR id = GetWindowLongPtrW( button, GWLP_ID ); + + if (id) SendNotifyMessageW( (HWND)id, WM_POPUPSYSTEMMENU, 0, lparam ); +} + static void do_hide_systray(void) { SetWindowPos( tray_window, 0, @@ -812,6 +821,10 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l if (HIWORD(wparam) == BN_CLICKED) click_taskbar_button( (HWND)lparam ); break; + case WM_CONTEXTMENU: + show_taskbar_contextmenu( (HWND)wparam, lparam ); + break; + case WM_MOUSEACTIVATE: return MA_NOACTIVATE;

1 0

Theodore Dubois : shell32: Avoid closing the caller's key.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 7c915af47ec6b153cf29da36986b41bbf9402a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c915af47ec6b153cf29da369… Author: Theodore Dubois <tblodt(a)icloud.com> Date: Sun Jun 5 09:35:39 2016 -0700 shell32: Avoid closing the caller's key. Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/assoc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index a3d21b9..1ccf0e2 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -259,7 +259,9 @@ static HRESULT WINAPI IQueryAssociations_fnInit( } else if (hkeyProgid != NULL) { - This->hkeySource = This->hkeyProgID = hkeyProgid; + /* reopen the key so we don't end up closing a key owned by the caller */ + RegOpenKeyExW(hkeyProgid, NULL, 0, KEY_READ, &This->hkeyProgID); + This->hkeySource = This->hkeyProgID; return S_OK; } else

1 0

Theodore Dubois : shell32/tests: Fix memory leaks.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 2a7c4ea8753a42155231de9fc3fb3e4d03a4ba2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a7c4ea8753a42155231de9fc… Author: Theodore Dubois <tblodt(a)icloud.com> Date: Sun Jun 5 09:35:39 2016 -0700 shell32/tests: Fix memory leaks. Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index beebbdf..274c0fc 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -104,7 +104,7 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW { IQueryAssociations *assoc; HRESULT hr; - WCHAR *buffer; + WCHAR *buffer = NULL; DWORD len; hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); @@ -115,8 +115,11 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, NULL, &len); if (expected_string) { ok_(__FILE__, line)(hr == S_FALSE, "GetString returned 0x%x, expected S_FALSE\n", hr); - if (hr != S_FALSE) - return; /* don't try to allocate memory */ + if (hr != S_FALSE) { + /* don't try to allocate memory using unitialized len */ + IQueryAssociations_Release(assoc); + return; + } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); @@ -128,6 +131,9 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW } else { ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); } + + IQueryAssociations_Release(assoc); + HeapFree(GetProcessHeap(), 0, buffer); } static void test_IQueryAssociations_GetString(void)

1 0

Theodore Dubois : shell32/tests: Fix out of memory errors and their underlying cause.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: fbbac88519fc66d32e629ca82af557bfbe9cacce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbac88519fc66d32e629ca82… Author: Theodore Dubois <tblodt(a)icloud.com> Date: Sun Jun 5 09:35:38 2016 -0700 shell32/tests: Fix out of memory errors and their underlying cause. The out of memory errors were happening because getstring_test was using len unitialized when GetString failed. The underlying cause was that deleting the keys would fail because RegDeleteKey does not work if the key has subkeys, and one of the keys has a subkey. The test fails when the keys are still there. The subkey is now deleted before the key that contains it. Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 67f7d32..beebbdf 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -113,21 +113,20 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW ok_(__FILE__, line)(hr == S_OK, "IQueryAssociations::Init failed, 0x%x\n", hr); hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, NULL, &len); - if (hr != S_FALSE) { - if (expected_string) { - ok_(__FILE__, line)(SUCCEEDED(hr), "GetString returned 0x%x, expected success\n", hr); - } else { - ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); - } - } + if (expected_string) { + ok_(__FILE__, line)(hr == S_FALSE, "GetString returned 0x%x, expected S_FALSE\n", hr); + if (hr != S_FALSE) + return; /* don't try to allocate memory */ - buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); - hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, buffer, &len); + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); + hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); + ok_(__FILE__, line)(hr == S_OK, "GetString returned 0x%x, expected S_OK\n", hr); - if (expected_string) { ok_(__FILE__, line)(lstrcmpW(buffer, expected_string) == 0, "GetString returned %s, expected %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(expected_string)); + } else { + ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); } } @@ -176,8 +175,9 @@ static void test_IQueryAssociations_GetString(void) getstring_test(test_progidW, NULL, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); getstring_test(NULL, test_progid_key, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); - RegDeleteKeyW(HKEY_CLASSES_ROOT, test_extensionW); + RegDeleteKeyW(test_progid_key, DefaultIconW); RegDeleteKeyW(HKEY_CLASSES_ROOT, test_progidW); + RegDeleteKeyW(HKEY_CLASSES_ROOT, test_extensionW); hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr);

1 0

Henri Verbeet : ddraw: Avoid accessing free' d memory on an error path in ddraw_surface_create().
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 2afd2f705f9352947527b95fbdd9af95c2a726b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afd2f705f9352947527b95fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 21:18:37 2016 +0200 ddraw: Avoid accessing free'd memory on an error path in ddraw_surface_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d36afe7..1cbd6c3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5754,10 +5754,9 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->dwFlags & DDSD_BACKBUFFERCOUNT) { WARN("Tried to specify a back buffer count for a non-flippable surface.\n"); + hr = desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP ? DDERR_INVALIDPARAMS : DDERR_INVALIDCAPS; HeapFree(GetProcessHeap(), 0, texture); - if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - return DDERR_INVALIDPARAMS; - return DDERR_INVALIDCAPS; + return hr; } }

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.6.3.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 62e253796e592d989e2b8f27630052f7fa64180f URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e253796e592d989e2b8f276… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 7 14:23:12 2016 -0500 mscoree: Update Wine Mono to 4.6.3. This brings in some build fixes, bugfixes from upstream, and a patch from Paul Gofman for compatibility with 64-bit Managed C++ code. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 8cbc221..c29f070 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.6.2" -#define MONO_SHA "0a5090a3b81b6250a5d7104fc585bd871a9e467d" +#define MONO_VERSION "4.6.3" +#define MONO_SHA "c1d6d223c99c41a9d4e674e967042f10bfe02b8b" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 033a121..8e158e2 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.6.2"; + static const char* mono_version = "4.6.3"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Stefan Dösinger : ddraw/tests: Remove p8_primary_test.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 55b8c75528446441635bae08b09803708f3603d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b8c75528446441635bae08b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jun 5 22:56:58 2016 +0100 ddraw/tests: Remove p8_primary_test. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/visual.c | 344 ---------------------------------------------- 1 file changed, 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55b8c75528446441635ba…

1 0

Stefan Dösinger : ddraw/tests: Test P8 color keying.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: ab34bc6ccada24ca0b6dc2ac2074b9b0ddbb55ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab34bc6ccada24ca0b6dc2ac2… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jun 5 22:56:57 2016 +0100 ddraw/tests: Test P8 color keying. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 46 +++++++++++++++++++++++++++++++++++++++++----- dlls/ddraw/tests/ddraw2.c | 46 +++++++++++++++++++++++++++++++++++++++++----- dlls/ddraw/tests/ddraw4.c | 46 +++++++++++++++++++++++++++++++++++++++++----- dlls/ddraw/tests/ddraw7.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 164 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab34bc6ccada24ca0b6dc…

1 0

Stefan Dösinger : ddraw/tests: Add readback tests to test_palette_gdi.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 156a2aa07af6f08ede4ee6c2375bb663955709b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156a2aa07af6f08ede4ee6c23… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jun 5 22:56:56 2016 +0100 ddraw/tests: Add readback tests to test_palette_gdi. The changed SetDisplayMode / SetCooperativeLevel order is necessary to make this test pass reliably on native. Otherwise my Windows 7 box returns a color of 0x00000000 from GetDC about 25% of the time. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 24 ++++++++++++++++++++++-- dlls/ddraw/tests/ddraw2.c | 24 ++++++++++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 24 ++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 24 ++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=156a2aa07af6f08ede4ee…

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
60
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 June 2016