December 2019 - Wine-Devel - list.winehq.org

[PATCH v2 1/2] wininet: Add missing schemes to url_schemes.
by Jacek Caban Dec. 19, 2019

Dec. 19, 2019

Fixes res URL scheme handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 23 +++++++++++++---------- dlls/wininet/tests/url.c | 5 ++++- 2 files changed, 17 insertions(+), 11 deletions(-)

1 0

[PATCH] rpcrt4: Support VT_BSTR in get_param_pointer_info.
by Jacek Caban Dec. 19, 2019

Dec. 19, 2019

Fixes a leak in typelib marshaller. Based on patch by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This was reported as a typelib marshaller rewrite regression. dlls/rpcrt4/ndr_typelib.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[PATCH 0/3] RFC: Implement MemoryWorkingSetExInformation.
by Andrew Wesie Dec. 19, 2019

Dec. 19, 2019

A stub for bug 45667 has been sitting in staging for a while. It is sufficient for League of Legends, but it is not correct by any definition. The challenge with MemoryWorkingSetExInformation is that it requires information that is not exposed by the Linux kernel. One option was to allocate valloc memory with PROT_NONE, then handle the faults in virtual_handle_fault and keep our own statistics. This implies a SIGSEGV signal for *every* VirtualAlloc page, which sounded slow. This patchset implements an optimized version of this by using /proc/pid/pagemap to handle demand-zero pages, which would have been the most common complicated case. The remaining complicated cases (e.g. VirtualProtect from PAGE_NOACCESS to PAGE_READONLY, ...) are handled by deferring changing the page protection until virtual_handle_fault. It is possible that this patchset will introduce a performance regression if an application heavily uses PAGE_NOACCESS or PAGE_GUARD protections. Also, this patch reverts to the staging stub's behavior if pagemaps is not available. If someone has an alternative approach, or there is appetite using the staging stub in upstream Wine, that would be very welcome feedback. Andrew Wesie (3): ntdll: Implement NtQueryVirtualMemory(MemoryWorkingSetExInformation). kernel32: QueryWorkingSetEx should use MemoryWorkingSetExInformation. psapi/tests: Test QueryWorkingSetEx. dlls/kernel32/process.c | 2 +- dlls/ntdll/virtual.c | 78 +++++++++++++++++++++++++++++--- dlls/psapi/tests/psapi_main.c | 84 +++++++++++++++++++++++++++++++++++ include/psapi.h | 18 ++++++++ include/winternl.h | 21 ++++++++- 5 files changed, 196 insertions(+), 7 deletions(-) -- 2.17.1

5 14

[PATCH] ws2_32: enable a WSAEnumNetworkEvents test that never runs
by Damjan Jovanovic Dec. 18, 2019

Dec. 18, 2019

In test_WSAEnumNetworkEvents(), a test's condition is always false as the preceding "if" requires the opposite condition. The test already passes. Enable it. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

2 1

[PATCH] msvcrt: Implement strtod without using 'long double'.
by Erich E. Hoover Dec. 18, 2019

Dec. 18, 2019

