- wine-devel - winehq.org

[PATCH] ws2_32: Provide default protocol for SOCK_STREAM and SOCK_DGRAM
by Robin Ebert 17 Jul '20

17 Jul '20

Windows provides a default protocol in socket() if af is AF_INET or AF_INET6 type is SOCK_STREAM or SOCK_DGRAM and protocol is 0. Signed-off-by: Robin Ebert <ebertrobin2002(a)gmail.com> --- dlls/ws2_32/socket.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7eddde..de30ee4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -835,6 +835,12 @@ static const int ws_poll_map[][2] = { WS_POLLRDBAND, POLLPRI } }; +static const int ws_default_protocol_map[][2] = +{ + { WS_SOCK_STREAM, WS_IPPROTO_TCP }, + { WS_SOCK_DGRAM, WS_IPPROTO_UDP } +}; + static const char magic_loopback_addr[] = {127, 12, 34, 56}; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS @@ -1660,6 +1666,26 @@ static int convert_poll_u2w(int events) return ret; } +static int get_default_protocol(int type) +{ + int i, ret; + for(i = ret = 0; i < ARRAY_SIZE(ws_default_protocol_map); i++) + { + if (ws_default_protocol_map[i][0] == type) + { + ret = ws_default_protocol_map[i][1]; + break; + } + } + + if(!ret) + WARN("selecting default protocol failed: type %i\n", type); + else + TRACE("selected %i as default protocol: type %i\n", ret, type); + + return ret; +} + static int set_ipx_packettype(int sock, int ptype) { #ifdef HAS_IPX @@ -7643,6 +7669,19 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, protocol = lpProtocolInfo->iProtocol; } + /* + Windows provides a default protocol + if af is AF_INET or AF_INET6, + type is SOCKET_STREAM or SOCKET_DGRAM + and protocol is 0 + */ + if (!protocol + && (af == WS_AF_INET || af == WS_AF_INET6) + && (type == WS_SOCK_STREAM || type == WS_SOCK_DGRAM)) + { + protocol = get_default_protocol(type); + } + if (!type && (af || protocol)) { int autoproto = protocol; -- 2.20.1

2 2

[PATCH 2/2] comctl32: Offset client area when toolbar divider is present.
by Piotr Caban 17 Jul '20

17 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 5 +++++ dlls/comctl32/toolbar.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[PATCH 1/2] comctl32: Compute border size from client and window rectangles.
by Piotr Caban 17 Jul '20

17 Jul '20

Fixes toolbar size when WS_EX_DLGMODALFRAME is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 26 ++++++++++++++++++++++---- dlls/comctl32/toolbar.c | 22 ++++++++++++---------- 2 files changed, 34 insertions(+), 14 deletions(-)

1 0

[PATCH] ntdll: Always use GNU _CI* functions implementation on clang.
by Jacek Caban 17 Jul '20

17 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes compilation with clang MSVC target. dlls/ntdll/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] msvcrt: Fix the spelling of a TRACE() message.
by Francois Gouget 17 Jul '20

17 Jul '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcrt/printf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 46df340839e..f776a1fa4b2 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -585,7 +585,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu ULONGLONG m; DWORD l; - TRACE("floting point argument: %.16le\n", v); + TRACE("floating point argument: %.16le\n", v); if(flags->Precision == -1) flags->Precision = 6; -- 2.20.1

2 1

[PATCH 4/4] server: Remove support for SET_CONSOLE_INPUT_INFO_ACTIVE_SB.
by Jacek Caban 17 Jul '20

17 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 26 +------------------------- server/protocol.def | 2 -- 2 files changed, 1 insertion(+), 27 deletions(-)

1 0

[PATCH 3/4] kernelbase: Use IOCTL_CONDRV_ACTIVATE in SetConsoleActiveScreenBuffer.
by Jacek Caban 17 Jul '20

17 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)

1 0

[PATCH 2/4] server: Introduce IOCTL_CONDRV_ACTIVATE ioctl.
by Jacek Caban 17 Jul '20

17 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 1 + server/console.c | 15 +++++++++++++++ server/trace.c | 1 + 3 files changed, 17 insertions(+)

1 0

[PATCH 1/4] kernelbase: Avoid unneeded GetConsoleOutputCP calls.
by Jacek Caban 17 Jul '20

17 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH] mshtml: Fix the spelling of a MoveUnitBounded() parameter.
by Francois Gouget 17 Jul '20

17 Jul '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/range.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index c15470c4ff5..7db62f49a12 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -2343,10 +2343,10 @@ static HRESULT WINAPI MarkupPointer2_MoveToMarkupPosition(IMarkupPointer2 *iface return E_NOTIMPL; } -static HRESULT WINAPI MarkupPointer2_MoveUnitBounded(IMarkupPointer2 *iface, MOVEUNIT_ACTION action, IMarkupPointer *boundry) +static HRESULT WINAPI MarkupPointer2_MoveUnitBounded(IMarkupPointer2 *iface, MOVEUNIT_ACTION action, IMarkupPointer *boundary) { MarkupPointer *This = impl_from_IMarkupPointer2(iface); - FIXME("(%p)->(%u %p)\n", This, action, boundry); + FIXME("(%p)->(%u %p)\n", This, action, boundary); return E_NOTIMPL; } -- 2.20.1

2 1

[PATCH 1/5] wined3d: Correctly destroy the adapter on format initialization failure in no3d mode.
by Matteo Bruni 17 Jul '20

17 Jul '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1f892a9d48e8..b0cb6ad88a3a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2990,7 +2990,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, if (!wined3d_adapter_no3d_init_format_info(adapter)) { - heap_free(adapter); + adapter_no3d_destroy(adapter); return NULL; } -- 2.26.2

3 8

[PATCH v2 1/2] dxgi: Implement IDXGIOutput5 and IDXGIOutput6 stubs.
by Rémi Bernon 17 Jul '20

17 Jul '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/output.c | 166 ++++++++++++++++++++++++++++----------- 3 files changed, 123 insertions(+), 47 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index ad4e4b13057..72f1a2df6b1 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -145,7 +145,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return hr; } - *output = (IDXGIOutput *)&output_object->IDXGIOutput4_iface; + *output = (IDXGIOutput *)&output_object->IDXGIOutput6_iface; TRACE("Returning output %p.\n", *output); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index a125a7667d9..e43ee59461c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -144,7 +144,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l /* IDXGIOutput */ struct dxgi_output { - IDXGIOutput4 IDXGIOutput4_iface; + IDXGIOutput6 IDXGIOutput6_iface; LONG refcount; struct wined3d_output *wined3d_output; struct wined3d_private_store private_store; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 5d31a0093cb..03b5384f326 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -181,18 +181,20 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, return S_OK; } -static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) +static inline struct dxgi_output *impl_from_IDXGIOutput6(IDXGIOutput6 *iface) { - return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput6_iface); } /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID iid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput6 *iface, REFIID iid, void **object) { TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); - if (IsEqualGUID(iid, &IID_IDXGIOutput4) + if (IsEqualGUID(iid, &IID_IDXGIOutput6) + || IsEqualGUID(iid, &IID_IDXGIOutput5) + || IsEqualGUID(iid, &IID_IDXGIOutput4) || IsEqualGUID(iid, &IID_IDXGIOutput3) || IsEqualGUID(iid, &IID_IDXGIOutput2) || IsEqualGUID(iid, &IID_IDXGIOutput1) @@ -211,9 +213,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput4 *iface) +static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput6 *iface) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); ULONG refcount = InterlockedIncrement(&output->refcount); TRACE("%p increasing refcount to %u.\n", output, refcount); @@ -221,9 +223,9 @@ static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput4 *iface) return refcount; } -static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput4 *iface) +static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput6 *iface) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); ULONG refcount = InterlockedDecrement(&output->refcount); TRACE("%p decreasing refcount to %u.\n", output, refcount); @@ -240,40 +242,40 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput4 *iface) /* IDXGIObject methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateData(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateData(IDXGIOutput6 *iface, REFGUID guid, UINT data_size, const void *data) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); return dxgi_set_private_data(&output->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput6 *iface, REFGUID guid, const IUnknown *object) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); return dxgi_set_private_data_interface(&output->private_store, guid, object); } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput6 *iface, REFGUID guid, UINT *data_size, void *data) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); return dxgi_get_private_data(&output->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput6 *iface, REFIID riid, void **parent) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); @@ -282,9 +284,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput4 *iface, /* IDXGIOutput methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_OUTPUT_DESC *desc) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_OUTPUT_DESC *desc) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_output_desc wined3d_desc; HRESULT hr; @@ -312,10 +314,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_O return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput6 *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *modes) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", iface, debug_dxgi_format(format), flags, mode_count, modes); @@ -324,10 +326,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput4 *if format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_0); } -static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput6 *iface, const DXGI_MODE_DESC *mode, DXGI_MODE_DESC *closest_match, IUnknown *device) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_display_mode wined3d_mode; HRESULT hr; @@ -347,7 +349,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput return hr; } -static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) +static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput6 *iface) { static BOOL once = FALSE; @@ -359,9 +361,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, IUnknown *device, BOOL exclusive) +static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput6 *iface, IUnknown *device, BOOL exclusive) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); HRESULT hr; TRACE("iface %p, device %p, exclusive %d.\n", iface, device, exclusive); @@ -376,9 +378,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, return hr; } -static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) +static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput6 *iface) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p.\n", iface); @@ -387,7 +389,7 @@ static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) wined3d_mutex_unlock(); } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput6 *iface, DXGI_GAMMA_CONTROL_CAPABILITIES *gamma_caps) { unsigned int i; @@ -408,7 +410,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOu return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput6 *iface, const DXGI_GAMMA_CONTROL *gamma_control) { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); @@ -416,7 +418,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput6 *iface, DXGI_GAMMA_CONTROL *gamma_control) { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); @@ -424,21 +426,21 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_SetDisplaySurface(IDXGIOutput4 *iface, IDXGISurface *surface) +static HRESULT STDMETHODCALLTYPE dxgi_output_SetDisplaySurface(IDXGIOutput6 *iface, IDXGISurface *surface) { FIXME("iface %p, surface %p stub!\n", iface, surface); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData(IDXGIOutput4 *iface, IDXGISurface *surface) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData(IDXGIOutput6 *iface, IDXGISurface *surface) { FIXME("iface %p, surface %p stub!\n", iface, surface); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput4 *iface, DXGI_FRAME_STATISTICS *stats) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput6 *iface, DXGI_FRAME_STATISTICS *stats) { FIXME("iface %p, stats %p stub!\n", iface, stats); @@ -447,10 +449,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput4 *if /* IDXGIOutput1 methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput6 *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC1 *modes) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", iface, debug_dxgi_format(format), flags, mode_count, modes); @@ -459,10 +461,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *i format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_1); } -static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput6 *iface, const DXGI_MODE_DESC1 *mode, DXGI_MODE_DESC1 *closest_match, IUnknown *device) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_display_mode wined3d_mode; HRESULT hr; @@ -482,7 +484,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutpu return hr; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput6 *iface, IDXGIResource *resource) { FIXME("iface %p, resource %p stub!\n", iface, resource); @@ -490,7 +492,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput4 return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput(IDXGIOutput6 *iface, IUnknown *device, IDXGIOutputDuplication **output_duplication) { FIXME("iface %p, device %p, output_duplication %p stub!\n", iface, device, output_duplication); @@ -500,7 +502,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput(IDXGIOutput4 *iface /* IDXGIOutput2 methods */ -static BOOL STDMETHODCALLTYPE dxgi_output_SupportsOverlays(IDXGIOutput4 *iface) +static BOOL STDMETHODCALLTYPE dxgi_output_SupportsOverlays(IDXGIOutput6 *iface) { FIXME("iface %p stub!\n", iface); @@ -509,7 +511,7 @@ static BOOL STDMETHODCALLTYPE dxgi_output_SupportsOverlays(IDXGIOutput4 *iface) /* IDXGIOutput3 methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlaySupport(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlaySupport(IDXGIOutput6 *iface, DXGI_FORMAT format, IUnknown *device, UINT *flags) { FIXME("iface %p, format %#x, device %p, flags %p stub!\n", iface, format, device, flags); @@ -519,7 +521,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlaySupport(IDXGIOutput4 *i /* IDXGIOutput4 methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlayColorSpaceSupport(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlayColorSpaceSupport(IDXGIOutput6 *iface, DXGI_FORMAT format, DXGI_COLOR_SPACE_TYPE color_space, IUnknown *device, UINT *flags) { FIXME("iface %p, format %#x, color_space %#x, device %p, flags %p stub!\n", @@ -528,7 +530,76 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlayColorSpaceSupport(IDXGI return E_NOTIMPL; } -static const struct IDXGIOutput4Vtbl dxgi_output_vtbl = +/* IDXGIOutput5 methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput1(IDXGIOutput6 *iface, + IUnknown *device, UINT flags, UINT format_count, const DXGI_FORMAT *formats, + IDXGIOutputDuplication **output_duplication) +{ + FIXME("iface %p, device %p, flags %#x, format_count %u, formats %p, " + "output_duplication %p stub!\n", iface, device, flags, format_count, + formats, output_duplication); + + return E_NOTIMPL; +} + +/* IDXGIOutput6 methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, + DXGI_OUTPUT_DESC1 *desc) +{ + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); + struct wined3d_output_desc wined3d_desc; + HRESULT hr; + + FIXME("iface %p, desc %p semi-stub!\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + wined3d_mutex_lock(); + hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to get output desc, hr %#x.\n", hr); + return hr; + } + + memcpy(desc->DeviceName, wined3d_desc.device_name, sizeof(desc->DeviceName)); + desc->DesktopCoordinates = wined3d_desc.desktop_rect; + desc->AttachedToDesktop = wined3d_desc.attached_to_desktop; + desc->Rotation = wined3d_desc.rotation; + desc->Monitor = wined3d_desc.monitor; + + /* FIXME: fill this from monitor EDID */ + desc->BitsPerColor = 0; + desc->ColorSpace = DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709; + desc->RedPrimary[0] = 0.f; + desc->RedPrimary[1] = 0.f; + desc->GreenPrimary[0] = 0.f; + desc->GreenPrimary[1] = 0.f; + desc->BluePrimary[0] = 0.f; + desc->BluePrimary[1] = 0.f; + desc->WhitePoint[0] = 0.f; + desc->WhitePoint[1] = 0.f; + desc->MinLuminance = 0.f; + desc->MaxLuminance = 0.f; + desc->MaxFullFrameLuminance = 0.f; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE dxgi_output_CheckHardwareCompositionSupport(IDXGIOutput6 *iface, + UINT *flags) +{ + FIXME("iface %p, flags %p stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static const struct IDXGIOutput6Vtbl dxgi_output_vtbl = { dxgi_output_QueryInterface, dxgi_output_AddRef, @@ -562,6 +633,11 @@ static const struct IDXGIOutput4Vtbl dxgi_output_vtbl = dxgi_output_CheckOverlaySupport, /* IDXGIOutput4 methods */ dxgi_output_CheckOverlayColorSpaceSupport, + /* IDXGIOutput5 methods */ + dxgi_output_DuplicateOutput1, + /* IDXGIOutput6 methods */ + dxgi_output_GetDesc1, + dxgi_output_CheckHardwareCompositionSupport, }; struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) @@ -569,13 +645,13 @@ struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) if (!iface) return NULL; assert(iface->lpVtbl == (IDXGIOutputVtbl *)&dxgi_output_vtbl); - return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput6_iface); } static void dxgi_output_init(struct dxgi_output *output, unsigned int output_idx, struct dxgi_adapter *adapter) { - output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; + output->IDXGIOutput6_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; output->wined3d_output = wined3d_adapter_get_output(adapter->wined3d_adapter, output_idx); wined3d_private_store_init(&output->private_store); -- 2.27.0

3 5

[PATCH resend] tests: Trace elapsed time when $WINETEST_TIME is set.
by Francois Gouget 17 Jul '20

17 Jul '20

This simplifies narrowing down where a test gets stuck or is slow if it times out but prints few messages. Note that the elapsed time is relative to the current process start time. So subprocesses will have a different elapsed time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48094 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v1: https://www.winehq.org/pipermail/wine-devel/2019-December/156041.html -> This was modifying the environment which caused some trouble. v2: https://www.winehq.org/pipermail/wine-devel/2019-December/157164.html -> Dropped attempting to use the same starting point for the elapsed time in each subprocess which eliminated the need for modifying the environment. But it was sent on the 30th of December which may have been a bad time because it fell into a black hole. Then there were other changes to make to test.h (to limit spam, handling of child processes) so this went to the back burner. So now I'm resubmitting v2. Let me know if it needs further changes. Once/if committed I'll patch the TestBot to add a 'Trace timing information' checkbox and parse the corresponding logs. include/wine/test.h | 75 +++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 26 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 84ac1e516bf..869d8f8e33b 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -47,6 +47,9 @@ /* debug level */ extern int winetest_debug; +/* trace timing information */ +extern int winetest_time; + /* running in interactive mode? */ extern int winetest_interactive; @@ -199,6 +202,10 @@ extern const struct test winetest_testlist[]; /* debug level */ int winetest_debug = 1; +/* trace timing information */ +int winetest_time = 0; +DWORD winetest_start_time, winetest_last_time; + /* interactive mode? */ int winetest_interactive = 0; @@ -278,11 +285,20 @@ void winetest_set_location( const char* file, int line ) data->current_line=line; } +const char *winetest_elapsed(void) +{ + DWORD now; + + if (!winetest_time) return ""; + winetest_last_time = now = GetTickCount(); + return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); +} + void winetest_subtest( const char* name ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Subtest %s\n", - data->current_file, data->current_line, name); + printf( "%s:%d:%s Subtest %s\n", + data->current_file, data->current_line, winetest_elapsed(), name ); } int broken( int condition ) @@ -302,9 +318,9 @@ static LONG winetest_add_line( void ) index = data->current_line % ARRAY_SIZE(line_counters); count = InterlockedIncrement(line_counters + index) - 1; if (count == winetest_mute_threshold) - printf( "%s:%d Line has been silenced after %d occurrences\n", - data->current_file, data->current_line, - winetest_mute_threshold); + printf( "%s:%d:%s Line has been silenced after %d occurrences\n", + data->current_file, data->current_line, winetest_elapsed(), + winetest_mute_threshold ); return count; } @@ -327,8 +343,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - printf( "%s:%d: Test succeeded inside todo block: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test succeeded inside todo block: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -340,8 +356,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d: Test marked todo: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test marked todo: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -355,17 +371,20 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - printf( "%s:%d: Test failed: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test failed: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else { - if (winetest_report_success) - printf( "%s:%d: Test succeeded\n", - data->current_file, data->current_line); + if (winetest_report_success || + (winetest_time && GetTickCount() >= winetest_last_time + 1000)) + { + printf( "%s:%d:%s Test succeeded\n", + data->current_file, data->current_line, winetest_elapsed() ); + } InterlockedIncrement(&successes); return 1; } @@ -390,7 +409,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: ", data->current_file, data->current_line ); + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); @@ -404,7 +423,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + printf( "%s:%d:%s Tests skipped: ", data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&skipped); } @@ -490,14 +509,16 @@ void winetest_wait_child_process( HANDLE process ) if (exit_code > 255) { DWORD pid = GetProcessId( process ); - printf( "%s:%d: unhandled exception %08x in child process %04x\n", - current_test->name, data->current_line, exit_code, pid ); + printf( "%s:%d:%s unhandled exception %08x in child process %04x\n", + current_test->name, data->current_line, winetest_elapsed(), + exit_code, pid ); InterlockedIncrement( &failures ); } else if (exit_code) { - printf( "%s:%d: %u failures in child process\n", - current_test->name, data->current_line, exit_code ); + printf( "%s:%d:%s %u failures in child process\n", + current_test->name, data->current_line, winetest_elapsed(), + exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -553,11 +574,11 @@ static int run_test( const char *name ) if (winetest_debug) { if (muted_todo_successes || muted_skipped || muted_traces) - printf( "%04x:%s: Silenced %d todos, %d skips and %d traces.\n", - GetCurrentProcessId(), test->name, + printf( "%04x:%s:%s Silenced %d todos, %d skips and %d traces.\n", + GetCurrentProcessId(), test->name, winetest_elapsed(), muted_todo_successes, muted_skipped, muted_traces); - printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - GetCurrentProcessId(), test->name, + printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + GetCurrentProcessId(), test->name, winetest_elapsed(), successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", @@ -584,8 +605,8 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) if (data->current_file) printf( "%s:%d: this is the last test seen before the exception\n", data->current_file, data->current_line ); - printf( "%04x:%s: unhandled exception %08x at %p\n", - GetCurrentProcessId(), current_test->name, + printf( "%04x:%s:%s unhandled exception %08x at %p\n", + GetCurrentProcessId(), current_test->name, winetest_elapsed(), ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); fflush( stdout ); return EXCEPTION_EXECUTE_HANDLER; @@ -621,6 +642,8 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); + winetest_last_time = winetest_start_time = GetTickCount(); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); -- 2.20.1

1 0

[PATCH] kernel32: FILE_SetDosError() is not used anymore so remove it.
by Francois Gouget 17 Jul '20

17 Jul '20

The last user, RemoveDirectoryA/W(), has been moved to kernelbase. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/file.c | 67 ---------------------------------- dlls/kernel32/kernel_private.h | 1 - 2 files changed, 68 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 29dd5791af4..949be6c303d 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -92,73 +92,6 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) } -/*********************************************************************** - * FILE_SetDosError - * - * Set the DOS error code from errno. - */ -void FILE_SetDosError(void) -{ - int save_errno = errno; /* errno gets overwritten by printf */ - - TRACE("errno = %d %s\n", errno, strerror(errno)); - switch (save_errno) - { - case EAGAIN: - SetLastError( ERROR_SHARING_VIOLATION ); - break; - case EBADF: - SetLastError( ERROR_INVALID_HANDLE ); - break; - case ENOSPC: - SetLastError( ERROR_HANDLE_DISK_FULL ); - break; - case EACCES: - case EPERM: - case EROFS: - SetLastError( ERROR_ACCESS_DENIED ); - break; - case EBUSY: - SetLastError( ERROR_LOCK_VIOLATION ); - break; - case ENOENT: - SetLastError( ERROR_FILE_NOT_FOUND ); - break; - case EISDIR: - SetLastError( ERROR_CANNOT_MAKE ); - break; - case ENFILE: - case EMFILE: - SetLastError( ERROR_TOO_MANY_OPEN_FILES ); - break; - case EEXIST: - SetLastError( ERROR_FILE_EXISTS ); - break; - case EINVAL: - case ESPIPE: - SetLastError( ERROR_SEEK ); - break; - case ENOTEMPTY: - SetLastError( ERROR_DIR_NOT_EMPTY ); - break; - case ENOEXEC: - SetLastError( ERROR_BAD_FORMAT ); - break; - case ENOTDIR: - SetLastError( ERROR_PATH_NOT_FOUND ); - break; - case EXDEV: - SetLastError( ERROR_NOT_SAME_DEVICE ); - break; - default: - WARN("unknown file error: %s\n", strerror(save_errno) ); - SetLastError( ERROR_GEN_FAILURE ); - break; - } - errno = save_errno; -} - - /*********************************************************************** * FILE_name_AtoW * diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index bcf2ee9a522..2a0e5247488 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -60,7 +60,6 @@ extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; extern const WCHAR DIR_Windows[] DECLSPEC_HIDDEN; extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; -extern void FILE_SetDosError(void) DECLSPEC_HIDDEN; extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH v2 1/2] qdvd: Add a stub dvd navigator filter.
by Gijs Vermeulen 17 Jul '20

17 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/qdvd/Makefile.in | 3 +- dlls/qdvd/navigator.c | 67 +++++++++++++ dlls/qdvd/qdvd_classes.idl | 7 ++ dlls/qdvd/qdvd_main.c | 3 + dlls/qdvd/qdvd_private.h | 1 + dlls/qdvd/tests/Makefile.in | 3 +- dlls/qdvd/tests/navigator.c | 191 ++++++++++++++++++++++++++++++++++++ 7 files changed, 273 insertions(+), 2 deletions(-) create mode 100644 dlls/qdvd/navigator.c create mode 100644 dlls/qdvd/tests/navigator.c diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index 8f5089b3ac..364a81e637 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -1,10 +1,11 @@ MODULE = qdvd.dll -IMPORTS = strmiids uuid ole32 +IMPORTS = strmbase strmiids uuid ole32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ graph.c \ + navigator.c \ qdvd_main.c IDL_SRCS = \ diff --git a/dlls/qdvd/navigator.c b/dlls/qdvd/navigator.c new file mode 100644 index 0000000000..1e121dde60 --- /dev/null +++ b/dlls/qdvd/navigator.c @@ -0,0 +1,67 @@ +/* + * Navigator filter + * + * Copyright 2020 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "qdvd_private.h" +#include "wine/strmbase.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qdvd); + +struct navigator +{ + struct strmbase_filter filter; +}; + +static inline struct navigator *impl_from_strmbase_filter(struct strmbase_filter *filter) +{ + return CONTAINING_RECORD(filter, struct navigator, filter); +} + +static struct strmbase_pin *navigator_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + return NULL; +} + +static void navigator_destroy(struct strmbase_filter *iface) +{ + struct navigator *filter = impl_from_strmbase_filter(iface); + + strmbase_filter_cleanup(&filter->filter); + free(filter); +} + +static const struct strmbase_filter_ops filter_ops = +{ + .filter_get_pin = navigator_get_pin, + .filter_destroy = navigator_destroy, +}; + +HRESULT navigator_create(IUnknown *outer, IUnknown **out) +{ + struct navigator *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + strmbase_filter_init(&object->filter, outer, &CLSID_DVDNavigator, &filter_ops); + + TRACE("Created DVD Navigator filter %p.\n", object); + *out = &object->filter.IUnknown_inner; + return S_OK; +} diff --git a/dlls/qdvd/qdvd_classes.idl b/dlls/qdvd/qdvd_classes.idl index 7fd2a081ba..c55c7e3944 100644 --- a/dlls/qdvd/qdvd_classes.idl +++ b/dlls/qdvd/qdvd_classes.idl @@ -24,3 +24,10 @@ uuid(fcc152b7-f372-11d0-8e00-00c04fd7c08b), ] coclass DvdGraphBuilder {} + +[ + helpstring("DVD Navigator Filter"), + threading(both), + uuid(9b8c4620-2c1a-11d0-8493-00a02438ad48), +] +coclass DVDNavigator {} diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index c529533e44..2fdb108877 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -100,6 +100,7 @@ static const IClassFactoryVtbl class_factory_vtbl = }; static struct class_factory graph_builder_cf = {{&class_factory_vtbl}, graph_builder_create}; +static struct class_factory navigator_cf = {{&class_factory_vtbl}, navigator_create}; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { @@ -120,6 +121,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) if (IsEqualGUID(clsid, &CLSID_DvdGraphBuilder)) return IClassFactory_QueryInterface(&graph_builder_cf.IClassFactory_iface, iid, out); + if (IsEqualGUID(clsid, &CLSID_DVDNavigator)) + return IClassFactory_QueryInterface(&navigator_cf.IClassFactory_iface, iid, out); FIXME("%s not available, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/qdvd/qdvd_private.h b/dlls/qdvd/qdvd_private.h index 297949ee60..48fced46f1 100644 --- a/dlls/qdvd/qdvd_private.h +++ b/dlls/qdvd/qdvd_private.h @@ -26,5 +26,6 @@ #include "wine/debug.h" HRESULT graph_builder_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT navigator_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; #endif /* QDVD_PRIVATE_H */ diff --git a/dlls/qdvd/tests/Makefile.in b/dlls/qdvd/tests/Makefile.in index 3e9efd9c74..57f8fbba5a 100644 --- a/dlls/qdvd/tests/Makefile.in +++ b/dlls/qdvd/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = qdvd.dll IMPORTS = strmiids uuid ole32 C_SRCS = \ - graph.c + graph.c \ + navigator.c diff --git a/dlls/qdvd/tests/navigator.c b/dlls/qdvd/tests/navigator.c new file mode 100644 index 0000000000..f01e428b4e --- /dev/null +++ b/dlls/qdvd/tests/navigator.c @@ -0,0 +1,191 @@ +/* + * Navigator filter unit tests + * + * Copyright 2020 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/strmbase.h" +#include "wine/test.h" + +static IBaseFilter *create_navigator(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_DVDNavigator, NULL, + CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_navigator(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + todo_wine check_interface(filter, &IID_IDvdControl, TRUE); + todo_wine check_interface(filter, &IID_IDvdControl2, TRUE); + todo_wine check_interface(filter, &IID_IDvdInfo, TRUE); + todo_wine check_interface(filter, &IID_IDvdInfo2, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + todo_wine check_interface(filter, &IID_ISpecifyPropertyPages, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IFileSourceFilter, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPersistStream, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); +} + +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IBaseFilter) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IBaseFilter *filter, *filter2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + filter = (IBaseFilter *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_DVDNavigator, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!filter, "Got interface %p.\n", filter); + + hr = CoCreateInstance(&CLSID_DVDNavigator, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IBaseFilter_Release(filter); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + +START_TEST(navigator) +{ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + test_interfaces(); + test_aggregation(); + + CoUninitialize(); +} -- 2.27.0

2 3

[PATCH vkd3d 5/5] vkd3d-shader: Rename the vkd3d_root_parameter structure to vkd3d_shader_root_parameter.
by Henri Verbeet 17 Jul '20

17 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 18 +++++++++--------- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d55a18d..631cbf5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -467,7 +467,7 @@ enum vkd3d_shader_root_parameter_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_PARAMETER_TYPE), }; -struct vkd3d_root_parameter +struct vkd3d_shader_root_parameter { enum vkd3d_shader_root_parameter_type parameter_type; union @@ -496,7 +496,7 @@ enum vkd3d_root_signature_flags struct vkd3d_root_signature_desc { unsigned int parameter_count; - const struct vkd3d_root_parameter *parameters; + const struct vkd3d_shader_root_parameter *parameters; unsigned int static_sampler_count; const struct vkd3d_static_sampler_desc *static_samplers; enum vkd3d_root_signature_flags flags; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e424aa6..303bedd 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2432,7 +2432,7 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c } static int shader_parse_root_parameters(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_root_parameter *parameters) + unsigned int offset, unsigned int count, struct vkd3d_shader_root_parameter *parameters) { const char *ptr; unsigned int i; @@ -2596,7 +2596,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size, v_1_0->parameter_count = count; if (v_1_0->parameter_count) { - struct vkd3d_root_parameter *parameters; + struct vkd3d_shader_root_parameter *parameters; if (!(parameters = vkd3d_calloc(v_1_0->parameter_count, sizeof(*parameters)))) return VKD3D_ERROR_OUT_OF_MEMORY; v_1_0->parameters = parameters; @@ -3181,7 +3181,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_sign return VKD3D_OK; } -static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters, unsigned int count) +static void free_descriptor_ranges(const struct vkd3d_shader_root_parameter *parameters, unsigned int count) { unsigned int i; @@ -3190,14 +3190,14 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters for (i = 0; i < count; ++i) { - const struct vkd3d_root_parameter *p = &parameters[i]; + const struct vkd3d_shader_root_parameter *p = &parameters[i]; if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); } } -static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, +static int convert_root_parameters_to_v_1_0(struct vkd3d_shader_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { const struct vkd3d_shader_descriptor_range1 *ranges1; @@ -3208,7 +3208,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, for (i = 0; i < count; ++i) { const struct vkd3d_root_parameter1 *p1 = &src[i]; - struct vkd3d_root_parameter *p = &dst[i]; + struct vkd3d_shader_root_parameter *p = &dst[i]; p->parameter_type = p1->parameter_type; switch (p->parameter_type) @@ -3264,8 +3264,8 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_ { const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; + struct vkd3d_shader_root_parameter *parameters = NULL; struct vkd3d_static_sampler_desc *samplers = NULL; - struct vkd3d_root_parameter *parameters = NULL; int ret; if ((dst_desc->parameter_count = src_desc->parameter_count)) @@ -3317,7 +3317,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete } static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, - const struct vkd3d_root_parameter *src, unsigned int count) + const struct vkd3d_shader_root_parameter *src, unsigned int count) { const struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_shader_descriptor_range1 *ranges1; @@ -3326,7 +3326,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, for (i = 0; i < count; ++i) { - const struct vkd3d_root_parameter *p = &src[i]; + const struct vkd3d_shader_root_parameter *p = &src[i]; struct vkd3d_root_parameter1 *p1 = &dst[i]; p1->parameter_type = p->parameter_type; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f7489f6..8dbd17e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -484,7 +484,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_d for (i = 0; i < root_signature->parameter_count; ++i) { - const struct vkd3d_root_parameter *parameter = &root_signature->parameters[i]; + const struct vkd3d_shader_root_parameter *parameter = &root_signature->parameters[i]; if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges); -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Rename the vkd3d_root_descriptor1 structure to vkd3d_shader_root_descriptor1.
by Henri Verbeet 17 Jul '20

17 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 83def2d..d55a18d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -540,7 +540,7 @@ struct vkd3d_shader_root_descriptor_table1 const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; }; -struct vkd3d_root_descriptor1 +struct vkd3d_shader_root_descriptor1 { unsigned int shader_register; unsigned int register_space; @@ -554,7 +554,7 @@ struct vkd3d_root_parameter1 { struct vkd3d_shader_root_descriptor_table1 descriptor_table; struct vkd3d_shader_root_constants constants; - struct vkd3d_root_descriptor1 descriptor; + struct vkd3d_shader_root_descriptor1 descriptor; } u; enum vkd3d_shader_visibility shader_visibility; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5df551b..e424aa6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2396,7 +2396,7 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co return VKD3D_OK; } -static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) +static void shader_validate_root_descriptor1(const struct vkd3d_shader_root_descriptor1 *descriptor) { unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE @@ -2408,7 +2408,7 @@ static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 } static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) + unsigned int offset, struct vkd3d_shader_root_descriptor1 *descriptor) { const char *ptr; @@ -2901,7 +2901,7 @@ static int shader_write_root_descriptor(struct root_signature_writer_context *co } static int shader_write_root_descriptor1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor1 *descriptor) + const struct vkd3d_shader_root_descriptor1 *descriptor) { if (!write_dword(context, descriptor->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY; -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Rename the vkd3d_root_descriptor_table1 structure to vkd3d_shader_root_descriptor_table1.
by Henri Verbeet 17 Jul '20

17 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cbc4562..83def2d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -534,7 +534,7 @@ struct vkd3d_shader_descriptor_range1 unsigned int descriptor_table_offset; }; -struct vkd3d_root_descriptor_table1 +struct vkd3d_shader_root_descriptor_table1 { unsigned int descriptor_range_count; const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; @@ -552,7 +552,7 @@ struct vkd3d_root_parameter1 enum vkd3d_shader_root_parameter_type parameter_type; union { - struct vkd3d_root_descriptor_table1 descriptor_table; + struct vkd3d_shader_root_descriptor_table1 descriptor_table; struct vkd3d_shader_root_constants constants; struct vkd3d_root_descriptor1 descriptor; } u; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4f19b85..5df551b 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2327,7 +2327,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c } static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor_table1 *table) + unsigned int offset, struct vkd3d_shader_root_descriptor_table1 *table) { struct vkd3d_shader_descriptor_range1 *ranges; unsigned int count; @@ -2830,7 +2830,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * } static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table1 *table) + const struct vkd3d_shader_root_descriptor_table1 *table) { const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; unsigned int i; @@ -2866,7 +2866,7 @@ static int shader_write_descriptor_table(struct root_signature_writer_context *c } static int shader_write_descriptor_table1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table1 *table) + const struct vkd3d_shader_root_descriptor_table1 *table) { if (!write_dword(context, table->descriptor_range_count)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -3072,7 +3072,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri return VKD3D_OK; } -static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_table1 *descriptor_table) +static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descriptor_table1 *descriptor_table) { bool have_srv_uav_cbv = false; bool have_sampler = false; -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_static_border_color enumeration to vkd3d_shader_static_border_colour.
by Henri Verbeet 17 Jul '20

17 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 12 ++++++------ libs/vkd3d-shader/dxbc.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d6f4aea..cbc4562 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -392,13 +392,13 @@ enum vkd3d_shader_comparison_func VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPARISON_FUNC), }; -enum vkd3d_static_border_color +enum vkd3d_shader_static_border_colour { - VKD3D_STATIC_BORDER_COLOR_TRANSPARENT_BLACK = 0, - VKD3D_STATIC_BORDER_COLOR_OPAQUE_BLACK = 1, - VKD3D_STATIC_BORDER_COLOR_OPAQUE_WHITE = 2, + VKD3D_SHADER_STATIC_BORDER_COLOUR_TRANSPARENT_BLACK = 0x0, + VKD3D_SHADER_STATIC_BORDER_COLOUR_OPAQUE_BLACK = 0x1, + VKD3D_SHADER_STATIC_BORDER_COLOUR_OPAQUE_WHITE = 0x2, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_STATIC_BORDER_COLOR), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STATIC_BORDER_COLOUR), }; struct vkd3d_static_sampler_desc @@ -410,7 +410,7 @@ struct vkd3d_static_sampler_desc float mip_lod_bias; unsigned int max_anisotropy; enum vkd3d_shader_comparison_func comparison_func; - enum vkd3d_static_border_color border_color; + enum vkd3d_shader_static_border_colour border_colour; float min_lod; float max_lod; unsigned int shader_register; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1fb8dc8..4f19b85 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2549,7 +2549,7 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co read_float(&ptr, &sampler_descs[i].mip_lod_bias); read_dword(&ptr, &sampler_descs[i].max_anisotropy); read_dword(&ptr, &sampler_descs[i].comparison_func); - read_dword(&ptr, &sampler_descs[i].border_color); + read_dword(&ptr, &sampler_descs[i].border_colour); read_float(&ptr, &sampler_descs[i].min_lod); read_float(&ptr, &sampler_descs[i].max_lod); read_dword(&ptr, &sampler_descs[i].shader_register); @@ -2989,7 +2989,7 @@ static int shader_write_static_samplers(struct root_signature_writer_context *co return VKD3D_ERROR_OUT_OF_MEMORY; if (!write_dword(context, samplers[i].comparison_func)) return VKD3D_ERROR_OUT_OF_MEMORY; - if (!write_dword(context, samplers[i].border_color)) + if (!write_dword(context, samplers[i].border_colour)) return VKD3D_ERROR_OUT_OF_MEMORY; if (!write_float(context, samplers[i].min_lod)) return VKD3D_ERROR_OUT_OF_MEMORY; -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Rename the vkd3d_comparison_func enumeration to vkd3d_shader_comparison_func.
by Henri Verbeet 17 Jul '20

17 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 20f9678..d6f4aea 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -378,18 +378,18 @@ enum vkd3d_shader_texture_address_mode VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TEXTURE_ADDRESS_MODE), }; -enum vkd3d_comparison_func +enum vkd3d_shader_comparison_func { - VKD3D_COMPARISON_FUNC_NEVER = 1, - VKD3D_COMPARISON_FUNC_LESS = 2, - VKD3D_COMPARISON_FUNC_EQUAL = 3, - VKD3D_COMPARISON_FUNC_LESS_EQUAL = 4, - VKD3D_COMPARISON_FUNC_GREATER = 5, - VKD3D_COMPARISON_FUNC_NOT_EQUAL = 6, - VKD3D_COMPARISON_FUNC_GREATER_EQUAL = 7, - VKD3D_COMPARISON_FUNC_ALWAYS = 8, + VKD3D_SHADER_COMPARISON_FUNC_NEVER = 0x1, + VKD3D_SHADER_COMPARISON_FUNC_LESS = 0x2, + VKD3D_SHADER_COMPARISON_FUNC_EQUAL = 0x3, + VKD3D_SHADER_COMPARISON_FUNC_LESS_EQUAL = 0x4, + VKD3D_SHADER_COMPARISON_FUNC_GREATER = 0x5, + VKD3D_SHADER_COMPARISON_FUNC_NOT_EQUAL = 0x6, + VKD3D_SHADER_COMPARISON_FUNC_GREATER_EQUAL = 0x7, + VKD3D_SHADER_COMPARISON_FUNC_ALWAYS = 0x8, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_COMPARISON_FUNC), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPARISON_FUNC), }; enum vkd3d_static_border_color @@ -409,7 +409,7 @@ struct vkd3d_static_sampler_desc enum vkd3d_shader_texture_address_mode address_w; float mip_lod_bias; unsigned int max_anisotropy; - enum vkd3d_comparison_func comparison_func; + enum vkd3d_shader_comparison_func comparison_func; enum vkd3d_static_border_color border_color; float min_lod; float max_lod; -- 2.11.0

1 0

[PATCH] winebuild: Find main/wmain in static libraries.
by Puetz Kevin A 17 Jul '20

17 Jul '20

Have the winebuild -spec.o include an undefined .globl referencing any symbol we know the winecrt0 entry point will eventually reference, so ld knows about what it needs before scanning library archives. --- wine.exe.so files set __wine_spec_exe_entry as the entry point, rather than main. Therefore the linker is not initially looking for main, and will pass over any objects in lib.a archives that might provide it. When libwinecrt0.a is reached, it finds __wine_spec_exe_entry and learns that this wants main, but this rescan will prefer the winecrt0 definition (in terms of WinMain) to rescanning earlier libraries. Only a direct .o file (which is never passed over) can override this, so libraries like -lgtest_main do not work as intended. diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e1d2e5edf8..66b15167a3 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -136,6 +136,7 @@ typedef struct int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ + int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* dll entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */ @@ -297,6 +298,7 @@ extern void output_gnu_stack_note(void); extern void add_import_dll( const char *name, const char *filename ); extern void add_delayed_import( const char *name ); extern void add_extra_ld_symbol( const char *name ); +extern void add_spec_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); extern void resolve_imports( DLLSPEC *spec ); extern int is_undefined( const char *name ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0e5e1627dd..68137b0f4c 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -396,8 +396,25 @@ static const char *get_default_entry_point( const DLLSPEC *spec ) { if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; - if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; - return "__wine_spec_exe_entry"; + if (spec->type == SPEC_WIN16) { + add_spec_extra_ld_symbol("WinMain16"); + return "__wine_spec_exe16_entry"; + } + if (spec->unicode_app) { + /* __wine_spec_exe_wentry always calls wmain */ + add_spec_extra_ld_symbol("wmain"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("wWinMain"); + } + return "__wine_spec_exe_wentry"; + } else { + /* __wine_spec_exe_entry always calls main */ + add_spec_extra_ld_symbol("main"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("WinMain"); + } + return "__wine_spec_exe_entry"; + } } /* parse options from the argv array and remove all the recognized ones */ @@ -448,6 +465,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unix" )) unix_lib = 1; + else if (!strcmp( optarg, "unicode" )) spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index c85249b2a9..7fccb0c4f6 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -50,6 +50,13 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static struct strarray spec_extra_ld_symbols = { 0 }; /* list of extra symbols that ld should resolve */ + +/* add a symbol to the list of extra symbols that ld must resolve */ +void add_spec_extra_ld_symbol( const char *name ) +{ + strarray_add( &spec_extra_ld_symbols, name, NULL ); +} /* check if entry point needs a relay thunk */ static inline int needs_relay( const ORDDEF *odp ) @@ -602,6 +609,7 @@ void output_exports( DLLSPEC *spec ) void output_module( DLLSPEC *spec ) { int machine = 0; + int i; unsigned int page_size = get_page_size(); const char *data_dirs[16] = { NULL }; @@ -680,6 +688,10 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* SizeOfCode */ output( "\t.long 0\n" ); /* SizeOfInitializedData */ output( "\t.long 0\n" ); /* SizeOfUninitializedData */ + + for (i = 0; i < spec_extra_ld_symbols.count; i++) + output( "\t.globl %s\n", asm_name(spec_extra_ld_symbols.str[i]) ); + /* note: we expand the AddressOfEntryPoint field on 64-bit by overwriting the BaseOfCode field */ output( "\t%s %s\n", /* AddressOfEntryPoint */ get_asm_ptr_keyword(), spec->init_func ? asm_name(spec->init_func) : "0" ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 29c1b0549d..3c2b029b40 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1228,8 +1228,6 @@ static void build(struct options* opts) entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry@8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; - else if (!is_pe && !opts->shared && opts->unicode_app) - entry_point = "__wine_spec_exe_wentry"; } else entry_point = opts->entry_point; @@ -1241,6 +1239,8 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); + if(opts->unicode_app) + strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe");

