- wine-devel - winehq.org

[PATCH v2 4/9] server: Support ConDrv/CurrentOut device.
by Jacek Caban 25 Jun '20

25 Jun '20

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

1 0

[PATCH v2 3/9] server: Support ConDrv/CurrentIn device.
by Jacek Caban 25 Jun '20

25 Jun '20

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

1 0

[PATCH v2 2/9] server: Introduce ConDrv device.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ server/directory.c | 6 +++- server/file.h | 1 + 3 files changed, 84 insertions(+), 1 deletion(-)

1 0

[PATCH v2 1/9] kernel32/tests: Add more tests for opening console.
by Jacek Caban 25 Jun '20

25 Jun '20

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

1 0

[PATCH] api-ms-win-core-namedpipe-ansi-l1-1-0: Add stub dll.
by Brendan Shanks 25 Jun '20

25 Jun '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 1 + dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-namedpipe-ansi-l1-1-0.spec | 3 +++ 3 files changed, 5 insertions(+) create mode 100644 dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec diff --git a/configure.ac b/configure.ac index a78610c6490..3c03bad292e 100644 --- a/configure.ac +++ b/configure.ac @@ -2903,6 +2903,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-misc-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-ansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namespace-l1-1-0) diff --git a/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in new file mode 100644 index 00000000000..6a86fa59ec3 --- /dev/null +++ b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-namedpipe-ansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec new file mode 100644 index 00000000000..d1e0b146dca --- /dev/null +++ b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stub GetNamedPipeClientComputerNameA +@ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) kernel32.GetNamedPipeHandleStateA +@ stdcall WaitNamedPipeA (str long) kernel32.WaitNamedPipeA -- 2.26.2

1 0

[PATCH v2 1/3] amstream: Use IDirectDraw instead of IDirectDraw7 internally.
by Gijs Vermeulen 25 Jun '20

25 Jun '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 35 ++++++++++++++++++---------------- dlls/amstream/tests/amstream.c | 12 ++++++------ 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index ca6a910f3f..f1b6d37d08 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -39,7 +39,7 @@ struct ddraw_stream IMultiMediaStream* parent; MSPID purpose_id; STREAM_TYPE stream_type; - IDirectDraw7 *ddraw; + IDirectDraw *ddraw; CRITICAL_SECTION cs; IMediaStreamFilter *filter; @@ -107,17 +107,17 @@ static ULONG WINAPI ddraw_IAMMediaStream_AddRef(IAMMediaStream *iface) static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); + ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + TRACE("%p decreasing refcount to %u.\n", stream, ref); if (!ref) { - DeleteCriticalSection(&This->cs); - if (This->ddraw) - IDirectDraw7_Release(This->ddraw); - HeapFree(GetProcessHeap(), 0, This); + DeleteCriticalSection(&stream->cs); + if (stream->ddraw) + IDirectDraw_Release(stream->ddraw); + HeapFree(GetProcessHeap(), 0, stream); } return ref; @@ -214,8 +214,8 @@ static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn stream->stream_type = stream_type; if (source_object - && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw7, (void **)&stream->ddraw))) - FIXME("Stream object doesn't implement IDirectDraw7 interface, hr %#x.\n", hr); + && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw, (void **)&stream->ddraw))) + FIXME("Stream object doesn't implement IDirectDraw interface, hr %#x.\n", hr); return S_OK; } @@ -373,23 +373,26 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMediaStream *iface, IDirectDraw **ddraw) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); - TRACE("(%p)->(%p)\n", iface, ddraw); + TRACE("stream %p, ddraw %p.\n", stream, ddraw); if (!ddraw) return E_POINTER; *ddraw = NULL; - if (!This->ddraw) + if (!stream->ddraw) { - HRESULT hr = DirectDrawCreateEx(NULL, (void**)&This->ddraw, &IID_IDirectDraw7, NULL); + HRESULT hr = DirectDrawCreate(NULL, &stream->ddraw, NULL); if (FAILED(hr)) return hr; - IDirectDraw7_SetCooperativeLevel(This->ddraw, NULL, DDSCL_NORMAL); + IDirectDraw_SetCooperativeLevel(stream->ddraw, NULL, DDSCL_NORMAL); } - return IDirectDraw7_QueryInterface(This->ddraw, &IID_IDirectDraw, (void**)ddraw); + IDirectDraw_AddRef(stream->ddraw); + *ddraw = stream->ddraw; + + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 03c8660a42..5aedfa4680 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4776,7 +4776,7 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw7, &MSPID_PrimaryVideo, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(ddraw, 2); + EXPECT_REF(ddraw, 2); hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4787,19 +4787,19 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ddraw2 == ddraw, "Expected ddraw %p, got %p.\n", ddraw, ddraw2); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); - todo_wine EXPECT_REF(ddraw, 4); + EXPECT_REF(ddraw, 4); IDirectDraw_Release(ddraw3); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); /* The current ddraw is released when SetDirectDraw() is called. */ hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw, 2); + todo_wine EXPECT_REF(ddraw, 2); hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4808,7 +4808,7 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); if (hr == S_OK) { -- 2.27.0

2 3

[PATCH] kernel32: Implement IsWow64Process2.
by Dmitry Timoshkov 25 Jun '20

25 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- .../api-ms-win-core-wow64-l1-1-1.spec | 1 + dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 81 +++++++++++++++++++ include/winbase.h | 1 + 5 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec b/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec index 08fa02c3fc..99ba713409 100644 --- a/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec +++ b/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec @@ -1,5 +1,6 @@ @ stdcall GetSystemWow64DirectoryA(ptr long) kernel32.GetSystemWow64DirectoryA @ stdcall GetSystemWow64DirectoryW(ptr long) kernel32.GetSystemWow64DirectoryW @ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process +@ stdcall IsWow64Process2(ptr ptr ptr) kernel32.IsWow64Process2 @ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection @ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 17322bcd90..e7a7f162b7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -999,6 +999,7 @@ @ stdcall -import IsValidNLSVersion(long wstr ptr) # @ stub IsValidUILanguage @ stdcall -import IsWow64Process(ptr ptr) +@ stdcall -import IsWow64Process2(ptr ptr ptr) @ stdcall -import K32EmptyWorkingSet(long) @ stdcall -import K32EnumDeviceDrivers(ptr long ptr) @ stdcall -import K32EnumPageFilesA(ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 5e177a4932..a05bf223e8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -884,7 +884,7 @@ @ stdcall IsValidSid(ptr) @ stdcall IsWellKnownSid(ptr long) @ stdcall IsWow64Process(ptr ptr) -# @ stub IsWow64Process2 +@ stdcall IsWow64Process2(ptr ptr ptr) @ stdcall K32EmptyWorkingSet(long) @ stdcall K32EnumDeviceDrivers(ptr long ptr) @ stdcall K32EnumPageFilesA(ptr ptr) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a3b168543f..b6e0d54ef8 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -882,6 +882,87 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsProcessorFeaturePresent ( DWORD feature ) } +/********************************************************************** + * IsWow64Process2 (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, USHORT *native_machine ) +{ + BOOL wow64; + SYSTEM_CPU_INFORMATION sci; + NTSTATUS status; + + if (!IsWow64Process( process, &wow64 )) + return FALSE; + + status = NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); + if (status) + return set_ntstatus( status ); + + if (!wow64) + *machine = IMAGE_FILE_MACHINE_UNKNOWN; + else + { + if (process != GetCurrentProcess()) + { + FIXME("not implemented for other process\n"); + *machine = IMAGE_FILE_MACHINE_UNKNOWN; + } + else + { + IMAGE_NT_HEADERS *nt; + nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + *machine = nt->FileHeader.Machine; + } + } + + switch (sci.Architecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + *native_machine = IMAGE_FILE_MACHINE_I386; + break; + + case PROCESSOR_ARCHITECTURE_ALPHA: + *native_machine = IMAGE_FILE_MACHINE_ALPHA; + break; + + case PROCESSOR_ARCHITECTURE_ARM: + *native_machine = IMAGE_FILE_MACHINE_ARM; + break; + + case PROCESSOR_ARCHITECTURE_IA64: + *native_machine = IMAGE_FILE_MACHINE_IA64; + break; + + case PROCESSOR_ARCHITECTURE_ALPHA64: + *native_machine = IMAGE_FILE_MACHINE_ALPHA64; + break; + + case PROCESSOR_ARCHITECTURE_AMD64: + *native_machine = IMAGE_FILE_MACHINE_AMD64; + break; + + case PROCESSOR_ARCHITECTURE_ARM64: + *native_machine = IMAGE_FILE_MACHINE_ARM64; + break; + + case PROCESSOR_ARCHITECTURE_MIPS: + case PROCESSOR_ARCHITECTURE_PPC: + case PROCESSOR_ARCHITECTURE_SHX: + case PROCESSOR_ARCHITECTURE_MSIL: + case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64: + case PROCESSOR_ARCHITECTURE_NEUTRAL: + case PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64: + case PROCESSOR_ARCHITECTURE_IA32_ON_ARM64: + default: + FIXME("unknown architecture %u\n", sci.Architecture); + *native_machine = IMAGE_FILE_MACHINE_UNKNOWN; + break; + } + + return TRUE; +} + + /********************************************************************** * IsWow64Process (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index 39a4a9c9ac..981d4ea76a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2406,6 +2406,7 @@ WINADVAPI BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR); WINADVAPI BOOL WINAPI IsValidSid(PSID); WINADVAPI BOOL WINAPI IsWellKnownSid(PSID,WELL_KNOWN_SID_TYPE); WINBASEAPI BOOL WINAPI IsWow64Process(HANDLE,PBOOL); +WINBASEAPI BOOL WINAPI IsWow64Process2(HANDLE,USHORT*,USHORT*); WINADVAPI BOOL WINAPI ImpersonateLoggedOnUser(HANDLE); WINADVAPI BOOL WINAPI ImpersonateNamedPipeClient(HANDLE); WINADVAPI BOOL WINAPI ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL); -- 2.26.2

3 2

[PATCH 1/2] qasf/dmowrapper: Don't crash in ::Stop when DMO wrapper is not initialized.
by Anton Baskanov 25 Jun '20

25 Jun '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/qasf/dmowrapper.c | 3 +++ dlls/qasf/tests/dmowrapper.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index e2d4063828..8cf4404ece 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -673,6 +673,9 @@ static HRESULT dmo_wrapper_cleanup_stream(struct strmbase_filter *iface) IMediaObject *dmo; DWORD i; + if (!filter->dmo) + return E_FAIL; + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); for (i = 0; i < filter->source_count; ++i) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 72c05ee49c..f76c0c3d9d 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1995,6 +1995,23 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_uninitialized(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_DMOWrapperFilter, NULL, + CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_Stop(filter); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(dmowrapper) { DWORD cookie; @@ -2022,6 +2039,7 @@ START_TEST(dmowrapper) test_media_types(); test_enum_media_types(); test_connect_pin(); + test_uninitialized(); CoRevokeClassObject(cookie); DMOUnregister(&testdmo_clsid, &DMOCATEGORY_AUDIO_DECODER); -- 2.17.1

2 3

[PATCH V2 1/3] dsdmo: Implement IDirectSoundFXEcho stub interface.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH 1/5] include: Add some more EVR mixer interfaces.
by Nikolay Sivov 25 Jun '20

25 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/evr9.idl | 114 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 include/evr9.idl diff --git a/include/Makefile.in b/include/Makefile.in index 9f70e72b4c7..90fb873f203 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -276,6 +276,7 @@ SOURCES = \ evntprov.h \ evntrace.h \ evr.idl \ + evr9.idl \ excpt.h \ exdisp.idl \ exdispid.h \ diff --git a/include/evr9.idl b/include/evr9.idl new file mode 100644 index 00000000000..1572d878387 --- /dev/null +++ b/include/evr9.idl @@ -0,0 +1,114 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +import "unknwn.idl"; +import "evr.idl"; +import "dxva2api.idl"; + +typedef struct MFVideoAlphaBitmapParams +{ + DWORD dwFlags; + COLORREF clrSrcKey; + RECT rcSrc; + MFVideoNormalizedRect nrcDest; + FLOAT fAlpha; + DWORD dwFilterMode; +} MFVideoAlphaBitmapParams; + +typedef struct MFVideoAlphaBitmap +{ + BOOL GetBitmapFromDC; + union + { + HDC hdc; + IDirect3DSurface9 *pDDS; + } bitmap; + MFVideoAlphaBitmapParams params; +} MFVideoAlphaBitmap; + +[ + object, + uuid(814c7b20-0fdb-4eec-af8f-f957c8f69edc), + local +] +interface IMFVideoMixerBitmap : IUnknown +{ + HRESULT SetAlphaBitmap( + [in] const MFVideoAlphaBitmap *bitmap + ); + HRESULT ClearAlphaBitmap(void); + HRESULT UpdateAlphaBitmapParameters( + [in] const MFVideoAlphaBitmapParams *params + ); + HRESULT GetAlphaBitmapParameters( + [out] MFVideoAlphaBitmapParams *params + ); +} + +[ + object, + uuid(6AB0000C-FECE-4d1f-A2AC-A9573530656E), + pointer_default(unique) +] +interface IMFVideoProcessor : IUnknown +{ + HRESULT GetAvailableVideoProcessorModes( + [out] UINT *count, + [out, size_is(*count)] GUID **modes + ); + HRESULT GetVideoProcessorCaps( + [in] GUID *mode, + [out] DXVA2_VideoProcessorCaps *caps + ); + HRESULT GetVideoProcessorMode( + [out] GUID *mode + ); + HRESULT SetVideoProcessorMode( + [in] GUID *mode + ); + HRESULT GetProcAmpRange( + [in] DWORD prop, + [out] DXVA2_ValueRange *range + ); + HRESULT GetProcAmpValues( + [in] DWORD flags, + [out] DXVA2_ProcAmpValues *values + ); + HRESULT SetProcAmpValues( + [in] DWORD flags, + [in] DXVA2_ProcAmpValues *values + ); + HRESULT GetFilteringRange( + [in] DWORD prop, + [out] DXVA2_ValueRange *range + ); + HRESULT GetFilteringValue( + [in] DWORD prop, + [out] DXVA2_Fixed32 *value + ); + HRESULT SetFilteringValue( + [in] DWORD prop, + [in] DXVA2_Fixed32 *value + ); + HRESULT GetBackgroundColor( + [out] COLORREF *color + ); + HRESULT SetBackgroundColor( + [in] COLORREF color + ); +} -- 2.27.0

1 4

[PATCH V2 3/3] dsdmo: Implement IDirectSoundFXEcho::SetAllParameters.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH V2 2/3] dsdmo: Implement IDirectSoundFXEcho::GetAllParameters.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v6 01/12] msscript.ocx: Fix detaching the script host in put_Language.
by Gabriel Ivăncescu 25 Jun '20

25 Jun '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 8b36f3a..fd2ada5 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1203,8 +1203,8 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan } } if (FAILED(hres)) { - This->host = NULL; detach_script_host(This->host); + This->host = NULL; } return hres; } -- 2.21.0

2 19

[PATCH 3/3] dsdmo: Implement IDirectSoundFXEcho::SetAllParameters.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/3] dsdmo: Implement IDirectSoundFXEcho::GetAllParameters.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] dsdmo: Implement IDirectSoundFXEcho stub interface.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] vbscript: Parse empty CASE ELSE clause
by Dmitry Kislyuk 25 Jun '20

25 Jun '20

2 1

[PATCH] include: Add ndisguid.h
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 2

[PATCH 3/3] winhttp: Add stubs for new proxy functions.
by Hans Leidekker 25 Jun '20

25 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/session.c | 107 ++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 12 +++++ 2 files changed, 119 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 186b70e4a2..228eb646ae 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -2028,6 +2028,113 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) return ret; } +/*********************************************************************** + * WinHttpCreateProxyResolver (winhttp.@) + */ +DWORD WINAPI WinHttpCreateProxyResolver( HINTERNET hsession, HINTERNET *hresolver ) +{ + FIXME("%p, %p\n", hsession, hresolver); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpFreeProxyResult (winhttp.@) + */ +void WINAPI WinHttpFreeProxyResult( WINHTTP_PROXY_RESULT *result ) +{ + FIXME("%p\n", result); +} + +/*********************************************************************** + * WinHttpFreeProxyResultEx (winhttp.@) + */ +void WINAPI WinHttpFreeProxyResultEx( WINHTTP_PROXY_RESULT_EX *result ) +{ + FIXME("%p\n", result); +} + +/*********************************************************************** + * WinHttpFreeProxySettings (winhttp.@) + */ +void WINAPI WinHttpFreeProxySettings( WINHTTP_PROXY_SETTINGS *settings ) +{ + FIXME("%p\n", settings); +} + +/*********************************************************************** + * WinHttpGetProxyForUrlEx (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyForUrlEx( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, + DWORD_PTR ctx ) +{ + FIXME("%p, %s, %p, %lx\n", hresolver, debugstr_w(url), options, ctx); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyForUrlEx2 (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyForUrlEx2( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, + DWORD selection_len, BYTE *selection, DWORD_PTR ctx ) +{ + FIXME("%p, %s, %p, %u, %p, %lx\n", hresolver, debugstr_w(url), options, selection_len, selection, ctx); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyResult (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyResult( HINTERNET hresolver, WINHTTP_PROXY_RESULT *result ) +{ + FIXME("%p, %p\n", hresolver, result); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyResultEx (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyResultEx( HINTERNET hresolver, WINHTTP_PROXY_RESULT_EX *result ) +{ + FIXME("%p, %p\n", hresolver, result); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxySettingsVersion (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxySettingsVersion( HINTERNET hsession, DWORD *version ) +{ + FIXME("%p, %p\n", hsession, version); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpReadProxySettings (winhttp.@) + */ +DWORD WINAPI WinHttpReadProxySettings( HINTERNET hsession, const WCHAR *connection, BOOL use_defaults, + BOOL set_autodiscover, DWORD *version, BOOL *defaults_returned, + WINHTTP_PROXY_SETTINGS *settings) +{ + FIXME("%p, %s, %d, %d, %p, %p, %p\n", hsession, debugstr_w(connection), use_defaults, set_autodiscover, + version, defaults_returned, settings); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpResetAutoProxy (winhttp.@) + */ +DWORD WINAPI WinHttpResetAutoProxy( HINTERNET hsession, DWORD flags ) +{ + FIXME("%p, %08x\n", hsession, flags); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +DWORD WINAPI WinHttpWriteProxySettings( HINTERNET hsession, BOOL force, WINHTTP_PROXY_SETTINGS *settings ) +{ + FIXME("%p, %d, %p\n", hsession, force, settings); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + /*********************************************************************** * WinHttpSetStatusCallback (winhttp.@) */ diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index beace245a8..581918791e 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -7,11 +7,20 @@ @ stdcall WinHttpCloseHandle(ptr) @ stdcall WinHttpConnect(ptr wstr long long) @ stdcall WinHttpCrackUrl(wstr long long ptr) +@ stdcall WinHttpCreateProxyResolver(ptr ptr) @ stdcall WinHttpCreateUrl(ptr long ptr ptr) @ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr) +@ stdcall WinHttpFreeProxyResult(ptr) +@ stdcall WinHttpFreeProxyResultEx(ptr) +@ stdcall WinHttpFreeProxySettings(ptr) @ stdcall WinHttpGetDefaultProxyConfiguration(ptr) @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) @ stdcall WinHttpGetProxyForUrl(ptr wstr ptr ptr) +@ stdcall WinHttpGetProxyForUrlEx(ptr wstr ptr ptr) +@ stdcall WinHttpGetProxyForUrlEx2(ptr wstr ptr long ptr ptr) +@ stdcall WinHttpGetProxyResult(ptr ptr) +@ stdcall WinHttpGetProxyResultEx(ptr ptr) +@ stdcall WinHttpGetProxySettingsVersion(ptr ptr) @ stdcall WinHttpOpen(wstr long wstr wstr long) @ stdcall WinHttpOpenRequest(ptr wstr wstr wstr wstr ptr long) @ stdcall WinHttpQueryAuthSchemes(ptr ptr ptr ptr) @@ -19,7 +28,9 @@ @ stdcall WinHttpQueryHeaders(ptr long wstr ptr ptr ptr) @ stdcall WinHttpQueryOption(ptr long ptr ptr) @ stdcall WinHttpReadData(ptr ptr long ptr) +@ stdcall WinHttpReadProxySettings(ptr wstr long long ptr ptr ptr) @ stdcall WinHttpReceiveResponse(ptr ptr) +@ stdcall WinHttpResetAutoProxy(ptr long) @ stdcall WinHttpSendRequest(ptr wstr long ptr long long long) @ stdcall WinHttpSetCredentials(ptr long long wstr ptr ptr) @ stdcall WinHttpSetDefaultProxyConfiguration(ptr) @@ -35,3 +46,4 @@ @ stdcall WinHttpWebSocketSend(ptr long ptr long) @ stdcall WinHttpWebSocketShutdown(ptr long ptr long) @ stdcall WinHttpWriteData(ptr ptr long ptr) +@ stdcall WinHttpWriteProxySettings(ptr long ptr) -- 2.20.1

1 0

[PATCH 2/3] winhttp: Status and reason are optional in the close response.
by Hans Leidekker 25 Jun '20

25 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 623fdf5db5..c15be38592 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3310,7 +3310,7 @@ static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD { DWORD err; if ((err = netconn_recv( netconn, buf, len, 0, (int *)ret_len ))) return err; - if (len && !*ret_len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + if (*ret_len != len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; return ERROR_SUCCESS; } @@ -3341,8 +3341,7 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket char hdr[2]; if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; - if (count != sizeof(hdr) || (hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || - (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) + if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } @@ -3353,14 +3352,12 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket { USHORT len16; if ((ret = receive_bytes( netconn, (char *)&len16, sizeof(len16), &count ))) return ret; - if (count != sizeof(len16)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; len = RtlUshortByteSwap( len16 ); } else if (len == 127) { ULONGLONG len64; if ((ret = receive_bytes( netconn, (char *)&len64, sizeof(len64), &count ))) return ret; - if (count != sizeof(len64)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; if ((len64 = RtlUlonglongByteSwap( len64 )) > ~0u) return ERROR_NOT_SUPPORTED; len = len64; } @@ -3548,23 +3545,21 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea } if ((ret = receive_frame( netconn, &count, &socket->opcode ))) goto done; - if (socket->opcode != SOCKET_OPCODE_CLOSE || (count && count > sizeof(socket->reason))) + if (socket->opcode != SOCKET_OPCODE_CLOSE || + (count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason)))) { ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; goto done; } - if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; - if (count != sizeof(socket->status)) + if (count) { - ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; - goto done; - } - socket->status = RtlUshortByteSwap( socket->status ); - if (!(ret = receive_bytes( netconn, socket->reason, sizeof(socket->reason), &socket->reason_len ))) - { - socket->state = SOCKET_STATE_CLOSED; + DWORD reason_len = count - sizeof(socket->status); + if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; + socket->status = RtlUshortByteSwap( socket->status ); + if ((ret = receive_bytes( netconn, socket->reason, reason_len, &socket->reason_len ))) goto done; } + socket->state = SOCKET_STATE_CLOSED; done: if (async) -- 2.20.1

1 0

[PATCH 1/3] winhttp: Set socket state before sending notifications.
by Hans Leidekker 25 Jun '20

25 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 457abb9f84..623fdf5db5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3372,10 +3372,11 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type, BOOL async ) { + struct netconn *netconn = socket->request->netconn; DWORD count, ret = ERROR_SUCCESS; - if (!socket->read_size) ret = receive_frame( socket->request->netconn, &socket->read_size, &socket->opcode ); - if (!ret) ret = receive_bytes( socket->request->netconn, buf, min(len, socket->read_size), &count ); + if (!socket->read_size) ret = receive_frame( netconn, &socket->read_size, &socket->opcode ); + if (!ret) ret = receive_bytes( netconn, buf, min(len, socket->read_size), &count ); if (!ret) { socket->read_size -= count; @@ -3385,7 +3386,6 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_type = map_opcode( socket->opcode, socket->read_size != 0 ); } } - if (async) { if (!ret) @@ -3458,9 +3458,13 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D static DWORD socket_shutdown( struct socket *socket, USHORT status, const void *reason, DWORD len, BOOL async ) { + struct netconn *netconn = socket->request->netconn; DWORD ret; - ret = send_frame( socket->request->netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ); + if (!(ret = send_frame( netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ))) + { + socket->state = SOCKET_STATE_SHUTDOWN; + } if (async) { if (!ret) send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NULL, 0 ); @@ -3473,8 +3477,6 @@ static DWORD socket_shutdown( struct socket *socket, USHORT status, const void * send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } } - - if (!ret) socket->state = SOCKET_STATE_SHUTDOWN; return ret; } @@ -3559,7 +3561,10 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea goto done; } socket->status = RtlUshortByteSwap( socket->status ); - ret = receive_bytes( netconn, socket->reason, sizeof(socket->reason), &socket->reason_len ); + if (!(ret = receive_bytes( netconn, socket->reason, sizeof(socket->reason), &socket->reason_len ))) + { + socket->state = SOCKET_STATE_CLOSED; + } done: if (async) @@ -3574,8 +3579,6 @@ done: send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } } - - if (!ret) socket->state = SOCKET_STATE_CLOSED; return ret; } -- 2.20.1

1 0

[PATCH vkd3d 5/5] vkd3d-shader: Store sampler comparison mode information in the descriptor scan info.
by Henri Verbeet 25 Jun '20

25 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 6 +++--- libs/vkd3d-shader/spirv.c | 6 ++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 26 ++++++++++++-------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6647d47..e155663 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -615,8 +615,9 @@ enum vkd3d_shader_resource_data_type enum vkd3d_shader_descriptor_info_flag { - VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER = 0x00000001, - VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ = 0x00000002, + VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER = 0x00000001, + VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ = 0x00000002, + VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE = 0x00000004, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_INFO_FLAG), }; @@ -640,7 +641,6 @@ struct vkd3d_shader_scan_info struct vkd3d_shader_descriptor_info *descriptors; unsigned int descriptor_count; - unsigned int sampler_comparison_mode_mask; /* 16 */ bool use_vocp; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7af08d9..0baa191 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5218,12 +5218,12 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ unsigned int structure_stride, bool raw, const struct vkd3d_spirv_resource_type *resource_type_info) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; - const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_combined_resource_sampler *current; uint32_t image_type_id, type_id, ptr_type_id, var_id; enum vkd3d_shader_binding_flag resource_type_flag; + const struct vkd3d_shader_descriptor_info *d; struct vkd3d_symbol symbol; unsigned int i; bool depth; @@ -5244,8 +5244,10 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) continue; + d = vkd3d_dxbc_compiler_get_descriptor_info(compiler, + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, 0, current->sampler_index); depth = current->sampler_index != VKD3D_DUMMY_SAMPLER_INDEX - && scan_info->sampler_comparison_mode_mask & (1u << current->sampler_index); + && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE); image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_space, resource_index, resource_type_info, sampled_type, structure_stride || raw, depth); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 20e9e02..ed67350 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -253,7 +253,8 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_contex static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, enum vkd3d_shader_descriptor_type type, unsigned int register_space, unsigned int register_index, - enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type) + enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type, + unsigned int flags) { struct vkd3d_shader_scan_info *scan_info = context->scan_info; struct vkd3d_shader_descriptor_info *d; @@ -271,7 +272,7 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c d->register_index = register_index; d->resource_type = resource_type; d->resource_data_type = resource_data_type; - d->flags = 0; + d->flags = flags; d->count = 1; ++scan_info->descriptor_count; @@ -301,7 +302,7 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc const struct vkd3d_shader_constant_buffer *cb = &instruction->declaration.cb; vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, cb->register_space, - cb->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); + cb->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); } static void vkd3d_shader_scan_input_declaration(struct vkd3d_shader_scan_info *scan_info, @@ -317,17 +318,14 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_sampler *sampler = &instruction->declaration.sampler; - struct vkd3d_shader_scan_info *scan_info = context->scan_info; - unsigned int sampler_index = sampler->register_index; + unsigned int flags; if (instruction->flags & VKD3DSI_SAMPLER_COMPARISON_MODE) - { - assert(sampler_index < CHAR_BIT * sizeof(scan_info->sampler_comparison_mode_mask)); - scan_info->sampler_comparison_mode_mask |= 1u << sampler_index; - } - + flags = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; + else + flags = 0; vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->register_space, - sampler->register_index, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT); + sampler->register_index, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT, flags); } static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -364,7 +362,7 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont break; } vkd3d_shader_scan_add_descriptor(context, type, semantic->register_space, - semantic->register_index, semantic->resource_type, resource_data_type); + semantic->register_index, semantic->resource_type, resource_data_type, 0); if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) vkd3d_shader_scan_add_uav_range(context, semantic->reg.reg.idx[0].offset, context->scan_info->descriptor_count - 1); @@ -381,7 +379,7 @@ static void vkd3d_shader_scan_resource_declaration_raw(struct vkd3d_shader_scan_ else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, - resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); + resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) vkd3d_shader_scan_add_uav_range(context, resource->dst.reg.idx[0].offset, context->scan_info->descriptor_count - 1); @@ -398,7 +396,7 @@ static void vkd3d_shader_scan_resource_declaration_structured(struct vkd3d_shade else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, - resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); + resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset, context->scan_info->descriptor_count - 1); -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Store UAV read information in the descriptor scan info.
by Henri Verbeet 25 Jun '20

25 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 +- libs/vkd3d-shader/spirv.c | 56 +++++++++++++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_main.c | 14 ++++----- 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 85bfc01..6647d47 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -616,6 +616,7 @@ enum vkd3d_shader_resource_data_type enum vkd3d_shader_descriptor_info_flag { VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER = 0x00000001, + VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ = 0x00000002, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_INFO_FLAG), }; @@ -639,7 +640,6 @@ struct vkd3d_shader_scan_info struct vkd3d_shader_descriptor_info *descriptors; unsigned int descriptor_count; - unsigned int uav_read_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ unsigned int sampler_comparison_mode_mask; /* 16 */ bool use_vocp; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 843717b..7af08d9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1863,6 +1863,8 @@ struct vkd3d_symbol_register_data struct vkd3d_symbol_resource_data { + unsigned int register_space; + unsigned int register_index; enum vkd3d_component_type sampled_type; uint32_t type_id; const struct vkd3d_spirv_resource_type *resource_type_info; @@ -5186,18 +5188,23 @@ static const struct vkd3d_shader_descriptor_info *vkd3d_dxbc_compiler_get_descri } static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, const struct vkd3d_spirv_resource_type *resource_type_info, - enum vkd3d_component_type data_type, bool raw_structured, uint32_t depth) + const struct vkd3d_shader_register *reg, unsigned int register_space, unsigned int register_index, + const struct vkd3d_spirv_resource_type *resource_type_info, enum vkd3d_component_type data_type, + bool raw_structured, uint32_t depth) { - const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_descriptor_info *d; uint32_t sampled_type_id; SpvImageFormat format; format = SpvImageFormatUnknown; - if (reg->type == VKD3DSPR_UAV - && (raw_structured || (scan_info->uav_read_mask & (1u << reg->idx[0].offset)))) - format = image_format_for_image_read(data_type); + if (reg->type == VKD3DSPR_UAV) + { + d = vkd3d_dxbc_compiler_get_descriptor_info(compiler, + VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, register_space, register_index); + if (raw_structured || (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ)) + format = image_format_for_image_read(data_type); + } sampled_type_id = vkd3d_spirv_get_type_id(builder, data_type, 1); return vkd3d_spirv_get_op_type_image(builder, sampled_type_id, resource_type_info->dim, @@ -5206,16 +5213,15 @@ static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler } static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *resource, enum vkd3d_shader_resource_type resource_type, - enum vkd3d_component_type sampled_type, unsigned int structure_stride, bool raw, - const struct vkd3d_spirv_resource_type *resource_type_info) + const struct vkd3d_shader_register *resource, unsigned int resource_space, unsigned int resource_index, + enum vkd3d_shader_resource_type resource_type, enum vkd3d_component_type sampled_type, + unsigned int structure_stride, bool raw, const struct vkd3d_spirv_resource_type *resource_type_info) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_combined_resource_sampler *current; - const unsigned int resource_index = resource->idx[0].offset; uint32_t image_type_id, type_id, ptr_type_id, var_id; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_symbol symbol; @@ -5241,8 +5247,8 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ depth = current->sampler_index != VKD3D_DUMMY_SAMPLER_INDEX && scan_info->sampler_comparison_mode_mask & (1u << current->sampler_index); - image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, - resource, resource_type_info, sampled_type, structure_stride || raw, depth); + image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_space, + resource_index, resource_type_info, sampled_type, structure_stride || raw, depth); type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image_type_id); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); @@ -5258,6 +5264,8 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_symbol_make_combined_sampler(&symbol, resource_index, current->sampler_index); symbol.id = var_id; + symbol.info.resource.register_space = resource_space; + symbol.info.resource.register_index = resource_index; symbol.info.resource.sampled_type = sampled_type; symbol.info.resource.type_id = image_type_id; symbol.info.resource.resource_type_info = resource_type_info; @@ -5274,7 +5282,6 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp unsigned int structure_stride, bool raw) { uint32_t counter_type_id, type_id, ptr_type_id, var_id, counter_var_id = 0; - const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; SpvStorageClass storage_class = SpvStorageClassUniformConstant; const struct vkd3d_spirv_resource_type *resource_type_info; @@ -5294,13 +5301,13 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, reg, NULL)) { - vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, - reg, resource_type, sampled_type, structure_stride, raw, resource_type_info); + vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, register_space, + register_index, resource_type, sampled_type, structure_stride, raw, resource_type_info); return; } - type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, - reg, resource_type_info, sampled_type, structure_stride || raw, 0); + type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, reg, register_space, + register_index, resource_type_info, sampled_type, structure_stride || raw, 0); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); @@ -5310,15 +5317,16 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); - if (is_uav && !(scan_info->uav_read_mask & (1u << reg->idx[0].offset))) - vkd3d_spirv_build_op_decorate(builder, var_id, SpvDecorationNonReadable, NULL, 0); - if (is_uav) { const struct vkd3d_shader_descriptor_info *d; d = vkd3d_dxbc_compiler_get_descriptor_info(compiler, VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, register_space, register_index); + + if (!(d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ)) + vkd3d_spirv_build_op_decorate(builder, var_id, SpvDecorationNonReadable, NULL, 0); + if (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER) { assert(structure_stride); /* counters are valid only for structured buffers */ @@ -5343,6 +5351,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp vkd3d_symbol_make_resource(&resource_symbol, reg); resource_symbol.id = var_id; + resource_symbol.info.resource.register_space = register_space; + resource_symbol.info.resource.register_index = register_index; resource_symbol.info.resource.sampled_type = sampled_type; resource_symbol.info.resource.type_id = type_id; resource_symbol.info.resource.resource_type_info = resource_type_info; @@ -7237,9 +7247,9 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil image->image_id = load ? vkd3d_spirv_build_op_load(builder, image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0; - image->image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, - resource_reg, image->resource_type_info, image->sampled_type, - image->structure_stride || image->raw, depth_comparison); + image->image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource_reg, + symbol->info.resource.register_space, symbol->info.resource.register_index, image->resource_type_info, + image->sampled_type, image->structure_stride || image->raw, depth_comparison); if (sampled) { diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index d07d102..20e9e02 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -22,8 +22,6 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); -STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); - static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const void *data, size_t size) { static int shader_id = 0; @@ -228,11 +226,13 @@ static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instr || (handler_idx == VKD3DSIH_LD_STRUCTURED && instruction->src[2].reg.type == VKD3DSPR_UAV); } -static void vkd3d_shader_scan_record_uav_read(struct vkd3d_shader_scan_info *scan_info, +static void vkd3d_shader_scan_record_uav_read(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_register *reg) { - assert(reg->idx[0].offset < VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); - scan_info->uav_read_mask |= 1u << reg->idx[0].offset; + struct vkd3d_shader_descriptor_info *d; + + d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); + d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ; } static bool vkd3d_shader_instruction_is_uav_counter(const struct vkd3d_shader_instruction *instruction) @@ -441,12 +441,12 @@ static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *cont for (i = 0; i < instruction->dst_count; ++i) { if (instruction->dst[i].reg.type == VKD3DSPR_UAV) - vkd3d_shader_scan_record_uav_read(context->scan_info, &instruction->dst[i].reg); + vkd3d_shader_scan_record_uav_read(context, &instruction->dst[i].reg); } for (i = 0; i < instruction->src_count; ++i) { if (instruction->src[i].reg.type == VKD3DSPR_UAV) - vkd3d_shader_scan_record_uav_read(context->scan_info, &instruction->src[i].reg); + vkd3d_shader_scan_record_uav_read(context, &instruction->src[i].reg); } } -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Store UAV counter information in the descriptor scan info.
by Henri Verbeet 25 Jun '20

25 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 9 ++++- libs/vkd3d-shader/spirv.c | 51 ++++++++++++++++++++-------- libs/vkd3d-shader/vkd3d_shader_main.c | 62 ++++++++++++++++++++++++++++++++--- libs/vkd3d/state.c | 42 +++++++++++++++++------- 4 files changed, 134 insertions(+), 30 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ea1944e..85bfc01 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -613,6 +613,13 @@ enum vkd3d_shader_resource_data_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_RESOURCE_DATA_TYPE), }; +enum vkd3d_shader_descriptor_info_flag +{ + VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER = 0x00000001, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_INFO_FLAG), +}; + struct vkd3d_shader_descriptor_info { enum vkd3d_shader_descriptor_type type; @@ -620,6 +627,7 @@ struct vkd3d_shader_descriptor_info unsigned int register_index; enum vkd3d_shader_resource_type resource_type; enum vkd3d_shader_resource_data_type resource_data_type; + unsigned int flags; /* vkd3d_shader_descriptor_info_flag */ unsigned int count; }; @@ -632,7 +640,6 @@ struct vkd3d_shader_scan_info unsigned int descriptor_count; unsigned int uav_read_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ - unsigned int uav_counter_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ unsigned int sampler_comparison_mode_mask; /* 16 */ bool use_vocp; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 49994a3..843717b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5167,6 +5167,24 @@ static SpvImageFormat image_format_for_image_read(enum vkd3d_component_type data } } +static const struct vkd3d_shader_descriptor_info *vkd3d_dxbc_compiler_get_descriptor_info( + struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_descriptor_type type, + unsigned int register_space, unsigned int register_index) +{ + const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; + const struct vkd3d_shader_descriptor_info *d; + unsigned int i; + + for (i = 0; i < scan_info->descriptor_count; ++i) + { + d = &scan_info->descriptors[i]; + if (d->type == type && d->register_space == register_space && d->register_index == register_index) + return d; + } + + return NULL; +} + static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, const struct vkd3d_spirv_resource_type *resource_type_info, enum vkd3d_component_type data_type, bool raw_structured, uint32_t depth) @@ -5295,25 +5313,32 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp if (is_uav && !(scan_info->uav_read_mask & (1u << reg->idx[0].offset))) vkd3d_spirv_build_op_decorate(builder, var_id, SpvDecorationNonReadable, NULL, 0); - if (is_uav && (scan_info->uav_counter_mask & (1u << reg->idx[0].offset))) + if (is_uav) { - assert(structure_stride); /* counters are valid only for structured buffers */ + const struct vkd3d_shader_descriptor_info *d; - if (vkd3d_dxbc_compiler_is_opengl_target(compiler)) + d = vkd3d_dxbc_compiler_get_descriptor_info(compiler, + VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, register_space, register_index); + if (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER) { - vkd3d_spirv_enable_capability(builder, SpvCapabilityAtomicStorage); - storage_class = SpvStorageClassAtomicCounter; - counter_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, counter_type_id); - } + assert(structure_stride); /* counters are valid only for structured buffers */ - counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, - ptr_type_id, storage_class, 0); + if (vkd3d_dxbc_compiler_is_opengl_target(compiler)) + { + vkd3d_spirv_enable_capability(builder, SpvCapabilityAtomicStorage); + storage_class = SpvStorageClassAtomicCounter; + counter_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, counter_type_id); + } - vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, - counter_var_id, reg, register_space, register_index, resource_type, true); + counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, + ptr_type_id, storage_class, 0); - vkd3d_spirv_build_op_name(builder, counter_var_id, "u%u_counter", reg->idx[0].offset); + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, + counter_var_id, reg, register_space, register_index, resource_type, true); + + vkd3d_spirv_build_op_name(builder, counter_var_id, "u%u_counter", reg->idx[0].offset); + } } vkd3d_symbol_make_resource(&resource_symbol, reg); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index aa401d0..d07d102 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -22,7 +22,6 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); -STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const void *data, size_t size) @@ -195,8 +194,30 @@ struct vkd3d_shader_scan_context { struct vkd3d_shader_scan_info *scan_info; size_t descriptors_size; + + struct + { + unsigned int id; + unsigned int descriptor_idx; + } *uav_ranges; + size_t uav_ranges_size; + size_t uav_range_count; }; +static struct vkd3d_shader_descriptor_info *vkd3d_shader_scan_get_uav_descriptor_info( + const struct vkd3d_shader_scan_context *context, unsigned int range_id) +{ + unsigned int i; + + for (i = 0; i < context->uav_range_count; ++i) + { + if (context->uav_ranges[i].id == range_id) + return &context->scan_info->descriptors[context->uav_ranges[i].descriptor_idx]; + } + + return NULL; +} + static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instruction *instruction) { enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx = instruction->handler_idx; @@ -221,11 +242,13 @@ static bool vkd3d_shader_instruction_is_uav_counter(const struct vkd3d_shader_in || handler_idx == VKD3DSIH_IMM_ATOMIC_CONSUME; } -static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_info *scan_info, +static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_register *reg) { - assert(reg->idx[0].offset < VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); - scan_info->uav_counter_mask |= 1u << reg->idx[0].offset; + struct vkd3d_shader_descriptor_info *d; + + d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); + d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER; } static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, @@ -248,12 +271,30 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c d->register_index = register_index; d->resource_type = resource_type; d->resource_data_type = resource_data_type; + d->flags = 0; d->count = 1; ++scan_info->descriptor_count; return true; } +static bool vkd3d_shader_scan_add_uav_range(struct vkd3d_shader_scan_context *context, + unsigned int id, unsigned int descriptor_idx) +{ + if (!vkd3d_array_reserve((void **)&context->uav_ranges, &context->uav_ranges_size, + context->uav_range_count + 1, sizeof(*context->uav_ranges))) + { + ERR("Failed to allocate UAV range.\n"); + return false; + } + + context->uav_ranges[context->uav_range_count].id = id; + context->uav_ranges[context->uav_range_count].descriptor_idx = descriptor_idx; + ++context->uav_range_count; + + return true; +} + static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { @@ -324,6 +365,9 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont } vkd3d_shader_scan_add_descriptor(context, type, semantic->register_space, semantic->register_index, semantic->resource_type, resource_data_type); + if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) + vkd3d_shader_scan_add_uav_range(context, semantic->reg.reg.idx[0].offset, + context->scan_info->descriptor_count - 1); } static void vkd3d_shader_scan_resource_declaration_raw(struct vkd3d_shader_scan_context *context, @@ -338,6 +382,9 @@ static void vkd3d_shader_scan_resource_declaration_raw(struct vkd3d_shader_scan_ type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); + if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) + vkd3d_shader_scan_add_uav_range(context, resource->dst.reg.idx[0].offset, + context->scan_info->descriptor_count - 1); } static void vkd3d_shader_scan_resource_declaration_structured(struct vkd3d_shader_scan_context *context, @@ -352,6 +399,9 @@ static void vkd3d_shader_scan_resource_declaration_structured(struct vkd3d_shade type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); + if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) + vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset, + context->scan_info->descriptor_count - 1); } static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, @@ -401,7 +451,7 @@ static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *cont } if (vkd3d_shader_instruction_is_uav_counter(instruction)) - vkd3d_shader_scan_record_uav_counter(context->scan_info, &instruction->src[0].reg); + vkd3d_shader_scan_record_uav_counter(context, &instruction->src[0].reg); } int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, @@ -435,6 +485,7 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); + vkd3d_free(context.uav_ranges); vkd3d_shader_free_scan_info(scan_info); vkd3d_shader_parser_destroy(&parser); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -443,6 +494,7 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, vkd3d_shader_scan_instruction(&context, &instruction); } + vkd3d_free(context.uav_ranges); vkd3d_shader_parser_destroy(&parser); return VKD3D_OK; } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 501afc6..a3c9b41 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1413,11 +1413,20 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel struct vkd3d_descriptor_set_context context; VkDescriptorSetLayoutBinding *binding_desc; VkDescriptorSetLayout set_layouts[3]; - unsigned int uav_counter_count; + unsigned int uav_counter_count = 0; unsigned int i, j; HRESULT hr; - if (!(uav_counter_count = vkd3d_popcount(shader_info->uav_counter_mask))) + for (i = 0; i < shader_info->descriptor_count; ++i) + { + const struct vkd3d_shader_descriptor_info *d = &shader_info->descriptors[i]; + + if (d->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV + && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER)) + ++uav_counter_count; + } + + if (!uav_counter_count) return S_OK; if (!(binding_desc = vkd3d_calloc(uav_counter_count, sizeof(*binding_desc)))) @@ -1435,20 +1444,22 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel if (root_signature->vk_set_layout) set_layouts[context.set_index++] = root_signature->vk_set_layout; - for (i = 0, j = 0; i < VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; ++i) + for (i = 0, j = 0; i < shader_info->descriptor_count; ++i) { - if (!(shader_info->uav_counter_mask & (1u << i))) + const struct vkd3d_shader_descriptor_info *d = &shader_info->descriptors[i]; + + if (d->type != VKD3D_SHADER_DESCRIPTOR_TYPE_UAV + || !(d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER)) continue; - state->uav_counters[j].register_space = 0; - state->uav_counters[j].register_index = i; + state->uav_counters[j].register_space = d->register_space; + state->uav_counters[j].register_index = d->register_index; state->uav_counters[j].shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE; state->uav_counters[j].binding.set = context.set_index; state->uav_counters[j].binding.binding = context.descriptor_binding; - /* FIXME: For graphics pipeline we have to take the shader visibility - * into account. - */ + /* FIXME: For the graphics pipeline we have to take the shader + * visibility into account. */ binding_desc[j].binding = context.descriptor_binding; binding_desc[j].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; binding_desc[j].descriptorCount = 1; @@ -2266,8 +2277,17 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s hr = hresult_from_vkd3d_result(ret); goto fail; } - if (shader_info.uav_counter_mask) - FIXME("UAV counters not implemented for graphics pipelines.\n"); + for (j = 0; j < shader_info.descriptor_count; ++j) + { + const struct vkd3d_shader_descriptor_info *d = &shader_info.descriptors[j]; + + if (d->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV + && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER)) + { + FIXME("UAV counters not implemented for graphics pipelines.\n"); + break; + } + } vkd3d_shader_free_scan_info(&shader_info); target_info = NULL; -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Report descriptor resource types in vkd3d_shader_scan_dxbc().
by Henri Verbeet 25 Jun '20

25 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 30 +++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 45 ++++++++++++++++++++++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 15 ----------- 3 files changed, 67 insertions(+), 23 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b2fa499..ea1944e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -585,11 +585,41 @@ struct vkd3d_versioned_root_signature_desc /* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 +enum vkd3d_shader_resource_type +{ + VKD3D_SHADER_RESOURCE_NONE = 0x0, + VKD3D_SHADER_RESOURCE_BUFFER = 0x1, + VKD3D_SHADER_RESOURCE_TEXTURE_1D = 0x2, + VKD3D_SHADER_RESOURCE_TEXTURE_2D = 0x3, + VKD3D_SHADER_RESOURCE_TEXTURE_2DMS = 0x4, + VKD3D_SHADER_RESOURCE_TEXTURE_3D = 0x5, + VKD3D_SHADER_RESOURCE_TEXTURE_CUBE = 0x6, + VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY = 0x7, + VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY = 0x8, + VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY = 0x9, + VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY = 0xa, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_RESOURCE_TYPE), +}; + +enum vkd3d_shader_resource_data_type +{ + VKD3D_SHADER_RESOURCE_DATA_UNORM = 0x1, + VKD3D_SHADER_RESOURCE_DATA_SNORM = 0x2, + VKD3D_SHADER_RESOURCE_DATA_INT = 0x3, + VKD3D_SHADER_RESOURCE_DATA_UINT = 0x4, + VKD3D_SHADER_RESOURCE_DATA_FLOAT = 0x5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_RESOURCE_DATA_TYPE), +}; + struct vkd3d_shader_descriptor_info { enum vkd3d_shader_descriptor_type type; unsigned int register_space; unsigned int register_index; + enum vkd3d_shader_resource_type resource_type; + enum vkd3d_shader_resource_data_type resource_data_type; unsigned int count; }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 45a7a80..aa401d0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -229,7 +229,8 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_info * } static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, - enum vkd3d_shader_descriptor_type type, unsigned int register_space, unsigned int register_index) + enum vkd3d_shader_descriptor_type type, unsigned int register_space, unsigned int register_index, + enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type) { struct vkd3d_shader_scan_info *scan_info = context->scan_info; struct vkd3d_shader_descriptor_info *d; @@ -245,6 +246,8 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c d->type = type; d->register_space = register_space; d->register_index = register_index; + d->resource_type = resource_type; + d->resource_data_type = resource_data_type; d->count = 1; ++scan_info->descriptor_count; @@ -256,8 +259,8 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc { const struct vkd3d_shader_constant_buffer *cb = &instruction->declaration.cb; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, - cb->register_space, cb->register_index); + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, cb->register_space, + cb->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); } static void vkd3d_shader_scan_input_declaration(struct vkd3d_shader_scan_info *scan_info, @@ -282,21 +285,45 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte scan_info->sampler_comparison_mode_mask |= 1u << sampler_index; } - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, - sampler->register_space, sampler->register_index); + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->register_space, + sampler->register_index, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT); } static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; + enum vkd3d_shader_resource_data_type resource_data_type; enum vkd3d_shader_descriptor_type type; if (semantic->reg.reg.type == VKD3DSPR_UAV) type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, semantic->register_space, semantic->register_index); + switch (semantic->resource_data_type) + { + case VKD3D_DATA_UNORM: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_UNORM; + break; + case VKD3D_DATA_SNORM: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_SNORM; + break; + case VKD3D_DATA_INT: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_INT; + break; + case VKD3D_DATA_UINT: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_UINT; + break; + case VKD3D_DATA_FLOAT: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; + break; + default: + ERR("Invalid resource data type %#x.\n", semantic->resource_data_type); + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; + break; + } + vkd3d_shader_scan_add_descriptor(context, type, semantic->register_space, + semantic->register_index, semantic->resource_type, resource_data_type); } static void vkd3d_shader_scan_resource_declaration_raw(struct vkd3d_shader_scan_context *context, @@ -309,7 +336,8 @@ static void vkd3d_shader_scan_resource_declaration_raw(struct vkd3d_shader_scan_ type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, resource->register_index); + vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, + resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); } static void vkd3d_shader_scan_resource_declaration_structured(struct vkd3d_shader_scan_context *context, @@ -322,7 +350,8 @@ static void vkd3d_shader_scan_resource_declaration_structured(struct vkd3d_shade type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, resource->register_index); + vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, + resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); } static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index dfbbdfd..a9a0c52 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -361,21 +361,6 @@ enum vkd3d_shader_register_type VKD3DSPR_INVALID = ~0u, }; -enum vkd3d_shader_resource_type -{ - VKD3D_SHADER_RESOURCE_NONE, - VKD3D_SHADER_RESOURCE_BUFFER, - VKD3D_SHADER_RESOURCE_TEXTURE_1D, - VKD3D_SHADER_RESOURCE_TEXTURE_2D, - VKD3D_SHADER_RESOURCE_TEXTURE_2DMS, - VKD3D_SHADER_RESOURCE_TEXTURE_3D, - VKD3D_SHADER_RESOURCE_TEXTURE_CUBE, - VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY, - VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY, - VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, - VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY, -}; - enum vkd3d_data_type { VKD3D_DATA_FLOAT, -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Report descriptor usage information in vkd3d_shader_scan_dxbc().
by Henri Verbeet 25 Jun '20

25 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 13 ++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 130 +++++++++++++++++++++++++++++++--- libs/vkd3d/state.c | 2 + 4 files changed, 137 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 358e90d..b2fa499 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -585,11 +585,22 @@ struct vkd3d_versioned_root_signature_desc /* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 +struct vkd3d_shader_descriptor_info +{ + enum vkd3d_shader_descriptor_type type; + unsigned int register_space; + unsigned int register_index; + unsigned int count; +}; + struct vkd3d_shader_scan_info { enum vkd3d_shader_structure_type type; void *next; + struct vkd3d_shader_descriptor_info *descriptors; + unsigned int descriptor_count; + unsigned int uav_read_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ unsigned int uav_counter_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ unsigned int sampler_comparison_mode_mask; /* 16 */ @@ -694,6 +705,7 @@ int vkd3d_shader_convert_root_signature(struct vkd3d_versioned_root_signature_de int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_scan_info *scan_info); +void vkd3d_shader_free_scan_info(struct vkd3d_shader_scan_info *scan_info); int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature); @@ -723,6 +735,7 @@ typedef int (*PFN_vkd3d_shader_convert_root_signature)(struct vkd3d_versioned_ro typedef int (*PFN_vkd3d_shader_scan_dxbc)(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_scan_info *scan_info); +typedef void (*PFN_vkd3d_shader_free_scan_info)(struct vkd3d_shader_scan_info *scan_info); typedef int (*PFN_vkd3d_shader_parse_input_signature)(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index a8c73b6..13bebde 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -5,6 +5,7 @@ global: vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element; vkd3d_shader_free_root_signature; + vkd3d_shader_free_scan_info; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; vkd3d_shader_parse_input_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3255094..45a7a80 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -187,9 +187,16 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, s vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); + vkd3d_shader_free_scan_info(&scan_info); return ret; } +struct vkd3d_shader_scan_context +{ + struct vkd3d_shader_scan_info *scan_info; + size_t descriptors_size; +}; + static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instruction *instruction) { enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx = instruction->handler_idx; @@ -221,6 +228,38 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_info * scan_info->uav_counter_mask |= 1u << reg->idx[0].offset; } +static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, + enum vkd3d_shader_descriptor_type type, unsigned int register_space, unsigned int register_index) +{ + struct vkd3d_shader_scan_info *scan_info = context->scan_info; + struct vkd3d_shader_descriptor_info *d; + + if (!vkd3d_array_reserve((void **)&scan_info->descriptors, &context->descriptors_size, + scan_info->descriptor_count + 1, sizeof(*scan_info->descriptors))) + { + ERR("Failed to allocate descriptor info.\n"); + return false; + } + + d = &scan_info->descriptors[scan_info->descriptor_count]; + d->type = type; + d->register_space = register_space; + d->register_index = register_index; + d->count = 1; + ++scan_info->descriptor_count; + + return true; +} + +static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_scan_context *context, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_constant_buffer *cb = &instruction->declaration.cb; + + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, + cb->register_space, cb->register_index); +} + static void vkd3d_shader_scan_input_declaration(struct vkd3d_shader_scan_info *scan_info, const struct vkd3d_shader_instruction *instruction) { @@ -230,29 +269,89 @@ static void vkd3d_shader_scan_input_declaration(struct vkd3d_shader_scan_info *s scan_info->use_vocp = true; } -static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_info *scan_info, +static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { - unsigned int sampler_index = instruction->declaration.dst.reg.idx[0].offset; + const struct vkd3d_shader_sampler *sampler = &instruction->declaration.sampler; + struct vkd3d_shader_scan_info *scan_info = context->scan_info; + unsigned int sampler_index = sampler->register_index; + if (instruction->flags & VKD3DSI_SAMPLER_COMPARISON_MODE) { assert(sampler_index < CHAR_BIT * sizeof(scan_info->sampler_comparison_mode_mask)); scan_info->sampler_comparison_mode_mask |= 1u << sampler_index; } + + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, + sampler->register_space, sampler->register_index); +} + +static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; + enum vkd3d_shader_descriptor_type type; + + if (semantic->reg.reg.type == VKD3DSPR_UAV) + type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; + else + type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; + vkd3d_shader_scan_add_descriptor(context, type, semantic->register_space, semantic->register_index); +} + +static void vkd3d_shader_scan_resource_declaration_raw(struct vkd3d_shader_scan_context *context, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; + enum vkd3d_shader_descriptor_type type; + + if (resource->dst.reg.type == VKD3DSPR_UAV) + type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; + else + type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; + vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, resource->register_index); } -static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_info *scan_info, +static void vkd3d_shader_scan_resource_declaration_structured(struct vkd3d_shader_scan_context *context, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_structured_resource *resource = &instruction->declaration.structured_resource; + enum vkd3d_shader_descriptor_type type; + + if (resource->reg.reg.type == VKD3DSPR_UAV) + type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; + else + type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; + vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, resource->register_index); +} + +static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { unsigned int i; switch (instruction->handler_idx) { + case VKD3DSIH_DCL_CONSTANT_BUFFER: + vkd3d_shader_scan_constant_buffer_declaration(context, instruction); + break; case VKD3DSIH_DCL_INPUT: - vkd3d_shader_scan_input_declaration(scan_info, instruction); + vkd3d_shader_scan_input_declaration(context->scan_info, instruction); break; case VKD3DSIH_DCL_SAMPLER: - vkd3d_shader_scan_sampler_declaration(scan_info, instruction); + vkd3d_shader_scan_sampler_declaration(context, instruction); + break; + case VKD3DSIH_DCL: + case VKD3DSIH_DCL_UAV_TYPED: + vkd3d_shader_scan_resource_declaration(context, instruction); + break; + case VKD3DSIH_DCL_RESOURCE_RAW: + case VKD3DSIH_DCL_UAV_RAW: + vkd3d_shader_scan_resource_declaration_raw(context, instruction); + break; + case VKD3DSIH_DCL_RESOURCE_STRUCTURED: + case VKD3DSIH_DCL_UAV_STRUCTURED: + vkd3d_shader_scan_resource_declaration_structured(context, instruction); break; default: break; @@ -263,23 +362,24 @@ static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_info *scan_in for (i = 0; i < instruction->dst_count; ++i) { if (instruction->dst[i].reg.type == VKD3DSPR_UAV) - vkd3d_shader_scan_record_uav_read(scan_info, &instruction->dst[i].reg); + vkd3d_shader_scan_record_uav_read(context->scan_info, &instruction->dst[i].reg); } for (i = 0; i < instruction->src_count; ++i) { if (instruction->src[i].reg.type == VKD3DSPR_UAV) - vkd3d_shader_scan_record_uav_read(scan_info, &instruction->src[i].reg); + vkd3d_shader_scan_record_uav_read(context->scan_info, &instruction->src[i].reg); } } if (vkd3d_shader_instruction_is_uav_counter(instruction)) - vkd3d_shader_scan_record_uav_counter(scan_info, &instruction->src[0].reg); + vkd3d_shader_scan_record_uav_counter(context->scan_info, &instruction->src[0].reg); } int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_scan_info *scan_info) { struct vkd3d_shader_instruction instruction; + struct vkd3d_shader_scan_context context; struct vkd3d_shader_parser parser; int ret; @@ -296,6 +396,9 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, memset(scan_info, 0, sizeof(*scan_info)); + memset(&context, 0, sizeof(context)); + context.scan_info = scan_info; + while (!shader_sm4_is_end(parser.data, &parser.ptr)) { shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); @@ -303,17 +406,26 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); + vkd3d_shader_free_scan_info(scan_info); vkd3d_shader_parser_destroy(&parser); return VKD3D_ERROR_INVALID_ARGUMENT; } - vkd3d_shader_scan_instruction(scan_info, &instruction); + vkd3d_shader_scan_instruction(&context, &instruction); } vkd3d_shader_parser_destroy(&parser); return VKD3D_OK; } +void vkd3d_shader_free_scan_info(struct vkd3d_shader_scan_info *scan_info) +{ + if (!scan_info) + return; + + vkd3d_free(scan_info->descriptors); +} + void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) { if (!shader_code) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index db342df..501afc6 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1528,6 +1528,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st WARN("Failed to create descriptor set layout for UAV counters, hr %#x.\n", hr); return hr; } + vkd3d_shader_free_scan_info(&shader_info); shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; @@ -2267,6 +2268,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } if (shader_info.uav_counter_mask) FIXME("UAV counters not implemented for graphics pipelines.\n"); + vkd3d_shader_free_scan_info(&shader_info); target_info = NULL; switch (shader_stages[i].stage) -- 2.11.0

1 0

[PATCH] mshtml: When creating new channel default to current locale charset.
by Dmitry Timoshkov 25 Jun '20

25 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/nsio.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7c8f029b4a..8cad9800a5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3372,6 +3372,7 @@ HRESULT create_doc_uri(IUri *iuri, nsWineURI **ret) static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) { nsChannel *channel; + BSTR bstr; if(!ensure_uri(uri)) return NS_ERROR_UNEXPECTED; @@ -3385,6 +3386,11 @@ static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) channel->nsIHttpChannelInternal_iface.lpVtbl = &nsHttpChannelInternalVtbl; channel->ref = 1; channel->request_method = METHOD_GET; + + bstr = charset_string_from_cp(GetACP()); + channel->charset = heap_strdupWtoA(bstr); + SysFreeString(bstr); + list_init(&channel->response_headers); list_init(&channel->request_headers); -- 2.26.2

2 6

[PATCH] include: Add include guard in devguid.h
by Vijay Kiran Kamuju 24 Jun '20

24 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] ntdll: Call TLS callbacks also for main exe on thread attach.
by Paul Gofman 24 Jun '20

24 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49007 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49098 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49041 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 42cdc628021..bc437d1a589 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3469,6 +3469,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow if ((status = alloc_thread_tls()) != STATUS_SUCCESS) NtTerminateThread( GetCurrentThread(), status ); thread_attach(); + if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_THREAD_ATTACH ); } RtlLeaveCriticalSection( &loader_section ); -- 2.26.2

1 1

[PATCH 1/2] amstream: Implement IDirectDrawMediaStream::SetDirectDraw().
by Gijs Vermeulen 24 Jun '20

24 Jun '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 34 ++++++++++-- dlls/amstream/tests/amstream.c | 95 ++++++++++++++++------------------ 2 files changed, 77 insertions(+), 52 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index ca6a910f3f..7f42879254 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -35,6 +35,7 @@ struct ddraw_stream IMemInputPin IMemInputPin_iface; IPin IPin_iface; LONG ref; + LONG sample_refs; IMultiMediaStream* parent; MSPID purpose_id; @@ -393,11 +394,34 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMedi } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMediaStream *iface, - IDirectDraw *pDirectDraw) + IDirectDraw *ddraw) { - FIXME("(%p)->(%p) stub!\n", iface, pDirectDraw); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); - return E_NOTIMPL; + TRACE("stream %p, ddraw %p.\n", stream, ddraw); + + EnterCriticalSection(&stream->cs); + + if (stream->sample_refs) + { + LeaveCriticalSection(&stream->cs); + return ((IDirectDraw *)stream->ddraw == ddraw) ? S_OK : MS_E_SAMPLEALLOC; + } + + if (stream->ddraw) + IDirectDraw7_Release(stream->ddraw); + + if (ddraw) + { + IDirectDraw_AddRef(ddraw); + stream->ddraw = (IDirectDraw7 *) ddraw; + } + else + stream->ddraw = NULL; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMediaStream *iface, @@ -948,6 +972,7 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IMemInputPin_iface.lpVtbl = &ddraw_meminput_vtbl; object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; + object->sample_refs = 0; InitializeCriticalSection(&object->cs); @@ -1010,6 +1035,8 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); + InterlockedDecrement(&sample->parent->sample_refs); + if (!ref) { if (sample->surface) @@ -1127,6 +1154,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = parent; + InterlockedIncrement(&parent->sample_refs); if (surface) { diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 03c8660a42..8f474215b5 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4798,7 +4798,7 @@ static void test_ddrawstream_getsetdirectdraw(void) /* The current ddraw is released when SetDirectDraw() is called. */ hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); EXPECT_REF(ddraw, 2); hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); @@ -4807,65 +4807,62 @@ static void test_ddrawstream_getsetdirectdraw(void) if (ddraw3) IDirectDraw_Release(ddraw3); hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(ddraw, 3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 3); - if (hr == S_OK) - { - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); - EXPECT_REF(ddraw, 4); - IDirectDraw_Release(ddraw3); - EXPECT_REF(ddraw, 3); + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); + EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw3); + EXPECT_REF(ddraw, 3); - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); - /* SetDirectDraw() doesn't take an extra reference to the ddraw object - * if there are samples extant. */ - hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw, 3); + /* SetDirectDraw() doesn't take an extra reference to the ddraw object + * if there are samples extant. */ + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 3); - hr = DirectDrawCreate(NULL, &ddraw3, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IDirectDraw_SetCooperativeLevel(ddraw3, GetDesktopWindow(), DDSCL_NORMAL); - ok(hr == DD_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw3, 1); + hr = DirectDrawCreate(NULL, &ddraw3, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw_SetCooperativeLevel(ddraw3, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw3, 1); - hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); - ok(hr == MS_E_SAMPLEALLOC, "Got hr %#x.\n", hr); + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); + ok(hr == MS_E_SAMPLEALLOC, "Got hr %#x.\n", hr); - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ddraw4 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw4); - EXPECT_REF(ddraw, 4); - IDirectDraw_Release(ddraw4); - EXPECT_REF(ddraw, 3); + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw4 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw4); + EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw4); + EXPECT_REF(ddraw, 3); - ref = IDirectDrawStreamSample_Release(sample); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); - hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw, 2); - EXPECT_REF(ddraw3, 2); + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 2); + EXPECT_REF(ddraw3, 2); - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ddraw4 == ddraw3, "Expected ddraw %p, got %p.\n", ddraw3, ddraw4); - EXPECT_REF(ddraw3, 3); - IDirectDraw_Release(ddraw4); - EXPECT_REF(ddraw3, 2); + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw4 == ddraw3, "Expected ddraw %p, got %p.\n", ddraw3, ddraw4); + EXPECT_REF(ddraw3, 3); + IDirectDraw_Release(ddraw4); + EXPECT_REF(ddraw3, 2); - hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw3, 1); + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw3, 1); - ref = IDirectDraw_Release(ddraw3); - ok(!ref, "Got outstanding refcount %d.\n", ref); - } + ref = IDirectDraw_Release(ddraw3); + ok(!ref, "Got outstanding refcount %d.\n", ref); EXPECT_REF(stream, 3); IDirectDrawMediaStream_Release(ddraw_stream); -- 2.27.0

2 2

[PATCH v2 6/9] ntdll: Support CONIN$ and CONOUT$ in RtlIsDosDeviceName_U.
by Jacek Caban 24 Jun '20

24 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: fixed tests on winxp dlls/ntdll/path.c | 8 ++++++++ dlls/ntdll/tests/path.c | 44 +++++++++++++++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 8 deletions(-)

1 0

[PATCH 8/9] kernel32: Reimplement OpenConsoleW on top of CreateFileW.
by Jacek Caban 24 Jun '20

24 Jun '20

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

2 1

[PATCH 6/9] ntdll: Support CONIN$ and CONOUT$ in RtlIsDosDeviceName_U.
by Jacek Caban 24 Jun '20

24 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/path.c | 8 ++++++++ dlls/ntdll/tests/path.c | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+)

2 1

[PATCH 9/9] server: Remove no longer needed support for opening current console in open_console request.
by Jacek Caban 24 Jun '20

24 Jun '20

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

1 0

[PATCH 7/9] kernelbase: Use NtCreateFile for console handles in CreateFileW.
by Jacek Caban 24 Jun '20

24 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 5 ----- dlls/kernelbase/console.c | 26 -------------------------- dlls/kernelbase/file.c | 31 ++++++------------------------- dlls/kernelbase/kernelbase.h | 2 -- 4 files changed, 6 insertions(+), 58 deletions(-)

1 0

[PATCH 5/9] server: Create console input/output symlinks.
by Jacek Caban 24 Jun '20

24 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 31 +++++++++++++++++++++++-------- server/directory.c | 2 +- server/file.h | 2 +- 3 files changed, 25 insertions(+), 10 deletions(-)

1 0

[PATCH 4/9] server: Introduce Console device object.
by Jacek Caban 24 Jun '20

24 Jun '20

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

1 0

[PATCH 3/9] server: Introduce CurrentOut device.
by Jacek Caban 24 Jun '20

24 Jun '20

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

1 0

[PATCH 1/9] kernel32/tests: Add more tests for opening console.
by Jacek Caban 24 Jun '20

24 Jun '20

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

1 0

WineHQ.org issues
by Jeremy Newman 24 Jun '20

24 Jun '20

I am aware of the new issues since we moved to a new IP address. I'm working to resolve them as quickly as possible. * Reverse DNS, we didn't get reverse setup prior to the move. Big derp there. Sorry. I've contacted the ISP and hopefully should get that setup today, assuming they respond to me. * 4.4.81.124 listed in zen.spamhaus.org. Seems that all of 4.4.0.0 is listed in the Spamhas PBL. I've contacted them so our IP is removed. If anyone else has contacts over there and wants to help speed this up, I'd appreciate it. Between these issues, we may see more bounces and rejections from our mailing lists. That said, you may not even get this email if your smtp host blocks based on the above. So I could just be talking to /dev/null ¯\_(ツ)_/¯ Other than this, the site is running fine on the new infrastructure. -N

1 0

[PATCH v4 1/6] user32/tests: Add inter-desktop rawinput message tests.
by Rémi Bernon 24 Jun '20

24 Jun '20

Another thread is created to execute the tests, for SetThreadDesktop to succeed consistently. It seems to fail spuriously if it is called from a thread that already created some windows before. This shows that rawinput messages may be dispatched across desktops, but only if the subscribing process has a window in the input desktop, and it is the foreground process (even if the target window may be in another desktop). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: What v3 should have been, queue_rawinput_message really simplified now, the only logic kept is here to implement RIDEV_INPUTSINK, although it will also be useful in the future, to dispatch HID rawinput from the winedevice processes. dlls/user32/tests/input.c | 119 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 113 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9ec829860af..01733317b2b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -50,6 +50,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "ddk/hidsdi.h" @@ -60,6 +61,8 @@ static HWND hWndTest; static LONG timetag = 0x10000000; +#define DESKTOP_ALL_ACCESS 0x01ff + static struct { LONG last_key_down; LONG last_key_up; @@ -1891,6 +1894,11 @@ struct rawinput_test rawinput_tests[] = { TRUE, TRUE, RIDEV_EXINPUTSINK, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, { TRUE, TRUE, RIDEV_EXINPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, + + /* cross-desktop foreground tests */ + { TRUE, FALSE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, 0, FALSE, TRUE, TRUE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, RIDEV_INPUTSINK, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, }; static void rawinput_test_process(void) @@ -1927,6 +1935,7 @@ static void rawinput_test_process(void) case 11: case 12: case 13: + case 16: GetCursorPos(&pt); hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, @@ -1960,6 +1969,9 @@ static void rawinput_test_process(void) rawinput_test_received_raw = FALSE; rawinput_test_received_rawfg = FALSE; + /* fallthrough */ + case 14: + case 15: if (i != 8) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); empty_message_queue(); break; @@ -1998,19 +2010,87 @@ static void rawinput_test_process(void) struct rawinput_test_thread_params { + HDESK desk; HANDLE ready; HANDLE start; HANDLE done; }; +static DWORD WINAPI rawinput_test_desk_thread(void *arg) +{ + struct rawinput_test_thread_params *params = arg; + RAWINPUTDEVICE raw_devices[1]; + DWORD ret; + POINT pt; + HWND hwnd = NULL; + MSG msg; + int i; + + ok( SetThreadDesktop( params->desk ), "SetThreadDesktop failed\n" ); + + for (i = 14; i < ARRAY_SIZE(rawinput_tests); ++i) + { + WaitForSingleObject(params->ready, INFINITE); + ResetEvent(params->ready); + + switch (i) + { + case 14: + case 15: + case 16: + GetCursorPos(&pt); + + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); + empty_message_queue(); + + /* FIXME: Try to workaround X11/Win32 focus inconsistencies and + * make the window visible and foreground as hard as possible. */ + ShowWindow(hwnd, SW_SHOW); + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hwnd); + UpdateWindow(hwnd); + empty_message_queue(); + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x02; + raw_devices[0].dwFlags = rawinput_tests[i].register_flags; + raw_devices[0].hwndTarget = rawinput_tests[i].register_window ? hwnd : 0; + + rawinput_test_received_legacy = FALSE; + rawinput_test_received_raw = FALSE; + rawinput_test_received_rawfg = FALSE; + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "%d: RegisterRawInputDevices failed\n", i); + ok(GetLastError() == 0xdeadbeef, "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + break; + } + + SetEvent(params->start); + + while (MsgWaitForMultipleObjects(1, &params->done, FALSE, INFINITE, QS_ALLINPUT) != WAIT_OBJECT_0) + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + ResetEvent(params->done); + if (hwnd) DestroyWindow(hwnd); + } + + return 0; +} + static DWORD WINAPI rawinput_test_thread(void *arg) { struct rawinput_test_thread_params *params = arg; + HANDLE thread; POINT pt; HWND hwnd = NULL; int i; - for (i = 0; i < ARRAY_SIZE(rawinput_tests); ++i) + for (i = 0; i < 14; ++i) { WaitForSingleObject(params->ready, INFINITE); ResetEvent(params->ready); @@ -2046,6 +2126,11 @@ static DWORD WINAPI rawinput_test_thread(void *arg) if (hwnd) DestroyWindow(hwnd); } + thread = CreateThread(NULL, 0, rawinput_test_desk_thread, params, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + return 0; } @@ -2063,6 +2148,9 @@ static void test_rawinput(const char* argv0) char path[MAX_PATH]; int i; + params.desk = CreateDesktopA( "rawinput_test_desktop", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + ok( params.desk != NULL, "CreateDesktopA failed, last error: %u\n", GetLastError() ); + params.ready = CreateEventA(NULL, FALSE, FALSE, NULL); ok(params.ready != NULL, "CreateEvent failed\n"); @@ -2103,7 +2191,8 @@ static void test_rawinput(const char* argv0) hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); ok(hwnd != 0, "CreateWindow failed\n"); - SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); + if (i != 14 && i != 15 && i != 16) + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); empty_message_queue(); /* FIXME: Try to workaround X11/Win32 focus inconsistencies and @@ -2135,14 +2224,30 @@ static void test_rawinput(const char* argv0) ok(!skipped, "%d: RegisterRawInputDevices failed: %u\n", i, GetLastError()); } - SetEvent(process_ready); - WaitForSingleObject(process_start, INFINITE); - ResetEvent(process_start); - SetEvent(params.ready); WaitForSingleObject(params.start, INFINITE); ResetEvent(params.start); + /* we need the main window to be over the other thread window, as although + * it is in another desktop, it will receive the messages directly otherwise */ + switch (i) + { + case 14: + case 15: + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hwnd); + empty_message_queue(); + + rawinput_test_received_legacy = FALSE; + rawinput_test_received_raw = FALSE; + rawinput_test_received_rawfg = FALSE; + break; + } + + SetEvent(process_ready); + WaitForSingleObject(process_start, INFINITE); + ResetEvent(process_start); + if (i <= 3 || i == 8) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); empty_message_queue(); @@ -2192,6 +2297,8 @@ static void test_rawinput(const char* argv0) CloseHandle(params.start); CloseHandle(params.ready); CloseHandle(thread); + + CloseDesktop(params.desk); } static void test_key_map(void) -- 2.27.0

2 7

[PATCH 7/7] widl: support optional output for random state debugging
by Marko Semet 24 Jun '20

24 Jun '20

Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/widl/utils.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)

1 0

[PATCH 6/7] winebuild: support optional output for random state debugging
by Marko Semet 24 Jun '20

24 Jun '20

Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/winebuild/utils.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)

1 0

[PATCH 4/7] widl: generate deterministic temporary filenames
by Marko Semet 24 Jun '20

24 Jun '20

Using xorshift* as pseudorandom number generator. It get initialised with the environment (sorted by name) and arguments. Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/widl/parser.l | 4 +- tools/widl/utils.c | 156 ++++++++++++++++++++++++++++++++++++++++++++ tools/widl/utils.h | 6 ++ tools/widl/widl.c | 3 +- 4 files changed, 166 insertions(+), 3 deletions(-)

1 0

[PATCH 2/7] winebuild: generate deterministic temporary filenames
by Marko Semet 24 Jun '20

24 Jun '20

Using xorshift* as pseudorandom number generator. It get initialised with the environment (sorted by name) and arguments. Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/winebuild/build.h | 6 ++ tools/winebuild/main.c | 1 + tools/winebuild/utils.c | 160 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 165 insertions(+), 2 deletions(-)

1 0

[PATCH 4/7] widl: generate deterministic temporary filenames
by Marko Semet 24 Jun '20

24 Jun '20

Using xorshift* as pseudorandom number generator. It get initialised with the environment (sorted by name) and arguments. Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/widl/parser.l | 4 +- tools/widl/utils.c | 156 ++++++++++++++++++++++++++++++++++++++++++++ tools/widl/utils.h | 6 ++ tools/widl/widl.c | 3 +- 4 files changed, 166 insertions(+), 3 deletions(-)

1 0

[PATCH 5/7] winegcc: support optional output for random state debugging
by Marko Semet 24 Jun '20

24 Jun '20

Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/winegcc/utils.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)

1 0

[PATCH 3/7] widl: use 'SOURCE_DATA_EPOCH' besides 'WIDL_TIME_OVERRIDE'
by Marko Semet 24 Jun '20

24 Jun '20

Helps to support reproducible builds. Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/widl/widl.c | 12 +++++++++++- tools/widl/write_msft.c | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-)

1 0

[PATCH 2/7] winebuild: generate deterministic temporary filenames
by Marko Semet 24 Jun '20

24 Jun '20

Using xorshift* as pseudorandom number generator. It get initialised with the environment (sorted by name) and arguments. Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/winebuild/build.h | 6 ++ tools/winebuild/main.c | 1 + tools/winebuild/utils.c | 160 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 165 insertions(+), 2 deletions(-)

1 0

[PATCH 1/7] winegcc: generate deterministic temporary filenames
by Marko Semet 24 Jun '20

24 Jun '20

Using xorshift* as pseudorandom number generator. It get initialised with the environment (sorted by name) and arguments. Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/winegcc/utils.c | 156 ++++++++++++++++++++++++++++++++++++++++ tools/winegcc/utils.h | 7 ++ tools/winegcc/winegcc.c | 5 +- 3 files changed, 166 insertions(+), 2 deletions(-)

1 0

[PATCH 1/4] evr: Implement MFT_MESSAGE_SET_D3D_MANAGER for default mixer.
by Nikolay Sivov 24 Jun '20

24 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index eaea037b693..931554b5479 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -21,6 +21,7 @@ #include "wine/debug.h" #include "evr.h" #include "d3d9.h" +#include "dxva2api.h" #include "mfapi.h" #include "mferror.h" @@ -47,6 +48,9 @@ struct video_mixer struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; unsigned int input_ids[MAX_MIXER_INPUT_STREAMS]; unsigned int input_count; + + IDirect3DDeviceManager9 *device_manager; + CRITICAL_SECTION cs; }; @@ -151,6 +155,8 @@ static ULONG WINAPI video_mixer_transform_Release(IMFTransform *iface) if (mixer->inputs[i].attributes) IMFAttributes_Release(mixer->inputs[i].attributes); } + if (mixer->device_manager) + IDirect3DDeviceManager9_Release(mixer->device_manager); DeleteCriticalSection(&mixer->cs); free(mixer); } @@ -444,9 +450,32 @@ static HRESULT WINAPI video_mixer_transform_ProcessEvent(IMFTransform *iface, DW static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { - FIXME("%p, %u, %#lx.\n", iface, message, param); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %#lx.\n", iface, message, param); + + switch (message) + { + case MFT_MESSAGE_SET_D3D_MANAGER: + + EnterCriticalSection(&mixer->cs); + + if (mixer->device_manager) + IDirect3DDeviceManager9_Release(mixer->device_manager); + mixer->device_manager = NULL; + if (param) + hr = IUnknown_QueryInterface((IUnknown *)param, &IID_IDirect3DDeviceManager9, (void **)&mixer->device_manager); + + LeaveCriticalSection(&mixer->cs); + + break; + default: + WARN("Message not handled %d.\n", message); + hr = E_NOTIMPL; + } + + return hr; } static HRESULT WINAPI video_mixer_transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) -- 2.27.0

1 3

[PATCH v3 1/6] user32/tests: Add inter-desktop rawinput message tests.
by Rémi Bernon 24 Jun '20

24 Jun '20

Another thread is created to execute the tests, for SetThreadDesktop to succeed consistently. It seems to fail spuriously if it is called from a thread that already created some windows before. This shows that rawinput messages may be dispatched across desktops, but only if the subscribing process has a window in the input desktop, and it is the foreground process (even if the target window may be in another desktop). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Add a cross-desktop test and rewrite queue_rawinput_message to be less suspicious, hopefully. Only enumerate processes when actually needed, ie: when implementing RIDEV_INPUTSINK flag support. dlls/user32/tests/input.c | 119 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 113 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9ec829860af..01733317b2b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -50,6 +50,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "ddk/hidsdi.h" @@ -60,6 +61,8 @@ static HWND hWndTest; static LONG timetag = 0x10000000; +#define DESKTOP_ALL_ACCESS 0x01ff + static struct { LONG last_key_down; LONG last_key_up; @@ -1891,6 +1894,11 @@ struct rawinput_test rawinput_tests[] = { TRUE, TRUE, RIDEV_EXINPUTSINK, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, { TRUE, TRUE, RIDEV_EXINPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, + + /* cross-desktop foreground tests */ + { TRUE, FALSE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, 0, FALSE, TRUE, TRUE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, RIDEV_INPUTSINK, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, }; static void rawinput_test_process(void) @@ -1927,6 +1935,7 @@ static void rawinput_test_process(void) case 11: case 12: case 13: + case 16: GetCursorPos(&pt); hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, @@ -1960,6 +1969,9 @@ static void rawinput_test_process(void) rawinput_test_received_raw = FALSE; rawinput_test_received_rawfg = FALSE; + /* fallthrough */ + case 14: + case 15: if (i != 8) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); empty_message_queue(); break; @@ -1998,19 +2010,87 @@ static void rawinput_test_process(void) struct rawinput_test_thread_params { + HDESK desk; HANDLE ready; HANDLE start; HANDLE done; }; +static DWORD WINAPI rawinput_test_desk_thread(void *arg) +{ + struct rawinput_test_thread_params *params = arg; + RAWINPUTDEVICE raw_devices[1]; + DWORD ret; + POINT pt; + HWND hwnd = NULL; + MSG msg; + int i; + + ok( SetThreadDesktop( params->desk ), "SetThreadDesktop failed\n" ); + + for (i = 14; i < ARRAY_SIZE(rawinput_tests); ++i) + { + WaitForSingleObject(params->ready, INFINITE); + ResetEvent(params->ready); + + switch (i) + { + case 14: + case 15: + case 16: + GetCursorPos(&pt); + + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); + empty_message_queue(); + + /* FIXME: Try to workaround X11/Win32 focus inconsistencies and + * make the window visible and foreground as hard as possible. */ + ShowWindow(hwnd, SW_SHOW); + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hwnd); + UpdateWindow(hwnd); + empty_message_queue(); + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x02; + raw_devices[0].dwFlags = rawinput_tests[i].register_flags; + raw_devices[0].hwndTarget = rawinput_tests[i].register_window ? hwnd : 0; + + rawinput_test_received_legacy = FALSE; + rawinput_test_received_raw = FALSE; + rawinput_test_received_rawfg = FALSE; + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "%d: RegisterRawInputDevices failed\n", i); + ok(GetLastError() == 0xdeadbeef, "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + break; + } + + SetEvent(params->start); + + while (MsgWaitForMultipleObjects(1, &params->done, FALSE, INFINITE, QS_ALLINPUT) != WAIT_OBJECT_0) + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + ResetEvent(params->done); + if (hwnd) DestroyWindow(hwnd); + } + + return 0; +} + static DWORD WINAPI rawinput_test_thread(void *arg) { struct rawinput_test_thread_params *params = arg; + HANDLE thread; POINT pt; HWND hwnd = NULL; int i; - for (i = 0; i < ARRAY_SIZE(rawinput_tests); ++i) + for (i = 0; i < 14; ++i) { WaitForSingleObject(params->ready, INFINITE); ResetEvent(params->ready); @@ -2046,6 +2126,11 @@ static DWORD WINAPI rawinput_test_thread(void *arg) if (hwnd) DestroyWindow(hwnd); } + thread = CreateThread(NULL, 0, rawinput_test_desk_thread, params, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + return 0; } @@ -2063,6 +2148,9 @@ static void test_rawinput(const char* argv0) char path[MAX_PATH]; int i; + params.desk = CreateDesktopA( "rawinput_test_desktop", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + ok( params.desk != NULL, "CreateDesktopA failed, last error: %u\n", GetLastError() ); + params.ready = CreateEventA(NULL, FALSE, FALSE, NULL); ok(params.ready != NULL, "CreateEvent failed\n"); @@ -2103,7 +2191,8 @@ static void test_rawinput(const char* argv0) hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); ok(hwnd != 0, "CreateWindow failed\n"); - SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); + if (i != 14 && i != 15 && i != 16) + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); empty_message_queue(); /* FIXME: Try to workaround X11/Win32 focus inconsistencies and @@ -2135,14 +2224,30 @@ static void test_rawinput(const char* argv0) ok(!skipped, "%d: RegisterRawInputDevices failed: %u\n", i, GetLastError()); } - SetEvent(process_ready); - WaitForSingleObject(process_start, INFINITE); - ResetEvent(process_start); - SetEvent(params.ready); WaitForSingleObject(params.start, INFINITE); ResetEvent(params.start); + /* we need the main window to be over the other thread window, as although + * it is in another desktop, it will receive the messages directly otherwise */ + switch (i) + { + case 14: + case 15: + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hwnd); + empty_message_queue(); + + rawinput_test_received_legacy = FALSE; + rawinput_test_received_raw = FALSE; + rawinput_test_received_rawfg = FALSE; + break; + } + + SetEvent(process_ready); + WaitForSingleObject(process_start, INFINITE); + ResetEvent(process_start); + if (i <= 3 || i == 8) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); empty_message_queue(); @@ -2192,6 +2297,8 @@ static void test_rawinput(const char* argv0) CloseHandle(params.start); CloseHandle(params.ready); CloseHandle(thread); + + CloseDesktop(params.desk); } static void test_key_map(void) -- 2.27.0

2 9

[PATCH] netio.sys: Fill socket addresses when accepting connection.
by Paul Gofman 24 Jun '20

24 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/netio.sys/netio.c | 35 ++++++++++++++++++++++--------- dlls/ntoskrnl.exe/tests/driver4.c | 18 ++++++++++++++-- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index dd6d2f48140..b54819664de 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -46,6 +46,7 @@ struct _WSK_CLIENT struct listen_socket_callback_context { + SOCKADDR *local_address; SOCKADDR *remote_address; const void *client_dispatch; void *client_context; @@ -53,15 +54,6 @@ struct listen_socket_callback_context SOCKET acceptor; }; -struct connect_socket_callback_context -{ - struct wsk_socket_internal *socket; - SOCKADDR *remote_address; - const void *client_dispatch; - void *client_context; - IRP *pending_irp; -}; - #define MAX_PENDING_IO 10 struct wsk_pending_io @@ -96,6 +88,7 @@ struct wsk_socket_internal }; static LPFN_ACCEPTEX pAcceptEx; +static LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs; static LPFN_CONNECTEX pConnectEx; static const WSK_PROVIDER_CONNECTION_DISPATCH wsk_provider_connection_dispatch; @@ -319,6 +312,8 @@ static void create_accept_socket(struct wsk_socket_internal *socket, struct wsk_ { struct listen_socket_callback_context *context = &socket->callback_context.listen_socket_callback_context; + INT local_address_len, remote_address_len; + SOCKADDR *local_address, *remote_address; struct wsk_socket_internal *accept_socket; if (!(accept_socket = heap_alloc_zero(sizeof(*accept_socket)))) @@ -338,7 +333,17 @@ static void create_accept_socket(struct wsk_socket_internal *socket, struct wsk_ accept_socket->protocol = socket->protocol; accept_socket->flags = WSK_FLAG_CONNECTION_SOCKET; socket_init(accept_socket); - /* TODO: fill local and remote addresses. */ + + pGetAcceptExSockaddrs(context->addr_buffer, 0, sizeof(SOCKADDR) + 16, sizeof(SOCKADDR) + 16, + &local_address, &local_address_len, &remote_address, &remote_address_len); + + if (context->local_address) + memcpy(context->local_address, local_address, + min(sizeof(*context->local_address), local_address_len)); + + if (context->remote_address) + memcpy(context->remote_address, remote_address, + min(sizeof(*context->remote_address), remote_address_len)); dispatch_pending_io(io, STATUS_SUCCESS, (ULONG_PTR)&accept_socket->wsk_socket); } @@ -373,6 +378,7 @@ static void WINAPI accept_callback(TP_CALLBACK_INSTANCE *instance, void *socket_ static BOOL WINAPI init_accept_functions(INIT_ONCE *once, void *param, void **context) { + GUID get_acceptex_guid = WSAID_GETACCEPTEXSOCKADDRS; GUID acceptex_guid = WSAID_ACCEPTEX; SOCKET s = (SOCKET)param; DWORD size; @@ -383,6 +389,14 @@ static BOOL WINAPI init_accept_functions(INIT_ONCE *once, void *param, void **co ERR("Could not get AcceptEx address, error %u.\n", WSAGetLastError()); return FALSE; } + + if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &get_acceptex_guid, sizeof(get_acceptex_guid), + &pGetAcceptExSockaddrs, sizeof(pGetAcceptExSockaddrs), &size, NULL, NULL)) + { + ERR("Could not get AcceptEx address, error %u.\n", WSAGetLastError()); + return FALSE; + } + return TRUE; } @@ -430,6 +444,7 @@ static NTSTATUS WINAPI wsk_accept(WSK_SOCKET *listen_socket, ULONG flags, void * return STATUS_PENDING; } + context->local_address = local_address; context->remote_address = remote_address; context->client_dispatch = accept_socket_dispatch; context->client_context = accept_socket_context; diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index dad1d6a04fd..48de151f31f 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -177,10 +177,10 @@ static void test_wsk_listen_socket(void) static const WSK_CLIENT_LISTEN_DISPATCH client_listen_dispatch; const WSK_PROVIDER_CONNECTION_DISPATCH *accept_dispatch; WSK_SOCKET *tcp_socket, *udp_socket, *accept_socket; + struct sockaddr_in addr, local_addr, remote_addr; struct socket_context context; WSK_BUF wsk_buf1, wsk_buf2; void *buffer1, *buffer2; - struct sockaddr_in addr; LARGE_INTEGER timeout; MDL *mdl1, *mdl2; NTSTATUS status; @@ -287,7 +287,10 @@ static void test_wsk_listen_socket(void) IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); - status = tcp_dispatch->WskAccept(tcp_socket, 0, NULL, NULL, NULL, NULL, wsk_irp); + memset(&local_addr, 0, sizeof(local_addr)); + memset(&remote_addr, 0, sizeof(remote_addr)); + status = tcp_dispatch->WskAccept(tcp_socket, 0, NULL, NULL, + (SOCKADDR *)&local_addr, (SOCKADDR *)&remote_addr, wsk_irp); ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); if (0) @@ -306,6 +309,17 @@ static void test_wsk_listen_socket(void) if (status == STATUS_SUCCESS && wsk_irp->IoStatus.Status == STATUS_SUCCESS) { + ok(local_addr.sin_family == AF_INET, "Got unexpected sin_family %u.\n", local_addr.sin_family); + ok(local_addr.sin_port == htons(SERVER_LISTEN_PORT), "Got unexpected sin_port %u.\n", + ntohs(local_addr.sin_port)); + ok(local_addr.sin_addr.s_addr == htonl(0x7f000001), "Got unexpected sin_addr %#x.\n", + ntohl(local_addr.sin_addr.s_addr)); + + ok(remote_addr.sin_family == AF_INET, "Got unexpected sin_family %u.\n", remote_addr.sin_family); + ok(remote_addr.sin_port, "Got zero sin_port.\n"); + ok(remote_addr.sin_addr.s_addr == htonl(0x7f000001), "Got unexpected sin_addr %#x.\n", + ntohl(remote_addr.sin_addr.s_addr)); + accept_socket = (WSK_SOCKET *)wsk_irp->IoStatus.Information; accept_dispatch = accept_socket->Dispatch; -- 2.26.2

1 0

[PATCH 4/8] winhttp: Implement WinHttpWebSocketClose.
by Hans Leidekker 24 Jun '20

24 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 99 +++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 3 ++ 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7f1c727cba..51aa755404 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3540,10 +3540,105 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r return ret; } +static DWORD socket_close( struct socket *socket, USHORT status, const void *reason, DWORD len, BOOL async ) +{ + struct netconn *netconn = socket->request->netconn; + DWORD ret, count; + + while (socket->read_size) /* drain any pending data */ + { + char buf[1024]; + if ((ret = receive_bytes( netconn, buf, min(socket->read_size, sizeof(buf)), &count ))) goto done; + socket->read_size -= count; + } + + if (socket->state < SOCKET_STATE_SHUTDOWN) + { + if ((ret = send_frame( netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ))) goto done; + socket->state = SOCKET_STATE_SHUTDOWN; + } + + if ((ret = receive_frame( netconn, &count, &socket->buf_type ))) goto done; + if (socket->buf_type != WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE || (count && count > sizeof(socket->reason))) + { + ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + goto done; + } + + if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; + if (count != sizeof(socket->status)) + { + ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + goto done; + } + socket->status = RtlUshortByteSwap( socket->status ); + ret = receive_bytes( netconn, socket->reason, sizeof(socket->reason), &socket->reason_len ); + +done: + if (async) + { + if (!ret) send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NULL, 0 ); + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_READ_DATA; /* FIXME */ + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_CLOSE_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + + if (!ret) socket->state = SOCKET_STATE_CLOSED; + return ret; +} + +static void task_socket_close( struct task_header *task ) +{ + struct socket *socket = (struct socket *)task->object; + struct socket_shutdown *s = (struct socket_shutdown *)task; + + socket_close( socket, s->status, s->reason, s->len, TRUE ); +} + DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) { - FIXME("%p, %u, %p, %u\n", hsocket, status, reason, len); - return ERROR_INVALID_PARAMETER; + struct socket *socket; + DWORD ret; + + TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); + + if (len && !reason) return ERROR_INVALID_PARAMETER; + + if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + if (socket->state >= SOCKET_STATE_CLOSED) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + } + + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + struct socket_shutdown *s; + + if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; + s->hdr.object = &socket->hdr; + s->hdr.proc = task_socket_close; + s->status = status; + s->reason = reason; + s->len = len; + + addref_object( &socket->hdr ); + ret = queue_task( &socket->hdr, &socket->recv_q, (struct task_header *)s ); + } + else ret = socket_close( socket, status, reason, len, FALSE ); + + release_object( &socket->hdr ); + return ret; } DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status, void *reason, DWORD len, diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 7d81e35934..41ada14c0c 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -230,6 +230,9 @@ struct socket struct queue recv_q; WINHTTP_WEB_SOCKET_BUFFER_TYPE buf_type; DWORD read_size; + USHORT status; + char reason[128]; + DWORD reason_len; }; struct task_header -- 2.20.1

2 2

[PATCH v2 3/3] server: Don't allow an empty desktop name.
by Huw Davies 24 Jun '20

24 Jun '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/tests/winstation.c | 2 -- server/winstation.c | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index d239ead6e98..76aa8a533b9 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -296,9 +296,7 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); d2 = CreateDesktopA( "", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); - todo_wine ok( !d2, "create empty desktop succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); diff --git a/server/winstation.c b/server/winstation.c index 43d112334d4..2962ea0df4a 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -513,6 +513,11 @@ DECL_HANDLER(create_desktop) struct unicode_str name = get_req_unicode_str(); reply->handle = 0; + if (!name.len) + { + set_error( STATUS_INVALID_HANDLE ); + return; + } if ((winstation = get_process_winstation( current->process, WINSTA_CREATEDESKTOP ))) { if ((desktop = create_desktop( &name, req->attributes, req->flags, winstation ))) -- 2.23.0

2 1

[PATCH v2 1/3] user32: Allow the app specific desktop to be "Default".
by Huw Davies 24 Jun '20

24 Jun '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/user_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 31a6168108c..9e45835e3a9 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -175,12 +175,12 @@ static const WCHAR *get_default_desktop(void) 'A','p','p','D','e','f','a','u','l','t','s',0}; static WCHAR buffer[MAX_PATH + ARRAY_SIZE(explorerW)]; WCHAR *p, *appname = buffer; - const WCHAR *ret = defaultW; + const WCHAR *ret = NULL; DWORD len; HKEY tmpkey, appkey; len = (GetModuleFileNameW( 0, buffer, MAX_PATH )); - if (!len || len >= MAX_PATH) return ret; + if (!len || len >= MAX_PATH) return defaultW; if ((p = strrchrW( appname, '/' ))) appname = p + 1; if ((p = strrchrW( appname, '\\' ))) appname = p + 1; p = appname + strlenW(appname); @@ -196,8 +196,7 @@ static const WCHAR *get_default_desktop(void) len = sizeof(buffer); if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; RegCloseKey( appkey ); - if (ret && strcmpiW( ret, defaultW )) return ret; - ret = defaultW; + if (ret) return ret; } } @@ -210,8 +209,9 @@ static const WCHAR *get_default_desktop(void) len = sizeof(buffer); if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; RegCloseKey( appkey ); + if (ret) return ret; } - return ret; + return defaultW; } -- 2.23.0

2 1

[PATCH v2 2/3] user32: Don't call CreateDesktop() with an empty desktop name.
by Huw Davies 24 Jun '20

24 Jun '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/user_main.c | 5 +++-- programs/explorer/desktop.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 9e45835e3a9..6b70db4978c 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -196,7 +196,8 @@ static const WCHAR *get_default_desktop(void) len = sizeof(buffer); if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; RegCloseKey( appkey ); - if (ret) return ret; + if (ret && *ret) return ret; + ret = NULL; } } @@ -209,7 +210,7 @@ static const WCHAR *get_default_desktop(void) len = sizeof(buffer); if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; RegCloseKey( appkey ); - if (ret) return ret; + if (ret && *ret) return ret; } return defaultW; } diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index e7acb2db772..691db5c8bda 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -732,7 +732,7 @@ static const WCHAR *get_default_desktop_name(void) /* @@ Wine registry key: HKCU\Software\Wine\Explorer */ if (!RegOpenKeyW( HKEY_CURRENT_USER, explorer_keyW, &hkey )) { - if (!RegQueryValueExW( hkey, desktopW, 0, NULL, (LPBYTE)buffer, &size )) ret = buffer; + if (!RegQueryValueExW( hkey, desktopW, 0, NULL, (LPBYTE)buffer, &size ) && *buffer) ret = buffer; RegCloseKey( hkey ); } return ret; @@ -974,7 +974,7 @@ void manage_desktop( WCHAR *arg ) /* parse the desktop option */ /* the option is of the form /desktop=name[,widthxheight[,driver]] */ - if (*arg == '=' || *arg == ',') + if ((arg[0] == '=' || arg[0] == ',') && arg[1] && arg[1] != ',') { arg++; name = arg; -- 2.23.0

1 0

[PATCH 4/4] server: Don't allow an empty desktop name.
by Huw Davies 24 Jun '20

24 Jun '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/tests/winstation.c | 2 -- server/winstation.c | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index d239ead6e98..76aa8a533b9 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -296,9 +296,7 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); d2 = CreateDesktopA( "", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); - todo_wine ok( !d2, "create empty desktop succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); diff --git a/server/winstation.c b/server/winstation.c index 43d112334d4..2962ea0df4a 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -513,6 +513,11 @@ DECL_HANDLER(create_desktop) struct unicode_str name = get_req_unicode_str(); reply->handle = 0; + if (!name.len) + { + set_error( STATUS_INVALID_HANDLE ); + return; + } if ((winstation = get_process_winstation( current->process, WINSTA_CREATEDESKTOP ))) { if ((desktop = create_desktop( &name, req->attributes, req->flags, winstation ))) -- 2.23.0

2 1

[PATCH v4 2/2] kernel32: Adjust toolhelp thread return order.
by Changping Yu 24 Jun '20

24 Jun '20

2 1

[PATCH 1/4] user32: Remove an unnecessary static.
by Huw Davies 24 Jun '20

24 Jun '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/user_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 31a6168108c..f050e5d92e5 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -173,7 +173,7 @@ static const WCHAR *get_default_desktop(void) static const WCHAR app_defaultsW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\', 'A','p','p','D','e','f','a','u','l','t','s',0}; - static WCHAR buffer[MAX_PATH + ARRAY_SIZE(explorerW)]; + WCHAR buffer[MAX_PATH + ARRAY_SIZE(explorerW)]; WCHAR *p, *appname = buffer; const WCHAR *ret = defaultW; DWORD len; -- 2.23.0

2 2

[PATCH v4 1/2] kernel32/tests: Add test suite to modify the thread, order of toolhelp.
by Changping Yu 24 Jun '20

24 Jun '20

2 1

[PATCH 3/4] user32: Don't call CreateDesktop() with an empty desktop name.
by Huw Davies 24 Jun '20

24 Jun '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/user_main.c | 5 +++-- programs/explorer/desktop.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index d5ac03fa5fb..6ec37482d45 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -196,7 +196,8 @@ static const WCHAR *get_default_desktop(void) len = sizeof(buffer); if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; RegCloseKey( appkey ); - if (ret) return ret; + if (ret && *ret) return ret; + ret = NULL; } } @@ -209,7 +210,7 @@ static const WCHAR *get_default_desktop(void) len = sizeof(buffer); if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; RegCloseKey( appkey ); - if (ret) return ret; + if (ret && *ret) return ret; } return defaultW; } diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index e7acb2db772..691db5c8bda 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -732,7 +732,7 @@ static const WCHAR *get_default_desktop_name(void) /* @@ Wine registry key: HKCU\Software\Wine\Explorer */ if (!RegOpenKeyW( HKEY_CURRENT_USER, explorer_keyW, &hkey )) { - if (!RegQueryValueExW( hkey, desktopW, 0, NULL, (LPBYTE)buffer, &size )) ret = buffer; + if (!RegQueryValueExW( hkey, desktopW, 0, NULL, (LPBYTE)buffer, &size ) && *buffer) ret = buffer; RegCloseKey( hkey ); } return ret; @@ -974,7 +974,7 @@ void manage_desktop( WCHAR *arg ) /* parse the desktop option */ /* the option is of the form /desktop=name[,widthxheight[,driver]] */ - if (*arg == '=' || *arg == ',') + if ((arg[0] == '=' || arg[0] == ',') && arg[1] && arg[1] != ',') { arg++; name = arg; -- 2.23.0

2 1

[PATCH 2/4] user32: Allow the app specific desktop to be "Default".
by Huw Davies 24 Jun '20

24 Jun '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/user_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index f050e5d92e5..d5ac03fa5fb 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -175,12 +175,12 @@ static const WCHAR *get_default_desktop(void) 'A','p','p','D','e','f','a','u','l','t','s',0}; WCHAR buffer[MAX_PATH + ARRAY_SIZE(explorerW)]; WCHAR *p, *appname = buffer; - const WCHAR *ret = defaultW; + const WCHAR *ret = NULL; DWORD len; HKEY tmpkey, appkey; len = (GetModuleFileNameW( 0, buffer, MAX_PATH )); - if (!len || len >= MAX_PATH) return ret; + if (!len || len >= MAX_PATH) return defaultW; if ((p = strrchrW( appname, '/' ))) appname = p + 1; if ((p = strrchrW( appname, '\\' ))) appname = p + 1; p = appname + strlenW(appname); @@ -196,8 +196,7 @@ static const WCHAR *get_default_desktop(void) len = sizeof(buffer); if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; RegCloseKey( appkey ); - if (ret && strcmpiW( ret, defaultW )) return ret; - ret = defaultW; + if (ret) return ret; } } @@ -210,8 +209,9 @@ static const WCHAR *get_default_desktop(void) len = sizeof(buffer); if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; RegCloseKey( appkey ); + if (ret) return ret; } - return ret; + return defaultW; } -- 2.23.0

1 0

[PATCH 6/8] winhttp/tests: Add asynchronous WebSocket tests.
by Hans Leidekker 24 Jun '20

24 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/notification.c | 206 ++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 435e262d18..98e4024867 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -28,12 +28,24 @@ #include "wine/test.h" +static DWORD (WINAPI *pWinHttpWebSocketClose)(HINTERNET,USHORT,void*,DWORD); +static HINTERNET (WINAPI *pWinHttpWebSocketCompleteUpgrade)(HINTERNET,DWORD_PTR); +static DWORD (WINAPI *pWinHttpWebSocketQueryCloseStatus)(HINTERNET,USHORT*,void*,DWORD,DWORD*); +static DWORD (WINAPI *pWinHttpWebSocketReceive)(HINTERNET,void*,DWORD,DWORD*,WINHTTP_WEB_SOCKET_BUFFER_TYPE*); +static DWORD (WINAPI *pWinHttpWebSocketSend)(HINTERNET,WINHTTP_WEB_SOCKET_BUFFER_TYPE,void*,DWORD); +static DWORD (WINAPI *pWinHttpWebSocketShutdown)(HINTERNET,USHORT,void*,DWORD); + enum api { winhttp_connect = 1, winhttp_open_request, winhttp_send_request, winhttp_receive_response, + winhttp_websocket_complete_upgrade, + winhttp_websocket_send, + winhttp_websocket_receive, + winhttp_websocket_shutdown, + winhttp_websocket_close, winhttp_query_data, winhttp_read_data, winhttp_write_data, @@ -615,6 +627,191 @@ static void test_async( void ) end_test( &info, __LINE__ ); } +static const struct notification websocket_test[] = +{ + { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE, NF_SIGNAL }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NF_SIGNAL }, + { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, + { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_SIGNAL }, + { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, + { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_SIGNAL }, + { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NF_SIGNAL }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } +}; + +static void test_websocket(void) +{ + HANDLE session, connection, request, socket, event; + WINHTTP_WEB_SOCKET_BUFFER_TYPE type; + DWORD size, status, err; + BOOL ret, unload = TRUE; + struct info info, *context = &info; + char buffer[1024]; + USHORT close_status; + + if (!pWinHttpWebSocketCompleteUpgrade) + { + win_skip( "WinHttpWebSocketCompleteUpgrade not supported\n" ); + return; + } + + info.test = websocket_test; + info.count = ARRAY_SIZE( websocket_test ); + info.index = 0; + info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + + session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); + ok( session != NULL, "got %u\n", GetLastError() ); + + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ret = WinHttpSetOption( session, WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT, &event, sizeof(event) ); + if (!ret) + { + win_skip( "Unload event not supported\n" ); + unload = FALSE; + } + + SetLastError( 0xdeadbeef ); + WinHttpSetStatusCallback( session, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); + err = GetLastError(); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err ); + + SetLastError( 0xdeadbeef ); + ret = WinHttpSetOption( session, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context) ); + err = GetLastError(); + ok( ret, "got %u\n", err ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + + setup_test( &info, winhttp_connect, __LINE__ ); + SetLastError( 0xdeadbeef ); + connection = WinHttpConnect( session, L"echo.websocket.org", 0, 0 ); + err = GetLastError(); + ok( connection != NULL, "got %u\n", err); + ok( err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %u\n", err ); + + setup_test( &info, winhttp_open_request, __LINE__ ); + SetLastError( 0xdeadbeef ); + request = WinHttpOpenRequest( connection, NULL, L"/", NULL, NULL, NULL, 0 ); + err = GetLastError(); + ok( request != NULL, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + + ret = WinHttpSetOption( request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0 ); + ok( ret, "got %u\n", GetLastError() ); + + setup_test( &info, winhttp_send_request, __LINE__ ); + SetLastError( 0xdeadbeef ); + ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, 0 ); + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) + { + skip( "connection failed, skipping\n" ); + WinHttpCloseHandle( request ); + WinHttpCloseHandle( connection ); + WinHttpCloseHandle( session ); + CloseHandle( info.wait ); + return; + } + ok( ret, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + setup_test( &info, winhttp_receive_response, __LINE__ ); + SetLastError( 0xdeadbeef ); + ret = WinHttpReceiveResponse( request, NULL ); + err = GetLastError(); + ok( ret, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + size = sizeof(status); + SetLastError( 0xdeadbeef ); + ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + err = GetLastError(); + ok( ret, "failed unexpectedly %u\n", err ); + ok( status == 101, "got %u\n", status ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err ); + + setup_test( &info, winhttp_websocket_complete_upgrade, __LINE__ ); + SetLastError( 0xdeadbeef ); + socket = pWinHttpWebSocketCompleteUpgrade( request, (DWORD_PTR)context ); + err = GetLastError(); + ok( socket != NULL, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + setup_test( &info, winhttp_websocket_send, __LINE__ ); + err = pWinHttpWebSocketSend( socket, 0, (void *)"hello", sizeof("hello") ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + setup_test( &info, winhttp_websocket_receive, __LINE__ ); + buffer[0] = 0; + size = 0xdeadbeef; + type = 0xdeadbeef; + err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + ok( size == 0xdeadbeef, "got %u\n", size ); + ok( type == 0xdeadbeef, "got %u\n", type ); + ok( buffer[0], "unexpected data\n" ); + + setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); + err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + setup_test( &info, winhttp_websocket_close, __LINE__ ); + ret = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + close_status = 0xdead; + size = sizeof(buffer) + 1; + err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( close_status == 1000, "got %u\n", close_status ); + ok( size <= sizeof(buffer), "got %u\n", size ); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( socket ); + WinHttpCloseHandle( request ); + WinHttpCloseHandle( connection ); + + if (unload) + { + status = WaitForSingleObject( event, 0 ); + ok( status == WAIT_TIMEOUT, "got %08x\n", status ); + } + WinHttpCloseHandle( session ); + WaitForSingleObject( info.wait, INFINITE ); + end_test( &info, __LINE__ ); + + if (unload) + { + status = WaitForSingleObject( event, 2000 ); + ok( status == WAIT_OBJECT_0, "got %08x\n", status ); + } + CloseHandle( event ); + CloseHandle( info.wait ); + end_test( &info, __LINE__ ); +} + static const char okmsg[] = "HTTP/1.1 200 OK\r\n" "Server: winetest\r\n" @@ -1001,13 +1198,22 @@ static void test_persistent_connection(int port) START_TEST (notification) { + HMODULE mod = GetModuleHandleA( "winhttp.dll" ); struct server_info si; HANDLE thread; DWORD ret; + pWinHttpWebSocketClose = (void *)GetProcAddress( mod, "WinHttpWebSocketClose" ); + pWinHttpWebSocketCompleteUpgrade = (void *)GetProcAddress( mod, "WinHttpWebSocketCompleteUpgrade" ); + pWinHttpWebSocketQueryCloseStatus = (void *)GetProcAddress( mod, "WinHttpWebSocketQueryCloseStatus" ); + pWinHttpWebSocketReceive = (void *)GetProcAddress( mod, "WinHttpWebSocketReceive" ); + pWinHttpWebSocketSend = (void *)GetProcAddress( mod, "WinHttpWebSocketSend" ); + pWinHttpWebSocketShutdown = (void *)GetProcAddress( mod, "WinHttpWebSocketShutdown" ); + test_connection_cache(); test_redirect(); test_async(); + test_websocket(); si.event = CreateEventW( NULL, 0, 0, NULL ); si.port = 7533; -- 2.20.1

2 1

[PATCH] user32/tests: Use skip() to skip tests when using a non-US keyboard.
by Huw Davies 24 Jun '20

24 Jun '20

Otherwise, under Wine, win_skip() counts as a failure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/tests/input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9ec829860af..3dde3ce3c08 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -286,7 +286,7 @@ static BOOL TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[ BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); if (!us_kbd) { - win_skip( "skipping test with inconsistent results on non-us keyboard\n" ); + skip( "skipping test with inconsistent results on non-us keyboard\n" ); return TRUE; } @@ -1193,7 +1193,7 @@ static void test_Input_unicode(void) BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); if (!us_kbd) { - win_skip( "skipping test with inconsistent results on non-us keyboard\n" ); + skip( "skipping test with inconsistent results on non-us keyboard\n" ); return; } -- 2.23.0

1 0

[PATCH 7/8] winhttp: Add support for WebSocket fragment buffers.
by Hans Leidekker 24 Jun '20

24 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 73 ++++++++++++++-------------------- dlls/winhttp/winhttp_private.h | 19 ++++++++- 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7d0f64003d..dacb175fbb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3156,33 +3156,16 @@ static DWORD send_bytes( struct netconn *netconn, char *bytes, int len ) return (count == len) ? ERROR_SUCCESS : ERROR_INTERNAL_ERROR; } -/* rfc6455 */ -enum opcode -{ - OPCODE_CONTINUE = 0x00, - OPCODE_TEXT = 0x01, - OPCODE_BINARY = 0x02, - OPCODE_RESERVED3 = 0x03, - OPCODE_RESERVED4 = 0x04, - OPCODE_RESERVED5 = 0x05, - OPCODE_RESERVED6 = 0x06, - OPCODE_RESERVED7 = 0x07, - OPCODE_CLOSE = 0x08, - OPCODE_PING = 0x09, - OPCODE_PONG = 0x0a, - OPCODE_INVALID = 0xff, -}; - -static enum opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) +static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) { switch (type) { - case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return OPCODE_TEXT; - case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return OPCODE_BINARY; - case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return OPCODE_CLOSE; + case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_TEXT; + case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_BINARY; + case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return SOCKET_OPCODE_CLOSE; default: FIXME("buffer type %u not supported\n", type); - return OPCODE_INVALID; + return SOCKET_OPCODE_INVALID; } } @@ -3194,10 +3177,10 @@ static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE DWORD buflen, BOOL final ) { DWORD i = 0, j, ret, offset = 2, len = buflen; - enum opcode opcode = map_buffer_type( type ); + enum socket_opcode opcode = map_buffer_type( type ); char hdr[14], byte, *mask; - if (opcode == OPCODE_CLOSE) len += sizeof(status); + if (opcode == SOCKET_OPCODE_CLOSE) len += sizeof(status); hdr[0] = final ? FIN_BIT : 0; hdr[0] |= opcode; @@ -3224,7 +3207,7 @@ static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE RtlGenRandom( mask, 4 ); if ((ret = send_bytes( netconn, hdr, offset + 4 ))) return ret; - if (opcode == OPCODE_CLOSE) /* prepend status code */ + if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ { byte = (status >> 8) ^ mask[i++ % 4]; if ((ret = send_bytes( netconn, &byte, 1 ))) return ret; @@ -3331,34 +3314,39 @@ static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD return ERROR_SUCCESS; } -static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum opcode opcode ) +static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOOL fragment ) { switch (opcode) { - case OPCODE_TEXT: return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; - case OPCODE_BINARY: return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; - case OPCODE_CLOSE: return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; + case SOCKET_OPCODE_TEXT: + if (fragment) return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; + + case SOCKET_OPCODE_BINARY: + if (fragment) return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; + return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; + + case SOCKET_OPCODE_CLOSE: + return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; + default: - ERR("opcode %u not handled\n", opcode); + FIXME("opcode %u not handled\n", opcode); return ~0u; } } -static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type ) +static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket_opcode *opcode ) { - WINHTTP_WEB_SOCKET_BUFFER_TYPE type; DWORD ret, len, count; - enum opcode opcode; char hdr[2]; if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; - if (count != sizeof(hdr) || (hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT)) + if (count != sizeof(hdr) || (hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || + (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } - - opcode = hdr[0] & 0xf; - type = map_opcode( opcode ); + *opcode = hdr[0] & 0xf; len = hdr[1] & ~MASK_BIT; if (len == 126) @@ -3378,7 +3366,6 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, WINHTTP_WEB } *ret_len = len; - *ret_type = type; return ERROR_SUCCESS; } @@ -3387,7 +3374,7 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD { DWORD count, ret = ERROR_SUCCESS; - if (!socket->read_size) ret = receive_frame( socket->request->netconn, &socket->read_size, &socket->buf_type ); + if (!socket->read_size) ret = receive_frame( socket->request->netconn, &socket->read_size, &socket->opcode ); if (!ret) ret = receive_bytes( socket->request->netconn, buf, min(len, socket->read_size), &count ); if (!ret) { @@ -3395,7 +3382,7 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD if (!async) { *ret_len = count; - *ret_type = socket->buf_type; + *ret_type = map_opcode( socket->opcode, socket->read_size != 0 ); } } @@ -3405,7 +3392,7 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD { WINHTTP_WEB_SOCKET_STATUS status; status.dwBytesTransferred = count; - status.eBufferType = socket->buf_type; + status.eBufferType = map_opcode( socket->opcode, socket->read_size != 0 ); send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); } else @@ -3558,8 +3545,8 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea socket->state = SOCKET_STATE_SHUTDOWN; } - if ((ret = receive_frame( netconn, &count, &socket->buf_type ))) goto done; - if (socket->buf_type != WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE || (count && count > sizeof(socket->reason))) + if ((ret = receive_frame( netconn, &count, &socket->opcode ))) goto done; + if (socket->opcode != SOCKET_OPCODE_CLOSE || (count && count > sizeof(socket->reason))) { ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; goto done; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 41ada14c0c..4a94375006 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -221,6 +221,23 @@ enum socket_state SOCKET_STATE_CLOSED = 2, }; +/* rfc6455 */ +enum socket_opcode +{ + SOCKET_OPCODE_CONTINUE = 0x00, + SOCKET_OPCODE_TEXT = 0x01, + SOCKET_OPCODE_BINARY = 0x02, + SOCKET_OPCODE_RESERVED3 = 0x03, + SOCKET_OPCODE_RESERVED4 = 0x04, + SOCKET_OPCODE_RESERVED5 = 0x05, + SOCKET_OPCODE_RESERVED6 = 0x06, + SOCKET_OPCODE_RESERVED7 = 0x07, + SOCKET_OPCODE_CLOSE = 0x08, + SOCKET_OPCODE_PING = 0x09, + SOCKET_OPCODE_PONG = 0x0a, + SOCKET_OPCODE_INVALID = 0xff, +}; + struct socket { struct object_header hdr; @@ -228,7 +245,7 @@ struct socket enum socket_state state; struct queue send_q; struct queue recv_q; - WINHTTP_WEB_SOCKET_BUFFER_TYPE buf_type; + enum socket_opcode opcode; DWORD read_size; USHORT status; char reason[128]; -- 2.20.1

2 1

[PATCH 8/8] winhttp/tests: Add more WebSocket tests.
by Hans Leidekker 24 Jun '20

24 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 156 +++++++++++++++++++++++++++++++++-- 1 file changed, 148 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index be02bbe250..12f5136973 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -27,7 +27,6 @@ #include <winhttp.h> #include <wincrypt.h> #include <winreg.h> -#include <stdio.h> #include <initguid.h> #include <httprequest.h> #include <httprequestid.h> @@ -37,7 +36,12 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static DWORD (WINAPI *pWinHttpWebSocketClose)(HINTERNET,USHORT,void*,DWORD); static HINTERNET (WINAPI *pWinHttpWebSocketCompleteUpgrade)(HINTERNET,DWORD_PTR); +static DWORD (WINAPI *pWinHttpWebSocketQueryCloseStatus)(HINTERNET,USHORT*,void*,DWORD,DWORD*); +static DWORD (WINAPI *pWinHttpWebSocketReceive)(HINTERNET,void*,DWORD,DWORD*,WINHTTP_WEB_SOCKET_BUFFER_TYPE*); +static DWORD (WINAPI *pWinHttpWebSocketSend)(HINTERNET,WINHTTP_WEB_SOCKET_BUFFER_TYPE,void*,DWORD); +static DWORD (WINAPI *pWinHttpWebSocketShutdown)(HINTERNET,USHORT,void*,DWORD); static BOOL proxy_active(void) { @@ -2440,9 +2444,9 @@ static DWORD CALLBACK server_thread(LPVOID param) strcat(headers, "\r\n\r\n"); send(c, headers, strlen(headers), 0); + continue; } else send(c, notokmsg, sizeof(notokmsg) - 1, 0); - continue; } if (strstr(buffer, "GET /quit")) { @@ -3097,11 +3101,13 @@ static void test_head_request(int port) static void test_websocket(int port) { - HINTERNET session, connection, request, socket; + HINTERNET session, connection, request, socket, socket2; DWORD size, len, count, status, index, error; DWORD_PTR ctx; + WINHTTP_WEB_SOCKET_BUFFER_TYPE type; WCHAR header[32]; - char buf[128]; + char buf[128], *large_buf; + USHORT close_status; BOOL ret; if (!pWinHttpWebSocketCompleteUpgrade) @@ -3215,7 +3221,7 @@ static void test_websocket(int port) len = 0xdeadbeef; size = sizeof(len); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, NULL, &len, - &size, 0); + &size, NULL); ok(!ret, "success\n"); index = 0; @@ -3226,6 +3232,12 @@ static void test_websocket(int port) socket = pWinHttpWebSocketCompleteUpgrade(request, 0); ok(socket != NULL, "got %u\n", GetLastError()); + size = sizeof(header); + ret = WinHttpQueryHeaders(socket, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); + error = GetLastError(); + ok(!ret, "success\n"); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", error); + header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); @@ -3243,16 +3255,24 @@ static void test_websocket(int port) ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM, L"Sec-WebSocket-Accept", buf, &size, &index); ok(ret, "got %u\n", GetLastError()); - /* Send/Receive on websock */ - - ret = WinHttpCloseHandle(connection); + /* sending request again generates new key */ + ret = WinHttpSendRequest(request, NULL, 0, NULL, 0, 0, 0); ok(ret, "got %u\n", GetLastError()); + /* and creates a new websocket */ + socket2 = pWinHttpWebSocketCompleteUpgrade(request, 0); + ok(socket2 != NULL, "got %u\n", GetLastError()); + ok(socket2 != socket, "got same socket\n"); + + WinHttpCloseHandle(connection); /* request handle is still valid */ size = sizeof(ctx); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); ok(ret, "got %u\n", GetLastError()); + ret = WinHttpCloseHandle(socket2); + ok(ret, "got %u\n", GetLastError()); + ret = WinHttpCloseHandle(socket); ok(ret, "got %u\n", GetLastError()); @@ -3267,6 +3287,121 @@ static void test_websocket(int port) ret = WinHttpCloseHandle(request); ok(ret, "got %u\n", GetLastError()); + + session = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); + ok(session != NULL, "got %u\n", GetLastError()); + + connection = WinHttpConnect(session, L"echo.websocket.org", 0, 0); + ok(connection != NULL, "got %u\n", GetLastError()); + + request = WinHttpOpenRequest(connection, L"GET", L"/", NULL, NULL, NULL, 0); + ok(request != NULL, "got %u\n", GetLastError()); + + ret = WinHttpSetOption(request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpSendRequest(request, NULL, 0, NULL, 0, 0, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(request, NULL); + ok(ret, "got %u\n", GetLastError()); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, + &size, NULL); + ok(ret, "got %u\n", GetLastError()); + ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %u\n", status); + + socket = pWinHttpWebSocketCompleteUpgrade(request, 0); + ok(socket != NULL, "got %u\n", GetLastError()); + + error = pWinHttpWebSocketSend(socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, NULL, 1); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + large_buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(buf) * 2); + memcpy(large_buf, "hello", sizeof("hello")); + memcpy(large_buf + sizeof(buf), "world", sizeof("world")); + error = pWinHttpWebSocketSend(socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, large_buf, sizeof(buf) * 2); + ok(!error, "got %u\n", error); + HeapFree(GetProcessHeap(), 0, large_buf); + + error = pWinHttpWebSocketReceive(socket, NULL, 0, NULL, NULL); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + error = pWinHttpWebSocketReceive(socket, buf, 0, NULL, NULL); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + error = pWinHttpWebSocketReceive(socket, NULL, 1, NULL, NULL); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + buf[0] = 0; + count = 0; + type = 0xdeadbeef; + error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); + ok(!error, "got %u\n", error); + ok(buf[0] == 'h', "got %c\n", buf[0]); + ok(count == sizeof(buf), "got %u\n", count); + ok(type == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, "got %u\n", type); + + buf[0] = 0; + count = 0; + type = 0xdeadbeef; + error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); + ok(!error, "got %u\n", error); + ok(buf[0] == 'w', "got %c\n", buf[0]); + ok(count == sizeof(buf), "got %u\n", count); + ok(type == WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, "got %u\n", type); + + error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success", + sizeof("success")); + ok(!error, "got %u\n", error); + + error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success2", + sizeof("success2")); + ok(!error, "got %u\n", error); + + error = pWinHttpWebSocketQueryCloseStatus(socket, NULL, NULL, 0, NULL); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 0, NULL); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, buf, 0, NULL); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, buf, sizeof(buf), NULL); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + error = pWinHttpWebSocketQueryCloseStatus(socket, NULL, NULL, 0, &len); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + len = 0; + error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 0, &len); + ok(error == ERROR_INSUFFICIENT_BUFFER, "got %u\n", error); + ok(len, "len not set\n"); + + error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 1, &len); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + + close_status = 0xdead; + len = 0xdeadbeef; + memset(buf, 0, sizeof(buf)); + error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, buf, sizeof(buf), &len); + ok(!error, "got %u\n", error); + ok(close_status == 1000, "got %08x\n", close_status); + ok(len == sizeof("success"), "got %u\n", len); + + WinHttpCloseHandle(socket); + WinHttpCloseHandle(request); + WinHttpCloseHandle(connection); + WinHttpCloseHandle(session); } static void test_not_modified(int port) @@ -4942,7 +5077,12 @@ START_TEST (winhttp) DWORD ret; HMODULE mod = GetModuleHandleA("winhttp.dll"); + pWinHttpWebSocketClose = (void *)GetProcAddress(mod, "WinHttpWebSocketClose"); pWinHttpWebSocketCompleteUpgrade = (void *)GetProcAddress(mod, "WinHttpWebSocketCompleteUpgrade"); + pWinHttpWebSocketQueryCloseStatus = (void *)GetProcAddress(mod, "WinHttpWebSocketQueryCloseStatus"); + pWinHttpWebSocketSend = (void *)GetProcAddress(mod, "WinHttpWebSocketSend"); + pWinHttpWebSocketShutdown = (void *)GetProcAddress(mod, "WinHttpWebSocketShutdown"); + pWinHttpWebSocketReceive = (void *)GetProcAddress(mod, "WinHttpWebSocketReceive"); test_WinHttpOpenRequest(); test_WinHttpSendRequest(); -- 2.20.1

1 0

[PATCH 5/8] winhttp: Implement WinHttpWebSocketQueryCloseStatus.
by Hans Leidekker 24 Jun '20

24 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 51aa755404..7d0f64003d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3642,10 +3642,38 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas } DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status, void *reason, DWORD len, - DWORD *consumed ) + DWORD *ret_len ) { - FIXME("%p, %p, %p, %u, %p\n", hsocket, status, reason, len, consumed); - return ERROR_INVALID_PARAMETER; + struct socket *socket; + DWORD ret; + + TRACE("%p, %p, %p, %u, %p\n", hsocket, status, reason, len, ret_len); + + if (!status || (len && !reason) || !ret_len) return ERROR_INVALID_PARAMETER; + + if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + if (socket->state < SOCKET_STATE_CLOSED) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + } + + *status = socket->status; + *ret_len = socket->reason_len; + if (socket->reason_len > len) ret = ERROR_INSUFFICIENT_BUFFER; + else + { + memcpy( reason, socket->reason, socket->reason_len ); + ret = ERROR_SUCCESS; + } + + release_object( &socket->hdr ); + return ret; } enum request_state -- 2.20.1

1 0

[PATCH 3/8] winhttp: Implement WinHttpWebSocketShutdown.
by Hans Leidekker 24 Jun '20

24 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 69 +++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 8 ++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 372e0e5e77..7f1c727cba 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3469,10 +3469,75 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D return ret; } +static DWORD socket_shutdown( struct socket *socket, USHORT status, const void *reason, DWORD len, BOOL async ) +{ + DWORD ret; + + ret = send_frame( socket->request->netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ); + if (async) + { + if (!ret) send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NULL, 0 ); + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_WRITE_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + + if (!ret) socket->state = SOCKET_STATE_SHUTDOWN; + return ret; +} + +static void task_socket_shutdown( struct task_header *task ) +{ + struct socket *socket = (struct socket *)task->object; + struct socket_shutdown *s = (struct socket_shutdown *)task; + + socket_shutdown( socket, s->status, s->reason, s->len, TRUE ); +} + DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) { - FIXME("%p, %u, %p, %u\n", hsocket, status, reason, len); - return ERROR_INVALID_PARAMETER; + struct socket *socket; + DWORD ret; + + TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); + + if (len && !reason) return ERROR_INVALID_PARAMETER; + + if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + if (socket->state >= SOCKET_STATE_SHUTDOWN) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + } + + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + struct socket_shutdown *s; + + if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; + s->hdr.object = &socket->hdr; + s->hdr.proc = task_socket_shutdown; + s->status = status; + s->reason = reason; + s->len = len; + + addref_object( &socket->hdr ); + ret = queue_task( &socket->hdr, &socket->send_q, (struct task_header *)s ); + } + else ret = socket_shutdown( socket, status, reason, len, FALSE ); + + release_object( &socket->hdr ); + return ret; } DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 9cf9c396cb..7d81e35934 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -292,6 +292,14 @@ struct socket_receive DWORD len; }; +struct socket_shutdown +{ + struct task_header hdr; + USHORT status; + const void *reason; + DWORD len; +}; + struct object_header *addref_object( struct object_header * ) DECLSPEC_HIDDEN; struct object_header *grab_object( HINTERNET ) DECLSPEC_HIDDEN; void release_object( struct object_header * ) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH 2/8] winhttp: Implement WinHttpWebSocketReceive.
by Hans Leidekker 24 Jun '20

24 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 159 ++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 10 +++ 2 files changed, 165 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4ffb2c7bf6..372e0e5e77 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -34,6 +34,7 @@ #include "schannel.h" #include "winhttp.h" #include "ntsecapi.h" +#include "winternl.h" #include "wine/debug.h" #include "winhttp_private.h" @@ -3067,10 +3068,19 @@ static void socket_destroy( struct object_header *hdr ) SetEvent( socket->send_q.cancel ); return; } + if (socket->recv_q.proc_running) + { + socket->recv_q.proc_running = FALSE; + SetEvent( socket->recv_q.cancel ); + return; + } release_object( &socket->request->hdr ); socket->send_q.cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &socket->send_q.cs ); + + socket->recv_q.cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &socket->recv_q.cs ); heap_free( socket ); } @@ -3120,6 +3130,8 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.context = context; InitializeCriticalSection( &socket->send_q.cs ); socket->send_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": socket.send_q.cs"); + InitializeCriticalSection( &socket->recv_q.cs ); + socket->recv_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": socket.recv_q.cs"); addref_object( &request->hdr ); socket->request = request; @@ -3311,11 +3323,150 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ return ret; } -DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *read, - WINHTTP_WEB_SOCKET_BUFFER_TYPE *type ) +static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD *ret_len ) { - FIXME("%p, %p, %u, %p, %p\n", hsocket, buf, len, read, type); - return ERROR_INVALID_PARAMETER; + DWORD err; + if ((err = netconn_recv( netconn, buf, len, 0, (int *)ret_len ))) return err; + if (len && !*ret_len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + return ERROR_SUCCESS; +} + +static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum opcode opcode ) +{ + switch (opcode) + { + case OPCODE_TEXT: return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; + case OPCODE_BINARY: return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; + case OPCODE_CLOSE: return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; + default: + ERR("opcode %u not handled\n", opcode); + return ~0u; + } +} + +static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type ) +{ + WINHTTP_WEB_SOCKET_BUFFER_TYPE type; + DWORD ret, len, count; + enum opcode opcode; + char hdr[2]; + + if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; + if (count != sizeof(hdr) || (hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT)) + { + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + } + + opcode = hdr[0] & 0xf; + type = map_opcode( opcode ); + + len = hdr[1] & ~MASK_BIT; + if (len == 126) + { + USHORT len16; + if ((ret = receive_bytes( netconn, (char *)&len16, sizeof(len16), &count ))) return ret; + if (count != sizeof(len16)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + len = RtlUshortByteSwap( len16 ); + } + else if (len == 127) + { + ULONGLONG len64; + if ((ret = receive_bytes( netconn, (char *)&len64, sizeof(len64), &count ))) return ret; + if (count != sizeof(len64)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + if ((len64 = RtlUlonglongByteSwap( len64 )) > ~0u) return ERROR_NOT_SUPPORTED; + len = len64; + } + + *ret_len = len; + *ret_type = type; + return ERROR_SUCCESS; +} + +static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, + WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type, BOOL async ) +{ + DWORD count, ret = ERROR_SUCCESS; + + if (!socket->read_size) ret = receive_frame( socket->request->netconn, &socket->read_size, &socket->buf_type ); + if (!ret) ret = receive_bytes( socket->request->netconn, buf, min(len, socket->read_size), &count ); + if (!ret) + { + socket->read_size -= count; + if (!async) + { + *ret_len = count; + *ret_type = socket->buf_type; + } + } + + if (async) + { + if (!ret) + { + WINHTTP_WEB_SOCKET_STATUS status; + status.dwBytesTransferred = count; + status.eBufferType = socket->buf_type; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); + } + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_READ_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + return ret; +} + +static void task_socket_receive( struct task_header *task ) +{ + struct socket *socket = (struct socket *)task->object; + struct socket_receive *r = (struct socket_receive *)task; + + socket_receive( socket, r->buf, r->len, NULL, NULL, TRUE ); +} + +DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *ret_len, + WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type ) +{ + struct socket *socket; + DWORD ret; + + TRACE("%p, %p, %u, %p, %p\n", hsocket, buf, len, ret_len, ret_type); + + if (!buf || !len) return ERROR_INVALID_PARAMETER; + + if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + if (socket->state != SOCKET_STATE_OPEN) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + } + + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + struct socket_receive *r; + + if (!(r = heap_alloc( sizeof(*r) ))) return FALSE; + r->hdr.object = &socket->hdr; + r->hdr.proc = task_socket_receive; + r->buf = buf; + r->len = len; + + addref_object( &socket->hdr ); + ret = queue_task( &socket->hdr, &socket->recv_q, (struct task_header *)r ); + } + else ret = socket_receive( socket, buf, len, ret_len, ret_type, FALSE ); + + release_object( &socket->hdr ); + return ret; } DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index d9e99651ab..9cf9c396cb 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -227,6 +227,9 @@ struct socket struct request *request; enum socket_state state; struct queue send_q; + struct queue recv_q; + WINHTTP_WEB_SOCKET_BUFFER_TYPE buf_type; + DWORD read_size; }; struct task_header @@ -282,6 +285,13 @@ struct socket_send DWORD len; }; +struct socket_receive +{ + struct task_header hdr; + void *buf; + DWORD len; +}; + struct object_header *addref_object( struct object_header * ) DECLSPEC_HIDDEN; struct object_header *grab_object( HINTERNET ) DECLSPEC_HIDDEN; void release_object( struct object_header * ) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH 1/8] winhttp: Implement WinHttpWebSocketSend.
by Hans Leidekker 24 Jun '20

24 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 184 ++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 17 +++ 2 files changed, 199 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0c038289f8..4ffb2c7bf6 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3061,7 +3061,16 @@ static void socket_destroy( struct object_header *hdr ) TRACE("%p\n", socket); + if (socket->send_q.proc_running) + { + socket->send_q.proc_running = FALSE; + SetEvent( socket->send_q.cancel ); + return; + } release_object( &socket->request->hdr ); + + socket->send_q.cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &socket->send_q.cs ); heap_free( socket ); } @@ -3109,6 +3118,8 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.callback = request->hdr.callback; socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; + InitializeCriticalSection( &socket->send_q.cs ); + socket->send_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": socket.send_q.cs"); addref_object( &request->hdr ); socket->request = request; @@ -3125,10 +3136,179 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR return hsocket; } +static DWORD send_bytes( struct netconn *netconn, char *bytes, int len ) +{ + int count; + DWORD err; + if ((err = netconn_send( netconn, bytes, len, &count ))) return err; + return (count == len) ? ERROR_SUCCESS : ERROR_INTERNAL_ERROR; +} + +/* rfc6455 */ +enum opcode +{ + OPCODE_CONTINUE = 0x00, + OPCODE_TEXT = 0x01, + OPCODE_BINARY = 0x02, + OPCODE_RESERVED3 = 0x03, + OPCODE_RESERVED4 = 0x04, + OPCODE_RESERVED5 = 0x05, + OPCODE_RESERVED6 = 0x06, + OPCODE_RESERVED7 = 0x07, + OPCODE_CLOSE = 0x08, + OPCODE_PING = 0x09, + OPCODE_PONG = 0x0a, + OPCODE_INVALID = 0xff, +}; + +static enum opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) +{ + switch (type) + { + case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return OPCODE_TEXT; + case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return OPCODE_BINARY; + case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return OPCODE_CLOSE; + default: + FIXME("buffer type %u not supported\n", type); + return OPCODE_INVALID; + } +} + +#define FIN_BIT (1 << 7) +#define MASK_BIT (1 << 7) +#define RESERVED_BIT (7 << 4) + +static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, USHORT status, const char *buf, + DWORD buflen, BOOL final ) +{ + DWORD i = 0, j, ret, offset = 2, len = buflen; + enum opcode opcode = map_buffer_type( type ); + char hdr[14], byte, *mask; + + if (opcode == OPCODE_CLOSE) len += sizeof(status); + + hdr[0] = final ? FIN_BIT : 0; + hdr[0] |= opcode; + hdr[1] = MASK_BIT; + if (len < 126) hdr[1] |= len; + else if (len < 65536) + { + hdr[1] |= 126; + hdr[2] = len >> 8; + hdr[3] = len & 0xff; + offset += 2; + } + else + { + hdr[1] |= 127; + hdr[2] = hdr[3] = hdr[4] = hdr[5] = 0; + hdr[6] = len >> 24; + hdr[7] = (len >> 16) & 0xff; + hdr[8] = (len >> 8) & 0xff; + hdr[9] = len & 0xff; + offset += 8; + } + mask = &hdr[offset]; + RtlGenRandom( mask, 4 ); + if ((ret = send_bytes( netconn, hdr, offset + 4 ))) return ret; + + if (opcode == OPCODE_CLOSE) /* prepend status code */ + { + byte = (status >> 8) ^ mask[i++ % 4]; + if ((ret = send_bytes( netconn, &byte, 1 ))) return ret; + + byte = (status & 0xff) ^ mask[i++ % 4]; + if ((ret = send_bytes( netconn, &byte, 1 ))) return ret; + } + + for (j = 0; j < buflen; j++) + { + byte = buf[j] ^ mask[i++ % 4]; + if ((ret = send_bytes( netconn, &byte, 1 ))) return ret; + } + + return ERROR_SUCCESS; +} + +static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, const void *buf, DWORD len, + BOOL async ) +{ + DWORD ret; + + ret = send_frame( socket->request->netconn, type, 0, buf, len, TRUE ); + if (async) + { + if (!ret) + { + WINHTTP_WEB_SOCKET_STATUS status; + status.dwBytesTransferred = len; + status.eBufferType = type; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, &status, sizeof(status) ); + } + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_WRITE_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_SEND_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + return ret; +} + +static void task_socket_send( struct task_header *task ) +{ + struct socket *socket = (struct socket *)task->object; + struct socket_send *s = (struct socket_send *)task; + + socket_send( socket, s->type, s->buf, s->len, TRUE ); +} + DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, void *buf, DWORD len ) { - FIXME("%p, %u, %p, %u\n", hsocket, type, buf, len); - return ERROR_INVALID_PARAMETER; + struct socket *socket; + DWORD ret; + + TRACE("%p, %u, %p, %u\n", hsocket, type, buf, len); + + if (len && !buf) return ERROR_INVALID_PARAMETER; + if (type != WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE && type != WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE) + { + FIXME("buffer type %u not supported\n", type); + return ERROR_NOT_SUPPORTED; + } + + if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + if (socket->state != SOCKET_STATE_OPEN) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + } + + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + struct socket_send *s; + + if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; + s->hdr.object = &socket->hdr; + s->hdr.proc = task_socket_send; + s->type = type; + s->buf = buf; + s->len = len; + + addref_object( &socket->hdr ); + ret = queue_task( &socket->hdr, &socket->send_q, (struct task_header *)s ); + } + else ret = socket_send( socket, type, buf, len, FALSE ); + + release_object( &socket->hdr ); + return ret; } DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *read, diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 207696e674..d9e99651ab 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -214,10 +214,19 @@ struct request } creds[TARGET_MAX][SCHEME_MAX]; }; +enum socket_state +{ + SOCKET_STATE_OPEN = 0, + SOCKET_STATE_SHUTDOWN = 1, + SOCKET_STATE_CLOSED = 2, +}; + struct socket { struct object_header hdr; struct request *request; + enum socket_state state; + struct queue send_q; }; struct task_header @@ -265,6 +274,14 @@ struct write_data DWORD *written; }; +struct socket_send +{ + struct task_header hdr; + WINHTTP_WEB_SOCKET_BUFFER_TYPE type; + const void *buf; + DWORD len; +}; + struct object_header *addref_object( struct object_header * ) DECLSPEC_HIDDEN; struct object_header *grab_object( HINTERNET ) DECLSPEC_HIDDEN; void release_object( struct object_header * ) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH v3] ntdll: Leave some space around DbgBreakPoint and DbgUserBreakPoint.
by Rémi Bernon 24 Jun '20

24 Jun '20

CoD: Black Ops 3 and CoD: WWII modify these (and several others) and expect to have enough space for a few instructions. It then verifies later that the patches are still in place, and terminates if the byte sequence do not match. Having small symbols can make the patches to overlap and the check to fail. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/signal_arm64.c | 8 ++++++-- dlls/ntdll/signal_i386.c | 8 ++++++-- dlls/ntdll/signal_x86_64.c | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 0159888f7ab..ddced4e0baa 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1358,12 +1358,16 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "brk #0; ret") +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "brk #0; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0; ret") +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * NtCurrentTeb (NTDLL.@) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index bda19bf4632..d91d19f043a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -555,12 +555,16 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * NtCurrentTeb (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 52f7b73f8bf..284522ffae7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2751,11 +2751,15 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); #endif /* __x86_64__ */ -- 2.27.0

1 0

[PATCH 1/3] ntdll: Refine NtSetInformationThread ThreadHideFromDebugger stubs.
by Rémi Bernon 24 Jun '20

24 Jun '20

CoD: Black Ops 3 and CoD: WWII do each one of these calls and terminate if they return unexpected results. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 14 ++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index cf3f7b9f6f2..eaf2f1a45b7 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2346,6 +2346,7 @@ static void test_affinity(void) DWORD_PTR proc_affinity, thread_affinity; THREAD_BASIC_INFORMATION tbi; SYSTEM_INFO si; + ULONG dummy; GetSystemInfo(&si); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); @@ -2450,6 +2451,32 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); + + dummy = 0; + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG) ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, NULL, 0 ); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status ); + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, NULL, 0 ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); + if (status == STATUS_INVALID_INFO_CLASS) + win_skip("ThreadHideFromDebugger not available\n"); + else + { + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + } } static void test_NtGetCurrentProcessorNumber(void) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index d26e0a98cac..2e2e5a3882d 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -831,6 +831,8 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, { NTSTATUS status; + TRACE("(%p,%d,%p,%x,%p)\n", handle, class, data, length, ret_len); + switch (class) { case ThreadBasicInformation: @@ -1063,6 +1065,14 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, #endif } + case ThreadHideFromDebugger: + if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + if (handle != GetCurrentThread()) return STATUS_ACCESS_DENIED; + *(BOOLEAN*)data = TRUE; + if (ret_len) *ret_len = sizeof(BOOLEAN); + return STATUS_SUCCESS; + case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: @@ -1088,6 +1098,8 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, { NTSTATUS status; + TRACE("(%p,%d,%p,%x)\n", handle, class, data, length); + switch (class) { case ThreadZeroTlsCell: @@ -1152,6 +1164,8 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, } case ThreadHideFromDebugger: + if (length) return STATUS_INFO_LENGTH_MISMATCH; + if (handle != GetCurrentThread()) return STATUS_INVALID_HANDLE; /* pretend the call succeeded to satisfy some code protectors */ return STATUS_SUCCESS; -- 2.27.0

3 9

[PATCH 2/2] winhttp: Semi-stub WinHttpWebSocketQueryCloseStatus
by Alistair Leslie-Hughes 24 Jun '20

24 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/request.c | 26 ++++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 10 ++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7ca2dfe864..e7c2184ab0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3185,8 +3185,30 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status, void *reason, DWORD len, DWORD *consumed ) { - FIXME("%p, %p, %p, %u, %p\n", hsocket, status, reason, len, consumed); - return ERROR_INVALID_PARAMETER; + struct socket *sock; + + FIXME("%p, %p, %p, %u, %p Semi-stub\n", hsocket, status, reason, len, consumed); + + if (!(sock = (struct socket *)grab_object( hsocket ))) + { + return ERROR_INVALID_HANDLE; + } + + if (sock->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + ERR("Incorrect handle type\n"); + release_object( &sock->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + + if (reason) + *(char*)reason = 0; + *consumed = 0; + *status = WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS; + + release_object( &sock->hdr ); + + return NO_ERROR; } enum request_state diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 44f156ba39..804d4fbca9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -39,6 +39,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static DWORD (WINAPI *pWinHttpWebSocketClose)(HINTERNET,USHORT,void *,DWORD); static HINTERNET (WINAPI *pWinHttpWebSocketCompleteUpgrade)(HINTERNET,DWORD_PTR); +static DWORD (WINAPI *pWinHttpWebSocketQueryCloseStatus)(HINTERNET,USHORT*,void*,DWORD,DWORD*); static BOOL proxy_active(void) { @@ -3104,6 +3105,7 @@ static void test_websocket(int port) WCHAR header[32]; char buf[128]; BOOL ret; + USHORT closestatus; if (!pWinHttpWebSocketCompleteUpgrade) { @@ -3252,6 +3254,13 @@ static void test_websocket(int port) ret = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 0); ok(ret == NO_ERROR, "got %u\n", GetLastError()); + size = sizeof(buf); + closestatus = WINHTTP_WEB_SOCKET_ABORTED_CLOSE_STATUS; + ret = pWinHttpWebSocketQueryCloseStatus(socket, &closestatus, NULL, 0, &size); + ok(ret == NO_ERROR, "got %u\n", GetLastError()); + ok(size == 0, "got %u\n", size); + ok(closestatus == WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, "got %u\n", closestatus); + /* request handle is still valid */ size = sizeof(ctx); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); @@ -4948,6 +4957,7 @@ START_TEST (winhttp) pWinHttpWebSocketClose = (void *)GetProcAddress(mod, "WinHttpWebSocketClose"); pWinHttpWebSocketCompleteUpgrade = (void *)GetProcAddress(mod, "WinHttpWebSocketCompleteUpgrade"); + pWinHttpWebSocketQueryCloseStatus = (void *)GetProcAddress(mod, "WinHttpWebSocketQueryCloseStatus"); test_WinHttpOpenRequest(); test_WinHttpSendRequest(); -- 2.27.0

2 1

[PATCH 1/2] winhttp: Semi-stub WinHttpWebSocketClose
by Alistair Leslie-Hughes 24 Jun '20

24 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/request.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 5 +++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0c038289f8..7ca2dfe864 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3146,8 +3146,40 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) { - FIXME("%p, %u, %p, %u\n", hsocket, status, reason, len); - return ERROR_INVALID_PARAMETER; + struct socket *sock; + DWORD ret; + int i; + /* FIN and Close (0x88), Mask bit (0x80), 4 bits blank mask. */ + unsigned char simple[6] = {0x88, 0x80, 0x00, 0x00, 0x00, 0x00}; + + FIXME("%p, %u, %p, %u Semi-stub\n", hsocket, status, reason, len); + + if (len > WINHTTP_WEB_SOCKET_MAX_CLOSE_REASON_LENGTH || (!len && reason)) + return ERROR_INVALID_PARAMETER; + + if (!(sock = (struct socket *)grab_object( hsocket ))) + { + return ERROR_INVALID_HANDLE; + } + + if (sock->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + ERR("Incorrect handle type\n"); + release_object( &sock->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + + if (len || status != WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS) + { + WARN("User supplied error message %d currently not supported.\n", status); + } + + i = 0; + /* Just send the simplest close message we have to */ + ret = netconn_send(sock->request->netconn, simple, ARRAY_SIZE(simple), &i); + + release_object( &sock->request->hdr ); + return ret; } DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status, void *reason, DWORD len, diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index be02bbe250..44f156ba39 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -37,6 +37,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static DWORD (WINAPI *pWinHttpWebSocketClose)(HINTERNET,USHORT,void *,DWORD); static HINTERNET (WINAPI *pWinHttpWebSocketCompleteUpgrade)(HINTERNET,DWORD_PTR); static BOOL proxy_active(void) @@ -3248,6 +3249,9 @@ static void test_websocket(int port) ret = WinHttpCloseHandle(connection); ok(ret, "got %u\n", GetLastError()); + ret = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 0); + ok(ret == NO_ERROR, "got %u\n", GetLastError()); + /* request handle is still valid */ size = sizeof(ctx); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); @@ -4942,6 +4946,7 @@ START_TEST (winhttp) DWORD ret; HMODULE mod = GetModuleHandleA("winhttp.dll"); + pWinHttpWebSocketClose = (void *)GetProcAddress(mod, "WinHttpWebSocketClose"); pWinHttpWebSocketCompleteUpgrade = (void *)GetProcAddress(mod, "WinHttpWebSocketCompleteUpgrade"); test_WinHttpOpenRequest(); -- 2.27.0

2 1

[PATCH] include: Add missing device GUIDs and fsfilter GUIDs.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 4/4] directmanipulation: Implement IDirectManipulationCompositor2 stub interface.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/4] directmanipulation: Fake success from IDirectManipulationViewPort2::SetViewPortRect.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44865 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/4] directmanipulation: Fake success from IDirectManipulationContent::SetContentRect.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/4] directmanipulation: Fake success from IDirectManipulationViewport2::ActivateConfiguration.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

WineHQ.org Downtime (2020-06-23)
by Jeremy Newman 23 Jun '20

23 Jun '20

WineHQ.org and all related services and websites will be offline for about an hour today for upgrades. This will start at: 14:00 CDT (-5 GMT) I will reply to this message when services have been restored. -N

1 1

[PATCH 1/2] amstream: Store parent as struct ddraw_stream in ddraw stream sample.
by Zebediah Figura 23 Jun '20

23 Jun '20

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Use %#x instead of %x, and break a long line. dlls/amstream/ddrawstream.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index c471a66200d..0bfbe653e7e 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -28,9 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static const WCHAR sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, - const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); - struct ddraw_stream { IAMMediaStream IAMMediaStream_iface; @@ -51,6 +48,9 @@ struct ddraw_stream AM_MEDIA_TYPE mt; }; +static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, + const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); + static inline struct ddraw_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) { return CONTAINING_RECORD(iface, struct ddraw_stream, IAMMediaStream_iface); @@ -401,12 +401,15 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMedi } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMediaStream *iface, - IDirectDrawSurface *surface, const RECT *rect, DWORD dwFlags, - IDirectDrawStreamSample **ppSample) + IDirectDrawSurface *surface, const RECT *rect, DWORD flags, + IDirectDrawStreamSample **sample) { - TRACE("(%p)->(%p,%s,%x,%p)\n", iface, surface, wine_dbgstr_rect(rect), dwFlags, ppSample); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + + TRACE("stream %p, surface %p, rect %s, flags %#x, sample %p.\n", + stream, surface, wine_dbgstr_rect(rect), flags, sample); - return ddrawstreamsample_create(iface, surface, rect, ppSample); + return ddrawstreamsample_create(stream, surface, rect, sample); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetTimePerFrame(IDirectDrawMediaStream *iface, @@ -959,7 +962,7 @@ struct ddraw_sample { IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; - IMediaStream *parent; + struct ddraw_stream *parent; IDirectDrawSurface *surface; RECT rect; }; @@ -1011,7 +1014,6 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) { if (sample->surface) IDirectDrawSurface_Release(sample->surface); - IMediaStream_Release(sample->parent); HeapFree(GetProcessHeap(), 0, sample); } @@ -1102,7 +1104,7 @@ static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = ddraw_sample_SetRect }; -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, +static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { struct ddraw_sample *object; @@ -1116,8 +1118,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; - object->parent = (IMediaStream*)parent; - IMediaStream_AddRef(object->parent); + object->parent = parent; if (surface) { @@ -1129,7 +1130,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD DDSURFACEDESC desc; IDirectDraw *ddraw; - hr = IDirectDrawMediaStream_GetDirectDraw(parent, &ddraw); + hr = IDirectDrawMediaStream_GetDirectDraw(&parent->IDirectDrawMediaStream_iface, &ddraw); if (FAILED(hr)) { IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); -- 2.27.0

1 1

[PATCH] ieframe: IOleObject::SetExtent() should resize the Shell Embedding Window.
by Dmitry Timoshkov 23 Jun '20

23 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 5c49845aa7..b0e166897a 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -740,6 +740,22 @@ static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, TRACE("(%p)->(%x %p)\n", This, dwDrawAspect, psizel); + if(This->shell_embedding_hwnd) { + LONG dpi_x, dpi_y, width, height; + HDC hdc; + + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + width = MulDiv(psizel->cx, dpi_x, 2540); + height = MulDiv(psizel->cy, dpi_y, 2540); + + SetWindowPos(This->shell_embedding_hwnd, NULL, + 0, 0, width, height, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); + } + /* Tests show that dwDrawAspect is ignored */ This->extent = *psizel; return S_OK; -- 2.26.2

2 3

[PATCH 1/2] amstream: Store parent as struct ddraw_stream in ddraw stream sample.
by Gijs Vermeulen 23 Jun '20

23 Jun '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index c471a66200..5c0203e76b 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -28,9 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static const WCHAR sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, - const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); - struct ddraw_stream { IAMMediaStream IAMMediaStream_iface; @@ -51,6 +48,9 @@ struct ddraw_stream AM_MEDIA_TYPE mt; }; +static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, + const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); + static inline struct ddraw_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) { return CONTAINING_RECORD(iface, struct ddraw_stream, IAMMediaStream_iface); @@ -401,12 +401,14 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMedi } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMediaStream *iface, - IDirectDrawSurface *surface, const RECT *rect, DWORD dwFlags, - IDirectDrawStreamSample **ppSample) + IDirectDrawSurface *surface, const RECT *rect, DWORD flags, + IDirectDrawStreamSample **sample) { - TRACE("(%p)->(%p,%s,%x,%p)\n", iface, surface, wine_dbgstr_rect(rect), dwFlags, ppSample); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + + TRACE("stream %p, surface %p, rect %s, flags %x, sample %p.\n", stream, surface, wine_dbgstr_rect(rect), flags, sample); - return ddrawstreamsample_create(iface, surface, rect, ppSample); + return ddrawstreamsample_create(stream, surface, rect, sample); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetTimePerFrame(IDirectDrawMediaStream *iface, @@ -959,7 +961,7 @@ struct ddraw_sample { IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; - IMediaStream *parent; + struct ddraw_stream *parent; IDirectDrawSurface *surface; RECT rect; }; @@ -1011,7 +1013,6 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) { if (sample->surface) IDirectDrawSurface_Release(sample->surface); - IMediaStream_Release(sample->parent); HeapFree(GetProcessHeap(), 0, sample); } @@ -1102,7 +1103,7 @@ static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = ddraw_sample_SetRect }; -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, +static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { struct ddraw_sample *object; @@ -1116,8 +1117,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; - object->parent = (IMediaStream*)parent; - IMediaStream_AddRef(object->parent); + object->parent = parent; if (surface) { @@ -1129,7 +1129,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD DDSURFACEDESC desc; IDirectDraw *ddraw; - hr = IDirectDrawMediaStream_GetDirectDraw(parent, &ddraw); + hr = IDirectDrawMediaStream_GetDirectDraw(&parent->IDirectDrawMediaStream_iface, &ddraw); if (FAILED(hr)) { IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); -- 2.27.0

1 1

[PATCH 2/2] msscript.ocx: Keep script host running as long as any script module is alive.
by Jacek Caban 23 Jun '20

23 Jun '20

Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 93 +++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 38 deletions(-)

1 0

[PATCH 1/2] msscript.ocx: Move modules_count to the Script Host.
by Jacek Caban 23 Jun '20

23 Jun '20

Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 40 +++++++++++++++--------------- dlls/msscript.ocx/tests/msscript.c | 9 +++++++ 2 files changed, 29 insertions(+), 20 deletions(-)

1 0

[PATCH 1/2] user32/tests: Add test of ShowWindow with SW_SHOWNOACTIVATE
by Haidong Yu 23 Jun '20

23 Jun '20

3 2

[PATCH] user32: Use a default name for winstations created or opened with no name.
by Huw Davies 23 Jun '20

23 Jun '20

The default is of the form "Service-0x<luid high>-<luid low>$" where the luid in question is the logon session luid. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/tests/winstation.c | 24 +++++++++++++++++++----- dlls/user32/winstation.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 4aa5565b96c..d239ead6e98 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -118,9 +118,10 @@ static void test_handles(void) HANDLE hthread; DWORD id, flags, le; ATOM atom; - char buffer[20]; + char buffer[29], default_name[29] = ""; DWORD size; BOOL ret; + TOKEN_STATISTICS token_stats; /* win stations */ @@ -215,7 +216,6 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); w2 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); ok( !w2, "open station succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); @@ -225,16 +225,30 @@ static void test_handles(void) memset( buffer, 0, sizeof(buffer) ); ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); - todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer ); - todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer ); + /* Get the logon session LUID */ + ret = GetTokenInformation( GetCurrentProcessToken(), TokenStatistics, &token_stats, sizeof(token_stats), NULL ); + if (ret) + sprintf( default_name, "Service-0x%x-%x$", token_stats.AuthenticationId.HighPart, + token_stats.AuthenticationId.LowPart ); + if (*default_name) + ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name ); SetLastError( 0xdeadbeef ); w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); - todo_wine ok( w3 != 0, "open station failed err %u\n", GetLastError() ); CloseWindowStation( w3 ); CloseWindowStation( w2 ); + w2 = CreateWindowStationA( NULL, 0, WINSTA_ALL_ACCESS, NULL ); + ok( w2 != 0, "create station failed err %u\n", GetLastError() ); + + memset( buffer, 0, sizeof(buffer) ); + ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); + ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); + if (*default_name) + ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name ); + CloseWindowStation( w2 ); + SetLastError( 0xdeadbeef ); w2 = CreateWindowStationA( "foo\\bar", 0, WINSTA_ALL_ACCESS, NULL ); ok( !w2, "create station succeeded\n" ); diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 4f53b43bd6c..b5d5a372faf 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -80,6 +80,30 @@ static HANDLE get_winstations_dir_handle(void) return handle; } +static BOOL WINAPI winstation_default_name_once( INIT_ONCE *once, void *param, void **context ) +{ + static const WCHAR fmt[] = {'S','e','r','v','i','c','e','-','0','x','%','x','-','%','x','$',0}; + WCHAR *name = (WCHAR *)param; + TOKEN_STATISTICS stats; + BOOL ret; + + ret = GetTokenInformation( GetCurrentProcessToken(), TokenStatistics, &stats, sizeof(stats), NULL ); + if (ret) + sprintfW( name, fmt, stats.AuthenticationId.HighPart, stats.AuthenticationId.LowPart ); + + return ret; +} + +static const WCHAR *get_winstation_default_name( void ) +{ + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; + static WCHAR name[29]; + BOOL ret; + + ret = InitOnceExecuteOnce( &once, winstation_default_name_once, name, NULL ); + return ret ? name : NULL; +} + /*********************************************************************** * CreateWindowStationA (USER32.@) */ @@ -113,6 +137,11 @@ HWINSTA WINAPI CreateWindowStationW( LPCWSTR name, DWORD flags, ACCESS_MASK acce SetLastError( ERROR_FILENAME_EXCED_RANGE ); return 0; } + if (!len) + { + name = get_winstation_default_name(); + len = strlenW( name ); + } SERVER_START_REQ( create_winstation ) { req->flags = 0; @@ -160,6 +189,11 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces SetLastError( ERROR_FILENAME_EXCED_RANGE ); return 0; } + if (!len) + { + name = get_winstation_default_name(); + len = strlenW( name ); + } SERVER_START_REQ( open_winstation ) { req->access = access; -- 2.23.0

2 1

[PATCH] shell32: Only consider copy operation multidest if the number of dst files is greater than one.
by Paul Gofman 23 Jun '20

23 Jun '20

Fixes crash on start in Worms World Party Remastered. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/shlfileop.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b941db39144..38c582be091 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1207,7 +1207,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl fileDest = &flTo->feFiles[0]; } - if (op->req->fFlags & FOF_MULTIDESTFILES) + if (op->req->fFlags & FOF_MULTIDESTFILES && flTo->dwNumFiles > 1) { if (flFrom->bAnyFromWildcard) return ERROR_CANCELLED; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 27c72440425..36602f335d6 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1816,6 +1816,15 @@ static void test_copy(void) CreateDirectoryA("one", NULL); CreateDirectoryA("two", NULL); + /* Test with FOF_MULTIDESTFILES with a wildcard in pFrom and single output directory. */ + shfo.pFrom = "a*.txt\0"; + shfo.pTo = "one\0"; + shfo.fFlags |= FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_MULTIDESTFILES; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one\\aa.txt"), "Expected file to exist\n"); + ok(DeleteFileA("one\\ab.txt"), "Expected file to exist\n"); + /* pFrom has a glob, pTo has more than one dest */ shfo.pFrom = "a*.txt\0"; shfo.pTo = "one\0two\0"; -- 2.26.2

1 0

[PATCH] dxva2: Implement DXVA2CreateVideoService().
by Nikolay Sivov 23 Jun '20

23 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 38 +++++++++++++++++++++++----------- dlls/dxva2/tests/dxva2.c | 44 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 13 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 7ba8d9806b1..bbee697674f 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -101,6 +101,7 @@ static HRESULT WINAPI device_manager_processor_service_QueryInterface(IDirectXVi REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IDirectXVideoProcessorService) || + IsEqualIID(riid, &IID_IDirectXVideoAccelerationService) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; @@ -401,16 +402,9 @@ static HRESULT WINAPI device_manager_GetVideoService(IDirect3DDeviceManager9 *if hr = DXVA2_E_NEW_VIDEO_DEVICE; else if (!(flags & HANDLE_FLAG_OPEN)) hr = E_HANDLE; - else if (IsEqualIID(riid, &IID_IDirectXVideoProcessorService)) - { - *obj = &manager->IDirectXVideoProcessorService_iface; - IUnknown_AddRef((IUnknown *)*obj); - } else - { - WARN("Unsupported service %s.\n", debugstr_guid(riid)); - hr = E_UNEXPECTED; - } + hr = IDirectXVideoProcessorService_QueryInterface(&manager->IDirectXVideoProcessorService_iface, + riid, obj); } LeaveCriticalSection(&manager->cs); @@ -462,11 +456,31 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceMan return S_OK; } -HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *device, REFIID riid, void **ppv ) +HRESULT WINAPI DXVA2CreateVideoService(IDirect3DDevice9 *device, REFIID riid, void **obj) { - FIXME("(%p, %s, %p): stub\n", device, debugstr_guid(riid), ppv); + IDirect3DDeviceManager9 *manager; + HANDLE handle; + HRESULT hr; + UINT token; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", device, debugstr_guid(riid), obj); + + if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager))) + return hr; + + if (FAILED(hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token))) + goto done; + + if (FAILED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle))) + goto done; + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, riid, obj); + IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + +done: + IDirect3DDeviceManager9_Release(manager); + + return hr; } BOOL WINAPI DegaussMonitor( HMONITOR monitor ) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 65771fb5874..e3e8dd2e66c 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -62,8 +62,10 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) static void test_device_manager(void) { IDirectXVideoProcessorService *processor_service; - IDirect3DDevice9 *device, *device2; + IDirectXVideoAccelerationService *accel_service; + IDirect3DDevice9 *device, *device2, *device3; IDirect3DDeviceManager9 *manager; + IDirect3DSurface9 *surface; int refcount, refcount2; HANDLE handle, handle1; IDirect3D9 *d3d; @@ -148,6 +150,46 @@ static void test_device_manager(void) hr = IDirect3DDeviceManager9_TestDevice(manager, handle); ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + /* Acceleration service. */ + hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoAccelerationService, (void **)&accel_service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); +todo_wine + ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirect3DSurface9_Release(surface); + + IDirectXVideoAccelerationService_Release(accel_service); + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoAccelerationService, + (void **)&accel_service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); +todo_wine + ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_GetDevice(surface, &device3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device.\n"); + IDirect3DDevice9_Release(device3); + + IDirect3DSurface9_Release(surface); + } + + IDirectXVideoAccelerationService_Release(accel_service); + IDirect3DDevice9_Release(device); IDirect3DDevice9_Release(device2); -- 2.27.0

1 0

[PATCH] mfplat: Implement GetVideoFormat().
by Nikolay Sivov 23 Jun '20

23 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 66722a84b6f..843c09c5e09 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -38,6 +38,7 @@ struct media_type struct attributes attributes; IMFMediaType IMFMediaType_iface; IMFVideoMediaType IMFVideoMediaType_iface; + MFVIDEOFORMAT *video_format; }; struct stream_desc @@ -648,6 +649,7 @@ static ULONG WINAPI video_mediatype_Release(IMFVideoMediaType *iface) if (!refcount) { clear_attributes_object(&media_type->attributes); + CoTaskMemFree(media_type->video_format); heap_free(media_type); } @@ -971,9 +973,17 @@ static HRESULT WINAPI video_mediatype_FreeRepresentation(IMFVideoMediaType *ifac static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMediaType *iface) { - FIXME("%p.\n", iface); + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + unsigned int size; + HRESULT hr; + + TRACE("%p.\n", iface); + + CoTaskMemFree(media_type->video_format); + if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType((IMFMediaType *)iface, &media_type->video_format, &size))) + WARN("Failed to create format description, hr %#x.\n", hr); - return NULL; + return media_type->video_format; } static HRESULT WINAPI video_mediatype_GetVideoRepresentation(IMFVideoMediaType *iface, GUID representation, -- 2.27.0

1 0

[PATCH 2/2] user32: Fix the popuped window hided abnormal.
by Haidong Yu 23 Jun '20

23 Jun '20

2 1

[PATCH] ntdll: Also call fsync() for FD_TYPE_CHAR in NtFlushBuffersFile().
by Paul Gofman 23 Jun '20

23 Jun '20

Fixes a regression introduced by 3078f10d43d834b0498358fe0accb565191b7020. Files of FD_TYPE_CHAR were also flushed by fsync() on server before referenced commit. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d235e67bd38..6a85231dfed 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5728,7 +5728,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) if (ret == STATUS_ACCESS_DENIED) ret = server_get_unix_fd( handle, FILE_APPEND_DATA, &fd, &needs_close, &type, NULL ); - if (!ret && (type == FD_TYPE_FILE || type == FD_TYPE_DIR)) + if (!ret && (type == FD_TYPE_FILE || type == FD_TYPE_DIR || type == FD_TYPE_CHAR)) { if (fsync(fd)) ret = errno_to_status( errno ); io->u.Status = ret; -- 2.26.2

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Allow vkd3d_shader_compile() to handle multiple target types.
by Henri Verbeet 23 Jun '20

23 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 13 +++++++++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 15 ++++++++++++--- libs/vkd3d/state.c | 1 + programs/vkd3d-compiler/main.c | 1 + tests/vkd3d_shader_api.c | 2 ++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 5c9e42e..7b3494e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -234,6 +234,14 @@ enum vkd3d_shader_source_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SOURCE_TYPE), }; +enum vkd3d_shader_target_type +{ + VKD3D_SHADER_TARGET_NONE, + VKD3D_SHADER_TARGET_SPIRV_BINARY, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE), +}; + struct vkd3d_shader_compile_info { enum vkd3d_shader_structure_type type; @@ -242,6 +250,7 @@ struct vkd3d_shader_compile_info struct vkd3d_shader_code source; enum vkd3d_shader_source_type source_type; + enum vkd3d_shader_target_type target_type; const struct vkd3d_shader_compile_option *options; unsigned int option_count; @@ -663,7 +672,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES -int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); +int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, @@ -693,7 +702,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature * Function pointer typedefs for vkd3d-shader functions. */ typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *spirv); + struct vkd3d_shader_code *out); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5e47122..3255094 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -120,10 +120,19 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_ERROR_INVALID_ARGUMENT; } + switch (compile_info->target_type) + { + case VKD3D_SHADER_TARGET_SPIRV_BINARY: + break; + default: + WARN("Invalid shader target type %#x.\n", compile_info->target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + return VKD3D_OK; } -int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) +int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) { struct vkd3d_shader_instruction instruction; struct vkd3d_dxbc_compiler *spirv_compiler; @@ -131,7 +140,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, s struct vkd3d_shader_parser parser; int ret; - TRACE("compile_info %p, spirv %p.\n", compile_info, spirv); + TRACE("compile_info %p, out %p.\n", compile_info, out); if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) return ret; @@ -174,7 +183,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, s } if (ret >= 0) - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, spirv); + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, out); vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2a1107f..55953ac 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1351,6 +1351,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; compile_info.options = NULL; compile_info.option_count = 0; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 9013f21..48ca42a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -193,6 +193,7 @@ int main(int argc, char **argv) info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = options.compile_options; info.option_count = options.compile_option_count; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 5b47703..6aef004 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -60,6 +60,7 @@ static void test_invalid_shaders(void) info.source.code = ps_break_code; info.source.size = sizeof(ps_break_code); info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = &option; info.option_count = 1; @@ -136,6 +137,7 @@ static void test_vkd3d_shader_pfns(void) compile_info.next = NULL; compile_info.source = vs; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; compile_info.options = NULL; compile_info.option_count = 0; -- 2.11.0

2 1

[PATCH vkd3d 5/5] include: Correct the "vkd3d_shader_binding_flag" type name in some comments.
by Henri Verbeet 23 Jun '20

23 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1cfc0fa..358e90d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -148,7 +148,7 @@ struct vkd3d_shader_resource_binding unsigned int register_space; unsigned int register_index; enum vkd3d_shader_visibility shader_visibility; - unsigned int flags; /* vkd3d_shader_binding_flags */ + unsigned int flags; /* vkd3d_shader_binding_flag */ struct vkd3d_shader_descriptor_binding binding; }; @@ -160,7 +160,7 @@ struct vkd3d_shader_combined_resource_sampler unsigned int resource_index; unsigned int sampler_index; enum vkd3d_shader_visibility shader_visibility; - unsigned int flags; /* vkd3d_shader_binding_flags */ + unsigned int flags; /* vkd3d_shader_binding_flag */ struct vkd3d_shader_descriptor_binding binding; }; -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Allow the name of the SPIR-V entry point to be specified.
by Henri Verbeet 23 Jun '20

23 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/spirv.c | 19 +++++++++++++------ libs/vkd3d/state.c | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d49fecd..1cfc0fa 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -279,6 +279,8 @@ struct vkd3d_shader_spirv_target_info enum vkd3d_shader_structure_type type; const void *next; + const char *entry_point; /* "main" if NULL. */ + enum vkd3d_shader_spirv_environment environment; const enum vkd3d_shader_spirv_extension *extensions; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7636316..49994a3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1666,7 +1666,7 @@ static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder, } } -static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) +static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder, const char *entry_point) { vkd3d_spirv_stream_init(&builder->debug_stream); vkd3d_spirv_stream_init(&builder->annotation_stream); @@ -1682,7 +1682,7 @@ static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) rb_init(&builder->declarations, vkd3d_spirv_declaration_compare); builder->main_function_id = vkd3d_spirv_alloc_id(builder); - vkd3d_spirv_build_op_name(builder, builder->main_function_id, "main"); + vkd3d_spirv_build_op_name(builder, builder->main_function_id, entry_point); } static void vkd3d_spirv_builder_begin_main_function(struct vkd3d_spirv_builder *builder) @@ -1714,7 +1714,7 @@ static void vkd3d_spirv_builder_free(struct vkd3d_spirv_builder *builder) } static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, - struct vkd3d_shader_code *spirv) + struct vkd3d_shader_code *spirv, const char *entry_point) { uint64_t capability_mask = builder->capability_mask; struct vkd3d_spirv_stream stream; @@ -1754,7 +1754,7 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, /* entry point declarations */ vkd3d_spirv_build_op_memory_model(&stream, SpvAddressingModelLogical, SpvMemoryModelGLSL450); vkd3d_spirv_build_op_entry_point(&stream, builder->execution_model, builder->main_function_id, - "main", builder->iface, builder->iface_element_count); + entry_point, builder->iface, builder->iface_element_count); /* execution mode declarations */ if (builder->invocation_count) @@ -2122,6 +2122,13 @@ static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler); +static const char *vkd3d_dxbc_compiler_get_entry_point_name(const struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; + + return info && info->entry_point ? info->entry_point : "main"; +} + struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_info *scan_info) @@ -2162,7 +2169,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return NULL; } - vkd3d_spirv_builder_init(&compiler->spirv_builder); + vkd3d_spirv_builder_init(&compiler->spirv_builder, vkd3d_dxbc_compiler_get_entry_point_name(compiler)); for (i = 0; i < compile_info->option_count; ++i) { @@ -8740,7 +8747,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->strip_debug) vkd3d_spirv_stream_clear(&builder->debug_stream); - if (!vkd3d_spirv_compile_module(builder, spirv)) + if (!vkd3d_spirv_compile_module(builder, spirv, vkd3d_dxbc_compiler_get_entry_point_name(compiler))) return VKD3D_ERROR; if (TRACE_ON()) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 55953ac..db342df 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2174,6 +2174,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; ps_target_info.next = NULL; + ps_target_info.entry_point = "main"; ps_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; ps_target_info.extensions = vk_info->shader_extensions; ps_target_info.extension_count = vk_info->shader_extension_count; -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Rename the vkd3d_tessellator_partitioning enumeration.
by Henri Verbeet 23 Jun '20

23 Jun '20

To vkd3d_shader_tessellator_partitioning. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/spirv.c | 10 +++++----- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 66793dc..d49fecd 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -302,12 +302,14 @@ enum vkd3d_shader_tessellator_output_primitive VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_OUTPUT_PRIMITIVE), }; -enum vkd3d_tessellator_partitioning +enum vkd3d_shader_tessellator_partitioning { - VKD3D_TESSELLATOR_PARTITIONING_INTEGER = 1, - VKD3D_TESSELLATOR_PARTITIONING_POW2 = 2, - VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3, - VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER = 0x1, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2 = 0x2, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 0x3, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 0x4, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_PARTITIONING), }; /* Extends vkd3d_shader_spirv_target_info. */ @@ -317,7 +319,7 @@ struct vkd3d_shader_spirv_domain_shader_target_info const void *next; enum vkd3d_shader_tessellator_output_primitive output_primitive; - enum vkd3d_tessellator_partitioning partitioning; + enum vkd3d_shader_tessellator_partitioning partitioning; }; /* root signature 1.0 */ diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7c8ddab..7636316 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5652,7 +5652,7 @@ static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_d } static void vkd3d_dxbc_compiler_emit_tessellator_partitioning(struct vkd3d_dxbc_compiler *compiler, - enum vkd3d_tessellator_partitioning partitioning) + enum vkd3d_shader_tessellator_partitioning partitioning) { SpvExecutionMode mode; @@ -5661,14 +5661,14 @@ static void vkd3d_dxbc_compiler_emit_tessellator_partitioning(struct vkd3d_dxbc_ switch (partitioning) { - case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: - case VKD3D_TESSELLATOR_PARTITIONING_POW2: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2: mode = SpvExecutionModeSpacingEqual; break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: mode = SpvExecutionModeSpacingFractionalOdd; break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: mode = SpvExecutionModeSpacingFractionalEven; break; default: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index ee9b45c..1b59e4c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -524,20 +524,20 @@ static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer } static void shader_dump_tessellator_partitioning(struct vkd3d_string_buffer *buffer, - enum vkd3d_tessellator_partitioning partitioning) + enum vkd3d_shader_tessellator_partitioning partitioning) { switch (partitioning) { - case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER: shader_addline(buffer, "integer"); break; - case VKD3D_TESSELLATOR_PARTITIONING_POW2: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2: shader_addline(buffer, "pow2"); break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: shader_addline(buffer, "fractional_odd"); break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: shader_addline(buffer, "fractional_even"); break; default: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c8734ef..dfbbdfd 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -774,7 +774,7 @@ struct vkd3d_shader_instruction struct vkd3d_shader_thread_group_size thread_group_size; enum vkd3d_tessellator_domain tessellator_domain; enum vkd3d_shader_tessellator_output_primitive tessellator_output_primitive; - enum vkd3d_tessellator_partitioning tessellator_partitioning; + enum vkd3d_shader_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; struct vkd3d_shader_index_range index_range; struct vkd3d_shader_indexable_temp indexable_temp; -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_tessellator_output_primitive enumeration.
by Henri Verbeet 23 Jun '20

23 Jun '20

To vkd3d_shader_tessellator_output_primitive, consistent with vkd3d-shader naming conventions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/spirv.c | 10 +++++----- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7b3494e..66793dc 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -292,12 +292,14 @@ struct vkd3d_shader_spirv_target_info unsigned int output_swizzle_count; }; -enum vkd3d_tessellator_output_primitive +enum vkd3d_shader_tessellator_output_primitive { - VKD3D_TESSELLATOR_OUTPUT_POINT = 1, - VKD3D_TESSELLATOR_OUTPUT_LINE = 2, - VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW = 3, - VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4, + VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT = 0x1, + VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE = 0x2, + VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW = 0x3, + VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 0x4, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_OUTPUT_PRIMITIVE), }; enum vkd3d_tessellator_partitioning @@ -314,7 +316,7 @@ struct vkd3d_shader_spirv_domain_shader_target_info enum vkd3d_shader_structure_type type; const void *next; - enum vkd3d_tessellator_output_primitive output_primitive; + enum vkd3d_shader_tessellator_output_primitive output_primitive; enum vkd3d_tessellator_partitioning partitioning; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9b655e4..7c8ddab 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5623,7 +5623,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co } static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_dxbc_compiler *compiler, - enum vkd3d_tessellator_output_primitive primitive) + enum vkd3d_shader_tessellator_output_primitive primitive) { SpvExecutionMode mode; @@ -5632,15 +5632,15 @@ static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_d switch (primitive) { - case VKD3D_TESSELLATOR_OUTPUT_POINT: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT: mode = SpvExecutionModePointMode; break; - case VKD3D_TESSELLATOR_OUTPUT_LINE: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE: return; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW: mode = SpvExecutionModeVertexOrderCw; break; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW: mode = SpvExecutionModeVertexOrderCcw; break; default: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 279ede0..ee9b45c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -501,20 +501,20 @@ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, } static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer *buffer, - enum vkd3d_tessellator_output_primitive output_primitive) + enum vkd3d_shader_tessellator_output_primitive output_primitive) { switch (output_primitive) { - case VKD3D_TESSELLATOR_OUTPUT_POINT: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT: shader_addline(buffer, "point"); break; - case VKD3D_TESSELLATOR_OUTPUT_LINE: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE: shader_addline(buffer, "line"); break; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW: shader_addline(buffer, "triangle_cw"); break; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW: shader_addline(buffer, "triangle_ccw"); break; default: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ecfd665..c8734ef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -773,7 +773,7 @@ struct vkd3d_shader_instruction struct vkd3d_shader_tgsm_structured tgsm_structured; struct vkd3d_shader_thread_group_size thread_group_size; enum vkd3d_tessellator_domain tessellator_domain; - enum vkd3d_tessellator_output_primitive tessellator_output_primitive; + enum vkd3d_shader_tessellator_output_primitive tessellator_output_primitive; enum vkd3d_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; struct vkd3d_shader_index_range index_range; -- 2.11.0

1 0

[PATCH 3/3] directmanipulation: Implement IDirectManipulationContent stub interface.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Based on patch by Gijs Vermeulen. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/3] msxml3: Use site's base URI when loading an XML file.
by Dmitry Timoshkov 23 Jun '20

23 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2a66fc9898..7aba8e4e5a 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2158,16 +2158,38 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) return E_FAIL; } -static HRESULT domdoc_load_moniker(domdoc *This, IMoniker *mon) +static HRESULT domdoc_load_file(domdoc *This, LPWSTR filename, IUri **uri) { + IMoniker *mon, *base_mon = NULL; bsc_t *bsc; HRESULT hr; - hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); - if(FAILED(hr)) - return hr; + if (This->base_uri) + { + hr = CreateURLMonikerEx2(NULL, This->base_uri, &base_mon, 0); + if (hr != S_OK) return hr; + } - return detach_bsc(bsc); + if (base_mon) /* look for file starting from base URL */ + hr = CreateUri(filename, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); + else /* look for file in the PATH */ + hr = create_uri(filename, uri); + if (hr == S_OK) + { + hr = CreateURLMonikerEx2(base_mon, *uri, &mon, 0); + if (hr == S_OK) + { + hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); + if (hr == S_OK) + hr = detach_bsc(bsc); + IMoniker_Release(mon); + } + } + + if (base_mon) + IMoniker_Release(base_mon); + + return hr; } static HRESULT WINAPI domdoc_load( @@ -2296,7 +2318,6 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { IUri *uri = NULL; - IMoniker *mon; if (This->properties->uri) { @@ -2304,15 +2325,7 @@ static HRESULT WINAPI domdoc_load( This->properties->uri = NULL; } - hr = create_uri(filename, &uri); - if (SUCCEEDED(hr)) - hr = CreateURLMonikerEx2(NULL, uri, &mon, 0); - if ( SUCCEEDED(hr) ) - { - hr = domdoc_load_moniker( This, mon ); - IMoniker_Release(mon); - } - + hr = domdoc_load_file(This, filename, &uri); if (SUCCEEDED(hr)) { get_doc(This)->name = (char *)xmlchar_from_wcharn(filename, -1, TRUE); -- 2.26.2

1 0

[PATCH 2/3] msxml3: IXMLDOMDocument2's ::SetSite implementation should query site for base URI.
by Dmitry Timoshkov 23 Jun '20

23 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 11 +++++++++++ dlls/msxml3/httprequest.c | 16 ++++++++-------- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/domdoc.c | 4 ---- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 76d3fdb601..2a66fc9898 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -135,6 +135,7 @@ struct domdoc /* IObjectWithSite */ IUnknown *site; + IUri *base_uri; /* IObjectSafety */ DWORD safeopt; @@ -963,6 +964,8 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) if (This->site) IUnknown_Release( This->site ); + if (This->base_uri) + IUri_Release( This->base_uri ); destroy_xmlnode(&This->node); for (eid = 0; eid < EVENTID_LAST; eid++) @@ -3551,6 +3554,12 @@ static HRESULT WINAPI domdoc_ObjectWithSite_SetSite( IObjectWithSite *iface, IUn This->site = NULL; } + if(This->base_uri) + { + IUri_Release(This->base_uri); + This->base_uri = NULL; + } + return S_OK; } @@ -3560,6 +3569,7 @@ static HRESULT WINAPI domdoc_ObjectWithSite_SetSite( IObjectWithSite *iface, IUn IUnknown_Release( This->site ); This->site = punk; + This->base_uri = get_base_uri(This->site); return S_OK; } @@ -3664,6 +3674,7 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->properties = properties_from_xmlDocPtr(xmldoc); doc->error = S_OK; doc->site = NULL; + doc->base_uri = NULL; doc->safeopt = 0; doc->cp_list = NULL; doc->namespaces = NULL; diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c6f9fdb33e..7286eb97bb 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1598,7 +1598,7 @@ static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface return IUnknown_QueryInterface( This->site, iid, ppvSite ); } -static void get_base_uri(httprequest *This) +IUri *get_base_uri(IUnknown *site) { IServiceProvider *provider; IHTMLDocument2 *doc; @@ -1606,30 +1606,30 @@ static void get_base_uri(httprequest *This) BSTR url; HRESULT hr; - hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); + hr = IUnknown_QueryInterface(site, &IID_IServiceProvider, (void**)&provider); if(FAILED(hr)) - return; + return NULL; hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); if(FAILED(hr)) hr = IServiceProvider_QueryService(provider, &SID_SInternetHostSecurityManager, &IID_IHTMLDocument2, (void**)&doc); IServiceProvider_Release(provider); if(FAILED(hr)) - return; + return NULL; hr = IHTMLDocument2_get_URL(doc, &url); IHTMLDocument2_Release(doc); if(FAILED(hr) || !url || !*url) - return; + return NULL; TRACE("host url %s\n", debugstr_w(url)); hr = CreateUri(url, 0, 0, &uri); SysFreeString(url); if(FAILED(hr)) - return; + return NULL; - This->base_uri = uri; + return uri; } static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface, IUnknown *punk ) @@ -1648,7 +1648,7 @@ static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface if (punk) { IUnknown_AddRef( punk ); - get_base_uri(This); + This->base_uri = get_base_uri(This->site); } return S_OK; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 08f944ab1b..918c0d3d44 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -535,6 +535,7 @@ HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; HRESULT create_uri(const WCHAR *, IUri **) DECLSPEC_HIDDEN; HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; +IUri *get_base_uri(IUnknown *) DECLSPEC_HIDDEN; /* Error Codes - not defined anywhere in the public headers */ #define E_XML_ELEMENT_UNDECLARED 0xC00CE00D diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b7cd57a069..27dfbda91b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13127,17 +13127,13 @@ static void test_load_with_site(void) qi_count = 0; hr = IObjectWithSite_SetSite(site, (IUnknown *)&sp); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(qi_count != 0, "got %d QI calls\n", qi_count); todo_wine ok(qi_list_contains(&IID_IXMLDOMDocument), "QI(IID_IXMLDOMDocument) was not called\n"); -todo_wine ok(qi_list_contains(&IID_IHTMLDocument2), "QI(IID_IHTMLDocument2) was not called\n"); -todo_wine ok(qi_list_contains(&IID_IServiceProvider), "QI(IID_IServiceProvider) was not called\n"); todo_wine ok(qi_list_contains(&IID_IOleClientSite), "QI(IID_IOleClientSite) was not called\n"); -todo_wine ok(qi_list_contains_service(&SID_SContainerDispatch, &IID_IHTMLDocument2), "QI(SID_SContainerDispatch, IID_IHTMLDocument2) was not called\n"); todo_wine -- 2.26.2

1 0

[PATCH 1/3] msxml3/tests: Add some tests for XML loading with site assigned.
by Dmitry Timoshkov 23 Jun '20

23 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/domdoc.c | 144 +++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a6acdba366..b7cd57a069 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -37,6 +37,7 @@ #include "dispex.h" #include "objsafe.h" #include "mshtml.h" +#include "docobj.h" #include "initguid.h" #include "asptlb.h" @@ -13015,6 +13016,148 @@ static void test_namespaces_as_attributes(void) free_bstrs(); } +static const IID *qi_list[32]; +static int qi_count; + +static BOOL qi_list_contains(REFIID iid) +{ + int i; + + for (i = 0; i < qi_count; i++) + { + if (IsEqualGUID(qi_list[i], iid)) + return TRUE; + } + + return FALSE; +} + +static BOOL qi_list_contains_service(REFIID service, REFIID iid) +{ + int i; + + for (i = 0; i < qi_count; i++) + { + if (IsEqualGUID(qi_list[i], service) && IsEqualGUID(qi_list[i + 1], iid)) + return TRUE; + } + + return FALSE; +} + +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 + ok(0, "qi_list overflow: %d\n", qi_count); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IServiceProvider)) + { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI sp_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI sp_Release(IServiceProvider *iface) +{ + return 1; +} + +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)) + { + if (qi_count + 1 < ARRAY_SIZE(qi_list)) + { + qi_list[qi_count++] = service; + qi_list[qi_count++] = iid; + } + else + ok(0, "qi_list overflow: %d\n", qi_count); + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl sp_vtbl = +{ + sp_QueryInterface, + sp_AddRef, + sp_Release, + sp_QueryService +}; + +static IServiceProvider sp = { &sp_vtbl }; + +static void test_load_with_site(void) +{ + char path[MAX_PATH]; + IXMLDOMDocument2 *doc; + IObjectWithSite *site; + VARIANT var; + VARIANT_BOOL b; + HRESULT hr; + + GetTempPathA(MAX_PATH, path); + strcat(path, "winetest.xml"); + write_to_file(path, win1252xml); + + doc = create_document(&IID_IXMLDOMDocument2); + + hr = IXMLDOMDocument2_QueryInterface(doc, &IID_IObjectWithSite, (void **)&site); + ok(hr == S_OK, "got %#x\n", hr); + + qi_count = 0; + hr = IObjectWithSite_SetSite(site, (IUnknown *)&sp); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(qi_count != 0, "got %d QI calls\n", qi_count); +todo_wine + ok(qi_list_contains(&IID_IXMLDOMDocument), "QI(IID_IXMLDOMDocument) was not called\n"); +todo_wine + ok(qi_list_contains(&IID_IHTMLDocument2), "QI(IID_IHTMLDocument2) was not called\n"); +todo_wine + ok(qi_list_contains(&IID_IServiceProvider), "QI(IID_IServiceProvider) was not called\n"); +todo_wine + ok(qi_list_contains(&IID_IOleClientSite), "QI(IID_IOleClientSite) was not called\n"); +todo_wine + ok(qi_list_contains_service(&SID_SContainerDispatch, &IID_IHTMLDocument2), + "QI(SID_SContainerDispatch, IID_IHTMLDocument2) was not called\n"); +todo_wine + ok(qi_list_contains_service(&SID_SInternetHostSecurityManager, &IID_IXMLDOMDocument), + "QI(SID_SInternetHostSecurityManager, IID_IXMLDOMDocument) was not called\n"); + + qi_count = 0; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_(path); + hr = IXMLDOMDocument2_load(doc, var, &b); + ok(hr == S_OK, "got %#x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + ok(qi_count == 0, "got %d QI calls\n", qi_count); + SysFreeString(V_BSTR(&var)); + + IXMLDOMDocument2_Release(doc); + + DeleteFileA(path); +} + START_TEST(domdoc) { HRESULT hr; @@ -13031,6 +13174,7 @@ START_TEST(domdoc) return; } + test_load_with_site(); test_domdoc(); test_persiststream(); test_domnode(); -- 2.26.2

1 0

[PATCH] ntoskrnl: Provide a more realistic value for register CR0
by Alex Henrie 23 Jun '20

23 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48997 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/instr.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 44f2ed4f51..f197570db0 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -35,6 +35,13 @@ #define KSHARED_USER_DATA_PAGE_SIZE 0x1000 +#define CR0_PE 0x00000001 /* Protected Mode */ +#define CR0_ET 0x00000010 /* Extension Type */ +#define CR0_NE 0x00000020 /* Numeric Error */ +#define CR0_WP 0x00010000 /* Write Protect */ +#define CR0_AM 0x00040000 /* Alignment Mask */ +#define CR0_PG 0x80000000 /* Paging */ + enum instr_op { INSTR_OP_MOV, @@ -350,7 +357,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE( "mov cr%u,%s at 0x%08x\n", reg, reg_names[instr[2] & 7], context->Eip ); switch (reg) { - case 0: *data = 0x10; break; /* FIXME: set more bits ? */ + case 0: *data = CR0_PE|CR0_ET|CR0_NE|CR0_WP|CR0_AM|CR0_PG; break; case 2: *data = 0; break; case 3: *data = 0; break; case 4: *data = 0; break; -- 2.27.0

1 0

[PATCH 1/2] msxml3: Set internal error on loading from IStream.
by Daniel Lehman 23 Jun '20

23 Jun '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/tests/domdoc.c | 61 ++++++++++++++++++++++++++++++++- dlls/msxml3/tests/msxml3_test.h | 22 ++++++++++++ dlls/msxml3/tests/xmldoc.c | 2 +- 4 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 dlls/msxml3/tests/msxml3_test.h diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 76d3fdb601..c86a4931c5 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2276,7 +2276,7 @@ static HRESULT WINAPI domdoc_load( if (hr == S_OK) { - hr = domdoc_load_from_stream(This, stream); + hr = This->error = domdoc_load_from_stream(This, stream); if (hr == S_OK) *isSuccessful = VARIANT_TRUE; ISequentialStream_Release(stream); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a6acdba366..436f2a489f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -37,12 +37,15 @@ #include "dispex.h" #include "objsafe.h" #include "mshtml.h" +#include "xmlparser.h" #include "initguid.h" #include "asptlb.h" #include "wine/heap.h" #include "wine/test.h" +#include "msxml3_test.h" + /* undef the #define in msxml2 so that we can access all versions */ #undef CLSID_DOMDocument @@ -700,6 +703,36 @@ static void _expect_list_len(IXMLDOMNodeList *list, LONG len, int line) #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) +#define EXPECT_PARSE_ERROR(doc, hr_exp, hr_todo) _expect_parse_error(doc, hr_exp, hr_todo, __LINE__) +static void _expect_parse_error(IXMLDOMDocument *doc, HRESULT hr_exp, BOOL hr_todo, int line) +{ + IXMLDOMParseError *error; + HRESULT hr; + LONG code; + + error = NULL; + hr = IXMLDOMDocument_get_parseError(doc, &error); + ok_(__FILE__,line)(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__,line)(!!error, "got NULL parseError\n"); + + code = 0xdeadbeef; + hr = IXMLDOMParseError_get_errorCode(error, &code); + if (FAILED(hr_exp)) + { + ok_(__FILE__,line)(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__,line)(FAILED(code), "expected failure HRESULT\n"); + todo_wine_if(hr_todo) + ok_(__FILE__,line)(hr_exp == code, "expected 0x%08x, got 0x%08x\n", hr_exp, code); + } + else + { + ok_(__FILE__,line)(hr == S_FALSE, "got 0x%08x\n", hr); + ok_(__FILE__,line)(SUCCEEDED(code), "expected successful HRESULT\n"); + } + + IXMLDOMParseError_Release(error); +} + static const WCHAR szEmpty[] = { 0 }; static const WCHAR szIncomplete[] = { '<','?','x','m','l',' ', @@ -10138,7 +10171,7 @@ static void test_selection(void) free_bstrs(); } -static void write_to_file(const char *name, const char *data) +void write_to_file(const char *name, const char *data) { DWORD written; HANDLE hfile; @@ -10215,6 +10248,7 @@ static void test_load(void) IXMLDOMNodeList *list; IXMLDOMDocument *doc; BSTR bstr1, bstr2; + IStream *stream; VARIANT_BOOL b; VARIANT src; HRESULT hr; @@ -10392,6 +10426,31 @@ static void test_load(void) ok(b == VARIANT_FALSE, "got %d\n", b); VariantClear(&src); + + /* test istream with empty content */ + write_to_file(path, nocontent); + create_stream_on_file(&stream, path); + V_VT(&src) = VT_UNKNOWN; + V_UNKNOWN(&src) = (IUnknown*)stream; + b = VARIANT_TRUE; + hr = IXMLDOMDocument_load(doc, src, &b); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + EXPECT_PARSE_ERROR(doc, XML_E_INVALIDATROOTLEVEL, TRUE); + VariantClear(&src); + + /* test istream with valid xml */ + write_to_file(path, complete4A); + create_stream_on_file(&stream, path); + V_VT(&src) = VT_UNKNOWN; + V_UNKNOWN(&src) = (IUnknown*)stream; + b = VARIANT_FALSE; + hr = IXMLDOMDocument_load(doc, src, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + EXPECT_PARSE_ERROR(doc, S_OK, FALSE); + VariantClear(&src); + IXMLDOMDocument_Release(doc); free_bstrs(); diff --git a/dlls/msxml3/tests/msxml3_test.h b/dlls/msxml3/tests/msxml3_test.h new file mode 100644 index 0000000000..a1a8a0a496 --- /dev/null +++ b/dlls/msxml3/tests/msxml3_test.h @@ -0,0 +1,22 @@ +/* + * Unit test suite for ntdll functions + * + * Copyright 2020 Daniel Lehman + * + * 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 + */ + +void write_to_file(const char *, const char *); +void create_stream_on_file(IStream **, LPCSTR); diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 693af19571..680b32a4c0 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -53,7 +53,7 @@ static void create_xml_file(LPCSTR filename) CloseHandle(hf); } -static void create_stream_on_file(IStream **stream, LPCSTR path) +void create_stream_on_file(IStream **stream, LPCSTR path) { HANDLE hfile; HGLOBAL hglobal; -- 2.17.1

2 3

[PATCH] kernel32: Fix handling of empty file name parameters.
by Changping Yu 23 Jun '20

23 Jun '20

2 1

[PATCH] winex11.drv: Add drag and drop events.
by Changping Yu 23 Jun '20

23 Jun '20

1 0

[PATCH 01/10] mf/tests: Add tests for the topology loader.
by Sergio Gómez Del Real 23 Jun '20

23 Jun '20

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/mf/tests/mf.c | 570 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 501 insertions(+), 69 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c79ae69f91..a92f183096 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -32,6 +32,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(MFVideoFormat_P208, 0x38303250, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(MFAudioFormat_ZZZ, 0x20202020, 0x2020, 0x2020, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20); #undef INITGUID #include <guiddef.h> @@ -54,34 +55,6 @@ static void _expect_ref(IUnknown* obj, ULONG expected_refcount, int line) expected_refcount); } -static WCHAR *load_resource(const WCHAR *name) -{ - static WCHAR pathW[MAX_PATH]; - DWORD written; - HANDLE file; - HRSRC res; - void *ptr; - - GetTempPathW(ARRAY_SIZE(pathW), pathW); - lstrcatW(pathW, name); - - file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, - NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", - wine_dbgstr_w(pathW), GetLastError()); - - res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); - ok(res != 0, "couldn't find resource\n"); - ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); - WriteFile(file, ptr, SizeofResource(GetModuleHandleA(NULL), res), - &written, NULL); - ok(written == SizeofResource(GetModuleHandleA(NULL), res), - "couldn't write resource\n" ); - CloseHandle(file); - - return pathW; -} - static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -1391,27 +1364,367 @@ static const IMFSampleGrabberSinkCallbackVtbl test_grabber_callback_vtbl = test_grabber_callback_OnShutdown, }; +static HRESULT WINAPI test_media_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IMFMediaSource) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + IUnknown_AddRef((IUnknown*)*out); + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_media_source_AddRef(IMFMediaSource *iface) +{ + return 2; +} + +static ULONG WINAPI test_media_source_Release(IMFMediaSource *iface) +{ + return 1; +} + +static HRESULT WINAPI test_media_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, + const GUID *time_format, const PROPVARIANT *start_position) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_Stop(IMFMediaSource *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_Pause(IMFMediaSource *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_Shutdown(IMFMediaSource *iface) +{ + return S_OK; +} + +static const IMFMediaSourceVtbl test_media_source_vtbl = +{ + test_media_source_QueryInterface, + test_media_source_AddRef, + test_media_source_Release, + test_media_source_GetEvent, + test_media_source_BeginGetEvent, + test_media_source_EndGetEvent, + test_media_source_QueueEvent, + test_media_source_GetCharacteristics, + test_media_source_CreatePresentationDescriptor, + test_media_source_Start, + test_media_source_Stop, + test_media_source_Pause, + test_media_source_Shutdown, +}; + +static HRESULT WINAPI test_mft_generic_QueryInterface(IMFTransform *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMFTransform)) + { + *out = iface; + IUnknown_AddRef((IUnknown*)*out); + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_mft_generic_AddRef(IMFTransform *iface) +{ + return 2; +} + +static ULONG WINAPI test_mft_generic_Release(IMFTransform *iface) +{ + return 1; +} + +static HRESULT WINAPI test_mft_generic_GetStreamLimits(IMFTransform *iface, DWORD *inputmin, DWORD *inputmax, DWORD *outputmin, DWORD *outputmax) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_GetStreamCount(IMFTransform *iface, DWORD *input_streams, DWORD *output_streams) +{ + *input_streams = 1; + *output_streams = 1; + return S_OK; +} + +static HRESULT WINAPI test_mft_generic_GetStreamIDs(IMFTransform *iface, DWORD inputidsize, DWORD *inputids, DWORD outputidsize, DWORD *outputids) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_GetInputStreamInfo(IMFTransform *iface, DWORD inputstream, MFT_INPUT_STREAM_INFO *streaminfo) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_GetOutputStreamInfo(IMFTransform *iface, DWORD outputstream, MFT_OUTPUT_STREAM_INFO *streaminfo) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_GetInputStreamAttributes(IMFTransform *iface, DWORD inputstream, IMFAttributes **attributes) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_GetOutputStreamAttributes(IMFTransform *iface, DWORD outputstream, IMFAttributes **attributes) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_DeleteInputStream(IMFTransform *iface, DWORD streamid) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_AddInputStreams(IMFTransform *iface, DWORD num_streams, DWORD *streamids) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_conv_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) +{ + static IMFMediaType *conv_out_type; + + if (id != 0 || index != 0) + return MF_E_NO_MORE_TYPES; + + MFCreateMediaType(&conv_out_type); + IMFMediaType_SetGUID(conv_out_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + IMFMediaType_SetGUID(conv_out_type, &MF_MT_SUBTYPE, &MFAudioFormat_ZZZ); + IMFMediaType_SetUINT32(conv_out_type, &MF_MT_AUDIO_NUM_CHANNELS, 1); + IMFMediaType_SetUINT32(conv_out_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 32000); + + *type = conv_out_type; + return S_OK; +} + +static HRESULT WINAPI test_mft_conv_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) +{ + UINT32 num_channels, sample; + + IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &num_channels); + IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &sample); + + if (num_channels == 2 && sample == 44100) + return S_OK; + + return MF_E_INVALIDMEDIATYPE; +} + +static HRESULT WINAPI test_mft_conv_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) +{ + UINT32 num_channels, sample; + + IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &num_channels); + IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &sample); + + if (num_channels == 1 && sample == 32000) + return S_OK; + + return MF_E_INVALIDMEDIATYPE; +} + +static HRESULT WINAPI test_mft_conv_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_conv_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_GetInputStatus(IMFTransform *iface, DWORD inputstream, DWORD *flags) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_GetOutputStatus(IMFTransform *iface, DWORD *flags) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_ProcessEvent(IMFTransform *iface, DWORD inputstream, IMFMediaEvent *event) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE type, ULONG_PTR param) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_ProcessInput(IMFTransform *iface, DWORD inputstream, IMFSample *sample, DWORD flags) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_mft_generic_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD outbufcount, MFT_OUTPUT_DATA_BUFFER *outsamples, DWORD *status) +{ + return E_NOTIMPL; +} + +static const IMFTransformVtbl test_mft_conv_vtbl = +{ + test_mft_generic_QueryInterface, + test_mft_generic_AddRef, + test_mft_generic_Release, + test_mft_generic_GetStreamLimits, + test_mft_generic_GetStreamCount, + test_mft_generic_GetStreamIDs, + test_mft_generic_GetInputStreamInfo, + test_mft_generic_GetOutputStreamInfo, + test_mft_generic_GetAttributes, + test_mft_generic_GetInputStreamAttributes, + test_mft_generic_GetOutputStreamAttributes, + test_mft_generic_DeleteInputStream, + test_mft_generic_AddInputStreams, + test_mft_generic_GetInputAvailableType, + test_mft_conv_GetOutputAvailableType, + test_mft_conv_SetInputType, + test_mft_conv_SetOutputType, + test_mft_conv_GetInputCurrentType, + test_mft_conv_GetOutputCurrentType, + test_mft_generic_GetInputStatus, + test_mft_generic_GetOutputStatus, + test_mft_generic_SetOutputBounds, + test_mft_generic_ProcessEvent, + test_mft_generic_ProcessMessage, + test_mft_generic_ProcessInput, + test_mft_generic_ProcessOutput, +}; + +static IMFTransform test_mft_conv = { &test_mft_conv_vtbl }; + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || (IsEqualGUID(riid, &IID_IClassFactory))) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactoryConv_CreateInstance(IClassFactory *iface, + IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + *ppv = &test_mft_conv; + return S_OK; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IClassFactoryVtbl ClassFactoryConvVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactoryConv_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ClassFactoryConv = { &ClassFactoryConvVtbl }; + +static const CLSID test_conv_clsid = { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static void test_topology_loader(void) { IMFSampleGrabberSinkCallback test_grabber_callback = { &test_grabber_callback_vtbl }; - IMFTopology *topology, *topology2, *full_topology; + IMFMediaSource test_media_source = { &test_media_source_vtbl }; + IMFTopology *topology, *full_topology = NULL; + static WCHAR str[] = { 'c','o','n','v', 0 }; + IMFMediaType *media_type, *mediatypes_pd[3]; IMFTopologyNode *src_node, *sink_node; + MFT_REGISTER_TYPE_INFO typeinfo; IMFPresentationDescriptor *pd; - IMFSourceResolver *resolver; IMFActivate *sink_activate; + IMFStreamSink *stream_sink; unsigned int count, value; - IMFMediaType *media_type; + IMFMediaTypeHandler *mth; IMFStreamDescriptor *sd; - MF_OBJECT_TYPE obj_type; - IMFMediaSource *source; IMFTopoLoader *loader; - IMFByteStream *stream; - IMFAttributes *attr; IMFMediaSink *sink; - WCHAR *filename; + WORD node_count; BOOL selected; HRESULT hr; GUID guid; + DWORD reg; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); @@ -1430,35 +1743,38 @@ static void test_topology_loader(void) todo_wine ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr); - hr = MFCreateSourceResolver(&resolver); - ok(hr == S_OK, "Failed to create source resolver, hr %#x.\n", hr); - - filename = load_resource(L"test.wav"); - - hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); - ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); - - IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attr); - IMFAttributes_SetString(attr, &MF_BYTESTREAM_CONTENT_TYPE, L"audio/wav"); - IMFAttributes_Release(attr); - - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, - &obj_type, (IUnknown **)&source); - ok(hr == S_OK || broken(FAILED(hr)) /* Vista */, "Failed to create source, hr %#x.\n", hr); - if (FAILED(hr)) - return; - - hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); - ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); - - hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); - ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); + hr = MFCreateMediaType(&mediatypes_pd[0]); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatypes_pd[0], &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set GUID, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatypes_pd[0], &MF_MT_SUBTYPE, &MFAudioFormat_ZZZ); + ok(hr == S_OK, "Failed to set GUID, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(mediatypes_pd[0], &MF_MT_AUDIO_NUM_CHANNELS, 2); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(mediatypes_pd[0], &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = MFCreateMediaType(&mediatypes_pd[1]); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatypes_pd[1], &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set GUID, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatypes_pd[1], &MF_MT_SUBTYPE, &MFAudioFormat_ZZZ); + ok(hr == S_OK, "Failed to set GUID, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(mediatypes_pd[1], &MF_MT_AUDIO_NUM_CHANNELS, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(mediatypes_pd[1], &MF_MT_AUDIO_SAMPLES_PER_SECOND, 32000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = MFCreateStreamDescriptor(0, 2, mediatypes_pd, &sd); + ok(hr == S_OK, "Failed to create stream descriptor, hr %#x.\n", hr); + hr = MFCreatePresentationDescriptor(1, &sd, &pd); + ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); + hr = IMFPresentationDescriptor_SelectStream(pd, 0); + ok(hr == S_OK, "Failed selecting stream.\n"); /* Add source node. */ hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node); ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); - hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)source); + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)&test_media_source); ok(hr == S_OK, "Failed to set node source, hr %#x.\n", hr); hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)pd); @@ -1481,7 +1797,11 @@ todo_wine hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_ZZZ); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_NUM_CHANNELS, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 32000); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = MFCreateSampleGrabberSinkActivate(media_type, &test_grabber_callback, &sink_activate); @@ -1511,22 +1831,49 @@ todo_wine hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); - hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink); + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Failed to get stream sink, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); hr = IMFTopology_GetCount(topology, &count); ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); + /* if no current media type set, loader uses first index exclusively */ hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); todo_wine + ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &mth); + ok(hr == S_OK, "Failed to get media type handler, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(mth, 0, &media_type); + ok(hr == S_OK, "Failed getting media type, hr %#x.\n", hr); + + /* setting current media type overrides previous behavior; tries with it, and only with it */ + hr = IMFMediaTypeHandler_SetCurrentMediaType(mth, media_type); + ok(hr == S_OK, "Failed setting current media type, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); +todo_wine + ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(mth, 1, &media_type); + ok(hr == S_OK, "Failed getting media type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(mth, media_type); + ok(hr == S_OK, "Failed setting current media type, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); - ok(full_topology != topology, "Unexpected instance.\n"); hr = IMFTopology_GetCount(topology, &count); ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); + hr = E_FAIL; hr = IMFTopology_GetCount(full_topology, &count); ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); todo_wine @@ -1543,16 +1890,101 @@ todo_wine { ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); ok(value == MF_TOPOLOGY_RESOLUTION_SUCCEEDED, "Unexpected value %#x.\n", value); } - hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL); + + IMFTopology_Release(full_topology); + + /* test with stream deselected */ + hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); + ok(hr == S_OK, "Failed getting stream descriptor, hr %#x.\n", hr); + + hr = IMFPresentationDescriptor_DeselectStream(pd, 0); + ok(hr == S_OK, "Failed deselecting stream, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); - ok(full_topology != topology2, "Unexpected instance.\n"); + + IMFPresentationDescriptor_Release(pd); + IMFStreamDescriptor_Release(sd); + IMFTopologyNode_Release(src_node); + + hr = IMFTopology_GetNode(full_topology, 0, &src_node); + ok(hr == S_OK, "Failed to get source node, hr %#x.\n", hr); + hr = IMFTopologyNode_GetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, &IID_IMFPresentationDescriptor, (void **)&pd); + ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); + hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); + ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); + ok(!selected, "Stream should not be selected.\n"); + + IMFStreamDescriptor_Release(sd); + IMFTopologyNode_Release(src_node); + IMFPresentationDescriptor_Release(pd); + IMFTopology_Release(full_topology); - IMFTopology_Release(topology2); + /* register a converter to test source -> mft -> sink */ + hr = CoRegisterClassObject(&test_conv_clsid, (IUnknown*)&ClassFactoryConv, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &reg); + ok(hr == S_OK, "Failed to register class object, hr %#x.\n"); + + typeinfo.guidMajorType = MFMediaType_Audio; + typeinfo.guidSubtype = MFAudioFormat_ZZZ; + hr = MFTRegisterLocalByCLSID(&test_conv_clsid, &MFT_CATEGORY_AUDIO_DECODER, str, MFT_ENUM_FLAG_ASYNCMFT, 1, &typeinfo, 1, &typeinfo); + ok(hr == S_OK, "Failed to register mft, hr %#x.\n"); + + hr = IMFTopology_GetNode(topology, 0, &src_node); + ok(hr == S_OK, "Failed to get source node, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(mth, 0, &media_type); + ok(hr == S_OK, "Failed getting media type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(mth, media_type); + ok(hr == S_OK, "Failed setting current media type, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); +todo_wine + ok(node_count == 3, "Unexpected node count %d.\n", node_count); IMFTopology_Release(full_topology); - IMFMediaSource_Release(source); - IMFSourceResolver_Release(resolver); - IMFByteStream_Release(stream); + /* test when MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES attribute is set on topology */ + hr = IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, 1); + ok(hr == S_OK, "Failed to set attribute.\n"); + + /* test with MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES set on source */ + hr = IMFTopologyNode_SetUINT32(src_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES); + ok(hr == S_OK, "Failed to set attribute.\n"); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); +todo_wine + ok(node_count == 3, "Unexpected node count %d.\n", node_count); + + /* now test without MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES on source */ + hr = IMFTopologyNode_SetUINT32(src_node, &MF_TOPONODE_CONNECT_METHOD, ~MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES); + ok(hr == S_OK, "Failed to set attribute.\n"); + + IMFTopology_Release(full_topology); + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(node_count == 2, "Unexpected node count %d.\n", node_count); + IMFTopology_Release(full_topology); + + IMFMediaType_Release(mediatypes_pd[0]); + IMFMediaType_Release(mediatypes_pd[1]); + IMFStreamDescriptor_Release(sd); + IMFPresentationDescriptor_Release(pd); + IMFTopology_RemoveNode(topology, src_node); + + hr = MFTUnregister(test_conv_clsid); + ok(hr == S_OK, "Failed to unregister mft, hr %#x.\n"); + hr = CoRevokeClassObject(reg); + ok(hr == S_OK, "Failed to unregister class object, hr %#x.\n"); + IMFTopoLoader_Release(loader); hr = MFShutdown(); -- 2.17.1

2 16

[PATCH 1/5] winegstreamer: Prefer YUV formats to RGB ones.
by Zebediah Figura 22 Jun '20

22 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 75ddb3082e6..11ca8f90bb0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1677,17 +1677,19 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, { static const GstVideoFormat video_formats[] = { - /* Roughly ordered by preference from videoflip. */ + /* Try to prefer YUV formats over RGB ones. Most decoders output in the + * YUV color space, and it's generally much less expensive for + * videoconvert to do YUV -> YUV transformations. */ GST_VIDEO_FORMAT_AYUV, - GST_VIDEO_FORMAT_BGRA, - GST_VIDEO_FORMAT_BGRx, - GST_VIDEO_FORMAT_BGR, GST_VIDEO_FORMAT_I420, GST_VIDEO_FORMAT_YV12, GST_VIDEO_FORMAT_YUY2, GST_VIDEO_FORMAT_UYVY, GST_VIDEO_FORMAT_YVYU, GST_VIDEO_FORMAT_NV12, + GST_VIDEO_FORMAT_BGRA, + GST_VIDEO_FORMAT_BGRx, + GST_VIDEO_FORMAT_BGR, }; if (!index) -- 2.27.0

2 5

[PATCH v4] amstream/tests: Add IDirectDrawMediaStream::SetDirectDraw() tests.
by Zebediah Figura 22 Jun '20

22 Jun '20

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v4: Resent with some style tweaks (avoid LPVOID, reword some comments). dlls/amstream/tests/amstream.c | 150 +++++++++++++++++++++++++++++---- 1 file changed, 133 insertions(+), 17 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index eb9b852ba48..1259de927df 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2013,8 +2013,6 @@ static void test_IDirectDrawStreamSample(void) DDSURFACEDESC desc = { sizeof(desc) }; IAMMultiMediaStream *mmstream; IDirectDrawSurface7 *surface7; - IDirectDraw *ddraw, *ddraw2; - IDirectDraw7 *ddraw7; HRESULT hr; RECT rect; @@ -2040,21 +2038,6 @@ static void test_IDirectDrawStreamSample(void) ok(hr == S_OK, "got 0x%08x\n", hr); if (FAILED(hr)) goto error; - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(ddraw == ddraw2, "got %p, %p\n", ddraw, ddraw2); - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void **)&ddraw7); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(ddraw7 == pdd7, "Got IDirectDraw instance %p, expected %p.\n", ddraw7, pdd7); - IDirectDraw7_Release(ddraw7); - - IDirectDraw_Release(ddraw2); - IDirectDraw_Release(ddraw); - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4768,6 +4751,138 @@ static void test_mediastreamfilter_get_current_stream_time(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_getsetdirectdraw(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDraw *ddraw, *ddraw2, *ddraw3, *ddraw4; + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IDirectDraw7 *ddraw7; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void **)&ddraw7); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 1); + EXPECT_REF(ddraw7, 1); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw7, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine EXPECT_REF(ddraw, 2); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw2 == ddraw, "Expected ddraw %p, got %p.\n", ddraw, ddraw2); + todo_wine EXPECT_REF(ddraw, 3); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); + todo_wine EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw3); + todo_wine EXPECT_REF(ddraw, 3); + + /* The current ddraw is released when SetDirectDraw() is called. */ + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 2); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(ddraw3 == NULL, "Expected NULL, got %p.\n", ddraw3); + if (ddraw3) IDirectDraw_Release(ddraw3); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine EXPECT_REF(ddraw, 3); + + if (hr == S_OK) + { + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); + EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw3); + EXPECT_REF(ddraw, 3); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* SetDirectDraw() doesn't take an extra reference to the ddraw object + * if there are samples extant. */ + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 3); + + hr = DirectDrawCreate(NULL, &ddraw3, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw_SetCooperativeLevel(ddraw3, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw3, 1); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); + ok(hr == MS_E_SAMPLEALLOC, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw4 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw4); + EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw4); + EXPECT_REF(ddraw, 3); + + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 2); + EXPECT_REF(ddraw3, 2); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw4 == ddraw3, "Expected ddraw %p, got %p.\n", ddraw3, ddraw4); + EXPECT_REF(ddraw3, 3); + IDirectDraw_Release(ddraw4); + EXPECT_REF(ddraw3, 2); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw3, 1); + + ref = IDirectDraw_Release(ddraw3); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + EXPECT_REF(stream, 3); + IDirectDrawMediaStream_Release(ddraw_stream); + EXPECT_REF(stream, 2); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + EXPECT_REF(stream, 1); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw7_Release(ddraw7); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IDirectDraw_Release(ddraw2); + EXPECT_REF(ddraw, 1); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -4816,6 +4931,7 @@ START_TEST(amstream) test_audiostreamsample_get_sample_times(); test_ddrawstream_initialize(); + test_ddrawstream_getsetdirectdraw(); test_ammediastream_join_am_multi_media_stream(); -- 2.27.0

1 0

[PATCH] user32: Delay retreival of window style in GetDCEx().
by Jeff Smith 22 Jun '20

22 Jun '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdi32/tests/dc.c | 2 ++ dlls/user32/painting.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 6640134d1f..10dd14c413 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -663,8 +663,10 @@ static void test_DC_bitmap(void) /* fill bitmap data with b&w pattern */ for( i = 0; i < 64; i++) bits[i] = i & 1 ? 0 : 0xffffff; + SetLastError(0xdeadbeef); hdc = GetDC(0); ok( hdc != NULL, "CreateDC rets %p\n", hdc); + ok(GetLastError() == 0xdeadbeef, "expected GetLastError() == 0xdeadbeef, got %#x\n", GetLastError()); bitspixel = GetDeviceCaps( hdc, BITSPIXEL); /* create a memory dc */ hdcmem = CreateCompatibleDC( hdc); diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 313c5fa1e6..b7d787ae47 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -987,7 +987,7 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) struct dce *dce; BOOL bUpdateVisRgn = TRUE; HWND parent; - LONG window_style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG window_style; if (!hwnd) hwnd = GetDesktopWindow(); else hwnd = WIN_GetFullHandle( hwnd ); @@ -996,6 +996,8 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) if (!IsWindow(hwnd)) return 0; + window_style = GetWindowLongW( hwnd, GWL_STYLE ); + /* fixup flags */ if (flags & (DCX_WINDOW | DCX_PARENTCLIP)) flags |= DCX_CACHE; -- 2.23.0

1 0

[PATCH v2 1/5] ntoskrnl/tests: Use the same sin port as ws2_32 tests.
by Paul Gofman 22 Jun '20

22 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.h | 2 ++ dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 4b70046b8e2..3bfc4bd80ac 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -55,3 +55,5 @@ static inline char *drv_strrchr( const char *str, char ch ) do { if (*str == ch) ret = (char *)(ULONG_PTR)str; } while (*str++); return ret; } + +#define SERVER_LISTEN_PORT 9374 diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index fedd5f25c2c..e11879e9e5b 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -243,7 +243,7 @@ static void test_wsk_listen_socket(void) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(12345); + addr.sin_port = htons(SERVER_LISTEN_PORT); IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c53f97e9d19..5555095bd22 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -532,7 +532,7 @@ static DWORD WINAPI wsk_test_thread(void *parameter) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(12345); + addr.sin_port = htons(SERVER_LISTEN_PORT); addr.sin_addr.s_addr = htonl(0x7f000001); ret = connect(s, (struct sockaddr *)&addr, sizeof(addr)); -- 2.26.2

1 4

[PATCH 1/5] d3dcompiler: Prepend static initializers to the function body.
by Zebediah Figura 22 Jun '20

22 Jun '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 ++ dlls/d3dcompiler_43/hlsl.y | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 9feaee0d8ac..a2d9c04d3bc 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -979,6 +979,8 @@ struct hlsl_parse_ctx struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1]; struct hlsl_type *Void; } builtin_types; + + struct list static_initializers; }; extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 393f8d52fbd..c9dbdeb8c18 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -888,14 +888,17 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, continue; } - list_move_tail(statements_list, v->initializer.instrs); - d3dcompiler_free(v->initializer.instrs); - load = new_var_load(var, var->loc); - list_add_tail(statements_list, &load->node.entry); + list_add_tail(v->initializer.instrs, &load->node.entry); assignment = make_assignment(&load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); d3dcompiler_free(v->initializer.args); - list_add_tail(statements_list, &assignment->entry); + list_add_tail(v->initializer.instrs, &assignment->entry); + + if (modifiers & HLSL_STORAGE_STATIC) + list_move_tail(&hlsl_ctx.static_initializers, v->initializer.instrs); + else + list_move_tail(statements_list, v->initializer.instrs); + d3dcompiler_free(v->initializer.instrs); } d3dcompiler_free(v); } @@ -1514,6 +1517,10 @@ hlsl_prog: /* empty */ | hlsl_prog declaration_statement { TRACE("Declaration statement parsed.\n"); + + if (!list_empty($2)) + FIXME("Uniform initializer.\n"); + free_instr_list($2); } | hlsl_prog preproc_directive { @@ -2961,6 +2968,7 @@ HRESULT parse_hlsl(enum shader_type type, DWORD major, DWORD minor, list_init(&hlsl_ctx.scopes); list_init(&hlsl_ctx.types); init_functions_tree(&hlsl_ctx.functions); + list_init(&hlsl_ctx.static_initializers); push_scope(&hlsl_ctx); hlsl_ctx.globals = hlsl_ctx.cur_scope; @@ -2984,6 +2992,8 @@ HRESULT parse_hlsl(enum shader_type type, DWORD major, DWORD minor, "entry point \"%s\" is missing a return value semantic", entry_func->func->name); } + list_move_head(entry_func->body, &hlsl_ctx.static_initializers); + /* Index 0 means unused; index 1 means function entry, so start at 2. */ index_instructions(entry_func->body, 2); -- 2.27.0

3 11

[PATCH v3] amstream/tests: Add IDirectDrawMediaStream::SetDirectDraw() tests.
by Gijs Vermeulen 22 Jun '20

22 Jun '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/tests/amstream.c | 150 +++++++++++++++++++++++++++++---- 1 file changed, 133 insertions(+), 17 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index eb9b852ba4..f4311efb60 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2013,8 +2013,6 @@ static void test_IDirectDrawStreamSample(void) DDSURFACEDESC desc = { sizeof(desc) }; IAMMultiMediaStream *mmstream; IDirectDrawSurface7 *surface7; - IDirectDraw *ddraw, *ddraw2; - IDirectDraw7 *ddraw7; HRESULT hr; RECT rect; @@ -2040,21 +2038,6 @@ static void test_IDirectDrawStreamSample(void) ok(hr == S_OK, "got 0x%08x\n", hr); if (FAILED(hr)) goto error; - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(ddraw == ddraw2, "got %p, %p\n", ddraw, ddraw2); - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void **)&ddraw7); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(ddraw7 == pdd7, "Got IDirectDraw instance %p, expected %p.\n", ddraw7, pdd7); - IDirectDraw7_Release(ddraw7); - - IDirectDraw_Release(ddraw2); - IDirectDraw_Release(ddraw); - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4768,6 +4751,138 @@ static void test_mediastreamfilter_get_current_stream_time(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_getsetdirectdraw(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDraw *ddraw, *ddraw2, *ddraw3, *ddraw4; + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IDirectDraw7 *ddraw7; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (LPVOID*)&ddraw7); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 1); + EXPECT_REF(ddraw7, 1); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown*)ddraw7, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine EXPECT_REF(ddraw, 2); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw2 == ddraw, "Expected ddraw %p, got %p.\n", ddraw, ddraw2); + todo_wine EXPECT_REF(ddraw, 3); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); + todo_wine EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw3); + todo_wine EXPECT_REF(ddraw, 3); + + /* Current ddraw gets released when SetDirectDraw is called */ + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 2); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(ddraw3 == NULL, "Expected NULL, got %p.\n", ddraw3); + if (ddraw3) IDirectDraw_Release(ddraw3); + + /* SetDirectDraw addrefs passed ddraw if not NULL */ + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine EXPECT_REF(ddraw, 3); + + if (hr == S_OK) + { + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); + EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw3); + EXPECT_REF(ddraw, 3); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* SetDirectDraw doesn't addref if there are samples, but ddraw is the same as current */ + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 3); + + hr = DirectDrawCreate(NULL, &ddraw3, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw_SetCooperativeLevel(ddraw3, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw3, 1); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); + ok(hr == MS_E_SAMPLEALLOC, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw4 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw4); + EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw4); + EXPECT_REF(ddraw, 3); + + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 2); + EXPECT_REF(ddraw3, 2); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw4 == ddraw3, "Expected ddraw %p, got %p.\n", ddraw3, ddraw4); + EXPECT_REF(ddraw3, 3); + IDirectDraw_Release(ddraw4); + EXPECT_REF(ddraw3, 2); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw3, 1); + + ref = IDirectDraw_Release(ddraw3); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + EXPECT_REF(stream, 3); + IDirectDrawMediaStream_Release(ddraw_stream); + EXPECT_REF(stream, 2); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + EXPECT_REF(stream, 1); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw7_Release(ddraw7); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IDirectDraw_Release(ddraw2); + EXPECT_REF(ddraw, 1); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -4816,6 +4931,7 @@ START_TEST(amstream) test_audiostreamsample_get_sample_times(); test_ddrawstream_initialize(); + test_ddrawstream_getsetdirectdraw(); test_ammediastream_join_am_multi_media_stream(); -- 2.27.0

1 0

[PATCH 2/3] directmanipulation: Implement IDirectManipulationPrimaryContent stub interface.
by Vijay Kiran Kamuju 22 Jun '20

22 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] directmanipulation: Implement IDirectManipulationViewport2 stub interface.
by Vijay Kiran Kamuju 22 Jun '20

22 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/6] winhttp: Don't close child handles on release.
by Hans Leidekker 22 Jun '20

22 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/handle.c | 14 ++------------ dlls/winhttp/request.c | 2 -- dlls/winhttp/session.c | 5 ----- dlls/winhttp/tests/winhttp.c | 27 +++++++++++++++++++++++---- dlls/winhttp/winhttp_private.h | 1 - 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 9c77d5166a..08052b91ee 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -79,7 +79,6 @@ void release_object( struct object_header *hdr ) send_callback( hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, &hdr->handle, sizeof(HINTERNET) ); TRACE("destroying object %p\n", hdr); - if (hdr->type != WINHTTP_HANDLE_TYPE_SESSION) list_remove( &hdr->entry ); hdr->vtbl->destroy( hdr ); } } @@ -89,7 +88,6 @@ HINTERNET alloc_handle( struct object_header *hdr ) struct object_header **p; ULONG_PTR handle, num; - list_init( &hdr->children ); hdr->handle = NULL; EnterCriticalSection( &handle_cs ); @@ -123,7 +121,7 @@ BOOL free_handle( HINTERNET hinternet ) { BOOL ret = FALSE; ULONG_PTR handle = (ULONG_PTR)hinternet; - struct object_header *hdr = NULL, *child, *next; + struct object_header *hdr = NULL; EnterCriticalSection( &handle_cs ); @@ -141,15 +139,7 @@ BOOL free_handle( HINTERNET hinternet ) LeaveCriticalSection( &handle_cs ); - if (hdr) - { - LIST_FOR_EACH_ENTRY_SAFE( child, next, &hdr->children, struct object_header, entry ) - { - TRACE("freeing child handle %p for parent handle 0x%lx\n", child->handle, handle + 1); - free_handle( child->handle ); - } - release_object( hdr ); - } + if (hdr) release_object( hdr ); EnterCriticalSection( &handle_cs ); if (next_handle > handle && !handles[handle]) next_handle = handle; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0511dd44ee..08e9d7584e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3102,11 +3102,9 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.vtbl = &socket_vtbl; socket->hdr.refs = 1; socket->hdr.context = context; - list_init( &socket->hdr.children ); addref_object( &request->hdr ); socket->request = request; - list_add_head( &request->hdr.children, &socket->hdr.entry ); if ((hsocket = alloc_handle( &socket->hdr ))) socket->hdr.handle = hsocket; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 87974ffbd8..13d228d851 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -246,7 +246,6 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->hdr.flags = flags; session->hdr.refs = 1; session->hdr.redirect_policy = WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP; - list_init( &session->hdr.children ); session->resolve_timeout = DEFAULT_RESOLVE_TIMEOUT; session->connect_timeout = DEFAULT_CONNECT_TIMEOUT; session->send_timeout = DEFAULT_SEND_TIMEOUT; @@ -552,11 +551,9 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hdr.notify_mask = session->hdr.notify_mask; connect->hdr.context = session->hdr.context; connect->hdr.redirect_policy = session->hdr.redirect_policy; - list_init( &connect->hdr.children ); addref_object( &session->hdr ); connect->session = session; - list_add_head( &session->hdr.children, &connect->hdr.entry ); if (!(connect->hostname = strdupW( server ))) goto end; connect->hostport = port; @@ -1121,12 +1118,10 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; request->hdr.redirect_policy = connect->hdr.redirect_policy; - list_init( &request->hdr.children ); list_init( &request->task_queue ); addref_object( &connect->hdr ); request->connect = connect; - list_add_head( &connect->hdr.children, &request->hdr.entry ); request->resolve_timeout = connect->session->resolve_timeout; request->connect_timeout = connect->session->connect_timeout; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 8083c4825b..be02bbe250 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3099,6 +3099,7 @@ static void test_websocket(int port) { HINTERNET session, connection, request, socket; DWORD size, len, count, status, index, error; + DWORD_PTR ctx; WCHAR header[32]; char buf[128]; BOOL ret; @@ -3244,10 +3245,28 @@ static void test_websocket(int port) /* Send/Receive on websock */ - WinHttpCloseHandle(request); - WinHttpCloseHandle(socket); - WinHttpCloseHandle(connection); - WinHttpCloseHandle(session); + ret = WinHttpCloseHandle(connection); + ok(ret, "got %u\n", GetLastError()); + + /* request handle is still valid */ + size = sizeof(ctx); + ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpCloseHandle(socket); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpCloseHandle(session); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpCloseHandle(request); + ok(ret, "got %u\n", GetLastError()); } static void test_not_modified(int port) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index af695f86c3..9b07b64b09 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -51,7 +51,6 @@ struct object_header WINHTTP_STATUS_CALLBACK callback; DWORD notify_mask; struct list entry; - struct list children; }; struct hostdata -- 2.20.1

2 1

[PATCH 6/6] winhttp: Send WINHTTP_CALLBACK_STATUS_HANDLE_CREATED notification in WinHttpWebSocketCompleteUpgrade.
by Hans Leidekker 22 Jun '20

22 Jun '20

Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d44baa26c2..0c038289f8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3113,7 +3113,10 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR addref_object( &request->hdr ); socket->request = request; - hsocket = alloc_handle( &socket->hdr ); + if ((hsocket = alloc_handle( &socket->hdr ))) + { + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hsocket, sizeof(hsocket) ); + } release_object( &socket->hdr ); release_object( &request->hdr ); -- 2.20.1

1 0

[PATCH 5/6] winhttp: Set socket notification mask and callback from the parent request.
by Hans Leidekker 22 Jun '20

22 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3129d4154e..d44baa26c2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3106,6 +3106,8 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.type = WINHTTP_HANDLE_TYPE_SOCKET; socket->hdr.vtbl = &socket_vtbl; socket->hdr.refs = 1; + socket->hdr.callback = request->hdr.callback; + socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; addref_object( &request->hdr ); -- 2.20.1

1 0

[PATCH 4/6] winhttp: Pass length in WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER callback
by Hans Leidekker 22 Jun '20

22 Jun '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9b72253a26..3129d4154e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1592,7 +1592,8 @@ static DWORD open_connection( struct request *request ) TRACE("connecting to %s:%u\n", debugstr_w(addressW), port); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); + len = lstrlenW( addressW ) + 1; + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, len ); if ((ret = netconn_create( host, &connect->sockaddr, request->connect_timeout, &netconn ))) { -- 2.20.1

1 0

[PATCH 3/6] winhttp: Make the task queue implementation more generic.
by Hans Leidekker 22 Jun '20

22 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 174 +++++++++++++++++---------------- dlls/winhttp/session.c | 12 ++- dlls/winhttp/winhttp_private.h | 18 ++-- 3 files changed, 109 insertions(+), 95 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1324005f1d..9b72253a26 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -121,27 +121,25 @@ static const WCHAR *attribute_table[] = NULL /* WINHTTP_QUERY_PASSPORT_CONFIG = 78 */ }; -static struct task_header *dequeue_task( struct request *request ) +static struct task_header *dequeue_task( struct queue *queue ) { struct task_header *task; - EnterCriticalSection( &request->task_cs ); - TRACE("%u tasks queued\n", list_count( &request->task_queue )); - task = LIST_ENTRY( list_head( &request->task_queue ), struct task_header, entry ); + EnterCriticalSection( &queue->cs ); + TRACE("%u tasks queued in %p\n", list_count(&queue->tasks), queue); + task = LIST_ENTRY( list_head( &queue->tasks ), struct task_header, entry ); if (task) list_remove( &task->entry ); - LeaveCriticalSection( &request->task_cs ); + LeaveCriticalSection( &queue->cs ); TRACE("returning task %p\n", task); return task; } -static void CALLBACK task_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) +static void CALLBACK run_queue( TP_CALLBACK_INSTANCE *instance, void *ctx ) { - struct request *request = ctx; - HANDLE handles[2]; + struct queue *queue = ctx; + HANDLE handles[] = { queue->wait, queue->cancel }; - handles[0] = request->task_wait; - handles[1] = request->task_cancel; for (;;) { DWORD err = WaitForMultipleObjects( 2, handles, FALSE, INFINITE ); @@ -150,21 +148,19 @@ static void CALLBACK task_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) case WAIT_OBJECT_0: { struct task_header *task; - while ((task = dequeue_task( request ))) + while ((task = dequeue_task( queue ))) { task->proc( task ); - release_object( &task->request->hdr ); + release_object( task->object ); heap_free( task ); } break; } case WAIT_OBJECT_0 + 1: TRACE("exiting\n"); - CloseHandle( request->task_cancel ); - CloseHandle( request->task_wait ); - request->task_cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &request->task_cs ); - request->hdr.vtbl->destroy( &request->hdr ); + CloseHandle( queue->wait ); + CloseHandle( queue->cancel ); + queue->object->vtbl->destroy( queue->object ); return; default: @@ -174,38 +170,43 @@ static void CALLBACK task_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) } } -static DWORD queue_task( struct task_header *task ) +static DWORD start_queue( struct object_header *object, struct queue *queue ) { - struct request *request = task->request; + DWORD ret = ERROR_OUTOFMEMORY; - if (!request->task_wait) + if (queue->wait) return ERROR_SUCCESS; + + queue->object = object; + list_init( &queue->tasks ); + if (!(queue->wait = CreateEventW( NULL, FALSE, FALSE, NULL ))) goto error; + if (!(queue->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ))) goto error; + if (!TrySubmitThreadpoolCallback( run_queue, queue, NULL )) ret = GetLastError(); + else { - if (!(request->task_wait = CreateEventW( NULL, FALSE, FALSE, NULL ))) return ERROR_OUTOFMEMORY; - if (!(request->task_cancel = CreateEventW( NULL, FALSE, FALSE, NULL ))) - { - CloseHandle( request->task_wait ); - request->task_wait = NULL; - return ERROR_OUTOFMEMORY; - } - if (!TrySubmitThreadpoolCallback( task_proc, request, NULL )) - { - CloseHandle( request->task_wait ); - request->task_wait = NULL; - CloseHandle( request->task_cancel ); - request->task_cancel = NULL; - return GetLastError(); - } - request->task_proc_running = TRUE; - InitializeCriticalSection( &request->task_cs ); - request->task_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": request.task_cs"); + queue->proc_running = TRUE; + TRACE("started %p\n", queue); + return ERROR_SUCCESS; } - EnterCriticalSection( &request->task_cs ); - TRACE("queueing task %p\n", task ); - list_add_tail( &request->task_queue, &task->entry ); - LeaveCriticalSection( &request->task_cs ); +error: + CloseHandle( queue->wait ); + queue->wait = NULL; + CloseHandle( queue->cancel ); + queue->cancel = NULL; + return ret; +} + +static DWORD queue_task( struct object_header *object, struct queue *queue, struct task_header *task ) +{ + DWORD ret; + if ((ret = start_queue( object, queue ))) return ret; + + EnterCriticalSection( &queue->cs ); + TRACE("queueing task %p in %p\n", task, queue); + list_add_tail( &queue->tasks, &task->entry ); + LeaveCriticalSection( &queue->cs ); - SetEvent( request->task_wait ); + SetEvent( queue->wait ); return ERROR_SUCCESS; } @@ -2215,8 +2216,10 @@ end: static void task_send_request( struct task_header *task ) { + struct request *request = (struct request *)task->object; struct send_request *s = (struct send_request *)task; - send_request( s->hdr.request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE ); + + send_request( request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE ); heap_free( s->headers ); } @@ -2250,8 +2253,8 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade { struct send_request *s; - if (!(s = heap_alloc( sizeof(struct send_request) ))) return FALSE; - s->hdr.request = request; + if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; + s->hdr.object = &request->hdr; s->hdr.proc = task_send_request; s->headers = strdupW( headers ); s->headers_len = headers_len; @@ -2261,10 +2264,9 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade s->context = context; addref_object( &request->hdr ); - ret = queue_task( (struct task_header *)s ); + ret = queue_task( &request->hdr, &request->queue, (struct task_header *)s ); } - else - ret = send_request( request, headers, headers_len, optional, optional_len, total_len, context, FALSE ); + else ret = send_request( request, headers, headers_len, optional, optional_len, total_len, context, FALSE ); release_object( &request->hdr ); SetLastError( ret ); @@ -2795,8 +2797,8 @@ static DWORD receive_response( struct request *request, BOOL async ) static void task_receive_response( struct task_header *task ) { - struct receive_response *r = (struct receive_response *)task; - receive_response( r->hdr.request, TRUE ); + struct request *request = (struct request *)task->object; + receive_response( request, TRUE ); } /*********************************************************************** @@ -2825,15 +2827,14 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) { struct receive_response *r; - if (!(r = heap_alloc( sizeof(struct receive_response) ))) return FALSE; - r->hdr.request = request; - r->hdr.proc = task_receive_response; + if (!(r = heap_alloc( sizeof(*r) ))) return FALSE; + r->hdr.object = &request->hdr; + r->hdr.proc = task_receive_response; addref_object( &request->hdr ); - ret = queue_task( (struct task_header *)r ); + ret = queue_task( &request->hdr, &request->queue, (struct task_header *)r ); } - else - ret = receive_response( request, FALSE ); + else ret = receive_response( request, FALSE ); release_object( &request->hdr ); SetLastError( ret ); @@ -2875,8 +2876,10 @@ done: static void task_query_data_available( struct task_header *task ) { + struct request *request = (struct request *)task->object; struct query_data *q = (struct query_data *)task; - query_data_available( q->hdr.request, q->available, TRUE ); + + query_data_available( request, q->available, TRUE ); } /*********************************************************************** @@ -2905,16 +2908,15 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) { struct query_data *q; - if (!(q = heap_alloc( sizeof(struct query_data) ))) return FALSE; - q->hdr.request = request; - q->hdr.proc = task_query_data_available; - q->available = available; + if (!(q = heap_alloc( sizeof(*q) ))) return FALSE; + q->hdr.object = &request->hdr; + q->hdr.proc = task_query_data_available; + q->available = available; addref_object( &request->hdr ); - ret = queue_task( (struct task_header *)q ); + ret = queue_task( &request->hdr, &request->queue, (struct task_header *)q ); } - else - ret = query_data_available( request, available, FALSE ); + else ret = query_data_available( request, available, FALSE ); release_object( &request->hdr ); SetLastError( ret ); @@ -2923,8 +2925,10 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) static void task_read_data( struct task_header *task ) { + struct request *request = (struct request *)task->object; struct read_data *r = (struct read_data *)task; - read_data( r->hdr.request, r->buffer, r->to_read, r->read, TRUE ); + + read_data( request, r->buffer, r->to_read, r->read, TRUE ); } /*********************************************************************** @@ -2953,18 +2957,17 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L { struct read_data *r; - if (!(r = heap_alloc( sizeof(struct read_data) ))) return FALSE; - r->hdr.request = request; - r->hdr.proc = task_read_data; - r->buffer = buffer; - r->to_read = to_read; - r->read = read; + if (!(r = heap_alloc( sizeof(*r) ))) return FALSE; + r->hdr.object = &request->hdr; + r->hdr.proc = task_read_data; + r->buffer = buffer; + r->to_read = to_read; + r->read = read; addref_object( &request->hdr ); - ret = queue_task( (struct task_header *)r ); + ret = queue_task( &request->hdr, &request->queue, (struct task_header *)r ); } - else - ret = read_data( request, buffer, to_read, read, FALSE ); + else ret = read_data( request, buffer, to_read, read, FALSE ); release_object( &request->hdr ); SetLastError( ret ); @@ -2995,8 +2998,10 @@ static DWORD write_data( struct request *request, const void *buffer, DWORD to_w static void task_write_data( struct task_header *task ) { + struct request *request = (struct request *)task->object; struct write_data *w = (struct write_data *)task; - write_data( w->hdr.request, w->buffer, w->to_write, w->written, TRUE ); + + write_data( request, w->buffer, w->to_write, w->written, TRUE ); } /*********************************************************************** @@ -3025,18 +3030,17 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write { struct write_data *w; - if (!(w = heap_alloc( sizeof(struct write_data) ))) return FALSE; - w->hdr.request = request; - w->hdr.proc = task_write_data; - w->buffer = buffer; - w->to_write = to_write; - w->written = written; + if (!(w = heap_alloc( sizeof(*w) ))) return FALSE; + w->hdr.object = &request->hdr; + w->hdr.proc = task_write_data; + w->buffer = buffer; + w->to_write = to_write; + w->written = written; addref_object( &request->hdr ); - ret = queue_task( (struct task_header *)w ); + ret = queue_task( &request->hdr, &request->queue, (struct task_header *)w ); } - else - ret = write_data( request, buffer, to_write, written, FALSE ); + else ret = write_data( request, buffer, to_write, written, FALSE ); release_object( &request->hdr ); SetLastError( ret ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index a5ec8b22f3..186b70e4a2 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -578,11 +578,11 @@ static void request_destroy( struct object_header *hdr ) TRACE("%p\n", request); - if (request->task_proc_running) + if (request->queue.proc_running) { /* Signal to the task proc to quit. It will call this again when it does. */ - request->task_proc_running = FALSE; - SetEvent( request->task_cancel ); + request->queue.proc_running = FALSE; + SetEvent( request->queue.cancel ); return; } release_object( &request->connect->hdr ); @@ -613,6 +613,9 @@ static void request_destroy( struct object_header *hdr ) heap_free( request->creds[i][j].password ); } } + + request->queue.cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &request->queue.cs ); heap_free( request ); } @@ -1117,7 +1120,8 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; request->hdr.redirect_policy = connect->hdr.redirect_policy; - list_init( &request->task_queue ); + InitializeCriticalSection( &request->queue.cs ); + request->queue.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": request.queue.cs"); addref_object( &connect->hdr ); request->connect = connect; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 9b07b64b09..207696e674 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -155,6 +155,16 @@ struct authinfo BOOL finished; /* finished authenticating */ }; +struct queue +{ + struct object_header *object; + CRITICAL_SECTION cs; + BOOL proc_running; + HANDLE wait; + HANDLE cancel; + struct list tasks; +}; + enum request_flags { REQUEST_FLAG_WEBSOCKET_UPGRADE = 0x01, @@ -196,11 +206,7 @@ struct request DWORD num_headers; struct authinfo *authinfo; struct authinfo *proxy_authinfo; - HANDLE task_wait; - HANDLE task_cancel; - BOOL task_proc_running; - struct list task_queue; - CRITICAL_SECTION task_cs; + struct queue queue; struct { WCHAR *username; @@ -217,7 +223,7 @@ struct socket struct task_header { struct list entry; - struct request *request; + struct object_header *object; void (*proc)( struct task_header * ); }; -- 2.20.1

1 0

[PATCH 2/6] winhttp: Get rid of some redundant assignments.
by Hans Leidekker 22 Jun '20

22 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 08e9d7584e..1324005f1d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3106,7 +3106,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR addref_object( &request->hdr ); socket->request = request; - if ((hsocket = alloc_handle( &socket->hdr ))) socket->hdr.handle = hsocket; + hsocket = alloc_handle( &socket->hdr ); release_object( &socket->hdr ); release_object( &request->hdr ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 13d228d851..a5ec8b22f3 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -282,8 +282,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST if (bypass && !(session->proxy_bypass = strdupW( bypass ))) goto end; } - if (!(handle = alloc_handle( &session->hdr ))) goto end; - session->hdr.handle = handle; + handle = alloc_handle( &session->hdr ); end: release_object( &session->hdr ); @@ -559,10 +558,10 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hostport = port; if (!set_server_for_hostname( connect, server, port )) goto end; - if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; - connect->hdr.handle = hconnect; - - send_callback( &session->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hconnect, sizeof(hconnect) ); + if ((hconnect = alloc_handle( &connect->hdr ))) + { + send_callback( &session->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hconnect, sizeof(hconnect) ); + } end: release_object( &connect->hdr ); @@ -1137,10 +1136,10 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!(request->version = strdupW( version ))) goto end; if (!(add_accept_types_header( request, types ))) goto end; - if (!(hrequest = alloc_handle( &request->hdr ))) goto end; - request->hdr.handle = hrequest; - - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hrequest, sizeof(hrequest) ); + if ((hrequest = alloc_handle( &request->hdr ))) + { + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hrequest, sizeof(hrequest) ); + } end: release_object( &request->hdr ); -- 2.20.1

1 0

[PATCH 1/4] ntoskrnl/tests: Use the same sin port as ws2_32 tests.
by Paul Gofman 22 Jun '20

22 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.h | 2 ++ dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 4b70046b8e2..3bfc4bd80ac 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -55,3 +55,5 @@ static inline char *drv_strrchr( const char *str, char ch ) do { if (*str == ch) ret = (char *)(ULONG_PTR)str; } while (*str++); return ret; } + +#define SERVER_LISTEN_PORT 9374 diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index fedd5f25c2c..e11879e9e5b 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -243,7 +243,7 @@ static void test_wsk_listen_socket(void) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(12345); + addr.sin_port = htons(SERVER_LISTEN_PORT); IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c53f97e9d19..5555095bd22 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -532,7 +532,7 @@ static DWORD WINAPI wsk_test_thread(void *parameter) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(12345); + addr.sin_port = htons(SERVER_LISTEN_PORT); addr.sin_addr.s_addr = htonl(0x7f000001); ret = connect(s, (struct sockaddr *)&addr, sizeof(addr)); -- 2.26.2

2 4

[PATCH V2 2/2] gdiplus: keep temporary dc from being released.
by Changping Yu 22 Jun '20

22 Jun '20

2 1

Trying to find debian version
by Zesh 22 Jun '20

22 Jun '20

I am trying to install wine and when trying to find my debian version, lsb_release -da says kali-rolling. So does cat /etc/debian_version. Is their another command I can use? On my virtual machine description it says it is running debian x64. Thanks.

2 1

[PATCH 1/2] mfplat: Add IMFVideoMediaType semi-stub.
by Nikolay Sivov 22 Jun '20

22 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 487 +++++++++++++++++++++++++++++++++++++++- dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 480 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index f92577a9cbc..ca806a899f5 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -37,6 +37,7 @@ struct media_type { struct attributes attributes; IMFMediaType IMFMediaType_iface; + IMFVideoMediaType IMFVideoMediaType_iface; }; struct stream_desc @@ -66,11 +67,16 @@ struct presentation_desc static HRESULT presentation_descriptor_init(struct presentation_desc *object, DWORD count); -static inline struct media_type *impl_from_IMFMediaType(IMFMediaType *iface) +static struct media_type *impl_from_IMFMediaType(IMFMediaType *iface) { return CONTAINING_RECORD(iface, struct media_type, IMFMediaType_iface); } +static struct media_type *impl_from_IMFVideoMediaType(IMFVideoMediaType *iface) +{ + return CONTAINING_RECORD(iface, struct media_type, IMFVideoMediaType_iface); +} + static inline struct stream_desc *impl_from_IMFStreamDescriptor(IMFStreamDescriptor *iface) { return CONTAINING_RECORD(iface, struct stream_desc, IMFStreamDescriptor_iface); @@ -413,13 +419,10 @@ static HRESULT WINAPI mediatype_GetMajorType(IMFMediaType *iface, GUID *guid) return attributes_GetGUID(&media_type->attributes, &MF_MT_MAJOR_TYPE, guid); } -static HRESULT WINAPI mediatype_IsCompressedFormat(IMFMediaType *iface, BOOL *compressed) +static HRESULT mediatype_is_compressed(struct media_type *media_type, BOOL *compressed) { - struct media_type *media_type = impl_from_IMFMediaType(iface); UINT32 value; - TRACE("%p, %p.\n", iface, compressed); - if (FAILED(attributes_GetUINT32(&media_type->attributes, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value))) { value = 0; @@ -430,11 +433,19 @@ static HRESULT WINAPI mediatype_IsCompressedFormat(IMFMediaType *iface, BOOL *co return S_OK; } -static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, DWORD *flags) +static HRESULT WINAPI mediatype_IsCompressedFormat(IMFMediaType *iface, BOOL *compressed) +{ + struct media_type *media_type = impl_from_IMFMediaType(iface); + + TRACE("%p, %p.\n", iface, compressed); + + return mediatype_is_compressed(media_type, compressed); +} + +static HRESULT media_type_is_equal(struct media_type *media_type, IMFMediaType *type, DWORD *flags) { const DWORD full_equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA | MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA; - struct media_type *media_type = impl_from_IMFMediaType(iface); struct comparand { IMFAttributes *type; @@ -446,8 +457,6 @@ static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, unsigned int i; BOOL result; - TRACE("%p, %p, %p.\n", iface, type, flags); - *flags = 0; left.type = &media_type->attributes.IMFAttributes_iface; @@ -535,6 +544,15 @@ static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, return *flags == full_equality_flags ? S_OK : S_FALSE; } +static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, DWORD *flags) +{ + struct media_type *media_type = impl_from_IMFMediaType(iface); + + TRACE("%p, %p, %p.\n", iface, type, flags); + + return media_type_is_equal(media_type, type, flags); +} + static HRESULT WINAPI mediatype_GetRepresentation(IMFMediaType *iface, GUID guid, void **representation) { FIXME("%p, %s, %p.\n", iface, debugstr_guid(&guid), representation); @@ -591,6 +609,425 @@ static const IMFMediaTypeVtbl mediatypevtbl = mediatype_FreeRepresentation }; +static HRESULT WINAPI video_mediatype_QueryInterface(IMFVideoMediaType *iface, REFIID riid, void **out) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFVideoMediaType) || + IsEqualIID(riid, &IID_IMFMediaType) || + IsEqualIID(riid, &IID_IMFAttributes) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + IMFVideoMediaType_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI video_mediatype_AddRef(IMFVideoMediaType *iface) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + ULONG refcount = InterlockedIncrement(&media_type->attributes.ref); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI video_mediatype_Release(IMFVideoMediaType *iface) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + ULONG refcount = InterlockedDecrement(&media_type->attributes.ref); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + clear_attributes_object(&media_type->attributes); + heap_free(media_type); + } + + return refcount; +} + +static HRESULT WINAPI video_mediatype_GetItem(IMFVideoMediaType *iface, REFGUID key, PROPVARIANT *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetItem(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_GetItemType(IMFVideoMediaType *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), type); + + return attributes_GetItemType(&media_type->attributes, key, type); +} + +static HRESULT WINAPI video_mediatype_CompareItem(IMFVideoMediaType *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result); + + return attributes_CompareItem(&media_type->attributes, key, value, result); +} + +static HRESULT WINAPI video_mediatype_Compare(IMFVideoMediaType *iface, IMFAttributes *attrs, + MF_ATTRIBUTES_MATCH_TYPE type, BOOL *result) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p, %d, %p.\n", iface, attrs, type, result); + + return attributes_Compare(&media_type->attributes, attrs, type, result); +} + +static HRESULT WINAPI video_mediatype_GetUINT32(IMFVideoMediaType *iface, REFGUID key, UINT32 *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetUINT32(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_GetUINT64(IMFVideoMediaType *iface, REFGUID key, UINT64 *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetUINT64(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_GetDouble(IMFVideoMediaType *iface, REFGUID key, double *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetDouble(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_GetGUID(IMFVideoMediaType *iface, REFGUID key, GUID *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetGUID(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_GetStringLength(IMFVideoMediaType *iface, REFGUID key, UINT32 *length) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), length); + + return attributes_GetStringLength(&media_type->attributes, key, length); +} + +static HRESULT WINAPI video_mediatype_GetString(IMFVideoMediaType *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_attr(key), value, size, length); + + return attributes_GetString(&media_type->attributes, key, value, size, length); +} + +static HRESULT WINAPI video_mediatype_GetAllocatedString(IMFVideoMediaType *iface, REFGUID key, + WCHAR **value, UINT32 *length) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, length); + + return attributes_GetAllocatedString(&media_type->attributes, key, value, length); +} + +static HRESULT WINAPI video_mediatype_GetBlobSize(IMFVideoMediaType *iface, REFGUID key, UINT32 *size) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), size); + + return attributes_GetBlobSize(&media_type->attributes, key, size); +} + +static HRESULT WINAPI video_mediatype_GetBlob(IMFVideoMediaType *iface, REFGUID key, UINT8 *buf, + UINT32 bufsize, UINT32 *blobsize) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_attr(key), buf, bufsize, blobsize); + + return attributes_GetBlob(&media_type->attributes, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI video_mediatype_GetAllocatedBlob(IMFVideoMediaType *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), buf, size); + + return attributes_GetAllocatedBlob(&media_type->attributes, key, buf, size); +} + +static HRESULT WINAPI video_mediatype_GetUnknown(IMFVideoMediaType *iface, REFGUID key, REFIID riid, void **obj) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_guid(riid), obj); + + return attributes_GetUnknown(&media_type->attributes, key, riid, obj); +} + +static HRESULT WINAPI video_mediatype_SetItem(IMFVideoMediaType *iface, REFGUID key, REFPROPVARIANT value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value)); + + return attributes_SetItem(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_DeleteItem(IMFVideoMediaType *iface, REFGUID key) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s.\n", iface, debugstr_attr(key)); + + return attributes_DeleteItem(&media_type->attributes, key); +} + +static HRESULT WINAPI video_mediatype_DeleteAllItems(IMFVideoMediaType *iface) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p.\n", iface); + + return attributes_DeleteAllItems(&media_type->attributes); +} + +static HRESULT WINAPI video_mediatype_SetUINT32(IMFVideoMediaType *iface, REFGUID key, UINT32 value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %u.\n", iface, debugstr_attr(key), value); + + return attributes_SetUINT32(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_SetUINT64(IMFVideoMediaType *iface, REFGUID key, UINT64 value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), wine_dbgstr_longlong(value)); + + return attributes_SetUINT64(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_SetDouble(IMFVideoMediaType *iface, REFGUID key, double value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %f.\n", iface, debugstr_attr(key), value); + + return attributes_SetDouble(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_SetGUID(IMFVideoMediaType *iface, REFGUID key, REFGUID value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); + + return attributes_SetGUID(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_SetString(IMFVideoMediaType *iface, REFGUID key, const WCHAR *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_w(value)); + + return attributes_SetString(&media_type->attributes, key, value); +} + +static HRESULT WINAPI video_mediatype_SetBlob(IMFVideoMediaType *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p, %u.\n", iface, debugstr_attr(key), buf, size); + + return attributes_SetBlob(&media_type->attributes, key, buf, size); +} + +static HRESULT WINAPI video_mediatype_SetUnknown(IMFVideoMediaType *iface, REFGUID key, IUnknown *unknown) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), unknown); + + return attributes_SetUnknown(&media_type->attributes, key, unknown); +} + +static HRESULT WINAPI video_mediatype_LockStore(IMFVideoMediaType *iface) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p.\n", iface); + + return attributes_LockStore(&media_type->attributes); +} + +static HRESULT WINAPI video_mediatype_UnlockStore(IMFVideoMediaType *iface) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p.\n", iface); + + return attributes_UnlockStore(&media_type->attributes); +} + +static HRESULT WINAPI video_mediatype_GetCount(IMFVideoMediaType *iface, UINT32 *count) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p.\n", iface, count); + + return attributes_GetCount(&media_type->attributes, count); +} + +static HRESULT WINAPI video_mediatype_GetItemByIndex(IMFVideoMediaType *iface, UINT32 index, GUID *key, PROPVARIANT *value) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %u, %p, %p.\n", iface, index, key, value); + + return attributes_GetItemByIndex(&media_type->attributes, index, key, value); +} + +static HRESULT WINAPI video_mediatype_CopyAllItems(IMFVideoMediaType *iface, IMFAttributes *dest) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p.\n", iface, dest); + + return attributes_CopyAllItems(&media_type->attributes, dest); +} + +static HRESULT WINAPI video_mediatype_GetMajorType(IMFVideoMediaType *iface, GUID *guid) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p.\n", iface, guid); + + return attributes_GetGUID(&media_type->attributes, &MF_MT_MAJOR_TYPE, guid); +} + +static HRESULT WINAPI video_mediatype_IsCompressedFormat(IMFVideoMediaType *iface, BOOL *compressed) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p.\n", iface, compressed); + + return mediatype_is_compressed(media_type, compressed); +} + +static HRESULT WINAPI video_mediatype_IsEqual(IMFVideoMediaType *iface, IMFMediaType *type, DWORD *flags) +{ + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + + TRACE("%p, %p, %p.\n", iface, type, flags); + + return media_type_is_equal(media_type, type, flags); +} + +static HRESULT WINAPI video_mediatype_GetRepresentation(IMFVideoMediaType *iface, GUID guid, void **representation) +{ + FIXME("%p, %s, %p.\n", iface, debugstr_guid(&guid), representation); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mediatype_FreeRepresentation(IMFVideoMediaType *iface, GUID guid, void *representation) +{ + FIXME("%p, %s, %p.\n", iface, debugstr_guid(&guid), representation); + + return E_NOTIMPL; +} + +static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMediaType *iface) +{ + FIXME("%p.\n", iface); + + return NULL; +} + +static HRESULT WINAPI video_mediatype_GetVideoRepresentation(IMFVideoMediaType *iface, GUID representation, + void **data, LONG stride) +{ + FIXME("%p, %s, %p, %d.\n", iface, debugstr_guid(&representation), data, stride); + + return E_NOTIMPL; +} + +static const IMFVideoMediaTypeVtbl videomediatypevtbl = +{ + video_mediatype_QueryInterface, + video_mediatype_AddRef, + video_mediatype_Release, + video_mediatype_GetItem, + video_mediatype_GetItemType, + video_mediatype_CompareItem, + video_mediatype_Compare, + video_mediatype_GetUINT32, + video_mediatype_GetUINT64, + video_mediatype_GetDouble, + video_mediatype_GetGUID, + video_mediatype_GetStringLength, + video_mediatype_GetString, + video_mediatype_GetAllocatedString, + video_mediatype_GetBlobSize, + video_mediatype_GetBlob, + video_mediatype_GetAllocatedBlob, + video_mediatype_GetUnknown, + video_mediatype_SetItem, + video_mediatype_DeleteItem, + video_mediatype_DeleteAllItems, + video_mediatype_SetUINT32, + video_mediatype_SetUINT64, + video_mediatype_SetDouble, + video_mediatype_SetGUID, + video_mediatype_SetString, + video_mediatype_SetBlob, + video_mediatype_SetUnknown, + video_mediatype_LockStore, + video_mediatype_UnlockStore, + video_mediatype_GetCount, + video_mediatype_GetItemByIndex, + video_mediatype_CopyAllItems, + video_mediatype_GetMajorType, + video_mediatype_IsCompressedFormat, + video_mediatype_IsEqual, + video_mediatype_GetRepresentation, + video_mediatype_FreeRepresentation, + video_mediatype_GetVideoFormat, + video_mediatype_GetVideoRepresentation, +}; + /*********************************************************************** * MFCreateMediaType (mfplat.@) */ @@ -2171,3 +2608,35 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA return hr; } + +/*********************************************************************** + * MFCreateVideoMediaTypeFromSubtype (mfplat.@) + */ +HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMediaType **media_type) +{ + struct media_type *object; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(subtype), media_type); + + if (!media_type) + return E_INVALIDARG; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + object->IMFVideoMediaType_iface.lpVtbl = &videomediatypevtbl; + + IMFVideoMediaType_SetGUID(&object->IMFVideoMediaType_iface, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + IMFVideoMediaType_SetGUID(&object->IMFVideoMediaType_iface, &MF_MT_SUBTYPE, subtype); + + *media_type = &object->IMFVideoMediaType_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index a1833312fc1..01f9efaecaa 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -76,7 +76,7 @@ @ stub MFCreateVideoMediaType @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader @ stub MFCreateVideoMediaTypeFromBitMapInfoHeaderEx -@ stub MFCreateVideoMediaTypeFromSubtype +@ stdcall MFCreateVideoMediaTypeFromSubtype(ptr ptr) @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader @ stdcall MFCreateWaveFormatExFromMFMediaType(ptr ptr ptr long) diff --git a/include/mfapi.h b/include/mfapi.h index 05ada65b9db..4da25341c68 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -510,6 +510,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR const PROPVARIANT *value, IMFMediaEvent **event); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); +HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMediaType **media_type); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); -- 2.27.0

1 1

[PATCH 1/2] gdiplus: Simplify modulo 8 math used for rendering origin.
by Jeff Smith 22 Jun '20

22 Jun '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- Supersedes uncommitted portions of 187295 and 187296. dlls/gdiplus/graphics.c | 10 +++++----- dlls/gdiplus/tests/brush.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6619be9b58..4b141e19b6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -159,8 +159,8 @@ static HBITMAP create_hatch_bitmap(const GpHatch *hatch, INT origin_x, INT origi * degree of shading needed. */ for (y = 0; y < 8; y++) { - const int hy = (((y + origin_y) % 8) + 8) % 8; - const int hx = ((origin_x % 8) + 8) % 8; + const int hy = (y + origin_y) & 7; + const int hx = origin_x & 7; unsigned int row = (0x10101 * hatch_data[hy]) >> hx; for (x = 0; x < 8; x++, row >>= 1) @@ -1198,13 +1198,13 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, /* See create_hatch_bitmap for an explanation of how index is derived. */ for (y = 0; y < fill_area->Height; y++, argb_pixels += cdwStride) { - const int hy = (7 - ((y + fill_area->Y - graphics->origin_y) % 8)) % 8; - const int hx = ((graphics->origin_x % 8) + 8) % 8; + const int hy = ~(y + fill_area->Y - graphics->origin_y) & 7; + const int hx = graphics->origin_x & 7; const unsigned int row = (0x10101 * hatch_data[hy]) >> hx; for (x = 0; x < fill_area->Width; x++) { - const unsigned int srow = row >> (7 - ((x + fill_area->X) % 8)); + const unsigned int srow = row >> (~(x + fill_area->X) & 7); int index; if (hatch_data[8]) index = (srow & 1) ? 2 : (srow & 0x82) ? 1 : 0; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 5d5280c7f9..78939e6899 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1814,8 +1814,8 @@ static void test_renderingOrigin(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { - const INT exp_x = ((tests[i][0] % 8) + 8) % 8; - const INT exp_y = ((tests[i][1] % 8) + 8) % 8; + const INT exp_x = tests[i][0] & 7; + const INT exp_y = tests[i][1] & 7; status = GdipSetRenderingOrigin(graphics_image, tests[i][0], tests[i][1]); expect(Ok, status); -- 2.23.0

3 8

[PATCH v2] windowscodecs/tests: Format ok() message for tests/ddsformat.c.
by Ziqing Hui 22 Jun '20

22 Jun '20

v2: Fix a typo. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 223 ++++++++++++++------------- 1 file changed, 113 insertions(+), 110 deletions(-)

2 1

[PATCH 1/2] gdiplus/tests: Add GDI/GDI+ graphics interop test.
by Shawn M. Chapla 22 Jun '20

22 Jun '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/graphics.c | 92 +++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f2ff589ab5..7040327e67 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6792,6 +6792,97 @@ static void test_hdc_caching(void) DeleteObject(hbm); } +static void test_gdi_interop(void) +{ + GpBitmap *bitmap; + GpGraphics *graphics; + GpMatrix *transform; + GpBrush *brush; + GpStatus stat; + HDC hdc; + HBRUSH hbrush, holdbrush; + ARGB color; + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + stat = GdipCreateMatrix(&transform); + expect(Ok, stat); + + stat = GdipSetMatrixElements(transform, 1.0, 0.0, 0.0, 1.0, 50.0, 50.0); + expect(Ok, stat); + + /* GDI+: Set world transform. Should not matter to GDI. */ + stat = GdipSetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &hdc); + expect(Ok, stat); + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(hdc, hbrush); + + /* GDI: Draw a rectangle at physical coords (5, 5) to (12, 10). */ + Rectangle(hdc, 5, 5, 12, 10); + + holdbrush = SelectObject(hdc, holdbrush); + + /* GDI: Set view port origin. Should not matter to GDI+. */ + SetViewportOrgEx(hdc, 20, 20, NULL); + + GdipReleaseDC(graphics, hdc); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + /* GDI+: Draw a rectangle at physical coords (85, 85) to (88, 95). */ + stat = GdipFillRectangleI(graphics, brush, 35, 35, 3, 10); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &hdc); + expect(Ok, stat); + + holdbrush = SelectObject(hdc, hbrush); + + /* GDI: Draw a rectangle at physical coords (25, 25) to (30, 34). + Updated view port origin should still be in effect. */ + Rectangle(hdc, 5, 5, 10, 14); + + SelectObject(hdc, holdbrush); + + DeleteObject(hbrush); + stat = GdipReleaseDC(graphics, hdc); + expect(Ok, stat); + + stat = GdipDeleteMatrix(transform); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 6, 6, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 26, 26, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 86, 86, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6885,6 +6976,7 @@ START_TEST(graphics) test_GdipGraphicsSetAbort(); test_cliphrgn_transform(); test_hdc_caching(); + test_gdi_interop(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd ); -- 2.27.0

2 3

[PATCH V2 1/2] gdiplus/tests: Add Gdip{Get, Release}DC more test.
by Changping Yu 22 Jun '20

22 Jun '20

1 0

[PATCH] msxml3: Add support for loading document from relative URL provided by hosting site.
by Dmitry Timoshkov 22 Jun '20

22 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 86 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 76d3fdb601..390644d5da 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -41,6 +41,9 @@ #include "ole2.h" #include "olectl.h" #include "msxml6.h" +#include "mshtml.h" +#include "docobj.h" +#include "urlmon.h" #include "wininet.h" #include "winreg.h" #include "shlwapi.h" @@ -2155,16 +2158,78 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) return E_FAIL; } -static HRESULT domdoc_load_moniker(domdoc *This, IMoniker *mon) +static HRESULT domdoc_load_file(domdoc *This, LPWSTR filename, IUri **uri) { + IMoniker *mon, *base_mon = NULL; bsc_t *bsc; HRESULT hr; - hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); - if(FAILED(hr)) - return hr; + if (This->site) + { + BSTR base_url = NULL; + IXMLDOMDocument *doc; + IHTMLDocument2 *doc2; + IOleClientSite *site; + IServiceProvider *sp; - return detach_bsc(bsc); + if (IUnknown_QueryInterface(This->site, &IID_IXMLDOMDocument, (void **)&doc) == S_OK) + { + IXMLDOMDocument_get_url(doc, &base_url); + IXMLDOMDocument_Release(doc); + } + else if (IUnknown_QueryInterface(This->site, &IID_IHTMLDocument2, (void **)&doc2) == S_OK) + { + IHTMLDocument2_get_URL(doc2, &base_url); + IHTMLDocument2_Release(doc2); + } + else if (IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void **)&sp) == S_OK) + { + if (IServiceProvider_QueryService(sp, &SID_SContainerDispatch, &IID_IXMLDOMDocument, (void **)&doc) == S_OK) + { + IXMLDOMDocument_get_url(doc, &base_url); + IXMLDOMDocument_Release(doc); + } + else if (IServiceProvider_QueryService(sp, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void **)&doc2) == S_OK) + { + IHTMLDocument2_get_URL(doc2, &base_url); + IHTMLDocument2_Release(doc2); + } + IServiceProvider_Release(sp); + } + else if (IUnknown_QueryInterface(This->site, &IID_IOleClientSite, (void **)&site) == S_OK) + { + FIXME("IID_IOleClientSite => %p\n", site); + IOleClientSite_Release(site); + } + + if (base_url) + { + TRACE("base_url: %s\n", debugstr_w(base_url)); + CreateURLMonikerEx(NULL, base_url, &base_mon, 0); + SysFreeString(base_url); + } + } + + if (base_mon) /* look for file starting from base URL */ + hr = CreateUri(filename, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); + else /* look for file in the PATH */ + hr = create_uri(filename, uri); + if (hr == S_OK) + { + hr = CreateURLMonikerEx2(base_mon, *uri, &mon, 0); + if (hr == S_OK) + { + hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); + if (hr == S_OK) + hr = detach_bsc(bsc); + IMoniker_Release(mon); + } + } + + if (base_mon) + IMoniker_Release(base_mon); + + return hr; } static HRESULT WINAPI domdoc_load( @@ -2293,7 +2358,6 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { IUri *uri = NULL; - IMoniker *mon; if (This->properties->uri) { @@ -2301,15 +2365,7 @@ static HRESULT WINAPI domdoc_load( This->properties->uri = NULL; } - hr = create_uri(filename, &uri); - if (SUCCEEDED(hr)) - hr = CreateURLMonikerEx2(NULL, uri, &mon, 0); - if ( SUCCEEDED(hr) ) - { - hr = domdoc_load_moniker( This, mon ); - IMoniker_Release(mon); - } - + hr = domdoc_load_file(This, filename, &uri); if (SUCCEEDED(hr)) { get_doc(This)->name = (char *)xmlchar_from_wcharn(filename, -1, TRUE); -- 2.26.2

2 1

[PATCH v5 1/2] user32/tests:Add test function Used to verify the child window Z order problem.【请注意，邮件由wine-devel-bounces@winehq.org代发】
by Jiajin Cui 22 Jun '20

22 Jun '20

I found that the z-order of window on WIN system will not change when HWND_TOPMOST and HWND_NOTOPMOST attributes are set for the same level window with WS_CHILD style, but it will change in wine, resulting in the problem of overlapping window, so I wrote a test function to explain this problem. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[PATCH v5 1/2], and optimize fixup_flags[PATCH v5 2/2]. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com>

2 1

[PATCH] msxml3: Add support for 'int' in IXMLDOMElement_put_dataType.
by Hans Leidekker 22 Jun '20

22 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msxml3/element.c | 1 + dlls/msxml3/tests/domdoc.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 0ff26e4fb7..ecebd39fea 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -847,6 +847,7 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( { /* for untyped node coerce to BSTR and set */ case DT_INVALID: + case DT_INT: if (V_VT(&value) != VT_BSTR) { VARIANT content; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a6acdba366..49768b8dbe 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8541,6 +8541,33 @@ static void test_put_nodeTypedValue(void) "got %s, expected \"1\"\n", wine_dbgstr_w(V_BSTR(&type))); VariantClear(&type); + /* int */ + hr = IXMLDOMElement_put_dataType(elem, _bstr_("int")); + EXPECT_HR(hr, S_OK); + + V_VT(&value) = VT_BSTR; + V_BSTR(&value) = _bstr_("1"); + hr = IXMLDOMElement_put_nodeTypedValue(elem, value); + EXPECT_HR(hr, S_OK); + VariantClear(&value); + + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMElement_get_nodeTypedValue(elem, &value); + EXPECT_HR(hr, S_OK); + ok(V_VT(&value) == VT_I4, "got %d\n", V_VT(&value)); + ok(V_I4(&value) == 1, "got %d\n", V_I4(&value)); + + V_VT(&value) = VT_I2; + V_I2(&value) = -1; + hr = IXMLDOMElement_put_nodeTypedValue(elem, value); + EXPECT_HR(hr, S_OK); + + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMElement_get_nodeTypedValue(elem, &value); + EXPECT_HR(hr, S_OK); + ok(V_VT(&value) == VT_I4, "got %d\n", V_VT(&value)); + ok(V_I4(&value) == -1, "got %d\n", V_I4(&value)); + hr = IXMLDOMElement_get_firstChild(elem, &node); EXPECT_HR(hr, S_OK); hr = IXMLDOMElement_removeChild(elem, node, NULL); -- 2.20.1

2 1

[PATCH v5 2/2] user32:Fix z order error when WS_CHILD window want to be topmost windows.
by Jiajin Cui 22 Jun '20

22 Jun '20

Window with WS_CHILD does not need to change Z order when SetWindowPos param hwndInsertAfter is HWND_TOPMOST or HWND_NOTOPMOST. Solve the problems mentioned in the previous patch, and Remove todo_wine on test_child_topmost_zorder. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[PATCH v5 1/2], and optimize fixup_flags[PATCH v5 2/2]. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com>

2 1

[PATCH] user32: Fix store the surface rectangle in the server.
by Chao Long 22 Jun '20

22 Jun '20

2 1

[PATCH 1/3] dxva2: Add device manager stub.
by Nikolay Sivov 22 Jun '20

22 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/dxva2/Makefile.in | 1 + dlls/dxva2/main.c | 147 +++++++++++++++++++++++++++- dlls/dxva2/tests/Makefile.in | 5 + dlls/dxva2/tests/dxva2.c | 181 +++++++++++++++++++++++++++++++++++ 6 files changed, 332 insertions(+), 4 deletions(-) create mode 100644 dlls/dxva2/tests/Makefile.in create mode 100644 dlls/dxva2/tests/dxva2.c diff --git a/configure b/configure index dd23b5ab13b..106ce1625b1 100755 --- a/configure +++ b/configure @@ -20683,6 +20683,7 @@ wine_fn_config_makefile dlls/dxgi enable_dxgi wine_fn_config_makefile dlls/dxgi/tests enable_tests wine_fn_config_makefile dlls/dxguid enable_dxguid wine_fn_config_makefile dlls/dxva2 enable_dxva2 +wine_fn_config_makefile dlls/dxva2/tests enable_tests wine_fn_config_makefile dlls/esent enable_esent wine_fn_config_makefile dlls/evr enable_evr wine_fn_config_makefile dlls/evr/tests enable_tests diff --git a/configure.ac b/configure.ac index 9c5f76669df..a78610c6490 100644 --- a/configure.ac +++ b/configure.ac @@ -3269,6 +3269,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) WINE_CONFIG_MAKEFILE(dlls/dxguid) WINE_CONFIG_MAKEFILE(dlls/dxva2) +WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) WINE_CONFIG_MAKEFILE(dlls/esent) WINE_CONFIG_MAKEFILE(dlls/evr) WINE_CONFIG_MAKEFILE(dlls/evr/tests) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index 44e125e9b5f..cc7551a186b 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -1,4 +1,5 @@ MODULE = dxva2.dll +IMPORTS = uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 782f0dfa3d4..e1eb2128439 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -16,19 +16,144 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "d3d9.h" -#include "dxva2api.h" #include "physicalmonitorenumerationapi.h" #include "lowlevelmonitorconfigurationapi.h" #include "highlevelmonitorconfigurationapi.h" +#include "initguid.h" +#include "dxva2api.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dxva2); +struct device_manager +{ + IDirect3DDeviceManager9 IDirect3DDeviceManager9_iface; + LONG refcount; + + UINT token; +}; + +static struct device_manager *impl_from_IDirect3DDeviceManager9(IDirect3DDeviceManager9 *iface) +{ + return CONTAINING_RECORD(iface, struct device_manager, IDirect3DDeviceManager9_iface); +} + +static HRESULT WINAPI device_manager_QueryInterface(IDirect3DDeviceManager9 *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(&IID_IDirect3DDeviceManager9, riid) || + IsEqualIID(&IID_IUnknown, riid)) + { + *obj = iface; + IDirect3DDeviceManager9_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI device_manager_AddRef(IDirect3DDeviceManager9 *iface) +{ + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + ULONG refcount = InterlockedIncrement(&manager->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) +{ + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + ULONG refcount = InterlockedDecrement(&manager->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(manager); + } + + return refcount; +} + +static HRESULT WINAPI device_manager_ResetDevice(IDirect3DDeviceManager9 *iface, IDirect3DDevice9 *device, + UINT token) +{ + FIXME("%p, %p, %#x.\n", iface, device, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_OpenDeviceHandle(IDirect3DDeviceManager9 *iface, HANDLE *hdevice) +{ + FIXME("%p, %p.\n", iface, hdevice); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_CloseDeviceHandle(IDirect3DDeviceManager9 *iface, HANDLE hdevice) +{ + FIXME("%p, %p.\n", iface, hdevice); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_TestDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice) +{ + FIXME("%p, %p.\n", iface, hdevice); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_LockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, + IDirect3DDevice9 **device, BOOL block) +{ + FIXME("%p, %p, %p, %d.\n", iface, hdevice, device, block); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_UnlockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, BOOL savestate) +{ + FIXME("%p, %p, %d.\n", iface, hdevice, savestate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_GetVideoService(IDirect3DDeviceManager9 *iface, HANDLE hdevice, REFIID riid, + void **obj) +{ + FIXME("%p, %p, %s, %p.\n", iface, hdevice, debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IDirect3DDeviceManager9Vtbl device_manager_vtbl = +{ + device_manager_QueryInterface, + device_manager_AddRef, + device_manager_Release, + device_manager_ResetDevice, + device_manager_OpenDeviceHandle, + device_manager_CloseDeviceHandle, + device_manager_TestDevice, + device_manager_LockDevice, + device_manager_UnlockDevice, + device_manager_GetVideoService, +}; + BOOL WINAPI CapabilitiesRequestAndCapabilitiesReply( HMONITOR monitor, LPSTR buffer, DWORD length ) { FIXME("(%p, %p, %d): stub\n", monitor, buffer, length); @@ -37,11 +162,25 @@ BOOL WINAPI CapabilitiesRequestAndCapabilitiesReply( HMONITOR monitor, LPSTR buf return FALSE; } -HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9( UINT *resetToken, IDirect3DDeviceManager9 **dxvManager ) +HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceManager9 **manager) { - FIXME("(%p, %p): stub\n", resetToken, dxvManager); + struct device_manager *object; - return E_NOTIMPL; + TRACE("%p, %p.\n", token, manager); + + *manager = NULL; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IDirect3DDeviceManager9_iface.lpVtbl = &device_manager_vtbl; + object->refcount = 1; + object->token = GetTickCount(); + + *token = object->token; + *manager = &object->IDirect3DDeviceManager9_iface; + + return S_OK; } HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *device, REFIID riid, void **ppv ) diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in new file mode 100644 index 00000000000..c86c5ab42fc --- /dev/null +++ b/dlls/dxva2/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dxva2.dll +IMPORTS = dxva2 user32 d3d9 + +C_SRCS = \ + dxva2.c diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c new file mode 100644 index 00000000000..cbcad40ca59 --- /dev/null +++ b/dlls/dxva2/tests/dxva2.c @@ -0,0 +1,181 @@ +/* + * Copyright 2020 Nikolay Sivov + * + * 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 "wine/test.h" +#include "d3d9.h" + +#include "initguid.h" +#include "dxva2api.h" + +static int get_refcount(IUnknown *object) +{ + IUnknown_AddRef(object); + return IUnknown_Release(object); +} + +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device = NULL; + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = focus_window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + + return device; +} + +static void test_device_manager(void) +{ + IDirectXVideoProcessorService *processor_service; + IDirect3DDevice9 *device, *device2; + IDirect3DDeviceManager9 *manager; + int refcount, refcount2; + HANDLE handle, handle1; + IDirect3D9 *d3d; + HWND window; + UINT token; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); +todo_wine + ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + /* Invalid token. */ + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token + 1); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + refcount = get_refcount((IUnknown *)device); + + handle1 = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + refcount2 = get_refcount((IUnknown *)device); + ok(refcount2 == refcount, "Unexpected refcount %d.\n", refcount); + + handle = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(handle != handle1, "Unexpected handle.\n"); +} + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Already closed. */ + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); +todo_wine + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + + handle = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle1); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_TestDevice(manager, handle1); +todo_wine + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + + handle = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + handle1 = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, + (void **)&processor_service); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectXVideoProcessorService_Release(processor_service); + + device2 = create_device(d3d, window); + hr = IDirect3DDeviceManager9_ResetDevice(manager, device2, token); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, + (void **)&processor_service); +todo_wine + ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_TestDevice(manager, handle); +todo_wine + ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + + IDirect3DDevice9_Release(device); + IDirect3DDevice9_Release(device2); + + IDirect3DDeviceManager9_Release(manager); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + +START_TEST(dxva2) +{ + test_device_manager(); +} -- 2.27.0

1 2

[PATCH v5 1/2] user32/tests:Add test function Used to verify the child window Z order problem.
by Jiajin Cui 22 Jun '20

22 Jun '20

I found that the z-order of window on WIN system will not change when HWND_TOPMOST and HWND_NOTOPMOST attributes are set for the same level window with WS_CHILD style, but it will change in wine, resulting in the problem of overlapping window, so I wrote a test function to explain this problem. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[PATCH v5 1/2], and optimize fixup_flags[PATCH v5 2/2]. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com>

2 1

[PATCH v5 2/2] user32:Fix z order error when WS_CHILD window want to be topmost windows.
by cuijiajin 22 Jun '20

22 Jun '20

window with WS_CHILD does not need to change Z order when SetWindowPos param hwndInsertAfter is HWND_TOPMOST or HWND_NOTOPMOST. Solve the problems mentioned in the previous patch, and Remove todo_wine on test_child_topmost_zorder. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[patch v5 1/2], and optimize fixup_flags[patch v5 2/2]. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com>

2 1

[PATCH] user32: Fix store the surface rectangle in the server
by longchao 22 Jun '20

22 Jun '20

2 1

[PATCH v5 1/2] user32/tests:Add test function Used to verify the child window Z order problem.
by cuijiajin 22 Jun '20

22 Jun '20

I found that the z-order of window on WIN system will not change when HWND_TOPMOST and HWND_NOTOPMOST attributes are set for the same level window with WS_CHILD style, but it will change in wine, resulting in the problem of overlapping window, so I wrote a test function to explain this problem. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. v5: Add todo_wine to test patch[patch v5 1/2], and optimize fixup_flags[patch v5 2/2]. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com>

2 1

[PATCH] ieframe/tests: Add some tests for Shell Embedding resizing.
by Dmitry Timoshkov 22 Jun '20

22 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/tests/webbrowser.c | 84 ++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 95d5fc4988..9d8a4fc63d 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1832,7 +1832,9 @@ static HWND create_container_window(void) static void test_DoVerb(IWebBrowser2 *unk) { IOleObject *oleobj; - RECT rect = {0,0,1000,1000}; + IOleWindow *olewin; + HWND hwnd; + RECT rect; HRESULT hres; hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); @@ -1840,6 +1842,12 @@ static void test_DoVerb(IWebBrowser2 *unk) if(FAILED(hres)) return; + hres = IOleObject_QueryInterface(oleobj, &IID_IOleWindow, (void**)&olewin); + ok(hres == S_OK, "Could not get IOleInPlaceSite: %08x\n", hres); + + hres = IOleWindow_GetWindow(olewin, &hwnd); + ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + SET_EXPECT(CanInPlaceActivate); SET_EXPECT(Site_GetWindow); SET_EXPECT(OnInPlaceActivate); @@ -1853,10 +1861,16 @@ static void test_DoVerb(IWebBrowser2 *unk) SET_EXPECT(SetMenu); SET_EXPECT(OnFocus_TRUE); + SetRect(&rect, 0, 0, 500, 500); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + SetRectEmpty(&rect); + GetWindowRect(hwnd, &rect); + ok(rect.right - rect.left == 1000 && rect.bottom - rect.top == 900, "window size = {%d %d}\n", + rect.right - rect.left, rect.bottom - rect.top); + CHECK_CALLED(CanInPlaceActivate); CHECK_CALLED(Site_GetWindow); CHECK_CALLED(OnInPlaceActivate); @@ -1870,10 +1884,27 @@ static void test_DoVerb(IWebBrowser2 *unk) CHECK_CALLED(SetMenu); CHECK_CALLED(OnFocus_TRUE); + SetRect(&rect, 0, 0, 600, 600); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + SetRectEmpty(&rect); + GetWindowRect(hwnd, &rect); + ok(rect.right - rect.left == 1000 && rect.bottom - rect.top == 900, "window size = {%d %d}\n", + rect.right - rect.left, rect.bottom - rect.top); + + SetRect(&rect, 0, 0, 700, 700); + hres = IOleObject_DoVerb(oleobj, OLEIVERB_UIACTIVATE, NULL, &ClientSite, + 0, (HWND)0xdeadbeef, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + + SetRectEmpty(&rect); + GetWindowRect(hwnd, &rect); + ok(rect.right - rect.left == 1000 && rect.bottom - rect.top == 900, "window size = {%d %d}\n", + rect.right - rect.left, rect.bottom - rect.top); + + IOleWindow_Release(olewin); IOleObject_Release(oleobj); } @@ -2649,14 +2680,18 @@ static void test_GetControlInfo(IWebBrowser2 *unk) IOleControl_Release(control); } -static void test_Extent(IWebBrowser2 *unk) +static void test_Extent(IWebBrowser2 *unk, BOOL activated) { IOleObject *oleobj; + IOleWindow *olewin; SIZE size, expected; + RECT rc; HRESULT hres; DWORD dpi_x; DWORD dpi_y; HDC hdc; + HWND hwnd; + char buf[256]; /* default aspect ratio is 96dpi / 96dpi */ hdc = GetDC(0); @@ -2671,15 +2706,41 @@ static void test_Extent(IWebBrowser2 *unk) if(FAILED(hres)) return; + hres = IOleObject_QueryInterface(oleobj, &IID_IOleWindow, (void**)&olewin); + ok(hres == S_OK, "Could not get IOleInPlaceSite: %08x\n", hres); + + hres = IOleWindow_GetWindow(olewin, &hwnd); + ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + + buf[0] = 0; + GetClassNameA(hwnd, buf, sizeof(buf)); + ok(!strcmp(buf, "Shell Embedding"), "got %s\n", buf); + size.cx = size.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &size); ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - /* Default size is 50x20 pixels, in himetric units */ - expected.cx = MulDiv( 50, 2540, dpi_x ); - expected.cy = MulDiv( 20, 2540, dpi_y ); + if(activated) { + /* FIXME: what is 300x150 coming from? */ + expected.cx = MulDiv( 300, 2540, dpi_x ); + expected.cy = MulDiv( 150, 2540, dpi_y ); + }else { + /* Default size is 50x20 pixels, in himetric units */ + expected.cx = MulDiv( 50, 2540, dpi_x ); + expected.cy = MulDiv( 20, 2540, dpi_y ); + } +todo_wine_if(activated) ok(size.cx == expected.cx && size.cy == expected.cy, "size = {%d %d} (expected %d %d)\n", size.cx, size.cy, expected.cx, expected.cy ); + SetRectEmpty(&rc); + GetWindowRect(hwnd, &rc); + if(activated) + /* window size should match what was set by last ::SetExtent() before activation */ + ok(rc.right - rc.left == 1000 && rc.bottom - rc.top == 900, "window size = {%d %d}\n", + rc.right - rc.left, rc.bottom - rc.top); + else + ok(IsRectEmpty(&rc), "window size = {%d %d}\n", rc.right - rc.left, rc.bottom - rc.top); + size.cx = 800; size.cy = 700; hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &size); @@ -2695,6 +2756,15 @@ static void test_Extent(IWebBrowser2 *unk) ok(hres == S_OK, "GetExtent failed: %08x\n", hres); ok(size.cx == 800 && size.cy == 700, "size = {%d %d}\n", size.cx, size.cy); + SetRectEmpty(&rc); + GetWindowRect(hwnd, &rc); + if(activated) + /* window size should match what was set by last ::SetExtent() before activation */ + ok(rc.right - rc.left == 1000 && rc.bottom - rc.top == 900, "window size = {%d %d}\n", + rc.right - rc.left, rc.bottom - rc.top); + else + ok(IsRectEmpty(&rc), "window size = {%d %d}\n", rc.right - rc.left, rc.bottom - rc.top); + size.cx = 900; size.cy = 800; hres = IOleObject_SetExtent(oleobj, 0, &size); @@ -2725,6 +2795,7 @@ static void test_Extent(IWebBrowser2 *unk) ok(hres == S_OK, "GetExtent failed: %08x\n", hres); ok(size.cx == 1000 && size.cy == 900, "size = {%d %d}\n", size.cx, size.cy); + IOleWindow_Release(olewin); IOleObject_Release(oleobj); } @@ -3754,9 +3825,10 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_LocationURL(webbrowser, L""); test_ConnectionPoint(webbrowser, TRUE); test_ClientSite(webbrowser, &ClientSite, !do_download); - test_Extent(webbrowser); + test_Extent(webbrowser, FALSE); test_wb_funcs(webbrowser, TRUE); test_DoVerb(webbrowser); + test_Extent(webbrowser, TRUE); test_olecmd(webbrowser, FALSE); test_Navigate2(webbrowser, L"about:blank"); test_QueryStatusWB(webbrowser, TRUE); -- 2.26.2

1 0

[PATH] user32: Fix store the surface rectangle in the server
by longchao＠uniontech.com 22 Jun '20

22 Jun '20

-------------- longchao(a)uniontech.com

2 1

[PATCH 1/2] include: Correct definition of PRTL_AVL_ALLOCATE_ROUTINE
by Alex Henrie 22 Jun '20

22 Jun '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/ddk/ntddk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index b9f8295db8..497d42da39 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -165,7 +165,7 @@ typedef enum _RTL_GENERIC_COMPARE_RESULTS { typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); -typedef void (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); +typedef void * (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); typedef void (WINAPI *PRTL_AVL_FREE_ROUTINE )(struct _RTL_AVL_TABLE *, void *buffer); -- 2.27.0

1 1

[PATH] user32: Fix store the surface rectangle in the server
by 龙超 22 Jun '20

22 Jun '20

2 1

[PATCH 1/6] kernel32/tests: Add tests for profile struct functions.
by Zebediah Figura 22 Jun '20

22 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I actually had a local version of 30ad67dc14 written several months ago. I figure it's at least worth sending the tests I wrote for that. dlls/kernel32/tests/profile.c | 72 +++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 1339b2b20ce..ce82a746e71 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1092,6 +1092,77 @@ static void test_WritePrivateProfileString(void) DeleteFileA(path); } +static void test_profile_struct(void) +{ + static const char expect_data[] = "[s]\r\nkey=616261637573006F\r\n"; + char buffer[20]; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, sizeof(buffer), "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStructA("s", "key", (void *)"abacus", sizeof("abacus"), "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(check_file_data("./winetest.ini", expect_data), "file doesn't match\n"); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 6, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 8, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "abacus"), "data didn't match\n"); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStringA("s", "key", "default", buffer, sizeof(buffer), "./winetest.ini"); + ok(ret == 16, "got size %u\n", ret); + ok(!strcmp(buffer, "616261637573006F"), "got %s\n", debugstr_a(buffer)); + + ret = WritePrivateProfileStringA("s", "key", "636163747573006F", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("s", "key", "6361637475730083", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "cactus"), "data didn't match\n"); + + ret = WritePrivateProfileStringA("s", "key", "636163747573008Q", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("s", "key", "16361637475730083", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + ret = DeleteFileA("./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); +} + START_TEST(profile) { test_profile_int(); @@ -1119,4 +1190,5 @@ START_TEST(profile) "[section2]\r", "CR only"); test_WritePrivateProfileString(); + test_profile_struct(); } -- 2.27.0

2 10

[PATCH] winevulkan: Update to VK spec version 1.2.145.
by Liam Middlebrook 21 Jun '20

21 Jun '20

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d027b9eaa7..a0bf6b0859 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.142" +VK_XML_VERSION = "1.2.145" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.26.2

1 0

winegstreamer: Avoid Fedora and openSUSE?
by Francois Gouget 21 Jun '20

21 Jun '20

So I ran into an issue 3 years ago where the 32-bit GStreamer plugins are unusable on Fedora and openSUSE despite these distributions shipping the needed 32-bit packages. So did anyone manage to get winegstreamer.dll to work for 32-bit Windows applications on Fedora and openSUSE or is it widely known that one should avoid them when using Wine? Note that of course I reported this issue to the distributions and this is where you'll find more details about this issue: * Fedora https://bugzilla.redhat.com/show_bug.cgi?id=1472160 -> Reported against Fedora 26, then 28, still present in Fedora 32 but fixing this bug seems to have been postponed indefinitely. * openSUSE https://bugzilla.opensuse.org/show_bug.cgi?id=1049452 -> Supposedly fixed on Tumbleweed 2 years ago but still present on openSUSE Leap 15.1 https://bugzilla.opensuse.org/show_bug.cgi?id=1172018 -> New bug for openSUSE Leap 15.1. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Demander si un ordinateur peut penser revient à demander si un sous-marin peut nager.

6 28

Installing Wine's build dependencies (wt-install-dev)
by Francois Gouget 21 Jun '20

21 Jun '20

So wt-install-dev now supports openSUSE Tumbleweed (in addition to Leap 15.1) and can also automate adding the contrib section on Debian (for the TrueType fonts) and also Ubuntu. I'm also not opposed to extending it to other distributions like Fedora and Arch. So I'd like to update the Wine wiki pages that describe how to build Wine to reference this tool [1] since I think it's really the easiest way to set things up the 32- and 64-bit build dependencies. But before I do that I wonder if the tool should be moved to another Git repository. Currently it's in my wt-daily repository but that may not be the most appropriate place. The three candidate are: * wt-daily That's where I initially put it since that was easiest and I use wt-install-dev to configure the machines for my daily WineTest runs. But wt-daily is not really a mainstream repository. * tools I also use wt-install-dev to configure the TestBot VMs that run the Wine tests. So since the TestBot source is stored in the tools repository it could make sense to add wt-install-dev there. * wine After all the goal is to help set up a system to compile Wine so that may be the most logical place for it. Then anyone wanting to compile Wine would immediately have access to this tool without having to go fetch some other repository. It could even be referenced in the README. Of course I'm also open to renaming wt-install-dev. Any thoughts? [1] https://wiki.winehq.org/Building_Wine#Cross-Compiling https://wiki.winehq.org/Building_Biarch_Wine_On_Ubuntu https://wiki.winehq.org/OpenSUSE#Build_Tools_and_Dependencies -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Linux: It is now safe to turn on your computer.

1 0

[PATCH 2/2] winhttp: Pass length in WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER callback
by Alistair Leslie-Hughes 21 Jun '20

21 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/request.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b25ab9a45c..5d22aeadbf 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1591,7 +1591,8 @@ static DWORD open_connection( struct request *request ) TRACE("connecting to %s:%u\n", debugstr_w(addressW), port); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); + len = lstrlenW( addressW ) + 1; + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, len ); if ((ret = netconn_create( host, &connect->sockaddr, request->connect_timeout, &netconn ))) { -- 2.27.0

1 0

[PATCH 1/2] winhttp: WinHttpWebSocketCompleteUpgrade use WINHTTP_CALLBACK_STATUS_HANDLE_CREATED callback
by Alistair Leslie-Hughes 21 Jun '20

21 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/request.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0511dd44ee..b25ab9a45c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3113,7 +3113,11 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR release_object( &socket->hdr ); release_object( &request->hdr ); TRACE("returning %p\n", hsocket); - if (hsocket) SetLastError( ERROR_SUCCESS ); + if (hsocket) + { + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, hsocket, sizeof(hsocket) ); + SetLastError( ERROR_SUCCESS ); + } return hsocket; } -- 2.27.0

1 0

[RFC PATCH 5/5] quartz/tests: Add MPEG video parser tests for MPEG splitter. (resend)
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 596 ++++++++++++++++++++++++++++------ dlls/quartz/tests/rsrc.rc | 4 + dlls/quartz/tests/video.mpg | Bin 0 -> 617 bytes 3 files changed, 500 insertions(+), 100 deletions(-) create mode 100644 dlls/quartz/tests/video.mpg

1 0

[RFC PATCH 5/5] quartz/tests: Add MPEG video parser tests for MPEG splitter.
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 596 ++++++++++++++++++++++++++++------ dlls/quartz/tests/rsrc.rc | 4 + dlls/quartz/tests/video.mpg | Bin 0 -> 617 bytes 3 files changed, 500 insertions(+), 100 deletions(-) create mode 100644 dlls/quartz/tests/video.mpg

2 1

[RFC PATCH 4/5] winegstreamer: Add MPEG video parser to MPEG splitter.
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 2 +- dlls/winegstreamer/gstdemux.c | 150 ++++++++++++++++++++++++++++++++-- 2 files changed, 143 insertions(+), 9 deletions(-)

1 0

[RFC PATCH 3/5] winegstreamer: Pass the AM_MEDIA_TYPE parameter to the handler.
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[RFC PATCH 2/5] winegstreamer: Implement listing of sink media types.
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Though, some of media types aren't supported. They are rejected by mpeg_splitter_sink_query_accept(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 75 ++++++++++++++--------------------- dlls/winegstreamer/gstdemux.c | 26 ++++++++++++ 2 files changed, 56 insertions(+), 45 deletions(-)

1 0

[RFC PATCH 1/5] quartz/tests: Factor out MP3 audio tests.
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Prepare the code before adding MPEG video tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 357 +++++++++++++++++++--------------- 1 file changed, 199 insertions(+), 158 deletions(-)

1 0

[PATCH] bcrypt/tests: Fix some failures on Windows 7.
by Zebediah Figura 20 Jun '20

20 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/bcrypt/tests/bcrypt.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e4a99d63048..f6e5c84e8d2 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2381,16 +2381,37 @@ static void test_BcryptDeriveKeyCapi(void) } ret = pBCryptDeriveKeyCapi(NULL, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || ret == STATUS_INVALID_HANDLE /* win7 */, "got %08x\n", ret); ret = pBCryptDeriveKeyCapi(hash, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); + + memset(key, 0, sizeof(key)); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 41, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + if (!ret) + ok(!memcmp(key, expect, sizeof(expect) - 1), "wrong key data\n"); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); memset(key, 0, sizeof(key)); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 20, 0); -- 2.27.0

1 0

Wine staging 5.11 release
by Alistair Leslie-Hughes 20 Jun '20

20 Jun '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.11 (702 patches are applied to wine vanilla) NOTE: Currently the esync patchset has been disabled until ntdll seperation upstream is complete. Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Add stub for NtContinue. * ntdll: Use NtContinue to continue execution after exceptions. * directmanipulation: New dll * uuid: Add directmanipulation.h * ntdll: Implement retrieving DOS attributes in NtQuery[Full]AttributesFile and NtQueryDirectoryFile. * directmanipulation: Create DirectManipulationManager/DirectManipulationSharedManager objects * directmanipulation: Implement IDirectManipulationManager2 GetUpdateManager. * directmanipulation/tests: Initial tests. Added: * None Updated: * ntdll-ForceBottomUpAlloc * winebuild-Fake_Dlls * ntdll-Syscall_Emulation * wow64cpu-Wow64Transition Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/6] quartz/vmr9: Merge VMR9_SendSampleData() into VMR9_DoRenderSample().
by Zebediah Figura 20 Jun '20

20 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- videoconvert seems to be faster at converting YUV -> YUV than YUV -> RGB, which makes sense. This patch set, as well as following patch sets, aim to improve the speed of video post-processing in the quartz pipeline. Particularly large video samples can take long enough to process that not only will the video play back slowly, but (depending on demuxer) the audio will get "stuck behind" it and stutter. dlls/quartz/vmr9.c | 155 ++++++++++++++++++++++----------------------- 1 file changed, 76 insertions(+), 79 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6b653e56092..f81d8067059 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -207,89 +207,41 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) return CONTAINING_RECORD(iface, struct quartz_vmr, renderer.filter.IBaseFilter_iface); } -static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo *info, LPBYTE data, - DWORD size) +static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { - const BITMAPINFOHEADER *bmiHeader = get_bitmap_header(&This->renderer.sink.pin.mt); - HRESULT hr = S_OK; - int width; - int height; - D3DLOCKED_RECT lock; - - TRACE("%p %p %d\n", This, data, size); - - width = bmiHeader->biWidth; - height = bmiHeader->biHeight; - - hr = IDirect3DSurface9_LockRect(info->lpSurf, &lock, NULL, D3DLOCK_DISCARD); - if (FAILED(hr)) - { - ERR("IDirect3DSurface9_LockRect failed (%x)\n",hr); - return hr; - } - - if (height > 0) { - /* Bottom up image needs inverting */ - lock.pBits = (char *)lock.pBits + (height * lock.Pitch); - while (height--) - { - lock.pBits = (char *)lock.pBits - lock.Pitch; - memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); - data = data + width * bmiHeader->biBitCount / 8; - } - } - else if (lock.Pitch != width * bmiHeader->biBitCount / 8) - { - WARN("Slow path! %u/%u\n", lock.Pitch, width * bmiHeader->biBitCount/8); - - while (height--) - { - memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); - data = data + width * bmiHeader->biBitCount / 8; - lock.pBits = (char *)lock.pBits + lock.Pitch; - } - } - else memcpy(lock.pBits, data, size); - - IDirect3DSurface9_UnlockRect(info->lpSurf); - - hr = IVMRImagePresenter9_PresentImage(This->presenter, This->cookie, info); - return hr; -} - -static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) -{ - struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - const HANDLE events[2] = {This->run_event, This->renderer.flush_event}; + struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); + const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + const BITMAPINFOHEADER *bitmap_header; + unsigned int data_size, width, depth; + REFERENCE_TIME start_time, end_time; VMR9PresentationInfo info = {}; - LPBYTE pbSrcStream = NULL; - long cbSrcStream = 0; - REFERENCE_TIME tStart, tStop; + D3DLOCKED_RECT locked_rect; + BYTE *data = NULL; HRESULT hr; + int height; - TRACE("%p %p\n", iface, pSample); + TRACE("filter %p, sample %p.\n", filter, sample); /* It is possible that there is no device at this point */ - if (!This->allocator || !This->presenter) + if (!filter->allocator || !filter->presenter) { ERR("NO PRESENTER!!\n"); return S_FALSE; } - hr = IMediaSample_GetTime(pSample, &tStart, &tStop); - if (FAILED(hr)) - info.dwFlags = VMR9Sample_SrcDstRectsValid; - else - info.dwFlags = VMR9Sample_SrcDstRectsValid | VMR9Sample_TimeValid; + info.dwFlags = VMR9Sample_SrcDstRectsValid; - if (IMediaSample_IsDiscontinuity(pSample) == S_OK) + if (SUCCEEDED(hr = IMediaSample_GetTime(sample, &start_time, &end_time))) + info.dwFlags |= VMR9Sample_TimeValid; + + if (IMediaSample_IsDiscontinuity(sample) == S_OK) info.dwFlags |= VMR9Sample_Discontinuity; - if (IMediaSample_IsPreroll(pSample) == S_OK) + if (IMediaSample_IsPreroll(sample) == S_OK) info.dwFlags |= VMR9Sample_Preroll; - if (IMediaSample_IsSyncPoint(pSample) == S_OK) + if (IMediaSample_IsSyncPoint(sample) == S_OK) info.dwFlags |= VMR9Sample_SyncPoint; /* If we render ourselves, and this is a preroll sample, discard it */ @@ -298,28 +250,73 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi return S_OK; } - hr = IMediaSample_GetPointer(pSample, &pbSrcStream); - if (FAILED(hr)) + if (FAILED(hr = IMediaSample_GetPointer(sample, &data))) { - ERR("Cannot get pointer to sample data (%x)\n", hr); + ERR("Failed to get pointer to sample data, hr %#x.\n", hr); return hr; } + data_size = IMediaSample_GetActualDataLength(sample); - cbSrcStream = IMediaSample_GetActualDataLength(pSample); + bitmap_header = get_bitmap_header(&filter->renderer.sink.pin.mt); + width = bitmap_header->biWidth; + height = bitmap_header->biHeight; + depth = bitmap_header->biBitCount; - info.rtStart = tStart; - info.rtEnd = tStop; - info.szAspectRatio.cx = This->bmiheader.biWidth; - info.szAspectRatio.cy = This->bmiheader.biHeight; - info.lpSurf = This->surfaces[(++This->cur_surface) % This->num_surfaces]; + info.rtStart = start_time; + info.rtEnd = end_time; + info.szAspectRatio.cx = width; + info.szAspectRatio.cy = height; + info.lpSurf = filter->surfaces[(++filter->cur_surface) % filter->num_surfaces]; - VMR9_SendSampleData(This, &info, pbSrcStream, cbSrcStream); + if (FAILED(hr = IDirect3DSurface9_LockRect(info.lpSurf, &locked_rect, NULL, D3DLOCK_DISCARD))) + { + ERR("Failed to lock surface, hr %#x.\n", hr); + return hr; + } - if (This->renderer.filter.state == State_Paused) + if (height > 0) + { + BYTE *dst = (BYTE *)locked_rect.pBits + (height * locked_rect.Pitch); + const BYTE *src = data; + + TRACE("Inverting image.\n"); + + while (height--) + { + dst -= locked_rect.Pitch; + memcpy(dst, src, width * depth / 8); + src += width * depth / 8; + } + } + else if (locked_rect.Pitch != width * depth / 8) { - LeaveCriticalSection(&This->renderer.csRenderLock); + BYTE *dst = locked_rect.pBits; + const BYTE *src = data; + + TRACE("Source pitch %u does not match dest pitch %u; copying manually.\n", + width * depth / 8, locked_rect.Pitch); + + while (height--) + { + memcpy(dst, src, width * depth / 8); + src += width * depth / 8; + dst += locked_rect.Pitch; + } + } + else + { + memcpy(locked_rect.pBits, data, data_size); + } + + IDirect3DSurface9_UnlockRect(info.lpSurf); + + hr = IVMRImagePresenter9_PresentImage(filter->presenter, filter->cookie, &info); + + if (filter->renderer.filter.state == State_Paused) + { + LeaveCriticalSection(&filter->renderer.csRenderLock); WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&This->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.csRenderLock); } return hr; -- 2.27.0

2 6

[PATCH v2 1/2] amstream: Implement IAudioStreamSample::GetSampleTimes.
by Anton Baskanov 19 Jun '20

19 Jun '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/audiostream.c | 33 +++++- dlls/amstream/tests/amstream.c | 181 +++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 8fba877719..4c6c326d84 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -34,6 +34,7 @@ struct queued_receive DWORD length; BYTE *pointer; DWORD position; + STREAM_TIME start_time; }; struct audio_stream @@ -66,6 +67,8 @@ typedef struct { LONG ref; struct audio_stream *parent; IAudioData *audio_data; + STREAM_TIME start_time; + STREAM_TIME end_time; HANDLE update_event; struct list entry; @@ -102,6 +105,12 @@ static void flush_receive_queue(struct audio_stream *stream) remove_queued_receive(LIST_ENTRY(entry, struct queued_receive, entry)); } +static STREAM_TIME stream_time_from_position(struct audio_stream *stream, struct queued_receive *receive) +{ + const WAVEFORMATEX *format = (WAVEFORMATEX *)stream->mt.pbFormat; + return receive->start_time + (receive->position * 10000000 + format->nAvgBytesPerSec / 2) / format->nAvgBytesPerSec; +} + static void process_update(IAudioStreamSampleImpl *sample, struct queued_receive *receive) { DWORD advance; @@ -109,9 +118,14 @@ static void process_update(IAudioStreamSampleImpl *sample, struct queued_receive advance = min(receive->length - receive->position, sample->length - sample->position); memcpy(&sample->pointer[sample->position], &receive->pointer[receive->position], advance); + if (!sample->position) + sample->start_time = stream_time_from_position(sample->parent, receive); + receive->position += advance; sample->position += advance; + sample->end_time = stream_time_from_position(sample->parent, receive); + sample->update_hr = (sample->position == sample->length) ? S_OK : MS_S_PENDING; } @@ -204,9 +218,19 @@ static HRESULT WINAPI IAudioStreamSampleImpl_GetMediaStream(IAudioStreamSample * static HRESULT WINAPI IAudioStreamSampleImpl_GetSampleTimes(IAudioStreamSample *iface, STREAM_TIME *start_time, STREAM_TIME *end_time, STREAM_TIME *current_time) { - FIXME("(%p)->(%p,%p,%p): stub\n", iface, start_time, end_time, current_time); + IAudioStreamSampleImpl *sample = impl_from_IAudioStreamSample(iface); - return E_NOTIMPL; + TRACE("sample %p, start_time %p, end_time %p, current_time %p.\n", sample, start_time, end_time, current_time); + + if (current_time) + IMediaStreamFilter_GetCurrentStreamTime(sample->parent->filter, current_time); + + if (start_time) + *start_time = sample->start_time; + if (end_time) + *end_time = sample->end_time; + + return S_OK; } static HRESULT WINAPI IAudioStreamSampleImpl_SetSampleTimes(IAudioStreamSample *iface, const STREAM_TIME *start_time, @@ -1228,6 +1252,8 @@ static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample * { struct audio_stream *stream = impl_from_IMemInputPin(iface); struct queued_receive *receive; + REFERENCE_TIME start_time = 0; + REFERENCE_TIME end_time = 0; BYTE *pointer; HRESULT hr; @@ -1253,6 +1279,8 @@ static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample * return hr; } + IMediaSample_GetTime(sample, &start_time, &end_time); + receive = calloc(1, sizeof(*receive)); if (!receive) { @@ -1263,6 +1291,7 @@ static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample * receive->length = IMediaSample_GetActualDataLength(sample); receive->pointer = pointer; receive->sample = sample; + receive->start_time = start_time; IMediaSample_AddRef(receive->sample); list_add_tail(&stream->receive_queue, &receive->entry); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index e1f6a15ad3..d12441fc2e 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -3851,6 +3851,186 @@ void test_audiostreamsample_completion_status(void) CloseHandle(event); } +static void test_audiostreamsample_get_sample_times(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const BYTE test_data[8] = { 0 }; + IAudioStreamSample *stream_sample; + IMediaFilter *graph_media_filter; + IAudioMediaStream *audio_stream; + STREAM_TIME filter_start_time; + IMemInputPin *mem_input_pin; + IMediaStreamFilter *filter; + IMediaSample *media_sample; + struct testfilter source; + STREAM_TIME current_time; + struct testclock clock; + IAudioData *audio_data; + STREAM_TIME start_time; + STREAM_TIME end_time; + IGraphBuilder *graph; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + 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, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IMemInputPin, (void **)&mem_input_pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaFilter, (void **)&graph_media_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testfilter_init(&source); + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAudioMediaStream_CreateSample(audio_stream, audio_data, 0, &stream_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAudioData_SetBuffer(audio_data, 5, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testclock_init(&clock); + + clock.time = 12345678; + + current_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, &current_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time)); + + IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + current_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, &current_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time)); + + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &filter_start_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock.get_time_hr = E_FAIL; + + current_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, &current_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_time == 0xdeadbeefddf15da1 + filter_start_time, "Expected current time %s, got %s.\n", + wine_dbgstr_longlong(0xdeadbeefddf15da1 + filter_start_time), wine_dbgstr_longlong(current_time)); + + clock.get_time_hr = S_OK; + + current_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, &current_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_time == filter_start_time, "Expected current time %s, got %s.\n", + wine_dbgstr_longlong(filter_start_time), wine_dbgstr_longlong(current_time)); + + clock.time = 23456789; + + current_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, &current_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_time == filter_start_time + 11111111, "Expected current time %s, got %s.\n", + wine_dbgstr_longlong(filter_start_time + 11111111), wine_dbgstr_longlong(current_time)); + + start_time = 0xdeadbeefdeadbeef; + end_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start_time == 0, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 0, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + media_sample = audiostream_allocate_sample(&source, test_data, 8); + start_time = 12345678; + end_time = 23456789; + hr = IMediaSample_SetTime(media_sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(mem_input_pin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(media_sample); + + hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0xdeadbeefdeadbeef; + end_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start_time == 12345678, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 12347946, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + media_sample = audiostream_allocate_sample(&source, test_data, 6); + start_time = 12345678; + end_time = 23456789; + hr = IMediaSample_SetTime(media_sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(mem_input_pin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(media_sample); + + hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0xdeadbeefdeadbeef; + end_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start_time == 12347946, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 12346585, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0xdeadbeefdeadbeef; + end_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start_time == 12346585, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 12348399, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + ref = IAudioStreamSample_Release(stream_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAudioData_Release(audio_data); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaFilter_Release(graph_media_filter); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IMemInputPin_Release(mem_input_pin); + IAudioMediaStream_Release(audio_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_ddrawstream_initialize(void) { IDirectDrawMediaStream *ddraw_stream; @@ -4510,6 +4690,7 @@ START_TEST(amstream) test_audiostreamsample_update(); test_audiostreamsample_completion_status(); + test_audiostreamsample_get_sample_times(); test_ddrawstream_initialize(); -- 2.17.1

2 4

[PATCH 1/3] ntoskrnl: Set DriverStart and DriverSize fields in DRIVER_OBJECT.
by Derek Lesho 19 Jun '20

19 Jun '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2da58dc104..7604c13b56 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3645,6 +3645,8 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING return STATUS_DLL_INIT_FAILED; driver_object->DriverSection = find_ldr_module( module ); + driver_object->DriverStart = ((LDR_MODULE *)driver_object->DriverSection)->BaseAddress; + driver_object->DriverSize = ((LDR_MODULE *)driver_object->DriverSection)->SizeOfImage; nt = RtlImageNtHeader( module ); if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; -- 2.26.2

3 11

Wine not working when trying to run .exe application
by Zesh 19 Jun '20

19 Jun '20

Hello when I am trying to run an .exe application this error shows up:"err:seh:setup_exception_record stack overflow 996 bytes in thread 0009 eip 7bc3e41f esp 00230f4c stack 0x230000-0x231000-0x330000", thanks.

2 2

[PATCH 1/3] ddraw: Thunk to surface1, not surface7 in blt.
by Stefan Dösinger 19 Jun '20

19 Jun '20

This patch series makes FRAPS work with ddraw games. It hooks only version 1 methods of blt, unlock and flip to detect a front buffer modification. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- In the past FRAPS wouldn't work in Wine because it assumed that the offset of the hooked functions inside the library is the same in every process. This wasn't the case when we used Linux .so's, but it now works with PE builds of the d3d frontend DLLs. d3d8 is already working. For d3d9, FRAPS hooks D3DPERF_*. It happens to work as-is with my build, but I have a patch in my tree that adds DECLSPEC_HOTPATCH to those. Unfortunately this nowadays runs into bug 47633, so we won't be able to upstream it anytime soon. That means using fraps with a d3d9 game puts you at the mercy of your compiler. --- dlls/ddraw/surface.c | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7b7f16e2a3c..46c5fa7da0f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1651,11 +1651,11 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons * D3D_OK on success, error code otherwise. * *****************************************************************************/ -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *dst_rect, - IDirectDrawSurface7 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect, + IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { - struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src_surface); + struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src_surface); struct wined3d_blt_fx wined3d_fx; DWORD unsupported_flags; DWORD fill_colour = 0; @@ -1834,6 +1834,19 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * } } +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *dst_rect, + IDirectDrawSurface7 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) +{ + struct ddraw_surface *dst = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface7(src_surface); + + TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", + iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); + + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); +} + static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_rect, IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { @@ -1843,47 +1856,34 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Blt(IDirectDrawSurface4 * TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src ? &src->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect, IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { struct ddraw_surface *dst = impl_from_IDirectDrawSurface3(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface3(src_surface); + struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface3(src_surface); TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_rect, IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { struct ddraw_surface *dst = impl_from_IDirectDrawSurface2(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface2(src_surface); - - TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", - iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); -} - -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect, - IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) -{ - struct ddraw_surface *dst = impl_from_IDirectDrawSurface(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src_surface); + struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface2(src_surface); TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - return ddraw_surface7_Blt(&dst->IDirectDrawSurface7_iface, dst_rect, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); + return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect, + src ? &src->IDirectDrawSurface_iface : NULL, src_rect, flags, fx); } /***************************************************************************** -- 2.26.2

3 4

[PATCH 1/3] amstream: Implement MediaStreamFilter::GetCurrentStreamTime.
by Anton Baskanov 19 Jun '20

19 Jun '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/filter.c | 28 ++++++- dlls/amstream/tests/amstream.c | 137 +++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 05a02e3f66..3dff686b21 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -174,6 +174,7 @@ struct filter IAMMediaStream **streams; IAMMediaStream *seekable_stream; FILTER_STATE state; + REFERENCE_TIME start_time; }; static inline struct filter *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) @@ -295,6 +296,7 @@ static HRESULT WINAPI filter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start EnterCriticalSection(&filter->cs); + filter->start_time = start; set_state(filter, State_Running); LeaveCriticalSection(&filter->cs); @@ -614,11 +616,31 @@ static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface return E_NOTIMPL; } -static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *pCurrentStreamTime) +static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) { - FIXME("(%p)->(%p): Stub!\n", iface, pCurrentStreamTime); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p, time %p.\n", filter, time); + + if (!time) + return E_POINTER; + + EnterCriticalSection(&filter->cs); + + if (filter->state != State_Running || !filter->clock) + { + *time = 0; + LeaveCriticalSection(&filter->cs); + return S_FALSE; + } + + IReferenceClock_GetTime(filter->clock, time); + + *time -= filter->start_time; + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_WaitUntil(IMediaStreamFilter *iface, REFERENCE_TIME WaitStreamTime) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2bc1310a96..e1f6a15ad3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2641,6 +2641,87 @@ static const IMediaSeekingVtbl testsource_seeking_vtbl = testsource_seeking_GetPreroll, }; +struct testclock +{ + IReferenceClock IReferenceClock_iface; + LONG refcount; + LONGLONG time; + HRESULT get_time_hr; +}; + +static inline struct testclock *impl_from_IReferenceClock(IReferenceClock *iface) +{ + return CONTAINING_RECORD(iface, struct testclock, IReferenceClock_iface); +} + +static HRESULT WINAPI testclock_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) +{ + if (winetest_debug > 1) trace("QueryInterface(%s)\n", wine_dbgstr_guid(iid)); + if (IsEqualGUID(iid, &IID_IReferenceClock) + || IsEqualGUID(iid, &IID_IUnknown)) + { + *out = iface; + IReferenceClock_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI testclock_AddRef(IReferenceClock *iface) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + return InterlockedIncrement(&clock->refcount); +} + +static ULONG WINAPI testclock_Release(IReferenceClock *iface) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + return InterlockedDecrement(&clock->refcount); +} + +static HRESULT WINAPI testclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + if (SUCCEEDED(clock->get_time_hr)) + *time = clock->time; + return clock->get_time_hr; +} + +static HRESULT WINAPI testclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static IReferenceClockVtbl testclock_vtbl = +{ + testclock_QueryInterface, + testclock_AddRef, + testclock_Release, + testclock_GetTime, + testclock_AdviseTime, + testclock_AdvisePeriodic, + testclock_Unadvise, +}; + +static void testclock_init(struct testclock *clock) +{ + memset(clock, 0, sizeof(*clock)); + clock->IReferenceClock_iface.lpVtbl = &testclock_vtbl; +} + static void test_audiostream_get_format(void) { static const WAVEFORMATEX pin_format = @@ -4330,6 +4411,61 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_current_stream_time(void) +{ + IMediaStreamFilter *filter; + struct testclock clock; + REFERENCE_TIME time; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaStreamFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testclock_init(&clock); + + /* Crashes on native. */ + if (0) + { + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_SetSyncSource(filter, &clock.IReferenceClock_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock.get_time_hr = E_FAIL; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_Run(filter, 23456789); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + clock.time = 34567890; + clock.get_time_hr = S_OK; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 11111101, "Got time %s.\n", wine_dbgstr_longlong(time)); + + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -4383,6 +4519,7 @@ START_TEST(amstream) test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); + test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); } -- 2.17.1

3 5

[PATCH v2 1/4] amstream: Get rid of the IDirectDrawStreamSampleImpl typedef.
by Gijs Vermeulen 19 Jun '20

19 Jun '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 73 +++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 1c924e40a2..e2f24c3b4c 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -952,21 +952,22 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) return S_OK; } -typedef struct { +struct ddraw_sample +{ IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; IMediaStream *parent; IDirectDrawSurface *surface; RECT rect; -} IDirectDrawStreamSampleImpl; +}; -static inline IDirectDrawStreamSampleImpl *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) +static inline struct ddraw_sample *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) { - return CONTAINING_RECORD(iface, IDirectDrawStreamSampleImpl, IDirectDrawStreamSample_iface); + return CONTAINING_RECORD(iface, struct ddraw_sample, IDirectDrawStreamSample_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_QueryInterface(IDirectDrawStreamSample *iface, +static HRESULT WINAPI ddraw_sample_QueryInterface(IDirectDrawStreamSample *iface, REFIID riid, void **ret_iface) { TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); @@ -986,43 +987,43 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_QueryInterface(IDirectDrawStre return E_NOINTERFACE; } -static ULONG WINAPI IDirectDrawStreamSampleImpl_AddRef(IDirectDrawStreamSample *iface) +static ULONG WINAPI ddraw_sample_AddRef(IDirectDrawStreamSample *iface) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); + ULONG ref = InterlockedIncrement(&sample->ref); TRACE("(%p)->(): new ref = %u\n", iface, ref); return ref; } -static ULONG WINAPI IDirectDrawStreamSampleImpl_Release(IDirectDrawStreamSample *iface) +static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); + ULONG ref = InterlockedDecrement(&sample->ref); TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) { - if (This->surface) - IDirectDrawSurface_Release(This->surface); - IMediaStream_Release(This->parent); - HeapFree(GetProcessHeap(), 0, This); + if (sample->surface) + IDirectDrawSurface_Release(sample->surface); + IMediaStream_Release(sample->parent); + HeapFree(GetProcessHeap(), 0, sample); } return ref; } /*** IStreamSample methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetMediaStream(IDirectDrawStreamSample *iface, IMediaStream **media_stream) +static HRESULT WINAPI ddraw_sample_GetMediaStream(IDirectDrawStreamSample *iface, IMediaStream **media_stream) { FIXME("(%p)->(%p): stub\n", iface, media_stream); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSampleTimes(IDirectDrawStreamSample *iface, STREAM_TIME *start_time, +static HRESULT WINAPI ddraw_sample_GetSampleTimes(IDirectDrawStreamSample *iface, STREAM_TIME *start_time, STREAM_TIME *end_time, STREAM_TIME *current_time) { FIXME("(%p)->(%p,%p,%p): stub\n", iface, start_time, end_time, current_time); @@ -1030,7 +1031,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSampleTimes(IDirectDrawStre return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetSampleTimes(IDirectDrawStreamSample *iface, const STREAM_TIME *start_time, +static HRESULT WINAPI ddraw_sample_SetSampleTimes(IDirectDrawStreamSample *iface, const STREAM_TIME *start_time, const STREAM_TIME *end_time) { FIXME("(%p)->(%p,%p): stub\n", iface, start_time, end_time); @@ -1038,7 +1039,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetSampleTimes(IDirectDrawStre return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample *iface, DWORD flags, HANDLE event, +static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, DWORD flags, HANDLE event, PAPCFUNC func_APC, DWORD APC_data) { FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); @@ -1046,7 +1047,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample return S_OK; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) +static HRESULT WINAPI ddraw_sample_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) { FIXME("(%p)->(%x,%u): stub\n", iface, flags, milliseconds); @@ -1054,27 +1055,27 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawSt } /*** IDirectDrawStreamSample methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, +static HRESULT WINAPI ddraw_sample_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, RECT *rect) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); TRACE("(%p)->(%p,%p)\n", iface, ddraw_surface, rect); if (ddraw_surface) { - *ddraw_surface = This->surface; + *ddraw_surface = sample->surface; if (*ddraw_surface) IDirectDrawSurface_AddRef(*ddraw_surface); } if (rect) - *rect = This->rect; + *rect = sample->rect; return S_OK; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) +static HRESULT WINAPI ddraw_sample_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) { FIXME("(%p)->(%p): stub\n", iface, rect); @@ -1084,24 +1085,24 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSampl static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = { /*** IUnknown methods ***/ - IDirectDrawStreamSampleImpl_QueryInterface, - IDirectDrawStreamSampleImpl_AddRef, - IDirectDrawStreamSampleImpl_Release, + ddraw_sample_QueryInterface, + ddraw_sample_AddRef, + ddraw_sample_Release, /*** IStreamSample methods ***/ - IDirectDrawStreamSampleImpl_GetMediaStream, - IDirectDrawStreamSampleImpl_GetSampleTimes, - IDirectDrawStreamSampleImpl_SetSampleTimes, - IDirectDrawStreamSampleImpl_Update, - IDirectDrawStreamSampleImpl_CompletionStatus, + ddraw_sample_GetMediaStream, + ddraw_sample_GetSampleTimes, + ddraw_sample_SetSampleTimes, + ddraw_sample_Update, + ddraw_sample_CompletionStatus, /*** IDirectDrawStreamSample methods ***/ - IDirectDrawStreamSampleImpl_GetSurface, - IDirectDrawStreamSampleImpl_SetRect + ddraw_sample_GetSurface, + ddraw_sample_SetRect }; static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { - IDirectDrawStreamSampleImpl *object; + struct ddraw_sample *object; HRESULT hr; TRACE("(%p)\n", ddraw_stream_sample); -- 2.27.0

3 7

[PATCH] winegstreamer: Change blacklist to a more neutral word (try 2)
by André Hentschel 19 Jun '20

19 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/winegstreamer/gst_cbs.c | 16 ++++++++-------- dlls/winegstreamer/gst_cbs.h | 8 ++++---- dlls/winegstreamer/gstdemux.c | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index bf7103b1606..6959eb33a5a 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -261,20 +261,20 @@ void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, +GstAutoplugSelectResult autoplug_banned_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { - struct cb_data cbdata = { AUTOPLUG_BLACKLIST }; + struct cb_data cbdata = { AUTOPLUG_BANNED }; - cbdata.u.autoplug_blacklist_data.bin = bin; - cbdata.u.autoplug_blacklist_data.pad = pad; - cbdata.u.autoplug_blacklist_data.caps = caps; - cbdata.u.autoplug_blacklist_data.fact = fact; - cbdata.u.autoplug_blacklist_data.user = user; + cbdata.u.autoplug_banned_data.bin = bin; + cbdata.u.autoplug_banned_data.pad = pad; + cbdata.u.autoplug_banned_data.caps = caps; + cbdata.u.autoplug_banned_data.fact = fact; + cbdata.u.autoplug_banned_data.user = user; call_cb(&cbdata); - return cbdata.u.autoplug_blacklist_data.ret; + return cbdata.u.autoplug_banned_data.ret; } void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 4725f23ad1a..5740a8e6e8f 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -40,7 +40,7 @@ enum CB_TYPE { EVENT_SINK, GOT_DATA_SINK, REMOVED_DECODED_PAD, - AUTOPLUG_BLACKLIST, + AUTOPLUG_BANNED, UNKNOWN_TYPE, QUERY_SINK, GSTDEMUX_MAX @@ -108,14 +108,14 @@ struct cb_data { GstPad *pad; gpointer user; } pad_removed_data; - struct autoplug_blacklist_data { + struct autoplug_banned_data { GstElement *bin; GstPad *pad; GstCaps *caps; GstElementFactory *fact; gpointer user; GstAutoplugSelectResult ret; - } autoplug_blacklist_data; + } autoplug_banned_data; struct unknown_type_data { GstElement *bin; GstPad *pad; @@ -150,7 +150,7 @@ gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DEC GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; +GstAutoplugSelectResult autoplug_banned_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b9c91245f82..8af0758ca02 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1232,12 +1232,12 @@ static void no_more_pads(GstElement *decodebin, gpointer user) SetEvent(filter->no_more_pads_event); } -static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) +static GstAutoplugSelectResult autoplug_banned(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); if (strstr(name, "Player protection")) { - WARN("Blacklisted a/52 decoder because it only works in Totem\n"); + WARN("Banned a/52 decoder because it only works in Totem\n"); return GST_AUTOPLUG_SELECT_SKIP; } if (!strcmp(name, "Fluendo Hardware Accelerated Video Decoder")) { @@ -1619,7 +1619,7 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); - g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), filter); + g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_banned_wrapper), filter); g_signal_connect(element, "unknown-type", G_CALLBACK(unknown_type_wrapper), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); @@ -2276,10 +2276,10 @@ void perform_cb_gstdemux(struct cb_data *cbdata) removed_decoded_pad(data->element, data->pad, data->user); break; } - case AUTOPLUG_BLACKLIST: + case AUTOPLUG_BANNED: { - struct autoplug_blacklist_data *data = &cbdata->u.autoplug_blacklist_data; - cbdata->u.autoplug_blacklist_data.ret = autoplug_blacklist(data->bin, + struct autoplug_banned_data *data = &cbdata->u.autoplug_banned_data; + cbdata->u.autoplug_banned_data.ret = autoplug_banned(data->bin, data->pad, data->caps, data->fact, data->user); break; } -- 2.17.1

1 0

[PATCH] ntdll: Increment num_busy_workers when queuing TP object.
by Paul Gofman 19 Jun '20

19 Jun '20

Otherwise two consequative submits may have the same num_busy_workers value if threadpool_worker_proc did not have a chance to pick the work in between. A new thread is not created in tp_submit() for the second submit and if the first submit queues an (infinitely long) wait the next submitted callback is not called for indefinite time period. Fixes hang on exit in Detroit Become Human. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/threadpool.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 451d441f572..84286fbee90 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1375,7 +1375,6 @@ static NTSTATUS tp_new_worker_thread( struct threadpool *pool ) { InterlockedIncrement( &pool->refcount ); pool->num_workers++; - pool->num_busy_workers++; NtClose( thread ); } return status; @@ -2137,6 +2136,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa static void tp_object_prio_queue( struct threadpool_object *object ) { + ++object->pool->num_busy_workers; list_add_tail( &object->pool->pools[object->priority], &object->pool_entry ); } @@ -2330,7 +2330,6 @@ static void CALLBACK threadpool_worker_proc( void *param ) TRACE( "starting worker thread for pool %p\n", pool ); RtlEnterCriticalSection( &pool->cs ); - pool->num_busy_workers--; for (;;) { while ((ptr = threadpool_get_next_item( pool ))) @@ -2360,7 +2359,6 @@ static void CALLBACK threadpool_worker_proc( void *param ) /* Leave critical section and do the actual callback. */ object->num_associated_callbacks++; object->num_running_callbacks++; - pool->num_busy_workers++; RtlLeaveCriticalSection( &pool->cs ); /* Initialize threadpool instance struct. */ @@ -2466,6 +2464,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) skip_cleanup: RtlEnterCriticalSection( &pool->cs ); + assert(pool->num_busy_workers); pool->num_busy_workers--; /* Simple callbacks are automatically shutdown after execution. */ -- 2.26.2

1 0

[PATCH V2 3/3] directmanipulation: Implement IDirectManipulationCompositor::SetUpdateManager.
by Vijay Kiran Kamuju 19 Jun '20

19 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH V2 2/3] directmanipulation: Implement IDirectManipulationFrameInfoProvider stub interface.
by Vijay Kiran Kamuju 19 Jun '20

19 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH V2 1/3] directmanipulation: Implement IDirectManipulationCompositor stub interface
by Vijay Kiran Kamuju 19 Jun '20

19 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/3] directmanipulation: Implement IDirectManipulationCompositor::SetUpdateManager.
by Vijay Kiran Kamuju 19 Jun '20

19 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/3] directmanipulation: Implement IDirectManipulationFrameInfoProvider stub interface.
by Vijay Kiran Kamuju 19 Jun '20

19 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] directmanipulation: Implement IDirectManipulationCompositor stub interface.
by Vijay Kiran Kamuju 19 Jun '20

19 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] mf: Set clipping window attribute for EVR activator.
by Nikolay Sivov 19 Jun '20

19 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/main.c | 8 +++++++- dlls/mf/tests/mf.c | 11 ++++++++++- include/mfidl.idl | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 15c9e5e3c9a..3546caa6912 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1291,12 +1291,18 @@ static const struct activate_funcs evr_activate_funcs = HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) { + HRESULT hr; + TRACE("%p, %p.\n", hwnd, activate); if (!activate) return E_POINTER; - return create_activation_object(hwnd, &evr_activate_funcs, activate); + hr = create_activation_object(hwnd, &evr_activate_funcs, activate); + if (SUCCEEDED(hr)) + IMFActivate_SetUINT64(*activate, &MF_ACTIVATE_VIDEO_WINDOW, (ULONG_PTR)hwnd); + + return hr; } struct simple_type_handler diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c79ae69f91d..d252bab9b3b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3228,7 +3228,8 @@ static void test_evr(void) { IMFMediaSink *sink, *sink2; IMFActivate *activate; - DWORD flags; + DWORD flags, count; + UINT64 value; HRESULT hr; hr = CoInitialize(NULL); @@ -3240,6 +3241,14 @@ static void test_evr(void) hr = MFCreateVideoRendererActivate(NULL, &activate); ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + hr = IMFActivate_GetCount(activate, &count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + + hr = IMFActivate_GetUINT64(activate, &MF_ACTIVATE_VIDEO_WINDOW, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(!value, "Unexpected value.\n"); + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); todo_wine ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); diff --git a/include/mfidl.idl b/include/mfidl.idl index 89b1bdd05b8..2955d0d2f3b 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1151,4 +1151,6 @@ cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, 0xb10aaec3, 0xef cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, 0x6ba644ff, 0x27c5, 0x4d02, 0x98, 0x87, 0xc2, 0x86, 0x19, 0xfd, 0xb9, 0x1b);") cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY, 0xa9770471, 0x92ec, 0x4df4, 0x94, 0xfe, 0x81, 0xc3, 0x6f, 0x0c, 0x3a, 0x7a);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_VIDEO_WINDOW, 0x9a2dbbdd, 0xf57e, 0x4162, 0x82, 0xb9, 0x68, 0x31, 0x37, 0x76, 0x82, 0xd3);") + cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") -- 2.27.0

1 2

[PATCH v5 01/10] msscript.ocx: Move the module array to the Script Host.
by Gabriel Ivăncescu 19 Jun '20

19 Jun '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 57 +++++++++++++++--------------- dlls/msscript.ocx/tests/msscript.c | 9 +++++ 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 8fb127e..7385ce1 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -82,6 +82,9 @@ typedef struct ScriptHost { SCRIPTSTATE script_state; CLSID clsid; + unsigned int module_count; + ScriptModule **modules; + struct list named_items; } ScriptHost; @@ -94,6 +97,7 @@ struct ScriptControl { IViewObjectEx IViewObjectEx_iface; IPointerInactive IPointerInactive_iface; IConnectionPointContainer IConnectionPointContainer_iface; + IScriptModuleCollection IScriptModuleCollection_iface; LONG ref; IOleClientSite *site; SIZEL extent; @@ -110,11 +114,6 @@ struct ScriptControl { IAdviseSink *view_sink; DWORD view_sink_flags; - /* modules */ - unsigned int module_count; - ScriptModule **modules; - IScriptModuleCollection IScriptModuleCollection_iface; - ScriptHost *host; }; @@ -766,15 +765,15 @@ static ScriptModule *create_module(void) return module; } -static void release_modules(ScriptControl *control) +static void release_modules(ScriptHost *host) { unsigned int i; - for (i = 0; i < control->module_count; i++) - IScriptModule_Release(&control->modules[i]->IScriptModule_iface); + for (i = 0; i < host->module_count; i++) + IScriptModule_Release(&host->modules[i]->IScriptModule_iface); - control->module_count = 0; - heap_free(control->modules); + host->module_count = 0; + heap_free(host->modules); } static HRESULT WINAPI ScriptModuleCollection_QueryInterface(IScriptModuleCollection *iface, REFIID riid, void **ppv) @@ -896,8 +895,9 @@ static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection * TRACE("(%p)->(%p)\n", This, plCount); if (!plCount) return E_POINTER; + if (!This->host) return E_FAIL; - *plCount = This->module_count; + *plCount = This->host->module_count; return S_OK; } @@ -947,6 +947,18 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) host->clsid = *clsid; list_init(&host->named_items); + /* Alloc global module */ + host->modules = heap_alloc_zero(sizeof(*host->modules)); + if (!host->modules) return E_OUTOFMEMORY; + + host->modules[0] = create_module(); + if (!host->modules[0]) { + heap_free(host->modules); + heap_free(host); + return E_OUTOFMEMORY; + } + host->module_count = 1; + hr = CoCreateInstance(&host->clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IActiveScript, (void**)&host->script); if (FAILED(hr)) { @@ -990,6 +1002,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) return S_OK; failed: + release_modules(host); release_script_engine(host); return hr; } @@ -1068,8 +1081,10 @@ static ULONG WINAPI ScriptControl_Release(IScriptControl *iface) if (This->site) IOleClientSite_Release(This->site); if (This->host) + { + release_modules(This->host); release_script_engine(This->host); - release_modules(This); + } heap_free(This); } @@ -1159,7 +1174,6 @@ static HRESULT WINAPI ScriptControl_get_Language(IScriptControl *iface, BSTR *p) static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR language) { ScriptControl *This = impl_from_IScriptControl(iface); - ScriptModule **modules; CLSID clsid; TRACE("(%p)->(%s)\n", This, debugstr_w(language)); @@ -1167,25 +1181,12 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan if (language && FAILED(CLSIDFromProgID(language, &clsid))) return CTL_E_INVALIDPROPERTYVALUE; - /* Alloc new global module */ - modules = heap_alloc_zero(sizeof(*modules)); - if (!modules) return E_OUTOFMEMORY; - - modules[0] = create_module(); - if (!modules[0]) { - heap_free(modules); - return E_OUTOFMEMORY; - } - if (This->host) { + release_modules(This->host); release_script_engine(This->host); This->host = NULL; } - release_modules(This); - This->modules = modules; - This->module_count = 1; - if (!language) return S_OK; @@ -1332,7 +1333,7 @@ static HRESULT WINAPI ScriptControl_get_Modules(IScriptControl *iface, IScriptMo TRACE("(%p)->(%p)\n", This, p); - if (!This->module_count) return E_FAIL; + if (!This->host) return E_FAIL; *p = &This->IScriptModuleCollection_iface; IScriptControl_AddRef(iface); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index fbbe831..b6a5209 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2414,7 +2414,16 @@ static void test_IScriptControl_get_Modules(void) ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); ok(count == 1, "count is not 1, got %d.\n", count); + hr = IScriptControl_put_Language(sc, NULL); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + + hr = IScriptModuleCollection_get_Count(mods, &count); + ok(hr == E_FAIL, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr); + IScriptModuleCollection_Release(mods); + hr = IScriptControl_get_Modules(sc, &mods); + ok(hr == E_FAIL, "IScriptControl_get_Modules returned: 0x%08x.\n", hr); + IScriptControl_Release(sc); /* custom script engine */ -- 2.21.0

1 9

[PATCH vkd3d 5/5] vkd3d-shader: Allow vkd3d_shader_compile_dxbc() to handle multiple source types.
by Henri Verbeet 19 Jun '20

19 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++++++++-- libs/vkd3d-shader/vkd3d_shader.map | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 29 +++++++++++++++++++++++------ libs/vkd3d/state.c | 3 ++- programs/vkd3d-compiler/main.c | 3 ++- tests/vkd3d_shader_api.c | 10 ++++++---- 6 files changed, 46 insertions(+), 15 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 367f8a2..5c9e42e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -226,6 +226,14 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +enum vkd3d_shader_source_type +{ + VKD3D_SHADER_SOURCE_NONE, + VKD3D_SHADER_SOURCE_DXBC_TPF, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SOURCE_TYPE), +}; + struct vkd3d_shader_compile_info { enum vkd3d_shader_structure_type type; @@ -233,6 +241,8 @@ struct vkd3d_shader_compile_info struct vkd3d_shader_code source; + enum vkd3d_shader_source_type source_type; + const struct vkd3d_shader_compile_option *options; unsigned int option_count; }; @@ -653,7 +663,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); +int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, @@ -682,7 +692,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature /* * Function pointer typedefs for vkd3d-shader functions. */ -typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_compile_info *compile_info, +typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 74c38e1..a8c73b6 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -1,7 +1,7 @@ VKD3D_1_0 { global: - vkd3d_shader_compile_dxbc; + vkd3d_shader_compile; vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element; vkd3d_shader_free_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 7179436..5e47122 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -103,7 +103,27 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) +static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) +{ + if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) + { + WARN("Invalid structure type %#x.\n", compile_info->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + switch (compile_info->source_type) + { + case VKD3D_SHADER_SOURCE_DXBC_TPF: + break; + default: + WARN("Invalid shader source type %#x.\n", compile_info->source_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + return VKD3D_OK; +} + +int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) { struct vkd3d_shader_instruction instruction; struct vkd3d_dxbc_compiler *spirv_compiler; @@ -113,11 +133,8 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in TRACE("compile_info %p, spirv %p.\n", compile_info, spirv); - if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) - { - WARN("Invalid compile_info structure type %#x.\n", compile_info->type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } + if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + return ret; scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; scan_info.next = NULL; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 8bc2595..2a1107f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1350,10 +1350,11 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.next = shader_interface; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; + compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.options = NULL; compile_info.option_count = 0; - if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv)) < 0) + if ((ret = vkd3d_shader_compile(&compile_info, &spirv)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index d33dafd..9013f21 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -192,6 +192,7 @@ int main(int argc, char **argv) info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; + info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; info.options = options.compile_options; info.option_count = options.compile_option_count; @@ -201,7 +202,7 @@ int main(int argc, char **argv) return 1; } - ret = vkd3d_shader_compile_dxbc(&info, &spirv); + ret = vkd3d_shader_compile(&info, &spirv); vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 00c6f95..5b47703 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -59,10 +59,11 @@ static void test_invalid_shaders(void) info.next = NULL; info.source.code = ps_break_code; info.source.size = sizeof(ps_break_code); + info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; info.options = &option; info.option_count = 1; - rc = vkd3d_shader_compile_dxbc(&info, &spirv); + rc = vkd3d_shader_compile(&info, &spirv); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } @@ -75,8 +76,8 @@ static void test_vkd3d_shader_pfns(void) PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; - PFN_vkd3d_shader_compile_dxbc pfn_vkd3d_shader_compile_dxbc; PFN_vkd3d_shader_scan_dxbc pfn_vkd3d_shader_scan_dxbc; + PFN_vkd3d_shader_compile pfn_vkd3d_shader_compile; struct vkd3d_versioned_root_signature_desc root_signature_desc; struct vkd3d_shader_signature_element *element; @@ -115,8 +116,8 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; - pfn_vkd3d_shader_compile_dxbc = vkd3d_shader_compile_dxbc; pfn_vkd3d_shader_scan_dxbc = vkd3d_shader_scan_dxbc; + pfn_vkd3d_shader_compile = vkd3d_shader_compile; rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); @@ -134,10 +135,11 @@ static void test_vkd3d_shader_pfns(void) compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = NULL; compile_info.source = vs; + compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.options = NULL; compile_info.option_count = 0; - rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv); + rc = pfn_vkd3d_shader_compile(&compile_info, &spirv); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_shader_code(&spirv); -- 2.11.0

2 1

[PATCH vkd3d 4/5] vkd3d-shader: Pass compile options as an array instead of as flags.
by Henri Verbeet 19 Jun '20

19 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 20 ++++++++++----- libs/vkd3d-shader/spirv.c | 24 ++++++++++++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 8 +++--- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- libs/vkd3d/state.c | 4 ++- programs/vkd3d-compiler/main.c | 43 ++++++++++++++++++++++++++++---- tests/vkd3d_shader_api.c | 13 ++++++++-- 7 files changed, 89 insertions(+), 26 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e4c86ed..367f8a2 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -40,11 +40,17 @@ enum vkd3d_shader_structure_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; -enum vkd3d_shader_compiler_option +enum vkd3d_shader_compile_option_name { - VKD3D_SHADER_STRIP_DEBUG = 0x00000001, + VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG = 0x00000001, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILER_OPTION), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), +}; + +struct vkd3d_shader_compile_option +{ + enum vkd3d_shader_compile_option_name name; + unsigned int value; }; enum vkd3d_shader_visibility @@ -226,6 +232,9 @@ struct vkd3d_shader_compile_info const void *next; struct vkd3d_shader_code source; + + const struct vkd3d_shader_compile_option *options; + unsigned int option_count; }; enum vkd3d_shader_spirv_environment @@ -644,8 +653,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *spirv, unsigned int compiler_options); +int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, @@ -675,7 +683,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature * Function pointer typedefs for vkd3d-shader functions. */ typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *spirv, unsigned int compiler_options); + struct vkd3d_shader_code *spirv); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5770341..9b655e4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2062,7 +2062,7 @@ struct vkd3d_dxbc_compiler { struct vkd3d_spirv_builder spirv_builder; - uint32_t options; + bool strip_debug; struct rb_tree symbol_table; uint32_t temp_id; @@ -2123,8 +2123,7 @@ static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler); struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, - const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, - const struct vkd3d_shader_compile_info *compile_info, + const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_info *scan_info) { const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; @@ -2164,7 +2163,22 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader } vkd3d_spirv_builder_init(&compiler->spirv_builder); - compiler->options = compiler_options; + + for (i = 0; i < compile_info->option_count; ++i) + { + const struct vkd3d_shader_compile_option *option = &compile_info->options[i]; + + switch (option->name) + { + case VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG: + compiler->strip_debug = !!option->value; + break; + + default: + WARN("Ignoring unrecognised option %#x with value %#x.\n", option->name, option->value); + break; + } + } rb_init(&compiler->symbol_table, vkd3d_symbol_compare); @@ -8723,7 +8737,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); } - if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) + if (compiler->strip_debug) vkd3d_spirv_stream_clear(&builder->debug_stream); if (!vkd3d_spirv_compile_module(builder, spirv)) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ae4a9b4..7179436 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -103,8 +103,7 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *spirv, unsigned int compiler_options) +int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) { struct vkd3d_shader_instruction instruction; struct vkd3d_dxbc_compiler *spirv_compiler; @@ -112,8 +111,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in struct vkd3d_shader_parser parser; int ret; - TRACE("compile_info %p, spirv %p, compiler_options %#x.\n", - compile_info, spirv, compiler_options); + TRACE("compile_info %p, spirv %p.\n", compile_info, spirv); if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) { @@ -135,7 +133,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in vkd3d_shader_trace(parser.data); if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compiler_options, compile_info, &scan_info))) + &parser.shader_desc, compile_info, &scan_info))) { ERR("Failed to create DXBC compiler.\n"); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9945c6b..ecfd665 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -820,8 +820,7 @@ int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, - const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, - const struct vkd3d_shader_compile_info *compile_info, + const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 831bbde..8bc2595 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1350,8 +1350,10 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.next = shader_interface; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; + compile_info.options = NULL; + compile_info.option_count = 0; - if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0)) < 0) + if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5f7b0c2..d33dafd 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -26,6 +26,8 @@ #include "vkd3d_common.h" #include "vkd3d_shader.h" +#define MAX_COMPILE_OPTIONS 1 + static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) { struct stat st; @@ -87,11 +89,11 @@ static bool write_shader(const struct vkd3d_shader_code *shader, const char *fil static const struct { const char *name; - enum vkd3d_shader_compiler_option compiler_option; + enum vkd3d_shader_compile_option_name compile_option; } compiler_options[] = { - {"--strip-debug", VKD3D_SHADER_STRIP_DEBUG}, + {"--strip-debug", VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG}, }; static void print_usage(const char *program_name) @@ -108,9 +110,38 @@ struct options { const char *filename; const char *output_filename; - unsigned int compiler_options; + struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; + unsigned int compile_option_count; }; +static void add_compile_option(struct options *options, + enum vkd3d_shader_compile_option_name name, unsigned int value) +{ + struct vkd3d_shader_compile_option *o; + unsigned int i; + + for (i = 0; i < options->compile_option_count; ++i) + { + o = &options->compile_options[i]; + + if (o->name == name) + { + o->value = value; + return; + } + } + + if (options->compile_option_count >= ARRAY_SIZE(options->compile_options)) + { + fprintf(stderr, "Ignoring option.\n"); + return; + } + + o = &options->compile_options[options->compile_option_count++]; + o->name = name; + o->value = value; +} + static bool parse_command_line(int argc, char **argv, struct options *options) { unsigned int i, j; @@ -134,7 +165,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { if (!strcmp(argv[i], compiler_options[j].name)) { - options->compiler_options |= compiler_options[j].compiler_option; + add_compile_option(options, compiler_options[j].compile_option, 1); break; } } @@ -161,6 +192,8 @@ int main(int argc, char **argv) info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; + info.options = options.compile_options; + info.option_count = options.compile_option_count; if (!read_shader(&info.source, options.filename)) { @@ -168,7 +201,7 @@ int main(int argc, char **argv) return 1; } - ret = vkd3d_shader_compile_dxbc(&info, &spirv, options.compiler_options); + ret = vkd3d_shader_compile_dxbc(&info, &spirv); vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 9e5bdf3..00c6f95 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -49,13 +49,20 @@ static void test_invalid_shaders(void) 0x3f800000, 0x3f800000, 0x3f800000, 0x01000002, 0x01000015, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; + static const struct vkd3d_shader_compile_option option = + { + .name = VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, + .value = 1, + }; info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source.code = ps_break_code; info.source.size = sizeof(ps_break_code); + info.options = &option; + info.option_count = 1; - rc = vkd3d_shader_compile_dxbc(&info, &spirv, VKD3D_SHADER_STRIP_DEBUG); + rc = vkd3d_shader_compile_dxbc(&info, &spirv); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } @@ -127,8 +134,10 @@ static void test_vkd3d_shader_pfns(void) compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = NULL; compile_info.source = vs; + compile_info.options = NULL; + compile_info.option_count = 0; - rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0); + rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_shader_code(&spirv); -- 2.11.0

2 1

[PATCH vkd3d 3/5] vkd3d-shader: Pass the target info as part of the vkd3d_shader_compile_info structure chain.
by Henri Verbeet 19 Jun '20

19 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 7 +++---- libs/vkd3d-shader/spirv.c | 19 +++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 36 ++++---------------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 - libs/vkd3d/state.c | 18 +++++++++------- programs/vkd3d-compiler/main.c | 2 +- tests/vkd3d_shader_api.c | 4 ++-- 7 files changed, 38 insertions(+), 49 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 5dd5d93..e4c86ed 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -245,6 +245,7 @@ enum vkd3d_shader_spirv_extension VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), }; +/* Extends vkd3d_shader_compile_info. */ struct vkd3d_shader_spirv_target_info { enum vkd3d_shader_structure_type type; @@ -644,8 +645,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_spirv_target_info *target_info); + struct vkd3d_shader_code *spirv, unsigned int compiler_options); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, @@ -675,8 +675,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature * Function pointer typedefs for vkd3d-shader functions. */ typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_spirv_target_info *target_info); + struct vkd3d_shader_code *spirv, unsigned int compiler_options); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 76ec221..5770341 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2125,12 +2125,12 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, const struct vkd3d_shader_compile_info *compile_info, - const struct vkd3d_shader_spirv_target_info *target_info, const struct vkd3d_shader_scan_info *scan_info) { const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; const struct vkd3d_shader_interface_info *shader_interface; + const struct vkd3d_shader_spirv_target_info *target_info; struct vkd3d_dxbc_compiler *compiler; unsigned int max_element_count; unsigned int i; @@ -2140,6 +2140,22 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader memset(compiler, 0, sizeof(*compiler)); + if ((target_info = vkd3d_find_struct(compile_info->next, SPIRV_TARGET_INFO))) + { + switch (target_info->environment) + { + case VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5: + case VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0: + break; + default: + WARN("Invalid target environment %#x.\n", target_info->environment); + vkd3d_free(compiler); + return NULL; + } + + compiler->spirv_target_info = target_info; + } + max_element_count = max(output_signature->element_count, patch_constant_signature->element_count); if (!(compiler->output_info = vkd3d_calloc(max_element_count, sizeof(*compiler->output_info)))) { @@ -2175,7 +2191,6 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->push_constants[i].pc = shader_interface->push_constant_buffers[i]; } } - compiler->spirv_target_info = target_info; compiler->scan_info = scan_info; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f11b3fc..ae4a9b4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -103,33 +103,8 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } -static int vkd3d_shader_validate_spirv_target_info(const struct vkd3d_shader_spirv_target_info *info) -{ - if (!info) - return VKD3D_OK; - - if (info->type != VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO) - { - WARN("Invalid structure type %#x.\n", info->type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - - switch (info->environment) - { - case VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5: - case VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0: - break; - default: - WARN("Invalid target environment %#x.\n", info->environment); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - - return VKD3D_OK; -} - int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_spirv_target_info *info) + struct vkd3d_shader_code *spirv, unsigned int compiler_options) { struct vkd3d_shader_instruction instruction; struct vkd3d_dxbc_compiler *spirv_compiler; @@ -137,8 +112,8 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in struct vkd3d_shader_parser parser; int ret; - TRACE("compile_info %p, spirv %p, compiler_options %#x, info %p.\n", - compile_info, spirv, compiler_options, info); + TRACE("compile_info %p, spirv %p, compiler_options %#x.\n", + compile_info, spirv, compiler_options); if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) { @@ -146,9 +121,6 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in return VKD3D_ERROR_INVALID_ARGUMENT; } - if ((ret = vkd3d_shader_validate_spirv_target_info(info)) < 0) - return ret; - scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; scan_info.next = NULL; if ((ret = vkd3d_shader_scan_dxbc(&compile_info->source, &scan_info)) < 0) @@ -163,7 +135,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in vkd3d_shader_trace(parser.data); if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compiler_options, compile_info, info, &scan_info))) + &parser.shader_desc, compiler_options, compile_info, &scan_info))) { ERR("Failed to create DXBC compiler.\n"); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8dd76fa..9945c6b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -822,7 +822,6 @@ struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, const struct vkd3d_shader_compile_info *compile_info, - const struct vkd3d_shader_spirv_target_info *target_info, const struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 1f60941..831bbde 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1326,8 +1326,7 @@ struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12Pipeline static HRESULT create_shader_stage(struct d3d12_device *device, struct VkPipelineShaderStageCreateInfo *stage_desc, enum VkShaderStageFlagBits stage, - const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, - const struct vkd3d_shader_spirv_target_info *target_info) + const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_shader_compile_info compile_info; @@ -1352,7 +1351,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; - if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, target_info)) < 0) + if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); @@ -1384,7 +1383,7 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, pipeline_info.pNext = NULL; pipeline_info.flags = 0; if (FAILED(hr = create_shader_stage(device, &pipeline_info.stage, - VK_SHADER_STAGE_COMPUTE_BIT, code, shader_interface, NULL))) + VK_SHADER_STAGE_COMPUTE_BIT, code, shader_interface))) return hr; pipeline_info.layout = vk_pipeline_layout; pipeline_info.basePipelineHandle = VK_NULL_HANDLE; @@ -1996,12 +1995,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s VkVertexInputBindingDivisorDescriptionEXT *binding_divisor; const struct vkd3d_vulkan_info *vk_info = &device->vk_info; uint32_t instance_divisors[D3D12_VS_INPUT_REGISTER_COUNT]; - const struct vkd3d_shader_spirv_target_info *target_info; uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; struct vkd3d_shader_parameter ps_shader_parameters[1]; struct vkd3d_shader_transform_feedback_info xfb_info; struct vkd3d_shader_spirv_target_info ps_target_info; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_spirv_target_info *target_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; bool have_attachment, is_dsv_format_unknown; @@ -2157,7 +2156,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!desc->PS.pShaderBytecode) { if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], - VK_SHADER_STAGE_FRAGMENT_BIT, &default_ps, NULL, NULL))) + VK_SHADER_STAGE_FRAGMENT_BIT, &default_ps, NULL))) goto fail; ++graphics->stage_count; @@ -2298,9 +2297,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } shader_interface.next = shader_stages[i].stage == xfb_stage ? &xfb_info : NULL; + if (target_info) + { + target_info->next = shader_interface.next; + shader_interface.next = target_info; + } if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], - shader_stages[i].stage, b, &shader_interface, target_info))) + shader_stages[i].stage, b, &shader_interface))) goto fail; ++graphics->stage_count; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 0cab836..5f7b0c2 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -168,7 +168,7 @@ int main(int argc, char **argv) return 1; } - ret = vkd3d_shader_compile_dxbc(&info, &spirv, options.compiler_options, NULL); + ret = vkd3d_shader_compile_dxbc(&info, &spirv, options.compiler_options); vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 4d5e7c1..9e5bdf3 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -55,7 +55,7 @@ static void test_invalid_shaders(void) info.source.code = ps_break_code; info.source.size = sizeof(ps_break_code); - rc = vkd3d_shader_compile_dxbc(&info, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL); + rc = vkd3d_shader_compile_dxbc(&info, &spirv, VKD3D_SHADER_STRIP_DEBUG); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } @@ -128,7 +128,7 @@ static void test_vkd3d_shader_pfns(void) compile_info.next = NULL; compile_info.source = vs; - rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, NULL); + rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_shader_code(&spirv); -- 2.11.0

2 1

[PATCH vkd3d 2/5] vkd3d-shader: Pass the interface info as part of the vkd3d_shader_compile_info structure chain.
by Henri Verbeet 19 Jun '20

19 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 3 +-- libs/vkd3d-shader/spirv.c | 5 +++-- libs/vkd3d-shader/vkd3d_shader_main.c | 13 +++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- libs/vkd3d/state.c | 4 ++-- programs/vkd3d-compiler/main.c | 2 +- tests/vkd3d_shader_api.c | 4 ++-- 7 files changed, 13 insertions(+), 20 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ec449bb..5dd5d93 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -179,6 +179,7 @@ struct vkd3d_shader_push_constant_buffer unsigned int size; /* in bytes */ }; +/* Extends vkd3d_shader_compile_info. */ struct vkd3d_shader_interface_info { enum vkd3d_shader_structure_type type; @@ -644,7 +645,6 @@ struct vkd3d_shader_signature int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *target_info); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); @@ -676,7 +676,6 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature */ typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *target_info); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3f6d526..76ec221 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2124,12 +2124,13 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, - const struct vkd3d_shader_interface_info *shader_interface, + const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_spirv_target_info *target_info, const struct vkd3d_shader_scan_info *scan_info) { const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; + const struct vkd3d_shader_interface_info *shader_interface; struct vkd3d_dxbc_compiler *compiler; unsigned int max_element_count; unsigned int i; @@ -2157,7 +2158,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->output_signature = &shader_desc->output_signature; compiler->patch_constant_signature = &shader_desc->patch_constant_signature; - if (shader_interface) + if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) { compiler->xfb_info = vkd3d_find_struct(shader_interface->next, TRANSFORM_FEEDBACK_INFO); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3d8829e..f11b3fc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -129,7 +129,6 @@ static int vkd3d_shader_validate_spirv_target_info(const struct vkd3d_shader_spi int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *info) { struct vkd3d_shader_instruction instruction; @@ -138,8 +137,8 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in struct vkd3d_shader_parser parser; int ret; - TRACE("compile_info %p, spirv %p, compiler_options %#x, shader_interface_info %p, info %p.\n", - compile_info, spirv, compiler_options, shader_interface_info, info); + TRACE("compile_info %p, spirv %p, compiler_options %#x, info %p.\n", + compile_info, spirv, compiler_options, info); if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) { @@ -147,12 +146,6 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in return VKD3D_ERROR_INVALID_ARGUMENT; } - if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO) - { - WARN("Invalid structure type %#x.\n", shader_interface_info->type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - if ((ret = vkd3d_shader_validate_spirv_target_info(info)) < 0) return ret; @@ -170,7 +163,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in vkd3d_shader_trace(parser.data); if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compiler_options, shader_interface_info, info, &scan_info))) + &parser.shader_desc, compiler_options, compile_info, info, &scan_info))) { ERR("Failed to create DXBC compiler.\n"); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a98eda6..8dd76fa 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -821,7 +821,7 @@ struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, - const struct vkd3d_shader_interface_info *shader_interface_info, + const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_spirv_target_info *target_info, const struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index fe44097..1f60941 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1348,11 +1348,11 @@ static HRESULT create_shader_stage(struct d3d12_device *device, shader_desc.flags = 0; compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; - compile_info.next = NULL; + compile_info.next = shader_interface; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; - if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, shader_interface, target_info)) < 0) + if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, target_info)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 7e73ab0..0cab836 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -168,7 +168,7 @@ int main(int argc, char **argv) return 1; } - ret = vkd3d_shader_compile_dxbc(&info, &spirv, options.compiler_options, NULL, NULL); + ret = vkd3d_shader_compile_dxbc(&info, &spirv, options.compiler_options, NULL); vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 8c9732c..4d5e7c1 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -55,7 +55,7 @@ static void test_invalid_shaders(void) info.source.code = ps_break_code; info.source.size = sizeof(ps_break_code); - rc = vkd3d_shader_compile_dxbc(&info, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL, NULL); + rc = vkd3d_shader_compile_dxbc(&info, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } @@ -128,7 +128,7 @@ static void test_vkd3d_shader_pfns(void) compile_info.next = NULL; compile_info.source = vs; - rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, NULL, NULL); + rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_shader_code(&spirv); -- 2.11.0

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Introduce struct vkd3d_shader_compile_info.
by Henri Verbeet 19 Jun '20

19 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 13 +++++++++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 18 ++++++++++++------ libs/vkd3d/state.c | 9 +++++++-- programs/vkd3d-compiler/main.c | 12 ++++++++---- tests/vkd3d_shader_api.c | 16 +++++++++++++--- 5 files changed, 51 insertions(+), 17 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e57b913..ec449bb 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -30,6 +30,7 @@ extern "C" { enum vkd3d_shader_structure_type { /* 1.2 */ + VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO, @@ -218,6 +219,14 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +struct vkd3d_shader_compile_info +{ + enum vkd3d_shader_structure_type type; + const void *next; + + struct vkd3d_shader_code source; +}; + enum vkd3d_shader_spirv_environment { VKD3D_SHADER_SPIRV_ENVIRONMENT_NONE, @@ -633,7 +642,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, +int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *target_info); @@ -665,7 +674,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature /* * Function pointer typedefs for vkd3d-shader functions. */ -typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_code *dxbc, +typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *target_info); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a56682e..3d8829e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -127,7 +127,7 @@ static int vkd3d_shader_validate_spirv_target_info(const struct vkd3d_shader_spi return VKD3D_OK; } -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, +int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *info) @@ -138,8 +138,14 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_parser parser; int ret; - TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface_info %p, info %p.\n", - dxbc->code, dxbc->size, spirv, compiler_options, shader_interface_info, info); + TRACE("compile_info %p, spirv %p, compiler_options %#x, shader_interface_info %p, info %p.\n", + compile_info, spirv, compiler_options, shader_interface_info, info); + + if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) + { + WARN("Invalid compile_info structure type %#x.\n", compile_info->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO) { @@ -152,13 +158,13 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; scan_info.next = NULL; - if ((ret = vkd3d_shader_scan_dxbc(dxbc, &scan_info)) < 0) + if ((ret = vkd3d_shader_scan_dxbc(&compile_info->source, &scan_info)) < 0) return ret; - if ((ret = vkd3d_shader_parser_init(&parser, dxbc)) < 0) + if ((ret = vkd3d_shader_parser_init(&parser, &compile_info->source)) < 0) return ret; - vkd3d_shader_dump_shader(parser.shader_version.type, dxbc); + vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); if (TRACE_ON()) vkd3d_shader_trace(parser.data); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7b14198..fe44097 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1329,8 +1329,8 @@ static HRESULT create_shader_stage(struct d3d12_device *device, const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, const struct vkd3d_shader_spirv_target_info *target_info) { - struct vkd3d_shader_code dxbc = {code->pShaderBytecode, code->BytecodeLength}; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct vkd3d_shader_compile_info compile_info; struct VkShaderModuleCreateInfo shader_desc; struct vkd3d_shader_code spirv = {0}; VkResult vr; @@ -1347,7 +1347,12 @@ static HRESULT create_shader_stage(struct d3d12_device *device, shader_desc.pNext = NULL; shader_desc.flags = 0; - if ((ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, shader_interface, target_info)) < 0) + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + compile_info.next = NULL; + compile_info.source.code = code->pShaderBytecode; + compile_info.source.size = code->BytecodeLength; + + if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, shader_interface, target_info)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index dd94374..7e73ab0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -148,7 +148,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) int main(int argc, char **argv) { - struct vkd3d_shader_code dxbc, spirv; + struct vkd3d_shader_compile_info info; + struct vkd3d_shader_code spirv; struct options options; int ret; @@ -158,14 +159,17 @@ int main(int argc, char **argv) return 1; } - if (!read_shader(&dxbc, options.filename)) + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + info.next = NULL; + + if (!read_shader(&info.source, options.filename)) { fprintf(stderr, "Failed to read DXBC shader.\n"); return 1; } - ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, options.compiler_options, NULL, NULL); - vkd3d_shader_free_shader_code(&dxbc); + ret = vkd3d_shader_compile_dxbc(&info, &spirv, options.compiler_options, NULL, NULL); + vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { fprintf(stderr, "Failed to compile DXBC shader, ret %d.\n", ret); diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index f9bec7e..8c9732c 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -23,6 +23,7 @@ static void test_invalid_shaders(void) { + struct vkd3d_shader_compile_info info; struct vkd3d_shader_code spirv; int rc; @@ -48,9 +49,13 @@ static void test_invalid_shaders(void) 0x3f800000, 0x3f800000, 0x3f800000, 0x01000002, 0x01000015, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const struct vkd3d_shader_code ps_break = {ps_break_code, sizeof(ps_break_code)}; - rc = vkd3d_shader_compile_dxbc(&ps_break, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL, NULL); + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + info.next = NULL; + info.source.code = ps_break_code; + info.source.size = sizeof(ps_break_code); + + rc = vkd3d_shader_compile_dxbc(&info, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL, NULL); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } @@ -68,6 +73,7 @@ static void test_vkd3d_shader_pfns(void) struct vkd3d_versioned_root_signature_desc root_signature_desc; struct vkd3d_shader_signature_element *element; + struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_scan_info scan_info; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; @@ -118,7 +124,11 @@ static void test_vkd3d_shader_pfns(void) ok(element, "Could not find shader signature element.\n"); pfn_vkd3d_shader_free_shader_signature(&signature); - rc = pfn_vkd3d_shader_compile_dxbc(&vs, &spirv, 0, NULL, NULL); + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + compile_info.next = NULL; + compile_info.source = vs; + + rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, NULL, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_shader_code(&spirv); -- 2.11.0

2 1

[PATCH v2 1/3] netio.sys: Support multiple simultaneous async operations for socket.
by Paul Gofman 19 Jun '20

19 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/netio.sys/netio.c | 162 +++++++++++++++++++++++++++-------------- 1 file changed, 106 insertions(+), 56 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index ed99a087a58..6cadff2e87c 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -53,6 +53,15 @@ struct listen_socket_callback_context SOCKET acceptor; }; +#define MAX_PENDING_IO 10 + +struct wsk_pending_io +{ + OVERLAPPED ovr; + TP_WAIT *tp_wait; + IRP *irp; +}; + struct wsk_socket_internal { WSK_SOCKET wsk_socket; @@ -63,12 +72,11 @@ struct wsk_socket_internal ADDRESS_FAMILY address_family; USHORT socket_type; ULONG protocol; - OVERLAPPED ovr; - TP_WAIT *tp_wait; - IRP *pending_irp; CRITICAL_SECTION cs_socket; + struct wsk_pending_io pending_io[MAX_PENDING_IO]; + union { struct listen_socket_callback_context listen_socket_callback_context; @@ -134,14 +142,9 @@ static inline void unlock_socket(struct wsk_socket_internal *socket) LeaveCriticalSection(&socket->cs_socket); } -static void socket_init(struct wsk_socket_internal *socket, PTP_WAIT_CALLBACK socket_async_callback) +static void socket_init(struct wsk_socket_internal *socket) { InitializeCriticalSection(&socket->cs_socket); - if (socket_async_callback) - { - socket->ovr.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - socket->tp_wait = CreateThreadpoolWait(socket_async_callback, socket, NULL); - } } static void dispatch_irp(IRP *irp, NTSTATUS status) @@ -152,6 +155,56 @@ static void dispatch_irp(IRP *irp, NTSTATUS status) IoCompleteRequest(irp, IO_NO_INCREMENT); } +static struct wsk_pending_io *allocate_pending_io(struct wsk_socket_internal *socket, + PTP_WAIT_CALLBACK socket_async_callback, IRP *irp) +{ + struct wsk_pending_io *io = socket->pending_io; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(socket->pending_io); ++i) + if (!io[i].irp) + break; + + if (i == ARRAY_SIZE(socket->pending_io)) + { + FIXME("Pending io requests count exceeds limit.\n"); + return NULL; + } + + io[i].irp = irp; + + if (io[i].tp_wait) + return &io[i]; + + io[i].ovr.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + io[i].tp_wait = CreateThreadpoolWait(socket_async_callback, socket, NULL); + + return &io[i]; +} + +static struct wsk_pending_io *find_pending_io(struct wsk_socket_internal *socket, TP_WAIT *tp_wait) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(socket->pending_io); ++i) + { + if (socket->pending_io[i].tp_wait == tp_wait) + return &socket->pending_io[i]; + } + + FIXME("Pending io not found for tp_wait %p.\n", tp_wait); + return NULL; +} + +static void dispatch_pending_io(struct wsk_pending_io *io, NTSTATUS status, ULONG_PTR information) +{ + TRACE("io %p, status %#x, information %#lx.\n", io, status, information); + + io->irp->IoStatus.Information = information; + dispatch_irp(io->irp, status); + io->irp = NULL; +} + static NTSTATUS WINAPI wsk_control_socket(WSK_SOCKET *socket, WSK_CONTROL_SOCKET_TYPE request_type, ULONG control_code, ULONG level, SIZE_T input_size, void *input_buffer, SIZE_T output_size, void *output_buffer, SIZE_T *output_size_returned, IRP *irp) @@ -168,18 +221,29 @@ static NTSTATUS WINAPI wsk_close_socket(WSK_SOCKET *socket, IRP *irp) { struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(socket); NTSTATUS status; + unsigned int i; TRACE("socket %p, irp %p.\n", socket, irp); lock_socket(s); - if (s->tp_wait) + for (i = 0; i < ARRAY_SIZE(s->pending_io); ++i) { - CancelIoEx((HANDLE)s->s, &s->ovr); - unlock_socket(s); - WaitForThreadpoolWaitCallbacks(s->tp_wait, FALSE); - lock_socket(s); - CloseThreadpoolWait(s->tp_wait); + struct wsk_pending_io *io = &s->pending_io[i]; + + if (io->tp_wait) + { + CancelIoEx((HANDLE)s->s, &io->ovr); + SetThreadpoolWait(io->tp_wait, NULL, NULL); + unlock_socket(s); + WaitForThreadpoolWaitCallbacks(io->tp_wait, FALSE); + lock_socket(s); + CloseThreadpoolWait(io->tp_wait); + CloseHandle(io->ovr.hEvent); + } + + if (io->irp) + dispatch_pending_io(io, STATUS_CANCELLED, 0); } if (s->flags & WSK_FLAG_LISTEN_SOCKET && s->callback_context.listen_socket_callback_context.acceptor) @@ -187,15 +251,6 @@ static NTSTATUS WINAPI wsk_close_socket(WSK_SOCKET *socket, IRP *irp) status = closesocket(s->s) ? sock_error_to_ntstatus(WSAGetLastError()) : STATUS_SUCCESS; - if (s->ovr.hEvent) - CloseHandle(s->ovr.hEvent); - - if (s->pending_irp) - { - s->pending_irp->IoStatus.Information = 0; - dispatch_irp(s->pending_irp, STATUS_CANCELLED); - } - unlock_socket(s); DeleteCriticalSection(&s->cs_socket); heap_free(socket); @@ -230,18 +285,16 @@ static NTSTATUS WINAPI wsk_bind(WSK_SOCKET *socket, SOCKADDR *local_address, ULO return STATUS_PENDING; } -static void create_accept_socket(struct wsk_socket_internal *socket) +static void create_accept_socket(struct wsk_socket_internal *socket, struct wsk_pending_io *io) { struct listen_socket_callback_context *context = &socket->callback_context.listen_socket_callback_context; struct wsk_socket_internal *accept_socket; - NTSTATUS status; if (!(accept_socket = heap_alloc_zero(sizeof(*accept_socket)))) { ERR("No memory.\n"); - status = STATUS_NO_MEMORY; - socket->pending_irp->IoStatus.Information = 0; + dispatch_pending_io(io, STATUS_NO_MEMORY, 0); } else { @@ -254,15 +307,11 @@ static void create_accept_socket(struct wsk_socket_internal *socket) accept_socket->address_family = socket->address_family; accept_socket->protocol = socket->protocol; accept_socket->flags = WSK_FLAG_CONNECTION_SOCKET; - socket_init(accept_socket, NULL); + socket_init(accept_socket); /* TODO: fill local and remote addresses. */ - socket->pending_irp->IoStatus.Information = (ULONG_PTR)&accept_socket->wsk_socket; - status = STATUS_SUCCESS; + dispatch_pending_io(io, STATUS_SUCCESS, (ULONG_PTR)&accept_socket->wsk_socket); } - TRACE("status %#x.\n", status); - dispatch_irp(socket->pending_irp, status); - socket->pending_irp = NULL; } static void WINAPI accept_callback(TP_CALLBACK_INSTANCE *instance, void *socket_, TP_WAIT *wait, @@ -270,24 +319,24 @@ static void WINAPI accept_callback(TP_CALLBACK_INSTANCE *instance, void *socket_ { struct listen_socket_callback_context *context; struct wsk_socket_internal *socket = socket_; + struct wsk_pending_io *io; DWORD size; TRACE("instance %p, socket %p, wait %p, wait_result %#x.\n", instance, socket, wait, wait_result); lock_socket(socket); context = &socket->callback_context.listen_socket_callback_context; + io = find_pending_io(socket, wait); - if (GetOverlappedResult((HANDLE)socket->s, &socket->ovr, &size, FALSE)) + if (GetOverlappedResult((HANDLE)socket->s, &io->ovr, &size, FALSE)) { - create_accept_socket(socket); + create_accept_socket(socket, io); } else { closesocket(context->acceptor); context->acceptor = 0; - socket->pending_irp->IoStatus.Information = 0; - dispatch_irp(socket->pending_irp, socket->ovr.Internal); - socket->pending_irp = NULL; + dispatch_pending_io(io, io->ovr.Internal, 0); } unlock_socket(socket); } @@ -314,8 +363,8 @@ static NTSTATUS WINAPI wsk_accept(WSK_SOCKET *listen_socket, ULONG flags, void * struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(listen_socket); static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; struct listen_socket_callback_context *context; + struct wsk_pending_io *io; SOCKET acceptor; - NTSTATUS status; DWORD size; int error; @@ -329,44 +378,47 @@ static NTSTATUS WINAPI wsk_accept(WSK_SOCKET *listen_socket, ULONG flags, void * if (!InitOnceExecuteOnce(&init_once, init_accept_functions, (void *)s->s, NULL)) { - status = STATUS_UNSUCCESSFUL; - dispatch_irp(irp, status); - return status; + dispatch_irp(irp, STATUS_UNSUCCESSFUL); + return STATUS_PENDING; } lock_socket(s); + if (!(io = allocate_pending_io(s, accept_callback, irp))) + { + irp->IoStatus.Information = 0; + dispatch_irp(irp, STATUS_UNSUCCESSFUL); + unlock_socket(s); + return STATUS_PENDING; + } + context = &s->callback_context.listen_socket_callback_context; if ((acceptor = WSASocketW(s->address_family, s->socket_type, s->protocol, NULL, 0, WSA_FLAG_OVERLAPPED)) == INVALID_SOCKET) { - status = sock_error_to_ntstatus(WSAGetLastError()); - dispatch_irp(irp, status); + dispatch_pending_io(io, sock_error_to_ntstatus(WSAGetLastError()), 0); unlock_socket(s); - return status; + return STATUS_PENDING; } - s->pending_irp = irp; context->remote_address = remote_address; context->client_dispatch = accept_socket_dispatch; context->client_context = accept_socket_context; context->acceptor = acceptor; if (pAcceptEx(s->s, acceptor, context->addr_buffer, 0, - sizeof(SOCKADDR) + 16, sizeof(SOCKADDR) + 16, &size, &s->ovr)) + sizeof(SOCKADDR) + 16, sizeof(SOCKADDR) + 16, &size, &io->ovr)) { - create_accept_socket(s); + create_accept_socket(s, io); } else if ((error = WSAGetLastError()) == ERROR_IO_PENDING) { - SetThreadpoolWait(s->tp_wait, s->ovr.hEvent, NULL); + SetThreadpoolWait(io->tp_wait, io->ovr.hEvent, NULL); } else { closesocket(acceptor); context->acceptor = 0; - irp->IoStatus.Information = 0; - dispatch_irp(irp, sock_error_to_ntstatus(error)); - s->pending_irp = NULL; + dispatch_pending_io(io, sock_error_to_ntstatus(error), 0); } unlock_socket(s); @@ -490,7 +542,6 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam PETHREAD owning_thread, SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) { struct wsk_socket_internal *socket; - PTP_WAIT_CALLBACK async_callback; NTSTATUS status; SOCKET s; @@ -532,7 +583,6 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam { case WSK_FLAG_LISTEN_SOCKET: socket->wsk_socket.Dispatch = &wsk_provider_listen_dispatch; - async_callback = accept_callback; break; case WSK_FLAG_CONNECTION_SOCKET: @@ -547,7 +597,7 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam goto done; } - socket_init(socket, async_callback); + socket_init(socket); irp->IoStatus.Information = (ULONG_PTR)&socket->wsk_socket; status = STATUS_SUCCESS; -- 2.26.2

1 2

[PATCH 1/3] netio.sys: Support multiple simultaneous async operations for socket.
by Paul Gofman 19 Jun '20

19 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/netio.sys/netio.c | 162 +++++++++++++++++++++++++++-------------- 1 file changed, 106 insertions(+), 56 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index ed99a087a58..6cadff2e87c 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -53,6 +53,15 @@ struct listen_socket_callback_context SOCKET acceptor; }; +#define MAX_PENDING_IO 10 + +struct wsk_pending_io +{ + OVERLAPPED ovr; + TP_WAIT *tp_wait; + IRP *irp; +}; + struct wsk_socket_internal { WSK_SOCKET wsk_socket; @@ -63,12 +72,11 @@ struct wsk_socket_internal ADDRESS_FAMILY address_family; USHORT socket_type; ULONG protocol; - OVERLAPPED ovr; - TP_WAIT *tp_wait; - IRP *pending_irp; CRITICAL_SECTION cs_socket; + struct wsk_pending_io pending_io[MAX_PENDING_IO]; + union { struct listen_socket_callback_context listen_socket_callback_context; @@ -134,14 +142,9 @@ static inline void unlock_socket(struct wsk_socket_internal *socket) LeaveCriticalSection(&socket->cs_socket); } -static void socket_init(struct wsk_socket_internal *socket, PTP_WAIT_CALLBACK socket_async_callback) +static void socket_init(struct wsk_socket_internal *socket) { InitializeCriticalSection(&socket->cs_socket); - if (socket_async_callback) - { - socket->ovr.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - socket->tp_wait = CreateThreadpoolWait(socket_async_callback, socket, NULL); - } } static void dispatch_irp(IRP *irp, NTSTATUS status) @@ -152,6 +155,56 @@ static void dispatch_irp(IRP *irp, NTSTATUS status) IoCompleteRequest(irp, IO_NO_INCREMENT); } +static struct wsk_pending_io *allocate_pending_io(struct wsk_socket_internal *socket, + PTP_WAIT_CALLBACK socket_async_callback, IRP *irp) +{ + struct wsk_pending_io *io = socket->pending_io; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(socket->pending_io); ++i) + if (!io[i].irp) + break; + + if (i == ARRAY_SIZE(socket->pending_io)) + { + FIXME("Pending io requests count exceeds limit.\n"); + return NULL; + } + + io[i].irp = irp; + + if (io[i].tp_wait) + return &io[i]; + + io[i].ovr.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + io[i].tp_wait = CreateThreadpoolWait(socket_async_callback, socket, NULL); + + return &io[i]; +} + +static struct wsk_pending_io *find_pending_io(struct wsk_socket_internal *socket, TP_WAIT *tp_wait) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(socket->pending_io); ++i) + { + if (socket->pending_io[i].tp_wait == tp_wait) + return &socket->pending_io[i]; + } + + FIXME("Pending io not found for tp_wait %p.\n", tp_wait); + return NULL; +} + +static void dispatch_pending_io(struct wsk_pending_io *io, NTSTATUS status, ULONG_PTR information) +{ + TRACE("io %p, status %#x, information %#lx.\n", io, status, information); + + io->irp->IoStatus.Information = information; + dispatch_irp(io->irp, status); + io->irp = NULL; +} + static NTSTATUS WINAPI wsk_control_socket(WSK_SOCKET *socket, WSK_CONTROL_SOCKET_TYPE request_type, ULONG control_code, ULONG level, SIZE_T input_size, void *input_buffer, SIZE_T output_size, void *output_buffer, SIZE_T *output_size_returned, IRP *irp) @@ -168,18 +221,29 @@ static NTSTATUS WINAPI wsk_close_socket(WSK_SOCKET *socket, IRP *irp) { struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(socket); NTSTATUS status; + unsigned int i; TRACE("socket %p, irp %p.\n", socket, irp); lock_socket(s); - if (s->tp_wait) + for (i = 0; i < ARRAY_SIZE(s->pending_io); ++i) { - CancelIoEx((HANDLE)s->s, &s->ovr); - unlock_socket(s); - WaitForThreadpoolWaitCallbacks(s->tp_wait, FALSE); - lock_socket(s); - CloseThreadpoolWait(s->tp_wait); + struct wsk_pending_io *io = &s->pending_io[i]; + + if (io->tp_wait) + { + CancelIoEx((HANDLE)s->s, &io->ovr); + SetThreadpoolWait(io->tp_wait, NULL, NULL); + unlock_socket(s); + WaitForThreadpoolWaitCallbacks(io->tp_wait, FALSE); + lock_socket(s); + CloseThreadpoolWait(io->tp_wait); + CloseHandle(io->ovr.hEvent); + } + + if (io->irp) + dispatch_pending_io(io, STATUS_CANCELLED, 0); } if (s->flags & WSK_FLAG_LISTEN_SOCKET && s->callback_context.listen_socket_callback_context.acceptor) @@ -187,15 +251,6 @@ static NTSTATUS WINAPI wsk_close_socket(WSK_SOCKET *socket, IRP *irp) status = closesocket(s->s) ? sock_error_to_ntstatus(WSAGetLastError()) : STATUS_SUCCESS; - if (s->ovr.hEvent) - CloseHandle(s->ovr.hEvent); - - if (s->pending_irp) - { - s->pending_irp->IoStatus.Information = 0; - dispatch_irp(s->pending_irp, STATUS_CANCELLED); - } - unlock_socket(s); DeleteCriticalSection(&s->cs_socket); heap_free(socket); @@ -230,18 +285,16 @@ static NTSTATUS WINAPI wsk_bind(WSK_SOCKET *socket, SOCKADDR *local_address, ULO return STATUS_PENDING; } -static void create_accept_socket(struct wsk_socket_internal *socket) +static void create_accept_socket(struct wsk_socket_internal *socket, struct wsk_pending_io *io) { struct listen_socket_callback_context *context = &socket->callback_context.listen_socket_callback_context; struct wsk_socket_internal *accept_socket; - NTSTATUS status; if (!(accept_socket = heap_alloc_zero(sizeof(*accept_socket)))) { ERR("No memory.\n"); - status = STATUS_NO_MEMORY; - socket->pending_irp->IoStatus.Information = 0; + dispatch_pending_io(io, STATUS_NO_MEMORY, 0); } else { @@ -254,15 +307,11 @@ static void create_accept_socket(struct wsk_socket_internal *socket) accept_socket->address_family = socket->address_family; accept_socket->protocol = socket->protocol; accept_socket->flags = WSK_FLAG_CONNECTION_SOCKET; - socket_init(accept_socket, NULL); + socket_init(accept_socket); /* TODO: fill local and remote addresses. */ - socket->pending_irp->IoStatus.Information = (ULONG_PTR)&accept_socket->wsk_socket; - status = STATUS_SUCCESS; + dispatch_pending_io(io, STATUS_SUCCESS, (ULONG_PTR)&accept_socket->wsk_socket); } - TRACE("status %#x.\n", status); - dispatch_irp(socket->pending_irp, status); - socket->pending_irp = NULL; } static void WINAPI accept_callback(TP_CALLBACK_INSTANCE *instance, void *socket_, TP_WAIT *wait, @@ -270,24 +319,24 @@ static void WINAPI accept_callback(TP_CALLBACK_INSTANCE *instance, void *socket_ { struct listen_socket_callback_context *context; struct wsk_socket_internal *socket = socket_; + struct wsk_pending_io *io; DWORD size; TRACE("instance %p, socket %p, wait %p, wait_result %#x.\n", instance, socket, wait, wait_result); lock_socket(socket); context = &socket->callback_context.listen_socket_callback_context; + io = find_pending_io(socket, wait); - if (GetOverlappedResult((HANDLE)socket->s, &socket->ovr, &size, FALSE)) + if (GetOverlappedResult((HANDLE)socket->s, &io->ovr, &size, FALSE)) { - create_accept_socket(socket); + create_accept_socket(socket, io); } else { closesocket(context->acceptor); context->acceptor = 0; - socket->pending_irp->IoStatus.Information = 0; - dispatch_irp(socket->pending_irp, socket->ovr.Internal); - socket->pending_irp = NULL; + dispatch_pending_io(io, io->ovr.Internal, 0); } unlock_socket(socket); } @@ -314,8 +363,8 @@ static NTSTATUS WINAPI wsk_accept(WSK_SOCKET *listen_socket, ULONG flags, void * struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(listen_socket); static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; struct listen_socket_callback_context *context; + struct wsk_pending_io *io; SOCKET acceptor; - NTSTATUS status; DWORD size; int error; @@ -329,44 +378,47 @@ static NTSTATUS WINAPI wsk_accept(WSK_SOCKET *listen_socket, ULONG flags, void * if (!InitOnceExecuteOnce(&init_once, init_accept_functions, (void *)s->s, NULL)) { - status = STATUS_UNSUCCESSFUL; - dispatch_irp(irp, status); - return status; + dispatch_irp(irp, STATUS_UNSUCCESSFUL); + return STATUS_PENDING; } lock_socket(s); + if (!(io = allocate_pending_io(s, accept_callback, irp))) + { + irp->IoStatus.Information = 0; + dispatch_irp(irp, STATUS_UNSUCCESSFUL); + unlock_socket(s); + return STATUS_PENDING; + } + context = &s->callback_context.listen_socket_callback_context; if ((acceptor = WSASocketW(s->address_family, s->socket_type, s->protocol, NULL, 0, WSA_FLAG_OVERLAPPED)) == INVALID_SOCKET) { - status = sock_error_to_ntstatus(WSAGetLastError()); - dispatch_irp(irp, status); + dispatch_pending_io(io, sock_error_to_ntstatus(WSAGetLastError()), 0); unlock_socket(s); - return status; + return STATUS_PENDING; } - s->pending_irp = irp; context->remote_address = remote_address; context->client_dispatch = accept_socket_dispatch; context->client_context = accept_socket_context; context->acceptor = acceptor; if (pAcceptEx(s->s, acceptor, context->addr_buffer, 0, - sizeof(SOCKADDR) + 16, sizeof(SOCKADDR) + 16, &size, &s->ovr)) + sizeof(SOCKADDR) + 16, sizeof(SOCKADDR) + 16, &size, &io->ovr)) { - create_accept_socket(s); + create_accept_socket(s, io); } else if ((error = WSAGetLastError()) == ERROR_IO_PENDING) { - SetThreadpoolWait(s->tp_wait, s->ovr.hEvent, NULL); + SetThreadpoolWait(io->tp_wait, io->ovr.hEvent, NULL); } else { closesocket(acceptor); context->acceptor = 0; - irp->IoStatus.Information = 0; - dispatch_irp(irp, sock_error_to_ntstatus(error)); - s->pending_irp = NULL; + dispatch_pending_io(io, sock_error_to_ntstatus(error), 0); } unlock_socket(s); @@ -490,7 +542,6 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam PETHREAD owning_thread, SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) { struct wsk_socket_internal *socket; - PTP_WAIT_CALLBACK async_callback; NTSTATUS status; SOCKET s; @@ -532,7 +583,6 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam { case WSK_FLAG_LISTEN_SOCKET: socket->wsk_socket.Dispatch = &wsk_provider_listen_dispatch; - async_callback = accept_callback; break; case WSK_FLAG_CONNECTION_SOCKET: @@ -547,7 +597,7 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam goto done; } - socket_init(socket, async_callback); + socket_init(socket); irp->IoStatus.Information = (ULONG_PTR)&socket->wsk_socket; status = STATUS_SUCCESS; -- 2.26.2

1 2

Store the surface rectangle in the server
by 龙超 19 Jun '20

19 Jun '20

2 1

[PATCH] gdi32: Add support for GCP_USEKERNING to GetCharacterPlacement.
by Dmitry Timoshkov 19 Jun '20

19 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/font.c | 77 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8788426a2c..0ad6502a9c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3278,6 +3278,55 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, return ret; } +static int kern_pair(const KERNINGPAIR *kern, int count, WCHAR c1, WCHAR c2) +{ + int i; + + for (i = 0; i < count; i++) + { + if (kern[i].wFirst == c1 && kern[i].wSecond == c2) + return kern[i].iKernAmount; + } + + return 0; +} + +static int *kern_string(HDC hdc, const WCHAR *str, int len, int *kern_total) +{ + int i, count; + KERNINGPAIR *kern = NULL; + int *ret; + + *kern_total = 0; + + ret = heap_alloc(len * sizeof(*ret)); + if (!ret) return NULL; + + count = GetKerningPairsW(hdc, 0, NULL); + if (count) + { + kern = heap_alloc(count * sizeof(*kern)); + if (!kern) + { + heap_free(ret); + return NULL; + } + + GetKerningPairsW(hdc, count, kern); + } + + for (i = 0; i < len - 1; i++) + { + ret[i] = kern_pair(kern, count, str[i], str[i + 1]); + *kern_total += ret[i]; + } + + ret[len - 1] = 0; /* no kerning for last element */ + + heap_free(kern); + return ret; +} + /************************************************************************* * GetCharacterPlacementW [GDI32.@] * @@ -3309,6 +3358,7 @@ GetCharacterPlacementW( DWORD ret=0; SIZE size; UINT i, nSet; + int *kern = NULL, kern_total = 0; TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); @@ -3325,7 +3375,7 @@ GetCharacterPlacementW( lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); - if(dwFlags&(~GCP_REORDER)) + if (dwFlags & ~(GCP_REORDER | GCP_USEKERNING)) FIXME("flags 0x%08x ignored\n", dwFlags); if(lpResults->lpClass) FIXME("classes not implemented\n"); @@ -3358,6 +3408,16 @@ GetCharacterPlacementW( nSet, lpResults->lpOrder, NULL, NULL ); } + if (dwFlags & GCP_USEKERNING) + { + kern = kern_string(hdc, lpString, nSet, &kern_total); + if (!kern) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + /* FIXME: Will use the placement chars */ if (lpResults->lpDx) { @@ -3365,7 +3425,11 @@ GetCharacterPlacementW( for (i = 0; i < nSet; i++) { if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) - lpResults->lpDx[i]= c; + { + lpResults->lpDx[i] = c; + if (dwFlags & GCP_USEKERNING) + lpResults->lpDx[i] += kern[i]; + } } } @@ -3375,15 +3439,22 @@ GetCharacterPlacementW( lpResults->lpCaretPos[0] = 0; for (i = 1; i < nSet; i++) + { + if (dwFlags & GCP_USEKERNING) + pos += kern[i]; + if (GetTextExtentPoint32W(hdc, &(lpString[i - 1]), 1, &size)) lpResults->lpCaretPos[i] = (pos += size.cx); + } } if(lpResults->lpGlyphs) GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); if (GetTextExtentPoint32W(hdc, lpString, uCount, &size)) - ret = MAKELONG(size.cx, size.cy); + ret = MAKELONG(size.cx + kern_total, size.cy); + + heap_free(kern); return ret; } -- 2.26.2

2 1

[PATCH V3 2/2] kernel32: Adjust toolhelp thread return order.
by Changping Yu 19 Jun '20

19 Jun '20

2 1

[PATCH V3 1/2] kernel32/tests: Add tests for getting main thread id by, toolhelp.
by Changping Yu 19 Jun '20

19 Jun '20

2 1

[PATCH V3 1/2] kernel32/tests: Add tests for getting main thread id by, toolhelp.
by Changping Yu 19 Jun '20

19 Jun '20

2 1

[PATCH V3 2/2] kernel32: Adjust toolhelp thread return order.
by Changping Yu 19 Jun '20

19 Jun '20

2 1

[PATCH V2 2/2] kernel32: Adjust toolhelp thread return order.
by Yu Changping 19 Jun '20

19 Jun '20

2 1

[PATCH V2 1/2] kernel32/tests: Add tests for getting main thread id by toolhelp.
by Yu Changping 19 Jun '20

19 Jun '20

2 1

[PATCH] winegstreamer: Clear the "colorimetry" and "chroma-site" fields in amt_to_gst_caps_video().
by Zebediah Figura 19 Jun '20

19 Jun '20

These fields don't prevent us from connecting, but they may force videoconvert to do an expensive conversion where not necessary. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b9c91245f82..75ddb3082e6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -416,8 +416,8 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) /* Clear some fields that shouldn't prevent us from connecting. */ for (i = 0; i < gst_caps_get_size(caps); ++i) { - gst_structure_remove_field(gst_caps_get_structure(caps, i), "framerate"); - gst_structure_remove_field(gst_caps_get_structure(caps, i), "pixel-aspect-ratio"); + gst_structure_remove_fields(gst_caps_get_structure(caps, i), + "framerate", "pixel-aspect-ratio", "colorimetry", "chroma-site", NULL); } } return caps; -- 2.27.0

1 0

[PATCH] windowscodecs/tests: Format ok() message for tests/ddsformat.c.
by Ziqing Hui 19 Jun '20

19 Jun '20

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

2 2

[PATCH V2 1/2] kernel32/tests: Add tests for getting main thread id by toolhelp.
by Yu Changping 19 Jun '20

19 Jun '20

1 0

[PATCH V2 2/2] kernel32: Adjust toolhelp thread return order.
by Yu Changping 19 Jun '20

19 Jun '20

1 0

[PATCH 1/3] amstream: Get rid of the IDirectDrawStreamSampleImpl typedef.
by Gijs Vermeulen 18 Jun '20

18 Jun '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 73 +++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 1c924e40a2..e2f24c3b4c 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -952,21 +952,22 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) return S_OK; } -typedef struct { +struct ddraw_sample +{ IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; IMediaStream *parent; IDirectDrawSurface *surface; RECT rect; -} IDirectDrawStreamSampleImpl; +}; -static inline IDirectDrawStreamSampleImpl *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) +static inline struct ddraw_sample *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) { - return CONTAINING_RECORD(iface, IDirectDrawStreamSampleImpl, IDirectDrawStreamSample_iface); + return CONTAINING_RECORD(iface, struct ddraw_sample, IDirectDrawStreamSample_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_QueryInterface(IDirectDrawStreamSample *iface, +static HRESULT WINAPI ddraw_sample_QueryInterface(IDirectDrawStreamSample *iface, REFIID riid, void **ret_iface) { TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); @@ -986,43 +987,43 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_QueryInterface(IDirectDrawStre return E_NOINTERFACE; } -static ULONG WINAPI IDirectDrawStreamSampleImpl_AddRef(IDirectDrawStreamSample *iface) +static ULONG WINAPI ddraw_sample_AddRef(IDirectDrawStreamSample *iface) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); + ULONG ref = InterlockedIncrement(&sample->ref); TRACE("(%p)->(): new ref = %u\n", iface, ref); return ref; } -static ULONG WINAPI IDirectDrawStreamSampleImpl_Release(IDirectDrawStreamSample *iface) +static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); + ULONG ref = InterlockedDecrement(&sample->ref); TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) { - if (This->surface) - IDirectDrawSurface_Release(This->surface); - IMediaStream_Release(This->parent); - HeapFree(GetProcessHeap(), 0, This); + if (sample->surface) + IDirectDrawSurface_Release(sample->surface); + IMediaStream_Release(sample->parent); + HeapFree(GetProcessHeap(), 0, sample); } return ref; } /*** IStreamSample methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetMediaStream(IDirectDrawStreamSample *iface, IMediaStream **media_stream) +static HRESULT WINAPI ddraw_sample_GetMediaStream(IDirectDrawStreamSample *iface, IMediaStream **media_stream) { FIXME("(%p)->(%p): stub\n", iface, media_stream); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSampleTimes(IDirectDrawStreamSample *iface, STREAM_TIME *start_time, +static HRESULT WINAPI ddraw_sample_GetSampleTimes(IDirectDrawStreamSample *iface, STREAM_TIME *start_time, STREAM_TIME *end_time, STREAM_TIME *current_time) { FIXME("(%p)->(%p,%p,%p): stub\n", iface, start_time, end_time, current_time); @@ -1030,7 +1031,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSampleTimes(IDirectDrawStre return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetSampleTimes(IDirectDrawStreamSample *iface, const STREAM_TIME *start_time, +static HRESULT WINAPI ddraw_sample_SetSampleTimes(IDirectDrawStreamSample *iface, const STREAM_TIME *start_time, const STREAM_TIME *end_time) { FIXME("(%p)->(%p,%p): stub\n", iface, start_time, end_time); @@ -1038,7 +1039,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetSampleTimes(IDirectDrawStre return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample *iface, DWORD flags, HANDLE event, +static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, DWORD flags, HANDLE event, PAPCFUNC func_APC, DWORD APC_data) { FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); @@ -1046,7 +1047,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample return S_OK; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) +static HRESULT WINAPI ddraw_sample_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) { FIXME("(%p)->(%x,%u): stub\n", iface, flags, milliseconds); @@ -1054,27 +1055,27 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawSt } /*** IDirectDrawStreamSample methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, +static HRESULT WINAPI ddraw_sample_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, RECT *rect) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); TRACE("(%p)->(%p,%p)\n", iface, ddraw_surface, rect); if (ddraw_surface) { - *ddraw_surface = This->surface; + *ddraw_surface = sample->surface; if (*ddraw_surface) IDirectDrawSurface_AddRef(*ddraw_surface); } if (rect) - *rect = This->rect; + *rect = sample->rect; return S_OK; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) +static HRESULT WINAPI ddraw_sample_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) { FIXME("(%p)->(%p): stub\n", iface, rect); @@ -1084,24 +1085,24 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSampl static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = { /*** IUnknown methods ***/ - IDirectDrawStreamSampleImpl_QueryInterface, - IDirectDrawStreamSampleImpl_AddRef, - IDirectDrawStreamSampleImpl_Release, + ddraw_sample_QueryInterface, + ddraw_sample_AddRef, + ddraw_sample_Release, /*** IStreamSample methods ***/ - IDirectDrawStreamSampleImpl_GetMediaStream, - IDirectDrawStreamSampleImpl_GetSampleTimes, - IDirectDrawStreamSampleImpl_SetSampleTimes, - IDirectDrawStreamSampleImpl_Update, - IDirectDrawStreamSampleImpl_CompletionStatus, + ddraw_sample_GetMediaStream, + ddraw_sample_GetSampleTimes, + ddraw_sample_SetSampleTimes, + ddraw_sample_Update, + ddraw_sample_CompletionStatus, /*** IDirectDrawStreamSample methods ***/ - IDirectDrawStreamSampleImpl_GetSurface, - IDirectDrawStreamSampleImpl_SetRect + ddraw_sample_GetSurface, + ddraw_sample_SetRect }; static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { - IDirectDrawStreamSampleImpl *object; + struct ddraw_sample *object; HRESULT hr; TRACE("(%p)\n", ddraw_stream_sample); -- 2.27.0

1 2

[RFC PATCH] Improved fake DLLs generation.
by Rémi Bernon 18 Jun '20

18 Jun '20

Hi everyone! I'm currently trying to make some Call of Duty games work, and for that I have been working on improving the fake DLLs code, based on the Wine Staging patch series, but also with a bit of rework. It's now apparently working well, and I'm sending this here to get some feedback, as I'm not completely sure of all the implications. This series addresses several issues at the same time, but the main idea is to make it possible to use fake DLLs directly from disk, as long as there's the corresponding builtin so DLL already in memory, and to make them closely match the module exposed by the builtin DLLs. The games are doing that for ntdll, and the current PE conversion will make this superfluous, but CoD Black Ops 3 also does too for gdi32.dll, calling GdiDllInitialize from a file mapping for instance (and possibly others I haven't seen yet). So, this does the following: * First of all, the NT header generation for the builtin so DLLs is improved, to reduce the amount of fixup required when mapping them. This is a bit convoluted and it's been split in many patches, but with the whole series, the only fixups required are the RVAs if the headers end up being unaligned. It could also be simplified by using linker scripts, but it also looked more complicated to maintain. * Then, instead of generating fake module separately from the builtin headers, they are extracted directly from the so file, with the PE sections memory, after it has been linked. This makes entry points aligned between fake DLLs and in memory module. The main problem is the module header alignment, that may need fixups, but it can be tweaked with base address adjustment if needed. * Next is the issue when entry points are called directly from the file image. I implemented that by reusing on some of the Wine Staging code, with a global callback located in TEB Spare2 field (but it could be also put somewhere else). Every entry point is redirected with linker symbol wrapping (using -Wl,--wrap), to some hand written thunks, and two function pointer table. One of the table is initially empty, and the other one is pre-filled with the real entry point symbols. When the so builtin is initially mapped, the first table is filled with the second one, and when the thunks are called, they jump directly into it. When called from a file mapping, the thunk find the empty function table, and then call the global callback, which fill the table from the real table of the corresponding loaded builtin so DLL in memory. * I also reused the staging syscall thunks, but using the symbol wrapping, which makes sure that any internal call also goes through the thunks -and potential hooks- like it was done for instance for NtOpenFile. It's actually only working for cross-source calls, because of the limitation of -Wl,--wrap, but it seems to be enough. The same mechanism applies to the normal entry point thunks. It's still a bit a work in progress, and I already know some potential issues, and for instance Steam for Windows complains -but not too much- about the thunk dll hotpatch prologue being unexpected, but it works for these games, passing both their module headers checks as well as the ntdll and gdi32 calls. I'm putting everything in one big attachment, as there's many patches and to avoid spamming the list, but git am should do the split if you want to try. Cheers, -- Rémi Bernon <rbernon(a)codeweavers.com>

2 1

[PATCH 1/2] gdi32: Add support for GCP_LIGATE to GetCharacterPlacement.
by Dmitry Timoshkov 18 Jun '20

18 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/font.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8788426a2c..cc366eb4d7 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3309,6 +3309,7 @@ GetCharacterPlacementW( DWORD ret=0; SIZE size; UINT i, nSet; + WCHAR *norm = NULL; TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); @@ -3325,13 +3326,32 @@ GetCharacterPlacementW( lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); - if(dwFlags&(~GCP_REORDER)) + if (dwFlags & ~(GCP_REORDER | GCP_LIGATE)) FIXME("flags 0x%08x ignored\n", dwFlags); if(lpResults->lpClass) FIXME("classes not implemented\n"); if (lpResults->lpCaretPos && (dwFlags & GCP_REORDER)) FIXME("Caret positions for complex scripts not implemented\n"); + if (dwFlags & GCP_LIGATE) + { + nSet = NormalizeString(NormalizationC, lpString, uCount, NULL, 0); + if (!nSet) return 0; + norm = heap_alloc(nSet * sizeof(WCHAR)); + if (!norm) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + if (!NormalizeString(NormalizationC, lpString, uCount, norm, nSet)) + { + heap_free(norm); + return 0; + } + lpString = norm; + uCount = nSet; + } + nSet = (UINT)uCount; if(nSet > lpResults->nGlyphs) nSet = lpResults->nGlyphs; @@ -3385,6 +3405,8 @@ GetCharacterPlacementW( if (GetTextExtentPoint32W(hdc, lpString, uCount, &size)) ret = MAKELONG(size.cx, size.cy); + heap_free(norm); + return ret; } -- 2.26.2

2 3

[PATCH v2] winex11.drv: Handle X error from vkGetRandROutputDisplayEXT().
by Paul Gofman 18 Jun '20

18 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49407 Nvidia implementation of vkGetRandROutputDisplayEXT() generates X exception when rrOutput is from different provider (or if rrOutput is just invalid). That can happen on certain multiple GPU configurations, on which Wine is currently unable to initialize display driver and thus create any window. According to Vulkan spec, vkGetRandROutputDisplayEXT is supposed to just return VK_NULL_HANDLE if there is no corresponding VkDisplayKHR. But it is probably better to workaround the problem to avoid long standing regression. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - add XSync(); - add comment for the patch. dlls/winex11.drv/xrandr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index f61a5b190e9..b1a43e48eab 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -756,9 +756,11 @@ static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_ { for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) { + X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, provider_info->outputs[output_idx], &vk_display ); - if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + XSync( gdi_display, FALSE ); + if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; memset( &id, 0, sizeof(id) ); -- 2.26.2

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Rename the vkd3d_shader_target_extension enumeration to vkd3d_shader_spirv_extension.
by Henri Verbeet 18 Jun '20

18 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 13 +++++++------ libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d/device.c | 2 +- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1fa39b9..e57b913 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -227,11 +227,12 @@ enum vkd3d_shader_spirv_environment VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_ENVIRONMENT), }; -enum vkd3d_shader_target_extension +enum vkd3d_shader_spirv_extension { - VKD3D_SHADER_TARGET_EXTENSION_NONE, + VKD3D_SHADER_SPIRV_EXTENSION_NONE, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, - VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), }; struct vkd3d_shader_spirv_target_info @@ -241,11 +242,11 @@ struct vkd3d_shader_spirv_target_info enum vkd3d_shader_spirv_environment environment; - unsigned int target_extension_count; - const enum vkd3d_shader_target_extension *target_extensions; + const enum vkd3d_shader_spirv_extension *extensions; + unsigned int extension_count; - unsigned int parameter_count; const struct vkd3d_shader_parameter *parameters; + unsigned int parameter_count; bool dual_source_blending; const unsigned int *output_swizzles; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bcc208a..3f6d526 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2197,14 +2197,14 @@ static bool vkd3d_dxbc_compiler_is_opengl_target(const struct vkd3d_dxbc_compile } static bool vkd3d_dxbc_compiler_is_target_extension_supported(const struct vkd3d_dxbc_compiler *compiler, - enum vkd3d_shader_target_extension extension) + enum vkd3d_shader_spirv_extension extension) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; unsigned int i; - for (i = 0; info && i < info->target_extension_count; ++i) + for (i = 0; info && i < info->extension_count; ++i) { - if (info->target_extensions[i] == extension) + if (info->extensions[i] == extension) return true; } @@ -6660,7 +6660,7 @@ static void vkd3d_dxbc_compiler_emit_kill(struct vkd3d_dxbc_compiler *compiler, vkd3d_spirv_build_op_label(builder, target_id); if (vkd3d_dxbc_compiler_is_target_extension_supported(compiler, - VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION)) + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION)) { vkd3d_spirv_enable_capability(builder, SpvCapabilityDemoteToHelperInvocationEXT); vkd3d_spirv_build_op_demote_to_helper_invocation(builder); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 843f327..437454d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1447,7 +1447,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, if (vulkan_info->EXT_shader_demote_to_helper_invocation) { vulkan_info->shader_extension_count = 1; - vulkan_info->shader_extensions[0] = VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION; + vulkan_info->shader_extensions[0] = VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION; } /* Disable unused Vulkan features. */ diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 84cdbe8..7b14198 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2167,8 +2167,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; ps_target_info.next = NULL; ps_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; - ps_target_info.target_extensions = vk_info->shader_extensions; - ps_target_info.target_extension_count = vk_info->shader_extension_count; + ps_target_info.extensions = vk_info->shader_extensions; + ps_target_info.extension_count = vk_info->shader_extension_count; ps_target_info.parameters = ps_shader_parameters; ps_target_info.parameter_count = ARRAY_SIZE(ps_shader_parameters); ps_target_info.dual_source_blending = is_dual_source_blending(&desc->BlendState.RenderTarget[0]); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bfdc7b4..d7da7f1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -122,7 +122,7 @@ struct vkd3d_vulkan_info VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; unsigned int shader_extension_count; - enum vkd3d_shader_target_extension shader_extensions[VKD3D_MAX_SHADER_EXTENSIONS]; + enum vkd3d_shader_spirv_extension shader_extensions[VKD3D_MAX_SHADER_EXTENSIONS]; D3D_FEATURE_LEVEL max_feature_level; }; -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Rename the vkd3d_shader_target enumeration to vkd3d_shader_spirv_environment.
by Henri Verbeet 18 Jun '20

18 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 12 ++++---- libs/vkd3d-shader/spirv.c | 52 +++++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_main.c | 8 +++--- libs/vkd3d/state.c | 2 +- 4 files changed, 39 insertions(+), 35 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 09b77b2..1fa39b9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -218,13 +218,13 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; -enum vkd3d_shader_target +enum vkd3d_shader_spirv_environment { - VKD3D_SHADER_TARGET_NONE, - VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5, - VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0, /* default target */ + VKD3D_SHADER_SPIRV_ENVIRONMENT_NONE, + VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5, + VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0, /* default target */ - VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_ENVIRONMENT), }; enum vkd3d_shader_target_extension @@ -239,7 +239,7 @@ struct vkd3d_shader_spirv_target_info enum vkd3d_shader_structure_type type; const void *next; - enum vkd3d_shader_target target; + enum vkd3d_shader_spirv_environment environment; unsigned int target_extension_count; const enum vkd3d_shader_target_extension *target_extensions; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9bcb59d..bcc208a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -36,21 +36,21 @@ #ifdef HAVE_SPIRV_TOOLS # include "spirv-tools/libspirv.h" -static spv_target_env spv_target_env_from_vkd3d(enum vkd3d_shader_target target) +static spv_target_env spv_target_env_from_vkd3d(enum vkd3d_shader_spirv_environment environment) { - switch (target) + switch (environment) { - case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: + case VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5: return SPV_ENV_OPENGL_4_5; - case VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0: + case VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0: return SPV_ENV_VULKAN_1_0; default: - ERR("Invalid shader target %#x.\n", target); + ERR("Invalid environment %#x.\n", environment); return SPV_ENV_VULKAN_1_0; } } -static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) +static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_spirv_environment environment) { const static uint32_t options = SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT; @@ -59,7 +59,7 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_s spv_context context; spv_result_t ret; - context = spvContextCreate(spv_target_env_from_vkd3d(target)); + context = spvContextCreate(spv_target_env_from_vkd3d(environment)); if (!(ret = spvBinaryToText(context, spirv->code, spirv->size / sizeof(uint32_t), options, &text, &diagnostic))) @@ -82,13 +82,14 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_s spvContextDestroy(context); } -static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) +static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment) { spv_diagnostic diagnostic = NULL; spv_context context; spv_result_t ret; - context = spvContextCreate(spv_target_env_from_vkd3d(target)); + context = spvContextCreate(spv_target_env_from_vkd3d(environment)); if ((ret = spvValidateBinary(context, spirv->code, spirv->size / sizeof(uint32_t), &diagnostic))) @@ -103,8 +104,10 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd #else -static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) {} -static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) {} +static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment) {} +static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment) {} #endif /* HAVE_SPIRV_TOOLS */ @@ -2180,16 +2183,17 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return compiler; } -static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(const struct vkd3d_dxbc_compiler *compiler) +static enum vkd3d_shader_spirv_environment vkd3d_dxbc_compiler_get_target_environment( + const struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; - return info ? info->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; + return info ? info->environment : VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; } static bool vkd3d_dxbc_compiler_is_opengl_target(const struct vkd3d_dxbc_compiler *compiler) { - return vkd3d_dxbc_compiler_get_target(compiler) == VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5; + return vkd3d_dxbc_compiler_get_target_environment(compiler) == VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5; } static bool vkd3d_dxbc_compiler_is_target_extension_supported(const struct vkd3d_dxbc_compiler *compiler, @@ -3544,12 +3548,12 @@ static const struct { enum vkd3d_shader_input_sysval_semantic sysval; struct vkd3d_spirv_builtin builtin; - enum vkd3d_shader_target target; + enum vkd3d_shader_spirv_environment environment; } vkd3d_system_value_builtins[] = { - {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, - {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, + {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexId}, VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5}, + {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5}, {VKD3D_SIV_POSITION, {VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}}, {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex, sv_vertex_id_fixup}}, @@ -3632,7 +3636,7 @@ static void vkd3d_dxbc_compiler_emit_register_execution_mode(struct vkd3d_dxbc_c static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) { - enum vkd3d_shader_target target; + enum vkd3d_shader_spirv_environment environment; unsigned int i; if (!sysval) @@ -3642,12 +3646,12 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( if (sysval == VKD3D_SIV_POSITION && compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL) return &vkd3d_pixel_shader_position_builtin; - target = vkd3d_dxbc_compiler_get_target(compiler); + environment = vkd3d_dxbc_compiler_get_target_environment(compiler); for (i = 0; i < ARRAY_SIZE(vkd3d_system_value_builtins); ++i) { if (vkd3d_system_value_builtins[i].sysval == sysval - && (!vkd3d_system_value_builtins[i].target - || vkd3d_system_value_builtins[i].target == target)) + && (!vkd3d_system_value_builtins[i].environment + || vkd3d_system_value_builtins[i].environment == environment)) return &vkd3d_system_value_builtins[i].builtin; } @@ -8711,9 +8715,9 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (TRACE_ON()) { - enum vkd3d_shader_target target = vkd3d_dxbc_compiler_get_target(compiler); - vkd3d_spirv_dump(spirv, target); - vkd3d_spirv_validate(spirv, target); + enum vkd3d_shader_spirv_environment environment = vkd3d_dxbc_compiler_get_target_environment(compiler); + vkd3d_spirv_dump(spirv, environment); + vkd3d_spirv_validate(spirv, environment); } return VKD3D_OK; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0badd74..a56682e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -114,13 +114,13 @@ static int vkd3d_shader_validate_spirv_target_info(const struct vkd3d_shader_spi return VKD3D_ERROR_INVALID_ARGUMENT; } - switch (info->target) + switch (info->environment) { - case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: - case VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0: + case VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5: + case VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0: break; default: - WARN("Invalid shader target %#x.\n", info->target); + WARN("Invalid target environment %#x.\n", info->environment); return VKD3D_ERROR_INVALID_ARGUMENT; } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 16bce6b..84cdbe8 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2166,7 +2166,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; ps_target_info.next = NULL; - ps_target_info.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; + ps_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; ps_target_info.target_extensions = vk_info->shader_extensions; ps_target_info.target_extension_count = vk_info->shader_extension_count; ps_target_info.parameters = ps_shader_parameters; -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Rename VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO.
by Henri Verbeet 18 Jun '20

18 Jun '20

To VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO, consistent with the structure name. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d/state.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1f58ebd..09b77b2 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -30,7 +30,7 @@ extern "C" { enum vkd3d_shader_structure_type { /* 1.2 */ - VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, + VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 38cb2ee..0badd74 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -141,7 +141,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface_info %p, info %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface_info, info); - if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO) + if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO) { WARN("Invalid structure type %#x.\n", shader_interface_info->type); return VKD3D_ERROR_INVALID_ARGUMENT; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 3f158d0..16bce6b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1521,7 +1521,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hr; } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; @@ -2229,7 +2229,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s xfb_stage = VK_SHADER_STAGE_VERTEX_BIT; } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; @@ -2926,7 +2926,7 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d } } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = &binding; shader_interface.binding_count = 1; -- 2.11.0

1 0

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