- Wine-Devel - list.winehq.org

[PATCH] include: Add IParentAndItem definition.
by Nikolay Sivov April 28, 2022

April 28, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/actxprxy/usrmarshal.c | 20 ++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 1 - include/shobjidl.idl | 25 +++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index 33db1327a8d..e4eada6848f 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -227,3 +227,23 @@ HRESULT __RPC_STUB IFolderView2_GetGroupBy_Proxy( TRACE("(%p)->(%p %p)\n", This, pkey, ascending); return IFolderView2_RemoteGetGroupBy_Proxy(This, pkey, ascending); } + +HRESULT __RPC_STUB IParentAndItem_GetParentAndItem_Stub( + IParentAndItem *This, + PIDLIST_ABSOLUTE *parent, + IShellFolder **folder, + PITEMID_CHILD *child) +{ + TRACE("(%p)->(%p %p %p)\n", This, parent, folder, child); + return IParentAndItem_GetParentAndItem(This, parent, folder, child); +} + +HRESULT __RPC_STUB IParentAndItem_GetParentAndItem_Proxy( + IParentAndItem *This, + PIDLIST_ABSOLUTE *parent, + IShellFolder **folder, + PITEMID_CHILD *child) +{ + TRACE("(%p)->(%p %p %p)\n", This, parent, folder, child); + return IParentAndItem_RemoteGetParentAndItem_Proxy(This, parent, folder, child); +} diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index b690e979ab5..da606a9e707 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -40,7 +40,6 @@ #include "wine/test.h" #include <initguid.h> -DEFINE_GUID(IID_IParentAndItem, 0xB3A4B685, 0xB685, 0x4805, 0x99,0xD9, 0x5D,0xEA,0xD2,0x87,0x32,0x36); DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0xaa,0x00,0x4a,0xe8,0x37); static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index a23f3cfdd36..8113d9a7ff6 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -501,6 +501,31 @@ interface IShellItemImageFactory : IUnknown [out] HBITMAP *phbm); } +[ + object, + uuid(b3a4b685-b685-4805-99d9-5dead2873236), + pointer_default(unique) +] +interface IParentAndItem : IUnknown +{ + HRESULT SetParentAndItem( + [in, unique] PCIDLIST_ABSOLUTE parent, + [in, unique] IShellFolder *folder, + [in] PCUITEMID_CHILD child); + + [local] + HRESULT GetParentAndItem( + [out] PIDLIST_ABSOLUTE *parent, + [out] IShellFolder **folder, + [out] PITEMID_CHILD *child); + + [call_as(GetParentAndItem)] + HRESULT RemoteGetParentAndItem( + [out] PIDLIST_ABSOLUTE *parent, + [out] IShellFolder **folder, + [out] PITEMID_CHILD *child); +} + typedef [v1_enum] enum tagNWMF { NWMF_UNLOADING = 0x00000001, NWMF_USERINITED = 0x00000002, -- 2.35.1

2 1

[PATCH 1/9] d2d1: Add stubs for ID2D1EffectContext.
by Ziqing Hui April 28, 2022

