- Wine-Devel - list.winehq.org

wine-5.0.3-rc1 Available
by Michael Stefaniuc Oct. 22, 2020

Oct. 22, 2020

Hello guys, I have pushed wine-5.0.3-rc1 (5a4b1dd7264ec195a3b4026e585ee3a49603f3a3) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ msasn1 and msado15 stick out with more / bigger patches. But other than that it is a pretty standard release. What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 5.0.3 (total 44): 7102 Microsoft Word 6.0 for Windows: copy/paste causes crash on unimplemented function ole2.dll16.OLEISCURRENTCLIPBOARD 26171 BVRP classic phone tools installer reports error 'Insufficient buffer' when trying to install print processor (AddPrintProcessorA stub should be symmetric to AddPrintProcessorW) 35903 CED1401 USB function driver fails to install (setupapi should use the original INF path as a default source path when copying files) 38020 Foxit Reader 6.12 crashes on unimplemented function msasn1.dll.ASN1_CreateModule during validation of digital signatures 44127 Metal Gear Solid V: Ground Zeroes doesn't launch 44306 Visual Novel "A Clockwork Ley-Line: The Borderline of Dusk" doesn't work with d3d9 44925 Multiple kernel drivers require 'ntoskrnl.exe.ExCreateCallback' stub to return STATUS_SUCCESS (StarForce v3, TrackMania Nations ESWC. Denuvo Anti-Cheat) 45536 Total Commander 9.x crashes on unimplemented function usp10.dll.ScriptGetFontAlternateGlyphs when Wine is not detected via named export 'ntdll.wine_get_version' 46726 Dirt Rally 2.0 does not use embedded CA cert 46818 PS4 Remote Play 2.x (.NET 4.x app) crashes on Sign-In PlayStation network (mshtml:HTMLDocument_get_cookie should not fail for 'about:blank') 48256 pwsh.exe (from Powershell-6.*) crashes after 20~50 sec: System.EntryPointNotFoundException: Unable to find an entry point named 'FreeAddrInfoEx' in DLL 'ws2_32.dll'. 48405 Battle.Net Launcher Beta crashes with Windows version set to 10 48668 rFactor2 - Physics thread slower on multiplayer mode 48779 Secret Files 3 crashes at launch (needs d3dx9_skin_info_Clone) 48938 Ashes of the Singularity: Escalation crashes on start 48959 S-Gear 2 installer does not recognize wine as Windows 10 49147 Microsoft Teams 1.3.x crashes on unimplemented function setupapi.dll.CM_Get_Device_Interface_AliasW 49178 Spitfire Audio 3.x crashes on start due to 'WTSQuerySessionInformationA' stub not initializing out parameters 49179 winetest.exe fails to run on windows arm (surface rt / armv7): procedure entry point NtCurrentTeb could not be located in the dynamic link library C:\Users\User\Desktop\winetest.exe 49189 Auslogics Registry Cleaner 8.x crashes and shows "OLE error 80004001" (SetCurrentProcessExplicitAppUserModelID stub needs to return S_OK) 49221 Denuvo Anti-Cheat 'denuvo-anti-cheat.sys' crashes due to unhandled emulation of MSR register reads related to CPU / virtualization features (returning zero value is sufficient) 49257 Avast Free Antivirus 20.3 crashes before installing due to unimplemented function rpcrt4.dll.RpcIfInqId 49264 MultiSync installation crashes (needs _Command::get/put_CommandText) 49272 MultiSync installation crashes (msado15.dll needs {b196b284-bab4-101a-b69c-00aa00341d07} IConnectionPointContainer) 49281 FinanceExplorer crashes inside msado15.dll 49289 Denuvo Anti-Cheat 'denuvo-anti-cheat.sys' crashes on unimplemented function ntoskrnl.exe.ExRegisterCallback 49291 Denuvo Anti-Cheat 'denuvo-anti-cheat.sys' crashes on unimplemented function ntoskrnl.exe.ExUnregisterCallback when unloading 49303 MultiSync installation crashes (msado15.dll needs IConnectionPointContainer::FindConnectionPoint) 49322 cmudpro334 shows error on unimplemented ITaskbarList::SetOverlayIcon() 49352 JamKazam 1.0.3744 msi installer fails at 'InstallFiles' action (incorrect handling of administrative image with compressed source files) 49372 winedump crashes for sltg typelib files 49379 Altium Designer 20 crashes on missing d2d1.dll.D2D1CreateDevice 49388 MultiSync installation crashes (msado15.dll needs IConnectionPoint::Advise) 49439 Printing and scanning software for Brother L2540DW fails to install (VBScript parser can't handle a "case else" statement with a comment and no statements to execute) 49460 where.exe is missing in wine (affects Waves Central ) 49487 ListView control custom draw in report view shows blank item if handler clears uItemState CDIS_SELECTED flag 49488 uninitialized bytes in server call from ntdll/server_write_file 49570 LVM_FINDITEM should do case-insensitive test for item text 49620 Tableau Desktop fails to install 49656 SAP GUI - Ws2_32.getaddrinfo crashes with non-standard service (/etc/services) 49662 Wine Internet Explorer crashes on https://[2600::]/ 49664 FrostyModManager v1.0.5.9 crashes on launch 49666 Red Dead Redemption 2 requires HEAP flags offset to match Windows 49685 Gigabyte "EasyTune" service crashes in wbemprox ---------------------------------------------------------------- Changes since 5.0.2: Aaro Altonen (8): msado15: Implement _Command get/put CommandType. msado15: Implement _Command get/put CommandText. msado15: Add IConnectionPointContainer stub to _Connection. msado15: Add IConnectionPoint stub to _Connection. msado15: Implement IConnectionPointContainer_FindConnectionPoint. include: Add ConnectionEventsVt definition. msado15/tests: Add tests for IConnectionPoint::Advise/Unadvise. msado15: Implement IConnectionPoint::Advise/Unadvise. Akihiro Sagawa (1): documentation: Update Japanese translation. Alex Henrie (2): urlmon: Call parse_host in combine_uri to set related parse_data fields. urlmon: Fix null pointer dereference in process_hook_section (Coverity). Alexandre Julliard (1): setupapi: Support a WineSourceDirs section to copy files from the Wine build or data dir. Alistair Leslie-Hughes (1): msado15: Implement _Connection get/put ConnectionString. Anton Baskanov (1): amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream. Brendan Shanks (5): winhttp: Treat a partial certificate chain as having an unknown/invalid CA. whoami: Add semi-stub application to display username. winevulkan: Don't initialize the Vulkan driver in DllMain(). ntdll: Pad HEAP structure so 'flags' offset matches recent Windows. winemac.drv: Fix warnings for constants deprecated by macOS 10.14. Changping Yu (2): kernel32/tests: Add test for thread enumeration order in toolhelp. kernel32: Adjust thread creation insertion order. Derek Lesho (1): msctf: Always provide a context when from GetBase/Top. Dmitry Kislyuk (1): vbscript: Parse empty CASE ELSE clause. Dmitry Timoshkov (1): winedump: Fix parsing of SLTG typelib created with some old tool. Gijs Vermeulen (5): wtsapi32: Implement WTSQuerySessionInformationA. d3dx9: Implement ID3DXSkinInfo_Clone(). amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw(). wbemprox: Set obj to NULL on error in get_object(). wbemprox: Don't crash in IWbemClassObject::Put() when called with empty class object. Hans Leidekker (3): msado15: Fix NULL pointer dereference in close_recordset. msi: Fix installing from administrative image with compressed source files. ws2_32: Avoid a crash in WS_getaddrinfo when the specified service doesn't exist. Jacek Caban (3): winnt.h: Provide inline NtCurrentTeb implementation for mingw arm builds. mshtml: Return NULL in IHTMLDocument2::get_cookie if InternetGetCookieExW failes. urlmon: Remove unused flags argument from parse_host. Jefferson Carpenter (1): ntoskrnl.exe: Set reserved to 0 in pnp WM_DEVICECHANGE broadcast. Jiajin Cui (1): gdiplus: Fix crash if failed to create bitmap. Julian Rüger (1): documentation: Update German translation. Louis Lenders (7): usp10: Add stub for ScriptGetFontAlternateGlyphs. shcore: Return S_OK in SetCurrentProcessExplicitAppUserModelID. ws2_32: Add FreeAddrInfoEx. setupapi: Add stub for CM_Get_Device_Interface_Alias{A,W}. explorerframe: Return S_OK in ITaskbarList::SetOverlayIcon. where.exe: Add stub program. sc.exe: Fake succes for the SdSet argument. Matteo Bruni (3): wined3d: Add GPU information for AMD Raven Ridge. user32: Add missing WM_WINE_CLIPCURSOR message type name. user32: Make sure update_window_state() is always executed on the owner thread. Nikolay Sivov (7): d2d1: Implement D2D1CreateDevice(). dwrite: Implement IDWriteFont::Equals(). dwrite: Add partial implementation for IDWriteFontFace5::Equals(). comctl32/listview: Rename helper argument. comctl32/listview: Use case-insensitive compare in LVM_FINDITEM. comctl32/listview: Do no alter custom draw text colors between notification stages. winedbg: Double dll name buffer size for unimplemented function exception. Paul Gofman (7): ntoskrnl.exe: Return STATUS_SUCCESS from ExCreateCallback() stub. ntoskrnl.exe: Return zero for unknown msr registers. ntoskrnl.exe: Add stub for ExRegisterCallback() function. ntoskrnl.exe: Add stub for ExUnregisterCallback() function. ws2_32: Optimize interface_bind_check() by caching adapter addresses. winebuild: Correct hotpatching prologue in import thunks for x86_64. shell32: Only consider copy operation multidest if the number of dst files is greater than one. Piotr Caban (1): msasn1: Fix buffer allocations. Rémi Bernon (2): kernel32: Catch process creation breakpoint exceptions. d3d11: Stop advertising the ID3D10Device interface on devices created by d3d11. Vijay Kiran Kamuju (12): ole2.dll16: Add stub OleIsCurrentClipboard function. winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW. include: Add related ASN1encoding_s and ASN1decoding_s structs. msasn1: Add ASN1_CreateModule stub implementation. msasn1/tests: Add initial tests. msasn1: Implement ASN1_CreateModule function. msasn1: Implement ASN1_CloseModule function. msasn1: Add partial implementation of ASN1_CreateEncoder. msasn1: Add stub for ASN1_CloseEncoder function. msasn1: Add partial implementation of ASN1_CreateDecoder. msasn1: Add stub for ASN1_CloseDecoder function. msasn1: Add stub for ASN1_Decode function. Zebediah Figura (6): setupapi: Reset the source file pointer when comparing files. setupapi: Store the original INF file path in a .pnf file. setupapi: Use the original INF source path if possible when copying files. winecfg: Set the Current{Major, Minor}VersionNumber registry values. wbemprox: Return WBEM_E_NOT_FOUND from get_object() if no object is available. d3dcompiler: Iterate through the instruction list in reverse in free_instr_list() (Valgrind). Zhiyi Zhang (2): rpcrt4: Implement RpcIfInqId(). dwmapi: Check NULL parameter in DwmIsCompositionEnabled(). -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH] quartz/tests: Use compare_double() to test IBasicVideo::get_AvgTimePerFrame().
by Zebediah Figura Oct. 22, 2020