3 2

[PATCH] rpcrt4: Add NdrCreateServerInterfaceFromStub() stub.
by Serge Gautherie 17 Jul '20

17 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- See https://testbot.winehq.org/JobDetails.pl?Key=70704. I confirm it is already on XP x86. Follow-up to 98eaef3ad945eae570f92184725115613f6a3951. Sorry. --- dlls/rpcrt4/rpcrt4.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 135beab..64b46d5 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -123,6 +123,7 @@ @ stdcall NdrByteCountPointerFree(ptr ptr ptr) @ stdcall NdrByteCountPointerMarshall(ptr ptr ptr) @ stdcall NdrByteCountPointerUnmarshall(ptr ptr ptr long) +@ stub NdrCreateServerInterfaceFromStub @ stdcall NdrCStdStubBuffer2_Release(ptr ptr) @ stdcall NdrCStdStubBuffer_Release(ptr ptr) @ stdcall NdrClearOutParameters(ptr ptr ptr) -- 2.10.0.windows.1

1 0

[PATCH] gdiplus/tests: Improve metafile DrawDriverString test.
by Shawn M. Chapla 17 Jul '20

17 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- This patch isn't strictly necessary, but it may clear up some potential for confusion in cases where test metafiles are being saved/loaded in a prefix where Times New Roman is not installed. dlls/gdiplus/tests/metafile.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 371a3c21b4..d2912f40ea 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2977,6 +2977,8 @@ static void test_drawdriverstring(void) GpStatus stat; GpGraphics *graphics; GpFont *solidfont, *hatchfont; + GpFontFamily *family; + WCHAR familyname[LF_FACESIZE]; GpBrush *solidbrush, *hatchbrush; HDC hdc; GpMatrix *matrix; @@ -2990,12 +2992,17 @@ static void test_drawdriverstring(void) logfont.lfCharSet = DEFAULT_CHARSET; stat = GdipCreateFontFromLogfontA(hdc, &logfont, &solidfont); - if (stat == NotTrueTypeFont || stat == FileNotFound) - { - DeleteDC(hdc); - skip("Times New Roman not installed.\n"); - return; - } + expect(Ok, stat); + + stat = GdipGetFamily(solidfont, &family); + expect(Ok, stat); + + familyname[0] = 0; + stat = GdipGetFamilyName(family, familyname, LANG_NEUTRAL); + expect(Ok, stat); + + if (lstrcmpiW(familyname, L"Times New Roman")) + trace("Times New Roman is not installed. save/load may not yield expected results.\n"); stat = GdipCloneFont(solidfont, &hatchfont); expect(Ok, stat); @@ -3031,7 +3038,7 @@ static void test_drawdriverstring(void) DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, matrix); expect(Ok, stat); - stat = GdipDeleteGraphics(graphics); + GdipDeleteGraphics(graphics); graphics = NULL; check_metafile(metafile, drawdriverstring_records, "drawdriverstring metafile", dst_points, -- 2.27.0

4 3

[PATCH 5/5] winevulkan: Implement VK_EXT_full_screen_exclusive
by Joshua Ashton 17 Jul '20

17 Jul '20

4 4

[PATCH v2] winebuild: Find main/wmain in static libraries.
by Puetz Kevin A 17 Jul '20

17 Jul '20

Have the winebuild -spec.o include an undefined .globl referencing any symbol we know the winecrt0 entry point will eventually reference, so ld knows about what it needs before scanning library archives. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- wine.exe.so files set __wine_spec_exe_entry as the entry point, rather than main. Therefore the linker is not initially looking for main, and will pass over any objects in lib.a archives that might provide it. When libwinecrt0.a is reached, it finds __wine_spec_exe_entry and learns that this wants main, but this rescan will prefer the winecrt0 definition (in terms of WinMain) to rescanning earlier libraries. Only a direct .o file (which is never passed over) can override this, so libraries like -lgtest_main do not work as intended. tools/winebuild/build.h | 2 ++ tools/winebuild/main.c | 22 ++++++++++++++++++++-- tools/winebuild/spec32.c | 12 ++++++++++++ tools/winegcc/winegcc.c | 4 ++-- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e1d2e5edf8..66b15167a3 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -136,6 +136,7 @@ typedef struct int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ + int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* dll entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */ @@ -297,6 +298,7 @@ extern void output_gnu_stack_note(void); extern void add_import_dll( const char *name, const char *filename ); extern void add_delayed_import( const char *name ); extern void add_extra_ld_symbol( const char *name ); +extern void add_spec_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); extern void resolve_imports( DLLSPEC *spec ); extern int is_undefined( const char *name ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0e5e1627dd..68137b0f4c 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -396,8 +396,25 @@ static const char *get_default_entry_point( const DLLSPEC *spec ) { if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; - if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; - return "__wine_spec_exe_entry"; + if (spec->type == SPEC_WIN16) { + add_spec_extra_ld_symbol("WinMain16"); + return "__wine_spec_exe16_entry"; + } + if (spec->unicode_app) { + /* __wine_spec_exe_wentry always calls wmain */ + add_spec_extra_ld_symbol("wmain"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("wWinMain"); + } + return "__wine_spec_exe_wentry"; + } else { + /* __wine_spec_exe_entry always calls main */ + add_spec_extra_ld_symbol("main"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("WinMain"); + } + return "__wine_spec_exe_entry"; + } } /* parse options from the argv array and remove all the recognized ones */ @@ -448,6 +465,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unix" )) unix_lib = 1; + else if (!strcmp( optarg, "unicode" )) spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index c85249b2a9..7fccb0c4f6 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -50,6 +50,13 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static struct strarray spec_extra_ld_symbols = { 0 }; /* list of extra symbols that ld should resolve */ + +/* add a symbol to the list of extra symbols that ld must resolve */ +void add_spec_extra_ld_symbol( const char *name ) +{ + strarray_add( &spec_extra_ld_symbols, name, NULL ); +} /* check if entry point needs a relay thunk */ static inline int needs_relay( const ORDDEF *odp ) @@ -602,6 +609,7 @@ void output_exports( DLLSPEC *spec ) void output_module( DLLSPEC *spec ) { int machine = 0; + int i; unsigned int page_size = get_page_size(); const char *data_dirs[16] = { NULL }; @@ -680,6 +688,10 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* SizeOfCode */ output( "\t.long 0\n" ); /* SizeOfInitializedData */ output( "\t.long 0\n" ); /* SizeOfUninitializedData */ + + for (i = 0; i < spec_extra_ld_symbols.count; i++) + output( "\t.globl %s\n", asm_name(spec_extra_ld_symbols.str[i]) ); + /* note: we expand the AddressOfEntryPoint field on 64-bit by overwriting the BaseOfCode field */ output( "\t%s %s\n", /* AddressOfEntryPoint */ get_asm_ptr_keyword(), spec->init_func ? asm_name(spec->init_func) : "0" ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 29c1b0549d..3c2b029b40 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1228,8 +1228,6 @@ static void build(struct options* opts) entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry@8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; - else if (!is_pe && !opts->shared && opts->unicode_app) - entry_point = "__wine_spec_exe_wentry"; } else entry_point = opts->entry_point; @@ -1241,6 +1239,8 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); + if(opts->unicode_app) + strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe");

1 0

[PATCH 2/5] include: define _tcs* macros only when libc support exists.
by Puetz Kevin A 17 Jul '20

17 Jul '20

When winegcc is using an underlying POSIX libc (rather than -mno-cygwin) it will only have `char` and `wchar_t` functions. If _TCHAR is neither of these there may be no suitable function to alias _tcs* to. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- include/tchar.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/tchar.h b/include/tchar.h index 56f876bf84..33db74c7ee 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -37,9 +37,15 @@ extern "C" { #define _strninc(str,n) (((char*)(str))+(n)) #define _strspnp(s1,s2) (*((s1)+=strspn((s1),(s2))) ? (s1) : NULL) +#if defined(__MSVCRT__) || defined(_MSC_VER) || (defined(WINE_UNICODE_NATIVE) && defined(_UNICODE)) || !(defined(_UNICODE) || defined(_MBCS)) /***************************************************************************** * tchar mappings + * + * These can only be defined when libc in use will have functions accepting _TCHAR, i.e. + * -mno-cygwin / __MSVCRT__ or __MSC_VER + * -fshort-wchar / WINE_UNICODE_NATIVE and _UNICODE (_TCHAR == WCHAR == wchar_t, so the libc wcs* functions are UTF-16) + * _TCHAR == `char` without _MBCS */ #ifndef _UNICODE # ifndef _MBCS @@ -223,6 +229,8 @@ extern "C" { #define _vtprintf WINE_tchar_routine(vprintf, vprintf, vwprintf) #define _TEOF WINE_tchar_routine(EOF, EOF, WEOF) +#endif /* tchar mappings */ + #define __T(x) __TEXT(x) #define _T(x) __T(x) #define _TEXT(x) __T(x) -- 2.27.0.windows.1

2 1

[PATCH v3 4/4] gdiplus: Add DrawDriverString serialization.
by Shawn M. Chapla 17 Jul '20

17 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- v3: - Remove unnecessary else in draw_driver_string. dlls/gdiplus/gdiplus_private.h | 3 + dlls/gdiplus/graphics.c | 4 + dlls/gdiplus/metafile.c | 182 +++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 14 +-- 4 files changed, 185 insertions(+), 18 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2ceaeade01..1b2de4e8f4 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -104,6 +104,9 @@ extern GpStatus METAFILE_DrawImagePointsRect(GpMetafile* metafile, GpImage *imag extern GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_DrawDriverString(GpMetafile *metafile, GDIPCONST UINT16 *text, INT length, + GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush, + GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix) DECLSPEC_HIDDEN; extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6c50d2d56c..5194719fd6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7427,6 +7427,10 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, if (length == -1) length = lstrlenW(text); + if (graphics->image && graphics->image->type == ImageTypeMetafile) + return METAFILE_DrawDriverString((GpMetafile*)graphics->image, text, length, font, + format, brush, positions, flags, matrix); + if (graphics->hdc && !graphics->alpha_hdc && brush->bt == BrushTypeSolidColor && (((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d25278d115..cedffb23ca 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -378,6 +378,17 @@ typedef struct EmfPlusImageAttributes DWORD Reserved2; } EmfPlusImageAttributes; +typedef struct EmfPlusFont +{ + DWORD Version; + float EmSize; + DWORD SizeUnit; + DWORD FontStyleFlags; + DWORD Reserved; + DWORD Length; + WCHAR FamilyName[1]; +} EmfPlusFont; + typedef struct EmfPlusObject { EmfPlusRecordHeader Header; @@ -389,6 +400,7 @@ typedef struct EmfPlusObject EmfPlusRegion region; EmfPlusImage image; EmfPlusImageAttributes image_attributes; + EmfPlusFont font; } ObjectData; } EmfPlusObject; @@ -537,17 +549,6 @@ typedef struct EmfPlusFillPie } RectData; } EmfPlusFillPie; -typedef struct EmfPlusFont -{ - DWORD Version; - float EmSize; - DWORD SizeUnit; - DWORD FontStyleFlags; - DWORD Reserved; - DWORD Length; - WCHAR FamilyName[1]; -} EmfPlusFont; - typedef struct EmfPlusDrawDriverString { EmfPlusRecordHeader Header; @@ -4643,3 +4644,162 @@ GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) METAFILE_WriteRecords(metafile); return Ok; } + +static GpStatus METAFILE_AddFontObject(GpMetafile *metafile, GDIPCONST GpFont *font, DWORD *id) +{ + EmfPlusObject *object_record; + EmfPlusFont *font_record; + GpStatus stat; + INT fn_len; + INT style; + + *id = -1; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && + metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + /* The following cast is ugly, but GdipGetFontStyle does treat + its first parameter as const. */ + stat = GdipGetFontStyle((GpFont*)font, &style); + if (stat != Ok) + return stat; + + fn_len = lstrlenW(font->family->FamilyName); + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.font.FamilyName[(fn_len + 1) & ~1]), + (void**)&object_record); + if (stat != Ok) + return stat; + + *id = METAFILE_AddObjectId(metafile); + + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypeFont << 8; + + font_record = &object_record->ObjectData.font; + font_record->Version = VERSION_MAGIC2; + font_record->EmSize = font->emSize; + font_record->SizeUnit = font->unit; + font_record->FontStyleFlags = style; + font_record->Reserved = 0; + font_record->Length = fn_len; + + memcpy(font_record->FamilyName, font->family->FamilyName, + fn_len * sizeof(*font->family->FamilyName)); + + return Ok; +} + +GpStatus METAFILE_DrawDriverString(GpMetafile *metafile, GDIPCONST UINT16 *text, INT length, + GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush, + GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix) +{ + DWORD brush_id; + DWORD font_id; + DWORD alloc_size; + GpStatus stat; + EmfPlusDrawDriverString *draw_string_record; + BYTE *cursor; + BOOL inline_color; + BOOL include_matrix = FALSE; + + if (length <= 0) + return InvalidParameter; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && + metafile->metafile_type != MetafileTypeEmfPlusDual) + { + FIXME("metafile type not supported: %i\n", metafile->metafile_type); + return NotImplemented; + } + + stat = METAFILE_AddFontObject(metafile, font, &font_id); + if (stat != Ok) + return stat; + + inline_color = (brush->bt == BrushTypeSolidColor); + if (!inline_color) + { + stat = METAFILE_AddBrushObject(metafile, brush, &brush_id); + if (stat != Ok) + return stat; + } + + if (matrix) + { + BOOL identity; + + stat = GdipIsMatrixIdentity(matrix, &identity); + if (stat != Ok) + return stat; + + include_matrix = !identity; + } + + alloc_size = FIELD_OFFSET(EmfPlusDrawDriverString, VariableData) + + length * (sizeof(*text) + sizeof(*positions)); + + if (include_matrix) + alloc_size += sizeof(*matrix); + + /* Pad record to DWORD alignment. */ + alloc_size = (alloc_size + 3) & ~3; + + stat = METAFILE_AllocateRecord(metafile, alloc_size, (void**)&draw_string_record); + if (stat != Ok) + return stat; + + draw_string_record->Header.Type = EmfPlusRecordTypeDrawDriverString; + draw_string_record->Header.Flags = font_id; + draw_string_record->DriverStringOptionsFlags = flags; + draw_string_record->MatrixPresent = include_matrix; + draw_string_record->GlyphCount = length; + + if (inline_color) + { + draw_string_record->Header.Flags |= 0x8000; + draw_string_record->brush.Color = ((GpSolidFill*)brush)->color; + } + else + draw_string_record->brush.BrushId = brush_id; + + cursor = &draw_string_record->VariableData[0]; + + memcpy(cursor, text, length * sizeof(*text)); + cursor += length * sizeof(*text); + + if (flags & DriverStringOptionsRealizedAdvance) + { + static BOOL fixme_written = FALSE; + + /* Native never writes DriverStringOptionsRealizedAdvance. Instead, + in the case of RealizedAdvance, each glyph position is computed + and serialized. + + While native GDI+ is capable of playing back metafiles with this + flag set, it is possible that some application might rely on + metafiles produced from GDI+ not setting this flag. Ideally we + would also compute the position of each glyph here, serialize those + values, and not set DriverStringOptionsRealizedAdvance. */ + if (!fixme_written) + { + fixme_written = TRUE; + FIXME("serializing RealizedAdvance flag and single GlyphPos with padding\n"); + } + + *((PointF*)cursor) = *positions; + } + else + memcpy(cursor, positions, length * sizeof(*positions)); + + if (include_matrix) + { + cursor += length * sizeof(*positions); + memcpy(cursor, matrix, sizeof(*matrix)); + } + + METAFILE_WriteRecords(metafile); + + return Ok; +} diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 986989bb1c..371a3c21b4 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2956,11 +2956,11 @@ static void test_restoredc(void) static const emfplus_record drawdriverstring_records[] = { { EMR_HEADER }, { EmfPlusRecordTypeHeader }, - { EmfPlusRecordTypeObject, ObjectTypeFont << 8, 1, 0 }, - { EmfPlusRecordTypeDrawDriverString, 0x8000, 1, 0 }, - { EmfPlusRecordTypeObject, (ObjectTypeFont << 8) | 1, 1 }, - { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 2, 1, 1 }, - { EmfPlusRecordTypeDrawDriverString, 0x1, 1, 1 }, + { EmfPlusRecordTypeObject, ObjectTypeFont << 8 }, + { EmfPlusRecordTypeDrawDriverString, 0x8000 }, + { EmfPlusRecordTypeObject, (ObjectTypeFont << 8) | 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 2 }, + { EmfPlusRecordTypeDrawDriverString, 0x1 }, { EmfPlusRecordTypeEndOfFile }, { EMR_EOF }, { 0 } @@ -3022,14 +3022,14 @@ static void test_drawdriverstring(void) stat = GdipDrawDriverString(graphics, L"Test", 4, solidfont, solidbrush, solidpos, DriverStringOptionsCmapLookup, matrix); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetMatrixElements(matrix, 1.5, 0.0, 0.0, 1.5, 0.0, 0.0); expect(Ok, stat); stat = GdipDrawDriverString(graphics, L"Test ", 5, hatchfont, hatchbrush, &hatchpos, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, matrix); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipDeleteGraphics(graphics); graphics = NULL; -- 2.27.0

2 1

[PATCH v2 1/4] gdiplus/tests: Add metafile DrawDriverString test.
by Shawn M. Chapla 17 Jul '20

17 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- v2: - Remove fragile output pixel testing. dlls/gdiplus/tests/metafile.c | 105 ++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f3b817b3de..986989bb1c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2953,6 +2953,110 @@ static void test_restoredc(void) expect(Ok, stat); } +static const emfplus_record drawdriverstring_records[] = { + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypeFont << 8, 1, 0 }, + { EmfPlusRecordTypeDrawDriverString, 0x8000, 1, 0 }, + { EmfPlusRecordTypeObject, (ObjectTypeFont << 8) | 1, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 2, 1, 1 }, + { EmfPlusRecordTypeDrawDriverString, 0x1, 1, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_drawdriverstring(void) +{ + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const PointF solidpos[4] = {{10.0,10.0}, {20.0,10.0}, {30.0,10.0}, {40.0,10.0}}; + static const PointF hatchpos = {10.0,30.0}; + + GpBitmap *bitmap; + GpStatus stat; + GpGraphics *graphics; + GpFont *solidfont, *hatchfont; + GpBrush *solidbrush, *hatchbrush; + HDC hdc; + GpMatrix *matrix; + GpMetafile *metafile; + LOGFONTA logfont = { 0 }; + + hdc = CreateCompatibleDC(0); + + strcpy(logfont.lfFaceName, "Times New Roman"); + logfont.lfHeight = 12; + logfont.lfCharSet = DEFAULT_CHARSET; + + stat = GdipCreateFontFromLogfontA(hdc, &logfont, &solidfont); + if (stat == NotTrueTypeFont || stat == FileNotFound) + { + DeleteDC(hdc); + skip("Times New Roman not installed.\n"); + return; + } + + stat = GdipCloneFont(solidfont, &hatchfont); + expect(Ok, stat); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, + L"winetest", &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + hdc = NULL; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&solidbrush); + expect(Ok, stat); + + stat = GdipCreateHatchBrush(HatchStyleHorizontal, (ARGB)0xff00ff00, (ARGB)0xffff0000, + (GpHatch**)&hatchbrush); + expect(Ok, stat); + + stat = GdipCreateMatrix(&matrix); + expect(Ok, stat); + + stat = GdipDrawDriverString(graphics, L"Test", 4, solidfont, solidbrush, solidpos, + DriverStringOptionsCmapLookup, matrix); + todo_wine expect(Ok, stat); + + stat = GdipSetMatrixElements(matrix, 1.5, 0.0, 0.0, 1.5, 0.0, 0.0); + expect(Ok, stat); + + stat = GdipDrawDriverString(graphics, L"Test ", 5, hatchfont, hatchbrush, &hatchpos, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, matrix); + todo_wine expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + graphics = NULL; + + check_metafile(metafile, drawdriverstring_records, "drawdriverstring metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "drawdriverstring.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, drawdriverstring_records, "drawdriverstring playback", + dst_points, &frame, UnitPixel); + + GdipDeleteMatrix(matrix); + GdipDeleteGraphics(graphics); + GdipDeleteBrush(solidbrush); + GdipDeleteBrush(hatchbrush); + GdipDeleteFont(solidfont); + GdipDeleteFont(hatchfont); + GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage((GpImage*)metafile); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3002,6 +3106,7 @@ START_TEST(metafile) test_drawpath(); test_fillpath(); test_restoredc(); + test_drawdriverstring(); GdiplusShutdown(gdiplusToken); } -- 2.27.0

3 8

[PATCH v6 5/5] windowscodecs: Add support for decoding uncompressed DDS image.
by Ziqing Hui 17 Jul '20

17 Jul '20

For uncompressed DDS image, "a block" means a pixel. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 75 +++++++++++++++++----------- dlls/windowscodecs/tests/ddsformat.c | 10 ---- 2 files changed, 47 insertions(+), 38 deletions(-)

2 1

[PATCH 4/5] include: improve errors when TEXT()/OLESTR() aren't implementable.
by Puetz Kevin A 17 Jul '20

17 Jul '20

With WINE_UNICODE_NATIVE is set, literals can use L"". With WINE_UNICODE_CHAR16 is set, literals can use u"". Otherwise (TCHAR/_TCHAR/OLECHAR == WCHAR == unsigned short) there is no suitable string literal syntax. Rather than generating an expression of the wrong type (char16_t *), these macros now expand to invalid syntax, i.e. prefix"..." which will fail to compile. But prefix should appear in the error message, and a descriptive identifier that one can easily search for in the headers to see which definitions are available that would work. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- include/tchar.h | 2 ++ include/winnt.rh | 5 ++++- include/wtypes.idl | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index 519a9f1002..6c9035c219 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -253,6 +253,8 @@ typedef char16_t _TCHAR; #define __T(x) u##x #else typedef unsigned short _TCHAR; +/* no compiler support for TEXT() in _UNICODE mode, consider -fshort-wchar or -DWINE_UNICODE_CHAR16 */ +# define __T(string) _TEXT_no_compiler_utf16_literal##string #endif typedef _TCHAR _TUCHAR; typedef _TCHAR _TSCHAR; diff --git a/include/winnt.rh b/include/winnt.rh index 786a38f326..bcc780b2ab 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -28,8 +28,11 @@ # define __TEXT(string) string # elif defined(WINE_UNICODE_NATIVE) # define __TEXT(string) L##string -# else +# elif defined(WINE_UNICODE_CHAR16) # define __TEXT(string) u##string +# else + /* no compiler support for TEXT() in UNICODE mode, consider -fshort-wchar or -DWINE_UNICODE_CHAR16 */ +# define __TEXT(string) TEXT_no_compiler_utf16_literal##string # endif # define TEXT(string) __TEXT(string) #endif diff --git a/include/wtypes.idl b/include/wtypes.idl index a6682212b5..9d9b73d62d 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -289,8 +289,10 @@ typedef [string] const OLECHAR *LPCOLESTR; cpp_quote("#ifndef __WINESRC__") cpp_quote("# ifdef WINE_UNICODE_NATIVE") cpp_quote("# define OLESTR(str) L##str") -cpp_quote("# else") +cpp_quote("# elif defined(WINE_UNICODE_CHAR16)") cpp_quote("# define OLESTR(str) u##str") +cpp_quote("# else") +cpp_quote("# define OLESTR(str) OLESTR_no_compiler_utf16_literal##str") cpp_quote("# endif") cpp_quote("#endif")

2 1

[PATCH v6 4/5] windowscodecs/tests: Add tests for decoding uncompressed DDS image.
by Ziqing Hui 17 Jul '20

17 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 98 +++++++++++++++------------- 1 file changed, 54 insertions(+), 44 deletions(-)

2 1

[PATCH v6 3/5] windowscodecs: Return fail for unsupported format in DdsDecoder_Initialize().
by Ziqing Hui 17 Jul '20

17 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 18 +++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 3 --- 2 files changed, 17 insertions(+), 4 deletions(-)

2 1

[PATCH v6 2/5] windowscodecs: In find_decoder(), get rid of nested if by using goto, and use IWICWineDecoder_Initialize() to initialize decoders.
by Ziqing Hui 17 Jul '20

17 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v6: * Move declaration for decoderinfo and wine_decoder inside the loop. * Remove label "end". * Remove the NULL checking for the release of enumdecoders and unkdecoderinfo because we know that they must have been successfully created. unkdecoderinfo is not able to be moved inside because it is used in the loop condition. dlls/windowscodecs/imgfactory.c | 100 ++++++++++++++++---------------- 1 file changed, 49 insertions(+), 51 deletions(-)

2 1

[PATCH v6 1/5] windowscodecs: Implement DdsDecoder_Wine_Initialize().
by Ziqing Hui 17 Jul '20

17 Jul '20

Code in DdsDecoder_Initialize() are moved to DdsDecoder_Wine_Initialize(). And DdsDecoder_Initialize() are implemented on top of DdsDecoder_Wine_Initialize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 126 +++++++++++++++++---------------- 1 file changed, 66 insertions(+), 60 deletions(-)

2 1

[PATCH 3/5] include: _TEXT(...) should obey _UNICODE to match _TCHAR
by Puetz Kevin A 17 Jul '20

17 Jul '20

