October 2017 - Wine-Commits

Tag wine-2.20 : Alexandre Julliard : Release 2.20
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: refs/tags/wine-2.20 Tag: d559a8c96209b392886f08cb82bf4a45454f326e URL: http://source.winehq.org/git/wine.git/?a=tag;h=d559a8c96209b392886f08cb82bf… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 19:13:35 2017 +0100 Release 2.20

1 0

Huw Davies : winefile: Initialize length before calling GetWindowPlacement ().
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 2b8a38169bf719225012e66a2409ffba8966f546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8a38169bf719225012e66a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:15 2017 +0000 winefile: Initialize length before calling GetWindowPlacement(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 27079bb..044a399 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1923,6 +1923,7 @@ static void frame_get_clientspace(HWND hwnd, PRECT prect) else { WINDOWPLACEMENT wp; + wp.length = sizeof(wp); GetWindowPlacement(hwnd, &wp); prect->left = prect->top = 0;

1 0

Huw Davies : ole32: Implement IOleCache2_UpdateCache().
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: ca2607db328075dd5d145327080fbd837007b958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2607db328075dd5d1453270… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:33 2017 +0000 ole32: Implement IOleCache2_UpdateCache(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 141 ++++++++++++-- dlls/ole32/tests/ole2.c | 480 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 540 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca2607db328075dd5d145…

1 0

Alex Henrie : mountmgr: Symlink WoW64 Wine ports key to regular Wine ports key.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: c296e7de4d6d7eab56ab3ee5d8f2dc2c913ae05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c296e7de4d6d7eab56ab3ee5d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 21:58:52 2017 +0100 mountmgr: Symlink WoW64 Wine ports key to regular Wine ports key. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 3 ++- dlls/mountmgr.sys/mountmgr.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 5101f2b..20c96d0 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1136,7 +1136,8 @@ static void create_port_devices( DRIVER_OBJECT *driver ) } p += 3; - RegOpenKeyExW( HKEY_LOCAL_MACHINE, ports_keyW, 0, KEY_QUERY_VALUE, &wine_ports_key ); + RegCreateKeyExW( HKEY_LOCAL_MACHINE, ports_keyW, 0, NULL, 0, + KEY_QUERY_VALUE, NULL, &wine_ports_key, NULL ); RegCreateKeyExW( HKEY_LOCAL_MACHINE, windows_ports_key_name, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &windows_ports_key, NULL ); diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 1eb0a78..b792be4 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -422,6 +422,17 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) static const WCHAR driver_serialW[] = {'\\','D','r','i','v','e','r','\\','S','e','r','i','a','l',0}; static const WCHAR driver_parallelW[] = {'\\','D','r','i','v','e','r','\\','P','a','r','a','l','l','e','l',0}; +#ifdef _WIN64 + static const WCHAR qualified_ports_keyW[] = {'\\','R','E','G','I','S','T','R','Y','\\', + 'M','A','C','H','I','N','E','\\','S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','P','o','r','t','s'}; /* no null terminator */ + static const WCHAR wow64_ports_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','o','w','6','4','3','2','N','o','d','e','\\','W','i','n','e','\\', + 'P','o','r','t','s',0}; + static const WCHAR symbolic_link_valueW[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; + HKEY wow64_ports_key = NULL; +#endif + UNICODE_STRING nameW, linkW; DEVICE_OBJECT *device; NTSTATUS status; @@ -449,6 +460,15 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) initialize_dbus(); initialize_diskarbitration(); +#ifdef _WIN64 + /* create a symlink so that the Wine port overrides key can be edited with 32-bit reg or regedit */ + RegCreateKeyExW( HKEY_LOCAL_MACHINE, wow64_ports_keyW, 0, NULL, REG_OPTION_CREATE_LINK, + KEY_SET_VALUE, NULL, &wow64_ports_key, NULL ); + RegSetValueExW( wow64_ports_key, symbolic_link_valueW, 0, REG_LINK, + (BYTE *)qualified_ports_keyW, sizeof(qualified_ports_keyW) ); + RegCloseKey( wow64_ports_key ); +#endif + RtlInitUnicodeString( &nameW, driver_serialW ); IoCreateDriver( &nameW, serial_driver_entry );

1 0

Huw Davies : user32: Initialize length before calling GetWindowPlacement() .
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 9933a0fc8601b6121251c9b046b7c24e0823f566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9933a0fc8601b6121251c9b04… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:16 2017 +0000 user32: Initialize length before calling GetWindowPlacement(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 1 + dlls/user32/winpos.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index fa0502e..895ccce 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -415,6 +415,7 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) TRACE("(%p, 0x%08x)\n", hWnd, dwFlags); + wp.length = sizeof(wp); if (IsIconic(hWnd) && GetWindowPlacement(hWnd, &wp)) return MonitorFromRect( &wp.rcNormalPosition, dwFlags ); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6b6b26a..10f0fd0 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1255,6 +1255,8 @@ UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd, LPPOINT ptIcon ) { WINDOWPLACEMENT wndpl; + + wndpl.length = sizeof(wndpl); if (GetWindowPlacement( hwnd, &wndpl )) { if (rectWnd) *rectWnd = wndpl.rcNormalPosition;

1 0

Huw Davies : ole32: Implement IOleCache_InitCache().
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 525a7ab1df800f7b43f993d79145204ef73db29c URL: http://source.winehq.org/git/wine.git/?a=commit;h=525a7ab1df800f7b43f993d79… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:34 2017 +0000 ole32: Implement IOleCache_InitCache(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 8 +++----- dlls/ole32/tests/ole2.c | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 2c5e451..2907426 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2373,12 +2373,10 @@ fail: return hr; } -static HRESULT WINAPI DataCache_InitCache( - IOleCache2* iface, - IDataObject* pDataObject) +static HRESULT WINAPI DataCache_InitCache( IOleCache2 *iface, IDataObject *data ) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE( "(%p %p)\n", iface, data ); + return IOleCache2_UpdateCache( iface, data, UPDFCACHE_ALLBUTNODATACACHE, NULL ); } static HRESULT WINAPI DataCache_IOleCache2_SetData( diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 9b96570..1a982b4 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1963,18 +1963,14 @@ static void test_data_cache(void) DeleteDC(hdcMem); - todo_wine { hr = IOleCache2_InitCache(pOleCache, &DataObject); ok(hr == CACHE_E_NOCACHE_UPDATED, "IOleCache_InitCache should have returned CACHE_E_NOCACHE_UPDATED instead of 0x%08x\n", hr); - } IPersistStorage_Release(pPS); IViewObject_Release(pViewObject); IOleCache2_Release(pOleCache); - todo_wine { CHECK_NO_EXTRA_METHODS(); - } hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IOleCache2, (LPVOID *)&pOleCache); ok_ole_success(hr, "CreateDataCache"); @@ -2623,6 +2619,12 @@ static void test_data_cache_updatecache( void ) { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, { NULL } }; + static const struct expected_method methods_initcache[] = + { + { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, + { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, + { NULL } + }; static const struct expected_method methods_empty[] = { { NULL } @@ -2841,6 +2843,13 @@ static void test_data_cache_updatecache( void ) CHECK_NO_EXTRA_METHODS(); + expected_method_list = methods_initcache; + + hr = IOleCache2_InitCache( cache, &DataObject ); + ok( hr == S_OK, "got %08x\n", hr ); + + CHECK_NO_EXTRA_METHODS(); + IOleCache2_Release( cache ); }

1 0

Huw Davies : ole32: A presentation cache for DVASPECT_ICON must have format CF_METAFILEPICT.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 12718fe02161358731ed19cd1e5bfe0fd122181e URL: http://source.winehq.org/git/wine.git/?a=commit;h=12718fe02161358731ed19cd1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:30 2017 +0000 ole32: A presentation cache for DVASPECT_ICON must have format CF_METAFILEPICT. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 22 +++++++++++++--------- dlls/ole32/tests/ole2.c | 23 +++++++++++++++++++++++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 7b33c59..2bb0948 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -322,19 +322,23 @@ static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FOR /* checks that the clipformat and tymed are valid and returns an error if they * aren't and CACHE_S_NOTSUPPORTED if they are valid, but can't be rendered by * DataCache_Draw */ -static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed) +static HRESULT check_valid_formatetc( const FORMATETC *fmt ) { - if (!cfFormat || !tymed || - (cfFormat == CF_METAFILEPICT && tymed == TYMED_MFPICT) || - (cfFormat == CF_BITMAP && tymed == TYMED_GDI) || - (cfFormat == CF_DIB && tymed == TYMED_HGLOBAL) || - (cfFormat == CF_ENHMETAFILE && tymed == TYMED_ENHMF)) + /* DVASPECT_ICON must be CF_METAFILEPICT */ + if (fmt->dwAspect == DVASPECT_ICON && fmt->cfFormat != CF_METAFILEPICT) + return DV_E_FORMATETC; + + if (!fmt->cfFormat || !fmt->tymed || + (fmt->cfFormat == CF_METAFILEPICT && fmt->tymed == TYMED_MFPICT) || + (fmt->cfFormat == CF_BITMAP && fmt->tymed == TYMED_GDI) || + (fmt->cfFormat == CF_DIB && fmt->tymed == TYMED_HGLOBAL) || + (fmt->cfFormat == CF_ENHMETAFILE && fmt->tymed == TYMED_ENHMF)) return S_OK; - else if (tymed == TYMED_HGLOBAL) + else if (fmt->tymed == TYMED_HGLOBAL) return CACHE_S_FORMATETC_NOTSUPPORTED; else { - WARN("invalid clipformat/tymed combination: %d/%d\n", cfFormat, tymed); + WARN("invalid clipformat/tymed combination: %d/%d\n", fmt->cfFormat, fmt->tymed); return DV_E_TYMED; } } @@ -368,7 +372,7 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc DWORD id = automatic ? 1 : This->last_cache_id; DataCacheEntry *entry; - hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); + hr = check_valid_formatetc( formatetc ); if (FAILED(hr)) return hr; if (hr == CACHE_S_FORMATETC_NOTSUPPORTED) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 509c625..4f72622 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2309,6 +2309,29 @@ static void test_data_cache_cache(void) hr = IOleCache2_Uncache( cache, view_caching[0].dwConnection ); ok( hr == S_OK, "got %08x\n", hr ); + /* Only able to set cfFormat == CF_METAFILEPICT (or == 0, see above) for DVASPECT_ICON */ + fmt.dwAspect = DVASPECT_ICON; + fmt.cfFormat = CF_DIB; + fmt.tymed = TYMED_HGLOBAL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == DV_E_FORMATETC, "got %08x\n", hr ); + fmt.cfFormat = CF_BITMAP; + fmt.tymed = TYMED_GDI; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == DV_E_FORMATETC, "got %08x\n", hr ); + fmt.cfFormat = CF_ENHMETAFILE; + fmt.tymed = TYMED_ENHMF; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == DV_E_FORMATETC, "got %08x\n", hr ); + fmt.cfFormat = CF_METAFILEPICT; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* uncache everything */ + hr = IOleCache2_Uncache( cache, conn ); + ok( hr == S_OK, "got %08x\n", hr ); + IDataObject_Release( data ); IOleCache2_Release( cache ); }

1 0

Marcus Meissner : user32/tests: Removed a unreliable test.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: ebfd1d3df63fbd0934e2087f2e02eb097a79cb2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfd1d3df63fbd0934e2087f2… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 30 18:07:36 2017 +0100 user32/tests: Removed a unreliable test. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index f0a24cb..8391ea0 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1759,10 +1759,8 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( 0xdeadbeef, hfixed ); ok( h == hfixed, "got %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); -#ifndef _WIN64 - /* testing if hfixed2 is freed triggers an exception on Win64 */ - ok( is_freed( hfixed2 ) || broken( !is_freed( hfixed2 )) /* < Vista */, "expected freed mem %p\n", hfixed2 ); -#endif + if (0) /* this test is unreliable / crashes */ + ok( is_freed( hfixed2 ), "expected freed mem %p\n", hfixed2 ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Huw Davies : user32: Use WS_MINIMIZE instead of WS_ICONIC.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 9c9c03046f58075faa9cd82f0496f27dfc718f88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9c03046f58075faa9cd82f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:13 2017 +0000 user32: Use WS_MINIMIZE instead of WS_ICONIC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 55b19cf..2b38897 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -378,7 +378,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRect( LPRECT rect, DWORD style, BOOL m */ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exStyle ) { - if (style & WS_ICONIC) return TRUE; + if (style & WS_MINIMIZE) return TRUE; style &= ~(WS_HSCROLL | WS_VSCROLL); TRACE("(%s) %08x %d %08x\n", wine_dbgstr_rect(rect), style, menu, exStyle ); @@ -409,7 +409,7 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) if (cls_style & CS_VREDRAW) result |= WVR_VREDRAW; if (cls_style & CS_HREDRAW) result |= WVR_HREDRAW; - if (!(style & WS_ICONIC)) + if (!(style & WS_MINIMIZE)) { NC_AdjustRectOuter( &tmpRect, style, FALSE, exStyle ); @@ -472,7 +472,7 @@ static void NC_GetInsideRect( HWND hwnd, enum coords_relative relative, RECT *re { WIN_GetRectangles( hwnd, relative, rect, NULL ); - if (style & WS_ICONIC) return; + if (style & WS_MINIMIZE) return; /* Remove frame from rectangle */ if (HAS_THICKFRAME( style, ex_style ))

1 0

Jacek Caban : mshtml: Release listeners in call_event_handlers.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: d2552c06a0c2c6f259960d92414ca1847d5f75c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2552c06a0c2c6f259960d924… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 23:20:39 2017 +0200 mshtml: Release listeners in call_event_handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a3359e0..f9d2460 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1439,6 +1439,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } } + for(listener = listeners; listener < listeners + listeners_cnt; listener++) + IDispatch_Release(listener->function); if(listeners != listeners_buf) heap_free(listeners); if(event->phase == DEP_CAPTURING_PHASE)

1 0