April 28, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 23 ++++ dlls/d2d1/effect.c | 256 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index aa8e8569455..98092d80951 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -34,6 +34,7 @@ #include "initguid.h" #endif #include "dwrite_2.h" +#include "d2d1effectauthor.h" enum d2d_brush_type { @@ -567,6 +568,14 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_effect_context +{ + ID2D1EffectContext ID2D1EffectContext_iface; + LONG refcount; +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context) DECLSPEC_HIDDEN; + struct d2d_effect_info { const CLSID *clsid; @@ -694,6 +703,13 @@ static inline const char *debug_d2d_point_2f(const D2D1_POINT_2F *point) return wine_dbg_sprintf("{%.8e, %.8e}", point->x, point->y); } +static inline const char *debug_d2d_point_2l(const D2D1_POINT_2L *point) +{ + if (!point) + return "(null)"; + return wine_dbg_sprintf("{%ld, %ld}", point->x, point->y); +} + static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) { if (!rect) @@ -701,6 +717,13 @@ static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) return wine_dbg_sprintf("(%.8e, %.8e)-(%.8e, %.8e)", rect->left, rect->top, rect->right, rect->bottom); } +static inline const char *debug_d2d_rect_l(const D2D1_RECT_L *rect) +{ + if (!rect) + return "(null)"; + return wine_dbg_sprintf("(%ld, %ld)-(%ld, %ld)", rect->left, rect->top, rect->right, rect->bottom); +} + static inline const char *debug_d2d_rounded_rect(const D2D1_ROUNDED_RECT *rounded_rect) { if (!rounded_rect) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 350ac3c7bbf..5709afed7a5 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -17,7 +17,6 @@ */ #include "d2d1_private.h" -#include "d2d1effectauthor.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -31,6 +30,261 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D1Grayscale, 1, 1, 1}, }; +static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1EffectContext *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect_context, ID2D1EffectContext_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1EffectContext) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1EffectContext_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_AddRef(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedIncrement(&effect_context->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedDecrement(&effect_context->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + { + heap_free(effect_context); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_effect_context_GetDpi(ID2D1EffectContext *iface, float *dpi_x, float *dpi_y) +{ + FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectContext *iface, + REFCLSID clsid, ID2D1Effect **effect) +{ + FIXME("iface %p, clsid %s, effect %p stub!\n", iface, debugstr_guid(clsid), effect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_GetMaximumSupportedFeatureLevel(ID2D1EffectContext *iface, + const D3D_FEATURE_LEVEL *levels, UINT32 level_count, D3D_FEATURE_LEVEL *max_level) +{ + FIXME("iface %p, levels %p, level_count %u, max_level %p stub!\n", iface, levels, level_count, max_level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateTransformNodeFromEffect(ID2D1EffectContext *iface, + ID2D1Effect *effect, ID2D1TransformNode **node) +{ + FIXME("iface %p, effect %p, node %p stub!\n", iface, effect, node); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBlendTransform(ID2D1EffectContext *iface, + UINT32 num_inputs, const D2D1_BLEND_DESCRIPTION *description, ID2D1BlendTransform **transform) +{ + FIXME("iface %p, num_inputs %u, description %p, transform %p stub!\n", iface, num_inputs, description, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBorderTransform(ID2D1EffectContext *iface, + D2D1_EXTEND_MODE mode_x, D2D1_EXTEND_MODE mode_y, ID2D1BorderTransform **transform) +{ + FIXME("iface %p, mode_x %#x, mode_y %#x, transform %p stub!\n", iface, mode_x, mode_y, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateOffsetTransform(ID2D1EffectContext *iface, + D2D1_POINT_2L offset, ID2D1OffsetTransform **transform) +{ + FIXME("iface %p, offset %s, transform %p stub!\n", iface, debug_d2d_point_2l(&offset), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBoundsAdjustmentTransform(ID2D1EffectContext *iface, + const D2D1_RECT_L *output_rect, ID2D1BoundsAdjustmentTransform **transform) +{ + FIXME("iface %p, output_rect %s, transform %p stub!\n", iface, debug_d2d_rect_l(output_rect), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id) +{ + FIXME("iface %p, shader_id %s stub!\n", iface, debugstr_guid(shader_id)); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateResourceTexture(ID2D1EffectContext *iface, + const GUID *id, const D2D1_RESOURCE_TEXTURE_PROPERTIES *texture_properties, + const BYTE *data, const UINT32 *strides, UINT32 data_size, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture_properties %p, data %p, strides %s, data_size %u, texture %p stub!\n", + iface, debugstr_guid(id), texture_properties, data, + strides ? wine_dbg_sprintf("%u", *strides) : "(null)", data_size, texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindResourceTexture(ID2D1EffectContext *iface, + const GUID *id, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture %p stub!\n", iface, debugstr_guid(id), texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateVertexBuffer(ID2D1EffectContext *iface, + const D2D1_VERTEX_BUFFER_PROPERTIES *buffer_properties, const GUID *id, + const D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES *custom_buffer_properties, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, buffer_properties %p, id %s, custom_buffer_properties %p, buffer %p stub!\n", + iface, buffer_properties, debugstr_guid(id), custom_buffer_properties, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindVertexBuffer(ID2D1EffectContext *iface, + const GUID *id, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, id %s, buffer %p stub!\n", iface, debugstr_guid(id), buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContext(ID2D1EffectContext *iface, + D2D1_COLOR_SPACE space, const BYTE *profile, UINT32 profile_size, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, space %#x, profile %p, profile_size %u, color_context %p stub!\n", + iface, space, profile, profile_size, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromFilename(ID2D1EffectContext *iface, + const WCHAR *filename, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, filename %s, color_context %p stub!\n", iface, debugstr_w(filename), color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicColorContext(ID2D1EffectContext *iface, + IWICColorContext *wic_color_context, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, wic_color_context %p, color_context %p stub!\n", iface, wic_color_context, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1EffectContext *iface, + D2D1_FEATURE feature, void *data, UINT32 data_size) +{ + FIXME("iface %p, feature %#x, data %p, data_size %u stub!\n", iface, feature, data, data_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D1EffectContext *iface, + D2D1_BUFFER_PRECISION precision) +{ + FIXME("iface %p, precision %#x stub!\n", iface, precision); + + return FALSE; +} + +static const ID2D1EffectContextVtbl d2d_effect_context_vtbl = +{ + d2d_effect_context_QueryInterface, + d2d_effect_context_AddRef, + d2d_effect_context_Release, + d2d_effect_context_GetDpi, + d2d_effect_context_CreateEffect, + d2d_effect_context_GetMaximumSupportedFeatureLevel, + d2d_effect_context_CreateTransformNodeFromEffect, + d2d_effect_context_CreateBlendTransform, + d2d_effect_context_CreateBorderTransform, + d2d_effect_context_CreateOffsetTransform, + d2d_effect_context_CreateBoundsAdjustmentTransform, + d2d_effect_context_LoadPixelShader, + d2d_effect_context_LoadVertexShader, + d2d_effect_context_LoadComputeShader, + d2d_effect_context_IsShaderLoaded, + d2d_effect_context_CreateResourceTexture, + d2d_effect_context_FindResourceTexture, + d2d_effect_context_CreateVertexBuffer, + d2d_effect_context_FindVertexBuffer, + d2d_effect_context_CreateColorContext, + d2d_effect_context_CreateColorContextFromFilename, + d2d_effect_context_CreateColorContextFromWicColorContext, + d2d_effect_context_CheckFeatureSupport, + d2d_effect_context_IsBufferPrecisionSupported, +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context) +{ + effect_context->ID2D1EffectContext_iface.lpVtbl = &d2d_effect_context_vtbl; + effect_context->refcount = 1; +} + static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) { return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); -- 2.25.1