This is, at least pedantically, independent of the similar macro UNICODE which controls <windef.h>, e.g. TEXT(), TCHAR, WINELIB_NAME_AW. So _T(...) and _TEXT(...) can't reuse the implementation of TEXT(...). Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- include/tchar.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index 33db74c7ee..519a9f1002 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -231,10 +231,6 @@ extern "C" { #endif /* tchar mappings */ -#define __T(x) __TEXT(x) -#define _T(x) __T(x) -#define _TEXT(x) __T(x) - #ifdef _UNICODE #if !defined(_WINT_T_DEFINED) && !defined(__WINT_TYPE__) typedef unsigned short wint_t; @@ -248,11 +244,13 @@ typedef unsigned short wctype_t; #ifndef __TCHAR_DEFINED #if defined(WINE_UNICODE_NATIVE) typedef wchar_t _TCHAR; +#define __T(x) L##x #elif defined(WINE_UNICODE_CHAR16) # if !defined(__cplusplus) && !defined(RC_INVOKED) # include <uchar.h> /* Bring in char16_t and char32_t for C */ # endif typedef char16_t _TCHAR; +#define __T(x) u##x #else typedef unsigned short _TCHAR; #endif @@ -264,6 +262,7 @@ typedef _TCHAR _TINT; #endif #else /* _UNICODE */ +#define __T(x) x #ifndef __TCHAR_DEFINED typedef char _TCHAR; typedef unsigned char _TUCHAR; @@ -278,6 +277,9 @@ typedef unsigned int _TINT; #endif #endif +#define _T(x) __T(x) +#define _TEXT(x) __T(x) + #ifndef _TCHAR_DEFINED typedef _TCHAR TCHAR, *PTCHAR; #define _TCHAR_DEFINED -- 2.27.0.windows.1

1 0

[PATCH 1/4] ntdll/tests: Remove some workarounds for no longer supported versions of Windows.
by Zebediah Figura 17 Jul '20

17 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/om.c | 387 ++++++++++++++++-------------------------- 1 file changed, 149 insertions(+), 238 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c17b6ffa8db..5d7e4007853 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -25,7 +25,6 @@ #include "winnt.h" #include "stdlib.h" -static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*, BOOL, LPCSTR); static BOOLEAN (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); @@ -98,8 +97,7 @@ static void test_case_sensitive (void) ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status); status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); - ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH, - "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION or STATUS_OBJECT_TYPE_MISMATCH got (%08x)\n", status); + ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); pRtlInitUnicodeString(&str, buffer2); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); @@ -117,8 +115,7 @@ static void test_case_sensitive (void) pRtlInitUnicodeString(&str, buffer4); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); - ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH, - "NtCreateMutant should have failed with STATUS_OBJECT_NAME_COLLISION or STATUS_OBJECT_TYPE_MISMATCH got (%08x)\n", status); + ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); status = pNtCreateEvent(&h, GENERIC_ALL, &attr, FALSE, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION, @@ -247,19 +244,10 @@ static HANDLE get_base_dir(void) sprintf( name, "\\BaseNamedObjects\\Session\\%u", NtCurrentTeb()->Peb->SessionId ); pRtlCreateUnicodeStringFromAsciiz(&str, name ); status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); + ok(!status, "got %#x\n", status); + ok(is_correct_dir( dir, objname ), "wrong dir\n"); pRtlFreeUnicodeString(&str); - if (!status && is_correct_dir( dir, objname )) goto done; - if (!status) pNtClose( dir ); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); - status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); - pRtlFreeUnicodeString(&str); - if (!status && is_correct_dir( dir, objname )) goto done; - if (!status) pNtClose( dir ); - - dir = 0; - -done: pNtClose( h ); return dir; } @@ -289,15 +277,10 @@ static void test_name_collisions(void) pRtlCreateUnicodeStringFromAsciiz(&str, "\\??\\PIPE\\om.c-mutant"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); - ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_OBJECT_PATH_NOT_FOUND, - "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08x)\n", status); + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status); pRtlFreeUnicodeString(&str); - if (!(dir = get_base_dir())) - { - win_skip( "couldn't find the BaseNamedObjects dir\n" ); - return; - } + dir = get_base_dir(); pRtlCreateUnicodeStringFromAsciiz(&str, "om.c-test"); InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, dir, NULL); h = CreateMutexA(NULL, FALSE, "om.c-test"); @@ -339,12 +322,12 @@ static void test_name_collisions(void) pNtClose(h1); pNtClose(h2); - h = pCreateWaitableTimerA(NULL, TRUE, "om.c-test"); + h = CreateWaitableTimerA(NULL, TRUE, "om.c-test"); ok(h != 0, "CreateWaitableTimerA failed got ret=%p (%d)\n", h, GetLastError()); status = pNtCreateTimer(&h1, GENERIC_ALL, &attr, NotificationTimer); ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, "NtCreateTimer should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status); - h2 = pCreateWaitableTimerA(NULL, TRUE, "om.c-test"); + h2 = CreateWaitableTimerA(NULL, TRUE, "om.c-test"); winerr = GetLastError(); ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, "CreateWaitableTimerA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr); @@ -468,12 +451,7 @@ static void test_name_limits(void) size.QuadPart = 4096; pRtlCreateUnicodeStringFromAsciiz( &target, "\\DosDevices" ); - if (!(attr.RootDirectory = get_base_dir())) - { - win_skip( "couldn't find the BaseNamedObjects dir\n" ); - return; - } - + attr.RootDirectory = get_base_dir(); str.Length = 0; status = pNtCreateMutant( &ret, GENERIC_ALL, &attr2, FALSE ); ok( status == STATUS_SUCCESS, "%u: NtCreateMutant failed %x\n", str.Length, status ); @@ -481,7 +459,7 @@ static void test_name_limits(void) status = pNtOpenMutant( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenMutant failed %x\n", str.Length, status ); status = pNtOpenMutant( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenMutant failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateSemaphore( &ret, GENERIC_ALL, &attr2, 1, 2 ); @@ -490,7 +468,7 @@ static void test_name_limits(void) status = pNtOpenSemaphore( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSemaphore failed %x\n", str.Length, status ); status = pNtOpenSemaphore( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenSemaphore failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateEvent( &ret, GENERIC_ALL, &attr2, 1, 0 ); @@ -499,7 +477,7 @@ static void test_name_limits(void) status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenEvent failed %x\n", str.Length, status ); status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenEvent failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateKeyedEvent( &ret, GENERIC_ALL, &attr2, 0 ); @@ -508,7 +486,7 @@ static void test_name_limits(void) status = pNtOpenKeyedEvent( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenKeyedEvent failed %x\n", str.Length, status ); status = pNtOpenKeyedEvent( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenKeyedEvent failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateTimer( &ret, GENERIC_ALL, &attr2, NotificationTimer ); @@ -517,7 +495,7 @@ static void test_name_limits(void) status = pNtOpenTimer( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenTimer failed %x\n", str.Length, status ); status = pNtOpenTimer( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenTimer failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateIoCompletion( &ret, GENERIC_ALL, &attr2, 0 ); @@ -526,7 +504,7 @@ static void test_name_limits(void) status = pNtOpenIoCompletion( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenCompletion failed %x\n", str.Length, status ); status = pNtOpenIoCompletion( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenCompletion failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateJobObject( &ret, GENERIC_ALL, &attr2 ); @@ -535,7 +513,7 @@ static void test_name_limits(void) status = pNtOpenJobObject( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenJobObject failed %x\n", str.Length, status ); status = pNtOpenJobObject( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenJobObject failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateDirectoryObject( &ret, GENERIC_ALL, &attr2 ); @@ -564,7 +542,7 @@ static void test_name_limits(void) status = pNtOpenSection( &ret2, SECTION_MAP_WRITE, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSection failed %x\n", str.Length, status ); status = pNtOpenSection( &ret2, SECTION_MAP_WRITE, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenSection failed %x\n", str.Length, status ); pNtClose( ret ); @@ -868,7 +846,7 @@ static void test_name_limits(void) attr2.ObjectName = attr3.ObjectName = NULL; status = pNtCreateKey( &ret, GENERIC_ALL, &attr2, 0, NULL, 0, NULL ); todo_wine - ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE /* vista wow64 */, "NULL: NtCreateKey failed %x\n", status ); status = pNtCreateKey( &ret, GENERIC_ALL, &attr3, 0, NULL, 0, NULL ); todo_wine @@ -876,7 +854,7 @@ static void test_name_limits(void) status = pNtCreateKey( &ret, GENERIC_ALL, NULL, 0, NULL, 0, NULL ); ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %x\n", status ); status = pNtOpenKey( &ret, GENERIC_ALL, &attr2 ); - ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE /* vista wow64 */, "NULL: NtOpenKey failed %x\n", status ); status = pNtOpenKey( &ret, GENERIC_ALL, &attr3 ); ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKey failed %x\n", status ); @@ -894,15 +872,14 @@ static void test_directory(void) UNICODE_STRING str; OBJECT_ATTRIBUTES attr; HANDLE dir, dir1, h, h2; - BOOL is_nt4; + WCHAR buffer[256]; + ULONG len, full_len; /* No name and/or no attributes */ status = pNtCreateDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, - "NtCreateDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08x)\n", status); + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#x\n", status); status = pNtOpenDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, - "NtOpenDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08x)\n", status); + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#x\n", status); status = pNtCreateDirectoryObject(&h, DIRECTORY_QUERY, NULL); ok(status == STATUS_SUCCESS, "Failed to create Directory without attributes(%08x)\n", status); @@ -951,87 +928,76 @@ static void test_directory(void) pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr); - is_nt4 = (status == STATUS_OBJECT_NAME_NOT_FOUND); /* nt4 doesn't have Local\\ symlink */ - if (!is_nt4) - { - WCHAR buffer[256]; - ULONG len, full_len; - - ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); - pRtlFreeUnicodeString(&str); - InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); - status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateDirectoryObject got %08x\n", status ); - pRtlFreeUnicodeString(&str); - - pRtlCreateUnicodeStringFromAsciiz( &str, "\\BaseNamedObjects\\Local\\om.c-test" ); - InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); - pRtlFreeUnicodeString( &str ); - pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-test" ); - InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); - status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Failed to open directory %08x\n", status ); - if (!status) pNtClose(h); - pRtlFreeUnicodeString( &str ); - - pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-event" ); - InitializeObjectAttributes( &attr, &str, 0, dir1, NULL ); - status = pNtCreateEvent( &h, GENERIC_ALL, &attr, 1, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateEvent failed %x\n", status ); - status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); - ok( status == STATUS_SUCCESS, "NtOpenEvent failed %x\n", status ); - pNtClose( h2 ); - pRtlFreeUnicodeString( &str ); - pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-test\\om.c-event" ); - InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); - status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenEvent failed %x\n", status ); - pRtlFreeUnicodeString( &str ); - pRtlCreateUnicodeStringFromAsciiz( &str, "\\BasedNamedObjects\\Local\\om.c-test\\om.c-event" ); - InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenEvent failed %x\n", status ); - pRtlFreeUnicodeString( &str ); - pNtClose( h ); - pNtClose( dir1 ); - - str.Buffer = buffer; - str.MaximumLength = sizeof(buffer); - len = 0xdeadbeef; - memset( buffer, 0xaa, sizeof(buffer) ); - status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); - if (status != STATUS_SUCCESS) - goto error; - full_len = str.Length + sizeof(WCHAR); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); - if (len == full_len) - ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); - - str.MaximumLength = str.Length; - len = 0xdeadbeef; - status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); - - str.MaximumLength = 0; - len = 0xdeadbeef; - status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); - - str.MaximumLength = str.Length + sizeof(WCHAR); - len = 0xdeadbeef; - status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); - -error: - pNtClose(dir); - } + + ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); + pRtlFreeUnicodeString(&str); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); + status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateDirectoryObject got %08x\n", status ); + pRtlFreeUnicodeString(&str); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\BaseNamedObjects\\Local\\om.c-test" ); + InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); + status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-test" ); + InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); + status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Failed to open directory %08x\n", status ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-event" ); + InitializeObjectAttributes( &attr, &str, 0, dir1, NULL ); + status = pNtCreateEvent( &h, GENERIC_ALL, &attr, 1, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %x\n", status ); + status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenEvent failed %x\n", status ); + pNtClose( h2 ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-test\\om.c-event" ); + InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); + status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenEvent failed %x\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\BasedNamedObjects\\Local\\om.c-test\\om.c-event" ); + InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); + status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenEvent failed %x\n", status ); + pRtlFreeUnicodeString( &str ); + pNtClose( h ); + pNtClose( dir1 ); + + str.Buffer = buffer; + str.MaximumLength = sizeof(buffer); + len = 0xdeadbeef; + memset( buffer, 0xaa, sizeof(buffer) ); + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + full_len = str.Length + sizeof(WCHAR); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); + + str.MaximumLength = str.Length; + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + + str.MaximumLength = 0; + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + + str.MaximumLength = str.Length + sizeof(WCHAR); + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + + pNtClose(dir); pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); @@ -1091,26 +1057,23 @@ error: pNtClose(dir); - if (!is_nt4) - { - InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Global\\om.c-test"); - status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); - pRtlFreeUnicodeString(&str); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local\\om.c-test\\one more level"); - status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); - pRtlFreeUnicodeString(&str); - pNtClose(h); - InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); - status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); - pRtlFreeUnicodeString(&str); - pNtClose(h); - pNtClose(dir); - } + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Global\\om.c-test"); + status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + pRtlFreeUnicodeString(&str); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local\\om.c-test\\one more level"); + status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + pRtlFreeUnicodeString(&str); + pNtClose(h); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); + status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + pRtlFreeUnicodeString(&str); + pNtClose(h); + pNtClose(dir); /* Create other objects using RootDirectory */ @@ -1160,11 +1123,9 @@ static void test_symboliclink(void) InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); pRtlCreateUnicodeStringFromAsciiz(&target, "\\DosDevices"); status = pNtCreateSymbolicLinkObject( NULL, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, - "NtCreateSymbolicLinkObject got %08x\n", status ); + ok(status == STATUS_ACCESS_VIOLATION, "got %#x\n", status); status = pNtOpenSymbolicLinkObject( NULL, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, - "NtOpenSymbolicLinkObject got %08x\n", status ); + ok(status == STATUS_ACCESS_VIOLATION, "got %#x\n", status); status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, NULL); ok(status == STATUS_ACCESS_VIOLATION, @@ -1178,14 +1139,10 @@ static void test_symboliclink(void) ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_VIOLATION, /* nt4 */ "NtCreateSymbolicLinkObject failed(%08x)\n", status); pRtlFreeUnicodeString(&target); - if (!status) pNtClose(h); InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target); - ok(status == STATUS_INVALID_PARAMETER || - broken(status == STATUS_SUCCESS), /* nt4 */ - "NtCreateSymbolicLinkObject should have failed with STATUS_INVALID_PARAMETER got(%08x)\n", status); - if (!status) pNtClose(h); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr); ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status); @@ -1242,21 +1199,14 @@ static void test_symboliclink(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\BaseNamedObjects\\om.c-test\\" ); status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND, - "NtCreateSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "got %#x\n", status ); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND, - "NtOpenSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "got %#x\n", status ); pRtlFreeUnicodeString( &str ); pRtlFreeUnicodeString(&target); /* Compound test */ - if (!(dir = get_base_dir())) - { - win_skip( "couldn't find the BaseNamedObjects dir\n" ); - return; - } - + dir = get_base_dir(); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, "test-link"); pRtlCreateUnicodeStringFromAsciiz(&target, "\\DosDevices"); @@ -1285,7 +1235,7 @@ static void _test_file_info(unsigned line, HANDLE handle) NTSTATUS status; status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef); - ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED, + ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* Vista+ */, "expected STATUS_NOT_IMPLEMENTED, got %x\n", status); status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); @@ -1293,7 +1243,7 @@ static void _test_file_info(unsigned line, HANDLE handle) status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileIoCompletionNotificationInformation); - ok_(__FILE__,line)(status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS), + ok_(__FILE__,line)(status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS) /* XP */, "FileIoCompletionNotificationInformation returned %x\n", status); } @@ -1305,7 +1255,7 @@ static void _test_no_file_info(unsigned line, HANDLE handle) NTSTATUS status; status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef); - ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED, + ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* Vista+ */, "expected STATUS_NOT_IMPLEMENTED, got %x\n", status); status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); @@ -1314,7 +1264,7 @@ static void _test_no_file_info(unsigned line, HANDLE handle) status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileIoCompletionNotificationInformation); - ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS), + ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* XP */, "FileIoCompletionNotificationInformation returned %x\n", status); } @@ -1432,24 +1382,19 @@ static void test_query_object(void) ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); - ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ - "unexpected len %u\n", len ); + ok( len == expected_len, "unexpected len %u\n", len ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INSUFFICIENT_RESOURCES), - "NtQueryObject failed %x\n", status ); - ok( len == expected_len || broken(!len || len == sizeof(UNICODE_STRING)), + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status ); + ok( len == expected_len || broken(!len /* XP */ || len == sizeof(UNICODE_STRING) /* 2003 */), "unexpected len %u\n", len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(UNICODE_STRING), &len ); - ok( status == STATUS_BUFFER_OVERFLOW || broken(status == STATUS_INSUFFICIENT_RESOURCES - || status == STATUS_INFO_LENGTH_MISMATCH), - "NtQueryObject failed %x\n", status ); - ok( len == expected_len || broken(!len), - "unexpected len %u\n", len ); + ok( status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok( len == expected_len, "unexpected len %u\n", len ); test_object_type( handle, "File" ); @@ -1498,8 +1443,7 @@ static void test_query_object(void) ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); - ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ - "unexpected len %u\n", len ); + ok( len == expected_len, "unexpected len %u\n", len ); ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_mailslot") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); @@ -1521,8 +1465,7 @@ static void test_query_object(void) str = (UNICODE_STRING *)buffer; expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); todo_wine - ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ - "unexpected len %u\n", len ); + ok( len == expected_len, "unexpected len %u\n", len ); todo_wine ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_pipe") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); @@ -1542,29 +1485,25 @@ static void test_query_object(void) pNtClose( handle ); pRtlCreateUnicodeStringFromAsciiz( &path, "\\REGISTRY\\Machine\\Software\\Classes" ); - status = pNtCreateKey( &handle, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, - "NtCreateKey failed status %x\n", status ); + status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed status %x\n", status ); pRtlFreeUnicodeString( &path ); - if (status == STATUS_SUCCESS) - { - len = 0; - status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); - ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); - str = (UNICODE_STRING *)buffer; - todo_wine - ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); - str = (UNICODE_STRING *)buffer; - expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); - todo_wine - ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ - "unexpected len %u\n", len ); - todo_wine - ok( len > sizeof(UNICODE_STRING) + sizeof("\\Classes") * sizeof(WCHAR), - "name too short %s\n", wine_dbgstr_w(str->Buffer) ); - trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); - pNtClose( handle ); - } + + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); + str = (UNICODE_STRING *)buffer; + todo_wine + ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); + ok( len == expected_len || len == expected_len - sizeof(WCHAR) /* wow64 */, "unexpected len %u\n", len ); + todo_wine + ok( len > sizeof(UNICODE_STRING) + sizeof("\\Classes") * sizeof(WCHAR), + "name too short %s\n", wine_dbgstr_w(str->Buffer) ); + trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + pNtClose( handle ); + pRtlFreeUnicodeString( &session ); test_object_type( GetCurrentProcess(), "Process" ); @@ -1853,7 +1792,7 @@ static void test_keyed_events(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); - ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH, + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* 7+ */, "CreateEvent %x\n", status ); NtClose( handle ); @@ -1911,34 +1850,15 @@ static void test_null_device(void) num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WriteFile(null, buf, sizeof(buf), &num_bytes, &ov); - if (ret || GetLastError() != ERROR_IO_PENDING) - { - ok(ret, "WriteFile failed with error %u\n", GetLastError()); - } - else - { - num_bytes = 0xdeadbeef; - ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); - ok(ret, "GetOverlappedResult failed with error %u\n", GetLastError()); - } + ok(ret, "got error %u\n", GetLastError()); ok(num_bytes == sizeof(buf), "expected num_bytes = %u, got %u\n", (DWORD)sizeof(buf), num_bytes); num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(null, buf, sizeof(buf), &num_bytes, &ov); - if (ret || GetLastError() != ERROR_IO_PENDING) - { - ok(!ret, "ReadFile unexpectedly succeeded\n"); - } - else - { - num_bytes = 0xdeadbeef; - ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); - ok(!ret, "GetOverlappedResult unexpectedly succeeded\n"); - } - ok(GetLastError() == ERROR_HANDLE_EOF, - "expected ERROR_HANDLE_EOF, got %u\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_HANDLE_EOF, "got error %u\n", GetLastError()); pNtClose(null); @@ -2151,15 +2071,6 @@ static void test_wait_on_address(void) START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); - HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); - - if (!hntdll) - { - skip("not running on NT, skipping test\n"); - return; - } - - pCreateWaitableTimerA = (void *)GetProcAddress(hkernel32, "CreateWaitableTimerA"); pRtlCreateUnicodeStringFromAsciiz = (void *)GetProcAddress(hntdll, "RtlCreateUnicodeStringFromAsciiz"); pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); -- 2.27.0

1 3

[PATCH 4/5] winevulkan: Implement the concept of faking extension support
by Joshua Ashton 16 Jul '20

16 Jul '20

2 1

[PATCH 3/5] winevulkan: Move VK_KHR_get_surface_capabilities2 functions to private thunks
by Joshua Ashton 16 Jul '20

16 Jul '20

2 1

[PATCH 2/5] winevulkan Move vkGetDeviceGroupSurfacePresentModesKHR to a private thunk
by Joshua Ashton 16 Jul '20

16 Jul '20

2 1

[PATCH 1/5] winevulkan: Move vkGetPhysicalDeviceSurfacePresentModesKHR to a private thunk
by Joshua Ashton 16 Jul '20

16 Jul '20

2 1

[PATCH] oleaut32: Cut off only non-empty \[0-9]+$ resource-id in RegisterTypeLib.
by Jacek Caban 16 Jul '20

16 Jul '20

From: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Check if szFullPath ended with '\\' (was explicitly a directory). Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 2

[PATCH] Use __typeof__ so <guiddef.h> is compatible with -std=c++11
by Puetz Kevin A 16 Jul '20

16 Jul '20

the typeof(...) extension is available in -std=gnu++11, but c++11 considers it replaced by decltype(...) and off-by-default __uuidof does need GNU __typeof__(), not decltype(), for c++03 support and because both __uuidof(typename) and __uuidof(expression) should work, but decltype(typename) is not accepted Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- include/guiddef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/guiddef.h b/include/guiddef.h index 546c450043..664f74fac3 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -74,7 +74,7 @@ extern "C++" { __WINE_UUID_ATTR const GUID __wine_uuidof<type>::uuid = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}; \ } -#define __uuidof(type) __wine_uuidof_type<typeof(type)>::inst::uuid +#define __uuidof(type) __wine_uuidof_type<__typeof__(type)>::inst::uuid #else /* __WINE_UUID_ATTR */

2 1

[PATCH] include: Use unsigned int in InlineIsEqualGUID.
by Jacek Caban 16 Jul '20

16 Jul '20

From: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> This fixes stand-alone inclusion of <guiddef.h> (without first including <basetsd.h>). Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/guiddef.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH] GWL_ID is not a HANDLE or pointer, and should be available on _WIN64
by Puetz Kevin A 16 Jul '20

16 Jul '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- include/winuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 311b1481be..53661f6c78 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1217,9 +1217,9 @@ typedef struct tagSTYLESTRUCT { /* Offsets for GetWindowLong() and GetWindowWord() */ #define GWL_EXSTYLE (-20) #define GWL_STYLE (-16) +#define GWL_ID (-12) #if !defined _WIN64 && !defined __WINESRC__ # define GWL_USERDATA (-21) -# define GWL_ID (-12) # define GWL_HWNDPARENT (-8) # define GWL_HINSTANCE (-6) # define GWL_WNDPROC (-4)

2 1

[PATCH 1/3] qdvd: Support aggregation.
by Gijs Vermeulen 16 Jul '20

16 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- configure.ac | 1 + dlls/qdvd/graph.c | 61 ++++++++++--- dlls/qdvd/qdvd_main.c | 8 +- dlls/qdvd/qdvd_private.h | 2 +- dlls/qdvd/tests/Makefile.in | 5 ++ dlls/qdvd/tests/graph.c | 171 ++++++++++++++++++++++++++++++++++++ 6 files changed, 232 insertions(+), 16 deletions(-) create mode 100644 dlls/qdvd/tests/Makefile.in create mode 100644 dlls/qdvd/tests/graph.c diff --git a/configure.ac b/configure.ac index 4829648c3a..d914e3eca8 100644 --- a/configure.ac +++ b/configure.ac @@ -3634,6 +3634,7 @@ WINE_CONFIG_MAKEFILE(dlls/qasf/tests) WINE_CONFIG_MAKEFILE(dlls/qcap) WINE_CONFIG_MAKEFILE(dlls/qcap/tests) WINE_CONFIG_MAKEFILE(dlls/qdvd) +WINE_CONFIG_MAKEFILE(dlls/qdvd/tests) WINE_CONFIG_MAKEFILE(dlls/qedit) WINE_CONFIG_MAKEFILE(dlls/qedit/tests) WINE_CONFIG_MAKEFILE(dlls/qmgr) diff --git a/dlls/qdvd/graph.c b/dlls/qdvd/graph.c index f33293bfa4..986fcc0db0 100644 --- a/dlls/qdvd/graph.c +++ b/dlls/qdvd/graph.c @@ -24,26 +24,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(qdvd); struct graph_builder { + IUnknown IUnknown_inner; IDvdGraphBuilder IDvdGraphBuilder_iface; + + IUnknown *outer_unk; LONG refcount; }; -static struct graph_builder *impl_from_IDvdGraphBuilder(IDvdGraphBuilder *iface) +static struct graph_builder *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, struct graph_builder, IDvdGraphBuilder_iface); + return CONTAINING_RECORD(iface, struct graph_builder, IUnknown_inner); } -static ULONG WINAPI graph_builder_AddRef(IDvdGraphBuilder *iface) +static ULONG WINAPI inner_AddRef(IUnknown *iface) { - struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + struct graph_builder *builder = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&builder->refcount); TRACE("%p increasing refcount to %u.\n", builder, refcount); return refcount; } -static ULONG WINAPI graph_builder_Release(IDvdGraphBuilder *iface) +static ULONG WINAPI inner_Release(IUnknown *iface) { - struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + struct graph_builder *builder = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&builder->refcount); TRACE("%p decreasing refcount to %u.\n", builder, refcount); if (!refcount) @@ -51,12 +54,16 @@ static ULONG WINAPI graph_builder_Release(IDvdGraphBuilder *iface) return refcount; } -static HRESULT WINAPI graph_builder_QueryInterface(IDvdGraphBuilder *iface, REFIID iid, void **out) +static HRESULT WINAPI inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) { + struct graph_builder *builder = impl_from_IUnknown(iface); + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_IDvdGraphBuilder) || IsEqualGUID(iid, &IID_IUnknown)) - *out = iface; + if (IsEqualGUID(iid, &IID_IUnknown)) + *out = &builder->IUnknown_inner; + else if (IsEqualGUID(iid, &IID_IDvdGraphBuilder)) + *out = &builder->IDvdGraphBuilder_iface; else { *out = NULL; @@ -68,6 +75,36 @@ static HRESULT WINAPI graph_builder_QueryInterface(IDvdGraphBuilder *iface, REFI return S_OK; } +static const IUnknownVtbl inner_vtbl = +{ + inner_QueryInterface, + inner_AddRef, + inner_Release, +}; + +static struct graph_builder *impl_from_IDvdGraphBuilder(IDvdGraphBuilder *iface) +{ + return CONTAINING_RECORD(iface, struct graph_builder, IDvdGraphBuilder_iface); +} + +static ULONG WINAPI graph_builder_AddRef(IDvdGraphBuilder *iface) +{ + struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + return IUnknown_AddRef(builder->outer_unk); +} + +static ULONG WINAPI graph_builder_Release(IDvdGraphBuilder *iface) +{ + struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + return IUnknown_Release(builder->outer_unk); +} + +static HRESULT WINAPI graph_builder_QueryInterface(IDvdGraphBuilder *iface, REFIID iid, void **out) +{ + struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + return IUnknown_QueryInterface(builder->outer_unk, iid, out); +} + static HRESULT WINAPI graph_builder_GetFiltergraph(IDvdGraphBuilder *iface, IGraphBuilder **graph) { FIXME("iface %p, graph %p, stub!\n", iface, graph); @@ -96,7 +133,7 @@ static const struct IDvdGraphBuilderVtbl graph_builder_vtbl = graph_builder_RenderDvdVideoVolume, }; -HRESULT graph_builder_create(IUnknown **out) +HRESULT graph_builder_create(IUnknown *outer, IUnknown **out) { struct graph_builder *builder; @@ -104,9 +141,11 @@ HRESULT graph_builder_create(IUnknown **out) return E_OUTOFMEMORY; builder->IDvdGraphBuilder_iface.lpVtbl = &graph_builder_vtbl; + builder->IUnknown_inner.lpVtbl = &inner_vtbl; builder->refcount = 1; + builder->outer_unk = outer ? outer : &builder->IUnknown_inner; TRACE("Created DVD graph builder %p.\n", builder); - *out = (IUnknown *)&builder->IDvdGraphBuilder_iface; + *out = &builder->IUnknown_inner; return S_OK; } diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index 9377f248ce..c529533e44 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -28,7 +28,7 @@ static HINSTANCE qdvd_instance; struct class_factory { IClassFactory IClassFactory_iface; - HRESULT (*create_instance)(IUnknown **out); + HRESULT (*create_instance)(IUnknown *outer, IUnknown **out); }; static struct class_factory *impl_from_IClassFactory(IClassFactory *iface) @@ -73,10 +73,10 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, *out = NULL; - if (outer) - return CLASS_E_NOAGGREGATION; + if (outer && !IsEqualGUID(iid, &IID_IUnknown)) + return E_NOINTERFACE; - if (SUCCEEDED(hr = factory->create_instance(&unk))) + if (SUCCEEDED(hr = factory->create_instance(outer, &unk))) { hr = IUnknown_QueryInterface(unk, iid, out); IUnknown_Release(unk); diff --git a/dlls/qdvd/qdvd_private.h b/dlls/qdvd/qdvd_private.h index b54dd3ddc1..297949ee60 100644 --- a/dlls/qdvd/qdvd_private.h +++ b/dlls/qdvd/qdvd_private.h @@ -25,6 +25,6 @@ #include "dshow.h" #include "wine/debug.h" -HRESULT graph_builder_create(IUnknown **out) DECLSPEC_HIDDEN; +HRESULT graph_builder_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; #endif /* QDVD_PRIVATE_H */ diff --git a/dlls/qdvd/tests/Makefile.in b/dlls/qdvd/tests/Makefile.in new file mode 100644 index 0000000000..3e9efd9c74 --- /dev/null +++ b/dlls/qdvd/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = qdvd.dll +IMPORTS = strmiids uuid ole32 + +C_SRCS = \ + graph.c diff --git a/dlls/qdvd/tests/graph.c b/dlls/qdvd/tests/graph.c new file mode 100644 index 0000000000..93dc4e66a9 --- /dev/null +++ b/dlls/qdvd/tests/graph.c @@ -0,0 +1,171 @@ +/* + * Graph builder unit tests + * + * Copyright 2020 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/strmbase.h" +#include "wine/test.h" + +static IDvdGraphBuilder *create_graph_builder(void) +{ + IDvdGraphBuilder *graph = NULL; + HRESULT hr = CoCreateInstance(&CLSID_DvdGraphBuilder, NULL, + CLSCTX_INPROC_SERVER, &IID_IDvdGraphBuilder, (void **)&graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return graph; +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IDvdGraphBuilder *graph = create_graph_builder(); + + check_interface(graph, &IID_IDvdGraphBuilder, TRUE); + check_interface(graph, &IID_IUnknown, TRUE); + + check_interface(graph, &IID_IBaseFilter, FALSE); + + IDvdGraphBuilder_Release(graph); +} + +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IDvdGraphBuilder) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IDvdGraphBuilder *graph, *graph2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + graph = (IDvdGraphBuilder *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_DvdGraphBuilder, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IDvdGraphBuilder, (void **)&graph); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!graph, "Got interface %p.\n", graph); + + hr = CoCreateInstance(&CLSID_DvdGraphBuilder, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IDvdGraphBuilder, (void **)&graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDvdGraphBuilder_QueryInterface(graph, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IDvdGraphBuilder_QueryInterface(graph, &IID_IDvdGraphBuilder, (void **)&graph2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph2 == (IDvdGraphBuilder *)0xdeadbeef, "Got unexpected IDvdGraphBuilder %p.\n", graph2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IDvdGraphBuilder_QueryInterface(graph, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IDvdGraphBuilder_Release(graph); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + +START_TEST(graph) +{ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + test_interfaces(); + test_aggregation(); + + CoUninitialize(); +} -- 2.27.0

3 7

[PATCH 1/3] dxgi: Implement IDXGIOutput5 and IDXGIOutput6 stubs.
by Rémi Bernon 16 Jul '20

16 Jul '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/output.c | 140 ++++++++++++++++++++++++++------------- 3 files changed, 97 insertions(+), 47 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index ad4e4b13057..72f1a2df6b1 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -145,7 +145,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return hr; } - *output = (IDXGIOutput *)&output_object->IDXGIOutput4_iface; + *output = (IDXGIOutput *)&output_object->IDXGIOutput6_iface; TRACE("Returning output %p.\n", *output); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index a125a7667d9..e43ee59461c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -144,7 +144,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l /* IDXGIOutput */ struct dxgi_output { - IDXGIOutput4 IDXGIOutput4_iface; + IDXGIOutput6 IDXGIOutput6_iface; LONG refcount; struct wined3d_output *wined3d_output; struct wined3d_private_store private_store; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 5d31a0093cb..cc5f8e49285 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -181,18 +181,20 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, return S_OK; } -static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) +static inline struct dxgi_output *impl_from_IDXGIOutput6(IDXGIOutput6 *iface) { - return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput6_iface); } /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID iid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput6 *iface, REFIID iid, void **object) { TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); - if (IsEqualGUID(iid, &IID_IDXGIOutput4) + if (IsEqualGUID(iid, &IID_IDXGIOutput6) + || IsEqualGUID(iid, &IID_IDXGIOutput5) + || IsEqualGUID(iid, &IID_IDXGIOutput4) || IsEqualGUID(iid, &IID_IDXGIOutput3) || IsEqualGUID(iid, &IID_IDXGIOutput2) || IsEqualGUID(iid, &IID_IDXGIOutput1) @@ -211,9 +213,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput4 *iface) +static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput6 *iface) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); ULONG refcount = InterlockedIncrement(&output->refcount); TRACE("%p increasing refcount to %u.\n", output, refcount); @@ -221,9 +223,9 @@ static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput4 *iface) return refcount; } -static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput4 *iface) +static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput6 *iface) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); ULONG refcount = InterlockedDecrement(&output->refcount); TRACE("%p decreasing refcount to %u.\n", output, refcount); @@ -240,40 +242,40 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput4 *iface) /* IDXGIObject methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateData(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateData(IDXGIOutput6 *iface, REFGUID guid, UINT data_size, const void *data) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); return dxgi_set_private_data(&output->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput6 *iface, REFGUID guid, const IUnknown *object) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); return dxgi_set_private_data_interface(&output->private_store, guid, object); } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput6 *iface, REFGUID guid, UINT *data_size, void *data) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); return dxgi_get_private_data(&output->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput6 *iface, REFIID riid, void **parent) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); @@ -282,9 +284,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput4 *iface, /* IDXGIOutput methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_OUTPUT_DESC *desc) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_OUTPUT_DESC *desc) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_output_desc wined3d_desc; HRESULT hr; @@ -312,10 +314,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_O return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput6 *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *modes) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", iface, debug_dxgi_format(format), flags, mode_count, modes); @@ -324,10 +326,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput4 *if format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_0); } -static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput6 *iface, const DXGI_MODE_DESC *mode, DXGI_MODE_DESC *closest_match, IUnknown *device) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_display_mode wined3d_mode; HRESULT hr; @@ -347,7 +349,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput return hr; } -static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) +static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput6 *iface) { static BOOL once = FALSE; @@ -359,9 +361,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, IUnknown *device, BOOL exclusive) +static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput6 *iface, IUnknown *device, BOOL exclusive) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); HRESULT hr; TRACE("iface %p, device %p, exclusive %d.\n", iface, device, exclusive); @@ -376,9 +378,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, return hr; } -static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) +static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput6 *iface) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p.\n", iface); @@ -387,7 +389,7 @@ static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) wined3d_mutex_unlock(); } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput6 *iface, DXGI_GAMMA_CONTROL_CAPABILITIES *gamma_caps) { unsigned int i; @@ -408,7 +410,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOu return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput6 *iface, const DXGI_GAMMA_CONTROL *gamma_control) { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); @@ -416,7 +418,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput6 *iface, DXGI_GAMMA_CONTROL *gamma_control) { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); @@ -424,21 +426,21 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_SetDisplaySurface(IDXGIOutput4 *iface, IDXGISurface *surface) +static HRESULT STDMETHODCALLTYPE dxgi_output_SetDisplaySurface(IDXGIOutput6 *iface, IDXGISurface *surface) { FIXME("iface %p, surface %p stub!\n", iface, surface); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData(IDXGIOutput4 *iface, IDXGISurface *surface) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData(IDXGIOutput6 *iface, IDXGISurface *surface) { FIXME("iface %p, surface %p stub!\n", iface, surface); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput4 *iface, DXGI_FRAME_STATISTICS *stats) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput6 *iface, DXGI_FRAME_STATISTICS *stats) { FIXME("iface %p, stats %p stub!\n", iface, stats); @@ -447,10 +449,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput4 *if /* IDXGIOutput1 methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput6 *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC1 *modes) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", iface, debug_dxgi_format(format), flags, mode_count, modes); @@ -459,10 +461,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *i format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_1); } -static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput6 *iface, const DXGI_MODE_DESC1 *mode, DXGI_MODE_DESC1 *closest_match, IUnknown *device) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_display_mode wined3d_mode; HRESULT hr; @@ -482,7 +484,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutpu return hr; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput6 *iface, IDXGIResource *resource) { FIXME("iface %p, resource %p stub!\n", iface, resource); @@ -490,7 +492,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput4 return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput(IDXGIOutput6 *iface, IUnknown *device, IDXGIOutputDuplication **output_duplication) { FIXME("iface %p, device %p, output_duplication %p stub!\n", iface, device, output_duplication); @@ -500,7 +502,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput(IDXGIOutput4 *iface /* IDXGIOutput2 methods */ -static BOOL STDMETHODCALLTYPE dxgi_output_SupportsOverlays(IDXGIOutput4 *iface) +static BOOL STDMETHODCALLTYPE dxgi_output_SupportsOverlays(IDXGIOutput6 *iface) { FIXME("iface %p stub!\n", iface); @@ -509,7 +511,7 @@ static BOOL STDMETHODCALLTYPE dxgi_output_SupportsOverlays(IDXGIOutput4 *iface) /* IDXGIOutput3 methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlaySupport(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlaySupport(IDXGIOutput6 *iface, DXGI_FORMAT format, IUnknown *device, UINT *flags) { FIXME("iface %p, format %#x, device %p, flags %p stub!\n", iface, format, device, flags); @@ -519,7 +521,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlaySupport(IDXGIOutput4 *i /* IDXGIOutput4 methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlayColorSpaceSupport(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlayColorSpaceSupport(IDXGIOutput6 *iface, DXGI_FORMAT format, DXGI_COLOR_SPACE_TYPE color_space, IUnknown *device, UINT *flags) { FIXME("iface %p, format %#x, color_space %#x, device %p, flags %p stub!\n", @@ -528,7 +530,50 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlayColorSpaceSupport(IDXGI return E_NOTIMPL; } -static const struct IDXGIOutput4Vtbl dxgi_output_vtbl = +/* IDXGIOutput5 methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput1(IDXGIOutput6 *iface, + IUnknown *device, UINT flags, UINT format_count, const DXGI_FORMAT *formats, + IDXGIOutputDuplication **duplication) +{ + FIXME("iface %p, device %p, flags %#x, format_count %d, formats %p, " + "output_duplication %p stub!\n", iface, device, flags, format_count, + formats, duplication); + + return E_NOTIMPL; +} + +/* IDXGIOutput6 methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, + DXGI_OUTPUT_DESC1 *desc) +{ + DXGI_OUTPUT_DESC base_desc; + HRESULT hr; + + FIXME("iface %p, desc %p stub!\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + if (FAILED(hr = dxgi_output_GetDesc(iface, &base_desc))) + return hr; + + memset(desc, 0, sizeof(*desc)); + memcpy(desc, &base_desc, sizeof(base_desc)); + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE dxgi_output_CheckHardwareCompositionSupport(IDXGIOutput6 *iface, + UINT *flags) +{ + FIXME("iface %p, flags %p stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static const struct IDXGIOutput6Vtbl dxgi_output_vtbl = { dxgi_output_QueryInterface, dxgi_output_AddRef, @@ -562,6 +607,11 @@ static const struct IDXGIOutput4Vtbl dxgi_output_vtbl = dxgi_output_CheckOverlaySupport, /* IDXGIOutput4 methods */ dxgi_output_CheckOverlayColorSpaceSupport, + /* IDXGIOutput5 methods */ + dxgi_output_DuplicateOutput1, + /* IDXGIOutput6 methods */ + dxgi_output_GetDesc1, + dxgi_output_CheckHardwareCompositionSupport, }; struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) @@ -569,13 +619,13 @@ struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) if (!iface) return NULL; assert(iface->lpVtbl == (IDXGIOutputVtbl *)&dxgi_output_vtbl); - return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput6_iface); } static void dxgi_output_init(struct dxgi_output *output, unsigned int output_idx, struct dxgi_adapter *adapter) { - output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; + output->IDXGIOutput6_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; output->wined3d_output = wined3d_adapter_get_output(adapter->wined3d_adapter, output_idx); wined3d_private_store_init(&output->private_store); -- 2.27.0

4 10

[PATCH 4/4] server: Remove support for crating renderer in alloc_console request.
by Jacek Caban 16 Jul '20

16 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-)

1 0

[PATCH 3/4] wineconsole: Use NtCreateFile to create renderer object.
by Jacek Caban 16 Jul '20

16 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 7 +++++++ programs/wineconsole/wineconsole.c | 20 +++++++++++++++++++- server/console.c | 12 ++++-------- 3 files changed, 30 insertions(+), 9 deletions(-)

1 0

[PATCH 2/4] server: Introduce IOCTL_CONDRV_ATTACH_RENDERER ioctl.
by Jacek Caban 16 Jul '20

16 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 4 ++++ server/console.c | 23 +++++++++++++++++++++++ server/trace.c | 1 + 3 files changed, 28 insertions(+)

1 0

[PATCH 1/4] server: Allow creating console renderer with open_file.
by Jacek Caban 16 Jul '20

16 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)