Oct. 22, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index f1b19aa6634..d7eafe53be8 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdint.h> #define COBJMACROS #include "dshow.h" #include "d3d9.h" @@ -65,6 +66,23 @@ static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TY && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); } +static BOOL compare_double(double f, double g, unsigned int ulps) +{ + uint64_t x = *(ULONGLONG *)&f; + uint64_t y = *(ULONGLONG *)&g; + + if (f < 0) + x = ~x + 1; + else + x |= ((ULONGLONG)1)<<63; + if (g < 0) + y = ~y + 1; + else + y |= ((ULONGLONG)1)<<63; + + return (x>y ? x-y : y-x) <= ulps; +} + static IFilterGraph2 *create_graph(void) { IFilterGraph2 *ret; @@ -2707,7 +2725,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); + ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l); -- 2.28.0

1 0

[PATCH] wbemprox: Also return system properties from IWbemClassObject::GetNames.
by Hans Leidekker Oct. 22, 2020

Oct. 22, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50038 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 61 +++++++++++++++++++++++++------------ dlls/wbemprox/tests/query.c | 17 +++++++++++ 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 525381d88d2..3d60825f24e 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1375,40 +1375,61 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { + static const WCHAR * const system_props[] = + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; SAFEARRAY *sa; BSTR str; - UINT i, table_index, result_index, num_props; + UINT i, table_index, result_index, count = 0; struct table *table; HRESULT hr; - LONG j; + LONG j = 0; if ((hr = map_view_index( view, index, &table_index, &result_index )) != S_OK) return hr; - - num_props = count_result_properties( view, table_index ); - if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; - table = view->table[table_index]; - for (i = 0, j = 0; i < table->num_cols; i++) - { - BOOL is_system; - if (is_method( table, i )) continue; - if (!is_result_prop( view, table->columns[i].name )) continue; + if (!(flags & WBEM_FLAG_NONSYSTEM_ONLY)) count += ARRAY_SIZE(system_props); + if (!(flags & WBEM_FLAG_SYSTEM_ONLY)) + { + for (i = 0; i < table->num_cols; i++) + { + if (!is_method( table, i ) && is_result_prop( view, table->columns[i].name )) count++; + } + } - is_system = is_system_prop( table->columns[i].name ); - if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue; - else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, count ))) return E_OUTOFMEMORY; - str = SysAllocString( table->columns[i].name ); - if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + if (!(flags & WBEM_FLAG_NONSYSTEM_ONLY)) + { + for (j = 0; j < ARRAY_SIZE(system_props); j++) + { + str = SysAllocString( system_props[j] ); + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } + SysFreeString( str ); + } + } + if (!(flags & WBEM_FLAG_SYSTEM_ONLY)) + { + for (i = 0; i < table->num_cols; i++) { + if (is_method( table, i ) || !is_result_prop( view, table->columns[i].name )) continue; + + str = SysAllocString( table->columns[i].name ); + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } SysFreeString( str ); - SafeArrayDestroy( sa ); - return E_OUTOFMEMORY; + j++; } - SysFreeString( str ); - j++; } + *props = sa; return S_OK; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d1ce42d64cb..7ba55dffdfb 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -460,6 +460,8 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) IWbemClassObject *process, *sig_in, *out; IWbemQualifierSet *qualifiers; VARIANT retval, val; + SAFEARRAY *names; + LONG bound, i; DWORD full_path_len = 0; LONG flavor; CIMTYPE type; @@ -484,6 +486,21 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) win_skip( "Win32_Process not available\n" ); return; } + names = NULL; + hr = IWbemClassObject_GetNames( process, NULL, 0, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( names != NULL, "names not set\n" ); + hr = SafeArrayGetUBound( names, 1, &bound ); + ok( hr == S_OK, "got %08x\n", hr ); + for (i = 0; i <= bound; i++) + { + BSTR str; + hr = SafeArrayGetElement( names, &i, &str ); + ok( hr == S_OK, "%d: got %08x\n", i, hr ); + SysFreeString( str ); + } + SafeArrayDestroy( names ); + sig_in = (void*)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"GetOwner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); -- 2.28.0

1 0

[PATCH] ntdll: Fix CreateFile for non-existing files on FAT file systems
by Joachim Priesner Oct. 22, 2020

Oct. 22, 2020

Two small bugs in find_file_in_dir/lookup_unix_name cause creation of new files on FAT file systems to fail. If the VFAT_IOCTL_READDIR_BOTH logic in find_file_in_dir does not yield any result, the NUL terminator of "unix_name" must be restored. Else the following opendir() call will read past the end of "unix_name". Since at the beginning of find_file_in_dir, the full file name was written to "unix_name" for the stat() shortcut logic, there is no out-of-bounds read and the opendir() call will reliably fail. But commit 688799b1f7b2750b938f8da771480d2c16d1ae1d changed the return code for this case from STATUS_OBJECT_PATH_NOT_FOUND to STATUS_OBJECT_NAME_NOT_FOUND, so lookup_unix_name needs to check for that as well. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> --- dlls/ntdll/unix/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index afb552be098..a443ff61282 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2550,6 +2550,8 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i goto not_found; } } + /* if that did not work, restore previous state of unix_name */ + unix_name[pos - 1] = 0; } close( fd ); } @@ -3133,6 +3135,9 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer if (status == STATUS_OBJECT_PATH_NOT_FOUND) { status = STATUS_OBJECT_NAME_NOT_FOUND; + } + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { if (disposition != FILE_OPEN && disposition != FILE_OVERWRITE) { ret = ntdll_wcstoumbs( name, end - name, unix_name + pos + 1, MAX_DIR_ENTRY_LEN + 1, TRUE ); -- 2.28.0

1 1

[PATCH] qcap/capturegraph: Return E_POINTER when ICaptureGraphBuilder2::FindInterface() is called with NULL filter.
by Gijs Vermeulen Oct. 22, 2020

Oct. 22, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46950 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/qcap/capturegraph.c | 3 +++ dlls/qcap/tests/capturegraph.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index b4f83956f0e..b98a321cb3a 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -343,6 +343,9 @@ static HRESULT WINAPI fnCaptureGraphBuilder2_FindInterface(ICaptureGraphBuilder2 TRACE("graph %p, category %s, majortype %s, filter %p, iid %s, out %p.\n", graph, debugstr_guid(category), debugstr_guid(majortype), filter, debugstr_guid(iid), out); + if (!filter) + return E_POINTER; + if (category && IsEqualGUID(category, &LOOK_DOWNSTREAM_ONLY)) return find_interface_recurse(PINDIR_OUTPUT, NULL, NULL, filter, iid, out); diff --git a/dlls/qcap/tests/capturegraph.c b/dlls/qcap/tests/capturegraph.c index c37ac515734..cdd9a27828a 100644 --- a/dlls/qcap/tests/capturegraph.c +++ b/dlls/qcap/tests/capturegraph.c @@ -384,6 +384,10 @@ static void test_find_interface(void) /* Test search order without any restrictions applied. */ + hr = ICaptureGraphBuilder2_FindInterface(capture_graph, NULL, &bogus_majortype, + NULL, &testiid, (void **)&unk); + ok(hr == E_POINTER, "got hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(tests_from_filter2); ++i) { hr = ICaptureGraphBuilder2_FindInterface(capture_graph, NULL, &bogus_majortype, -- 2.29.0

2 1

[PATCH v2 1/2] winegstreamer: Respect integer promotion rules when clamping timestamp + diff.
by Zebediah Figura Oct. 22, 2020

Oct. 22, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6279c2c28c0..68b12cf8f14 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2060,7 +2060,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil /* The documentation specifies that timestamp + diff must be nonnegative. */ diff = qm.Late * 100; - if (timestamp < -diff) + if (diff < 0 && timestamp < (GstClockTime)-diff) diff = -timestamp; evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp); -- 2.28.0

1 1

[PATCH v2 1/2] winex11.drv: Keep the window's own restored state when unminimized, if it was fullscreen before.
by Gabriel Ivăncescu Oct. 22, 2020

Oct. 22, 2020

Fixes a regression introduced by commit 82c6ec3a32f44e8b3e0cc88b7f10e0c0d7fa1b89, which caused the WM_ACTIVATEAPP to be sent while the window is minimized, if it has been clicked on in the taskbar to be restored. According to the Extended Window Manager Hints spec, WMs remove the NET_WM_STATE_FULLSCREEN state when restored, they use the previous size of the window (not the fullscreen). This caused the WM_SYSCOMMAND SC_RESTORE message's ShowWindow to revert the window back to its original (non-fullscreen) size, instead of being restored to fullscreen, breaking some apps like Heroes of Might and Magic V. We have to override the X server's window state here to match Windows behavior and restore it back to fullscreen. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- read_net_wm_states is when X11 changes some state from outside Wine and sends it a notification that it did; then Wine has to update its own wm states to match the X server (so it's properly integrated). However, in this case, since the WM clears the fullscreen state on minimization, we must not do that, because Windows doesn't—and more, when the window is restored from minimized, we must ignore the X11 state changes and force it back to what Wine had (usually fullscreen unless it gets hooked by the app, then we keep what the app changed). This is to match Windows behavior, which differs from X11, and apps rely on. dlls/winex11.drv/event.c | 14 ++++++++++++++ dlls/winex11.drv/window.c | 12 +++++++++++- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 07f7a1a..c17ae27 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1296,6 +1296,8 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat if (data->iconic && data->wm_state == NormalState) /* restore window */ { + DWORD old_state = data->net_wm_state; + data->iconic = FALSE; read_net_wm_states( event->display, data ); if ((style & WS_CAPTION) == WS_CAPTION && (data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED))) @@ -1313,11 +1315,23 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat { if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { + /* if the window was fullscreen before minimized, we have to keep its + state and restore it to the fullscreen state, because WMs remove the + fullscreen state when minimized, so we can't use the X server state. */ + BOOL keep_state = (style & WS_MINIMIZE) && (old_state & (1 << NET_WM_STATE_FULLSCREEN)); + + if (keep_state) + data->keep_fs_state = TRUE; TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); release_win_data( data ); if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + if (keep_state && (data = get_win_data( hwnd ))) + { + data->keep_fs_state = FALSE; + release_win_data( data ); + } return; } TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4571739..17b5a8c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1076,6 +1076,11 @@ void read_net_wm_states( Display* display, struct x11drv_win_data *data ) if (!maximized_horz) new_state &= ~(1 << NET_WM_STATE_MAXIMIZED); + /* WMs remove it when minimizing a window. Keep track of it internally, + so we can restore it properly when the time comes to check for it. */ + if ((data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) && data->iconic) + new_state |= 1 << NET_WM_STATE_FULLSCREEN; + data->net_wm_state = new_state; } @@ -2450,6 +2455,11 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (event_type != ConfigureNotify && event_type != PropertyNotify && event_type != GravityNotify && event_type != ReparentNotify) event_type = 0; /* ignore other events */ + + /* if we keep the Wine window's restored state, we pretend it's + not an event, so that it's synced properly with the X server. */ + if (data->keep_fs_state && !(new_style & WS_MINIMIZE)) + event_type = 0; } if (data->mapped && event_type != ReparentNotify) @@ -2545,7 +2555,7 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) } goto done; } - if (!data->managed || !data->mapped || data->iconic) goto done; + if (!data->managed || !data->mapped || data->iconic || data->keep_fs_state) goto done; /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 173d94b..f0d2fba 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -574,6 +574,7 @@ struct x11drv_win_data BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ + BOOL keep_fs_state : 1; /* don't override the window state when restoring from an event, if fullscreen */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ -- 2.21.0