2 13

[PATCH 1/2] shell32: Only call HCR_GetFolderAttributes with simple pidls
by Fabian Maurer April 27, 2022

April 27, 2022

The function returns false with not-simple pidls anyways. This fixes an "ERR" message when opening a control panel applet from explorer Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 10aafc160c0..8e3b561cfd1 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -412,7 +412,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO if (_ILIsDrive (pidl)) { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - } else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) { + } else if (has_guid && _ILIsPidlSimple(pidl) && HCR_GetFolderAttributes(pidl, &dwAttributes)) { *pdwAttributes = dwAttributes; } else if (_ILGetDataPointer (pidl)) { DWORD file_attr = _ILGetFileAttributes (pidl, NULL, 0); -- 2.34.1

2 5

[PATCH v2 1/5] server: Return void from sock_reselect().
by Zebediah Figura April 27, 2022

April 27, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index b403541fcbf..a9d8d2ca2bd 100644 --- a/server/sock.c +++ b/server/sock.c @@ -567,7 +567,7 @@ void sock_init(void) } } -static int sock_reselect( struct sock *sock ) +static void sock_reselect( struct sock *sock ) { int ev = sock_get_poll_events( sock->fd ); @@ -575,7 +575,6 @@ static int sock_reselect( struct sock *sock ) fprintf(stderr,"sock_reselect(%p): new mask %x\n", sock, ev); set_fd_events( sock->fd, ev ); - return ev; } static unsigned int afd_poll_flag_to_win32( unsigned int flags ) -- 2.34.1