1 0

[PATCH v2] ntdll/tests: Test KiUserExceptionDispatcher with RtlUnwind on i386.
by Paul Gofman 16 Jul '20

16 Jul '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix typo in the title. dlls/ntdll/tests/exception.c | 88 +++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 44b00ad7b00..fce1de385ef 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1667,6 +1667,23 @@ static void *hook_KiUserExceptionDispatcher_eip; static void *dbg_except_continue_handler_eip; static void *hook_exception_address; +static struct +{ + DWORD old_eax; + DWORD old_edx; + DWORD old_esi; + DWORD old_edi; + DWORD old_ebp; + DWORD old_esp; + DWORD new_eax; + DWORD new_edx; + DWORD new_esi; + DWORD new_edi; + DWORD new_ebp; + DWORD new_esp; +} +test_kiuserexceptiondispatcher_regs; + static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { @@ -1677,6 +1694,11 @@ static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGIST got_exception = 1; dbg_except_continue_handler_eip = (void *)context->Eip; ++context->Eip; + + context->Eip = (DWORD)code_mem + 0x1c; + context->Eax = 0xdeadbeef; + context->Esi = 0xdeadbeef; + pRtlUnwind(NtCurrentTeb()->Tib.ExceptionList, (void *)context->Eip, rec, (void *)0xdeadbeef); return ExceptionContinueExecution; } @@ -1701,6 +1723,7 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE * software raised exception. */ context->Eip = (ULONG_PTR)rec->ExceptionAddress; } + return EXCEPTION_CONTINUE_EXECUTION; } @@ -1725,9 +1748,39 @@ void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *contex static void test_kiuserexceptiondispatcher(void) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); - static const BYTE except_code[] = + static BYTE except_code[] = { + 0xb9, /* mov imm32, %ecx */ + /* offset: 0x1 */ + 0x00, 0x00, 0x00, 0x00, + + 0x89, 0x01, /* mov %eax, (%ecx) */ + 0x89, 0x51, 0x04, /* mov %edx, 0x4(%ecx) */ + 0x89, 0x71, 0x08, /* mov %esi, 0x8(%ecx) */ + 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ + 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ + 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ + 0x83, 0xc1, 0x18, /* add $0x18, %ecx */ + + /* offset: 0x19 */ 0xcc, /* int3 */ + + 0x0f, 0x0b, /* ud2, illegal instruction */ + + /* offset: 0x1c */ + 0xb9, /* mov imm32, %ecx */ + /* offset: 0x1d */ + 0x00, 0x00, 0x00, 0x00, + + 0x89, 0x01, /* mov %eax, (%ecx) */ + 0x89, 0x51, 0x04, /* mov %edx, 0x4(%ecx) */ + 0x89, 0x71, 0x08, /* mov %esi, 0x8(%ecx) */ + 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ + 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ + 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ + + 0x67, 0x48, 0x8b, 0x71, 0xf0, /* mov -0x10(%ecx),%esi */ + 0xc3, /* ret */ }; static BYTE hook_trampoline[] = @@ -1745,6 +1798,7 @@ static void test_kiuserexceptiondispatcher(void) void *phook_trampoline = hook_trampoline; DWORD old_protect1, old_protect2; EXCEPTION_RECORD record; + void *bpt_address; BYTE *ptr; BOOL ret; @@ -1755,6 +1809,15 @@ static void test_kiuserexceptiondispatcher(void) return; } + if (!pRtlUnwind) + { + win_skip("RtlUnwind is not available.\n"); + return; + } + + *(DWORD *)(except_code + 1) = (DWORD)&test_kiuserexceptiondispatcher_regs; + *(DWORD *)(except_code + 0x1d) = (DWORD)&test_kiuserexceptiondispatcher_regs.new_eax; + *(unsigned int *)(hook_trampoline + 2) = (ULONG_PTR)&phook_KiUserExceptionDispatcher; *(unsigned int *)(hook_trampoline + 8) = (ULONG_PTR)&pKiUserExceptionDispatcher; @@ -1786,13 +1849,24 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, + ok(test_kiuserexceptiondispatcher_regs.new_eax == 0xdeadbeef, "Got unexpected eax %#x.\n", + test_kiuserexceptiondispatcher_regs.new_eax); + ok(test_kiuserexceptiondispatcher_regs.new_esi == 0xdeadbeef, "Got unexpected esi %#x.\n", + test_kiuserexceptiondispatcher_regs.new_esi); + ok(test_kiuserexceptiondispatcher_regs.old_edi + == test_kiuserexceptiondispatcher_regs.new_edi, "edi does not match.\n"); + ok(test_kiuserexceptiondispatcher_regs.old_ebp + == test_kiuserexceptiondispatcher_regs.new_ebp, "ebp does not match.\n"); + + bpt_address = (BYTE *)code_mem + 0x19; + + ok(hook_exception_address == bpt_address || broken(!hook_exception_address) /* Win2008 */, "Got unexpected exception address %p, expected %p.\n", - hook_exception_address, code_mem); - ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", - hook_KiUserExceptionDispatcher_eip, code_mem); - ok(dbg_except_continue_handler_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", - dbg_except_continue_handler_eip, code_mem); + hook_exception_address, bpt_address); + ok(hook_KiUserExceptionDispatcher_eip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_eip, bpt_address); + ok(dbg_except_continue_handler_eip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_eip, bpt_address); record.ExceptionCode = 0x80000003; record.ExceptionFlags = 0; -- 2.26.2

1 0

[PATCH v2 1/5] ntoskrnl.exe: Store current thread object at right offset from GS.
by Derek Lesho 16 Jul '20

16 Jul '20

In kernel mode, GS base is not set to a TEB, but fortunately the offset for the current thread object, which EasyAntiCheat.sys relies on, doesn't conflict with anything in the TEB. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Add comment explaining position. --- dlls/ntoskrnl.exe/ntoskrnl.c | 37 +++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d407cffee69..7fb01464816 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -870,7 +870,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) for (;;) { - NtCurrentTeb()->Reserved5[1] = NULL; + NtCurrentTeb()->SystemReserved1[15] = NULL; if (!context.in_buff && !(context.in_buff = HeapAlloc( GetProcessHeap(), 0, context.in_size ))) { ERR( "failed to allocate buffer\n" ); @@ -891,7 +891,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) context.params = reply->params; context.in_size = reply->in_size; client_tid = reply->client_tid; - NtCurrentTeb()->Reserved5[1] = wine_server_get_ptr( reply->client_thread ); + NtCurrentTeb()->SystemReserved1[15] = wine_server_get_ptr( reply->client_thread ); } else { @@ -2339,7 +2339,7 @@ POBJECT_TYPE PsThreadType = &thread_type; */ PRKTHREAD WINAPI KeGetCurrentThread(void) { - struct _KTHREAD *thread = NtCurrentTeb()->Reserved5[1]; + struct _KTHREAD *thread = NtCurrentTeb()->SystemReserved1[15]; if (!thread) { @@ -2352,7 +2352,11 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) kernel_object_from_handle( handle, PsThreadType, (void**)&thread ); if (handle != GetCurrentThread()) NtClose( handle ); - NtCurrentTeb()->Reserved5[1] = thread; + /* In kernel mode, GS base is not set to a TEB, but fortunately the offset + for the current thread object, which EasyAntiCheat.sys relies on, + doesn't conflict with anything in the TEB. */ + + NtCurrentTeb()->SystemReserved1[15] = thread; } return thread; @@ -2881,6 +2885,22 @@ DEVICE_OBJECT* WINAPI IoGetAttachedDeviceReference( DEVICE_OBJECT *device ) } +struct system_thread_ctx +{ + PKSTART_ROUTINE start; + PVOID context; +}; + +static void WINAPI init_system_thread(PVOID context) +{ + struct system_thread_ctx info = *(struct system_thread_ctx *)context; + HeapFree( GetProcessHeap(), 0, context ); + + NtCurrentTeb()->SystemReserved1[15] = KeGetCurrentThread(); + + info.start(info.context); +} + /*********************************************************************** * PsCreateSystemThread (NTOSKRNL.EXE.@) */ @@ -2889,9 +2909,16 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, HANDLE ProcessHandle, PCLIENT_ID ClientId, PKSTART_ROUTINE StartRoutine, PVOID StartContext) { + struct system_thread_ctx *info; + if (!ProcessHandle) ProcessHandle = GetCurrentProcess(); + + info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) ); + info->start = StartRoutine; + info->context = StartContext; + return RtlCreateUserThread(ProcessHandle, 0, FALSE, 0, 0, - 0, StartRoutine, StartContext, + 0, init_system_thread, info, ThreadHandle, ClientId); } -- 2.27.0

1 4

[PATCH] ntdll/tests: Test KiUserExcpetionDispatcher with RtlUnwind on i386.
by Paul Gofman 16 Jul '20

16 Jul '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 88 +++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 44b00ad7b00..fce1de385ef 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1667,6 +1667,23 @@ static void *hook_KiUserExceptionDispatcher_eip; static void *dbg_except_continue_handler_eip; static void *hook_exception_address; +static struct +{ + DWORD old_eax; + DWORD old_edx; + DWORD old_esi; + DWORD old_edi; + DWORD old_ebp; + DWORD old_esp; + DWORD new_eax; + DWORD new_edx; + DWORD new_esi; + DWORD new_edi; + DWORD new_ebp; + DWORD new_esp; +} +test_kiuserexceptiondispatcher_regs; + static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { @@ -1677,6 +1694,11 @@ static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGIST got_exception = 1; dbg_except_continue_handler_eip = (void *)context->Eip; ++context->Eip; + + context->Eip = (DWORD)code_mem + 0x1c; + context->Eax = 0xdeadbeef; + context->Esi = 0xdeadbeef; + pRtlUnwind(NtCurrentTeb()->Tib.ExceptionList, (void *)context->Eip, rec, (void *)0xdeadbeef); return ExceptionContinueExecution; } @@ -1701,6 +1723,7 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE * software raised exception. */ context->Eip = (ULONG_PTR)rec->ExceptionAddress; } + return EXCEPTION_CONTINUE_EXECUTION; } @@ -1725,9 +1748,39 @@ void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *contex static void test_kiuserexceptiondispatcher(void) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); - static const BYTE except_code[] = + static BYTE except_code[] = { + 0xb9, /* mov imm32, %ecx */ + /* offset: 0x1 */ + 0x00, 0x00, 0x00, 0x00, + + 0x89, 0x01, /* mov %eax, (%ecx) */ + 0x89, 0x51, 0x04, /* mov %edx, 0x4(%ecx) */ + 0x89, 0x71, 0x08, /* mov %esi, 0x8(%ecx) */ + 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ + 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ + 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ + 0x83, 0xc1, 0x18, /* add $0x18, %ecx */ + + /* offset: 0x19 */ 0xcc, /* int3 */ + + 0x0f, 0x0b, /* ud2, illegal instruction */ + + /* offset: 0x1c */ + 0xb9, /* mov imm32, %ecx */ + /* offset: 0x1d */ + 0x00, 0x00, 0x00, 0x00, + + 0x89, 0x01, /* mov %eax, (%ecx) */ + 0x89, 0x51, 0x04, /* mov %edx, 0x4(%ecx) */ + 0x89, 0x71, 0x08, /* mov %esi, 0x8(%ecx) */ + 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ + 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ + 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ + + 0x67, 0x48, 0x8b, 0x71, 0xf0, /* mov -0x10(%ecx),%esi */ + 0xc3, /* ret */ }; static BYTE hook_trampoline[] = @@ -1745,6 +1798,7 @@ static void test_kiuserexceptiondispatcher(void) void *phook_trampoline = hook_trampoline; DWORD old_protect1, old_protect2; EXCEPTION_RECORD record; + void *bpt_address; BYTE *ptr; BOOL ret; @@ -1755,6 +1809,15 @@ static void test_kiuserexceptiondispatcher(void) return; } + if (!pRtlUnwind) + { + win_skip("RtlUnwind is not available.\n"); + return; + } + + *(DWORD *)(except_code + 1) = (DWORD)&test_kiuserexceptiondispatcher_regs; + *(DWORD *)(except_code + 0x1d) = (DWORD)&test_kiuserexceptiondispatcher_regs.new_eax; + *(unsigned int *)(hook_trampoline + 2) = (ULONG_PTR)&phook_KiUserExceptionDispatcher; *(unsigned int *)(hook_trampoline + 8) = (ULONG_PTR)&pKiUserExceptionDispatcher; @@ -1786,13 +1849,24 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, + ok(test_kiuserexceptiondispatcher_regs.new_eax == 0xdeadbeef, "Got unexpected eax %#x.\n", + test_kiuserexceptiondispatcher_regs.new_eax); + ok(test_kiuserexceptiondispatcher_regs.new_esi == 0xdeadbeef, "Got unexpected esi %#x.\n", + test_kiuserexceptiondispatcher_regs.new_esi); + ok(test_kiuserexceptiondispatcher_regs.old_edi + == test_kiuserexceptiondispatcher_regs.new_edi, "edi does not match.\n"); + ok(test_kiuserexceptiondispatcher_regs.old_ebp + == test_kiuserexceptiondispatcher_regs.new_ebp, "ebp does not match.\n"); + + bpt_address = (BYTE *)code_mem + 0x19; + + ok(hook_exception_address == bpt_address || broken(!hook_exception_address) /* Win2008 */, "Got unexpected exception address %p, expected %p.\n", - hook_exception_address, code_mem); - ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", - hook_KiUserExceptionDispatcher_eip, code_mem); - ok(dbg_except_continue_handler_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", - dbg_except_continue_handler_eip, code_mem); + hook_exception_address, bpt_address); + ok(hook_KiUserExceptionDispatcher_eip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_eip, bpt_address); + ok(dbg_except_continue_handler_eip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_eip, bpt_address); record.ExceptionCode = 0x80000003; record.ExceptionFlags = 0; -- 2.26.2

1 0

[PATCH 10/10 v2] msvcrt: Add _ismbcpunct_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

2 1

[PATCH 09/10 v2] msvcrt: Add _ismbcprint_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

2 1

[PATCH 08/10 v2] msvcrt: Add _ismbcspace_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

2 1

[PATCH 07/10 v2] msvcrt: Add _ismbcupper_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

2 1

[PATCH 06/10 v2] msvcrt: Add _ismbclower_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

2 1

[PATCH 05/10 v2] msvcrt: Add _ismbcalpha_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

2 1

[PATCH 04/10 v2] msvcrt: Add _ismbcgraph_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

2 1

[PATCH 03/10 v2] msvcrt: Add _ismbcdigit_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

2 1

[PATCH 02/10 v2] msvcrt: Add _ismbcalnum_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

2 1

[PATCH 01/10 v2] msvcrt: Add _ismbbkana_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 30 ++++++++++++++----- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +-- 11 files changed, 33 insertions(+), 19 deletions(-)

1 0

[PATCH 8/8 v2] msvcrt: Don't use toupperW.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/dir.c | 2 +- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 7/8 v2] msvcrt: Don't use toupperW in _toupper_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)

1 0

[PATCH 6/8 v2] msvcrt: Don't use toupperW in _towupper_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 5/8 v2] msvcrt: Don't use tolowerW.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH 4/8 v2] msvcrt: Don't use tolowerW and toupperW in _setmbcp_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[PATCH 3/8 v2] msvcrt: Don't use tolowerW in _tolower_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 20 ++++++-------------- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 7 insertions(+), 14 deletions(-)

1 0

[PATCH 2/8 v2] msvcrt: Don't use tolowerW in _towlower_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 1/8 v2] msvcrt: Improve __crtLCMapStringA implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - use __crtLCMapStringA in _tolower_l and _toupper_l dlls/msvcrt/locale.c | 52 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 6 deletions(-)

1 0

[PATCH] ntdll: Fix PE unwind info for %rsi, %rdi in KiUserExceptionDispatcher.
by Paul Gofman 16 Jul '20

16 Jul '20

Fixes StarCraft crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 16 +++--- dlls/ntdll/tests/exception.c | 100 ++++++++++++++++++++++++++++++----- 2 files changed, 95 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 57f9aee8105..4ce7deb71cb 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -585,22 +585,22 @@ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, "mov %rbp,-0x10(%rcx)\n\t" "mov %rdi,-0x18(%rcx)\n\t" "mov %rsi,-0x20(%rcx)\n\t" - "lea -0x10(%rcx),%rbp\n\t" + "lea -0x20(%rcx),%rbp\n\t" "mov %rsp,%rdx\n\t" /* context */ "lea 0x4f0(%rsp),%rcx\n\t" /* rec */ __ASM_SEH(".seh_pushreg %rbp\n\t") - __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_SEH(".seh_pushreg %rdi\n\t") __ASM_SEH(".seh_pushreg %rsi\n\t") + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_signal_frame\n\t") - __ASM_CFI(".cfi_adjust_cfa_offset 0x10\n\t") - __ASM_CFI(".cfi_def_cfa %rbp,0x10\n\t") - __ASM_CFI(".cfi_rel_offset %rip,0x8\n\t") - __ASM_CFI(".cfi_rel_offset %rbp,0x0\n\t") - __ASM_CFI(".cfi_rel_offset %rdi,-0x8\n\t") - __ASM_CFI(".cfi_rel_offset %rsi,-0x10\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x20\n\t") + __ASM_CFI(".cfi_def_cfa %rbp,0x20\n\t") + __ASM_CFI(".cfi_rel_offset %rip,0x18\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0x10\n\t") + __ASM_CFI(".cfi_rel_offset %rdi,0x8\n\t") + __ASM_CFI(".cfi_rel_offset %rsi,0\n\t") "call " __ASM_NAME("dispatch_exception") "\n\t" "int3") diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c78f4911083..44b00ad7b00 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2825,6 +2825,22 @@ static BOOL hook_called; static void *hook_KiUserExceptionDispatcher_rip; static void *dbg_except_continue_handler_rip; static void *hook_exception_address; +static struct +{ + ULONG64 old_rax; + ULONG64 old_rdx; + ULONG64 old_rsi; + ULONG64 old_rdi; + ULONG64 old_rbp; + ULONG64 old_rsp; + ULONG64 new_rax; + ULONG64 new_rdx; + ULONG64 new_rsi; + ULONG64 new_rdi; + ULONG64 new_rbp; + ULONG64 new_rsp; +} +test_kiuserexceptiondispatcher_regs; static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) @@ -2836,6 +2852,8 @@ static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGIST memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, sizeof(saved_KiUserExceptionDispatcher_bytes)); + RtlUnwind((void *)test_kiuserexceptiondispatcher_regs.old_rsp, + (BYTE *)code_mem + 0x28, rec, (void *)0xdeadbeef); return ExceptionContinueExecution; } @@ -2853,6 +2871,10 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE if (NtCurrentTeb()->Peb->BeingDebugged) ++context->Rip; + if (context->Rip >= (ULONG64)code_mem && context->Rip < (ULONG64)code_mem + 0x100) + RtlUnwind((void *)test_kiuserexceptiondispatcher_regs.old_rsp, + (BYTE *)code_mem + 0x28, rec, (void *)0xdeadbeef); + return EXCEPTION_CONTINUE_EXECUTION; } @@ -2869,15 +2891,43 @@ void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *conte hook_KiUserExceptionDispatcher_rip = (void *)context->Rip; hook_exception_address = rec->ExceptionAddress; - memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, sizeof(saved_KiUserExceptionDispatcher_bytes)); + memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, + sizeof(saved_KiUserExceptionDispatcher_bytes)); } static void test_kiuserexceptiondispatcher(void) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); - static const BYTE except_code[] = + static BYTE except_code[] = { + 0x48, 0xb9, /* mov imm64, %rcx */ + /* offset: 0x2 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + + 0x48, 0x89, 0x01, /* mov %rax, (%rcx) */ + 0x48, 0x89, 0x51, 0x08, /* mov %rdx, 0x8(%rcx) */ + 0x48, 0x89, 0x71, 0x10, /* mov %rsi, 0x10(%rcx) */ + 0x48, 0x89, 0x79, 0x18, /* mov %rdi, 0x18(%rcx) */ + 0x48, 0x89, 0x69, 0x20, /* mov %rbp, 0x20(%rcx) */ + 0x48, 0x89, 0x61, 0x28, /* mov %rsp, 0x28(%rcx) */ + 0x48, 0x83, 0xc1, 0x30, /* add $0x30, %rcx */ + + /* offset: 0x25 */ 0xcc, /* int3 */ + + 0x0f, 0x0b, /* ud2, illegal instruction */ + + /* offset: 0x28 */ + 0x48, 0xb9, /* mov imm64, %rcx */ + /* offset: 0x2a */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + + 0x48, 0x89, 0x01, /* mov %rax, (%rcx) */ + 0x48, 0x89, 0x51, 0x08, /* mov %rdx, 0x8(%rcx) */ + 0x48, 0x89, 0x71, 0x10, /* mov %rsi, 0x10(%rcx) */ + 0x48, 0x89, 0x79, 0x18, /* mov %rdi, 0x18(%rcx) */ + 0x48, 0x89, 0x69, 0x20, /* mov %rbp, 0x20(%rcx) */ + 0x48, 0x89, 0x61, 0x28, /* mov %rsp, 0x28(%rcx) */ 0xc3, /* ret */ }; static BYTE hook_trampoline[] = @@ -2901,6 +2951,7 @@ static void test_kiuserexceptiondispatcher(void) BYTE patched_KiUserExceptionDispatcher_bytes[12]; DWORD old_protect1, old_protect2; EXCEPTION_RECORD record; + void *bpt_address; BYTE *ptr; BOOL ret; @@ -2911,6 +2962,9 @@ static void test_kiuserexceptiondispatcher(void) return; } + *(ULONG64 *)(except_code + 2) = (ULONG64)&test_kiuserexceptiondispatcher_regs; + *(ULONG64 *)(except_code + 0x2a) = (ULONG64)&test_kiuserexceptiondispatcher_regs.new_rax; + ok(((ULONG64)&phook_KiUserExceptionDispatcher & 0xffffffff) == ((ULONG64)&phook_KiUserExceptionDispatcher), "Address is too long.\n"); ok(((ULONG64)&pKiUserExceptionDispatcher & 0xffffffff) == ((ULONG64)&pKiUserExceptionDispatcher), @@ -2945,13 +2999,24 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, + ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#lx.\n", + test_kiuserexceptiondispatcher_regs.new_rax); + ok(test_kiuserexceptiondispatcher_regs.old_rsi + == test_kiuserexceptiondispatcher_regs.new_rsi, "rsi does not match.\n"); + ok(test_kiuserexceptiondispatcher_regs.old_rdi + == test_kiuserexceptiondispatcher_regs.new_rdi, "rdi does not match.\n"); + ok(test_kiuserexceptiondispatcher_regs.old_rbp + == test_kiuserexceptiondispatcher_regs.new_rbp, "rbp does not match.\n"); + + bpt_address = (BYTE *)code_mem + 0x25; + + ok(hook_exception_address == bpt_address || broken(!hook_exception_address) /* Win2008 */, "Got unexpected exception address %p, expected %p.\n", - hook_exception_address, code_mem); - ok(hook_KiUserExceptionDispatcher_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", - hook_KiUserExceptionDispatcher_rip, code_mem); - ok(dbg_except_continue_handler_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", - dbg_except_continue_handler_rip, code_mem); + hook_exception_address, bpt_address); + ok(hook_KiUserExceptionDispatcher_rip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_rip, bpt_address); + ok(dbg_except_continue_handler_rip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_rip, bpt_address); memset(&record, 0, sizeof(record)); record.ExceptionCode = 0x80000003; @@ -2993,14 +3058,24 @@ static void test_kiuserexceptiondispatcher(void) sizeof(patched_KiUserExceptionDispatcher_bytes)); got_exception = 0; hook_called = FALSE; + run_exception_test(dbg_except_continue_handler, NULL, except_code, ARRAY_SIZE(except_code), PAGE_EXECUTE_READ); ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - ok(hook_KiUserExceptionDispatcher_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", - hook_KiUserExceptionDispatcher_rip, code_mem); - ok(dbg_except_continue_handler_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", - dbg_except_continue_handler_rip, code_mem); + ok(hook_KiUserExceptionDispatcher_rip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_rip, bpt_address); + ok(dbg_except_continue_handler_rip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_rip, bpt_address); + + ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#lx.\n", + test_kiuserexceptiondispatcher_regs.new_rax); + ok(test_kiuserexceptiondispatcher_regs.old_rsi + == test_kiuserexceptiondispatcher_regs.new_rsi, "rsi does not match.\n"); + ok(test_kiuserexceptiondispatcher_regs.old_rdi + == test_kiuserexceptiondispatcher_regs.new_rdi, "rdi does not match.\n"); + ok(test_kiuserexceptiondispatcher_regs.old_rbp + == test_kiuserexceptiondispatcher_regs.new_rbp, "rbp does not match.\n"); NtCurrentTeb()->Peb->BeingDebugged = 0; @@ -3997,7 +4072,6 @@ START_TEST(exception) NtCurrentTeb()->Peb->BeingDebugged = 0x98; test_closehandle(0, (HANDLE)0xdeadbeef); NtCurrentTeb()->Peb->BeingDebugged = 0; - #endif test_suspend_thread(); -- 2.26.2

1 0

[PATCH] wininet: Get rid of user buffer in create_cookie_url().
by Serge Gautherie 16 Jul '20

16 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/wininet/cookie.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index b5f779b..1786b3d 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -147,28 +147,31 @@ static cookie_domain_t *get_cookie_domain(substr_t domain, BOOL create) static WCHAR *create_cookie_url(substr_t domain, substr_t path, substr_t *ret_path) { - WCHAR user[UNLEN], *p, *url; + WCHAR *p, *url; DWORD len, user_len, i; static const WCHAR cookie_prefix[] = {'C','o','o','k','i','e',':'}; - user_len = ARRAY_SIZE(user); - if(!GetUserNameW(user, &user_len)) - return FALSE; - user_len--; + user_len = 0; + if(GetUserNameW(NULL, &user_len) || GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return NULL; + /* user_len already accounts for terminating NULL */ len = ARRAY_SIZE(cookie_prefix) + user_len + 1 /* @ */ + domain.len + path.len; - url = heap_alloc((len+1) * sizeof(WCHAR)); + url = heap_alloc(len * sizeof(WCHAR)); if(!url) return NULL; memcpy(url, cookie_prefix, sizeof(cookie_prefix)); p = url + ARRAY_SIZE(cookie_prefix); - memcpy(p, user, user_len*sizeof(WCHAR)); + if(!GetUserNameW(p, &user_len)) { + heap_free(url); + return NULL; + } p += user_len; - *p++ = '@'; + *(p - 1) = '@'; memcpy(p, domain.str, domain.len*sizeof(WCHAR)); p += domain.len; -- 2.10.0.windows.1

2 1

[PATCH 4/4 v2] ucrtbase/tests: Check errno in strtod tests.
by Piotr Caban 16 Jul '20

16 Jul '20

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/string.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

1 0

[PATCH 3/4 v2] msvcrt: Treat large exponent as overflow in strtod.
by Piotr Caban 16 Jul '20

16 Jul '20

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 2 +- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH 2/4 v2] msvcrt: Set errno in strtod.
by Piotr Caban 16 Jul '20

16 Jul '20

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 6 +++++- dlls/msvcrt/tests/string.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[PATCH 1/4 v2] msvcrt/tests: Check errno in strtod test.
by Piotr Caban 16 Jul '20

16 Jul '20

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - only patches 2 and 4 were changed - reset errno to 0 only in msvcrt.dll (other version of the dll are not doing it, it even depends on msvcrt.dll version) - always check errno in ucrtbase tests dlls/msvcrt/tests/string.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[PATCH 06/17] msvcrt: Don't use toupperW in _toupper_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-)

2 1

[PATCH resend] winapi_test: Add/remove headers for urlmon test, in tests.dat.
by Serge Gautherie 16 Jul '20

16 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to b3da4abc5771a7542409412c41b3356255f248b2. --- tools/winapi/tests.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..57a65e1 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1261,9 +1261,9 @@ Unit tests for data structure packing %header -basetsd.h winnt.h windef.h +guiddef.h urlmon.h %include -- 2.10.0.windows.1

2 1

[PATCH 05/17] msvcrt: Don't use toupperW in _towupper_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

2 1

[PATCH 1/2] comctl32/listview: Rename helper argument.
by Nikolay Sivov 16 Jul '20

16 Jul '20

Rpcndr.h defines "small" as char. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f1f09d201e0..1092a6ce9b0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8740,7 +8740,7 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) return oldspacing; } -static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) +static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL is_small) { INT cx, cy; @@ -8751,8 +8751,8 @@ static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) } else { - size->cx = GetSystemMetrics(small ? SM_CXSMICON : SM_CXICON); - size->cy = GetSystemMetrics(small ? SM_CYSMICON : SM_CYICON); + size->cx = GetSystemMetrics(is_small ? SM_CXSMICON : SM_CXICON); + size->cy = GetSystemMetrics(is_small ? SM_CYSMICON : SM_CYICON); } } -- 2.27.0