Fixes the "regression" with cl.exe caused by 0e183cc3c0d3b6f89f79047cdd71c389afc75073. ( https://bugs.winehq.org/show_bug.cgi?id=48160 ) Best, Erich

2 1

[PATCH] include: Define the _STGMEDIUM_UNION type for C++.
by Zebediah Figura Dec. 18, 2019

Dec. 18, 2019

This fixes a regression introduced by 732f67ed38a45911d726df8da5a68710d175ba1d. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/objidl.idl | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/include/objidl.idl b/include/objidl.idl index a0ad1f6e01..a5466c3698 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1426,8 +1426,11 @@ interface IAdviseSink : IUnknown default: wireHGLOBAL hGeneric; } GDI_OBJECT; +/* Defining the _STGMEDIUM_UNION type yields a violation of the C spec when + * NONAMELESSUNION is not defined, so only define it for C++. */ +cpp_quote("#ifdef __cplusplus") typedef struct _userSTGMEDIUM { - union switch(DWORD tymed) u { + union _STGMEDIUM_UNION switch(DWORD tymed) u { case TYMED_NULL: ; case TYMED_MFPICT: wireHMETAFILEPICT hMetaFilePict; case TYMED_ENHMF: wireHENHMETAFILE hHEnhMetaFile; @@ -1439,6 +1442,23 @@ interface IAdviseSink : IUnknown } DUMMYUNIONNAME; IUnknown *pUnkForRelease; } userSTGMEDIUM; +cpp_quote("#else") +cpp_quote("typedef struct _userSTGMEDIUM {") +cpp_quote(" struct {") +cpp_quote(" DWORD tymed;") +cpp_quote(" union {") +cpp_quote(" wireHMETAFILEPICT hMetaFilePict;") +cpp_quote(" wireHENHMETAFILE hHEnhMetaFile;") +cpp_quote(" GDI_OBJECT *hGdiHandle;") +cpp_quote(" wireHGLOBAL hGlobal;") +cpp_quote(" LPOLESTR lpszFileName;") +cpp_quote(" BYTE_BLOB *pstm;") +cpp_quote(" BYTE_BLOB *pstg;") +cpp_quote(" } u;") +cpp_quote(" } DUMMYUNIONNAME;") +cpp_quote(" IUnknown *pUnkForRelease;") +cpp_quote("} userSTGMEDIUM;") +cpp_quote("#endif") typedef [unique] userSTGMEDIUM *wireSTGMEDIUM; typedef [wire_marshal(wireSTGMEDIUM)] uSTGMEDIUM STGMEDIUM; -- 2.24.1

2 2

[PATCH] kernel32: update version to win7
by Louis Lenders Dec. 18, 2019

Dec. 18, 2019

https://bugs.winehq.org/show_bug.cgi?id=48304 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/version.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/version.rc b/dlls/kernel32/version.rc index d4b994f28d..82287e5da7 100644 --- a/dlls/kernel32/version.rc +++ b/dlls/kernel32/version.rc @@ -25,10 +25,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT #define WINE_FILEDESCRIPTION_STR "Wine kernel DLL" #define WINE_FILENAME_STR "kernel32.dll" -/* these values come from Windows XP SP2 */ -#define WINE_FILEVERSION 5,1,2600,2180 -#define WINE_FILEVERSION_STR "5.01.2600.2180" -#define WINE_PRODUCTVERSION 5,1,2600,2180 -#define WINE_PRODUCTVERSION_STR "5.01.2600.2180" +/* these values come from Windows 7 SP1 */ +#define WINE_FILEVERSION 6,1,7601,17514 +#define WINE_FILEVERSION_STR "6.1.7601.17514" +#define WINE_PRODUCTVERSION 6,1,7601,17514 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" #include "wine/wine_common_ver.rc" -- 2.24.1

4 3

[PATCH] dmime: IDirectMusicAudioPath Release primary buffer.
by Alistair Leslie-Hughes Dec. 18, 2019

Dec. 18, 2019

In IDirectMusicAudioPath CreateStandardAudioPath we create a AudioPath object and assign it a primary buffer object which needs to be released. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36272 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/audiopath.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index ac3121c0e0a..1aadba92aea 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -108,6 +108,8 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { + if (This->pPrimary) + IDirectSoundBuffer_Release(This->pPrimary); if (This->pDSBuffer) IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; -- 2.24.0

2 1

[PATCH] rpcrt4: Fix implicit in attribute handling in write_param_fs.
by Jacek Caban Dec. 18, 2019

Dec. 18, 2019

Fixes regression caused by typelib marshaling rewrite. Spotted by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/tmarshal.c | 13 +++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 4 ++++ dlls/rpcrt4/ndr_typelib.c | 6 ++++-- 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[PATCH v2 1/2] winemac.drv: Pass the CAMetalLayer to MoltenVK.
by Chip Davis Dec. 18, 2019

Dec. 18, 2019

It isn't safe to access the view object from any thread other than the main thread. In fact, if you try to call vkCreateMacOSSurfaceMVK() from any other thread, MoltenVK prints out a big, scary warning telling you not to do this! Instead, get the layer from the view ourselves and pass that to MoltenVK. Recent versions of MoltenVK can accept either the view or the layer. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Don't check for the main thread. dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/vulkan.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 877653ea0078..edbfab518e3c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3796,6 +3796,18 @@ macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_devi return (macdrv_metal_view)metalView; } +macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) +{ + WineMetalView* view = (WineMetalView*)v; + __block CAMetalLayer* layer; + + OnMainThread(^{ + layer = (CAMetalLayer*)view.layer; + }); + + return (macdrv_metal_layer)layer; +} + void macdrv_view_release_metal_view(macdrv_metal_view v) { WineMetalView* view = (WineMetalView*)v; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 676adb435bb3..b02ad79f0259 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -140,6 +140,7 @@ #ifdef HAVE_METAL_METAL_H typedef struct macdrv_opaque_metal_device* macdrv_metal_device; typedef struct macdrv_opaque_metal_view* macdrv_metal_view; +typedef struct macdrv_opaque_metal_layer* macdrv_metal_layer; #endif typedef struct macdrv_opaque_status_item* macdrv_status_item; struct macdrv_event; @@ -587,6 +588,7 @@ extern void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat extern macdrv_metal_device macdrv_create_metal_device(void) DECLSPEC_HIDDEN; extern void macdrv_release_metal_device(macdrv_metal_device d) DECLSPEC_HIDDEN; extern macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_device d) DECLSPEC_HIDDEN; +extern macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) DECLSPEC_HIDDEN; extern void macdrv_view_release_metal_view(macdrv_metal_view v) DECLSPEC_HIDDEN; #endif extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index cc7f22f67880..21e93827c156 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -282,7 +282,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ - create_info_host.pView = mac_surface->view; + create_info_host.pView = macdrv_view_get_metal_layer(mac_surface->view); res = pvkCreateMacOSSurfaceMVK(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); if (res != VK_SUCCESS) -- 2.24.0

2 3