2 8

[PATCH 0/2] MR7: ntdll: Properly track refcount with forwarded exports.
by Jinoh Kang (＠iamahuman) April 27, 2022

April 27, 2022

This fixes https://bugs.winehq.org/show_bug.cgi?id=52094. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7

3 4

[PATCH v3 0/5] MR5: windows.media.speech: Backport tweaks from windows.gaming.input async.
by Rémi Bernon April 27, 2022

April 27, 2022

Some being more cosmetic than others. -- v3: windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close. windows.media.speech: Simplify error handling in async_operation_create. windows.media.speech: Initialize HRESULT variables consistently. windows.media.speech: Return E_ILLEGAL_METHOD_CALL from get_ErrorCode. windows.media.speech: Return operation error from IAsyncOperation_GetResults. https://gitlab.winehq.org/wine/wine/-/merge_requests/5

1 5

[PATCH v2 0/1] MR8: wineboot: Don't use ai_canonname for ComputerName if it is "localhost".
by Jinoh Kang (＠iamahuman) April 27, 2022

April 27, 2022

-- v2: wineboot: Don't use ai_canonname for ComputerName if it is "localhost". https://gitlab.winehq.org/wine/wine/-/merge_requests/8

2 1

[PATCH v2 1/2] ntdll/tests: Test NtMapViewOfSection with a DLL and zero_bits.
by Brendan Shanks April 27, 2022

April 27, 2022

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- The zero_bits mask test always passes on 32-bit (the pointer is either truncated, or version.dll is itself 32-bit). dlls/ntdll/tests/virtual.c | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 30a97ba9d94..cd374cf2ea4 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -37,6 +37,8 @@ static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char*); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID*); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(PVOID); static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); static const BOOL is_win64 = sizeof(void*) != sizeof(int); @@ -904,6 +906,43 @@ static void test_NtMapViewOfSection(void) CloseHandle(file); DeleteFileA(testfile); + /* test zero_bits > 31 with a 64-bit DLL if possible */ + if (is_wow64) + pWow64DisableWow64FsRedirection(&ptr2); + + file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n"); + + if (is_wow64) + pWow64RevertWow64FsRedirection(ptr2); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + zero_bits = 0x7fffffff; + status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY); + + if (!is_win64 && !is_wow64) + { + ok(status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %08lx\n", status); + } + else + { + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + todo_wine + ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr); + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + } + + NtClose(mapping); + CloseHandle(file); + TerminateProcess(process, 0); CloseHandle(process); } @@ -1152,6 +1191,8 @@ START_TEST(virtual) mod = GetModuleHandleA("kernel32.dll"); pIsWow64Process = (void *)GetProcAddress(mod, "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(mod, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(mod, "Wow64RevertWow64FsRedirection"); pGetEnabledXStateFeatures = (void *)GetProcAddress(mod, "GetEnabledXStateFeatures"); mod = GetModuleHandleA("ntdll.dll"); pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); -- 2.35.1

2 2

[PATCH v2 0/5] MR5: windows.media.speech: Backport tweaks from windows.gaming.input async.
by Rémi Bernon April 27, 2022

April 27, 2022

Some being more cosmetic than others. -- v2: windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close. windows.media.speech: Simplify error handling in async_operation_create. windows.media.speech: Initialize HRESULT variables consistently. windows.media.speech: Return E_ILLEGAL_METHOD_CALL from get_ErrorCode. https://gitlab.winehq.org/wine/wine/-/merge_requests/5

2 8

[PATCH v2 3/3] msvcp140_atomic_wait: Add __std_atomic_wait_direct implementation.
by Piotr Caban April 27, 2022

April 27, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52821 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 7 ++ .../msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 76 +++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-)

1 0