1 1

[PATCH 04/17] msvcrt: Don't use tolowerW.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-)

2 1

[PATCH 03/17] msvcrt: Don't use tolowerW and toupperW in _setmbcp_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

2 1

[PATCH 02/17] msvcrt: Don't use tolowerW in _tolower_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)

2 1

[PATCH 17/17] msvcrt: Add _ismbcpunct_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 16/17] msvcrt: Add _ismbcprint_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 15/17] msvcrt: Add _ismbcspace_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 13/17] msvcrt: Add _ismbclower_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 14/17] msvcrt: Add _ismbcupper_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 12/17] msvcrt: Add _ismbcalpha_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 11/17] msvcrt: Add _ismbcgraph_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 10/17] msvcrt: Add _ismbcdigit_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 09/17] msvcrt: Add _ismbcalnum_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 08/17] msvcrt: Add _ismbbkana_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 30 ++++++++++++++----- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +-- 11 files changed, 33 insertions(+), 19 deletions(-)

1 0

[PATCH 07/17] msvcrt: Don't use toupperW.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/dir.c | 2 +- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 01/17] msvcrt: Don't use tolowerW in _towlower_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH vkd3d 5/5] vkd3d-shader: Rename the vkd3d_texture_address_mode enumeration to vkd3d_shader_texture_address_mode.
by Henri Verbeet 16 Jul '20

16 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2ae35ae..20f9678 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -367,15 +367,15 @@ enum vkd3d_shader_filter VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_FILTER), }; -enum vkd3d_texture_address_mode +enum vkd3d_shader_texture_address_mode { - VKD3D_TEXTURE_ADDRESS_MODE_WRAP = 1, - VKD3D_TEXTURE_ADDRESS_MODE_MIRROR = 2, - VKD3D_TEXTURE_ADDRESS_MODE_CLAMP = 3, - VKD3D_TEXTURE_ADDRESS_MODE_BORDER = 4, - VKD3D_TEXTURE_ADDRESS_MODE_MIRROR_ONCE = 5, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_WRAP = 0x1, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_MIRROR = 0x2, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_CLAMP = 0x3, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_BORDER = 0x4, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_MIRROR_ONCE = 0x5, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_TEXTURE_ADDRESS_MODE), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TEXTURE_ADDRESS_MODE), }; enum vkd3d_comparison_func @@ -404,9 +404,9 @@ enum vkd3d_static_border_color struct vkd3d_static_sampler_desc { enum vkd3d_shader_filter filter; - enum vkd3d_texture_address_mode address_u; - enum vkd3d_texture_address_mode address_v; - enum vkd3d_texture_address_mode address_w; + enum vkd3d_shader_texture_address_mode address_u; + enum vkd3d_shader_texture_address_mode address_v; + enum vkd3d_shader_texture_address_mode address_w; float mip_lod_bias; unsigned int max_anisotropy; enum vkd3d_comparison_func comparison_func; -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Rename the vkd3d_filter enumeration to vkd3d_shader_filter.
by Henri Verbeet 16 Jul '20

16 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 82 +++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b2c3dc9..2ae35ae 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -325,46 +325,46 @@ struct vkd3d_shader_spirv_domain_shader_target_info }; /* root signature 1.0 */ -enum vkd3d_filter -{ - VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0, - VKD3D_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x1, - VKD3D_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x4, - VKD3D_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x5, - VKD3D_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x10, - VKD3D_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x11, - VKD3D_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x14, - VKD3D_FILTER_MIN_MAG_MIP_LINEAR = 0x15, - VKD3D_FILTER_ANISOTROPIC = 0x55, - VKD3D_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x80, - VKD3D_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x81, - VKD3D_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x84, - VKD3D_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x85, - VKD3D_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x90, - VKD3D_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91, - VKD3D_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x94, - VKD3D_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x95, - VKD3D_FILTER_COMPARISON_ANISOTROPIC = 0xd5, - VKD3D_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100, - VKD3D_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101, - VKD3D_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104, - VKD3D_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105, - VKD3D_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110, - VKD3D_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111, - VKD3D_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114, - VKD3D_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115, - VKD3D_FILTER_MINIMUM_ANISOTROPIC = 0x155, - VKD3D_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180, - VKD3D_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181, - VKD3D_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184, - VKD3D_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185, - VKD3D_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190, - VKD3D_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191, - VKD3D_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194, - VKD3D_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195, - VKD3D_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_FILTER), +enum vkd3d_shader_filter +{ + VKD3D_SHADER_FILTER_MIN_MAG_MIP_POINT = 0x000, + VKD3D_SHADER_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x001, + VKD3D_SHADER_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x004, + VKD3D_SHADER_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x005, + VKD3D_SHADER_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x010, + VKD3D_SHADER_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x011, + VKD3D_SHADER_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x014, + VKD3D_SHADER_FILTER_MIN_MAG_MIP_LINEAR = 0x015, + VKD3D_SHADER_FILTER_ANISOTROPIC = 0x055, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x080, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x081, + VKD3D_SHADER_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x084, + VKD3D_SHADER_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x085, + VKD3D_SHADER_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x090, + VKD3D_SHADER_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x091, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x094, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x095, + VKD3D_SHADER_FILTER_COMPARISON_ANISOTROPIC = 0x0d5, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101, + VKD3D_SHADER_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104, + VKD3D_SHADER_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105, + VKD3D_SHADER_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110, + VKD3D_SHADER_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115, + VKD3D_SHADER_FILTER_MINIMUM_ANISOTROPIC = 0x155, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195, + VKD3D_SHADER_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_FILTER), }; enum vkd3d_texture_address_mode @@ -403,7 +403,7 @@ enum vkd3d_static_border_color struct vkd3d_static_sampler_desc { - enum vkd3d_filter filter; + enum vkd3d_shader_filter filter; enum vkd3d_texture_address_mode address_u; enum vkd3d_texture_address_mode address_v; enum vkd3d_texture_address_mode address_w; -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Rename the vkd3d_root_descriptor structure to vkd3d_shader_root_descriptor.
by Henri Verbeet 16 Jul '20

16 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0323766..b2c3dc9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -450,7 +450,7 @@ struct vkd3d_shader_root_constants unsigned int value_count; }; -struct vkd3d_root_descriptor +struct vkd3d_shader_root_descriptor { unsigned int shader_register; unsigned int register_space; @@ -474,7 +474,7 @@ struct vkd3d_root_parameter { struct vkd3d_shader_root_descriptor_table descriptor_table; struct vkd3d_shader_root_constants constants; - struct vkd3d_root_descriptor descriptor; + struct vkd3d_shader_root_descriptor descriptor; } u; enum vkd3d_shader_visibility shader_visibility; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a247d5c..1fb8dc8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2376,7 +2376,7 @@ static int shader_parse_root_constants(struct root_signature_parser_context *con } static int shader_parse_root_descriptor(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor *descriptor) + unsigned int offset, struct vkd3d_shader_root_descriptor *descriptor) { const char *ptr; @@ -2890,7 +2890,7 @@ static int shader_write_root_constants(struct root_signature_writer_context *con } static int shader_write_root_descriptor(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor *descriptor) + const struct vkd3d_shader_root_descriptor *descriptor) { if (!write_dword(context, descriptor->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY; -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_root_constants structure to vkd3d_shader_root_constants.
by Henri Verbeet 16 Jul '20

16 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 6 +++--- libs/vkd3d-shader/dxbc.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6fa2505..0323766 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -443,7 +443,7 @@ struct vkd3d_shader_root_descriptor_table const struct vkd3d_shader_descriptor_range *descriptor_ranges; }; -struct vkd3d_root_constants +struct vkd3d_shader_root_constants { unsigned int shader_register; unsigned int register_space; @@ -473,7 +473,7 @@ struct vkd3d_root_parameter union { struct vkd3d_shader_root_descriptor_table descriptor_table; - struct vkd3d_root_constants constants; + struct vkd3d_shader_root_constants constants; struct vkd3d_root_descriptor descriptor; } u; enum vkd3d_shader_visibility shader_visibility; @@ -553,7 +553,7 @@ struct vkd3d_root_parameter1 union { struct vkd3d_root_descriptor_table1 descriptor_table; - struct vkd3d_root_constants constants; + struct vkd3d_shader_root_constants constants; struct vkd3d_root_descriptor1 descriptor; } u; enum vkd3d_shader_visibility shader_visibility; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0848c04..a247d5c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2354,7 +2354,7 @@ static int shader_parse_descriptor_table1(struct root_signature_parser_context * } static int shader_parse_root_constants(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_constants *constants) + unsigned int offset, struct vkd3d_shader_root_constants *constants) { const char *ptr; @@ -2696,7 +2696,7 @@ static enum vkd3d_shader_visibility versioned_root_signature_get_parameter_shade return desc->u.v_1_1.parameters[i].shader_visibility; } -static const struct vkd3d_root_constants *versioned_root_signature_get_root_constants( +static const struct vkd3d_shader_root_constants *versioned_root_signature_get_root_constants( const struct vkd3d_versioned_root_signature_desc *desc, unsigned int i) { if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) @@ -2877,7 +2877,7 @@ static int shader_write_descriptor_table1(struct root_signature_writer_context * } static int shader_write_root_constants(struct root_signature_writer_context *context, - const struct vkd3d_root_constants *constants) + const struct vkd3d_shader_root_constants *constants) { if (!write_dword(context, constants->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY; -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Rename the vkd3d_root_descriptor_table structure to vkd3d_shader_root_descriptor_table.
by Henri Verbeet 16 Jul '20

16 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1ce701c..6fa2505 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -437,7 +437,7 @@ struct vkd3d_shader_descriptor_range unsigned int descriptor_table_offset; }; -struct vkd3d_root_descriptor_table +struct vkd3d_shader_root_descriptor_table { unsigned int descriptor_range_count; const struct vkd3d_shader_descriptor_range *descriptor_ranges; @@ -472,7 +472,7 @@ struct vkd3d_root_parameter enum vkd3d_shader_root_parameter_type parameter_type; union { - struct vkd3d_root_descriptor_table descriptor_table; + struct vkd3d_shader_root_descriptor_table descriptor_table; struct vkd3d_root_constants constants; struct vkd3d_root_descriptor descriptor; } u; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6297a04..0848c04 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2300,7 +2300,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context } static int shader_parse_descriptor_table(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor_table *table) + unsigned int offset, struct vkd3d_shader_root_descriptor_table *table) { struct vkd3d_shader_descriptor_range *ranges; unsigned int count; @@ -2807,7 +2807,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte } static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table *table) + const struct vkd3d_shader_root_descriptor_table *table) { const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; unsigned int i; @@ -2855,7 +2855,7 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context } static int shader_write_descriptor_table(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table *table) + const struct vkd3d_shader_root_descriptor_table *table) { if (!write_dword(context, table->descriptor_range_count)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -3036,7 +3036,7 @@ static int shader_write_root_signature(struct root_signature_writer_context *con return shader_write_static_samplers(context, desc); } -static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_table *descriptor_table) +static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table) { bool have_srv_uav_cbv = false; bool have_sampler = false; -- 2.11.0

1 0

[PATCH] comctl32/listview: Use case-insensitive compare in LVM_FINDITEM.
by Nikolay Sivov 16 Jul '20

16 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 12 +++++++++--- dlls/comctl32/tests/listview.c | 13 +++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f1f09d201e0..1e9902fd6c1 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6292,6 +6292,13 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *infoPtr, INT nItem, BOOL bPart return TRUE; } +static unsigned int startswithW(const WCHAR *str, const WCHAR *sub) +{ + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && towlower(*p1) == towlower(*p2)) { p1++; p2++; } + return !*p2; +} + /*** * DESCRIPTION: * Searches for an item with specific characteristics. @@ -6398,12 +6405,11 @@ again: { if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) { - WCHAR *p = wcsstr(lvItem.pszText, lpFindInfo->psz); - if (!p || p != lvItem.pszText) continue; + if (!startswithW(lvItem.pszText, lpFindInfo->psz)) continue; } else { - if (lstrcmpW(lvItem.pszText, lpFindInfo->psz) != 0) continue; + if (lstrcmpiW(lvItem.pszText, lpFindInfo->psz)) continue; } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 20b9873d30d..c19de7f03f9 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5366,6 +5366,19 @@ static void test_finditem(void) r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(0, r); + /* Case sensitivity. */ + strcpy(f, "Foo"); + fi.flags = LVFI_STRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + + strcpy(f, "F"); + fi.flags = LVFI_SUBSTRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + DestroyWindow(hwnd); } -- 2.27.0

2 1

[PATCH 1/5] quartz/tests: Test previous filter states.
by Zebediah Figura 16 Jul '20

16 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 0c627aaeafb..bd6562b0ed5 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1166,14 +1166,15 @@ struct testfilter IFilterGraph *graph; WCHAR *name; IReferenceClock *clock; - FILTER_STATE state; - REFERENCE_TIME start_time; IEnumPins IEnumPins_iface; struct testpin *pins; unsigned int pin_count, enum_idx; + FILTER_STATE state; + REFERENCE_TIME start_time; HRESULT state_hr, GetState_hr, seek_hr; + FILTER_STATE expect_stop_prev, expect_run_prev; IAMFilterMiscFlags IAMFilterMiscFlags_iface; ULONG misc_flags; @@ -1358,6 +1359,10 @@ static HRESULT WINAPI testfilter_Stop(IBaseFilter *iface) struct testfilter *filter = impl_from_IBaseFilter(iface); if (winetest_debug > 1) trace("%p->Stop()\n", filter); + todo_wine_if (filter->expect_stop_prev == State_Running) + ok(filter->state == filter->expect_stop_prev, "Expected previous state %#x, got %#x.\n", + filter->expect_stop_prev, filter->state); + check_state_transition(filter, State_Stopped); filter->state = State_Stopped; @@ -1380,6 +1385,9 @@ static HRESULT WINAPI testfilter_Run(IBaseFilter *iface, REFERENCE_TIME start) struct testfilter *filter = impl_from_IBaseFilter(iface); if (winetest_debug > 1) trace("%p->Run(%s)\n", filter, wine_dbgstr_longlong(start)); + ok(filter->state == filter->expect_run_prev, "Expected previous state %#x, got %#x.\n", + filter->expect_run_prev, filter->state); + check_state_transition(filter, State_Running); filter->state = State_Running; @@ -1831,7 +1839,9 @@ static void testfilter_init(struct testfilter *filter, struct testpin *pins, int filter->pin_count = pin_count; for (i = 0; i < pin_count; i++) pins[i].filter = &filter->IBaseFilter_iface; + filter->state = State_Stopped; + filter->expect_stop_prev = filter->expect_run_prev = State_Paused; } static HRESULT WINAPI testfilter_cf_QueryInterface(IClassFactory *iface, REFIID iid, void **out) @@ -3383,6 +3393,7 @@ static void test_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); + source.expect_run_prev = sink.expect_run_prev = State_Stopped; hr = IReferenceClock_GetTime(clock, &start_time); ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); hr = IMediaFilter_Run(filter, 0); @@ -3400,6 +3411,7 @@ static void test_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Paused); + source.expect_run_prev = sink.expect_run_prev = State_Paused; hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); @@ -3587,6 +3599,7 @@ todo_wine /* This logic doesn't apply when using IMediaFilter methods directly. */ + source.expect_run_prev = sink.expect_run_prev = State_Stopped; sink.state_hr = S_FALSE; sink.GetState_hr = VFW_S_STATE_INTERMEDIATE; hr = IMediaFilter_Run(filter, 0); @@ -3610,6 +3623,8 @@ todo_wine ok(sink.state == State_Stopped, "Got state %u.\n", sink.state); ok(source.state == State_Stopped, "Got state %u.\n", source.state); + source.expect_run_prev = sink.expect_run_prev = State_Paused; + /* Test VFW_S_CANT_CUE. */ sink.GetState_hr = VFW_S_CANT_CUE; @@ -3658,7 +3673,7 @@ todo_wine /* Destroying the graph while it's running stops all filters. */ - hr = IMediaFilter_Run(filter, 0); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); todo_wine @@ -3667,6 +3682,7 @@ todo_wine ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + source.expect_stop_prev = sink.expect_stop_prev = State_Running; IMediaFilter_Release(filter); IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); -- 2.27.0

1 4

[PATCH 2/4] mountmgr: Add support for IRP_MJ_QUERY_VOLUME_INFORMATION.
by Erich E. Hoover 16 Jul '20

16 Jul '20

This patch allows the mountmgr to handle the volume information request IRP, allowing volume information to be queried from the mountmgr. Best, Erich

2 3

[PATCH v2 1/6] ntoskrnl.exe: Add tests for permanent objects.
by Zebediah Figura 16 Jul '20

16 Jul '20

These tests have to live in ntoskrnl, since only kernel drivers and processes running as LOCAL SYSTEM can create permanent objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 ++-- dlls/ntoskrnl.exe/tests/driver.c | 49 +++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6acdec5dc5a..0f65490b487 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1378,7 +1378,7 @@ @ stdcall ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm @ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort -@ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject +@ stdcall ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall ZwCreateEvent(ptr long ptr long long) NtCreateEvent @ stdcall ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile @ stdcall -private ZwCreateIoCompletion(ptr long ptr long) NtCreateIoCompletion @@ -1412,11 +1412,11 @@ @ stdcall -private ZwLoadKey(ptr ptr) NtLoadKey @ stdcall -private ZwLockFile(long long ptr ptr ptr ptr ptr ptr long long) NtLockFile @ stdcall -private ZwLockVirtualMemory(long ptr ptr long) NtLockVirtualMemory -@ stdcall -private ZwMakeTemporaryObject(long) NtMakeTemporaryObject +@ stdcall ZwMakeTemporaryObject(long) NtMakeTemporaryObject @ stdcall -private ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection @ stdcall -private ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile @ stdcall -private ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey -@ stdcall -private ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject +@ stdcall ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject @ stdcall -private ZwOpenEvent(ptr long ptr) NtOpenEvent @ stdcall ZwOpenFile(ptr long ptr ptr long long) NtOpenFile @ stdcall -private ZwOpenJobObject(ptr long ptr) NtOpenJobObject diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index bb5bbeb4fa5..0ae63ffafb3 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2024,6 +2024,54 @@ static void test_process_memory(const struct test_input *test_input) ObDereferenceObject(process); } +static void test_permanence(void) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle, handle2; + UNICODE_STRING str; + NTSTATUS status; + + RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\wine_test_dir"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + + attr.Attributes = OBJ_PERMANENT; + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + + attr.Attributes = 0; + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + todo_wine ok(!status, "got %#x\n", status); + status = ZwMakeTemporaryObject( handle ); + ok(!status, "got %#x\n", status); + status = ZwMakeTemporaryObject( handle ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + todo_wine ok(!status, "got %#x\n", status); + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + attr.Attributes = OBJ_PERMANENT; + status = ZwOpenDirectoryObject( &handle2, 0, &attr ); + ok(status == STATUS_SUCCESS, "got %#x\n", status); + status = ZwClose( handle2 ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + attr.Attributes = 0; + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -2080,6 +2128,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_affinity(); test_dpc(); test_process_memory(test_input); + test_permanence(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; -- 2.27.0

2 7

[PATCH 1/6] ntoskrnl.exe: Add tests for permanent objects.
by Zebediah Figura 16 Jul '20

16 Jul '20

These tests have to live in ntoskrnl, since only kernel drivers and processes running as LOCAL SYSTEM can create permanent objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 ++-- dlls/ntoskrnl.exe/tests/driver.c | 49 +++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6acdec5dc5a..0f65490b487 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1378,7 +1378,7 @@ @ stdcall ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm @ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort -@ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject +@ stdcall ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall ZwCreateEvent(ptr long ptr long long) NtCreateEvent @ stdcall ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile @ stdcall -private ZwCreateIoCompletion(ptr long ptr long) NtCreateIoCompletion @@ -1412,11 +1412,11 @@ @ stdcall -private ZwLoadKey(ptr ptr) NtLoadKey @ stdcall -private ZwLockFile(long long ptr ptr ptr ptr ptr ptr long long) NtLockFile @ stdcall -private ZwLockVirtualMemory(long ptr ptr long) NtLockVirtualMemory -@ stdcall -private ZwMakeTemporaryObject(long) NtMakeTemporaryObject +@ stdcall ZwMakeTemporaryObject(long) NtMakeTemporaryObject @ stdcall -private ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection @ stdcall -private ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile @ stdcall -private ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey -@ stdcall -private ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject +@ stdcall ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject @ stdcall -private ZwOpenEvent(ptr long ptr) NtOpenEvent @ stdcall ZwOpenFile(ptr long ptr ptr long long) NtOpenFile @ stdcall -private ZwOpenJobObject(ptr long ptr) NtOpenJobObject diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index bb5bbeb4fa5..0ae63ffafb3 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2024,6 +2024,54 @@ static void test_process_memory(const struct test_input *test_input) ObDereferenceObject(process); } +static void test_permanence(void) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle, handle2; + UNICODE_STRING str; + NTSTATUS status; + + RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\wine_test_dir"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + + attr.Attributes = OBJ_PERMANENT; + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + + attr.Attributes = 0; + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + todo_wine ok(!status, "got %#x\n", status); + status = ZwMakeTemporaryObject( handle ); + ok(!status, "got %#x\n", status); + status = ZwMakeTemporaryObject( handle ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + todo_wine ok(!status, "got %#x\n", status); + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + attr.Attributes = OBJ_PERMANENT; + status = ZwOpenDirectoryObject( &handle2, 0, &attr ); + ok(status == STATUS_SUCCESS, "got %#x\n", status); + status = ZwClose( handle2 ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + attr.Attributes = 0; + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -2080,6 +2128,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_affinity(); test_dpc(); test_process_memory(test_input); + test_permanence(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; -- 2.27.0

2 8

[PATCH 1/5] ntoskrnl.exe: Store current thread object at right offset from GS.
by Derek Lesho 15 Jul '20

15 Jul '20

In kernel mode, GS base is not set to a TEB, but fortunately the offset for the current thread object, which EasyAntiCheat.sys relies on, doesn't conflict with anything in the TEB. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d407cffee69..2430b0d9202 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -870,7 +870,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) for (;;) { - NtCurrentTeb()->Reserved5[1] = NULL; + NtCurrentTeb()->SystemReserved1[15] = NULL; if (!context.in_buff && !(context.in_buff = HeapAlloc( GetProcessHeap(), 0, context.in_size ))) { ERR( "failed to allocate buffer\n" ); @@ -891,7 +891,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) context.params = reply->params; context.in_size = reply->in_size; client_tid = reply->client_tid; - NtCurrentTeb()->Reserved5[1] = wine_server_get_ptr( reply->client_thread ); + NtCurrentTeb()->SystemReserved1[15] = wine_server_get_ptr( reply->client_thread ); } else { @@ -2339,7 +2339,7 @@ POBJECT_TYPE PsThreadType = &thread_type; */ PRKTHREAD WINAPI KeGetCurrentThread(void) { - struct _KTHREAD *thread = NtCurrentTeb()->Reserved5[1]; + struct _KTHREAD *thread = NtCurrentTeb()->SystemReserved1[15]; if (!thread) { @@ -2352,7 +2352,7 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) kernel_object_from_handle( handle, PsThreadType, (void**)&thread ); if (handle != GetCurrentThread()) NtClose( handle ); - NtCurrentTeb()->Reserved5[1] = thread; + NtCurrentTeb()->SystemReserved1[15] = thread; } return thread; @@ -2881,6 +2881,22 @@ DEVICE_OBJECT* WINAPI IoGetAttachedDeviceReference( DEVICE_OBJECT *device ) } +struct system_thread_ctx +{ + PKSTART_ROUTINE start; + PVOID context; +}; + +static void WINAPI init_system_thread(PVOID context) +{ + struct system_thread_ctx info = *(struct system_thread_ctx *)context; + HeapFree( GetProcessHeap(), 0, context ); + + NtCurrentTeb()->SystemReserved1[15] = KeGetCurrentThread(); + + info.start(info.context); +} + /*********************************************************************** * PsCreateSystemThread (NTOSKRNL.EXE.@) */ @@ -2889,9 +2905,16 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, HANDLE ProcessHandle, PCLIENT_ID ClientId, PKSTART_ROUTINE StartRoutine, PVOID StartContext) { + struct system_thread_ctx *info; + if (!ProcessHandle) ProcessHandle = GetCurrentProcess(); + + info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) ); + info->start = StartRoutine; + info->context = StartContext; + return RtlCreateUserThread(ProcessHandle, 0, FALSE, 0, 0, - 0, StartRoutine, StartContext, + 0, init_system_thread, info, ThreadHandle, ClientId); } -- 2.27.0

2 6

[PATCH 1/4] msvcrt/tests: Check errno in strtod test.
by Daniel Lehman 15 Jul '20

15 Jul '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msvcrt/tests/string.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b5b877e7ec..ccbd049c4c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1938,6 +1938,7 @@ static void test__strtod(void) const char *str; int len; double ret; + int err; } tests[] = { { "12.1", 4, 12.1 }, { "-13.721", 7, -13.721 }, @@ -1953,7 +1954,7 @@ static void test__strtod(void) { "0.82181281288121", 16, 0.82181281288121 }, { "21921922352523587651128218821", 29, 21921922352523587651128218821.0 }, { "0.1d238", 7, 0.1e238 }, - { "0.1D-4736", 9, 0 }, + { "0.1D-4736", 9, 0, ERANGE }, { "3.4028234663852887e38", 21, FLT_MAX }, { "1.7976931348623158e+308", 23, DBL_MAX }, { "00", 2, 0 }, @@ -1975,7 +1976,8 @@ static void test__strtod(void) ok(d == tests[i].ret, "%d) d = %.16e\n", i, d); ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", i, (int)(end - tests[i].str)); - ok(errno = 0xdeadbeef, "%d) errno = %d\n", i, errno); + todo_wine_if(!tests[i].err) + ok(errno == tests[i].err, "%d) errno = %d\n", i, errno); } if (!p__strtod_l) -- 2.25.1

1 3

[PATCH v2 1/4] server: Introduce IOCTL_CONDRV_GET_TITLE ioctl.
by Jacek Caban 15 Jul '20

15 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Thanks, Zebediah include/wine/condrv.h | 1 + server/console.c | 4 ++++ 2 files changed, 5 insertions(+)

1 0

[PATCH 1/4] server: Introduce IOCTL_CONDRV_SET_TITLE ioctl.
by Jacek Caban 15 Jul '20

15 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 1 + server/console.c | 4 ++++ 2 files changed, 5 insertions(+)

2 1

[PATCH 4/4] ntdll: Silence server_ioctl_file debug traces.
by Jacek Caban 15 Jul '20

15 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 3/4] server: Trace console ioctls.
by Jacek Caban 15 Jul '20

15 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/trace.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[PATCH 2/4] wineconsole: Use IOCTL_CONDRV_GET_TITLE in WINECON_GetConsoleTitle.
by Jacek Caban 15 Jul '20

15 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/wineconsole.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)

1 0

[PATCH 4/4] kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle.
by Erich E. Hoover 15 Jul '20

15 Jul '20

This patch removes the volume querying information duplication in kernelbase by re-implementing GetVolumeInformation using GetVolumeInformationByHandle (itself implemented with NtQueryVolumeInformationFile). Best, Erich

1 0

[PATCH 3/4] ntdll: Allow NtQueryVolumeInformationFile to query volume information from the mountmgr.
by Erich E. Hoover 15 Jul '20

15 Jul '20

This patch allows NtQueryVolumeInformationFile to pass FileFsVolumeInformation and FileFsAttributeInformation requests to the mountmgr. These requests currently do not work for NT device paths, which results in a bunch of duplication in kernelbase. Best, Erich

1 0

[PATCH v2] mlang: Fix scripts values in fnIMLangFontLink2_GetScriptFontInfo().
by Serge Gautherie 15 Jul '20

15 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- MSVC: '...\mlang.c(3568): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)' --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1b1aed3..e3582cc 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3565,7 +3565,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, { if (j >= *puiFonts) break; - pScriptFont[j].scripts = 1 << mlang_data[i].sid; + pScriptFont[j].scripts = (SCRIPT_IDS)1 << mlang_data[i].sid; if (dwFlags == SCRIPTCONTF_FIXED_FONT) { MultiByteToWideChar(CP_ACP, 0, mlang_data[i].fixed_font, -1, -- 2.10.0.windows.1

1 0

[PATCH 1/4] server: Allow get_volume_info to issue IRP_MJ_QUERY_VOLUME_INFORMATION.
by Erich E. Hoover 15 Jul '20

15 Jul '20

Per AJ's request for splitting, this patch allows the get_volume_info request to issue an IRP to request the volume information from the mountmgr. Sorry it's taken me awhile to get to this :/ Note that patch 1 and 2 can be applied in opposite order, if desired. Best, Erich

1 0

[PATCH] RegisterTypeLib: only cut off non-empty \[0-9]+$ resource-id
by Puetz Kevin A 15 Jul '20

15 Jul '20

Fixes mis-applied patch in 5ecd6e4807d4b145a06e653dc1bb2f16678d0c14 The check was mistakenly changed to check file_name[0] when merging. The original intent was that since wcsrchr returns a pointer to the '\\', if (file_name != NULL), we already know file_name[0] != '\0' because '\\'!='\0' The check was intentionally whether the *next* character, file_name[1], was '\0', i.e. whether szFullPath ended with '\\' (was explicitly a directory). Passing a directory is incorrect input (szFullPath should be a .tlb file), but for quality-of-implemnentation it still seems wrong to have this remove two path elements, e.g. currently "path\\to\\" truncates to "path\\to" as if the last "\\" delimited a resource id, then splits the filename yielding szHelpDir == "path" and file_name == "to", rather than szHelpDir=="path\\to" and file_name == "" as seems intended (and as the originally-submitted patch would have). Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 01bb16efbc..06667850a3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -730,7 +730,7 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W if ((disposition == REG_CREATED_NEW_KEY) && (szHelpDir == NULL)) { szHelpDir = freeHelpDir = SysAllocString(szFullPath); file_name = wcsrchr(szHelpDir, '\\'); - if (file_name && file_name[0]) { + if (file_name && file_name[1]) { /* possible remove a numeric \index (resource-id) */ WCHAR *end_ptr = file_name + 1; while ('0' <= *end_ptr && *end_ptr <= '9') end_ptr++;

1 0

[PATCH v5 1/5] windowscodecs: Implement DdsDecoder_Wine_Initialize().
by Ziqing Hui 15 Jul '20

15 Jul '20

Code in DdsDecoder_Initialize() are moved to DdsDecoder_Wine_Initialize(). And DdsDecoder_Initialize() are implemented on top of DdsDecoder_Wine_Initialize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v5: Remove the format validation in this patch to satisfy d3dx10 tests. dlls/windowscodecs/ddsformat.c | 126 +++++++++++++++++---------------- 1 file changed, 66 insertions(+), 60 deletions(-)

2 1

[PATCH 1/2] gdiplus/tests: Add additional logfont size tests.
by Shawn M. Chapla 15 Jul '20

15 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/font.c | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 10d1f3bd5a..74cf451e36 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -300,6 +300,56 @@ static void test_logfont(void) GdipDeleteFontFamily(family); GdipDeleteFont(font); + font = NULL; + + /* The next test must be done with a font where tmHeight - + tmInternalLeading != tmAscent. Times New Roman is such a font, + so make sure we really have it before continuing. */ + memset(&lfa, 0, sizeof(lfa)); + lstrcpyA(lfa.lfFaceName, "Times New Roman"); + + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + expect(Ok, stat); + + memset(&lfa2, 0, sizeof(lfa2)); + stat = GdipGetLogFontA(font, graphics, &lfa2); + expect(Ok, stat); + + GdipDeleteFont(font); + font = NULL; + + if (!lstrlenA(lfa.lfFaceName) || lstrcmpA(lfa.lfFaceName, lfa2.lfFaceName)) + { + skip("Times New Roman not installed\n"); + } + else + { + static const struct + { + INT input; + REAL expected; + } test_sizes[] = {{12, 9.0}, {36, 32.0}, {48, 42.0}, {72, 63.0}, {144, 127.0}}; + + UINT i; + + memset(&lfa, 0, sizeof(lfa)); + lstrcpyA(lfa.lfFaceName, "Times New Roman"); + + for (i = 0; i < sizeof(test_sizes)/sizeof(test_sizes[0]); ++i) + { + lfa.lfHeight = test_sizes[i].input; + + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + expect(Ok, stat); + + stat = GdipGetFontSize(font, &rval); + expect(Ok, stat); + todo_wine expectf(test_sizes[i].expected, rval); + + GdipDeleteFont(font); + font = NULL; + } + } GdipDeleteGraphics(graphics); ReleaseDC(0, hdc); -- 2.27.0

2 3

[PATCH v5 2/5] windowscodecs: In find_decoder(), get rid of nested if by using goto, and use IWICWineDecoder_Initialize() to initialize decoders.
by Ziqing Hui 15 Jul '20

15 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- If we keep the nested if in find_decoder(), after code for calling IWICWineDecoder_Initialize() is added, the nested blocks will become too deep, which makes the code really hard to read. So here I use goto to get rid of them. v5: It's a new patch in this patch set. dlls/windowscodecs/imgfactory.c | 101 ++++++++++++++++---------------- 1 file changed, 50 insertions(+), 51 deletions(-)

2 1

[PATCH] InlineIsEqualGUID makes use of undefined ULONG type
by Puetz Kevin A 15 Jul '20

15 Jul '20

This breaks stand-alone inclusion of <guiddef.h> (without first including <basetsd.h>), which is supposed to be OK. According to <basetsd.h> wine supports ILP32, LP64 or P64, so `unsigned long` isn't safe - `long` might be a 64-bit type. But `unsigned int` should be 32-bit for any of those models This is a type-punning cast regardless; REFGUID is not actually ULONG[4] either Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- E.g. https://docs.microsoft.com/en-us/windows/win32/api/guiddef/nf-guiddef-isequ… says > Header: guiddef.h (include GuidDef.h, Objbase.h) Rather than the common "(include Windows.h)"; this header is meant to be usable stand-alone --- include/guiddef.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 664f74fac3..a25b3a7107 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -156,18 +156,18 @@ typedef GUID FMTID,*LPFMTID; #define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID))) inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) { - return (((ULONG *)&rguid1)[0] == ((ULONG *)&rguid2)[0] && - ((ULONG *)&rguid1)[1] == ((ULONG *)&rguid2)[1] && - ((ULONG *)&rguid1)[2] == ((ULONG *)&rguid2)[2] && - ((ULONG *)&rguid1)[3] == ((ULONG *)&rguid2)[3]); + return (((unsigned int *)&rguid1)[0] == ((unsigned int *)&rguid2)[0] && + ((unsigned int *)&rguid1)[1] == ((unsigned int *)&rguid2)[1] && + ((unsigned int *)&rguid1)[2] == ((unsigned int *)&rguid2)[2] && + ((unsigned int *)&rguid1)[3] == ((unsigned int *)&rguid2)[3]); } #else #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #define InlineIsEqualGUID(rguid1, rguid2) \ - (((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \ - ((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \ - ((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \ - ((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3]) + (((unsigned int *)rguid1)[0] == ((unsigned int *)rguid2)[0] && \ + ((unsigned int *)rguid1)[1] == ((unsigned int *)rguid2)[1] && \ + ((unsigned int *)rguid1)[2] == ((unsigned int *)rguid2)[2] && \ + ((unsigned int *)rguid1)[3] == ((unsigned int *)rguid2)[3]) #endif #ifdef __cplusplus

1 0

[PATCH 1/3] mf/topoloader: Switch to public interface for initial topology validation.
by Nikolay Sivov 15 Jul '20

15 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/topology.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index abe66c45fd4..fdb2944676a 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1936,38 +1936,50 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface) static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *input_topology, IMFTopology **output_topology, IMFTopology *current_topology) { - struct topology *topology = unsafe_impl_from_IMFTopology(input_topology); + MF_TOPOLOGY_TYPE node_type; + IMFTopologyNode *node; + unsigned short i = 0; IMFStreamSink *sink; + IUnknown *object; HRESULT hr; - size_t i; FIXME("%p, %p, %p, %p.\n", iface, input_topology, output_topology, current_topology); if (current_topology) FIXME("Current topology instance is ignored.\n"); - for (i = 0; i < topology->nodes.count; ++i) + /* Basic sanity checks for input topology: + + - source nodes must have stream descriptor set; + - sink nodes must be resolved to stream sink objects; + */ + while (SUCCEEDED(IMFTopology_GetNode(input_topology, i++, &node))) { - struct topology_node *node = topology->nodes.nodes[i]; + IMFTopologyNode_GetNodeType(node, &node_type); - switch (node->node_type) + switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (node->object) + if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, &object))) { /* Sinks must be bound beforehand. */ - if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFStreamSink, (void **)&sink))) - return MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; - IMFStreamSink_Release(sink); + if (FAILED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&sink))) + hr = MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; + else if (sink) + IMFStreamSink_Release(sink); + IUnknown_Release(object); } break; case MF_TOPOLOGY_SOURCESTREAM_NODE: - if (FAILED(hr = IMFAttributes_GetItem(node->attributes, &MF_TOPONODE_STREAM_DESCRIPTOR, NULL))) - return hr; + hr = IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAM_DESCRIPTOR, NULL); break; default: ; } + + IMFTopologyNode_Release(node); + if (FAILED(hr)) + return hr; } if (FAILED(hr = MFCreateTopology(output_topology))) -- 2.27.0