2 2

[PATCH v2] msado15: Implement _Recordset get/put CursorType
by Hans Leidekker Oct. 22, 2020

Oct. 22, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Fix cursor_typo ;) Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 6 ++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a5096e5c4ff..e3dd83a4309 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -44,6 +44,7 @@ struct recordset LONG index; VARIANT *data; CursorLocationEnum cursor_location; + CursorTypeEnum cursor_type; }; struct fields @@ -910,14 +911,22 @@ static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size ) static HRESULT WINAPI recordset_get_CursorType( _Recordset *iface, CursorTypeEnum *cursor_type ) { - FIXME( "%p, %p\n", iface, cursor_type ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", iface, cursor_type ); + + *cursor_type = recordset->cursor_type; + return S_OK; } static HRESULT WINAPI recordset_put_CursorType( _Recordset *iface, CursorTypeEnum cursor_type ) { - FIXME( "%p, %d\n", iface, cursor_type ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %d\n", iface, cursor_type ); + + recordset->cursor_type = cursor_type; + return S_OK; } static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) @@ -1546,6 +1555,7 @@ HRESULT Recordset_create( void **obj ) recordset->refs = 1; recordset->index = -1; recordset->cursor_location = adUseServer; + recordset->cursor_type = adOpenForwardOnly; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index adf9fb30bc2..e95df49c2c2 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -68,6 +68,7 @@ static void test_Recordset(void) LONG refs, count, state; VARIANT missing, val, index; CursorLocationEnum location; + CursorTypeEnum cursor; BSTR name; HRESULT hr; @@ -144,6 +145,11 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( location == adUseServer, "got %d\n", location ); + cursor = adOpenUnspecified; + hr = _Recordset_get_CursorType( recordset, &cursor ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.28.0

1 0

[PATCH 5/5] riched20: Simplify some of the drawing code using a few helpers.
by Huw Davies Oct. 22, 2020

Oct. 22, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 3 +++ dlls/riched20/paint.c | 59 +++++++++++++++++++----------------------- dlls/riched20/table.c | 22 ++++++++++++++++ 3 files changed, 52 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 97d4c3bc5ab..68c54c2b328 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -280,6 +280,8 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; +ME_Paragraph *cell_end_para( ME_Cell *cell ) DECLSPEC_HIDDEN; +ME_Paragraph *cell_first_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_prev( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; @@ -289,6 +291,7 @@ ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 5a0432a9eed..30c0d7f57fd 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -23,12 +23,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph); +static void draw_paragraph( ME_Context *c, ME_Paragraph *para ); void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) { - ME_DisplayItem *item; + ME_Paragraph *para; ME_Context c; + ME_Cell *cell; int ys, ye; HRGN oldRgn; @@ -44,36 +45,29 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); - item = editor->pBuffer->pFirst->next; + para = editor_first_para( editor ); /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */ c.pt.x = c.rcView.left - editor->horz_si.nPos; c.pt.y = c.rcView.top - editor->vert_si.nPos; - while(item != editor->pBuffer->pLast) + while (para_next( para )) { - assert(item->type == diParagraph); - - ys = c.pt.y + item->member.para.pt.y; - if (item->member.para.pCell - != item->member.para.next_para->member.para.pCell) - { - ME_Cell *cell = NULL; - cell = &ME_FindItemBack(item->member.para.next_para, diCell)->member.cell; + ys = c.pt.y + para->pt.y; + cell = para_cell( para ); + if (cell && para == cell_end_para( cell )) ye = c.pt.y + cell->pt.y + cell->nHeight; - } else { - ye = ys + item->member.para.nHeight; - } - if (item->member.para.pCell && !(item->member.para.nFlags & MEPF_ROWEND) && - item->member.para.pCell != item->member.para.prev_para->member.para.pCell) + else ye = ys + para->nHeight; + + if (cell && !(para->nFlags & MEPF_ROWEND) && para == cell_first_para( cell )) { /* the border shifts the text down */ - ys -= item->member.para.pCell->member.cell.yTextOffset; + ys -= para_cell( para )->yTextOffset; } /* Draw the paragraph if any of the paragraph is in the update region. */ if (ys < rcUpdate->bottom && ye > rcUpdate->top) - ME_DrawParagraph(&c, item); - item = item->member.para.next_para; + draw_paragraph( &c, para ); + para = para_next( para ); } if (c.pt.y + editor->nTotalLength < c.rcView.bottom) { @@ -909,12 +903,12 @@ static void draw_para_number( ME_Context *c, ME_Paragraph *para ) } } -static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) +static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) { int align = SetTextAlign(c->hDC, TA_BASELINE); ME_DisplayItem *p; + ME_Cell *cell; ME_Run *run; - ME_Paragraph *para = NULL; RECT rc, bounds; int y; int height = 0, baseline = 0, no=0; @@ -923,32 +917,33 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.left = c->pt.x; rc.right = c->rcView.right; - assert(paragraph); - para = &paragraph->member.para; y = c->pt.y + para->pt.y; - if (para->pCell) + if ((cell = para_cell( para ))) { - ME_Cell *cell = &para->pCell->member.cell; rc.left = c->pt.x + cell->pt.x; rc.right = rc.left + cell->nWidth; } - if (para->nFlags & MEPF_ROWSTART) { - ME_Cell *cell = &para->next_para->member.para.pCell->member.cell; + if (para->nFlags & MEPF_ROWSTART) + { + cell = table_row_first_cell( para ); rc.right = c->pt.x + cell->pt.x; - } else if (para->nFlags & MEPF_ROWEND) { - ME_Cell *cell = &para->prev_para->member.para.pCell->member.cell; + } + else if (para->nFlags & MEPF_ROWEND) + { + cell = table_row_end_cell( para ); rc.left = c->pt.x + cell->pt.x + cell->nWidth; } ME_DrawParaDecoration(c, para, y, &bounds); y += bounds.top; - if (bounds.left || bounds.right) { + if (bounds.left || bounds.right) + { rc.left = max(rc.left, c->pt.x + bounds.left); rc.right = min(rc.right, c->pt.x - bounds.right + max(c->editor->sizeWindow.cx, c->editor->nTotalWidth)); } - for (p = paragraph->next; p != para->next_para; p = p->next) + for (p = para_get_di( para )->next; p != para_get_di( para_next( para ) ); p = p->next) { switch(p->type) { case diParagraph: diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 63b5d0fd05b..daae18d5968 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -180,6 +180,14 @@ ME_Cell *table_row_first_cell( ME_Paragraph *para ) return para_cell( para ); } +ME_Cell *table_row_end_cell( ME_Paragraph *para ) +{ + if (!para_in_table( para )) return NULL; + + para = para_prev( table_row_end( para )); + return cell_next( para_cell( para ) ); +} + ME_Cell *cell_next( ME_Cell *cell ) { if (!cell->next_cell) return NULL; @@ -192,6 +200,20 @@ ME_Cell *cell_prev( ME_Cell *cell ) return &cell->prev_cell->member.cell; } +ME_Paragraph *cell_first_para( ME_Cell *cell ) +{ + return &ME_FindItemFwd( cell_get_di( cell ), diParagraph )->member.para; +} + +ME_Paragraph *cell_end_para( ME_Cell *cell ) +{ + ME_Cell *next = cell_next( cell ); + + if (!next) return cell_first_para( cell ); /* End of row */ + + return &ME_FindItemBack( cell_get_di( next ), diParagraph )->member.para; +} + /* Make a bunch of assertions to make sure tables haven't been corrupted. * * These invariants may not hold true in the middle of streaming in rich text -- 2.23.0

1 0

[PATCH 4/5] riched20: Use cell ptrs in the rtf writing code.
by Huw Davies Oct. 22, 2020

Oct. 22, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/writer.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 182a725dbad..9e79eda274d 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -316,7 +316,7 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs ME_Run *run = first; ME_FontTableItem *table = pStream->fonttbl; unsigned int i; - ME_DisplayItem *pCell = NULL; + ME_Cell *cell = NULL; ME_Paragraph *prev_para = NULL; do @@ -336,12 +336,10 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs if (run->para->fmt.wNumbering) add_font_to_fonttbl( pStream, run->para->para_num.style ); - if ((pCell = run->para->pCell)) + if ((cell = para_cell( run->para ))) { - ME_Border* borders[4] = { &pCell->member.cell.border.top, - &pCell->member.cell.border.left, - &pCell->member.cell.border.bottom, - &pCell->member.cell.border.right }; + ME_Border* borders[4] = { &cell->border.top, &cell->border.left, + &cell->border.bottom, &cell->border.right }; for (i = 0; i < 4; i++) if (borders[i]->width > 0) add_color_to_colortbl( pStream, borders[i]->colorRef ); @@ -389,7 +387,7 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream, ME_Paragraph *para ) { - ME_DisplayItem *cell; + ME_Cell *cell; char props[STREAMOUT_BUFFER_SIZE] = ""; int i; const char sideChar[4] = {'t','l','b','r'}; @@ -399,19 +397,16 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream if (!editor->bEmulateVersion10) /* v4.1 */ { PARAFORMAT2 *pFmt = &table_row_end( para )->fmt; - para = table_row_start( para ); - cell = para->next_para->member.para.pCell; - assert(cell); + cell = table_row_first_cell( para ); + assert( cell ); if (pFmt->dxOffset) sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); if (pFmt->dxStartIndent) sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); do { - ME_Border* borders[4] = { &cell->member.cell.border.top, - &cell->member.cell.border.left, - &cell->member.cell.border.bottom, - &cell->member.cell.border.right }; + ME_Border* borders[4] = { &cell->border.top, &cell->border.left, + &cell->border.bottom, &cell->border.right }; for (i = 0; i < 4; i++) { if (borders[i]->width) @@ -425,9 +420,9 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream sprintf(props + strlen(props), "\\brdrcf%u", idx); } } - sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); - cell = cell->member.cell.next_cell; - } while (cell->member.cell.next_cell); + sprintf( props + strlen(props), "\\cellx%d", cell->nRightBoundary ); + cell = cell_next( cell ); + } while (cell_next( cell )); } else /* v1.0 - 3.0 */ { -- 2.23.0

1 0