1 2

[PATCH 14/14] msvcrt: Don't use isxdigitW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 13/14] msvcrt: Don't use isupperW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 12/14] msvcrt: Don't use ispunctW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 11/14] msvcrt: Don't use isprintW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)

1 0

[PATCH 10/14] msvcrt: Don't use islowerW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 09/14] msvcrt: Don't use isgraphW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 08/14] msvcrt: Don't use isdigitW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 07/14] msvcrt: Don't use iscntrlW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 06/14] msvcrt: Don't use isalphaW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 05/14] msvcrt: Don't use isalnumW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 04/14] msvcrt: Don't use isspaceW.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 03/14] msvcrt: Use _iswctype_l in _iswspace_l function.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)

1 0

[PATCH 02/14] msvcrt: Don't use strstrW in wcsstr.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

1 0

[PATCH 01/14] msvcrt: Remove unused parameter in pf_integer_conv.
by Piotr Caban 15 Jul '20

15 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)

1 0

[PATCH v5 5/5] windowscodecs: Add support for decoding uncompressed DDS image.
by Ziqing Hui 15 Jul '20

15 Jul '20

For uncompressed DDS image, "a block" means a pixel. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 75 +++++++++++++++++----------- dlls/windowscodecs/tests/ddsformat.c | 10 ---- 2 files changed, 47 insertions(+), 38 deletions(-)

1 0

[PATCH v5 4/5] windowscodecs/tests: Add tests for decoding uncompressed DDS image.
by Ziqing Hui 15 Jul '20

15 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 98 +++++++++++++++------------- 1 file changed, 54 insertions(+), 44 deletions(-)

1 0

[PATCH v5 3/5] windowscodecs: Return fail for unsupported format in DdsDecoder_Initialize().
by Ziqing Hui 15 Jul '20

15 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v5: It's a new patch in this patch set. dlls/windowscodecs/ddsformat.c | 18 +++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 3 --- 2 files changed, 17 insertions(+), 4 deletions(-)

1 0

[PATCH v5] ws2_32: Drop dependencies on system getprotoby(name|number) functions
by Alex Henrie 15 Jul '20

15 Jul '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v5: Remove the controversial line break (for real this time) --- configure.ac | 2 - dlls/ws2_32/socket.c | 69 ++++-------------------- dlls/ws2_32/tests/protocol.c | 100 +++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 62 deletions(-) diff --git a/configure.ac b/configure.ac index 4829648c3a..9002ce8d60 100644 --- a/configure.ac +++ b/configure.ac @@ -2245,8 +2245,6 @@ AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ ) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7eddde44d..e7f08fe14a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6509,56 +6509,23 @@ static const struct { int prot; const char *names[3]; } protocols[] = { { 0, { "ip", "IP" }}, { 1, { "icmp", "ICMP" }}, - { 2, { "igmp", "IGMP" }}, { 3, { "ggp", "GGP" }}, { 6, { "tcp", "TCP" }}, { 8, { "egp", "EGP" }}, - { 9, { "igp", "IGP" }}, { 12, { "pup", "PUP" }}, { 17, { "udp", "UDP" }}, { 20, { "hmp", "HMP" }}, { 22, { "xns-idp", "XNS-IDP" }}, { 27, { "rdp", "RDP" }}, - { 29, { "iso-tp4", "ISO-TP4" }}, - { 33, { "dccp", "DCCP" }}, - { 36, { "xtp", "XTP" }}, - { 37, { "ddp", "DDP" }}, - { 38, { "idpr-cmtp", "IDPR-CMTP" }}, { 41, { "ipv6", "IPv6" }}, { 43, { "ipv6-route", "IPv6-Route" }}, { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 45, { "idrp", "IDRP" }}, - { 46, { "rsvp", "RSVP" }}, - { 47, { "gre", "GRE" }}, { 50, { "esp", "ESP" }}, { 51, { "ah", "AH" }}, - { 57, { "skip", "SKIP" }}, { 58, { "ipv6-icmp", "IPv6-ICMP" }}, { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, { 60, { "ipv6-opts", "IPv6-Opts" }}, { 66, { "rvd", "RVD" }}, - { 73, { "rspf", "RSPF" }}, - { 81, { "vmtp", "VMTP" }}, - { 88, { "eigrp", "EIGRP" }}, - { 89, { "ospf", "OSPFIGP" }}, - { 93, { "ax.25", "AX.25" }}, - { 94, { "ipip", "IPIP" }}, - { 97, { "etherip", "ETHERIP" }}, - { 98, { "encap", "ENCAP" }}, - { 103, { "pim", "PIM" }}, - { 108, { "ipcomp", "IPCOMP" }}, - { 112, { "vrrp", "VRRP" }}, - { 115, { "l2tp", "L2TP" }}, - { 124, { "isis", "ISIS" }}, - { 132, { "sctp", "SCTP" }}, - { 133, { "fc", "FC" }}, - { 135, { "mobility-header", "Mobility-Header" }}, - { 136, { "udplite", "UDPLite" }}, - { 137, { "mpls-in-ip", "MPLS-in-IP" }}, - { 139, { "hip", "HIP" }}, - { 140, { "shim6", "Shim6" }}, - { 141, { "wesp", "WESP" }}, - { 142, { "rohc", "ROHC" }}, }; /*********************************************************************** @@ -6567,19 +6534,11 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNAME - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobyname(name)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + if (_strnicmp( protocols[i].names[0], name, -1 ) == 0) { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, protocols[i].prot ); break; @@ -6601,23 +6560,13 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNUMBER - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobynumber(number)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + if (protocols[i].prot != number) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; } if (!retval) { diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 99bd1373a9..de5fe36d45 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -192,6 +192,104 @@ static void test_WSAEnumProtocolsW(void) } } +struct protocol +{ + int prot; + const char *names[2]; + BOOL missing_from_xp; +}; + +static const struct protocol protocols[] = +{ + { 0, { "ip", "IP" }}, + { 1, { "icmp", "ICMP" }}, + { 3, { "ggp", "GGP" }}, + { 6, { "tcp", "TCP" }}, + { 8, { "egp", "EGP" }}, + { 12, { "pup", "PUP" }}, + { 17, { "udp", "UDP" }}, + { 20, { "hmp", "HMP" }}, + { 22, { "xns-idp", "XNS-IDP" }}, + { 27, { "rdp", "RDP" }}, + { 41, { "ipv6", "IPv6" }, TRUE}, + { 43, { "ipv6-route", "IPv6-Route" }, TRUE}, + { 44, { "ipv6-frag", "IPv6-Frag" }, TRUE}, + { 50, { "esp", "ESP" }}, + { 51, { "ah", "AH" }}, + { 58, { "ipv6-icmp", "IPv6-ICMP" }, TRUE}, + { 59, { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE}, + { 60, { "ipv6-opts", "IPv6-Opts" }, TRUE}, + { 66, { "rvd", "RVD" }}, +}; + +static const struct protocol *find_protocol(int number) +{ + int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + if (protocols[i].prot == number) + return &protocols[i]; + } + return NULL; +} + +static void test_getprotobyname(void) +{ + struct protoent *ent; + char all_caps_name[16]; + int i, j; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + for (j = 0; j < ARRAY_SIZE(protocols[0].names); j++) + { + ent = getprotobyname(protocols[i].names[j]); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(protocols[i].names[j]), protocols[i].prot, ent ? ent->p_proto : -1); + } + + for (j = 0; protocols[i].names[0][j]; j++) + all_caps_name[j] = toupper(protocols[i].names[0][j]); + all_caps_name[j] = 0; + ent = getprotobyname(all_caps_name); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(all_caps_name), protocols[i].prot, ent ? ent->p_proto : -1); + } +} + +static void test_getprotobynumber(void) +{ + struct protoent *ent; + const struct protocol *ref; + int i; + + for (i = -1; i <= 256; i++) + { + ent = getprotobynumber(i); + ref = find_protocol(i); + + if (!ref) + { + ok(!ent, "Expected protocol number %d to be undefined, got %s\n", + i, wine_dbgstr_a(ent ? ent->p_name : NULL)); + continue; + } + + ok((ent && ent->p_name && strcmp(ent->p_name, ref->names[0]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent ? ent->p_name : NULL)); + + ok((ent && ent->p_aliases && ent->p_aliases[0] && + strcmp(ent->p_aliases[0], ref->names[1]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d alias 0 to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent && ent->p_aliases ? ent->p_aliases[0] : NULL)); + } +} + START_TEST( protocol ) { WSADATA data; @@ -201,4 +299,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); + test_getprotobyname(); + test_getprotobynumber(); } -- 2.27.0

1 0

[PATCH v3] ws2_32: Drop dependencies on system getprotoby(name|number) functions
by Alex Henrie 15 Jul '20

15 Jul '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v3: - Remove binary search - Reduce size of names array from 3 to 2 in the tests - Remove always-true condition - Remove line break - Add a helper function that does a linear search of the whole protocol list for every getprotobynumber test --- configure.ac | 2 - dlls/ws2_32/socket.c | 69 ++++-------------------- dlls/ws2_32/tests/protocol.c | 101 +++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 62 deletions(-) diff --git a/configure.ac b/configure.ac index 4829648c3a..9002ce8d60 100644 --- a/configure.ac +++ b/configure.ac @@ -2245,8 +2245,6 @@ AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ ) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7eddde44d..e7f08fe14a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6509,56 +6509,23 @@ static const struct { int prot; const char *names[3]; } protocols[] = { { 0, { "ip", "IP" }}, { 1, { "icmp", "ICMP" }}, - { 2, { "igmp", "IGMP" }}, { 3, { "ggp", "GGP" }}, { 6, { "tcp", "TCP" }}, { 8, { "egp", "EGP" }}, - { 9, { "igp", "IGP" }}, { 12, { "pup", "PUP" }}, { 17, { "udp", "UDP" }}, { 20, { "hmp", "HMP" }}, { 22, { "xns-idp", "XNS-IDP" }}, { 27, { "rdp", "RDP" }}, - { 29, { "iso-tp4", "ISO-TP4" }}, - { 33, { "dccp", "DCCP" }}, - { 36, { "xtp", "XTP" }}, - { 37, { "ddp", "DDP" }}, - { 38, { "idpr-cmtp", "IDPR-CMTP" }}, { 41, { "ipv6", "IPv6" }}, { 43, { "ipv6-route", "IPv6-Route" }}, { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 45, { "idrp", "IDRP" }}, - { 46, { "rsvp", "RSVP" }}, - { 47, { "gre", "GRE" }}, { 50, { "esp", "ESP" }}, { 51, { "ah", "AH" }}, - { 57, { "skip", "SKIP" }}, { 58, { "ipv6-icmp", "IPv6-ICMP" }}, { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, { 60, { "ipv6-opts", "IPv6-Opts" }}, { 66, { "rvd", "RVD" }}, - { 73, { "rspf", "RSPF" }}, - { 81, { "vmtp", "VMTP" }}, - { 88, { "eigrp", "EIGRP" }}, - { 89, { "ospf", "OSPFIGP" }}, - { 93, { "ax.25", "AX.25" }}, - { 94, { "ipip", "IPIP" }}, - { 97, { "etherip", "ETHERIP" }}, - { 98, { "encap", "ENCAP" }}, - { 103, { "pim", "PIM" }}, - { 108, { "ipcomp", "IPCOMP" }}, - { 112, { "vrrp", "VRRP" }}, - { 115, { "l2tp", "L2TP" }}, - { 124, { "isis", "ISIS" }}, - { 132, { "sctp", "SCTP" }}, - { 133, { "fc", "FC" }}, - { 135, { "mobility-header", "Mobility-Header" }}, - { 136, { "udplite", "UDPLite" }}, - { 137, { "mpls-in-ip", "MPLS-in-IP" }}, - { 139, { "hip", "HIP" }}, - { 140, { "shim6", "Shim6" }}, - { 141, { "wesp", "WESP" }}, - { 142, { "rohc", "ROHC" }}, }; /*********************************************************************** @@ -6567,19 +6534,11 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNAME - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobyname(name)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + if (_strnicmp( protocols[i].names[0], name, -1 ) == 0) { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, protocols[i].prot ); break; @@ -6601,23 +6560,13 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNUMBER - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobynumber(number)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + if (protocols[i].prot != number) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; } if (!retval) { diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 99bd1373a9..9d787cb590 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -192,6 +192,105 @@ static void test_WSAEnumProtocolsW(void) } } +struct protocol +{ + int prot; + const char *names[2]; + BOOL missing_from_xp; +}; + +static const struct protocol protocols[] = +{ + { 0, { "ip", "IP" }}, + { 1, { "icmp", "ICMP" }}, + { 3, { "ggp", "GGP" }}, + { 6, { "tcp", "TCP" }}, + { 8, { "egp", "EGP" }}, + { 12, { "pup", "PUP" }}, + { 17, { "udp", "UDP" }}, + { 20, { "hmp", "HMP" }}, + { 22, { "xns-idp", "XNS-IDP" }}, + { 27, { "rdp", "RDP" }}, + { 41, { "ipv6", "IPv6" }, TRUE}, + { 43, { "ipv6-route", "IPv6-Route" }, TRUE}, + { 44, { "ipv6-frag", "IPv6-Frag" }, TRUE}, + { 50, { "esp", "ESP" }}, + { 51, { "ah", "AH" }}, + { 58, { "ipv6-icmp", "IPv6-ICMP" }, TRUE}, + { 59, { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE}, + { 60, { "ipv6-opts", "IPv6-Opts" }, TRUE}, + { 66, { "rvd", "RVD" }}, +}; + +static const struct protocol *find_protocol(int number) +{ + int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + if (protocols[i].prot == number) + return &protocols[i]; + } + return NULL; +} + +void test_getprotobyname(void) +{ + struct protoent *ent; + char all_caps_name[16]; + int i, j; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + for (j = 0; j < ARRAY_SIZE(protocols[0].names); j++) + { + ent = getprotobyname(protocols[i].names[j]); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(protocols[i].names[j]), protocols[i].prot, ent ? ent->p_proto : -1); + } + + for (j = 0; protocols[i].names[0][j]; j++) + all_caps_name[j] = toupper(protocols[i].names[0][j]); + all_caps_name[j] = 0; + ent = getprotobyname(all_caps_name); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(all_caps_name), protocols[i].prot, ent ? ent->p_proto : -1); + } +} + +void test_getprotobynumber(void) +{ + struct protoent *ent; + const struct protocol *ref; + int i; + + for (i = -1; i <= 256; i++) + { + ent = getprotobynumber(i); + ref = find_protocol(i); + + if (!ref) + { + ok(!ent, + "Expected protocol number %d to be undefined, got %s\n", + i, wine_dbgstr_a(ent ? ent->p_name : NULL)); + continue; + } + + ok((ent && ent->p_name && strcmp(ent->p_name, ref->names[0]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent ? ent->p_name : NULL)); + + ok((ent && ent->p_aliases && ent->p_aliases[0] && + strcmp(ent->p_aliases[0], ref->names[1]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d alias 0 to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent && ent->p_aliases ? ent->p_aliases[0] : NULL)); + } +} + START_TEST( protocol ) { WSADATA data; @@ -201,4 +300,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); + test_getprotobyname(); + test_getprotobynumber(); } -- 2.27.0

2 1

[PATCH v4] ws2_32: Drop dependencies on system getprotoby(name|number) functions
by Alex Henrie 15 Jul '20

15 Jul '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v3: - Remove binary search - Reduce size of names array from 3 to 2 in the tests - Remove always-true condition - Remove line break - Add a helper function that does a linear search of the whole protocol list for every getprotobynumber test v4: - Make test_getprotobyname and test_getprotobynumber static --- configure.ac | 2 - dlls/ws2_32/socket.c | 69 ++++-------------------- dlls/ws2_32/tests/protocol.c | 101 +++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 62 deletions(-) diff --git a/configure.ac b/configure.ac index 4829648c3a..9002ce8d60 100644 --- a/configure.ac +++ b/configure.ac @@ -2245,8 +2245,6 @@ AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ ) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7eddde44d..e7f08fe14a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6509,56 +6509,23 @@ static const struct { int prot; const char *names[3]; } protocols[] = { { 0, { "ip", "IP" }}, { 1, { "icmp", "ICMP" }}, - { 2, { "igmp", "IGMP" }}, { 3, { "ggp", "GGP" }}, { 6, { "tcp", "TCP" }}, { 8, { "egp", "EGP" }}, - { 9, { "igp", "IGP" }}, { 12, { "pup", "PUP" }}, { 17, { "udp", "UDP" }}, { 20, { "hmp", "HMP" }}, { 22, { "xns-idp", "XNS-IDP" }}, { 27, { "rdp", "RDP" }}, - { 29, { "iso-tp4", "ISO-TP4" }}, - { 33, { "dccp", "DCCP" }}, - { 36, { "xtp", "XTP" }}, - { 37, { "ddp", "DDP" }}, - { 38, { "idpr-cmtp", "IDPR-CMTP" }}, { 41, { "ipv6", "IPv6" }}, { 43, { "ipv6-route", "IPv6-Route" }}, { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 45, { "idrp", "IDRP" }}, - { 46, { "rsvp", "RSVP" }}, - { 47, { "gre", "GRE" }}, { 50, { "esp", "ESP" }}, { 51, { "ah", "AH" }}, - { 57, { "skip", "SKIP" }}, { 58, { "ipv6-icmp", "IPv6-ICMP" }}, { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, { 60, { "ipv6-opts", "IPv6-Opts" }}, { 66, { "rvd", "RVD" }}, - { 73, { "rspf", "RSPF" }}, - { 81, { "vmtp", "VMTP" }}, - { 88, { "eigrp", "EIGRP" }}, - { 89, { "ospf", "OSPFIGP" }}, - { 93, { "ax.25", "AX.25" }}, - { 94, { "ipip", "IPIP" }}, - { 97, { "etherip", "ETHERIP" }}, - { 98, { "encap", "ENCAP" }}, - { 103, { "pim", "PIM" }}, - { 108, { "ipcomp", "IPCOMP" }}, - { 112, { "vrrp", "VRRP" }}, - { 115, { "l2tp", "L2TP" }}, - { 124, { "isis", "ISIS" }}, - { 132, { "sctp", "SCTP" }}, - { 133, { "fc", "FC" }}, - { 135, { "mobility-header", "Mobility-Header" }}, - { 136, { "udplite", "UDPLite" }}, - { 137, { "mpls-in-ip", "MPLS-in-IP" }}, - { 139, { "hip", "HIP" }}, - { 140, { "shim6", "Shim6" }}, - { 141, { "wesp", "WESP" }}, - { 142, { "rohc", "ROHC" }}, }; /*********************************************************************** @@ -6567,19 +6534,11 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNAME - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobyname(name)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + if (_strnicmp( protocols[i].names[0], name, -1 ) == 0) { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, protocols[i].prot ); break; @@ -6601,23 +6560,13 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNUMBER - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobynumber(number)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + if (protocols[i].prot != number) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; } if (!retval) { diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 99bd1373a9..92da46ad0c 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -192,6 +192,105 @@ static void test_WSAEnumProtocolsW(void) } } +struct protocol +{ + int prot; + const char *names[2]; + BOOL missing_from_xp; +}; + +static const struct protocol protocols[] = +{ + { 0, { "ip", "IP" }}, + { 1, { "icmp", "ICMP" }}, + { 3, { "ggp", "GGP" }}, + { 6, { "tcp", "TCP" }}, + { 8, { "egp", "EGP" }}, + { 12, { "pup", "PUP" }}, + { 17, { "udp", "UDP" }}, + { 20, { "hmp", "HMP" }}, + { 22, { "xns-idp", "XNS-IDP" }}, + { 27, { "rdp", "RDP" }}, + { 41, { "ipv6", "IPv6" }, TRUE}, + { 43, { "ipv6-route", "IPv6-Route" }, TRUE}, + { 44, { "ipv6-frag", "IPv6-Frag" }, TRUE}, + { 50, { "esp", "ESP" }}, + { 51, { "ah", "AH" }}, + { 58, { "ipv6-icmp", "IPv6-ICMP" }, TRUE}, + { 59, { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE}, + { 60, { "ipv6-opts", "IPv6-Opts" }, TRUE}, + { 66, { "rvd", "RVD" }}, +}; + +static const struct protocol *find_protocol(int number) +{ + int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + if (protocols[i].prot == number) + return &protocols[i]; + } + return NULL; +} + +static void test_getprotobyname(void) +{ + struct protoent *ent; + char all_caps_name[16]; + int i, j; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + for (j = 0; j < ARRAY_SIZE(protocols[0].names); j++) + { + ent = getprotobyname(protocols[i].names[j]); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(protocols[i].names[j]), protocols[i].prot, ent ? ent->p_proto : -1); + } + + for (j = 0; protocols[i].names[0][j]; j++) + all_caps_name[j] = toupper(protocols[i].names[0][j]); + all_caps_name[j] = 0; + ent = getprotobyname(all_caps_name); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(all_caps_name), protocols[i].prot, ent ? ent->p_proto : -1); + } +} + +static void test_getprotobynumber(void) +{ + struct protoent *ent; + const struct protocol *ref; + int i; + + for (i = -1; i <= 256; i++) + { + ent = getprotobynumber(i); + ref = find_protocol(i); + + if (!ref) + { + ok(!ent, + "Expected protocol number %d to be undefined, got %s\n", + i, wine_dbgstr_a(ent ? ent->p_name : NULL)); + continue; + } + + ok((ent && ent->p_name && strcmp(ent->p_name, ref->names[0]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent ? ent->p_name : NULL)); + + ok((ent && ent->p_aliases && ent->p_aliases[0] && + strcmp(ent->p_aliases[0], ref->names[1]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d alias 0 to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent && ent->p_aliases ? ent->p_aliases[0] : NULL)); + } +} + START_TEST( protocol ) { WSADATA data; @@ -201,4 +300,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); + test_getprotobyname(); + test_getprotobynumber(); } -- 2.27.0

1 0

[PATCH v4 1/3] windowscodecs: Implement DdsDecoder_Wine_Initialize().
by Ziqing Hui 15 Jul '20

15 Jul '20

Code in DdsDecoder_Initialize() are moved to DdsDecoder_Wine_Initialize(). And DdsDecoder_Initialize() are implemented on top of DdsDecoder_Wine_Initialize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v4: Add todo_wine() for cube map in d3dx10 tests. dlls/d3dx10_43/tests/d3dx10.c | 3 +- dlls/windowscodecs/ddsformat.c | 118 ++++++++++++++++----------- dlls/windowscodecs/tests/ddsformat.c | 3 - 3 files changed, 72 insertions(+), 52 deletions(-)

3 4

[PATCH 1/8] quartz: Add more tracing to state change methods.
by Zebediah Figura 15 Jul '20

15 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6a29b5d7484..e035b8f0ed1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1723,6 +1723,8 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { struct filter_graph *graph = impl_from_IMediaControl(iface); + TRACE("graph %p.\n", graph); + return IMediaFilter_Run(&graph->IMediaFilter_iface, 0); } @@ -1730,6 +1732,8 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { struct filter_graph *graph = impl_from_IMediaControl(iface); + TRACE("graph %p.\n", graph); + return IMediaFilter_Pause(&graph->IMediaFilter_iface); } @@ -1737,6 +1741,8 @@ static HRESULT WINAPI MediaControl_Stop(IMediaControl *iface) { struct filter_graph *graph = impl_from_IMediaControl(iface); + TRACE("graph %p.\n", graph); + return IMediaFilter_Stop(&graph->IMediaFilter_iface); } @@ -1744,6 +1750,8 @@ static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, LONG timeout, { struct filter_graph *graph = impl_from_IMediaControl(iface); + TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state); + if (timeout < 0) timeout = INFINITE; return IMediaFilter_GetState(&graph->IMediaFilter_iface, timeout, (FILTER_STATE *)state); @@ -4951,6 +4959,7 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F } LeaveCriticalSection(&graph->cs); + TRACE("Returning %#x, state %u.\n", hr, *state); return hr; } -- 2.27.0

2 9

[PATCH v3] msvfw32/tests: add a few tests for MCIWndCreate
by David Adam 14 Jul '20

14 Jul '20

All the tests pass the testbot (see job 75149)

1 1

[PATCH v2 1/3] user32: Create separate FIXME() messages for each packet type in DisplayConfigGetDeviceInfo().
by Brendan Shanks 14 Jul '20

14 Jul '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Trace the names of packet types (both implemented and unimplemented) dlls/user32/sysparams.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8b2b3381dc3..3ec6c54023b 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4815,7 +4815,7 @@ done: */ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) { - FIXME("stub: %p\n", packet); + TRACE("(%p)\n", packet); if (!packet || packet->size < sizeof(*packet)) return ERROR_GEN_FAILURE; @@ -4825,6 +4825,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: { DISPLAYCONFIG_SOURCE_DEVICE_NAME *source_name = (DISPLAYCONFIG_SOURCE_DEVICE_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: stub\n"); + if (packet->size < sizeof(*source_name)) return ERROR_INVALID_PARAMETER; @@ -4833,6 +4836,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: { DISPLAYCONFIG_TARGET_DEVICE_NAME *target_name = (DISPLAYCONFIG_TARGET_DEVICE_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: stub\n"); + if (packet->size < sizeof(*target_name)) return ERROR_INVALID_PARAMETER; @@ -4841,6 +4847,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: { DISPLAYCONFIG_TARGET_PREFERRED_MODE *preferred_mode = (DISPLAYCONFIG_TARGET_PREFERRED_MODE *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: stub\n"); + if (packet->size < sizeof(*preferred_mode)) return ERROR_INVALID_PARAMETER; @@ -4849,6 +4858,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: { DISPLAYCONFIG_ADAPTER_NAME *adapter_name = (DISPLAYCONFIG_ADAPTER_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: stub\n"); + if (packet->size < sizeof(*adapter_name)) return ERROR_INVALID_PARAMETER; -- 2.26.2

2 5

[PATCH v2] ws2_32: Drop dependencies on system getprotoby(name|number) functions
by Alex Henrie 14 Jul '20

14 Jul '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: - Keep original protocol table format - Implement getprotobynumber using binary search --- configure.ac | 2 - dlls/ws2_32/socket.c | 76 ++++++++------------------- dlls/ws2_32/tests/protocol.c | 99 ++++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 57 deletions(-) diff --git a/configure.ac b/configure.ac index 4829648c3a..9002ce8d60 100644 --- a/configure.ac +++ b/configure.ac @@ -2245,8 +2245,6 @@ AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ ) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 69fbb37af2..a860258beb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6507,58 +6507,26 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) static const struct { int prot; const char *names[3]; } protocols[] = { + /* keep this list sorted by number for binary search */ { 0, { "ip", "IP" }}, { 1, { "icmp", "ICMP" }}, - { 2, { "igmp", "IGMP" }}, { 3, { "ggp", "GGP" }}, { 6, { "tcp", "TCP" }}, { 8, { "egp", "EGP" }}, - { 9, { "igp", "IGP" }}, { 12, { "pup", "PUP" }}, { 17, { "udp", "UDP" }}, { 20, { "hmp", "HMP" }}, { 22, { "xns-idp", "XNS-IDP" }}, { 27, { "rdp", "RDP" }}, - { 29, { "iso-tp4", "ISO-TP4" }}, - { 33, { "dccp", "DCCP" }}, - { 36, { "xtp", "XTP" }}, - { 37, { "ddp", "DDP" }}, - { 38, { "idpr-cmtp", "IDPR-CMTP" }}, { 41, { "ipv6", "IPv6" }}, { 43, { "ipv6-route", "IPv6-Route" }}, { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 45, { "idrp", "IDRP" }}, - { 46, { "rsvp", "RSVP" }}, - { 47, { "gre", "GRE" }}, { 50, { "esp", "ESP" }}, { 51, { "ah", "AH" }}, - { 57, { "skip", "SKIP" }}, { 58, { "ipv6-icmp", "IPv6-ICMP" }}, { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, { 60, { "ipv6-opts", "IPv6-Opts" }}, { 66, { "rvd", "RVD" }}, - { 73, { "rspf", "RSPF" }}, - { 81, { "vmtp", "VMTP" }}, - { 88, { "eigrp", "EIGRP" }}, - { 89, { "ospf", "OSPFIGP" }}, - { 93, { "ax.25", "AX.25" }}, - { 94, { "ipip", "IPIP" }}, - { 97, { "etherip", "ETHERIP" }}, - { 98, { "encap", "ENCAP" }}, - { 103, { "pim", "PIM" }}, - { 108, { "ipcomp", "IPCOMP" }}, - { 112, { "vrrp", "VRRP" }}, - { 115, { "l2tp", "L2TP" }}, - { 124, { "isis", "ISIS" }}, - { 132, { "sctp", "SCTP" }}, - { 133, { "fc", "FC" }}, - { 135, { "mobility-header", "Mobility-Header" }}, - { 136, { "udplite", "UDPLite" }}, - { 137, { "mpls-in-ip", "MPLS-in-IP" }}, - { 139, { "hip", "HIP" }}, - { 140, { "shim6", "Shim6" }}, - { 141, { "wesp", "WESP" }}, - { 142, { "rohc", "ROHC" }}, }; /*********************************************************************** @@ -6567,24 +6535,18 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNAME - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobyname(name)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + if (_strnicmp( protocols[i].names[0], name, -1 ) == 0) { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, protocols[i].prot ); break; } } + if (!retval) { WARN( "protocol %s not found\n", debugstr_a(name) ); @@ -6601,24 +6563,28 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNUMBER - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobynumber(number)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + int start = 0, end = ARRAY_SIZE(protocols) - 1, i; + + do { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + i = (start + end) / 2; + if (number < protocols[i].prot) + { + end = i - 1; + } + else if (number > protocols[i].prot) + { + start = i + 1; + } + else { - if (protocols[i].prot != number) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, protocols[i].prot ); break; } } + while (start <= end); + if (!retval) { WARN( "protocol %d not found\n", number ); diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 99bd1373a9..4cc7770dad 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -192,6 +192,103 @@ static void test_WSAEnumProtocolsW(void) } } +struct protocol +{ + int prot; + const char *names[3]; + BOOL missing_from_xp; +}; + +static const struct protocol protocols[] = +{ + /* keep this list sorted by number for intelligent linear search */ + { 0, { "ip", "IP" }}, + { 1, { "icmp", "ICMP" }}, + { 3, { "ggp", "GGP" }}, + { 6, { "tcp", "TCP" }}, + { 8, { "egp", "EGP" }}, + { 12, { "pup", "PUP" }}, + { 17, { "udp", "UDP" }}, + { 20, { "hmp", "HMP" }}, + { 22, { "xns-idp", "XNS-IDP" }}, + { 27, { "rdp", "RDP" }}, + { 41, { "ipv6", "IPv6" }, TRUE}, + { 43, { "ipv6-route", "IPv6-Route" }, TRUE}, + { 44, { "ipv6-frag", "IPv6-Frag" }, TRUE}, + { 50, { "esp", "ESP" }}, + { 51, { "ah", "AH" }}, + { 58, { "ipv6-icmp", "IPv6-ICMP" }, TRUE}, + { 59, { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE}, + { 60, { "ipv6-opts", "IPv6-Opts" }, TRUE}, + { 66, { "rvd", "RVD" }}, + { } +}; + +void test_getprotobyname(void) +{ + struct protoent *ent; + char all_caps_name[16]; + int i, j; + + for (i = 0; i < ARRAY_SIZE(protocols) - 1; i++) + { + for (j = 0; protocols[i].names[j]; j++) + { + ent = getprotobyname(protocols[i].names[j]); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(protocols[i].names[j]), protocols[i].prot, ent ? ent->p_proto : -1); + } + + if (protocols[i].names[0]) + { + for (j = 0; protocols[i].names[0][j]; j++) + all_caps_name[j] = toupper(protocols[i].names[0][j]); + all_caps_name[j] = 0; + ent = getprotobyname(all_caps_name); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(all_caps_name), protocols[i].prot, ent ? ent->p_proto : -1); + } + } +} + +void test_getprotobynumber(void) +{ + struct protoent *ent; + const struct protocol *ref = &protocols[0]; + int i, j; + + for (i = -1; i <= 256; i++) + { + ent = getprotobynumber(i); + + if (i != ref->prot) + { + ok(!ent, + "Expected protocol number %d to be undefined, got %s\n", + i, wine_dbgstr_a(ent ? ent->p_name : NULL)); + continue; + } + + ok((ent && ent->p_name && strcmp(ent->p_name, ref->names[0]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent ? ent->p_name : NULL)); + + for (j = 0; ref->names[1+j]; j++) + { + ok((ent && ent->p_aliases && ent->p_aliases[j] && + strcmp(ent->p_aliases[j], ref->names[1+j]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d alias %d to be %s, got %s\n", + i, j, ref->names[0], wine_dbgstr_a(ent && ent->p_aliases ? ent->p_aliases[j] : NULL)); + } + + ref++; + } +} + START_TEST( protocol ) { WSADATA data; @@ -201,4 +298,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); + test_getprotobyname(); + test_getprotobynumber(); } -- 2.27.0

3 8

[PATCH] api-ms-win-core-systemtopology-l1-1-0: Add dll.
by Myah Caron 14 Jul '20

14 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Apparently Death Stranding requires this DLL. --- configure.ac | 1 + dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-systemtopology-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 4 files changed, 5 insertions(+) create mode 100644 dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec diff --git a/configure.ac b/configure.ac index d596422320..4829648c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -2946,6 +2946,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-l1-2-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-sysinfo-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-sysinfo-l1-2-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-systemtopology-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-threadpool-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-threadpool-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-threadpool-legacy-l1-1-0) diff --git a/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in b/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in new file mode 100644 index 0000000000..beed9fb9c2 --- /dev/null +++ b/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-systemtopology-l1-1-0.dll diff --git a/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec b/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec new file mode 100644 index 0000000000..b5365eb930 --- /dev/null +++ b/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall GetNumaHighestNodeNumber(ptr) kernelbase.GetNumaHighestNodeNumber +@ stdcall GetNumaNodeProcessorMaskEx(long ptr) kernelbase.GetNumaNodeProcessorMaskEx diff --git a/tools/make_specfiles b/tools/make_specfiles index 420d850b73..f8f8da8d5c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -223,6 +223,7 @@ my @dll_groups = "api-ms-win-core-string-obsolete-l1-1-0", "api-ms-win-core-sysinfo-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", + "api-ms-win-core-systemtopology-l1-1-0", "api-ms-win-core-util-l1-1-0", "api-ms-win-core-synch-ansi-l1-1-0", "api-ms-win-core-synch-l1-1-0", -- 2.27.0

2 2

[PATCH 9/9] msvcrt: Use _wcsnicmp instead of strnicmpW.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/file.c | 6 +++--- dlls/msvcrt/msvcrt.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-)

1 0

[PATCH 8/9] msvcrt: Don't use strncmpiW in _wcsnicmp_l.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)

1 0

[PATCH 7/9] msvcrt: Don't use strncmpiW in _wcsnicoll_l.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)

1 0

[PATCH 6/9] msvcrt: Don't use strncmpW in msvcrt_get_flags.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 5/9] msvcrt: Don't use strncmpW in wcsncmp.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)

1 0

[PATCH 4/9] msvcrt: Don't use strcmpiW in _wcsicmp_l.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 69 ++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 31 deletions(-)

1 0

[PATCH 3/9] msvcrt: Don't use strcmpiW in _wcsicoll_l.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)

1 0

[PATCH 2/9] msvcrt: Don't use strcmpW in wcscmp.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/msvcrt/wcs.c | 28 +++++++++++++++++++--------- 2 files changed, 34 insertions(+), 9 deletions(-)

1 0

[PATCH 1/9] ucrtbase: Add parameters validation to _timespec32_get function.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH v2 1/6] wined3d: Fix / update reported driver model version.
by Matteo Bruni 14 Jul '20

14 Jul '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/directx.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 454125c1462d..45f3f61f2fe7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -198,20 +198,26 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) return refcount; } -/* Certain applications (Steam) complain if we report an outdated driver version. In general, - * reporting a driver version is moot because we are not the Windows driver, and we have different - * bugs, features, etc. +/* Certain applications (e.g. Steam) complain if we report an outdated driver + * version. * * The driver version has the form "x.y.z.w". * - * "x" is the Windows version the driver is meant for: + * "x" is the Windows version / driver model the driver is meant for: * 4 -> 95/98/NT4 * 5 -> 2000 - * 6 -> 2000/XP - * 7 -> Vista - * 8 -> Windows 7 - * 9 -> Windows 8 - * 10 -> Windows 10 + * 6 -> XP + * 7 -> Vista - WDDM 1.0 + * 8 -> Windows 7 - WDDM 1.1 + * 9 -> Windows 8 - WDDM 1.2 + * 10 -> Windows 8.1 - WDDM 1.3 + * 20 -> Windows 10 - WDDM 2.0 + * 21 -> Windows 10 Anniversary Update - WDDM 2.1 + * 22 -> Windows 10 Creators Update - WDDM 2.2 + * 23 -> Windows 10 Fall Creators Update - WDDM 2.3 + * 24 -> Windows 10 April 2018 Update - WDDM 2.4 + * 25 -> Windows 10 October 2018 Update - WDDM 2.5 + * 26 -> Windows 10 May 2019 Update - WDDM 2.6 * * "y" is the maximum Direct3D version the driver supports. * y -> d3d version mapping: @@ -705,20 +711,25 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_os_version = 8; driver_model = DRIVER_MODEL_NT6X; } + else if (os_version.dwMinorVersion == 2) + { + driver_os_version = 9; + driver_model = DRIVER_MODEL_NT6X; + } else { if (os_version.dwMinorVersion > 3) { - FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", + FIXME("Unhandled OS version %u.%u, reporting Windows 8.1.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); } - driver_os_version = 9; + driver_os_version = 10; driver_model = DRIVER_MODEL_NT6X; } break; case 10: - driver_os_version = 10; + driver_os_version = 26; driver_model = DRIVER_MODEL_NT6X; break; -- 2.26.2

3 11

[PATCH] winecrt0: Do not expect jmp_buf to be aligned in __wine_longjmp on x86_64.
by Paul Gofman 14 Jul '20

14 Jul '20

There is no guarantee that jmp_buf is 16 bytes aligned. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winecrt0/exception.c | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 137ee2d6ee3..d3ce8d1aebb 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -80,16 +80,16 @@ __ASM_GLOBAL_FUNC( __wine_setjmpex, "movq %r15,0x48(%rcx)\n\t" /* jmp_buf->R15 */ "movq (%rsp),%rax\n\t" "movq %rax,0x50(%rcx)\n\t" /* jmp_buf->Rip */ - "movdqa %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ - "movdqa %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ - "movdqa %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ - "movdqa %xmm9,0x90(%rcx)\n\t" /* jmp_buf->Xmm9 */ - "movdqa %xmm10,0xa0(%rcx)\n\t" /* jmp_buf->Xmm10 */ - "movdqa %xmm11,0xb0(%rcx)\n\t" /* jmp_buf->Xmm11 */ - "movdqa %xmm12,0xc0(%rcx)\n\t" /* jmp_buf->Xmm12 */ - "movdqa %xmm13,0xd0(%rcx)\n\t" /* jmp_buf->Xmm13 */ - "movdqa %xmm14,0xe0(%rcx)\n\t" /* jmp_buf->Xmm14 */ - "movdqa %xmm15,0xf0(%rcx)\n\t" /* jmp_buf->Xmm15 */ + "movq %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ + "movq %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ + "movq %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ + "movq %xmm9,0x90(%rcx)\n\t" /* jmp_buf->Xmm9 */ + "movq %xmm10,0xa0(%rcx)\n\t" /* jmp_buf->Xmm10 */ + "movq %xmm11,0xb0(%rcx)\n\t" /* jmp_buf->Xmm11 */ + "movq %xmm12,0xc0(%rcx)\n\t" /* jmp_buf->Xmm12 */ + "movq %xmm13,0xd0(%rcx)\n\t" /* jmp_buf->Xmm13 */ + "movq %xmm14,0xe0(%rcx)\n\t" /* jmp_buf->Xmm14 */ + "movq %xmm15,0xf0(%rcx)\n\t" /* jmp_buf->Xmm15 */ "xorq %rax,%rax\n\t" "retq" ) @@ -103,16 +103,16 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, "movq 0x38(%rcx),%r13\n\t" /* jmp_buf->R13 */ "movq 0x40(%rcx),%r14\n\t" /* jmp_buf->R14 */ "movq 0x48(%rcx),%r15\n\t" /* jmp_buf->R15 */ - "movdqa 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ - "movdqa 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ - "movdqa 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ - "movdqa 0x90(%rcx),%xmm9\n\t" /* jmp_buf->Xmm9 */ - "movdqa 0xa0(%rcx),%xmm10\n\t" /* jmp_buf->Xmm10 */ - "movdqa 0xb0(%rcx),%xmm11\n\t" /* jmp_buf->Xmm11 */ - "movdqa 0xc0(%rcx),%xmm12\n\t" /* jmp_buf->Xmm12 */ - "movdqa 0xd0(%rcx),%xmm13\n\t" /* jmp_buf->Xmm13 */ - "movdqa 0xe0(%rcx),%xmm14\n\t" /* jmp_buf->Xmm14 */ - "movdqa 0xf0(%rcx),%xmm15\n\t" /* jmp_buf->Xmm15 */ + "movq 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ + "movq 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ + "movq 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ + "movq 0x90(%rcx),%xmm9\n\t" /* jmp_buf->Xmm9 */ + "movq 0xa0(%rcx),%xmm10\n\t" /* jmp_buf->Xmm10 */ + "movq 0xb0(%rcx),%xmm11\n\t" /* jmp_buf->Xmm11 */ + "movq 0xc0(%rcx),%xmm12\n\t" /* jmp_buf->Xmm12 */ + "movq 0xd0(%rcx),%xmm13\n\t" /* jmp_buf->Xmm13 */ + "movq 0xe0(%rcx),%xmm14\n\t" /* jmp_buf->Xmm14 */ + "movq 0xf0(%rcx),%xmm15\n\t" /* jmp_buf->Xmm15 */ "movq 0x50(%rcx),%rdx\n\t" /* jmp_buf->Rip */ "movq 0x10(%rcx),%rsp\n\t" /* jmp_buf->Rsp */ "jmp *%rdx" ) -- 2.26.2

4 7

[PATCH v2] ntdll: Always align stack pointer in __wine_syscall_dispatcher on x64.
by Paul Gofman 14 Jul '20

14 Jul '20

Syscall thunks break stack alignment for dispatcher. Regardless of that, it is probably better not to assume aligned stack in syscall thunk entry. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix jump destination in error branch (last jump). tools/winebuild/import.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 97191ca89ec..278de20522e 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1497,23 +1497,25 @@ void output_syscalls( DLLSPEC *spec ) * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tcmpq $%u,%%rax\n", count ); - output( "\tjae 3f\n" ); + output( "\tjae 4f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); - output( "\tjbe 1f\n" ); - output( "\tsubq %%rcx,%%rsp\n" ); + output( "\tja 1f\n" ); + output( "\tandq $~15,%%rsp\n\t" ); + output( "\tjmp 2f\n" ); + output( "1:\tsubq %%rcx,%%rsp\n" ); output( "\tshrq $3,%%rcx\n" ); output( "\tleaq 0x38(%%rbp),%%rsi\n" ); output( "\tandq $~15,%%rsp\n\t" ); output( "\tmovq %%rsp,%%rdi\n" ); output( "\tcld\n" ); output( "\trep; movsq\n" ); - output( "1:\tmovq %%r10,%%rcx\n" ); + output( "2:\tmovq %%r10,%%rcx\n" ); output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); output( "\tcallq *(%%r10,%%rax,8)\n" ); - output( "2:\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "3:\tleaq -0x10(%%rbp),%%rsp\n" ); output( "\tpopq %%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); output( "\tpopq %%rsi\n" ); @@ -1523,8 +1525,8 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -8" ); output_cfi( ".cfi_same_value %%rbp" ); output( "\tret\n" ); - output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); - output( "\tjmp 2b\n" ); + output( "4:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tjmp 3b\n" ); break; case CPU_ARM: output( "\tldr r1, 4f\n" ); -- 2.26.2

1 0

[PATCH v2 1/2] amstream: Add AMMediaStream::JoinFilterGraph() tests.
by Gijs Vermeulen 14 Jul '20

14 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/tests/amstream.c | 84 ++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2d9f3e35f2..a0876d6242 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4328,6 +4328,89 @@ static void test_ammediastream_join_filter(void) check_ammediastream_join_filter(&CLSID_AMDirectDrawStream); } +static void check_ammediastream_join_filter_graph(const MSPID *id) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IGraphBuilder *builder, *builder2; + IMediaStreamFilter *filter; + IAMMediaStream *stream; + IFilterGraph *graph; + FILTER_INFO info; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!filter, "Expected non-null filter.\n"); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, id, 0, (IMediaStream **)&stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!builder, "Expected non-null graph.\n"); + EXPECT_REF(builder, 4); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph, (void **)&graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + /* Crashes on native. */ + if (0) + { + hr = IAMMediaStream_JoinFilterGraph(stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + hr = IAMMediaStream_JoinFilterGraph(stream, graph); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(builder2 == builder, "Expected graph %p, got %p.\n", builder, builder2); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IGraphBuilder_Release(builder2); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + ref = IFilterGraph_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(builder); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ammediastream_join_filter_graph(void) +{ + check_ammediastream_join_filter_graph(&MSPID_PrimaryAudio); + check_ammediastream_join_filter_graph(&MSPID_PrimaryVideo); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5023,6 +5106,7 @@ START_TEST(amstream) test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); + test_ammediastream_join_filter_graph(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run(); -- 2.27.0

2 3

[PATCH 6/6] server: Remove no longer needed fill_console_output request.
by Jacek Caban 14 Jul '20

14 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 7 +++++++ server/console.c | 20 -------------------- server/protocol.def | 21 --------------------- server/trace.c | 26 -------------------------- tools/make_requests | 1 - 5 files changed, 7 insertions(+), 68 deletions(-)

2 1

Compiler requirement with wine-mono
by Michael Cronenworth 14 Jul '20

14 Jul '20

Hi, I noticed that wine-mono 5.1.0 ships a binary compiler package inside of the source code tarball. Why was wine-mono switched from MinGW GCC to MinGW Clang? Is it now impossible to use MinGW GCC to build wine-mono? I'm attempting to ship an update to wine-mono in Fedora, but I cannot use the bundled binary compiler to do so, and I cannot get the source to compile with MinGW GCC. Thanks, Michael

2 2

[PATCH 5/6] kernel32: Use IOCTL_CONDRV_FILL_OUTPUT in CONSOLE_FillLineUniform.
by Jacek Caban 14 Jul '20

14 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)

2 1

[PATCH 4/6] kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in fill_console_output.
by Jacek Caban 14 Jul '20

14 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)

1 0

[PATCH 3/6] kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in FillConsoleOutputAttribute.
by Jacek Caban 14 Jul '20

14 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)

1 0

[PATCH 2/6] kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in FillConsoleOutputCharacterW.
by Jacek Caban 14 Jul '20

14 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)

1 0

[PATCH 1/6] server: Introduce IOCTL_CONDRV_FILL_OUTPUT ioctl.
by Jacek Caban 14 Jul '20

14 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 13 +++++++++++++ server/console.c | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+)

1 0

[PATCH] ntdll: Ignore L length specifier in printf.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/printf.h | 6 +++++- dlls/ntdll/tests/string.c | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-)

2 1

[PATCH] msvcrt: Use proper flags instead of characters for printf flags.
by Piotr Caban 14 Jul '20

14 Jul '20

Ports 1a43c5de71eea457855f7dcfb7e5811f1c74ebf8 to msvcrt. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 101 ++++++++++++++++++++----------------------- dlls/msvcrt/wcs.c | 9 ++++ 2 files changed, 56 insertions(+), 54 deletions(-)

1 0

[PATCH v4 3/3] windowscodecs: Add support for decoding uncompressed DDS image.
by Ziqing Hui 14 Jul '20

14 Jul '20

For uncompressed DDS image, "a block" means a pixel. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 75 +++++++++++++++++----------- dlls/windowscodecs/tests/ddsformat.c | 10 ---- 2 files changed, 47 insertions(+), 38 deletions(-)

2 1

[PATCH v4 2/3] windowscodecs/tests: Add tests for decoding uncompressed DDS image.
by Ziqing Hui 14 Jul '20

14 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 98 +++++++++++++++------------- 1 file changed, 54 insertions(+), 44 deletions(-)

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Rename the vkd3d_root_parameter_type enumeration to vkd3d_shader_root_parameter_type.
by Henri Verbeet 14 Jul '20

14 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 18 +++++------ libs/vkd3d-shader/dxbc.c | 60 +++++++++++++++++------------------ libs/vkd3d-shader/vkd3d_shader_main.c | 4 +-- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b5bf13a..1ce701c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -456,20 +456,20 @@ struct vkd3d_root_descriptor unsigned int register_space; }; -enum vkd3d_root_parameter_type +enum vkd3d_shader_root_parameter_type { - VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE = 0, - VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS = 1, - VKD3D_ROOT_PARAMETER_TYPE_CBV = 2, - VKD3D_ROOT_PARAMETER_TYPE_SRV = 3, - VKD3D_ROOT_PARAMETER_TYPE_UAV = 4, + VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE = 0x0, + VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS = 0x1, + VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV = 0x2, + VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV = 0x3, + VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV = 0x4, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_PARAMETER_TYPE), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_PARAMETER_TYPE), }; struct vkd3d_root_parameter { - enum vkd3d_root_parameter_type parameter_type; + enum vkd3d_shader_root_parameter_type parameter_type; union { struct vkd3d_root_descriptor_table descriptor_table; @@ -549,7 +549,7 @@ struct vkd3d_root_descriptor1 struct vkd3d_root_parameter1 { - enum vkd3d_root_parameter_type parameter_type; + enum vkd3d_shader_root_parameter_type parameter_type; union { struct vkd3d_root_descriptor_table1 descriptor_table; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index cad2556..6297a04 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2456,15 +2456,15 @@ static int shader_parse_root_parameters(struct root_signature_parser_context *co switch (parameters[i].parameter_type) { - case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: ret = shader_parse_descriptor_table(context, offset, &parameters[i].u.descriptor_table); break; - case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: ret = shader_parse_root_constants(context, offset, &parameters[i].u.constants); break; - case VKD3D_ROOT_PARAMETER_TYPE_CBV: - case VKD3D_ROOT_PARAMETER_TYPE_SRV: - case VKD3D_ROOT_PARAMETER_TYPE_UAV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV: ret = shader_parse_root_descriptor(context, offset, &parameters[i].u.descriptor); break; default: @@ -2504,15 +2504,15 @@ static int shader_parse_root_parameters1(struct root_signature_parser_context *c switch (parameters[i].parameter_type) { - case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: ret = shader_parse_descriptor_table1(context, offset, &parameters[i].u.descriptor_table); break; - case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: ret = shader_parse_root_constants(context, offset, &parameters[i].u.constants); break; - case VKD3D_ROOT_PARAMETER_TYPE_CBV: - case VKD3D_ROOT_PARAMETER_TYPE_SRV: - case VKD3D_ROOT_PARAMETER_TYPE_UAV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV: ret = shader_parse_root_descriptor1(context, offset, &parameters[i].u.descriptor); break; default: @@ -2678,7 +2678,7 @@ static unsigned int versioned_root_signature_get_parameter_count(const struct vk return desc->u.v_1_1.parameter_count; } -static enum vkd3d_root_parameter_type versioned_root_signature_get_parameter_type( +static enum vkd3d_shader_root_parameter_type versioned_root_signature_get_parameter_type( const struct vkd3d_versioned_root_signature_desc *desc, unsigned int i) { if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) @@ -2938,18 +2938,18 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co switch (versioned_root_signature_get_parameter_type(desc, i)) { - case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) ret = shader_write_descriptor_table(context, &desc->u.v_1_0.parameters[i].u.descriptor_table); else ret = shader_write_descriptor_table1(context, &desc->u.v_1_1.parameters[i].u.descriptor_table); break; - case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: ret = shader_write_root_constants(context, versioned_root_signature_get_root_constants(desc, i)); break; - case VKD3D_ROOT_PARAMETER_TYPE_CBV: - case VKD3D_ROOT_PARAMETER_TYPE_SRV: - case VKD3D_ROOT_PARAMETER_TYPE_UAV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV: if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) ret = shader_write_root_descriptor(context, &desc->u.v_1_0.parameters[i].u.descriptor); else @@ -3115,10 +3115,10 @@ static int validate_root_signature_desc(const struct vkd3d_versioned_root_signat for (i = 0; i < versioned_root_signature_get_parameter_count(desc); ++i) { - enum vkd3d_root_parameter_type type; + enum vkd3d_shader_root_parameter_type type; type = versioned_root_signature_get_parameter_type(desc, i); - if (type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + if (type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) { if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) ret = validate_descriptor_table_v_1_0(&desc->u.v_1_0.parameters[i].u.descriptor_table); @@ -3192,7 +3192,7 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters { const struct vkd3d_root_parameter *p = &parameters[i]; - if (p->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); } } @@ -3213,7 +3213,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, p->parameter_type = p1->parameter_type; switch (p->parameter_type) { - case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: ranges = NULL; if ((p->u.descriptor_table.descriptor_range_count = p1->u.descriptor_table.descriptor_range_count)) { @@ -3234,12 +3234,12 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, ranges[j].descriptor_table_offset = ranges1[j].descriptor_table_offset; } break; - case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: p->u.constants = p1->u.constants; break; - case VKD3D_ROOT_PARAMETER_TYPE_CBV: - case VKD3D_ROOT_PARAMETER_TYPE_SRV: - case VKD3D_ROOT_PARAMETER_TYPE_UAV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV: p->u.descriptor.shader_register = p1->u.descriptor.shader_register; p->u.descriptor.register_space = p1->u.descriptor.register_space; break; @@ -3311,7 +3311,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete { const struct vkd3d_root_parameter1 *p = &parameters[i]; - if (p->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); } } @@ -3332,7 +3332,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, p1->parameter_type = p->parameter_type; switch (p1->parameter_type) { - case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: ranges1 = NULL; if ((p1->u.descriptor_table.descriptor_range_count = p->u.descriptor_table.descriptor_range_count)) { @@ -3354,12 +3354,12 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, ranges1[j].descriptor_table_offset = ranges[j].descriptor_table_offset; } break; - case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: p1->u.constants = p->u.constants; break; - case VKD3D_ROOT_PARAMETER_TYPE_CBV: - case VKD3D_ROOT_PARAMETER_TYPE_SRV: - case VKD3D_ROOT_PARAMETER_TYPE_UAV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV: p1->u.descriptor.shader_register = p->u.descriptor.shader_register; p1->u.descriptor.register_space = p->u.descriptor.register_space; p1->u.descriptor.flags = VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index b9caac7..f7489f6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -486,7 +486,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_d { const struct vkd3d_root_parameter *parameter = &root_signature->parameters[i]; - if (parameter->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges); } vkd3d_free((void *)root_signature->parameters); @@ -503,7 +503,7 @@ static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_root_signature_d { const struct vkd3d_root_parameter1 *parameter = &root_signature->parameters[i]; - if (parameter->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges); } vkd3d_free((void *)root_signature->parameters); -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Rename the vkd3d_root_descriptor_flags enumeration to vkd3d_shader_root_descriptor_flags.
by Henri Verbeet 14 Jul '20

14 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/dxbc.c | 10 +++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ab670ec..b5bf13a 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -503,12 +503,14 @@ struct vkd3d_root_signature_desc }; /* root signature 1.1 */ -enum vkd3d_root_descriptor_flags +enum vkd3d_shader_root_descriptor_flags { - VKD3D_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAGS), }; enum vkd3d_shader_descriptor_range_flags @@ -542,7 +544,7 @@ struct vkd3d_root_descriptor1 { unsigned int shader_register; unsigned int register_space; - enum vkd3d_root_descriptor_flags flags; + enum vkd3d_shader_root_descriptor_flags flags; }; struct vkd3d_root_parameter1 diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 76a6a47..cad2556 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2211,7 +2211,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, } /* root signatures */ -#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE +#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE #define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ (VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) @@ -2398,10 +2398,10 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) { - unsigned int unknown_flags = descriptor->flags & ~(VKD3D_ROOT_DESCRIPTOR_FLAG_NONE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); + unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); if (unknown_flags) FIXME("Unknown root descriptor flags %#x.\n", unknown_flags); -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Rename the vkd3d_descriptor_range1 structure to vkd3d_shader_descriptor_range1.
by Henri Verbeet 14 Jul '20

14 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d7711b0..ab670ec 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -522,7 +522,7 @@ enum vkd3d_shader_descriptor_range_flags VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS), }; -struct vkd3d_descriptor_range1 +struct vkd3d_shader_descriptor_range1 { enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; @@ -535,7 +535,7 @@ struct vkd3d_descriptor_range1 struct vkd3d_root_descriptor_table1 { unsigned int descriptor_range_count; - const struct vkd3d_descriptor_range1 *descriptor_ranges; + const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; }; struct vkd3d_root_descriptor1 diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7692880..76a6a47 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2253,7 +2253,7 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * return VKD3D_OK; } -static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) +static void shader_validate_descriptor_range1(const struct vkd3d_shader_descriptor_range1 *range) { unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE @@ -2266,7 +2266,7 @@ static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_rang } static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) + unsigned int offset, unsigned int count, struct vkd3d_shader_descriptor_range1 *ranges) { const char *ptr; unsigned int i; @@ -2329,7 +2329,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, unsigned int offset, struct vkd3d_root_descriptor_table1 *table) { - struct vkd3d_descriptor_range1 *ranges; + struct vkd3d_shader_descriptor_range1 *ranges; unsigned int count; const char *ptr; @@ -2832,7 +2832,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, const struct vkd3d_root_descriptor_table1 *table) { - const struct vkd3d_descriptor_range1 *ranges = table->descriptor_ranges; + const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; unsigned int i; for (i = 0; i < table->descriptor_range_count; ++i) @@ -3080,7 +3080,7 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_ta for (i = 0; i < descriptor_table->descriptor_range_count; ++i) { - const struct vkd3d_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; + const struct vkd3d_shader_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV @@ -3200,7 +3200,7 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { - const struct vkd3d_descriptor_range1 *ranges1; + const struct vkd3d_shader_descriptor_range1 *ranges1; struct vkd3d_shader_descriptor_range *ranges; unsigned int i, j; int ret; @@ -3320,7 +3320,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, const struct vkd3d_root_parameter *src, unsigned int count) { const struct vkd3d_shader_descriptor_range *ranges; - struct vkd3d_descriptor_range1 *ranges1; + struct vkd3d_shader_descriptor_range1 *ranges1; unsigned int i, j; int ret; -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_descriptor_range structure to vkd3d_shader_descriptor_range.
by Henri Verbeet 14 Jul '20

14 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cc61dc5..d7711b0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -428,7 +428,7 @@ enum vkd3d_shader_descriptor_range_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE), }; -struct vkd3d_descriptor_range +struct vkd3d_shader_descriptor_range { enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; @@ -440,7 +440,7 @@ struct vkd3d_descriptor_range struct vkd3d_root_descriptor_table { unsigned int descriptor_range_count; - const struct vkd3d_descriptor_range *descriptor_ranges; + const struct vkd3d_shader_descriptor_range *descriptor_ranges; }; struct vkd3d_root_constants diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6035aee..7692880 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2223,7 +2223,7 @@ struct root_signature_parser_context }; static int shader_parse_descriptor_ranges(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_descriptor_range *ranges) + unsigned int offset, unsigned int count, struct vkd3d_shader_descriptor_range *ranges) { const char *ptr; unsigned int i; @@ -2302,7 +2302,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context static int shader_parse_descriptor_table(struct root_signature_parser_context *context, unsigned int offset, struct vkd3d_root_descriptor_table *table) { - struct vkd3d_descriptor_range *ranges; + struct vkd3d_shader_descriptor_range *ranges; unsigned int count; const char *ptr; @@ -2809,7 +2809,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, const struct vkd3d_root_descriptor_table *table) { - const struct vkd3d_descriptor_range *ranges = table->descriptor_ranges; + const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; unsigned int i; for (i = 0; i < table->descriptor_range_count; ++i) @@ -3044,7 +3044,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_ta for (i = 0; i < descriptor_table->descriptor_range_count; ++i) { - const struct vkd3d_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; + const struct vkd3d_shader_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV @@ -3201,7 +3201,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { const struct vkd3d_descriptor_range1 *ranges1; - struct vkd3d_descriptor_range *ranges; + struct vkd3d_shader_descriptor_range *ranges; unsigned int i, j; int ret; @@ -3319,7 +3319,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, const struct vkd3d_root_parameter *src, unsigned int count) { - const struct vkd3d_descriptor_range *ranges; + const struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_descriptor_range1 *ranges1; unsigned int i, j; int ret; -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Rename the vkd3d_descriptor_range_flags enumeration to vkd3d_shader_descriptor_range_flags.
by Henri Verbeet 14 Jul '20

14 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 16 +++++++++------- libs/vkd3d-shader/dxbc.c | 12 ++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 50c64ca..cc61dc5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -511,13 +511,15 @@ enum vkd3d_root_descriptor_flags VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, }; -enum vkd3d_descriptor_range_flags +enum vkd3d_shader_descriptor_range_flags { - VKD3D_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, - VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, - VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, - VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, - VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS), }; struct vkd3d_descriptor_range1 @@ -526,7 +528,7 @@ struct vkd3d_descriptor_range1 unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; - enum vkd3d_descriptor_range_flags flags; + enum vkd3d_shader_descriptor_range_flags flags; unsigned int descriptor_table_offset; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a0f03cf..6035aee 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2214,7 +2214,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, #define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE #define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ - (VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) + (VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) struct root_signature_parser_context { @@ -2255,11 +2255,11 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) { - unsigned int unknown_flags = range->flags & ~(VKD3D_DESCRIPTOR_RANGE_FLAG_NONE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); + unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); if (unknown_flags) FIXME("Unknown descriptor range flags %#x.\n", unknown_flags); -- 2.11.0

1 0

[PATCH] shlwapi/tests: Remove failing test.
by Nikolay Sivov 14 Jul '20

14 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/tests/ordinal.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 8c5e3e261e2..919cac8563f 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1684,11 +1684,8 @@ if (0) LocalFileTimeToFileTime(&filetime, &filetime); /* no way to get required buffer length here */ - SetLastError(0xdeadbeef); ret = pSHFormatDateTimeA(&filetime, NULL, NULL, 0); ok(ret == 0, "got %d\n", ret); - ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == ERROR_SUCCESS /* Win7 */), - "expected 0xdeadbeef, got %d\n", GetLastError()); SetLastError(0xdeadbeef); buff[0] = 'a'; buff[1] = 0; -- 2.27.0

1 0

[PATCH] msxml3/tests: Remove traces.
by Nikolay Sivov 14 Jul '20

14 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 4 ---- dlls/msxml3/tests/httpreq.c | 1 - 2 files changed, 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f45364058a6..7f3b42d8401 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13146,8 +13146,6 @@ static BOOL qi_list_contains_service(REFIID service, REFIID iid) static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID iid, void **ppv) { - trace("sp_QueryInterface: %s\n", wine_dbgstr_guid(iid)); - if (qi_count < ARRAY_SIZE(qi_list)) qi_list[qi_count++] = iid; else @@ -13177,8 +13175,6 @@ static ULONG WINAPI sp_Release(IServiceProvider *iface) static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, REFIID iid, void **ppv) { - trace("sp_QueryService: %s, %s\n", wine_dbgstr_guid(service), wine_dbgstr_guid(iid)); - if (IsEqualGUID(service, &SID_SContainerDispatch) || IsEqualGUID(service, &SID_SInternetHostSecurityManager)) { diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 8a2ed2c73a3..74c302d5ebe 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -235,7 +235,6 @@ static IHTMLElementCollection htmlecoll = { &TestHTMLECollectionVtbl }; /* test IHTMLDocument2 */ static HRESULT WINAPI htmldoc2_QueryInterface(IHTMLDocument2 *iface, REFIID riid, void **ppvObject) { - trace("\n"); *ppvObject = NULL; return E_NOINTERFACE; } -- 2.27.0

1 0

[PATCH] evr/tests: Fix test crash on Windows 7.
by Nikolay Sivov 14 Jul '20

14 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/tests/evr.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5e184947188..6a5d80df416 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1080,15 +1080,18 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); - /* Device manager wasn't set, sample get regular memory buffers. */ - hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + /* Device manager wasn't set, sample gets regular memory buffers. */ + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + } IMFMediaBuffer_Release(buffer); - IMFGetService_Release(gs); IMFSample_Release(sample); } -- 2.27.0

1 0

[PATCH] winevulkan: Export VK_KHR_get_surface_capabilities2 functions from vulkan-1.
by Brendan Shanks 14 Jul '20

14 Jul '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- These functions are now exported by the Windows loader, see <https://github.com/KhronosGroup/Vulkan-Loader/issues/342> and <https://github.com/KhronosGroup/Vulkan-Loader/commit/03cc64b563f2e4b875819b…> dlls/vulkan-1/vulkan-1.spec | 2 ++ dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winevulkan/winevulkan.spec | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index e8fb64d82bd..026bd99dec7 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -179,7 +179,9 @@ @ stdcall vkGetPhysicalDeviceQueueFamilyProperties2(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceQueueFamilyProperties2 @ stdcall vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties @ stdcall vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties2 +@ stdcall vkGetPhysicalDeviceSurfaceCapabilities2KHR(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR @ stdcall vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR +@ stdcall vkGetPhysicalDeviceSurfaceFormats2KHR(ptr ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormats2KHR @ stdcall vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormatsKHR @ stdcall vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfacePresentModesKHR @ stdcall vkGetPhysicalDeviceSurfaceSupportKHR(ptr long int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceSupportKHR diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b84eb39587e..04b263e3e40 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -130,6 +130,7 @@ UNSUPPORTED_EXTENSIONS = [ CORE_EXTENSIONS = [ "VK_KHR_display", "VK_KHR_display_swapchain", + "VK_KHR_get_surface_capabilities2", "VK_KHR_surface", "VK_KHR_swapchain", "VK_KHR_win32_surface", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 94aa1e3fb7b..06d79b8faea 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4939,7 +4939,7 @@ static VkResult WINAPI wine_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesC return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(physicalDevice->phys_dev, pCombinationCount, pCombinations); } -static VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) { #if defined(USE_STRUCT_CONVERSION) VkResult result; @@ -4962,7 +4962,7 @@ VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice->phys_dev, surface, pSurfaceCapabilities); } -static VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, uint32_t *pSurfaceFormatCount, VkSurfaceFormat2KHR *pSurfaceFormats) +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, uint32_t *pSurfaceFormatCount, VkSurfaceFormat2KHR *pSurfaceFormats) { #if defined(USE_STRUCT_CONVERSION) VkResult result; diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 44ac8c6d2fc..383e6b9b8f1 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -182,7 +182,9 @@ @ stdcall -private wine_vkGetPhysicalDeviceQueueFamilyProperties2(ptr ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr) +@ stdcall -private wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(ptr ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) +@ stdcall -private wine_vkGetPhysicalDeviceSurfaceFormats2KHR(ptr ptr ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceSupportKHR(ptr long int64 ptr) -- 2.26.2

2 1

[PATCH] ntdll: Always align stack pointer in __wine_syscall_dispatcher on x64.
by Paul Gofman 14 Jul '20

14 Jul '20

Syscall thunks break stack alignment for dispatcher. Regardless of that, it is probably better not to assume aligned stack in syscall thunk entry. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- tools/winebuild/import.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 97191ca89ec..4f641825e36 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1497,23 +1497,25 @@ void output_syscalls( DLLSPEC *spec ) * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tcmpq $%u,%%rax\n", count ); - output( "\tjae 3f\n" ); + output( "\tjae 4f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); - output( "\tjbe 1f\n" ); - output( "\tsubq %%rcx,%%rsp\n" ); + output( "\tja 1f\n" ); + output( "\tandq $~15,%%rsp\n\t" ); + output( "\tjmp 2f\n" ); + output( "1:\tsubq %%rcx,%%rsp\n" ); output( "\tshrq $3,%%rcx\n" ); output( "\tleaq 0x38(%%rbp),%%rsi\n" ); output( "\tandq $~15,%%rsp\n\t" ); output( "\tmovq %%rsp,%%rdi\n" ); output( "\tcld\n" ); output( "\trep; movsq\n" ); - output( "1:\tmovq %%r10,%%rcx\n" ); + output( "2:\tmovq %%r10,%%rcx\n" ); output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); output( "\tcallq *(%%r10,%%rax,8)\n" ); - output( "2:\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "3:\tleaq -0x10(%%rbp),%%rsp\n" ); output( "\tpopq %%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); output( "\tpopq %%rsi\n" ); @@ -1523,7 +1525,7 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -8" ); output_cfi( ".cfi_same_value %%rbp" ); output( "\tret\n" ); - output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "4:\tmovl $0x%x,%%eax\n", invalid_param ); output( "\tjmp 2b\n" ); break; case CPU_ARM: -- 2.26.2

1 0

[PATCH 1/5] quartz: Use calloc() in filter_graph_common_create().
by Zebediah Figura 13 Jul '20

13 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 110 ++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 63 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a23e35d6a1c..8c206789897 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -510,7 +510,7 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) CloseHandle(This->message_thread_ret); } DeleteCriticalSection(&This->cs); - CoTaskMemFree(This); + free(This); InterlockedDecrement(&object_locks); } @@ -5377,80 +5377,64 @@ static const IUnknownVtbl IInner_VTable = static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL threaded) { - IFilterGraphImpl *fimpl; + IFilterGraphImpl *object; HRESULT hr; *out = NULL; - fimpl = CoTaskMemAlloc(sizeof(*fimpl)); - fimpl->defaultclock = TRUE; - fimpl->IUnknown_inner.lpVtbl = &IInner_VTable; - fimpl->IFilterGraph2_iface.lpVtbl = &IFilterGraph2_VTable; - fimpl->IMediaControl_iface.lpVtbl = &IMediaControl_VTable; - fimpl->IMediaSeeking_iface.lpVtbl = &IMediaSeeking_VTable; - fimpl->IBasicAudio_iface.lpVtbl = &IBasicAudio_VTable; - fimpl->IBasicVideo2_iface.lpVtbl = &IBasicVideo_VTable; - fimpl->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable; - fimpl->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable; - fimpl->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; - fimpl->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; - fimpl->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; - fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; - fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; - fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; - fimpl->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; - fimpl->ref = 1; - list_init(&fimpl->filters); - fimpl->name_index = 1; - fimpl->refClock = NULL; - fimpl->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); - fimpl->HandleEcComplete = TRUE; - fimpl->HandleEcRepaint = TRUE; - fimpl->HandleEcClockChanged = TRUE; - fimpl->notif.hWnd = 0; - fimpl->notif.disabled = FALSE; - fimpl->nRenderers = 0; - fimpl->EcCompleteCount = 0; - fimpl->refClockProvider = NULL; - fimpl->state = State_Stopped; - fimpl->pSite = NULL; - EventsQueue_Init(&fimpl->evqueue); - InitializeCriticalSection(&fimpl->cs); - fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); - fimpl->nItfCacheEntries = 0; - memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); - fimpl->stream_start = fimpl->stream_elapsed = 0; - fimpl->punkFilterMapper2 = NULL; - fimpl->version = 0; - fimpl->current_pos = 0; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - if (threaded) + object->IBasicAudio_iface.lpVtbl = &IBasicAudio_VTable; + object->IBasicVideo2_iface.lpVtbl = &IBasicVideo_VTable; + object->IFilterGraph2_iface.lpVtbl = &IFilterGraph2_VTable; + object->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; + object->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; + object->IMediaControl_iface.lpVtbl = &IMediaControl_VTable; + object->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable; + object->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; + object->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; + object->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; + object->IMediaSeeking_iface.lpVtbl = &IMediaSeeking_VTable; + object->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; + object->IUnknown_inner.lpVtbl = &IInner_VTable; + object->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; + object->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable; + object->ref = 1; + object->outer_unk = outer ? outer : &object->IUnknown_inner; + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, object->outer_unk, + CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&object->punkFilterMapper2))) { - fimpl->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); - fimpl->message_thread = CreateThread(NULL, 0, message_thread_run, fimpl, 0, &fimpl->message_thread_id); - WaitForSingleObject(fimpl->message_thread_ret, INFINITE); + ERR("Failed to create filter mapper, hr %#x.\n", hr); + free(object); + return hr; } - else - fimpl->message_thread = NULL; - fimpl->outer_unk = outer ? outer : &fimpl->IUnknown_inner; + InitializeCriticalSection(&object->cs); + object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); - /* create Filtermapper aggregated. */ - hr = CoCreateInstance(&CLSID_FilterMapper2, fimpl->outer_unk, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&fimpl->punkFilterMapper2); + object->defaultclock = TRUE; + EventsQueue_Init(&object->evqueue); + list_init(&object->filters); + object->HandleEcClockChanged = TRUE; + object->HandleEcComplete = TRUE; + object->HandleEcRepaint = TRUE; + object->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); + object->name_index = 1; + object->timeformatseek = TIME_FORMAT_MEDIA_TIME; - if (FAILED(hr)) { - ERR("Unable to create filter mapper (%x)\n", hr); - if (fimpl->punkFilterMapper2) IUnknown_Release(fimpl->punkFilterMapper2); - CloseHandle(fimpl->hEventCompletion); - EventsQueue_Destroy(&fimpl->evqueue); - fimpl->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&fimpl->cs); - CoTaskMemFree(fimpl); - return hr; + if (threaded) + { + object->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); + object->message_thread = CreateThread(NULL, 0, message_thread_run, object, 0, &object->message_thread_id); + WaitForSingleObject(object->message_thread_ret, INFINITE); } + else + object->message_thread = NULL; - *out = &fimpl->IUnknown_inner; + TRACE("Created %sthreaded filter graph %p.\n", threaded ? "" : "non-", object); + *out = &object->IUnknown_inner; return S_OK; } -- 2.27.0

2 5

[PATCH] ws2_32: Trace SIO_IDEAL_SEND_BACKLOG_* calls
by Alistair Leslie-Hughes 13 Jul '20

13 Jul '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 4 ++-- include/ws2ipdef.h | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f55b023e527..a0df7698206 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4619,8 +4619,8 @@ static const char *debugstr_wsaioctl(DWORD code) IOCTL_NAME(WS_SIO_GET_INTERFACE_LIST); /* IOCTL_NAME(WS_SIO_GET_INTERFACE_LIST_EX); */ IOCTL_NAME(WS_SIO_GET_QOS); - /* IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_CHANGE); - IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_QUERY); */ + IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_CHANGE); + IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_QUERY); IOCTL_NAME(WS_SIO_KEEPALIVE_VALS); IOCTL_NAME(WS_SIO_MULTIPOINT_LOOPBACK); IOCTL_NAME(WS_SIO_MULTICAST_SCOPE); diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 4cae361e5fe..fc465804962 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -282,6 +282,14 @@ typedef struct WS(in_pktinfo) { #define SS_PORT(ssp) (((PSOCKADDR_IN)(ssp))->sin_port) +#ifndef USE_WS_PREFIX +#define SIO_IDEAL_SEND_BACKLOG_CHANGE _IO ('t', 122) +#define SIO_IDEAL_SEND_BACKLOG_QUERY _IOR('t', 123, ULONG) +#else +#define WS_SIO_IDEAL_SEND_BACKLOG_CHANGE WS__IO ('t', 122) +#define WS_SIO_IDEAL_SEND_BACKLOG_QUERY WS__IOR('t', 123, ULONG) +#endif + #ifdef __cplusplus extern "C" { #endif -- 2.27.0

1 0

[PATCH] bcrypt: Allow importing private ECDSA keys.
by Derek Lesho 13 Jul '20

13 Jul '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fee40ebe8d..f4e59734cc 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1201,6 +1201,10 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP key_size = 32; magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; break; + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + break; default: FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); -- 2.27.0

2 2

[PATCH v3 4/6] windowscodecs: Implement DdsDecoder_Wine_Initialize().
by Ziqing Hui 13 Jul '20

13 Jul '20

Code in DdsDecoder_Initialize() are moved to DdsDecoder_Wine_Initialize(). And DdsDecoder_Initialize() are implemented on top of DdsDecoder_Wine_Initialize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Change the position of EnterCriticalSection() to the beginning of DdsDecoder_Initialize(). dlls/windowscodecs/ddsformat.c | 118 ++++++++++++++++----------- dlls/windowscodecs/tests/ddsformat.c | 3 - 2 files changed, 70 insertions(+), 51 deletions(-)

3 2

[PATCH v2] winegcc: Align sections in PE files to page size.
by Rémi Bernon 13 Jul '20

13 Jul '20

This makes sure it will be possible to mmap the section directly instead of having to copy them. It then also makes perf able to figure the code origin for Wine modules. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Move code to PLATFORM_MINGW case. tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 29c1b0549d3..274f93f40fd 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -521,6 +521,9 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) if (opts->debug_file && strendswith(opts->debug_file, ".pdb")) strarray_add(link_args, strmake("-Wl,-pdb,%s", opts->debug_file)); + if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment,0x1000" )) + strarray_add( link_args, "-Wl,--file-alignment,0x1000" ); + strarray_addall( link_args, flags ); return link_args; -- 2.27.0

1 0

[PATCH] ntdll/tests: Add test to check if GetTickCount is updated after sleeping.
by Myah Caron 13 Jul '20

13 Jul '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/ntdll/tests/time.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index d756a8c839..02d54feec3 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -199,7 +199,7 @@ static void test_user_shared_data_time(void) { KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; ULONGLONG t1, t2, t3; - int i = 0; + int i = 0, working = 0; i = 0; do @@ -253,6 +253,17 @@ static void test_user_shared_data_time(void) "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); } + + for (i = 0; i < 100; i++) { + t1 = GetTickCount(); + Sleep(1); + t2 = GetTickCount(); + + if (t1 != t2) + working++; + } + + todo_wine ok(working >= 90, "tick count isn't updated after sleeping one millisecond (%d%% correct)\n", working); } START_TEST(time) -- 2.27.0

1 0

ntdll/tests: Add test to check if GetTickCount is updated after sleeping.
by Myah Caron 13 Jul '20

13 Jul '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/ntdll/tests/time.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index d756a8c839..02d54feec3 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -199,7 +199,7 @@ static void test_user_shared_data_time(void) { KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; ULONGLONG t1, t2, t3; - int i = 0; + int i = 0, working = 0; i = 0; do @@ -253,6 +253,17 @@ static void test_user_shared_data_time(void) "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); } + + for (i = 0; i < 100; i++) { + t1 = GetTickCount(); + Sleep(1); + t2 = GetTickCount(); + + if (t1 != t2) + working++; + } + + todo_wine ok(working >= 90, "tick count isn't updated after sleeping one millisecond (%d%% correct)\n", working); } START_TEST(time) -- 2.27.0

1 0

[PATCH] winegcc: Align sections in PE files to page size.
by Rémi Bernon 13 Jul '20

13 Jul '20

This makes sure it will be possible to mmap the section directly instead of having to copy them. It then also makes perf able to figure the code origin for Wine modules. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm resending just this one as I am now trying to upstream PE support directly in Linux perf. This should still be useful to avoid copying sections when Wine modules are loaded. tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 29c1b0549d3..24da839fd83 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -547,6 +547,9 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) else if (!opts->strip) strarray_add(link_args, "-Wl,-debug:dwarf"); + if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment:0x1000")) + strarray_add( link_args, "-Wl,--file-alignment:0x1000" ); + strarray_addall( link_args, flags ); return link_args; -- 2.27.0

3 4

[PATCH 1/4] gdiplus/tests: Add metafile DrawDriverString test.
by Shawn M. Chapla 13 Jul '20

13 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/metafile.c | 141 ++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f3b817b3de..9e25da7561 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2953,6 +2953,146 @@ static void test_restoredc(void) expect(Ok, stat); } +static const emfplus_record drawdriverstring_records[] = { + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypeFont << 8, 1, 0 }, + { EmfPlusRecordTypeDrawDriverString, 0x8000, 1, 0 }, + { EmfPlusRecordTypeObject, (ObjectTypeFont << 8) | 1, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 2, 1, 1 }, + { EmfPlusRecordTypeDrawDriverString, 0x1, 1, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_drawdriverstring(void) +{ + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const PointF solidpos[4] = {{10.0,10.0}, {20.0,10.0}, {30.0,10.0}, {40.0,10.0}}; + static const PointF hatchpos = {10.0,30.0}; + + GpBitmap *bitmap; + GpStatus stat; + GpGraphics *graphics; + GpFont *solidfont, *hatchfont; + GpBrush *solidbrush, *hatchbrush; + HDC hdc; + GpMatrix *matrix; + GpMetafile *metafile; + ARGB color; + LOGFONTA logfont = { 0 }; + + hdc = CreateCompatibleDC(0); + + strcpy(logfont.lfFaceName, "Times New Roman"); + logfont.lfHeight = 12; + logfont.lfCharSet = DEFAULT_CHARSET; + + stat = GdipCreateFontFromLogfontA(hdc, &logfont, &solidfont); + if (stat == NotTrueTypeFont || stat == FileNotFound) + { + DeleteDC(hdc); + skip("Times New Roman not installed.\n"); + return; + } + + stat = GdipCloneFont(solidfont, &hatchfont); + expect(Ok, stat); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, + L"winetest", &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + hdc = NULL; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&solidbrush); + expect(Ok, stat); + + stat = GdipCreateHatchBrush(HatchStyleHorizontal, (ARGB)0xff00ff00, (ARGB)0xffff0000, + (GpHatch**)&hatchbrush); + expect(Ok, stat); + + stat = GdipCreateMatrix(&matrix); + expect(Ok, stat); + + stat = GdipDrawDriverString(graphics, L"Test", 4, solidfont, solidbrush, solidpos, + DriverStringOptionsCmapLookup, matrix); + todo_wine expect(Ok, stat); + + stat = GdipSetMatrixElements(matrix, 1.5, 0.0, 0.0, 1.5, 0.0, 0.0); + expect(Ok, stat); + + stat = GdipDrawDriverString(graphics, L"Test ", 5, hatchfont, hatchbrush, &hatchpos, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, matrix); + todo_wine expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + graphics = NULL; + + check_metafile(metafile, drawdriverstring_records, "drawdriverstring metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "drawdriverstring.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, drawdriverstring_records, "drawdriverstring playback", + dst_points, &frame, UnitPixel); + +/* The way we render glyphs differs slightly from native wrt. alpha + channel values around edges. Since verifying that glyphs are + rendered in a way that is pixel identical to native isn't really + the point of this test, simply perform a cursory check that + alpha channel values are non-zero. */ +#define fuzzy_expect(expected, got) \ + ok((got & ~0xff000000) == expected && (got & 0xff000000), \ + "Expected RGB 0x%.8x with any non-zero alpha value, got 0x%.8x\n", expected, got) + + GdipBitmapGetPixel(bitmap, 12, 9, &color); + todo_wine fuzzy_expect(0xff, color); + + GdipBitmapGetPixel(bitmap, 21, 9, &color); + todo_wine fuzzy_expect(0xff, color); + + GdipBitmapGetPixel(bitmap, 31, 9, &color); + todo_wine fuzzy_expect(0xff, color); + + GdipBitmapGetPixel(bitmap, 41, 9, &color); + todo_wine fuzzy_expect(0xff, color); + + GdipBitmapGetPixel(bitmap, 14, 23, &color); + todo_wine fuzzy_expect(0xff0000, color); + + GdipBitmapGetPixel(bitmap, 23, 23, &color); + todo_wine fuzzy_expect(0xff0000, color); + + GdipBitmapGetPixel(bitmap, 28, 23, &color); + todo_wine fuzzy_expect(0xff0000, color); + + GdipBitmapGetPixel(bitmap, 32, 23, &color); + todo_wine fuzzy_expect(0xff0000, color); + +#undef fuzzy_expect + + GdipDeleteMatrix(matrix); + GdipDeleteGraphics(graphics); + GdipDeleteBrush(solidbrush); + GdipDeleteBrush(hatchbrush); + GdipDeleteFont(solidfont); + GdipDeleteFont(hatchfont); + GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage((GpImage*)metafile); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3002,6 +3142,7 @@ START_TEST(metafile) test_drawpath(); test_fillpath(); test_restoredc(); + test_drawdriverstring(); GdiplusShutdown(gdiplusToken); } -- 2.27.0

4 8

[PATCH v3 6/6] windowscodecs: Add support for decoding uncompressed DDS image.
by Ziqing Hui 13 Jul '20

13 Jul '20

For uncompressed DDS image, "a block" means a pixel. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 75 +++++++++++++++++----------- dlls/windowscodecs/tests/ddsformat.c | 10 ---- 2 files changed, 47 insertions(+), 38 deletions(-)

2 1

[PATCH v3 5/6] windowscodecs/tests: Add tests for decoding uncompressed DDS image.
by Ziqing Hui 13 Jul '20

13 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 98 +++++++++++++++------------- 1 file changed, 54 insertions(+), 44 deletions(-)

2 1

[PATCH 1/5] msdmo/tests: Add tests for DMOGetTypes().
by Zebediah Figura 13 Jul '20

13 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msdmo/tests/msdmo.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 68de11f21ab..14653ea8d75 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -117,9 +117,59 @@ static void test_DMOEnum(void) IEnumDMO_Release(enum_dmo); } +static void test_DMOGetTypes(void) +{ + static const DMO_PARTIAL_MEDIATYPE input_types[] = + { + {{0x1111}, {0x2222}}, + {{0x1111}, {0x3333}}, + }; + ULONG input_count, output_count; + DMO_PARTIAL_MEDIATYPE types[3]; + HRESULT hr; + + hr = DMOGetTypes(&GUID_unknowndmo, 0, &input_count, types, 0, &output_count, NULL); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, + ARRAY_SIZE(input_types), input_types, 0, NULL); + if (hr != S_OK) + return; + + hr = DMOGetTypes(&GUID_unknowndmo, 0, &input_count, types, 0, &output_count, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!input_count, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + + memset(types, 0, sizeof(types)); + hr = DMOGetTypes(&GUID_unknowndmo, 1, &input_count, types, 0, &output_count, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(input_count == 1, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + todo_wine ok(!memcmp(types, input_types, sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); + + memset(types, 0, sizeof(types)); + hr = DMOGetTypes(&GUID_unknowndmo, 2, &input_count, types, 0, &output_count, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(input_count == 2, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + ok(!memcmp(types, input_types, 2 * sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); + + memset(types, 0, sizeof(types)); + hr = DMOGetTypes(&GUID_unknowndmo, 2, &input_count, types, 0, &output_count, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(input_count == 2, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + ok(!memcmp(types, input_types, 2 * sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + START_TEST(msdmo) { test_DMOUnregister(); test_DMOGetName(); test_DMOEnum(); + test_DMOGetTypes(); } -- 2.27.0

1 4

[RFC] Trying to fix desktop switches, cont.
by Rafał Mużyło 13 Jul '20

13 Jul '20

So, after the previous post, I sat down and once again did some thinking/tinkering. Obviously, the previous patch couldn't work, at least not in the restoring part. This one seems to work (for now), though I've only did some very basic testing. It doesn't seem to be a way to add private data to a window, that would both be only accessible by wine and integrated with standard winapi calls. Correct me, if that's wrong. While WS_HIDDEN would seem better fitting, AFAICT it removes the window from event queues, so I went with WS_DISABLED. This time through standard functions.

4 9

[PATCH] ws2_32: Drop dependencies on system getprotoby(name|number) functions
by Alex Henrie 13 Jul '20

13 Jul '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Implementing these functions entirely in Wine allows us to make sure that protocol 0 is "ip" (not "hotopt" like on Linux) and that protocols supported by neither Windows nor Wine do not appear in the list. Plus, it will facilitate the conversion of ws2_32 to PE. --- configure.ac | 2 - dlls/ws2_32/socket.c | 165 +++++++++++++++++------------------ dlls/ws2_32/tests/protocol.c | 147 +++++++++++++++++++++++++++++++ 3 files changed, 229 insertions(+), 85 deletions(-) diff --git a/configure.ac b/configure.ac index 4829648c3a..9002ce8d60 100644 --- a/configure.ac +++ b/configure.ac @@ -2245,8 +2245,6 @@ AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ ) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 69fbb37af2..36a92f2354 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6505,60 +6505,82 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) } -static const struct { int prot; const char *names[3]; } protocols[] = -{ - { 0, { "ip", "IP" }}, - { 1, { "icmp", "ICMP" }}, - { 2, { "igmp", "IGMP" }}, - { 3, { "ggp", "GGP" }}, - { 6, { "tcp", "TCP" }}, - { 8, { "egp", "EGP" }}, - { 9, { "igp", "IGP" }}, - { 12, { "pup", "PUP" }}, - { 17, { "udp", "UDP" }}, - { 20, { "hmp", "HMP" }}, - { 22, { "xns-idp", "XNS-IDP" }}, - { 27, { "rdp", "RDP" }}, - { 29, { "iso-tp4", "ISO-TP4" }}, - { 33, { "dccp", "DCCP" }}, - { 36, { "xtp", "XTP" }}, - { 37, { "ddp", "DDP" }}, - { 38, { "idpr-cmtp", "IDPR-CMTP" }}, - { 41, { "ipv6", "IPv6" }}, - { 43, { "ipv6-route", "IPv6-Route" }}, - { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 45, { "idrp", "IDRP" }}, - { 46, { "rsvp", "RSVP" }}, - { 47, { "gre", "GRE" }}, - { 50, { "esp", "ESP" }}, - { 51, { "ah", "AH" }}, - { 57, { "skip", "SKIP" }}, - { 58, { "ipv6-icmp", "IPv6-ICMP" }}, - { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, - { 60, { "ipv6-opts", "IPv6-Opts" }}, - { 66, { "rvd", "RVD" }}, - { 73, { "rspf", "RSPF" }}, - { 81, { "vmtp", "VMTP" }}, - { 88, { "eigrp", "EIGRP" }}, - { 89, { "ospf", "OSPFIGP" }}, - { 93, { "ax.25", "AX.25" }}, - { 94, { "ipip", "IPIP" }}, - { 97, { "etherip", "ETHERIP" }}, - { 98, { "encap", "ENCAP" }}, - { 103, { "pim", "PIM" }}, - { 108, { "ipcomp", "IPCOMP" }}, - { 112, { "vrrp", "VRRP" }}, - { 115, { "l2tp", "L2TP" }}, - { 124, { "isis", "ISIS" }}, - { 132, { "sctp", "SCTP" }}, - { 133, { "fc", "FC" }}, - { 135, { "mobility-header", "Mobility-Header" }}, - { 136, { "udplite", "UDPLite" }}, - { 137, { "mpls-in-ip", "MPLS-in-IP" }}, - { 139, { "hip", "HIP" }}, - { 140, { "shim6", "Shim6" }}, - { 141, { "wesp", "WESP" }}, - { 142, { "rohc", "ROHC" }}, +static const char * const protocols[][3] = +{ + /* 0 */ + { "ip", "IP" }, + { "icmp", "ICMP" }, + { }, + { "ggp", "GGP" }, + { }, + { }, + { "tcp", "TCP" }, + { }, + { "egp", "EGP" }, + { }, + /* 10 */ + { }, + { }, + { "pup", "PUP" }, + { }, + { }, + { }, + { }, + { "udp", "UDP" }, + { }, + { }, + /* 20 */ + { "hmp", "HMP" }, + { }, + { "xns-idp", "XNS-IDP" }, + { }, + { }, + { }, + { }, + { "rdp", "RDP" }, + { }, + { }, + /* 30 */ + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + /* 40 */ + { }, + { "ipv6", "IPv6" }, + { }, + { "ipv6-route", "IPv6-Route" }, + { "ipv6-frag", "IPv6-Frag" }, + { }, + { }, + { }, + { }, + { }, + /* 50 */ + { "esp", "ESP" }, + { "ah", "AH" }, + { }, + { }, + { }, + { }, + { }, + { }, + { "ipv6-icmp", "IPv6-ICMP" }, + { "ipv6-nonxt", "IPv6-NoNxt" }, + /* 60 */ + { "ipv6-opts", "IPv6-Opts" }, + { }, + { }, + { }, + { }, + { }, + { "rvd", "RVD" }, }; /*********************************************************************** @@ -6567,21 +6589,12 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNAME - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobyname(name)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + if (protocols[i][0] && _strnicmp( protocols[i][0], name, -1 ) == 0) { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); + retval = WS_create_pe( protocols[i][0], (char **)&protocols[i][1], i ); break; } } @@ -6601,23 +6614,9 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNUMBER - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobynumber(number)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + if (number < ARRAY_SIZE(protocols) && protocols[number][0]) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + retval = WS_create_pe( protocols[number][0], (char **)&protocols[number][1], number ); } if (!retval) { diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 99bd1373a9..323119da1c 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -192,6 +192,151 @@ static void test_WSAEnumProtocolsW(void) } } +static const struct +{ + const char *names[3]; + BOOL missing_from_xp; +} +protocols[] = +{ + /* 0 */ + { { "ip", "IP" } }, + { { "icmp", "ICMP" } }, + { }, + { { "ggp", "GGP" } }, + { }, + { }, + { { "tcp", "TCP" } }, + { }, + { { "egp", "EGP" } }, + { }, + /* 10 */ + { }, + { }, + { { "pup", "PUP" } }, + { }, + { }, + { }, + { }, + { { "udp", "UDP" } }, + { }, + { }, + /* 20 */ + { { "hmp", "HMP" } }, + { }, + { { "xns-idp", "XNS-IDP" } }, + { }, + { }, + { }, + { }, + { { "rdp", "RDP" } }, + { }, + { }, + /* 30 */ + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + /* 40 */ + { }, + { { "ipv6", "IPv6" }, TRUE }, + { }, + { { "ipv6-route", "IPv6-Route" }, TRUE }, + { { "ipv6-frag", "IPv6-Frag" }, TRUE }, + { }, + { }, + { }, + { }, + { }, + /* 50 */ + { { "esp", "ESP" }, TRUE }, + { { "ah", "AH" }, TRUE }, + { }, + { }, + { }, + { }, + { }, + { }, + { { "ipv6-icmp", "IPv6-ICMP" }, TRUE }, + { { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE }, + /* 60 */ + { { "ipv6-opts", "IPv6-Opts" }, TRUE }, + { }, + { }, + { }, + { }, + { }, + { { "rvd", "RVD" } }, +}; + +void test_getprotobyname(void) +{ + struct protoent *ent; + char all_caps_name[16]; + int i, j; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + for (j = 0; protocols[i].names[j]; j++) + { + ent = getprotobyname(protocols[i].names[j]); + ok((ent && ent->p_proto == i) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(protocols[i].names[j]), i, ent ? ent->p_proto : -1); + } + + if (protocols[i].names[0]) + { + for (j = 0; protocols[i].names[0][j]; j++) + all_caps_name[j] = toupper(protocols[i].names[0][j]); + all_caps_name[j] = 0; + ent = getprotobyname(all_caps_name); + ok((ent && ent->p_proto == i) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(all_caps_name), i, ent ? ent->p_proto : -1); + } + } +} + +void test_getprotobynumber(void) +{ + struct protoent *ent; + int i, j; + + for (i = -1; i <= 256; i++) + { + ent = getprotobynumber(i); + + if (i < 0 || i >= ARRAY_SIZE(protocols) || !protocols[i].names[0]) + { + ok(!ent, + "Expected protocol number %d to be undefined, got %s\n", + i, wine_dbgstr_a(ent ? ent->p_name : NULL)); + continue; + } + + ok((ent && ent->p_name && strcmp(ent->p_name, protocols[i].names[0]) == 0) || + broken(!ent && protocols[i].missing_from_xp), + "Expected protocol number %d to be %s, got %s\n", + i, protocols[i].names[0], wine_dbgstr_a(ent ? ent->p_name : NULL)); + + for (j = 0; protocols[i].names[1+j]; j++) + { + ok((ent && ent->p_aliases && ent->p_aliases[j] && + strcmp(ent->p_aliases[j], protocols[i].names[1+j]) == 0) || + broken(!ent && protocols[i].missing_from_xp), + "Expected protocol number %d alias %d to be %s, got %s\n", + i, j, protocols[i].names[0], wine_dbgstr_a(ent && ent->p_aliases ? ent->p_aliases[j] : NULL)); + } + } +} + START_TEST( protocol ) { WSADATA data; @@ -201,4 +346,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); + test_getprotobyname(); + test_getprotobynumber(); } -- 2.27.0

3 3

[PATCH 1/5] wined3d: Fix / update reported driver model version.
by Matteo Bruni 13 Jul '20

13 Jul '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/directx.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 454125c1462d..45f3f61f2fe7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -198,20 +198,26 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) return refcount; } -/* Certain applications (Steam) complain if we report an outdated driver version. In general, - * reporting a driver version is moot because we are not the Windows driver, and we have different - * bugs, features, etc. +/* Certain applications (e.g. Steam) complain if we report an outdated driver + * version. * * The driver version has the form "x.y.z.w". * - * "x" is the Windows version the driver is meant for: + * "x" is the Windows version / driver model the driver is meant for: * 4 -> 95/98/NT4 * 5 -> 2000 - * 6 -> 2000/XP - * 7 -> Vista - * 8 -> Windows 7 - * 9 -> Windows 8 - * 10 -> Windows 10 + * 6 -> XP + * 7 -> Vista - WDDM 1.0 + * 8 -> Windows 7 - WDDM 1.1 + * 9 -> Windows 8 - WDDM 1.2 + * 10 -> Windows 8.1 - WDDM 1.3 + * 20 -> Windows 10 - WDDM 2.0 + * 21 -> Windows 10 Anniversary Update - WDDM 2.1 + * 22 -> Windows 10 Creators Update - WDDM 2.2 + * 23 -> Windows 10 Fall Creators Update - WDDM 2.3 + * 24 -> Windows 10 April 2018 Update - WDDM 2.4 + * 25 -> Windows 10 October 2018 Update - WDDM 2.5 + * 26 -> Windows 10 May 2019 Update - WDDM 2.6 * * "y" is the maximum Direct3D version the driver supports. * y -> d3d version mapping: @@ -705,20 +711,25 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_os_version = 8; driver_model = DRIVER_MODEL_NT6X; } + else if (os_version.dwMinorVersion == 2) + { + driver_os_version = 9; + driver_model = DRIVER_MODEL_NT6X; + } else { if (os_version.dwMinorVersion > 3) { - FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", + FIXME("Unhandled OS version %u.%u, reporting Windows 8.1.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); } - driver_os_version = 9; + driver_os_version = 10; driver_model = DRIVER_MODEL_NT6X; } break; case 10: - driver_os_version = 10; + driver_os_version = 26; driver_model = DRIVER_MODEL_NT6X; break; -- 2.26.2

2 7

[PATCH v2] msvcrt: Remove extra pointers on lldiv() implementation and test.
by Serge Gautherie 13 Jul '20

13 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/msvcrt/math.c | 9 +++++---- dlls/ucrtbase/tests/misc.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2e91547..ae4a267 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2114,11 +2114,12 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) /********************************************************************* * lldiv (MSVCR100.@) */ -MSVCRT_lldiv_t* CDECL MSVCRT_lldiv(MSVCRT_lldiv_t *ret, - MSVCRT_longlong num, MSVCRT_longlong denom) +MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) { - ret->quot = num / denom; - ret->rem = num % denom; + MSVCRT_lldiv_t ret; + + ret.quot = num / denom; + ret.rem = num % denom; return ret; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index cd100cf..e4928b1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -520,12 +520,19 @@ static void test__sopen_s(void) static void test_lldiv(void) { - static lldiv_t* (CDECL *p_lldiv)(lldiv_t*,LONGLONG,LONGLONG) = (void*)lldiv; lldiv_t r; - p_lldiv(&r, (LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); + r = lldiv(((LONGLONG)0x111 << 32) + 0x222, (LONGLONG)1 << 32); ok(r.quot == 0x111, "quot = %s\n", wine_dbgstr_longlong(r.quot)); ok(r.rem == 0x222, "rem = %s\n", wine_dbgstr_longlong(r.rem)); + + r = lldiv(((LONGLONG)0x69CF0012 << 32) + 0x0033E78A, 0x30); + ok(r.quot == ((LONGLONG)0x02345000 << 32) + 0x600114D2, "quot = %s\n", wine_dbgstr_longlong(r.quot)); + ok(r.rem == 0x2A, "rem = %s\n", wine_dbgstr_longlong(r.rem)); + + r = lldiv(((LONGLONG)0x243A5678 << 32) + 0x9ABCDEF0, (LONGLONG)0x12 << 48); + ok(r.quot == 0x0203, "quot = %s\n", wine_dbgstr_longlong(r.quot)); + ok(r.rem == ((LONGLONG)0x00045678 << 32) + 0x9ABCDEF0, "rem = %s\n", wine_dbgstr_longlong(r.rem)); } static void test_isblank(void) -- 2.10.0.windows.1

2 1

[PATCH 6/6] server: Remove no longer needed get_console_mode and set_console_mode requests.
by Jacek Caban 13 Jul '20

13 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 58 --------------------------------------------- server/protocol.def | 14 ----------- 2 files changed, 72 deletions(-)

2 1

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-devel