- wine-devel - winehq.org

[PATCH] ntdll: Catch EXCEPTION_INVALID_HANDLE in NtClose.
by Rémi Bernon 05 Aug '20

05 Aug '20

That was dropped in 4752e252ea6ee084b679a9b9551a1c55f8744451 and it causes Metal Gear Solid V: Ground Zeroes to crash on start. The game debugs itself and closes an invalid handle as an anti-debug check. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm not sure why the try catch was removed, and maybe there's a better fix to it? dlls/ntdll/unix/server.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 4d7962fddc7..e45accf4f2b 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -87,6 +87,7 @@ #include "winnt.h" #include "wine/library.h" #include "wine/server.h" +#include "wine/exception.h" #include "wine/debug.h" #include "unix_private.h" #include "ddk/wdm.h" @@ -1634,6 +1635,11 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE return ret; } +static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} /************************************************************************** * NtClose @@ -1656,8 +1662,15 @@ NTSTATUS WINAPI NtClose( HANDLE handle ) if (!NtCurrentTeb()->Peb->BeingDebugged) return ret; if (!NtQueryInformationProcess( NtCurrentProcess(), ProcessDebugPort, &port, sizeof(port), NULL) && port) { - NtCurrentTeb()->ExceptionCode = ret; - pKiRaiseUserExceptionDispatcher(); + __TRY + { + NtCurrentTeb()->ExceptionCode = ret; + pKiRaiseUserExceptionDispatcher(); + } + __EXCEPT(invalid_handle_exception_handler) + { + } + __ENDTRY } return ret; } -- 2.27.0

1 0

[PATCH 2/2] msvcrt: Use correct code page in _write when outputing to console.
by Piotr Caban 05 Aug '20

05 Aug '20

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

1 0

[PATCH 1/2] msvcrt: Avoid allocations in _write implementation.
by Piotr Caban 05 Aug '20

05 Aug '20

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

1 0

[PATCH] msvcrt: Return error on invalid character in mbstowcs.
by Piotr Caban 05 Aug '20

05 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 15 +++++++++++---- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 16 insertions(+), 4 deletions(-)

1 0

[v4 PATCH 1/5] combase: Move IMalloc/IMallocSpy functionality.
by Nikolay Sivov 05 Aug '20

05 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/Makefile.in | 1 + dlls/combase/combase.spec | 12 +- dlls/combase/malloc.c | 456 +++++++++++++++++++++++++++++++++ dlls/ole32/ifs.c | 515 -------------------------------------- dlls/ole32/ole32.spec | 12 +- 5 files changed, 469 insertions(+), 527 deletions(-) create mode 100644 dlls/combase/malloc.c diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 83c71ce9493..f2174f4e3eb 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ errorinfo.c \ + malloc.c \ roapi.c \ string.c \ usrmarshal.c diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index cb073ef2fcc..aa1c04ce0ac 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -109,7 +109,7 @@ @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) ole32.CoGetInstanceFromFile @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) ole32.CoGetInstanceFromIStorage @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream -@ stdcall CoGetMalloc(long ptr) ole32.CoGetMalloc +@ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax @ stub CoGetModuleType @ stdcall CoGetObjectContext(ptr ptr) ole32.CoGetObjectContext @@ -139,7 +139,7 @@ @ stub CoRegisterActivationFilter @ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject @ stdcall CoRegisterInitializeSpy(ptr ptr) ole32.CoRegisterInitializeSpy -@ stdcall CoRegisterMallocSpy(ptr) ole32.CoRegisterMallocSpy +@ stdcall CoRegisterMallocSpy(ptr) @ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter @ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid @ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate @@ -151,15 +151,15 @@ @ stdcall CoRevertToSelf() ole32.CoRevertToSelf @ stdcall CoRevokeClassObject(long) ole32.CoRevokeClassObject @ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy -@ stdcall CoRevokeMallocSpy() ole32.CoRevokeMallocSpy +@ stdcall CoRevokeMallocSpy() @ stub CoSetCancelObject @ stub CoSetErrorInfo @ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) ole32.CoSetProxyBlanket @ stdcall CoSuspendClassObjects() ole32.CoSuspendClassObjects @ stdcall CoSwitchCallContext(ptr ptr) ole32.CoSwitchCallContext -@ stdcall CoTaskMemAlloc(long) ole32.CoTaskMemAlloc -@ stdcall CoTaskMemFree(ptr) ole32.CoTaskMemFree -@ stdcall CoTaskMemRealloc(ptr long) ole32.CoTaskMemRealloc +@ stdcall CoTaskMemAlloc(long) +@ stdcall CoTaskMemFree(ptr) +@ stdcall CoTaskMemRealloc(ptr long) @ stub CoTestCancel @ stdcall CoUninitialize() ole32.CoUninitialize @ stub CoUnloadingWOW diff --git a/dlls/combase/malloc.c b/dlls/combase/malloc.c new file mode 100644 index 00000000000..2be03ae1e31 --- /dev/null +++ b/dlls/combase/malloc.c @@ -0,0 +1,456 @@ +/* + * Copyright 1997 Marcus Meissner + * + * 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 "oleauto.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(olemalloc); + +static const IMallocVtbl allocator_vtbl; + +struct allocator +{ + IMalloc IMalloc_iface; + IMallocSpy *spy; + DWORD spyed_allocations; + BOOL spy_release_pending; /* CoRevokeMallocSpy called with spyed allocations left */ + void **blocks; + DWORD blocks_length; +}; + +static struct allocator allocator = { .IMalloc_iface.lpVtbl = &allocator_vtbl }; + +static CRITICAL_SECTION allocspy_cs; +static CRITICAL_SECTION_DEBUG allocspy_cs_debug = +{ + 0, 0, &allocspy_cs, + { &allocspy_cs_debug.ProcessLocksList, &allocspy_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": allocspy_cs") } +}; +static CRITICAL_SECTION allocspy_cs = { &allocspy_cs_debug, -1, 0, 0, 0, 0 }; + +static BOOL mallocspy_grow(DWORD length) +{ + void **blocks; + + if (!allocator.blocks) blocks = LocalAlloc(LMEM_ZEROINIT, length * sizeof(void *)); + else blocks = LocalReAlloc(allocator.blocks, length * sizeof(void *), LMEM_ZEROINIT | LMEM_MOVEABLE); + if (blocks) + { + allocator.blocks = blocks; + allocator.blocks_length = length; + } + + return blocks != NULL; +} + +static void mallocspy_add_mem(void *mem) +{ + void **current; + + if (!mem || (!allocator.blocks_length && !mallocspy_grow(0x1000))) + return; + + /* Find a free location */ + current = allocator.blocks; + while (*current) + { + current++; + if (current >= allocator.blocks + allocator.blocks_length) + { + DWORD old_length = allocator.blocks_length; + if (!mallocspy_grow(allocator.blocks_length + 0x1000)) + return; + current = allocator.blocks + old_length; + } + } + + *current = mem; + allocator.spyed_allocations++; +} + +static void** mallocspy_is_allocation_spyed(const void *mem) +{ + void **current = allocator.blocks; + + while (*current != mem) + { + current++; + if (current >= allocator.blocks + allocator.blocks_length) + return NULL; + } + + return current; +} + +static BOOL mallocspy_remove_spyed_memory(const void *mem) +{ + void **current; + + if (!allocator.blocks_length) + return FALSE; + + if (!(current = mallocspy_is_allocation_spyed(mem))) + return FALSE; + + allocator.spyed_allocations--; + *current = NULL; + return TRUE; +} + +static HRESULT WINAPI allocator_QueryInterface(IMalloc *iface, REFIID riid, void **obj) +{ + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IMalloc, riid)) + { + *obj = &allocator.IMalloc_iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI allocator_AddRef(IMalloc *iface) +{ + return 2; +} + +static ULONG WINAPI allocator_Release(IMalloc *iface) +{ + return 1; +} + +static void * WINAPI allocator_Alloc(IMalloc *iface, SIZE_T cb) +{ + void *addr; + + TRACE("%ld.\n", cb); + + if (allocator.spy) + { + SIZE_T preAllocResult; + + EnterCriticalSection(&allocspy_cs); + preAllocResult = IMallocSpy_PreAlloc(allocator.spy, cb); + if (cb && !preAllocResult) + { + /* PreAlloc can force Alloc to fail, but not if cb == 0 */ + TRACE("returning null\n"); + LeaveCriticalSection(&allocspy_cs); + return NULL; + } + } + + addr = HeapAlloc(GetProcessHeap(), 0, cb); + + if (allocator.spy) + { + addr = IMallocSpy_PostAlloc(allocator.spy, addr); + mallocspy_add_mem(addr); + LeaveCriticalSection(&allocspy_cs); + } + + TRACE("%p.\n",addr); + return addr; +} + +static void * WINAPI allocator_Realloc(IMalloc *iface, void *pv, SIZE_T cb) +{ + void *addr; + + TRACE("%p, %ld.\n",pv,cb); + + if (allocator.spy) + { + void *real_mem; + BOOL spyed; + + EnterCriticalSection(&allocspy_cs); + spyed = mallocspy_remove_spyed_memory(pv); + cb = IMallocSpy_PreRealloc(allocator.spy, pv, cb, &real_mem, spyed); + + /* check if can release the spy */ + if (allocator.spy_release_pending && !allocator.spyed_allocations) + { + IMallocSpy_Release(allocator.spy); + allocator.spy_release_pending = FALSE; + allocator.spy = NULL; + LeaveCriticalSection(&allocspy_cs); + } + + if (!cb) + { + /* PreRealloc can force Realloc to fail */ + if (allocator.spy) + LeaveCriticalSection(&allocspy_cs); + return NULL; + } + + pv = real_mem; + } + + if (!pv) addr = HeapAlloc(GetProcessHeap(), 0, cb); + else if (cb) addr = HeapReAlloc(GetProcessHeap(), 0, pv, cb); + else + { + HeapFree(GetProcessHeap(), 0, pv); + addr = NULL; + } + + if (allocator.spy) + { + addr = IMallocSpy_PostRealloc(allocator.spy, addr, TRUE); + mallocspy_add_mem(addr); + LeaveCriticalSection(&allocspy_cs); + } + + TRACE("%p.\n", addr); + return addr; +} + +static void WINAPI allocator_Free(IMalloc *iface, void *mem) +{ + BOOL spyed_block = FALSE, spy_active = FALSE; + + TRACE("%p.\n", mem); + + if (!mem) + return; + + if (allocator.spy) + { + EnterCriticalSection(&allocspy_cs); + spyed_block = mallocspy_remove_spyed_memory(mem); + spy_active = TRUE; + mem = IMallocSpy_PreFree(allocator.spy, mem, spyed_block); + } + + HeapFree(GetProcessHeap(), 0, mem); + + if (spy_active) + { + IMallocSpy_PostFree(allocator.spy, spyed_block); + + /* check if can release the spy */ + if (allocator.spy_release_pending && !allocator.spyed_allocations) + { + IMallocSpy_Release(allocator.spy); + allocator.spy_release_pending = FALSE; + allocator.spy = NULL; + } + + LeaveCriticalSection(&allocspy_cs); + } +} + +/****************************************************************************** + * NOTES + * FIXME returns: + * win95: size allocated (4 byte boundaries) + * win2k: size originally requested !!! (allocated on 8 byte boundaries) + */ +static SIZE_T WINAPI allocator_GetSize(IMalloc *iface, void *mem) +{ + BOOL spyed_block = FALSE, spy_active = FALSE; + SIZE_T size; + + TRACE("%p.\n", mem); + + if (!mem) + return (SIZE_T)-1; + + if (allocator.spy) + { + EnterCriticalSection(&allocspy_cs); + spyed_block = !!mallocspy_is_allocation_spyed(mem); + spy_active = TRUE; + mem = IMallocSpy_PreGetSize(allocator.spy, mem, spyed_block); + } + + size = HeapSize(GetProcessHeap(), 0, mem); + + if (spy_active) + { + size = IMallocSpy_PostGetSize(allocator.spy, size, spyed_block); + LeaveCriticalSection(&allocspy_cs); + } + + return size; +} + +static INT WINAPI allocator_DidAlloc(IMalloc *iface, void *mem) +{ + BOOL spyed_block = FALSE, spy_active = FALSE; + int did_alloc; + + TRACE("%p.\n", mem); + + if (!mem) + return -1; + + if (allocator.spy) + { + EnterCriticalSection(&allocspy_cs); + spyed_block = !!mallocspy_is_allocation_spyed(mem); + spy_active = TRUE; + mem = IMallocSpy_PreDidAlloc(allocator.spy, mem, spyed_block); + } + + did_alloc = HeapValidate(GetProcessHeap(), 0, mem); + + if (spy_active) + { + did_alloc = IMallocSpy_PostDidAlloc(allocator.spy, mem, spyed_block, did_alloc); + LeaveCriticalSection(&allocspy_cs); + } + + return did_alloc; +} + +static void WINAPI allocator_HeapMinimize(IMalloc *iface) +{ + BOOL spy_active = FALSE; + + TRACE("\n"); + + if (allocator.spy) + { + EnterCriticalSection(&allocspy_cs); + spy_active = TRUE; + IMallocSpy_PreHeapMinimize(allocator.spy); + } + + if (spy_active) + { + IMallocSpy_PostHeapMinimize(allocator.spy); + LeaveCriticalSection(&allocspy_cs); + } +} + +static const IMallocVtbl allocator_vtbl = +{ + allocator_QueryInterface, + allocator_AddRef, + allocator_Release, + allocator_Alloc, + allocator_Realloc, + allocator_Free, + allocator_GetSize, + allocator_DidAlloc, + allocator_HeapMinimize +}; + +/****************************************************************************** + * CoGetMalloc (combase.@) + */ +HRESULT WINAPI CoGetMalloc(DWORD context, IMalloc **imalloc) +{ + if (context != MEMCTX_TASK) + { + *imalloc = NULL; + return E_INVALIDARG; + } + + *imalloc = &allocator.IMalloc_iface; + + return S_OK; +} + +/*********************************************************************** + * CoTaskMemAlloc (combase.@) + */ +void * WINAPI CoTaskMemAlloc(SIZE_T size) +{ + return IMalloc_Alloc(&allocator.IMalloc_iface, size); +} + +/*********************************************************************** + * CoTaskMemFree (combase.@) + */ +void WINAPI CoTaskMemFree(void *ptr) +{ + IMalloc_Free(&allocator.IMalloc_iface, ptr); +} + +/*********************************************************************** + * CoTaskMemRealloc (combase.@) + */ +void * WINAPI CoTaskMemRealloc(void *ptr, SIZE_T size) +{ + return IMalloc_Realloc(&allocator.IMalloc_iface, ptr, size); +} + +/*********************************************************************** + * CoRegisterMallocSpy (combase.@) + */ +HRESULT WINAPI CoRegisterMallocSpy(IMallocSpy *spy) +{ + HRESULT hr = E_INVALIDARG; + + TRACE("%p.\n", spy); + + if (!spy) return E_INVALIDARG; + + EnterCriticalSection(&allocspy_cs); + + if (allocator.spy) + hr = CO_E_OBJISREG; + else if (SUCCEEDED(IMallocSpy_QueryInterface(spy, &IID_IMallocSpy, (void **)&spy))) + { + allocator.spy = spy; + hr = S_OK; + } + + LeaveCriticalSection(&allocspy_cs); + + return hr; +} + +/*********************************************************************** + * CoRevokeMallocSpy (combase.@) + */ +HRESULT WINAPI CoRevokeMallocSpy(void) +{ + HRESULT hr = S_OK; + + TRACE("\n"); + + EnterCriticalSection(&allocspy_cs); + + if (!allocator.spy) + hr = CO_E_OBJNOTREG; + else if (allocator.spyed_allocations) + { + allocator.spy_release_pending = TRUE; + hr = E_ACCESSDENIED; + } + else + { + IMallocSpy_Release(allocator.spy); + allocator.spy = NULL; + } + + LeaveCriticalSection(&allocspy_cs); + + return hr; +} diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index a144833c7af..845bdeea4a5 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -32,521 +32,6 @@ #include "ole2.h" #include "winerror.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(olemalloc); - -/****************************************************************************** - * IMalloc32 implementation - * - * NOTES - * For supporting CoRegisterMallocSpy the IMalloc implementation must know if - * a given memory block was allocated with a spy active. - * - *****************************************************************************/ -/* set the vtable later */ -static const IMallocVtbl VT_IMalloc32; - -struct allocator -{ - IMalloc IMalloc_iface; - IMallocSpy * pSpy; /* the spy when active */ - DWORD SpyedAllocationsLeft; /* number of spyed allocations left */ - BOOL SpyReleasePending; /* CoRevokeMallocSpy called with spyed allocations left*/ - LPVOID * SpyedBlocks; /* root of the table */ - DWORD SpyedBlockTableLength;/* size of the table*/ -}; - -static struct allocator Malloc32 = { .IMalloc_iface.lpVtbl = &VT_IMalloc32 }; - -/* with a spy active all calls from pre to post methods are threadsafe */ -static CRITICAL_SECTION IMalloc32_SpyCS; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &IMalloc32_SpyCS, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": IMalloc32_SpyCS") } -}; -static CRITICAL_SECTION IMalloc32_SpyCS = { &critsect_debug, -1, 0, 0, 0, 0 }; - -/* resize the old table */ -static BOOL SetSpyedBlockTableLength ( DWORD NewLength ) -{ - LPVOID *NewSpyedBlocks; - - if (!Malloc32.SpyedBlocks) NewSpyedBlocks = LocalAlloc(LMEM_ZEROINIT, NewLength * sizeof(PVOID)); - else NewSpyedBlocks = LocalReAlloc(Malloc32.SpyedBlocks, NewLength * sizeof(PVOID), LMEM_ZEROINIT | LMEM_MOVEABLE); - if (NewSpyedBlocks) { - Malloc32.SpyedBlocks = NewSpyedBlocks; - Malloc32.SpyedBlockTableLength = NewLength; - } - - return NewSpyedBlocks != NULL; -} - -/* add a location to the table */ -static BOOL AddMemoryLocation(LPVOID * pMem) -{ - LPVOID * Current; - - /* allocate the table if not already allocated */ - if (!Malloc32.SpyedBlockTableLength && !SetSpyedBlockTableLength(0x1000)) - return FALSE; - - /* find a free location */ - Current = Malloc32.SpyedBlocks; - while (*Current) { - Current++; - if (Current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) { - /* no more space in table, grow it */ - DWORD old_length = Malloc32.SpyedBlockTableLength; - if (!SetSpyedBlockTableLength( Malloc32.SpyedBlockTableLength + 0x1000)) - return FALSE; - Current = Malloc32.SpyedBlocks + old_length; - } - }; - - /* put the location in our table */ - *Current = pMem; - Malloc32.SpyedAllocationsLeft++; - /*TRACE("%lu\n",Malloc32.SpyedAllocationsLeft);*/ - return TRUE; -} - -static void** mallocspy_is_allocation_spyed(const void *mem) -{ - void **current = Malloc32.SpyedBlocks; - - while (*current != mem) - { - current++; - if (current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) - return NULL; - } - - return current; -} - -static BOOL mallocspy_remove_spyed_memory(const void *mem) -{ - void **current; - - if (!Malloc32.SpyedBlockTableLength) - return FALSE; - - if (!(current = mallocspy_is_allocation_spyed(mem))) - return FALSE; - - Malloc32.SpyedAllocationsLeft--; - *current = NULL; - return TRUE; -} - -/****************************************************************************** - * IMalloc32_QueryInterface [VTABLE] - */ -static HRESULT WINAPI IMalloc_fnQueryInterface(IMalloc *iface, REFIID refiid, void **obj) -{ - TRACE("(%s,%p)\n",debugstr_guid(refiid),obj); - - if (IsEqualIID(&IID_IUnknown,refiid) || IsEqualIID(&IID_IMalloc,refiid)) { - *obj = &Malloc32; - return S_OK; - } - return E_NOINTERFACE; -} - -/****************************************************************************** - * IMalloc32_AddRefRelease [VTABLE] - */ -static ULONG WINAPI IMalloc_fnAddRefRelease(IMalloc *iface) -{ - return 1; -} - -/****************************************************************************** - * IMalloc32_Alloc [VTABLE] - */ -static void * WINAPI IMalloc_fnAlloc(IMalloc *iface, SIZE_T cb) -{ - void *addr; - - TRACE("(%ld)\n",cb); - - if(Malloc32.pSpy) { - SIZE_T preAllocResult; - - EnterCriticalSection(&IMalloc32_SpyCS); - preAllocResult = IMallocSpy_PreAlloc(Malloc32.pSpy, cb); - if ((cb != 0) && (preAllocResult == 0)) { - /* PreAlloc can force Alloc to fail, but not if cb == 0 */ - TRACE("returning null\n"); - LeaveCriticalSection(&IMalloc32_SpyCS); - return NULL; - } - } - - addr = HeapAlloc(GetProcessHeap(),0,cb); - - if(Malloc32.pSpy) { - addr = IMallocSpy_PostAlloc(Malloc32.pSpy, addr); - if (addr) AddMemoryLocation(addr); - LeaveCriticalSection(&IMalloc32_SpyCS); - } - - TRACE("--(%p)\n",addr); - return addr; -} - -/****************************************************************************** - * IMalloc32_Realloc [VTABLE] - */ -static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb) -{ - void *pNewMemory; - - TRACE("(%p,%ld)\n",pv,cb); - - if(Malloc32.pSpy) { - void *pRealMemory; - BOOL fSpyed; - - EnterCriticalSection(&IMalloc32_SpyCS); - fSpyed = mallocspy_remove_spyed_memory(pv); - cb = IMallocSpy_PreRealloc(Malloc32.pSpy, pv, cb, &pRealMemory, fSpyed); - - /* check if can release the spy */ - if(Malloc32.SpyReleasePending && !Malloc32.SpyedAllocationsLeft) { - IMallocSpy_Release(Malloc32.pSpy); - Malloc32.SpyReleasePending = FALSE; - Malloc32.pSpy = NULL; - LeaveCriticalSection(&IMalloc32_SpyCS); - } - - if (0==cb) { - /* PreRealloc can force Realloc to fail */ - if (Malloc32.pSpy) - LeaveCriticalSection(&IMalloc32_SpyCS); - return NULL; - } - - pv = pRealMemory; - } - - if (!pv) pNewMemory = HeapAlloc(GetProcessHeap(),0,cb); - else if (cb) pNewMemory = HeapReAlloc(GetProcessHeap(),0,pv,cb); - else { - HeapFree(GetProcessHeap(),0,pv); - pNewMemory = NULL; - } - - if(Malloc32.pSpy) { - pNewMemory = IMallocSpy_PostRealloc(Malloc32.pSpy, pNewMemory, TRUE); - if (pNewMemory) AddMemoryLocation(pNewMemory); - LeaveCriticalSection(&IMalloc32_SpyCS); - } - - TRACE("--(%p)\n",pNewMemory); - return pNewMemory; -} - -/****************************************************************************** - * IMalloc32_Free [VTABLE] - */ -static void WINAPI IMalloc_fnFree(IMalloc *iface, void *mem) -{ - BOOL spyed_block = FALSE, spy_active = FALSE; - - TRACE("(%p)\n", mem); - - if (!mem) - return; - - if (Malloc32.pSpy) - { - EnterCriticalSection(&IMalloc32_SpyCS); - spyed_block = mallocspy_remove_spyed_memory(mem); - spy_active = TRUE; - mem = IMallocSpy_PreFree(Malloc32.pSpy, mem, spyed_block); - } - - HeapFree(GetProcessHeap(), 0, mem); - - if (spy_active) - { - IMallocSpy_PostFree(Malloc32.pSpy, spyed_block); - - /* check if can release the spy */ - if (Malloc32.SpyReleasePending && !Malloc32.SpyedAllocationsLeft) - { - IMallocSpy_Release(Malloc32.pSpy); - Malloc32.SpyReleasePending = FALSE; - Malloc32.pSpy = NULL; - } - - LeaveCriticalSection(&IMalloc32_SpyCS); - } -} - -/****************************************************************************** - * IMalloc32_GetSize [VTABLE] - * - * NOTES - * FIXME returns: - * win95: size allocated (4 byte boundaries) - * win2k: size originally requested !!! (allocated on 8 byte boundaries) - */ -static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *mem) -{ - BOOL spyed_block = FALSE, spy_active = FALSE; - SIZE_T size; - - TRACE("(%p)\n", mem); - - if (!mem) - return (SIZE_T)-1; - - if (Malloc32.pSpy) - { - EnterCriticalSection(&IMalloc32_SpyCS); - spyed_block = !!mallocspy_is_allocation_spyed(mem); - spy_active = TRUE; - mem = IMallocSpy_PreGetSize(Malloc32.pSpy, mem, spyed_block); - } - - size = HeapSize(GetProcessHeap(), 0, mem); - - if (spy_active) - { - size = IMallocSpy_PostGetSize(Malloc32.pSpy, size, spyed_block); - LeaveCriticalSection(&IMalloc32_SpyCS); - } - - return size; -} - -/****************************************************************************** - * IMalloc32_DidAlloc [VTABLE] - */ -static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem) -{ - BOOL spyed_block = FALSE, spy_active = FALSE; - int did_alloc; - - TRACE("(%p)\n", mem); - - if (!mem) - return -1; - - if (Malloc32.pSpy) - { - EnterCriticalSection(&IMalloc32_SpyCS); - spyed_block = !!mallocspy_is_allocation_spyed(mem); - spy_active = TRUE; - mem = IMallocSpy_PreDidAlloc(Malloc32.pSpy, mem, spyed_block); - } - - did_alloc = HeapValidate(GetProcessHeap(), 0, mem); - - if (spy_active) - { - did_alloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, mem, spyed_block, did_alloc); - LeaveCriticalSection(&IMalloc32_SpyCS); - } - - return did_alloc; -} - -/****************************************************************************** - * IMalloc32_HeapMinimize [VTABLE] - */ -static void WINAPI IMalloc_fnHeapMinimize(IMalloc *iface) -{ - BOOL spy_active = FALSE; - - TRACE("()\n"); - - if (Malloc32.pSpy) - { - EnterCriticalSection(&IMalloc32_SpyCS); - spy_active = TRUE; - IMallocSpy_PreHeapMinimize(Malloc32.pSpy); - } - - if (spy_active) - { - IMallocSpy_PostHeapMinimize(Malloc32.pSpy); - LeaveCriticalSection(&IMalloc32_SpyCS); - } -} - -static const IMallocVtbl VT_IMalloc32 = -{ - IMalloc_fnQueryInterface, - IMalloc_fnAddRefRelease, - IMalloc_fnAddRefRelease, - IMalloc_fnAlloc, - IMalloc_fnRealloc, - IMalloc_fnFree, - IMalloc_fnGetSize, - IMalloc_fnDidAlloc, - IMalloc_fnHeapMinimize -}; - -/****************************************************************************** - * CoGetMalloc [OLE32.@] - * - * Retrieves the current IMalloc interface for the process. - * - * PARAMS - * context [I] Should always be MEMCTX_TASK. - * imalloc [O] Address where memory allocator object will be stored. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI CoGetMalloc(DWORD context, IMalloc **imalloc) -{ - if (context != MEMCTX_TASK) { - *imalloc = NULL; - return E_INVALIDARG; - } - - *imalloc = &Malloc32.IMalloc_iface; - return S_OK; -} - -/*********************************************************************** - * CoTaskMemAlloc [OLE32.@] - * - * Allocates memory using the current process memory allocator. - * - * PARAMS - * size [I] Size of the memory block to allocate. - * - * RETURNS - * Success: Pointer to newly allocated memory block. - * Failure: NULL. - */ -LPVOID WINAPI CoTaskMemAlloc(SIZE_T size) -{ - return IMalloc_Alloc(&Malloc32.IMalloc_iface,size); -} - -/*********************************************************************** - * CoTaskMemFree [OLE32.@] - * - * Frees memory allocated from the current process memory allocator. - * - * PARAMS - * ptr [I] Memory block to free. - * - * RETURNS - * Nothing. - */ -VOID WINAPI CoTaskMemFree(LPVOID ptr) -{ - IMalloc_Free(&Malloc32.IMalloc_iface, ptr); -} - -/*********************************************************************** - * CoTaskMemRealloc [OLE32.@] - * - * Allocates memory using the current process memory allocator. - * - * PARAMS - * pvOld [I] Pointer to old memory block. - * size [I] Size of the new memory block. - * - * RETURNS - * Success: Pointer to newly allocated memory block. - * Failure: NULL. - */ -LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, SIZE_T size) -{ - return IMalloc_Realloc(&Malloc32.IMalloc_iface, pvOld, size); -} - -/*********************************************************************** - * CoRegisterMallocSpy [OLE32.@] - * - * Registers an object that receives notifications on memory allocations and - * frees. - * - * PARAMS - * pMallocSpy [I] New spy object. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * NOTES - * if a mallocspy is already registered, we can't do it again since - * only the spy knows, how to free a memory block - */ -HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy) -{ - IMallocSpy* pSpy; - HRESULT hres = E_INVALIDARG; - - TRACE("%p\n", pMallocSpy); - - if(!pMallocSpy) return E_INVALIDARG; - - EnterCriticalSection(&IMalloc32_SpyCS); - - if (Malloc32.pSpy) - hres = CO_E_OBJISREG; - else if (SUCCEEDED(IMallocSpy_QueryInterface(pMallocSpy, &IID_IMallocSpy, (void**)&pSpy))) { - Malloc32.pSpy = pSpy; - hres = S_OK; - } - - LeaveCriticalSection(&IMalloc32_SpyCS); - - return hres; -} - -/*********************************************************************** - * CoRevokeMallocSpy [OLE32.@] - * - * Revokes a previously registered object that receives notifications on memory - * allocations and frees. - * - * PARAMS - * pMallocSpy [I] New spy object. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * NOTES - * we can't revoke a malloc spy as long as memory blocks allocated with - * the spy are active since only the spy knows how to free them - */ -HRESULT WINAPI CoRevokeMallocSpy(void) -{ - HRESULT hres = S_OK; - TRACE("\n"); - - EnterCriticalSection(&IMalloc32_SpyCS); - - if (!Malloc32.pSpy) - hres = CO_E_OBJNOTREG; - else if (Malloc32.SpyedAllocationsLeft) { - TRACE("SpyReleasePending with %u allocations left\n", Malloc32.SpyedAllocationsLeft); - Malloc32.SpyReleasePending = TRUE; - hres = E_ACCESSDENIED; - } else { - IMallocSpy_Release(Malloc32.pSpy); - Malloc32.pSpy = NULL; - } - LeaveCriticalSection(&IMalloc32_SpyCS); - - return hres; -} - /****************************************************************************** * IsValidInterface [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 927a98ea123..78e8641cf36 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -38,7 +38,7 @@ @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) -@ stdcall CoGetMalloc(long ptr) +@ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) @ stdcall CoGetObject(wstr ptr ptr ptr) @ stdcall CoGetObjectContext(ptr ptr) @@ -67,7 +67,7 @@ @ stdcall CoRegisterChannelHook(ptr ptr) @ stdcall CoRegisterClassObject(ptr ptr long long ptr) @ stdcall CoRegisterInitializeSpy(ptr ptr) -@ stdcall CoRegisterMallocSpy (ptr) +@ stdcall CoRegisterMallocSpy(ptr) combase.CoRegisterMallocSpy @ stdcall CoRegisterMessageFilter(ptr ptr) @ stdcall CoRegisterPSClsid(ptr ptr) @ stdcall CoRegisterSurrogate(ptr) @@ -78,14 +78,14 @@ @ stdcall CoRevertToSelf() @ stdcall CoRevokeClassObject(long) @ stdcall CoRevokeInitializeSpy(int64) -@ stdcall CoRevokeMallocSpy() +@ stdcall CoRevokeMallocSpy() combase.CoRevokeMallocSpy @ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) @ stdcall CoSetState(ptr) @ stdcall CoSuspendClassObjects() @ stdcall CoSwitchCallContext(ptr ptr) -@ stdcall CoTaskMemAlloc(long) -@ stdcall CoTaskMemFree(ptr) -@ stdcall CoTaskMemRealloc(ptr long) +@ stdcall CoTaskMemAlloc(long) combase.CoTaskMemAlloc +@ stdcall CoTaskMemFree(ptr) combase.CoTaskMemFree +@ stdcall CoTaskMemRealloc(ptr long) combase.CoTaskMemRealloc @ stdcall CoTreatAsClass(ptr ptr) @ stdcall CoUninitialize() @ stub CoUnloadingWOW -- 2.27.0

3 11

[PATCH 2/2] xactengine3_7: Implement IXACT3Cue Interface.
by Vijay Kiran Kamuju 05 Aug '20

05 Aug '20

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

2 1

[PATCH 1/2] xactengine3_7: Implement IXACT3SoundBank Interface.
by Vijay Kiran Kamuju 05 Aug '20

05 Aug '20

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

2 1

[PATCH v2] wininet: Implement INTERNET_OPTION_SECURITY_CERTIFICATE flag for InternetQueryOption.
by Daniel Lehman 05 Aug '20

05 Aug '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: remove FIXME --- dlls/wininet/http.c | 60 ++++++++++++++++++ dlls/wininet/resource.h | 3 + dlls/wininet/tests/http.c | 127 +++++++++++++++++++++++++++++++++++++- dlls/wininet/wininet.rc | 11 ++++ 4 files changed, 199 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 220493718c..635fc055b3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -54,6 +54,7 @@ #include "internet.h" #include "zlib.h" +#include "resource.h" #include "wine/debug.h" #include "wine/exception.h" @@ -2277,6 +2278,65 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return get_security_cert_struct(req, (INTERNET_CERTIFICATE_INFOA*)buffer); } + case INTERNET_OPTION_SECURITY_CERTIFICATE: { + DWORD err; + int needed; + char fmt[512]; + char strength[16]; + char start_date[32]; + char start_time[32]; + char expiry_date[32]; + char expiry_time[32]; + SYSTEMTIME start, expiry; + INTERNET_CERTIFICATE_INFOA info; + + if(!size) + return ERROR_INVALID_PARAMETER; + + if(!req->netconn) { + *size = 0; + return ERROR_INTERNET_INVALID_OPERATION; + } + + if(!buffer) { + *size = 1; + return ERROR_INSUFFICIENT_BUFFER; + } + + if((err = get_security_cert_struct(req, &info))) + return err; + + LoadStringA(WININET_hModule, IDS_CERT_FORMAT, fmt, sizeof(fmt)); + LoadStringA(WININET_hModule, info.dwKeySize >= 128 ? IDS_CERT_HIGH : IDS_CERT_LOW, + strength, sizeof(strength)); + + FileTimeToSystemTime(&info.ftStart, &start); + FileTimeToSystemTime(&info.ftExpiry, &expiry); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_date, sizeof(start_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_time, sizeof(start_time)); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_date, sizeof(expiry_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_time, sizeof(expiry_time)); + + needed = _scprintf(fmt, info.lpszSubjectInfo, info.lpszIssuerInfo, + start_date, start_time, expiry_date, expiry_time, + strength, info.dwKeySize); + if(needed < *size) { + err = ERROR_SUCCESS; + *size = snprintf(buffer, *size, fmt, info.lpszSubjectInfo, info.lpszIssuerInfo, + start_date, start_time, expiry_date, expiry_time, + strength, info.dwKeySize); + }else { + err = ERROR_INSUFFICIENT_BUFFER; + *size = 1; + } + + LocalFree(info.lpszSubjectInfo); + LocalFree(info.lpszIssuerInfo); + LocalFree(info.lpszProtocolName); + LocalFree(info.lpszSignatureAlgName); + LocalFree(info.lpszEncryptionAlgName); + return err; + } case INTERNET_OPTION_CONNECT_TIMEOUT: if (*size < sizeof(DWORD)) return ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/wininet/resource.h b/dlls/wininet/resource.h index 256a374af0..190d3cc397 100644 --- a/dlls/wininet/resource.h +++ b/dlls/wininet/resource.h @@ -38,3 +38,6 @@ #define IDS_CERT_DATE_INVALID 0x502 #define IDS_CERT_CN_INVALID 0x503 #define IDS_CERT_ERRORS 0x504 +#define IDS_CERT_FORMAT 0x505 +#define IDS_CERT_HIGH 0x506 +#define IDS_CERT_LOW 0x507 diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c07d60d2a9..e0a38e05c4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6112,9 +6112,26 @@ static const cert_struct_test_t test_winehq_com_cert = { "webmaster(a)winehq.org" }; +static const char *cert_string_fmt = + "Subject:\r\n%s\r\n" + "Issuer:\r\n%s\r\n" + "Effective Date:\t%s %s\r\n" + "Expiration Date:\t%s %s\r\n" + "Security Protocol:\t%s\r\n" + "Signature Type:\t%s\r\n" + "Encryption Type:\t%s\r\n" + "Privacy Strength:\t%s (%u bits)"; + static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) { INTERNET_CERTIFICATE_INFOA info; + SYSTEMTIME start, expiry; + char expiry_date[32]; + char expiry_time[32]; + char start_date[32]; + char start_time[32]; + char expect[512]; + char actual[512]; DWORD size; BOOL res; @@ -6138,6 +6155,42 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); ok(info.dwKeySize >= 128 && info.dwKeySize <= 256, "dwKeySize = %u\n", info.dwKeySize); + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + { + skip("Non-English locale (test with hardcoded English)\n"); + release_cert_info(&info); + return; + } + + size = sizeof(actual); + SetLastError(0xdeadbeef); + memset(actual, 0x55, sizeof(actual)); + res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size); + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); + + FileTimeToSystemTime(&info.ftStart, &start); + FileTimeToSystemTime(&info.ftExpiry, &expiry); + + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_date, sizeof(start_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_time, sizeof(start_time)); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_date, sizeof(expiry_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_time, sizeof(expiry_time)); + + snprintf(expect, sizeof(expect), cert_string_fmt, info.lpszSubjectInfo, info.lpszIssuerInfo, + start_date, start_time, expiry_date, expiry_time, + info.lpszSignatureAlgName, info.lpszEncryptionAlgName, info.lpszProtocolName, + info.dwKeySize >= 128 ? "High" : "Low", info.dwKeySize); + ok(size == strlen(actual), "size = %u\n", size); + ok(!strcmp(actual, expect), "cert = actual\n%s\n", actual); + + --size; + SetLastError(0xdeadbeef); + memset(actual, 0x55, sizeof(actual)); + res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + ok(actual[0] == 0x55, "unexpected byte: %02x\n", actual[0]); + release_cert_info(&info); } @@ -6217,7 +6270,7 @@ static void test_security_flags(void) INTERNET_CERTIFICATE_INFOA *cert; HINTERNET ses, conn, req; DWORD size, flags; - char buf[100]; + char buf[512]; BOOL res; if (!https_support) @@ -6378,6 +6431,30 @@ static void test_security_flags(void) } HeapFree(GetProcessHeap(), 0, cert); + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, NULL, NULL); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetQueryOption failed: %d\n", GetLastError()); + + size = 0; + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, NULL, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + + size = 42; + SetLastError(0xdeadbeef); + memset(buf, 0x55, sizeof(buf)); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, buf, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + ok(buf[0] == 0x55, "unexpected byte: %02x\n", buf[0]); + + size = sizeof(buf); + SetLastError(0xdeadbeef); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, buf, &size); + ok(res && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size < sizeof(buf), "unexpected size: %u\n", size); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTED_TO_SERVER, 2); CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); @@ -6562,9 +6639,10 @@ static void test_secure_connection(void) static const WCHAR get[] = {'G','E','T',0}; static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; - DWORD size, flags, err; + DWORD size, size2, flags, err; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; + char certstr1[512], certstr2[512]; BOOL ret; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); @@ -6629,6 +6707,19 @@ static void test_secure_connection(void) } HeapFree(GetProcessHeap(), 0, certificate_structW); + SetLastError(0xdeadbeef); + size = sizeof(certstr1); + ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, certstr1, &size); + ok(ret && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + size2 = sizeof(certstr2); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, certstr2, &size2); + ok(ret && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + + ok(size == size2, "expected same size\n"); + ok(!strcmp(certstr1, certstr2), "expected same string\n"); + InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses); @@ -7517,6 +7608,37 @@ static void test_concurrent_header_access(void) CloseHandle( wait ); } +static void test_cert_string(void) +{ + HINTERNET ses, con, req; + char actual[512]; + DWORD size; + BOOL res; + + ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, NULL, "/", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + size = sizeof(actual); + SetLastError( 0xdeadbeef ); + memset( actual, 0x55, sizeof(actual) ); + res = InternetQueryOptionA( req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size ); + ok( !res && GetLastError() == ERROR_INTERNET_INVALID_OPERATION, + "InternetQueryOption failed: %u\n", GetLastError() ); + ok( size == 0, "unexpected size: %u\n", size ); + ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + START_TEST(http) { HMODULE hdll; @@ -7566,5 +7688,6 @@ START_TEST(http) test_connection_failure(); test_default_service_port(); test_concurrent_header_access(); + test_cert_string(); free_events(); } diff --git a/dlls/wininet/wininet.rc b/dlls/wininet/wininet.rc index b6e35629ca..5bd5b48ccc 100644 --- a/dlls/wininet/wininet.rc +++ b/dlls/wininet/wininet.rc @@ -29,6 +29,17 @@ STRINGTABLE IDS_CERT_DATE_INVALID "The date on the certificate is invalid." IDS_CERT_CN_INVALID "The name on the certificate does not match the site." IDS_CERT_ERRORS "There is at least one unspecified security problem with this certificate." + + IDS_CERT_FORMAT "Subject:\015\n%s\015\n" \ + "Issuer:\015\n%s\015\n" \ + "Effective Date:\t%s %s\015\n" \ + "Expiration Date:\t%s %s\015\n" \ + "Security Protocol:\t(null)\015\n" \ + "Signature Type:\t(null)\015\n" \ + "Encryption Type:\t(null)\015\n" \ + "Privacy Strength:\t%s (%u bits)" + IDS_CERT_HIGH "High" + IDS_CERT_LOW "Low" } IDD_PROXYDLG DIALOG 36, 24, 220, 146 -- 2.25.1

4 4

[PATCH 2/2] xactengine3_7: Use CLSID defined from global header.
by Alistair Leslie-Hughes 05 Aug '20

05 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/Makefile.in | 1 + dlls/xactengine3_7/xact_dll.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in index 6fce27d1628..6d486171622 100644 --- a/dlls/xactengine3_7/Makefile.in +++ b/dlls/xactengine3_7/Makefile.in @@ -1,5 +1,6 @@ MODULE = xactengine3_7.dll IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0307 EXTRALIBS = $(FAUDIO_LIBS) EXTRAINCL = $(FAUDIO_CFLAGS) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 69570e8ceff..2a55b49de25 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -27,7 +27,6 @@ #include "initguid.h" #include "xact3.h" #include "rpcproxy.h" -#include "xact_classes.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xact3); @@ -511,7 +510,7 @@ HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - if (IsEqualGUID(rclsid, &CLSID_XACTEngine37)) + if (IsEqualGUID(rclsid, &CLSID_XACTEngine)) { TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&XACTFactory, riid, ppv); -- 2.27.0

1 0

[PATCH] gdiplus: Avoid a few unnecessary calculations for arc2polybezier.
by Jeff Smith 05 Aug '20

05 Aug '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- 1. If width and height are equal, the 'unstretch' is not needed, though the unit conversion still is. 2. When the ratio between width and height is all that is needed, scaling them both equally is waste. 3. The start of a new partial is going to be the same as the end of the previous partial. dlls/gdiplus/gdiplus.c | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index d114ff797e..ee98d024f8 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -202,54 +202,54 @@ static void add_arc_part(GpPointF * pt, REAL x1, REAL y1, REAL x2, REAL y2, * adjusts the angles so that when we stretch the points they will end in the * right place. This is only complicated because atan and atan2 do not behave * conveniently. */ -static void unstretch_angle(REAL * angle, REAL rad_x, REAL rad_y) +static REAL unstretch_angle(REAL angle, REAL dia_x, REAL dia_y) { REAL stretched; INT revs_off; - *angle = deg2rad(*angle); + if(fabs(cos(angle)) < 0.00001 || fabs(sin(angle)) < 0.00001) + return angle; - if(fabs(cos(*angle)) < 0.00001 || fabs(sin(*angle)) < 0.00001) - return; - - stretched = gdiplus_atan2(sin(*angle) / fabs(rad_y), cos(*angle) / fabs(rad_x)); - revs_off = gdip_round(*angle / (2.0 * M_PI)) - gdip_round(stretched / (2.0 * M_PI)); + stretched = gdiplus_atan2(sin(angle) / fabs(dia_y), cos(angle) / fabs(dia_x)); + revs_off = gdip_round(angle / (2.0 * M_PI)) - gdip_round(stretched / (2.0 * M_PI)); stretched += ((REAL)revs_off) * M_PI * 2.0; - *angle = stretched; + return stretched; } /* Stores the bezier points that correspond to the arc in points. If points is * null, just return the number of points needed to represent the arc. */ -INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, - REAL startAngle, REAL sweepAngle) +INT arc2polybezier(GpPointF * points, REAL left, REAL top, REAL width, REAL height, + REAL start_angle, REAL sweep_angle) { INT i; - REAL end_angle, start_angle, endAngle; + REAL partial_end_angle, end_angle; - endAngle = startAngle + sweepAngle; - unstretch_angle(&startAngle, x2 / 2.0, y2 / 2.0); - unstretch_angle(&endAngle, x2 / 2.0, y2 / 2.0); + end_angle = deg2rad(start_angle + sweep_angle); + start_angle = deg2rad(start_angle); - /* start_angle and end_angle are the iterative variables */ - start_angle = startAngle; + if (width != height) + { + start_angle = unstretch_angle(start_angle, width, height); + end_angle = unstretch_angle(end_angle, width, height); + } for(i = 0; i < MAX_ARC_PTS - 1; i += 3){ /* check if we've overshot the end angle */ - if( sweepAngle > 0.0 ) + if( sweep_angle > 0.0 ) { - if (start_angle >= endAngle) break; - end_angle = min(start_angle + M_PI_2, endAngle); + if (start_angle >= end_angle) break; + partial_end_angle = min(start_angle + M_PI_2, end_angle); } else { - if (start_angle <= endAngle) break; - end_angle = max(start_angle - M_PI_2, endAngle); + if (start_angle <= end_angle) break; + partial_end_angle = max(start_angle - M_PI_2, end_angle); } if (points) - add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0); + add_arc_part(&points[i], left, top, width, height, start_angle, partial_end_angle, i == 0); - start_angle += M_PI_2 * (sweepAngle < 0.0 ? -1.0 : 1.0); + start_angle = partial_end_angle; } if (i == 0) return 0; -- 2.23.0

2 1

[PATCH v2] dmime: Parse TimeSig track data.
by Alistair Leslie-Hughes 04 Aug '20

04 Aug '20

The tims data actually has a DWORD (size) before the structure. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/timesigtrack.c | 61 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 697b3e3593b..f61e87806e9 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -37,6 +37,11 @@ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, IDirectMusicTrack_iface); } +static inline IDirectMusicTimeSigTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ret_iface) { @@ -207,10 +212,62 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; +struct timesig_item +{ + DWORD size; + DMUS_IO_TIMESIGNATURE_ITEM timesig; +}; + +static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *stream, + struct chunk_entry *timesig) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = timesig}; + struct timesig_item item; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(timesig)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if (chunk.id != DMUS_FOURCC_TIMESIGNATURE_TRACK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &item, sizeof(item)))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + + TRACE(" Size %d\n", item.size); + + TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); + TRACE(" - lTime %d\n", item.timesig.lTime); + TRACE(" - bBeatsPerMeasure %d\n", item.timesig.bBeatsPerMeasure); + TRACE(" - bBeat %d\n", item.timesig.bBeat); + TRACE(" - wGridsPerBeat %d\n", item.timesig.wGridsPerBeat); + } + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_TIMESIGTRACK_LIST) + hr = parse_timetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.27.0

2 2

[PATCH 2/2] dmime: Simplify loading/storing of the Tempo Track data
by Michael Stefaniuc 04 Aug '20

04 Aug '20

Fixes loading more than one tempo items. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Turns out the pattern of storing an array in a chunk as DWORD - size of element elements[] - array of elements is pretty common. 10 IDirectMusicTrack implementations have it, some of them in multiple chunk types. dlls/dmime/dmobject.c | 45 ++++++++++++++++++ dlls/dmime/dmobject.h | 2 + dlls/dmime/tempotrack.c | 102 +++++++++++++++------------------------- 3 files changed, 85 insertions(+), 64 deletions(-) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 0ef007530fd..e6a1ce906a7 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -28,6 +28,7 @@ #include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -371,6 +372,50 @@ HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) return stream_get_chunk(stream, chunk); } +/* Reads chunk data of the form: + DWORD - size of array element + element[] - Array of elements + The caller needs to heap_free() the array. +*/ +HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array, + unsigned int *count, DWORD elem_size) +{ + DWORD size; + HRESULT hr; + + *array = NULL; + *count = 0; + + if (chunk->size < sizeof(DWORD)) { + WARN_(dmfile)("%s: Too short to read element size\n", debugstr_chunk(chunk)); + return E_FAIL; + } + if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD)))) + return hr; + if (size != elem_size) { + WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n", + debugstr_chunk(chunk), size, elem_size); + return DMUS_E_UNSUPPORTED_STREAM; + } + + *count = (chunk->size - sizeof(DWORD)) / elem_size; + size = *count * elem_size; + if (!(*array = heap_alloc(size))) + return E_OUTOFMEMORY; + if (FAILED(hr = stream_read(stream, *array, size))) { + heap_free(*array); + *array = NULL; + return hr; + } + + if (chunk->size > size + sizeof(DWORD)) { + WARN_(dmfile)("%s: Extraneous data at end of array\n", debugstr_chunk(chunk)); + stream_skip_chunk(stream, chunk); + return S_FALSE; + } + return S_OK; +} + HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data, ULONG size) { diff --git a/dlls/dmime/dmobject.h b/dlls/dmime/dmobject.h index a1729c83232..afe721dc824 100644 --- a/dlls/dmime/dmobject.h +++ b/dlls/dmime/dmobject.h @@ -35,6 +35,8 @@ HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HI HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array, + unsigned int *count, DWORD elem_size) DECLSPEC_HIDDEN; HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data, ULONG size) DECLSPEC_HIDDEN; HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str, diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 94e4430b7f9..9d25ccc298c 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -29,11 +29,13 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicTempoTrack implementation */ + typedef struct IDirectMusicTempoTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; - struct list Items; + DMUS_IO_TEMPO_ITEM *items; + unsigned int count; } IDirectMusicTempoTrack; /* IDirectMusicTempoTrack IDirectMusicTrack8 part: */ @@ -83,16 +85,7 @@ static ULONG WINAPI tempo_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - struct list *cursor, *cursor2; - DMUS_PRIVATE_TEMPO_ITEM *item; - - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) { - item = LIST_ENTRY(cursor, DMUS_PRIVATE_TEMPO_ITEM, entry); - list_remove(cursor); - - heap_free(item); - } - + heap_free(This->items); heap_free(This); DMIME_UnlockModule(); } @@ -157,8 +150,8 @@ static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty MUSIC_TIME *next, void *param) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - DMUS_PRIVATE_TEMPO_ITEM *item = NULL; DMUS_TEMPO_PARAM *prm = param; + unsigned int i; TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); @@ -174,15 +167,15 @@ static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty prm->mtTime = 0; prm->dblTempo = 0.123456; - LIST_FOR_EACH_ENTRY(item, &This->Items, DMUS_PRIVATE_TEMPO_ITEM, entry) { - if (item->item.lTime <= time) { - MUSIC_TIME ofs = item->item.lTime - time; + for (i = 0; i < This->count; i++) { + if (This->items[i].lTime <= time) { + MUSIC_TIME ofs = This->items[i].lTime - time; if (ofs > prm->mtTime) { prm->mtTime = ofs; - prm->dblTempo = item->item.dblTempo; + prm->dblTempo = This->items[i].dblTempo; } - if (next && item->item.lTime > time && item->item.lTime < *next) - *next = item->item.lTime; + if (next && This->items[i].lTime > time && This->items[i].lTime < *next) + *next = This->items[i].lTime; } } @@ -334,53 +327,35 @@ static inline IDirectMusicTempoTrack *impl_from_IPersistStream(IPersistStream *i return CONTAINING_RECORD(iface, IDirectMusicTempoTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - IDirectMusicTempoTrack *This = impl_from_IPersistStream(iface); - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount; - LARGE_INTEGER liMove; - DMUS_IO_TEMPO_ITEM item; - LPDMUS_PRIVATE_TEMPO_ITEM pNewItem = NULL; - DWORD nItem = 0; - FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm); - - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_TEMPO_TRACK: { - TRACE_(dmfile)(": Tempo track\n"); - IStream_Read (pStm, &StreamSize, sizeof(DWORD), NULL); - StreamSize -= sizeof(DWORD); - StreamCount = 0; - TRACE_(dmfile)(" - sizeof(DMUS_IO_TEMPO_ITEM): %u (chunkSize = %u)\n", StreamSize, Chunk.dwSize); - do { - IStream_Read (pStm, &item, sizeof(item), NULL); - ++nItem; - TRACE_(dmfile)("DMUS_IO_TEMPO_ITEM #%d\n", nItem); - TRACE_(dmfile)(" - lTime = %u\n", item.lTime); - TRACE_(dmfile)(" - dblTempo = %g\n", item.dblTempo); - pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_TEMPO_ITEM)); - if (NULL == pNewItem) - return E_OUTOFMEMORY; - - pNewItem->item = item; - list_add_tail (&This->Items, &pNewItem->entry); - pNewItem = NULL; - StreamCount += sizeof(item); - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - return E_FAIL; - } - } + IDirectMusicTempoTrack *This = impl_from_IPersistStream(iface); + struct chunk_entry chunk = {0}; + unsigned int i; + HRESULT hr; - return S_OK; + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + if (chunk.id != DMUS_FOURCC_TEMPO_TRACK) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = stream_chunk_get_array(stream, &chunk, (void **)&This->items, &This->count, + sizeof(DMUS_IO_TEMPO_ITEM)); + if (FAILED(hr)) + return hr; + + for (i = 0; i < This->count; i++) { + TRACE_(dmfile)("DMUS_IO_TEMPO_ITEM #%u\n", i); + TRACE_(dmfile)(" - lTime = %u\n", This->items[i].lTime); + TRACE_(dmfile)(" - dblTempo = %g\n", This->items[i].dblTempo); + } + + return S_OK; } static const IPersistStreamVtbl persiststream_vtbl = { @@ -410,7 +385,6 @@ HRESULT WINAPI create_dmtempotrack(REFIID lpcGUID, void **ppobj) dmobject_init(&track->dmobj, &CLSID_DirectMusicTempoTrack, (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - list_init(&track->Items); DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); -- 2.26.2

1 0

[PATCH 1/2] dmime: Constify the chunk parameter of stream_skip_chunk()
by Michael Stefaniuc 04 Aug '20

04 Aug '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/dmobject.c | 2 +- dlls/dmime/dmobject.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 2a0a540fdb7..0ef007530fd 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -349,7 +349,7 @@ HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk) return S_OK; } -HRESULT stream_skip_chunk(IStream *stream, struct chunk_entry *chunk) +HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk) { LARGE_INTEGER end; diff --git a/dlls/dmime/dmobject.h b/dlls/dmime/dmobject.h index fcbb89fd28b..a1729c83232 100644 --- a/dlls/dmime/dmobject.h +++ b/dlls/dmime/dmobject.h @@ -33,7 +33,7 @@ struct chunk_entry { HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; -HRESULT stream_skip_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; +HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk) DECLSPEC_HIDDEN; HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data, ULONG size) DECLSPEC_HIDDEN; -- 2.26.2

1 0

[PATCH 3/3 v2] msvcrt: Import sqrt from musl.
by Piotr Caban 04 Aug '20

04 Aug '20

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

2 2

[PATCH 1/2] ntdll: Use unique handle numbers in generated SMBIOS tables.
by Brendan Shanks 04 Aug '20

04 Aug '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 3756bd7cee0..de33d52ed2e 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1257,6 +1257,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; char *buffer = (char*)sfti->TableBuffer; BYTE string_count; + BYTE handle_count = 0; struct smbios_prologue *prologue; struct smbios_bios *bios; struct smbios_system *system; @@ -1321,7 +1322,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON bios = (struct smbios_bios*)buffer; bios->hdr.type = 0; bios->hdr.length = sizeof(struct smbios_bios); - bios->hdr.handle = 0; + bios->hdr.handle = handle_count++; bios->vendor = bios_vendor_len ? ++string_count : 0; bios->version = bios_version_len ? ++string_count : 0; bios->start = 0; @@ -1346,7 +1347,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON system = (struct smbios_system*)buffer; system->hdr.type = 1; system->hdr.length = sizeof(struct smbios_system); - system->hdr.handle = 0; + system->hdr.handle = handle_count++; system->vendor = system_vendor_len ? ++string_count : 0; system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; @@ -1370,7 +1371,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON board = (struct smbios_board*)buffer; board->hdr.type = 2; board->hdr.length = sizeof(struct smbios_board); - board->hdr.handle = 0; + board->hdr.handle = handle_count++; board->vendor = board_vendor_len ? ++string_count : 0; board->product = board_product_len ? ++string_count : 0; board->version = board_version_len ? ++string_count : 0; @@ -1388,7 +1389,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON chassis = (struct smbios_chassis*)buffer; chassis->hdr.type = 3; chassis->hdr.length = sizeof(struct smbios_chassis); - chassis->hdr.handle = 0; + chassis->hdr.handle = handle_count++; chassis->vendor = chassis_vendor_len ? ++string_count : 0; chassis->type = atoi(chassis_type); chassis->version = chassis_version_len ? ++string_count : 0; -- 2.26.2

1 1

[PATCH v2] vbscript: Support conversion to string in InStr
by Dmitry Kislyuk 04 Aug '20

04 Aug '20

2 1

[PATCH v2] ieframe: Deactivate UI when processing IOleObject::DoVerb(OLEIVERB_HIDE).
by Dmitry Timoshkov 04 Aug '20

04 Aug '20

This fixes an application that expects to go through full UI activation after IOleObject::DoVerb(OLEIVERB_HIDE) + IOleObject::DoVerb(OLEIVERB_UIACTIVATE). v2: Move the tests to test_WebBrowser_DoVerb(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/ieframe.h | 2 + dlls/ieframe/oleobject.c | 44 ++++++--- dlls/ieframe/tests/webbrowser.c | 154 +++++++++++++++++++++++++++++++- 3 files changed, 183 insertions(+), 17 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 329cea2f7c..24d490c272 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -210,6 +210,8 @@ struct WebBrowser { OLEINPLACEFRAMEINFO frameinfo; SIZEL extent; + BOOL ui_activated; + HWND shell_embedding_hwnd; VARIANT_BOOL register_browser; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 031994caa5..a2f87dda2f 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -214,6 +214,9 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) if(FAILED(hres)) return hres; + if(This->ui_activated) + return S_OK; + IOleInPlaceSiteEx_OnUIActivate(This->inplace); if(This->doc_host.frame) @@ -227,6 +230,8 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) SetFocus(This->shell_embedding_hwnd); notify_on_focus(This, TRUE); + This->ui_activated = TRUE; + return S_OK; } @@ -579,6 +584,26 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont return S_OK; } +static void deactivate_ui(WebBrowser *This) +{ + if(This->ui_activated) { + if(This->doc_host.frame) + IOleInPlaceFrame_SetActiveObject(This->doc_host.frame, NULL, NULL); + + if(This->uiwindow) + IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, NULL, NULL); + + if(This->inplace) + IOleInPlaceSiteEx_OnUIDeactivate(This->inplace, FALSE); + notify_on_focus(This, FALSE); + + This->ui_activated = FALSE; + } + + if(This->inplace) + IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); +} + static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { WebBrowser *This = impl_from_IOleObject(iface); @@ -592,17 +617,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) return E_NOTIMPL; } - if(This->doc_host.frame) - IOleInPlaceFrame_SetActiveObject(This->doc_host.frame, NULL, NULL); - - if(This->uiwindow) - IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, NULL, NULL); - - if(This->inplace) - IOleInPlaceSiteEx_OnUIDeactivate(This->inplace, FALSE); - notify_on_focus(This, FALSE); - if(This->inplace) - IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); + deactivate_ui(This); /* store old client site - we need to restore it in DoVerb */ client = This->client; @@ -677,8 +692,11 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag return activate_inplace(This, pActiveSite); case OLEIVERB_HIDE: TRACE("OLEIVERB_HIDE\n"); - if(This->inplace) - IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); + if(This->inplace) { + deactivate_ui(This); + IOleInPlaceSiteEx_Release(This->inplace); + This->inplace = NULL; + } if(This->shell_embedding_hwnd) ShowWindow(This->shell_embedding_hwnd, SW_HIDE); return S_OK; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index e0af0d4642..9c2c393aaf 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -167,7 +167,8 @@ static VARIANT_BOOL exvb; static IWebBrowser2 *wb; static HWND container_hwnd, shell_embedding_hwnd; -static BOOL is_downloading, do_download, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; +static BOOL is_downloading, do_download, is_first_load, use_container_olecmd; +static BOOL test_close, test_hide, is_http, use_container_dochostui; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; static const WCHAR *current_url; @@ -1265,7 +1266,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { CHECK_EXPECT(UIWindow_SetActiveObject); - if(!test_close) { + if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); } else { @@ -1279,7 +1280,7 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { CHECK_EXPECT(Frame_SetActiveObject); - if(!test_close) { + if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); } else { @@ -3743,7 +3744,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) SET_EXPECT(Advise_OnClose); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); - todo_wine CHECK_NOT_CALLED(OnFocus_FALSE); + CHECK_NOT_CALLED(OnFocus_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); CHECK_CALLED(Advise_OnClose); @@ -4018,6 +4019,8 @@ static void test_WebBrowser_DoVerb(void) HWND hwnd; ULONG ref; BOOL res; + HRESULT hres; + VARIANT_BOOL b; webbrowser = create_webbrowser(); init_test(webbrowser, 0); @@ -4050,6 +4053,149 @@ static void test_WebBrowser_DoVerb(void) call_DoVerb(webbrowser, OLEIVERB_HIDE); CHECK_CALLED(OnInPlaceDeactivate); + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + SET_EXPECT(OnUIActivate); + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(SetMenu); + SET_EXPECT(OnFocus_TRUE); + call_DoVerb(webbrowser, OLEIVERB_SHOW); + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + CHECK_CALLED(OnUIActivate); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(SetMenu); + CHECK_CALLED(OnFocus_TRUE); + + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + call_DoVerb(webbrowser, OLEIVERB_SHOW); + call_DoVerb(webbrowser, OLEIVERB_UIACTIVATE); + + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(OnUIDeactivate); + SET_EXPECT(OnFocus_FALSE); + SET_EXPECT(OnInPlaceDeactivate); + test_hide = TRUE; + call_DoVerb(webbrowser, OLEIVERB_HIDE); + test_hide = FALSE; + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(OnUIDeactivate); + CHECK_CALLED(OnFocus_FALSE); + CHECK_CALLED(OnInPlaceDeactivate); + + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + SET_EXPECT(OnUIActivate); + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(SetMenu); + SET_EXPECT(OnFocus_TRUE); + call_DoVerb(webbrowser, OLEIVERB_SHOW); + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + CHECK_CALLED(OnUIActivate); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(SetMenu); + CHECK_CALLED(OnFocus_TRUE); + + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(OnUIDeactivate); + SET_EXPECT(OnFocus_FALSE); + SET_EXPECT(OnInPlaceDeactivate); + test_hide = TRUE; + call_DoVerb(webbrowser, OLEIVERB_HIDE); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(OnUIDeactivate); + CHECK_CALLED(OnFocus_FALSE); + CHECK_CALLED(OnInPlaceDeactivate); + + call_DoVerb(webbrowser, OLEIVERB_HIDE); + test_hide = FALSE; + + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + SET_EXPECT(OnUIActivate); + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(SetMenu); + SET_EXPECT(OnFocus_TRUE); + call_DoVerb(webbrowser, OLEIVERB_UIACTIVATE); + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + CHECK_CALLED(OnUIActivate); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(SetMenu); + CHECK_CALLED(OnFocus_TRUE); + + b = 0x100; + hres = IWebBrowser2_get_Visible(webbrowser, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + call_DoVerb(webbrowser, OLEIVERB_SHOW); + test_ClientSite(webbrowser, NULL, FALSE); ref = IWebBrowser2_Release(webbrowser); -- 2.26.2

2 1

[PATCH 1/5] msscript.ocx: Implement the ScriptModule enumerator.
by Gabriel Ivăncescu 04 Aug '20

04 Aug '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 163 ++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 134 +++++++++++++++++++++++- 2 files changed, 294 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 7fc7b95..352bcab 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -66,6 +66,15 @@ struct named_item { IDispatch *disp; }; +struct module_enum { + IEnumVARIANT IEnumVARIANT_iface; + LONG ref; + + UINT pos; + ScriptHost *host; + ScriptControl *control; +}; + typedef struct { IScriptModule IScriptModule_iface; LONG ref; @@ -375,6 +384,11 @@ static inline ScriptHost *impl_from_IServiceProvider(IServiceProvider *iface) return CONTAINING_RECORD(iface, ScriptHost, IServiceProvider_iface); } +static inline struct module_enum *module_enum_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, struct module_enum, IEnumVARIANT_iface); +} + /* IActiveScriptSite */ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { @@ -844,6 +858,135 @@ static const IScriptModuleVtbl ScriptModuleVtbl = { ScriptModule_Run }; +static HRESULT WINAPI module_enum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + struct module_enum *This = module_enum_from_IEnumVARIANT(iface); + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IEnumVARIANT, riid)) + { + *ppv = &This->IEnumVARIANT_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI module_enum_AddRef(IEnumVARIANT *iface) +{ + struct module_enum *This = module_enum_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI module_enum_Release(IEnumVARIANT *iface) +{ + struct module_enum *This = module_enum_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); + IScriptControl_Release(&This->control->IScriptControl_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI module_enum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + struct module_enum *This = module_enum_from_IEnumVARIANT(iface); + unsigned int i, num; + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + + if (!rgVar) return E_POINTER; + if (This->host != This->control->host) return E_FAIL; + + num = min(celt, This->host->module_count - This->pos); + for (i = 0; i < num; i++) + { + V_VT(rgVar + i) = VT_DISPATCH; + V_DISPATCH(rgVar + i) = (IDispatch*)(&This->control->modules[This->pos++]->IScriptModule_iface); + IDispatch_AddRef(V_DISPATCH(rgVar + i)); + } + + if (pCeltFetched) *pCeltFetched = i; + return i == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI module_enum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + struct module_enum *This = module_enum_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%u)\n", This, celt); + + if (This->host != This->control->host) return E_FAIL; + + if (This->host->module_count - This->pos < celt) + { + This->pos = This->host->module_count; + return S_FALSE; + } + This->pos += celt; + return S_OK; +} + +static HRESULT WINAPI module_enum_Reset(IEnumVARIANT *iface) +{ + struct module_enum *This = module_enum_from_IEnumVARIANT(iface); + + TRACE("(%p)\n", This); + + if (This->host != This->control->host) return E_FAIL; + + This->pos = 0; + return S_OK; +} + +static HRESULT WINAPI module_enum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + struct module_enum *This = module_enum_from_IEnumVARIANT(iface); + struct module_enum *clone; + + TRACE("(%p)->(%p)\n", This, ppEnum); + + if (!ppEnum) return E_POINTER; + if (This->host != This->control->host) return E_FAIL; + + if (!(clone = heap_alloc(sizeof(*clone)))) + return E_OUTOFMEMORY; + + *clone = *This; + clone->ref = 1; + IActiveScriptSite_AddRef(&This->host->IActiveScriptSite_iface); + IScriptControl_AddRef(&This->control->IScriptControl_iface); + + *ppEnum = &clone->IEnumVARIANT_iface; + return S_OK; +} + +static const IEnumVARIANTVtbl module_enum_vtbl = { + module_enum_QueryInterface, + module_enum_AddRef, + module_enum_Release, + module_enum_Next, + module_enum_Skip, + module_enum_Reset, + module_enum_Clone +}; + static ScriptModule *create_module(ScriptHost *host, BSTR name) { ScriptModule *module; @@ -987,10 +1130,26 @@ static HRESULT WINAPI ScriptModuleCollection_Invoke(IScriptModuleCollection *ifa static HRESULT WINAPI ScriptModuleCollection_get__NewEnum(IScriptModuleCollection *iface, IUnknown **ppenumContexts) { ScriptControl *This = impl_from_IScriptModuleCollection(iface); + struct module_enum *module_enum; - FIXME("(%p)->(%p)\n", This, ppenumContexts); + TRACE("(%p)->(%p)\n", This, ppenumContexts); - return E_NOTIMPL; + if (!ppenumContexts) return E_POINTER; + if (!This->host) return E_FAIL; + + if (!(module_enum = heap_alloc(sizeof(*module_enum)))) + return E_OUTOFMEMORY; + + module_enum->IEnumVARIANT_iface.lpVtbl = &module_enum_vtbl; + module_enum->ref = 1; + module_enum->pos = 0; + module_enum->host = This->host; + module_enum->control = This; + IActiveScriptSite_AddRef(&This->host->IActiveScriptSite_iface); + IScriptControl_AddRef(&This->IScriptControl_iface); + + *ppenumContexts = (IUnknown*)&module_enum->IEnumVARIANT_iface; + return S_OK; } static HRESULT WINAPI ScriptModuleCollection_get_Item(IScriptModuleCollection *iface, VARIANT index, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 807f82e..9986fbf 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2307,14 +2307,17 @@ static void test_IScriptControl_Run(void) static void test_IScriptControl_get_Modules(void) { + IEnumVARIANT *enumvar, *enumvar2; IScriptModuleCollection *mods; + VARIANT var, vars[3]; IScriptModule *mod; IScriptControl *sc; IUnknown *unknown; - VARIANT var; + ULONG fetched; LONG count; HRESULT hr; BSTR str; + UINT i; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); @@ -2360,6 +2363,16 @@ static void test_IScriptControl_get_Modules(void) IScriptModule_Release(mod); SysFreeString(str); + /* Grab an enumerator before we add another module */ + hr = IScriptModuleCollection_get__NewEnum(mods, NULL); + ok(hr == E_POINTER, "IScriptModuleCollection_get__NewEnum returned: 0x%08x.\n", hr); + hr = IScriptModuleCollection_get__NewEnum(mods, &unknown); + ok(hr == S_OK, "IScriptModuleCollection_get__NewEnum failed: 0x%08x.\n", hr); + hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void**)&enumvar); + ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08x.\n", hr); + ok((char*)unknown == (char*)enumvar, "unknown and enumvar are not the same (%p vs %p).\n", unknown, enumvar); + IUnknown_Release(unknown); + str = SysAllocString(L"some other Module"); hr = IScriptModuleCollection_Add(mods, str, &var, &mod); ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08x.\n", hr); @@ -2428,6 +2441,46 @@ static void test_IScriptControl_get_Modules(void) IScriptModule_Release(mod); SysFreeString(str); + /* Test the enumerator, should be updated */ + fetched = 0xdeadbeef; + hr = IEnumVARIANT_Next(enumvar, 0, NULL, NULL); + ok(hr == E_POINTER, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + hr = IEnumVARIANT_Next(enumvar, 0, NULL, &fetched); + ok(hr == E_POINTER, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); + ok(fetched == 0xdeadbeef, "got %u.\n", fetched); + hr = IEnumVARIANT_Next(enumvar, 0, &var, &fetched); + ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + ok(fetched == 0, "got %u.\n", fetched); + hr = IEnumVARIANT_Next(enumvar, 0, &var, NULL); + ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + hr = IEnumVARIANT_Clone(enumvar, NULL); + ok(hr == E_POINTER, "IEnumVARIANT_Clone failed: 0x%08x.\n", hr); + + hr = IEnumVARIANT_Next(enumvar, ARRAY_SIZE(vars), vars, &fetched); + ok(hr == S_OK, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); + ok(fetched == ARRAY_SIZE(vars), "got %u.\n", fetched); + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); + ok(fetched == 0, "got %u.\n", fetched); + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 1); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Clone(enumvar, &enumvar2); + ok(hr == S_OK, "IEnumVARIANT_Clone failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar2, 1); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + IEnumVARIANT_Release(enumvar2); + + for (i = 0; i < ARRAY_SIZE(vars); i++) + { + ok(V_VT(&vars[i]) == VT_DISPATCH, "V_VT(vars[%u]) = %d.\n", i, V_VT(&vars[i])); + hr = IDispatch_QueryInterface(V_DISPATCH(&vars[i]), &IID_IScriptModule, (void**)&mod); + ok(hr == S_OK, "Failed to query IScriptModule from vars[%u]: 0x%08x.\n", i, hr); + IScriptModule_Release(mod); + VariantClear(&vars[i]); + } + /* The 'Global' module is the same as the script control */ str = SysAllocString(L"add(10, 5)"); hr = IScriptControl_Eval(sc, str, &var); @@ -2465,6 +2518,17 @@ static void test_IScriptControl_get_Modules(void) IScriptModule_Release(mod); SysFreeString(str); + /* The enumerator is also invalid */ + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == E_FAIL, "IEnumVARIANT_Skip returned: 0x%08x.\n", hr); + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == E_FAIL, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == E_FAIL, "IEnumVARIANT_Skip returned: 0x%08x.\n", hr); + hr = IEnumVARIANT_Clone(enumvar, &enumvar2); + ok(hr == E_FAIL, "IEnumVARIANT_Clone returned: 0x%08x.\n", hr); + IEnumVARIANT_Release(enumvar); + hr = IScriptControl_put_Language(sc, NULL); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); @@ -2480,6 +2544,8 @@ static void test_IScriptControl_get_Modules(void) hr = IScriptModuleCollection_Add(mods, str, &var, &mod); ok(hr == E_FAIL, "IScriptModuleCollection_Add returned: 0x%08x.\n", hr); SysFreeString(str); + hr = IScriptModuleCollection_get__NewEnum(mods, &unknown); + ok(hr == E_FAIL, "IScriptModuleCollection_get__NewEnum returned: 0x%08x.\n", hr); IScriptModuleCollection_Release(mods); hr = IScriptControl_get_Modules(sc, &mods); @@ -2640,6 +2706,72 @@ static void test_IScriptControl_get_Modules(void) SET_EXPECT(Close); IScriptModule_Release(mod); CHECK_CALLED(Close); + + /* Hold an enumerator while releasing the script control */ + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + str = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(str); + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + hr = IScriptControl_get_Modules(sc, &mods); + ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08x.\n", hr); + IScriptControl_Release(sc); + + SET_EXPECT(AddNamedItem); + str = SysAllocString(L"bar"); + AddNamedItem_expected_name = str; + AddNamedItem_expected_flags = SCRIPTITEM_CODEONLY; + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = NULL; + hr = IScriptModuleCollection_Add(mods, str, &var, &mod); + ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08x.\n", hr); + IScriptModule_Release(mod); + VariantClear(&var); + SysFreeString(str); + CHECK_CALLED(AddNamedItem); + + hr = IScriptModuleCollection_get__NewEnum(mods, &unknown); + ok(hr == S_OK, "IScriptModuleCollection_get__NewEnum failed: 0x%08x.\n", hr); + hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void**)&enumvar); + ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08x.\n", hr); + IUnknown_Release(unknown); + + IScriptModuleCollection_Release(mods); + IActiveScriptSite_Release(site); + + hr = IEnumVARIANT_Next(enumvar, ARRAY_SIZE(vars), vars, &fetched); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); + ok(fetched == 2, "got %u.\n", fetched); + for (i = 0; i < fetched; i++) + { + ok(V_VT(&vars[i]) == VT_DISPATCH, "V_VT(vars[%u]) = %d.\n", i, V_VT(&vars[i])); + hr = IDispatch_QueryInterface(V_DISPATCH(&vars[i]), &IID_IScriptModule, (void**)&mod); + ok(hr == S_OK, "Failed to query IScriptModule from vars[%u]: 0x%08x.\n", i, hr); + hr = IScriptModule_get_Name(mod, &str); + ok(hr == S_OK, "IScriptModule_get_Name failed for vars[%u]: 0x%08x.\n", i, hr); + ok(!lstrcmpW(str, i ? L"bar" : L"Global"), "wrong name for vars[%u]: %s.\n", i, wine_dbgstr_w(str)); + IScriptModule_Release(mod); + VariantClear(&vars[i]); + SysFreeString(str); + } + + SET_EXPECT(Close); + IEnumVARIANT_Release(enumvar); + CHECK_CALLED(Close); } } -- 2.21.0

2 11

[PATCH] dbghelp: Add xmm and mxcsr register mapping functions for i386
by Vijay Kiran Kamuju 04 Aug '20

04 Aug '20

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

1 0

[v3 PATCH 1/5] combase: Move HGLOBAL marshalling functions.
by Nikolay Sivov 04 Aug '20

04 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.spec | 4 + dlls/combase/usrmarshal.c | 219 ++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 +- dlls/ole32/usrmarshal.c | 219 -------------------------------------- 4 files changed, 227 insertions(+), 223 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9d0bad29f0d..3c0955f705d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -197,6 +197,10 @@ @ stdcall HDC_UserMarshal(ptr ptr ptr) @ stdcall HDC_UserSize(ptr long ptr) @ stdcall HDC_UserUnmarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserFree(ptr ptr) +@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserSize(ptr long ptr) +@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) @ stdcall HICON_UserFree(ptr ptr) @ stdcall HICON_UserMarshal(ptr ptr ptr) @ stdcall HICON_UserSize(ptr long ptr) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index c88e8c57cd0..7c77cc1a80e 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -617,6 +617,225 @@ unsigned char * __RPC_USER HPALETTE_UserUnmarshal(ULONG *pFlags, unsigned char * return pBuffer; } +/****************************************************************************** + * HGLOBAL_UserSize (combase.@) + * + * Calculates the buffer size required to marshal an HGLOBAL. + * + * PARAMS + * pFlags [I] Flags. See notes. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the clip format. + * phGlobal [I] HGLOBAL to size. + * + * RETURNS + * The buffer size required to marshal an HGLOBAL plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *phGlobal) +{ + ULONG size = StartingSize; + + TRACE("%s, %u, %p.\n", debugstr_user_flags(pFlags), StartingSize, phGlobal); + + ALIGN_LENGTH(size, 3); + + size += sizeof(ULONG); + + if (LOWORD(*pFlags) == MSHCTX_INPROC) + size += sizeof(HGLOBAL); + else + { + size += sizeof(ULONG); + if (*phGlobal) + { + SIZE_T ret; + size += 3 * sizeof(ULONG); + ret = GlobalSize(*phGlobal); + size += (ULONG)ret; + } + } + + return size; +} + +/****************************************************************************** + * HGLOBAL_UserMarshal (combase.@) + * + * Marshals an HGLOBAL into a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format into. + * phGlobal [I] HGLOBAL to marshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) +{ + TRACE("%s, %p, &%p.\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); + + ALIGN_POINTER(pBuffer, 3); + + if (LOWORD(*pFlags) == MSHCTX_INPROC) + { + if (sizeof(*phGlobal) == 8) + *(ULONG *)pBuffer = WDT_INPROC64_CALL; + else + *(ULONG *)pBuffer = WDT_INPROC_CALL; + pBuffer += sizeof(ULONG); + *(HGLOBAL *)pBuffer = *phGlobal; + pBuffer += sizeof(HGLOBAL); + } + else + { + *(ULONG *)pBuffer = WDT_REMOTE_CALL; + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = HandleToULong(*phGlobal); + pBuffer += sizeof(ULONG); + if (*phGlobal) + { + const unsigned char *memory; + SIZE_T size = GlobalSize(*phGlobal); + *(ULONG *)pBuffer = (ULONG)size; + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = HandleToULong(*phGlobal); + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = (ULONG)size; + pBuffer += sizeof(ULONG); + + memory = GlobalLock(*phGlobal); + memcpy(pBuffer, memory, size); + pBuffer += size; + GlobalUnlock(*phGlobal); + } + } + + return pBuffer; +} + +/****************************************************************************** + * HGLOBAL_UserUnmarshal (combase.@) + * + * Unmarshals an HGLOBAL from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format from. + * phGlobal [O] Address that receive the unmarshaled HGLOBAL. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) +{ + ULONG fContext; + + TRACE("%s, %p, &%p.\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); + + ALIGN_POINTER(pBuffer, 3); + + fContext = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + + if (((fContext == WDT_INPROC_CALL) && (sizeof(*phGlobal) < 8)) || + ((fContext == WDT_INPROC64_CALL) && (sizeof(*phGlobal) == 8))) + { + *phGlobal = *(HGLOBAL *)pBuffer; + pBuffer += sizeof(*phGlobal); + } + else if (fContext == WDT_REMOTE_CALL) + { + ULONG handle; + + handle = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + + if (handle) + { + ULONG size; + void *memory; + + size = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + /* redundancy is bad - it means you have to check consistency like + * this: */ + if (*(ULONG *)pBuffer != handle) + { + RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); + return pBuffer; + } + pBuffer += sizeof(ULONG); + /* redundancy is bad - it means you have to check consistency like + * this: */ + if (*(ULONG *)pBuffer != size) + { + RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); + return pBuffer; + } + pBuffer += sizeof(ULONG); + + /* FIXME: check size is not too big */ + + *phGlobal = GlobalAlloc(GMEM_MOVEABLE, size); + memory = GlobalLock(*phGlobal); + memcpy(memory, pBuffer, size); + pBuffer += size; + GlobalUnlock(*phGlobal); + } + else + *phGlobal = NULL; + } + else + RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); + + return pBuffer; +} + +/****************************************************************************** + * HGLOBAL_UserFree (combase.@) + * + * Frees an unmarshaled HGLOBAL. + * + * PARAMS + * pFlags [I] Flags. See notes. + * phGlobal [I] HGLOBAL to free. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of + * which the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) +{ + TRACE("%s, &%p.\n", debugstr_user_flags(pFlags), *phGlobal); + + if (LOWORD(*pFlags) != MSHCTX_INPROC && *phGlobal) + GlobalFree(*phGlobal); +} + /****************************************************************************** * HPALETTE_UserFree (combase.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 97618e08935..c3ee8f27f23 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -143,10 +143,10 @@ @ stdcall HENHMETAFILE_UserMarshal(ptr ptr ptr) @ stdcall HENHMETAFILE_UserSize(ptr long ptr) @ stdcall HENHMETAFILE_UserUnmarshal(ptr ptr ptr) -@ stdcall HGLOBAL_UserFree(ptr ptr) -@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) -@ stdcall HGLOBAL_UserSize(ptr long ptr) -@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserFree(ptr ptr) combase.HGLOBAL_UserFree +@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) combase.HGLOBAL_UserMarshal +@ stdcall HGLOBAL_UserSize(ptr long ptr) combase.HGLOBAL_UserSize +@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) combase.HGLOBAL_UserUnmarshal @ stdcall HICON_UserFree(ptr ptr) combase.HICON_UserFree @ stdcall HICON_UserMarshal(ptr ptr ptr) combase.HICON_UserMarshal @ stdcall HICON_UserSize(ptr long ptr) combase.HICON_UserSize diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 694ef60764f..a5daa949830 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -156,225 +156,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) IMPL_WIREM_HANDLE(HACCEL) -/****************************************************************************** - * HGLOBAL_UserSize [OLE32.@] - * - * Calculates the buffer size required to marshal an HGLOBAL. - * - * PARAMS - * pFlags [I] Flags. See notes. - * StartingSize [I] Starting size of the buffer. This value is added on to - * the buffer size required for the clip format. - * phGlobal [I] HGLOBAL to size. - * - * RETURNS - * The buffer size required to marshal an HGLOBAL plus the starting size. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *phGlobal) -{ - ULONG size = StartingSize; - - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, phGlobal); - - ALIGN_LENGTH(size, 3); - - size += sizeof(ULONG); - - if (LOWORD(*pFlags) == MSHCTX_INPROC) - size += sizeof(HGLOBAL); - else - { - size += sizeof(ULONG); - if (*phGlobal) - { - SIZE_T ret; - size += 3 * sizeof(ULONG); - ret = GlobalSize(*phGlobal); - size += (ULONG)ret; - } - } - - return size; -} - -/****************************************************************************** - * HGLOBAL_UserMarshal [OLE32.@] - * - * Marshals an HGLOBAL into a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format into. - * phGlobal [I] HGLOBAL to marshal. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) -{ - TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); - - ALIGN_POINTER(pBuffer, 3); - - if (LOWORD(*pFlags) == MSHCTX_INPROC) - { - if (sizeof(*phGlobal) == 8) - *(ULONG *)pBuffer = WDT_INPROC64_CALL; - else - *(ULONG *)pBuffer = WDT_INPROC_CALL; - pBuffer += sizeof(ULONG); - *(HGLOBAL *)pBuffer = *phGlobal; - pBuffer += sizeof(HGLOBAL); - } - else - { - *(ULONG *)pBuffer = WDT_REMOTE_CALL; - pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = HandleToULong(*phGlobal); - pBuffer += sizeof(ULONG); - if (*phGlobal) - { - const unsigned char *memory; - SIZE_T size = GlobalSize(*phGlobal); - *(ULONG *)pBuffer = (ULONG)size; - pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = HandleToULong(*phGlobal); - pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = (ULONG)size; - pBuffer += sizeof(ULONG); - - memory = GlobalLock(*phGlobal); - memcpy(pBuffer, memory, size); - pBuffer += size; - GlobalUnlock(*phGlobal); - } - } - - return pBuffer; -} - -/****************************************************************************** - * HGLOBAL_UserUnmarshal [OLE32.@] - * - * Unmarshals an HGLOBAL from a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format from. - * phGlobal [O] Address that receive the unmarshaled HGLOBAL. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to an ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is an ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) -{ - ULONG fContext; - - TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); - - ALIGN_POINTER(pBuffer, 3); - - fContext = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - - if (((fContext == WDT_INPROC_CALL) && (sizeof(*phGlobal) < 8)) || - ((fContext == WDT_INPROC64_CALL) && (sizeof(*phGlobal) == 8))) - { - *phGlobal = *(HGLOBAL *)pBuffer; - pBuffer += sizeof(*phGlobal); - } - else if (fContext == WDT_REMOTE_CALL) - { - ULONG handle; - - handle = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - - if (handle) - { - ULONG size; - void *memory; - - size = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - /* redundancy is bad - it means you have to check consistency like - * this: */ - if (*(ULONG *)pBuffer != handle) - { - RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - return pBuffer; - } - pBuffer += sizeof(ULONG); - /* redundancy is bad - it means you have to check consistency like - * this: */ - if (*(ULONG *)pBuffer != size) - { - RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - return pBuffer; - } - pBuffer += sizeof(ULONG); - - /* FIXME: check size is not too big */ - - *phGlobal = GlobalAlloc(GMEM_MOVEABLE, size); - memory = GlobalLock(*phGlobal); - memcpy(memory, pBuffer, size); - pBuffer += size; - GlobalUnlock(*phGlobal); - } - else - *phGlobal = NULL; - } - else - RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); - - return pBuffer; -} - -/****************************************************************************** - * HGLOBAL_UserFree [OLE32.@] - * - * Frees an unmarshaled HGLOBAL. - * - * PARAMS - * pFlags [I] Flags. See notes. - * phGlobal [I] HGLOBAL to free. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of - * which the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) -{ - TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *phGlobal); - - if (LOWORD(*pFlags) != MSHCTX_INPROC && *phGlobal) - GlobalFree(*phGlobal); -} - /****************************************************************************** * HMETAFILE_UserSize [OLE32.@] * -- 2.27.0

3 10

[PATCH 2/2] xactengine3_6: New dll
by Alistair Leslie-Hughes 04 Aug '20

04 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_6/Makefile.in | 11 +++++++ dlls/xactengine3_6/main.c | 42 +++++++++++++++++++++++++++ dlls/xactengine3_6/xact_classes.idl | 28 ++++++++++++++++++ dlls/xactengine3_6/xactengine3_6.spec | 4 +++ 4 files changed, 85 insertions(+) create mode 100644 dlls/xactengine3_6/Makefile.in create mode 100644 dlls/xactengine3_6/main.c create mode 100644 dlls/xactengine3_6/xact_classes.idl create mode 100644 dlls/xactengine3_6/xactengine3_6.spec diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in new file mode 100644 index 00000000000..ffd7020292e --- /dev/null +++ b/dlls/xactengine3_6/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_6.dll +IMPORTS = ole32 uuid +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + main.c \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_6/main.c b/dlls/xactengine3_6/main.c new file mode 100644 index 00000000000..53a75028691 --- /dev/null +++ b/dlls/xactengine3_6/main.c @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018 Ethan Lee 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "xact_classes.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xact3); + +extern IClassFactory XACTFactory; + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + if (IsEqualGUID(rclsid, &CLSID_XACTEngine36)) + { + TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&XACTFactory, riid, ppv); + } + + FIXME("Unknown class %s\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/xactengine3_6/xact_classes.idl b/dlls/xactengine3_6/xact_classes.idl new file mode 100644 index 00000000000..7a5b5ec202f --- /dev/null +++ b/dlls/xactengine3_6/xact_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xactengine + * + * Copyright 2018 Ethan Lee 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 + */ + +#pragma makedep register + +[ + helpstring("XACT3.6 Class"), + threading(both), + uuid(248d8a3b-6256-44d3-a018-2ac96c459f47) +] +coclass XACTEngine36 { interface IXACT37Engine; } diff --git a/dlls/xactengine3_6/xactengine3_6.spec b/dlls/xactengine3_6/xactengine3_6.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_6/xactengine3_6.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() -- 2.27.0

2 1

[PATCH] ieframe: Deactivate UI when processing IOleObject::DoVerb(OLEIVERB_HIDE).
by Dmitry Timoshkov 04 Aug '20

04 Aug '20

This fixes an application that expects to go through full UI activation after IOleObject::DoVerb(OLEIVERB_HIDE) + IOleObject::DoVerb(OLEIVERB_UIACTIVATE). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/ieframe.h | 2 + dlls/ieframe/oleobject.c | 44 +++++++--- dlls/ieframe/tests/webbrowser.c | 148 +++++++++++++++++++++++++++++++- 3 files changed, 177 insertions(+), 17 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 329cea2f7c..24d490c272 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -210,6 +210,8 @@ struct WebBrowser { OLEINPLACEFRAMEINFO frameinfo; SIZEL extent; + BOOL ui_activated; + HWND shell_embedding_hwnd; VARIANT_BOOL register_browser; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 031994caa5..a2f87dda2f 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -214,6 +214,9 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) if(FAILED(hres)) return hres; + if(This->ui_activated) + return S_OK; + IOleInPlaceSiteEx_OnUIActivate(This->inplace); if(This->doc_host.frame) @@ -227,6 +230,8 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) SetFocus(This->shell_embedding_hwnd); notify_on_focus(This, TRUE); + This->ui_activated = TRUE; + return S_OK; } @@ -579,6 +584,26 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont return S_OK; } +static void deactivate_ui(WebBrowser *This) +{ + if(This->ui_activated) { + if(This->doc_host.frame) + IOleInPlaceFrame_SetActiveObject(This->doc_host.frame, NULL, NULL); + + if(This->uiwindow) + IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, NULL, NULL); + + if(This->inplace) + IOleInPlaceSiteEx_OnUIDeactivate(This->inplace, FALSE); + notify_on_focus(This, FALSE); + + This->ui_activated = FALSE; + } + + if(This->inplace) + IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); +} + static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { WebBrowser *This = impl_from_IOleObject(iface); @@ -592,17 +617,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) return E_NOTIMPL; } - if(This->doc_host.frame) - IOleInPlaceFrame_SetActiveObject(This->doc_host.frame, NULL, NULL); - - if(This->uiwindow) - IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, NULL, NULL); - - if(This->inplace) - IOleInPlaceSiteEx_OnUIDeactivate(This->inplace, FALSE); - notify_on_focus(This, FALSE); - if(This->inplace) - IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); + deactivate_ui(This); /* store old client site - we need to restore it in DoVerb */ client = This->client; @@ -677,8 +692,11 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag return activate_inplace(This, pActiveSite); case OLEIVERB_HIDE: TRACE("OLEIVERB_HIDE\n"); - if(This->inplace) - IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); + if(This->inplace) { + deactivate_ui(This); + IOleInPlaceSiteEx_Release(This->inplace); + This->inplace = NULL; + } if(This->shell_embedding_hwnd) ShowWindow(This->shell_embedding_hwnd, SW_HIDE); return S_OK; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index e0af0d4642..fc6dbb6756 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -167,7 +167,8 @@ static VARIANT_BOOL exvb; static IWebBrowser2 *wb; static HWND container_hwnd, shell_embedding_hwnd; -static BOOL is_downloading, do_download, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; +static BOOL is_downloading, do_download, is_first_load, use_container_olecmd; +static BOOL test_close, test_hide, is_http, use_container_dochostui; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; static const WCHAR *current_url; @@ -1265,7 +1266,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { CHECK_EXPECT(UIWindow_SetActiveObject); - if(!test_close) { + if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); } else { @@ -1279,7 +1280,7 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { CHECK_EXPECT(Frame_SetActiveObject); - if(!test_close) { + if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); } else { @@ -1838,6 +1839,7 @@ static void test_DoVerb(IWebBrowser2 *unk) RECT rect = {0,0,1000,1000}; HRESULT hres; DWORD connection; + VARIANT_BOOL b; hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); @@ -1847,6 +1849,77 @@ static void test_DoVerb(IWebBrowser2 *unk) hres = IOleObject_Advise(oleobj, &test_sink, &connection); ok(hres == S_OK, "Advise failed: %08x\n", hres); + b = 0x100; + hres = IWebBrowser2_get_Visible(unk, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + SET_EXPECT(OnUIActivate); + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(SetMenu); + SET_EXPECT(OnFocus_TRUE); + + hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, + 0, (HWND)0xdeadbeef, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + CHECK_CALLED(OnUIActivate); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(SetMenu); + CHECK_CALLED(OnFocus_TRUE); + + b = 0x100; + hres = IWebBrowser2_get_Visible(unk, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, + 0, (HWND)0xdeadbeef, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + + hres = IOleObject_DoVerb(oleobj, OLEIVERB_UIACTIVATE, NULL, &ClientSite, + 0, (HWND)0xdeadbeef, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(OnUIDeactivate); + SET_EXPECT(OnFocus_FALSE); + SET_EXPECT(OnInPlaceDeactivate); + + test_hide = TRUE; + hres = IOleObject_DoVerb(oleobj, OLEIVERB_HIDE, NULL, &ClientSite, + 0, (HWND)0xdeadbeef, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + test_hide = FALSE; + + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(OnUIDeactivate); + CHECK_CALLED(OnFocus_FALSE); + CHECK_CALLED(OnInPlaceDeactivate); + + b = 0x100; + hres = IWebBrowser2_get_Visible(unk, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + SET_EXPECT(CanInPlaceActivate); SET_EXPECT(Site_GetWindow); SET_EXPECT(OnInPlaceActivate); @@ -1877,6 +1950,73 @@ static void test_DoVerb(IWebBrowser2 *unk) CHECK_CALLED(SetMenu); CHECK_CALLED(OnFocus_TRUE); + b = 0x100; + hres = IWebBrowser2_get_Visible(unk, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(OnUIDeactivate); + SET_EXPECT(OnFocus_FALSE); + SET_EXPECT(OnInPlaceDeactivate); + + test_hide = TRUE; + hres = IOleObject_DoVerb(oleobj, OLEIVERB_HIDE, NULL, &ClientSite, + 0, (HWND)0xdeadbeef, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(OnUIDeactivate); + CHECK_CALLED(OnFocus_FALSE); + CHECK_CALLED(OnInPlaceDeactivate); + + hres = IOleObject_DoVerb(oleobj, OLEIVERB_HIDE, NULL, &ClientSite, + 0, (HWND)0xdeadbeef, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + test_hide = FALSE; + + b = 0x100; + hres = IWebBrowser2_get_Visible(unk, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + SET_EXPECT(OnUIActivate); + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(SetMenu); + SET_EXPECT(OnFocus_TRUE); + + hres = IOleObject_DoVerb(oleobj, OLEIVERB_UIACTIVATE, NULL, &ClientSite, + 0, (HWND)0xdeadbeef, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + CHECK_CALLED(OnUIActivate); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(SetMenu); + CHECK_CALLED(OnFocus_TRUE); + + b = 0x100; + hres = IWebBrowser2_get_Visible(unk, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", b); + hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); @@ -3743,7 +3883,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) SET_EXPECT(Advise_OnClose); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); - todo_wine CHECK_NOT_CALLED(OnFocus_FALSE); + CHECK_NOT_CALLED(OnFocus_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); CHECK_CALLED(Advise_OnClose); -- 2.26.2

2 1

[PATCH] vbscript: Support conversion to string in InStr
by Dmitry Kislyuk 04 Aug '20

04 Aug '20

2 1

[PATCH 2/3 v2] msvcrt: Import sqrtf from musl.
by Piotr Caban 04 Aug '20

04 Aug '20

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

1 0

[PATCH 1/3 v2] ucrtbase: Support overriding return value in _matherr.
by Piotr Caban 04 Aug '20

04 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 130 ++++++++++++++++++++----------------- dlls/ucrtbase/tests/misc.c | 7 ++ 2 files changed, 76 insertions(+), 61 deletions(-)

1 0

[PATCH 1/2] fsutil: make usage and unsupported command messages localizable
by Vijay Kiran Kamuju 04 Aug '20

04 Aug '20

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

3 2

[PATCH vkd3d 4/5] vkd3d-compiler: Add an option to specify the buffer type to use for buffer UAV bindings.
by Henri Verbeet 04 Aug '20

04 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index be8a99d..9b50c10 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -27,11 +27,12 @@ #include "vkd3d_common.h" #include "vkd3d_shader.h" -#define MAX_COMPILE_OPTIONS 1 +#define MAX_COMPILE_OPTIONS 2 enum { OPTION_HELP = CHAR_MAX + 1, + OPTION_BUFFER_UAV, OPTION_OUTPUT, OPTION_STRIP_DEBUG, OPTION_VERSION, @@ -101,6 +102,9 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" + " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" + " Valid values are 'buffer-texture' (default) and\n" + " 'storage-buffer'.\n" " -o, --output=<file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" @@ -151,6 +155,23 @@ static void add_compile_option(struct options *options, o->value = value; } +static bool parse_buffer_uav(enum vkd3d_shader_compile_option_buffer_uav *buffer_uav, const char *arg) +{ + if (!strcmp(arg, "buffer-texture")) + { + *buffer_uav = VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_TEXEL_BUFFER; + return true; + } + + if (!strcmp(arg, "storage-buffer")) + { + *buffer_uav = VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_BUFFER; + return true; + } + + return false; +} + static enum vkd3d_shader_source_type parse_source_type(const char *source) { if (!strcmp(source, "dxbc-tpf") || !strcmp(source, "none")) @@ -161,11 +182,13 @@ static enum vkd3d_shader_source_type parse_source_type(const char *source) static bool parse_command_line(int argc, char **argv, struct options *options) { + enum vkd3d_shader_compile_option_buffer_uav buffer_uav; int option; static struct option long_options[] = { {"help", no_argument, NULL, OPTION_HELP}, + {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, {"output", required_argument, NULL, OPTION_OUTPUT}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {"version", no_argument, NULL, OPTION_VERSION}, @@ -182,6 +205,15 @@ static bool parse_command_line(int argc, char **argv, struct options *options) switch (option) { + case OPTION_BUFFER_UAV: + if (!parse_buffer_uav(&buffer_uav, optarg)) + { + fprintf(stderr, "Invalid buffer UAV type '%s' specified.\n", optarg); + return false; + } + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV, buffer_uav); + break; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; -- 2.11.0

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Merge the vkd3d_shader_descriptor_type and vkd3d_shader_descriptor_range_type enumerations.
by Henri Verbeet 04 Aug '20

04 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 23 ++++++----------------- libs/vkd3d-shader/dxbc.c | 16 ++++++++-------- libs/vkd3d-shader/spirv.c | 5 +++-- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 26a2110..de2c0c7 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -88,11 +88,10 @@ struct vkd3d_shader_code enum vkd3d_shader_descriptor_type { - VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN, - VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, /* cb# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, /* t# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, /* u# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, /* s# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_SRV = 0x0, /* t# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_UAV = 0x1, /* u# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_CBV = 0x2, /* cb# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER = 0x3, /* s# */ VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_TYPE), }; @@ -450,19 +449,9 @@ struct vkd3d_shader_static_sampler_desc enum vkd3d_shader_visibility shader_visibility; }; -enum vkd3d_shader_descriptor_range_type -{ - VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV = 0x0, - VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV = 0x1, - VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV = 0x2, - VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER = 0x3, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE), -}; - struct vkd3d_shader_descriptor_range { - enum vkd3d_shader_descriptor_range_type range_type; + enum vkd3d_shader_descriptor_type range_type; unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; @@ -558,7 +547,7 @@ enum vkd3d_shader_descriptor_range_flags struct vkd3d_shader_descriptor_range1 { - enum vkd3d_shader_descriptor_range_type range_type; + enum vkd3d_shader_descriptor_type range_type; unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index df5f6a2..1aa8a5c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3143,13 +3143,13 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri { const struct vkd3d_shader_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; - if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV - || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV - || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV) + if (r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV) { have_srv_uav_cbv = true; } - else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER) + else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER) { have_sampler = true; } @@ -3184,13 +3184,13 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descri { const struct vkd3d_shader_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; - if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV - || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV - || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV) + if (r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV) { have_srv_uav_cbv = true; } - else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER) + else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER) { have_sampler = true; } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4d1826f..9ef0430 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2364,7 +2364,6 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor struct vkd3d_shader_descriptor_binding binding; unsigned int i; - descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN; if (reg->type == VKD3DSPR_CONSTBUFFER) descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; else if (reg->type == VKD3DSPR_RESOURCE) @@ -2378,6 +2377,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor FIXME("Unhandled register type %#x.\n", reg->type); vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE, "Encountered invalid/unhandled register type %#x.", reg->type); + goto done; } resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER @@ -2406,7 +2406,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor "Could not find descriptor binding for UAV counter %u, space %u.", reg_idx, register_space); } } - else if (descriptor_type != VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN) + else { for (i = 0; i < shader_interface->binding_count; ++i) { @@ -2432,6 +2432,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor } } +done: binding.set = 0; binding.binding = compiler->binding_idx++; return binding; -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Allow plain storage buffers to be used for buffer UAVs.
by Henri Verbeet 04 Aug '20

04 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 13 ++ libs/vkd3d-shader/spirv.c | 387 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 321 insertions(+), 79 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 140744c..26a2110 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -40,9 +40,22 @@ enum vkd3d_shader_structure_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; +/* This also affects UAV counters in Vulkan environments. In OpenGL + * environments, atomic counter buffers are always used for UAV counters. */ +enum vkd3d_shader_compile_option_buffer_uav +{ + /* Use buffer textures for buffer UAVs, this is the default. */ + VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_TEXEL_BUFFER = 0x00000000, + /* Use storage buffers for buffer UAVs. */ + VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_BUFFER = 0x00000001, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV), +}; + enum vkd3d_shader_compile_option_name { VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG = 0x00000001, + VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002, /* vkd3d_shader_compile_option_buffer_uav */ VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9af672b..4d1826f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -965,6 +965,17 @@ static uint32_t vkd3d_spirv_get_op_type_array(struct vkd3d_spirv_builder *builde vkd3d_spirv_build_op_type_array); } +static uint32_t vkd3d_spirv_build_op_type_runtime_array(struct vkd3d_spirv_builder *builder, uint32_t element_type) +{ + return vkd3d_spirv_build_op_r1(builder, &builder->global_stream, SpvOpTypeRuntimeArray, element_type); +} + +static uint32_t vkd3d_spirv_get_op_type_runtime_array(struct vkd3d_spirv_builder *builder, uint32_t element_type) +{ + return vkd3d_spirv_build_once1(builder, SpvOpTypeRuntimeArray, + element_type, vkd3d_spirv_build_op_type_runtime_array); +} + static uint32_t vkd3d_spirv_build_op_type_struct(struct vkd3d_spirv_builder *builder, uint32_t *members, unsigned int member_count) { @@ -1517,6 +1528,13 @@ static void vkd3d_spirv_build_op_image_write(struct vkd3d_spirv_builder *builder image_id, coordinate_id, texel_id); } +static uint32_t vkd3d_spirv_build_op_array_length(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t struct_id, uint32_t member_id) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpArrayLength, result_type, struct_id, member_id); +} + static uint32_t vkd3d_spirv_build_op_image_query_size_lod(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t image_id, uint32_t lod_id) { @@ -2047,6 +2065,7 @@ struct vkd3d_dxbc_compiler bool failed; bool strip_debug; + bool ssbo_uavs; struct rb_tree symbol_table; uint32_t temp_id; @@ -2168,6 +2187,15 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->strip_debug = !!option->value; break; + case VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV: + if (option->value == VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_TEXEL_BUFFER) + compiler->ssbo_uavs = false; + else if (option->value == VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_BUFFER) + compiler->ssbo_uavs = true; + else + WARN("Ignoring unrecognised value %#x for option %#x.\n", option->value, option->name); + break; + default: WARN("Ignoring unrecognised option %#x with value %#x.\n", option->name, option->value); break; @@ -2207,6 +2235,12 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return compiler; } +static bool vkd3d_dxbc_compiler_use_storage_buffer(const struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_symbol_resource_data *resource) +{ + return compiler->ssbo_uavs && resource->resource_type_info->resource_type == VKD3D_SHADER_RESOURCE_BUFFER; +} + static enum vkd3d_shader_spirv_environment vkd3d_dxbc_compiler_get_target_environment( const struct vkd3d_dxbc_compiler *compiler) { @@ -5322,8 +5356,28 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp return; } - type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, reg, register_space, - register_index, resource_type_info, sampled_type, structure_stride || raw, 0); + if (compiler->ssbo_uavs && is_uav && resource_type == VKD3D_SHADER_RESOURCE_BUFFER) + { + uint32_t array_type_id, struct_id; + + type_id = vkd3d_spirv_get_type_id(builder, sampled_type, 1); + + array_type_id = vkd3d_spirv_get_op_type_runtime_array(builder, type_id); + vkd3d_spirv_build_op_decorate1(builder, array_type_id, SpvDecorationArrayStride, 4); + + struct_id = vkd3d_spirv_build_op_type_struct(builder, &array_type_id, 1); + vkd3d_spirv_build_op_decorate(builder, struct_id, SpvDecorationBufferBlock, NULL, 0); + vkd3d_spirv_build_op_member_decorate1(builder, struct_id, 0, SpvDecorationOffset, 0); + + type_id = struct_id; + storage_class = SpvStorageClassUniform; + } + else + { + 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); @@ -5347,13 +5401,28 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp { assert(structure_stride); /* counters are valid only for structured buffers */ + counter_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); 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_SHADER_COMPONENT_UINT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, counter_type_id); } + else if (compiler->ssbo_uavs) + { + uint32_t length_id, array_type_id, struct_id; + + length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 1); + array_type_id = vkd3d_spirv_build_op_type_array(builder, counter_type_id, length_id); + vkd3d_spirv_build_op_decorate1(builder, array_type_id, SpvDecorationArrayStride, 4); + + struct_id = vkd3d_spirv_build_op_type_struct(builder, &array_type_id, 1); + vkd3d_spirv_build_op_decorate(builder, struct_id, SpvDecorationBufferBlock, NULL, 0); + vkd3d_spirv_build_op_member_decorate1(builder, struct_id, 0, SpvDecorationOffset, 0); + + storage_class = SpvStorageClassUniform; + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, struct_id); + } counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); @@ -7602,47 +7671,82 @@ static uint32_t vkd3d_dxbc_compiler_emit_raw_structured_addressing( static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + uint32_t coordinate_id, type_id, val_id, texel_type_id, ptr_type_id, ptr_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t coordinate_id, type_id, val_id, texel_type_id; const struct vkd3d_shader_src_param *resource; + const struct vkd3d_symbol *resource_symbol; uint32_t base_coordinate_id, component_idx; uint32_t constituents[VKD3D_VEC4_SIZE]; struct vkd3d_shader_image image; + uint32_t indices[2]; unsigned int i, j; SpvOp op; resource = &src[instruction->src_count - 1]; + resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, &resource->reg); - if (resource->reg.type == VKD3DSPR_RESOURCE) - op = SpvOpImageFetch; - else - op = SpvOpImageRead; + if (resource->reg.type == VKD3DSPR_UAV + && vkd3d_dxbc_compiler_use_storage_buffer(compiler, &resource_symbol->info.resource)) + { + texel_type_id = vkd3d_spirv_get_type_id(builder, resource_symbol->info.resource.sampled_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassUniform, texel_type_id); - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NONE); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, + type_id, resource_symbol->info.resource.structure_stride, + &src[0], VKD3DSP_WRITEMASK_0, &src[1], VKD3DSP_WRITEMASK_0); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); - base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, - type_id, image.structure_stride, &src[0], VKD3DSP_WRITEMASK_0, &src[1], VKD3DSP_WRITEMASK_0); + assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); + for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) + { + if (!(dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) + continue; - texel_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); - assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); - for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) + component_idx = vkd3d_swizzle_get_component(resource->swizzle, i); + coordinate_id = base_coordinate_id; + if (component_idx) + coordinate_id = vkd3d_spirv_build_op_iadd(builder, type_id, + coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); + indices[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + indices[1] = coordinate_id; + + ptr_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, resource_symbol->id, indices, 2); + constituents[j++] = vkd3d_spirv_build_op_load(builder, texel_type_id, ptr_id, SpvMemoryAccessMaskNone); + } + } + else { - if (!(dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) - continue; + if (resource->reg.type == VKD3DSPR_RESOURCE) + op = SpvOpImageFetch; + else + op = SpvOpImageRead; - component_idx = vkd3d_swizzle_get_component(resource->swizzle, i); - coordinate_id = base_coordinate_id; - if (component_idx) - coordinate_id = vkd3d_spirv_build_op_iadd(builder, type_id, - coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NONE); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, + type_id, image.structure_stride, &src[0], VKD3DSP_WRITEMASK_0, &src[1], VKD3DSP_WRITEMASK_0); - val_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, - op, texel_type_id, image.image_id, coordinate_id); - constituents[j++] = vkd3d_spirv_build_op_composite_extract1(builder, - type_id, val_id, 0); + texel_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); + assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); + for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) + { + if (!(dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) + continue; + + component_idx = vkd3d_swizzle_get_component(resource->swizzle, i); + coordinate_id = base_coordinate_id; + if (component_idx) + coordinate_id = vkd3d_spirv_build_op_iadd(builder, type_id, + coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); + + val_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + op, texel_type_id, image.image_id, coordinate_id); + constituents[j++] = vkd3d_spirv_build_op_composite_extract1(builder, + type_id, val_id, 0); + } } assert(dst->reg.data_type == VKD3D_DATA_UINT); vkd3d_dxbc_compiler_emit_store_dst_components(compiler, dst, VKD3D_SHADER_COMPONENT_UINT, constituents); @@ -7710,40 +7814,79 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured(struct vkd3d_dxbc_compile static void vkd3d_dxbc_compiler_emit_store_uav_raw_structured(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + uint32_t coordinate_id, type_id, val_id, data_id, ptr_type_id, ptr_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t coordinate_id, type_id, val_id, texel_id; - const struct vkd3d_shader_src_param *texel; + const struct vkd3d_symbol *resource_symbol; uint32_t base_coordinate_id, component_idx; + const struct vkd3d_shader_src_param *data; struct vkd3d_shader_image image; unsigned int component_count; + uint32_t indices[2]; - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, NULL, VKD3D_IMAGE_FLAG_NONE); - assert((instruction->handler_idx == VKD3DSIH_STORE_STRUCTURED) != !image.structure_stride); - base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, - type_id, image.structure_stride, &src[0], VKD3DSP_WRITEMASK_0, &src[1], VKD3DSP_WRITEMASK_0); + resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, &dst->reg); - texel = &src[instruction->src_count - 1]; - assert(texel->reg.data_type == VKD3D_DATA_UINT); - val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, texel, dst->write_mask); + if (vkd3d_dxbc_compiler_use_storage_buffer(compiler, &resource_symbol->info.resource)) + { + type_id = vkd3d_spirv_get_type_id(builder, resource_symbol->info.resource.sampled_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassUniform, type_id); - component_count = vkd3d_write_mask_component_count(dst->write_mask); - for (component_idx = 0; component_idx < component_count; ++component_idx) + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, + type_id, resource_symbol->info.resource.structure_stride, + &src[0], VKD3DSP_WRITEMASK_0, &src[1], VKD3DSP_WRITEMASK_0); + + data = &src[instruction->src_count - 1]; + assert(data->reg.data_type == VKD3D_DATA_UINT); + val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, data, dst->write_mask); + + component_count = vkd3d_write_mask_component_count(dst->write_mask); + for (component_idx = 0; component_idx < component_count; ++component_idx) + { + data_id = component_count > 1 ? + vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, component_idx) : val_id; + + coordinate_id = base_coordinate_id; + if (component_idx) + coordinate_id = vkd3d_spirv_build_op_iadd(builder, type_id, + coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); + indices[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + indices[1] = coordinate_id; + + ptr_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, resource_symbol->id, indices, 2); + vkd3d_spirv_build_op_store(builder, ptr_id, data_id, SpvMemoryAccessMaskNone); + } + } + else { - /* Mesa Vulkan drivers require the texel parameter to be a vector. */ - texel_id = vkd3d_dxbc_compiler_emit_construct_vector(compiler, VKD3D_SHADER_COMPONENT_UINT, - VKD3D_VEC4_SIZE, val_id, component_idx, component_count); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, NULL, VKD3D_IMAGE_FLAG_NONE); + assert((instruction->handler_idx == VKD3DSIH_STORE_STRUCTURED) != !image.structure_stride); + base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, + type_id, image.structure_stride, &src[0], VKD3DSP_WRITEMASK_0, &src[1], VKD3DSP_WRITEMASK_0); - coordinate_id = base_coordinate_id; - if (component_idx) - coordinate_id = vkd3d_spirv_build_op_iadd(builder, type_id, - coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); + data = &src[instruction->src_count - 1]; + assert(data->reg.data_type == VKD3D_DATA_UINT); + val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, data, dst->write_mask); - vkd3d_spirv_build_op_image_write(builder, image.image_id, coordinate_id, - texel_id, SpvImageOperandsMaskNone, NULL, 0); + component_count = vkd3d_write_mask_component_count(dst->write_mask); + for (component_idx = 0; component_idx < component_count; ++component_idx) + { + /* Mesa Vulkan drivers require the texel parameter to be a vector. */ + data_id = vkd3d_dxbc_compiler_emit_construct_vector(compiler, VKD3D_SHADER_COMPONENT_UINT, + VKD3D_VEC4_SIZE, val_id, component_idx, component_count); + + coordinate_id = base_coordinate_id; + if (component_idx) + coordinate_id = vkd3d_spirv_build_op_iadd(builder, type_id, + coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); + + vkd3d_spirv_build_op_image_write(builder, image.image_id, coordinate_id, + data_id, SpvImageOperandsMaskNone, NULL, 0); + } } + } static void vkd3d_dxbc_compiler_emit_store_tgsm(struct vkd3d_dxbc_compiler *compiler, @@ -7808,43 +7951,84 @@ static void vkd3d_dxbc_compiler_emit_ld_uav_typed(struct vkd3d_dxbc_compiler *co const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t coordinate_id, type_id, val_id, ptr_type_id, ptr_id; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t coordinate_id, type_id, val_id; + const struct vkd3d_symbol *resource_symbol; struct vkd3d_shader_image image; DWORD coordinate_mask; + uint32_t indices[2]; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_NONE); - type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); - coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; - coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); + resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, &src[1].reg); - val_id = vkd3d_spirv_build_op_image_read(builder, type_id, - image.image_id, coordinate_id, SpvImageOperandsMaskNone, NULL, 0); + if (vkd3d_dxbc_compiler_use_storage_buffer(compiler, &resource_symbol->info.resource)) + { + type_id = vkd3d_spirv_get_type_id(builder, resource_symbol->info.resource.sampled_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassUniform, type_id); + coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_0); + indices[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + indices[1] = coordinate_id; - vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, - dst, val_id, image.sampled_type, src[1].swizzle); + ptr_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, resource_symbol->id, indices, 2); + val_id = vkd3d_spirv_build_op_load(builder, type_id, ptr_id, SpvMemoryAccessMaskNone); + + vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, dst, val_id, + resource_symbol->info.resource.sampled_type, src[1].swizzle); + } + else + { + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_NONE); + type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); + coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; + coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); + + val_id = vkd3d_spirv_build_op_image_read(builder, type_id, + image.image_id, coordinate_id, SpvImageOperandsMaskNone, NULL, 0); + + vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, + dst, val_id, image.sampled_type, src[1].swizzle); + } } static void vkd3d_dxbc_compiler_emit_store_uav_typed(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + uint32_t coordinate_id, texel_id, type_id, val_id, ptr_type_id, ptr_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t coordinate_id, texel_id; + const struct vkd3d_symbol *resource_symbol; struct vkd3d_shader_image image; DWORD coordinate_mask; + uint32_t indices[2]; - vkd3d_spirv_enable_capability(builder, SpvCapabilityStorageImageWriteWithoutFormat); + resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, &dst->reg); - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, NULL, VKD3D_IMAGE_FLAG_NONE); - coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; - coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); - texel_id = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[1], dst->write_mask, image.sampled_type); + if (vkd3d_dxbc_compiler_use_storage_buffer(compiler, &resource_symbol->info.resource)) + { + type_id = vkd3d_spirv_get_type_id(builder, resource_symbol->info.resource.sampled_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassUniform, type_id); + coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_0); + indices[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + indices[1] = coordinate_id; - vkd3d_spirv_build_op_image_write(builder, image.image_id, coordinate_id, texel_id, - SpvImageOperandsMaskNone, NULL, 0); + val_id = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[1], + VKD3DSP_WRITEMASK_0, resource_symbol->info.resource.sampled_type); + ptr_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, resource_symbol->id, indices, 2); + vkd3d_spirv_build_op_store(builder, ptr_id, val_id, SpvMemoryAccessMaskNone); + } + else + { + vkd3d_spirv_enable_capability(builder, SpvCapabilityStorageImageWriteWithoutFormat); + + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, NULL, VKD3D_IMAGE_FLAG_NONE); + coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; + coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); + texel_id = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[1], dst->write_mask, image.sampled_type); + + vkd3d_spirv_build_op_image_write(builder, image.image_id, coordinate_id, texel_id, + SpvImageOperandsMaskNone, NULL, 0); + } } static void vkd3d_dxbc_compiler_emit_uav_counter_instruction(struct vkd3d_dxbc_compiler *compiler, @@ -7873,6 +8057,15 @@ static void vkd3d_dxbc_compiler_emit_uav_counter_instruction(struct vkd3d_dxbc_c pointer_id = counter_id; memory_semantics |= SpvMemorySemanticsAtomicCounterMemoryMask; } + else if (compiler->ssbo_uavs) + { + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassUniform, type_id); + coordinate_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + operands[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + operands[1] = coordinate_id; + pointer_id = vkd3d_spirv_build_op_access_chain(builder, + ptr_type_id, counter_id, operands, 2); + } else { ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id); @@ -7946,6 +8139,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + const struct vkd3d_symbol *resource_symbol = NULL; uint32_t ptr_type_id, type_id, val_id, result_id; enum vkd3d_shader_component_type component_type; const struct vkd3d_shader_dst_param *resource; @@ -7981,10 +8175,21 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil else { scope = SpvScopeDevice; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NO_LOAD); - coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; - structure_stride = image.structure_stride; - raw = image.raw; + resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, &resource->reg); + + if (vkd3d_dxbc_compiler_use_storage_buffer(compiler, &resource_symbol->info.resource)) + { + coordinate_mask = VKD3DSP_WRITEMASK_0; + structure_stride = resource_symbol->info.resource.structure_stride; + raw = resource_symbol->info.resource.raw; + } + else + { + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NO_LOAD); + coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; + structure_stride = image.structure_stride; + raw = image.raw; + } } type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); @@ -8009,12 +8214,24 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil } else { - component_type = image.sampled_type; - type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id); - sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); - pointer_id = vkd3d_spirv_build_op_image_texel_pointer(builder, - ptr_type_id, image.id, coordinate_id, sample_id); + if (vkd3d_dxbc_compiler_use_storage_buffer(compiler, &resource_symbol->info.resource)) + { + component_type = resource_symbol->info.resource.sampled_type; + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassUniform, type_id); + operands[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + operands[1] = coordinate_id; + pointer_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, resource_symbol->id, operands, 2); + } + else + { + component_type = image.sampled_type; + type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id); + sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + pointer_id = vkd3d_spirv_build_op_image_texel_pointer(builder, + ptr_type_id, image.id, coordinate_id, sample_id); + } } val_id = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[1], VKD3DSP_WRITEMASK_0, component_type); @@ -8041,18 +8258,30 @@ static void vkd3d_dxbc_compiler_emit_bufinfo(struct vkd3d_dxbc_compiler *compile struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + const struct vkd3d_symbol *resource_symbol; uint32_t type_id, val_id, stride_id; struct vkd3d_shader_image image; uint32_t constituents[2]; unsigned int write_mask; - vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); + if (compiler->ssbo_uavs && src->reg.type == VKD3DSPR_UAV) + { + resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, &src->reg); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + val_id = vkd3d_spirv_build_op_array_length(builder, type_id, resource_symbol->id, 0); + write_mask = VKD3DSP_WRITEMASK_0; + } + else + { + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, NULL, VKD3D_IMAGE_FLAG_NONE); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, NULL, VKD3D_IMAGE_FLAG_NONE); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); - val_id = vkd3d_spirv_build_op_image_query_size(builder, type_id, image.image_id); - write_mask = VKD3DSP_WRITEMASK_0; + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + val_id = vkd3d_spirv_build_op_image_query_size(builder, type_id, image.image_id); + write_mask = VKD3DSP_WRITEMASK_0; + } if (image.structure_stride) { -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Add a compiler message for unhandled register types in vkd3d_dxbc_compiler_get_descriptor_binding().
by Henri Verbeet 04 Aug '20

04 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6341370..9af672b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2340,7 +2340,11 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor else if (reg->type == VKD3DSPR_SAMPLER) descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER; else + { FIXME("Unhandled register type %#x.\n", reg->type); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE, + "Encountered invalid/unhandled register type %#x.", reg->type); + } resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 16df8a5..21e37da 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -71,6 +71,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF = 1000, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, + VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001, -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Fail shader compilation if any descriptor bindings are missing.
by Henri Verbeet 04 Aug '20

04 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 30 ++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 51 ++++++++++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++++- 3 files changed, 64 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 86ee263..6341370 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2043,6 +2043,9 @@ struct vkd3d_dxbc_compiler { struct vkd3d_spirv_builder spirv_builder; + struct vkd3d_shader_message_context *message_context; + bool failed; + bool strip_debug; struct rb_tree symbol_table; @@ -2113,7 +2116,8 @@ static const char *vkd3d_dxbc_compiler_get_entry_point_name(const struct vkd3d_d 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_descriptor_info *scan_descriptor_info) + const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, + struct vkd3d_shader_message_context *message_context) { const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; @@ -2127,6 +2131,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return NULL; memset(compiler, 0, sizeof(*compiler)); + compiler->message_context = message_context; if ((target_info = vkd3d_find_struct(compile_info->next, SPIRV_TARGET_INFO))) { @@ -2304,6 +2309,17 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com return false; } +static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_dxbc_compiler_error(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(compiler->message_context, error, format, args); + va_end(args); + compiler->failed = true; +} + static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor_binding( struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, unsigned int register_space, unsigned int reg_idx, enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) @@ -2346,7 +2362,11 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor return current->binding; } if (shader_interface->uav_counter_count) + { FIXME("Could not find descriptor binding for UAV counter %u, space %u.\n", reg_idx, register_space); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND, + "Could not find descriptor binding for UAV counter %u, space %u.", reg_idx, register_space); + } } else if (descriptor_type != VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN) { @@ -2365,8 +2385,13 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor return current->binding; } if (shader_interface->binding_count) + { FIXME("Could not find binding for type %#x, space %u, register %u, shader type %#x.\n", descriptor_type, register_space, reg_idx, compiler->shader_type); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND, + "Could not find descriptor binding for type %#x, space %u, register %u, shader type %#x.", + descriptor_type, register_space, reg_idx, compiler->shader_type); + } } binding.set = 0; @@ -8797,6 +8822,9 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, vkd3d_spirv_validate(spirv, environment); } + if (compiler->failed) + return VKD3D_ERROR_INVALID_SHADER; + return VKD3D_OK; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0785c14..cfac8e2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -149,11 +149,9 @@ char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_con return messages; } -void vkd3d_shader_error(struct vkd3d_shader_message_context *context, - enum vkd3d_shader_error error, const char *format, ...) +void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, + enum vkd3d_shader_error error, const char *format, va_list args) { - va_list args; - if (context->log_level < VKD3D_SHADER_LOG_ERROR) return; @@ -162,12 +160,20 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, context->source_name, context->line, context->column, error); else vkd3d_string_buffer_printf(&context->messages, "%s: E%04u: ", context->source_name, error); - va_start(args, format); vkd3d_string_buffer_vprintf(&context->messages, format, args); - va_end(args); vkd3d_string_buffer_printf(&context->messages, "\n"); } +void vkd3d_shader_error(struct vkd3d_shader_message_context *context, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(context, error, format, args); + va_end(args); +} + static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const void *data, size_t size) { static int shader_id = 0; @@ -306,35 +312,30 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if ((ret = vkd3d_shader_scan(&scan_info, messages)) < 0) return ret; - - if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) - return VKD3D_ERROR; - ret = vkd3d_shader_parser_init(&parser, &compile_info->source, &message_context); - vkd3d_shader_message_context_trace_messages(&message_context); if (messages) { vkd3d_shader_free_messages(*messages); - if (!(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) - ret = VKD3D_ERROR_OUT_OF_MEMORY; - } - vkd3d_shader_message_context_cleanup(&message_context); - if (ret < 0) - { - vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - return ret; + *messages = NULL; } + if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) + return VKD3D_ERROR; + if ((ret = vkd3d_shader_parser_init(&parser, &compile_info->source, &message_context)) < 0) + goto done; + vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compile_info, &scan_descriptor_info))) + &parser.shader_desc, compile_info, &scan_descriptor_info, &message_context))) { ERR("Failed to create DXBC compiler.\n"); vkd3d_shader_parser_destroy(&parser); - vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - return VKD3D_ERROR; + ret = VKD3D_ERROR; + goto done; } + message_context.line = 2; /* Line 1 is the version token. */ + message_context.column = 1; while (!shader_sm4_is_end(parser.data, &parser.ptr)) { shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); @@ -348,6 +349,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if ((ret = vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction)) < 0) break; + ++message_context.line; } if (ret >= 0) @@ -355,6 +357,11 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); +done: + vkd3d_shader_message_context_trace_messages(&message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_cleanup(&message_context); vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d728fdc..16df8a5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -70,6 +70,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF = 1000, + VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, + VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001, VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE = 3002, @@ -846,6 +848,8 @@ void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_mess vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) void vkd3d_shader_error(struct vkd3d_shader_message_context *context, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; +void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, + enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; @@ -858,7 +862,8 @@ 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, const struct vkd3d_shader_compile_info *compile_info, - const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) DECLSPEC_HIDDEN; + const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, + struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, -- 2.11.0

1 0

[PATCH 1/5] combase: Move HMETAFILEPICT marshalling functions.
by Nikolay Sivov 04 Aug '20

04 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/Makefile.in | 2 +- dlls/combase/combase.spec | 4 + dlls/combase/usrmarshal.c | 230 ++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 +- dlls/ole32/usrmarshal.c | 225 +------------------------------------ 5 files changed, 243 insertions(+), 226 deletions(-) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 954dc629973..24793205d5d 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,6 +1,6 @@ MODULE = combase.dll IMPORTLIB = combase -IMPORTS = advapi32 ole32 user32 gdi32 uuid +IMPORTS = advapi32 ole32 user32 gdi32 uuid rpcrt4 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9d0bad29f0d..359f1774336 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -205,6 +205,10 @@ @ stdcall HMENU_UserMarshal(ptr ptr ptr) @ stdcall HMENU_UserSize(ptr long ptr) @ stdcall HMENU_UserUnmarshal(ptr ptr ptr) +@ stdcall HMETAFILEPICT_UserFree(ptr ptr) +@ stdcall HMETAFILEPICT_UserMarshal(ptr ptr ptr) +@ stdcall HMETAFILEPICT_UserSize(ptr long ptr) +@ stdcall HMETAFILEPICT_UserUnmarshal(ptr ptr ptr) @ stdcall HPALETTE_UserFree(ptr ptr) @ stdcall HPALETTE_UserMarshal(ptr ptr ptr) @ stdcall HPALETTE_UserSize(ptr long ptr) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index c88e8c57cd0..725b29aa28d 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -23,16 +23,26 @@ #define NONAMELESSUNION #include "ole2.h" +#include "rpc.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +ULONG __RPC_USER HMETAFILE_UserSize(ULONG *pFlags, ULONG StartingSize, HMETAFILE *phmf); +unsigned char * __RPC_USER HMETAFILE_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HMETAFILE *phmf); +unsigned char * __RPC_USER HMETAFILE_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HMETAFILE *phmf); +void __RPC_USER HMETAFILE_UserFree(ULONG *pFlags, HMETAFILE *phmf); + #define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align))&~(_Align)) #define ALIGNED_POINTER(_Ptr, _Align) ((LPVOID)ALIGNED_LENGTH((ULONG_PTR)(_Ptr), _Align)) #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align) #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) +#define USER_MARSHAL_PTR_PREFIX \ + ( (DWORD)'U' | ( (DWORD)'s' << 8 ) | \ + ( (DWORD)'e' << 16 ) | ( (DWORD)'r' << 24 ) ) + static const char* debugstr_user_flags(ULONG *pFlags) { char buf[12]; @@ -640,6 +650,226 @@ void __RPC_USER HPALETTE_UserFree(ULONG *pFlags, HPALETTE *phPal) FIXME(":stub\n"); } +/****************************************************************************** + * HMETAFILEPICT_UserSize (combase.@) + * + * Calculates the buffer size required to marshal an metafile pict. + * + * PARAMS + * pFlags [I] Flags. See notes. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the clip format. + * phMfp [I] Metafile pict to size. + * + * RETURNS + * The buffer size required to marshal a metafile pict plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +ULONG __RPC_USER HMETAFILEPICT_UserSize(ULONG *pFlags, ULONG size, HMETAFILEPICT *phMfp) +{ + TRACE("%s, %u, &%p.\n", debugstr_user_flags(pFlags), size, *phMfp); + + ALIGN_LENGTH(size, 3); + + size += sizeof(ULONG); + + if(LOWORD(*pFlags) == MSHCTX_INPROC) + size += sizeof(HMETAFILEPICT); + else + { + size += sizeof(ULONG); + + if (*phMfp) + { + METAFILEPICT *mfpict = GlobalLock(*phMfp); + + /* FIXME: raise an exception if mfpict is NULL? */ + size += 3 * sizeof(ULONG); + size += sizeof(ULONG); + + size = HMETAFILE_UserSize(pFlags, size, &mfpict->hMF); + + GlobalUnlock(*phMfp); + } + } + + return size; +} + +/****************************************************************************** + * HMETAFILEPICT_UserMarshal (combase.@) + * + * Marshals a metafile pict into a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format into. + * phMfp [I] Metafile pict to marshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HMETAFILEPICT *phMfp) +{ + TRACE("%s, %p, &%p.\n", debugstr_user_flags(pFlags), pBuffer, *phMfp); + + ALIGN_POINTER(pBuffer, 3); + + if (LOWORD(*pFlags) == MSHCTX_INPROC) + { + if (sizeof(HMETAFILEPICT) == 8) + *(ULONG *)pBuffer = WDT_INPROC64_CALL; + else + *(ULONG *)pBuffer = WDT_INPROC_CALL; + pBuffer += sizeof(ULONG); + *(HMETAFILEPICT *)pBuffer = *phMfp; + pBuffer += sizeof(HMETAFILEPICT); + } + else + { + *(ULONG *)pBuffer = WDT_REMOTE_CALL; + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = (ULONG)(ULONG_PTR)*phMfp; + pBuffer += sizeof(ULONG); + + if (*phMfp) + { + METAFILEPICT *mfpict = GlobalLock(*phMfp); + remoteMETAFILEPICT * remmfpict = (remoteMETAFILEPICT *)pBuffer; + + /* FIXME: raise an exception if mfpict is NULL? */ + remmfpict->mm = mfpict->mm; + remmfpict->xExt = mfpict->xExt; + remmfpict->yExt = mfpict->yExt; + pBuffer += 3 * sizeof(ULONG); + *(ULONG *)pBuffer = USER_MARSHAL_PTR_PREFIX; + pBuffer += sizeof(ULONG); + + pBuffer = HMETAFILE_UserMarshal(pFlags, pBuffer, &mfpict->hMF); + + GlobalUnlock(*phMfp); + } + } + return pBuffer; +} + +/****************************************************************************** + * HMETAFILEPICT_UserUnmarshal (combase.@) + * + * Unmarshals an metafile pict from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format from. + * phMfp [O] Address that receive the unmarshaled metafile pict. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HMETAFILEPICT *phMfp) +{ + ULONG fContext; + + TRACE("%s, %p, %p.\n", debugstr_user_flags(pFlags), pBuffer, phMfp); + + ALIGN_POINTER(pBuffer, 3); + + fContext = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + + if ((fContext == WDT_INPROC_CALL) || fContext == WDT_INPROC64_CALL) + { + *phMfp = *(HMETAFILEPICT *)pBuffer; + pBuffer += sizeof(HMETAFILEPICT); + } + else + { + ULONG handle = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + *phMfp = NULL; + + if(handle) + { + METAFILEPICT *mfpict; + const remoteMETAFILEPICT *remmfpict; + ULONG user_marshal_prefix; + + remmfpict = (const remoteMETAFILEPICT *)pBuffer; + + *phMfp = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); + if (!*phMfp) + RpcRaiseException(E_OUTOFMEMORY); + + mfpict = GlobalLock(*phMfp); + mfpict->mm = remmfpict->mm; + mfpict->xExt = remmfpict->xExt; + mfpict->yExt = remmfpict->yExt; + pBuffer += 3 * sizeof(ULONG); + user_marshal_prefix = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + + if (user_marshal_prefix != USER_MARSHAL_PTR_PREFIX) + RpcRaiseException(RPC_X_INVALID_TAG); + + pBuffer = HMETAFILE_UserUnmarshal(pFlags, pBuffer, &mfpict->hMF); + + GlobalUnlock(*phMfp); + } + } + return pBuffer; +} + +/****************************************************************************** + * HMETAFILEPICT_UserFree (combase.@) + * + * Frees an unmarshaled metafile pict. + * + * PARAMS + * pFlags [I] Flags. See notes. + * phMfp [I] Metafile pict to free. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of + * which the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +void __RPC_USER HMETAFILEPICT_UserFree(ULONG *pFlags, HMETAFILEPICT *phMfp) +{ + TRACE("%s, &%p.\n", debugstr_user_flags(pFlags), *phMfp); + + if ((LOWORD(*pFlags) != MSHCTX_INPROC) && *phMfp) + { + METAFILEPICT *mfpict; + + mfpict = GlobalLock(*phMfp); + /* FIXME: raise an exception if mfpict is NULL? */ + HMETAFILE_UserFree(pFlags, &mfpict->hMF); + GlobalUnlock(*phMfp); + + GlobalFree(*phMfp); + } +} /****************************************************************************** * WdtpInterfacePointer_UserSize (combase.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 97618e08935..cabbb480b43 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -155,10 +155,10 @@ @ stdcall HMENU_UserMarshal(ptr ptr ptr) combase.HMENU_UserMarshal @ stdcall HMENU_UserSize(ptr long ptr) combase.HMENU_UserSize @ stdcall HMENU_UserUnmarshal(ptr ptr ptr) combase.HMENU_UserUnmarshal -@ stdcall HMETAFILEPICT_UserFree(ptr ptr) -@ stdcall HMETAFILEPICT_UserMarshal(ptr ptr ptr) -@ stdcall HMETAFILEPICT_UserSize(ptr long ptr) -@ stdcall HMETAFILEPICT_UserUnmarshal(ptr ptr ptr) +@ stdcall HMETAFILEPICT_UserFree(ptr ptr) combase.HMETAFILEPICT_UserFree +@ stdcall HMETAFILEPICT_UserMarshal(ptr ptr ptr) combase.HMETAFILEPICT_UserMarshal +@ stdcall HMETAFILEPICT_UserSize(ptr long ptr) combase.HMETAFILEPICT_UserSize +@ stdcall HMETAFILEPICT_UserUnmarshal(ptr ptr ptr) combase.HMETAFILEPICT_UserUnmarshal @ stdcall HMETAFILE_UserFree(ptr ptr) @ stdcall HMETAFILE_UserMarshal(ptr ptr ptr) @ stdcall HMETAFILE_UserSize(ptr long ptr) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 694ef60764f..7319badc97a 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -52,6 +52,10 @@ ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, U unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG RealFlags, unsigned char *pBuffer, IUnknown *punk, REFIID riid); unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, IUnknown **ppunk, REFIID riid); +ULONG __RPC_USER HMETAFILEPICT_UserSize(ULONG *pFlags, ULONG size, HMETAFILEPICT *phMfp); +unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HMETAFILEPICT *phMfp); +unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HMETAFILEPICT *phMfp); +void __RPC_USER HMETAFILEPICT_UserFree(ULONG *pFlags, HMETAFILEPICT *phMfp); static const char* debugstr_user_flags(ULONG *pFlags) { @@ -769,227 +773,6 @@ void __RPC_USER HENHMETAFILE_UserFree(ULONG *pFlags, HENHMETAFILE *phEmf) DeleteEnhMetaFile(*phEmf); } -/****************************************************************************** - * HMETAFILEPICT_UserSize [OLE32.@] - * - * Calculates the buffer size required to marshal an metafile pict. - * - * PARAMS - * pFlags [I] Flags. See notes. - * StartingSize [I] Starting size of the buffer. This value is added on to - * the buffer size required for the clip format. - * phMfp [I] Metafile pict to size. - * - * RETURNS - * The buffer size required to marshal a metafile pict plus the starting size. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -ULONG __RPC_USER HMETAFILEPICT_UserSize(ULONG *pFlags, ULONG size, HMETAFILEPICT *phMfp) -{ - TRACE("(%s, %d, &%p)\n", debugstr_user_flags(pFlags), size, *phMfp); - - ALIGN_LENGTH(size, 3); - - size += sizeof(ULONG); - - if(LOWORD(*pFlags) == MSHCTX_INPROC) - size += sizeof(HMETAFILEPICT); - else - { - size += sizeof(ULONG); - - if (*phMfp) - { - METAFILEPICT *mfpict = GlobalLock(*phMfp); - - /* FIXME: raise an exception if mfpict is NULL? */ - size += 3 * sizeof(ULONG); - size += sizeof(ULONG); - - size = HMETAFILE_UserSize(pFlags, size, &mfpict->hMF); - - GlobalUnlock(*phMfp); - } - } - - return size; -} - -/****************************************************************************** - * HMETAFILEPICT_UserMarshal [OLE32.@] - * - * Marshals a metafile pict into a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format into. - * phMfp [I] Metafile pict to marshal. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HMETAFILEPICT *phMfp) -{ - TRACE("(%s, %p, &%p)\n", debugstr_user_flags(pFlags), pBuffer, *phMfp); - - ALIGN_POINTER(pBuffer, 3); - - if (LOWORD(*pFlags) == MSHCTX_INPROC) - { - if (sizeof(HMETAFILEPICT) == 8) - *(ULONG *)pBuffer = WDT_INPROC64_CALL; - else - *(ULONG *)pBuffer = WDT_INPROC_CALL; - pBuffer += sizeof(ULONG); - *(HMETAFILEPICT *)pBuffer = *phMfp; - pBuffer += sizeof(HMETAFILEPICT); - } - else - { - *(ULONG *)pBuffer = WDT_REMOTE_CALL; - pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = (ULONG)(ULONG_PTR)*phMfp; - pBuffer += sizeof(ULONG); - - if (*phMfp) - { - METAFILEPICT *mfpict = GlobalLock(*phMfp); - remoteMETAFILEPICT * remmfpict = (remoteMETAFILEPICT *)pBuffer; - - /* FIXME: raise an exception if mfpict is NULL? */ - remmfpict->mm = mfpict->mm; - remmfpict->xExt = mfpict->xExt; - remmfpict->yExt = mfpict->yExt; - pBuffer += 3 * sizeof(ULONG); - *(ULONG *)pBuffer = USER_MARSHAL_PTR_PREFIX; - pBuffer += sizeof(ULONG); - - pBuffer = HMETAFILE_UserMarshal(pFlags, pBuffer, &mfpict->hMF); - - GlobalUnlock(*phMfp); - } - } - return pBuffer; -} - -/****************************************************************************** - * HMETAFILEPICT_UserUnmarshal [OLE32.@] - * - * Unmarshals an metafile pict from a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format from. - * phMfp [O] Address that receive the unmarshaled metafile pict. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to an ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is an ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HMETAFILEPICT *phMfp) -{ - ULONG fContext; - - TRACE("(%s, %p, %p)\n", debugstr_user_flags(pFlags), pBuffer, phMfp); - - ALIGN_POINTER(pBuffer, 3); - - fContext = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - - if ((fContext == WDT_INPROC_CALL) || fContext == WDT_INPROC64_CALL) - { - *phMfp = *(HMETAFILEPICT *)pBuffer; - pBuffer += sizeof(HMETAFILEPICT); - } - else - { - ULONG handle = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - *phMfp = NULL; - - if(handle) - { - METAFILEPICT *mfpict; - const remoteMETAFILEPICT *remmfpict; - ULONG user_marshal_prefix; - - remmfpict = (const remoteMETAFILEPICT *)pBuffer; - - *phMfp = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); - if (!*phMfp) - RpcRaiseException(E_OUTOFMEMORY); - - mfpict = GlobalLock(*phMfp); - mfpict->mm = remmfpict->mm; - mfpict->xExt = remmfpict->xExt; - mfpict->yExt = remmfpict->yExt; - pBuffer += 3 * sizeof(ULONG); - user_marshal_prefix = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - - if (user_marshal_prefix != USER_MARSHAL_PTR_PREFIX) - RpcRaiseException(RPC_X_INVALID_TAG); - - pBuffer = HMETAFILE_UserUnmarshal(pFlags, pBuffer, &mfpict->hMF); - - GlobalUnlock(*phMfp); - } - } - return pBuffer; -} - -/****************************************************************************** - * HMETAFILEPICT_UserFree [OLE32.@] - * - * Frees an unmarshaled metafile pict. - * - * PARAMS - * pFlags [I] Flags. See notes. - * phMfp [I] Metafile pict to free. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of - * which the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -void __RPC_USER HMETAFILEPICT_UserFree(ULONG *pFlags, HMETAFILEPICT *phMfp) -{ - TRACE("(%s, &%p)\n", debugstr_user_flags(pFlags), *phMfp); - - if ((LOWORD(*pFlags) != MSHCTX_INPROC) && *phMfp) - { - METAFILEPICT *mfpict; - - mfpict = GlobalLock(*phMfp); - /* FIXME: raise an exception if mfpict is NULL? */ - HMETAFILE_UserFree(pFlags, &mfpict->hMF); - GlobalUnlock(*phMfp); - - GlobalFree(*phMfp); - } -} - /****************************************************************************** * STGMEDIUM_UserSize [OLE32.@] * -- 2.27.0

2 8

[v2 PATCH 1/5] combase: Move HGLOBAL marshalling functions.
by Nikolay Sivov 04 Aug '20

04 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.spec | 4 + dlls/combase/usrmarshal.c | 219 ++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 +- dlls/ole32/usrmarshal.c | 219 -------------------------------------- 4 files changed, 227 insertions(+), 223 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9d0bad29f0d..3c0955f705d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -197,6 +197,10 @@ @ stdcall HDC_UserMarshal(ptr ptr ptr) @ stdcall HDC_UserSize(ptr long ptr) @ stdcall HDC_UserUnmarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserFree(ptr ptr) +@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserSize(ptr long ptr) +@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) @ stdcall HICON_UserFree(ptr ptr) @ stdcall HICON_UserMarshal(ptr ptr ptr) @ stdcall HICON_UserSize(ptr long ptr) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index c88e8c57cd0..7c77cc1a80e 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -617,6 +617,225 @@ unsigned char * __RPC_USER HPALETTE_UserUnmarshal(ULONG *pFlags, unsigned char * return pBuffer; } +/****************************************************************************** + * HGLOBAL_UserSize (combase.@) + * + * Calculates the buffer size required to marshal an HGLOBAL. + * + * PARAMS + * pFlags [I] Flags. See notes. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the clip format. + * phGlobal [I] HGLOBAL to size. + * + * RETURNS + * The buffer size required to marshal an HGLOBAL plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *phGlobal) +{ + ULONG size = StartingSize; + + TRACE("%s, %u, %p.\n", debugstr_user_flags(pFlags), StartingSize, phGlobal); + + ALIGN_LENGTH(size, 3); + + size += sizeof(ULONG); + + if (LOWORD(*pFlags) == MSHCTX_INPROC) + size += sizeof(HGLOBAL); + else + { + size += sizeof(ULONG); + if (*phGlobal) + { + SIZE_T ret; + size += 3 * sizeof(ULONG); + ret = GlobalSize(*phGlobal); + size += (ULONG)ret; + } + } + + return size; +} + +/****************************************************************************** + * HGLOBAL_UserMarshal (combase.@) + * + * Marshals an HGLOBAL into a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format into. + * phGlobal [I] HGLOBAL to marshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) +{ + TRACE("%s, %p, &%p.\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); + + ALIGN_POINTER(pBuffer, 3); + + if (LOWORD(*pFlags) == MSHCTX_INPROC) + { + if (sizeof(*phGlobal) == 8) + *(ULONG *)pBuffer = WDT_INPROC64_CALL; + else + *(ULONG *)pBuffer = WDT_INPROC_CALL; + pBuffer += sizeof(ULONG); + *(HGLOBAL *)pBuffer = *phGlobal; + pBuffer += sizeof(HGLOBAL); + } + else + { + *(ULONG *)pBuffer = WDT_REMOTE_CALL; + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = HandleToULong(*phGlobal); + pBuffer += sizeof(ULONG); + if (*phGlobal) + { + const unsigned char *memory; + SIZE_T size = GlobalSize(*phGlobal); + *(ULONG *)pBuffer = (ULONG)size; + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = HandleToULong(*phGlobal); + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = (ULONG)size; + pBuffer += sizeof(ULONG); + + memory = GlobalLock(*phGlobal); + memcpy(pBuffer, memory, size); + pBuffer += size; + GlobalUnlock(*phGlobal); + } + } + + return pBuffer; +} + +/****************************************************************************** + * HGLOBAL_UserUnmarshal (combase.@) + * + * Unmarshals an HGLOBAL from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format from. + * phGlobal [O] Address that receive the unmarshaled HGLOBAL. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) +{ + ULONG fContext; + + TRACE("%s, %p, &%p.\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); + + ALIGN_POINTER(pBuffer, 3); + + fContext = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + + if (((fContext == WDT_INPROC_CALL) && (sizeof(*phGlobal) < 8)) || + ((fContext == WDT_INPROC64_CALL) && (sizeof(*phGlobal) == 8))) + { + *phGlobal = *(HGLOBAL *)pBuffer; + pBuffer += sizeof(*phGlobal); + } + else if (fContext == WDT_REMOTE_CALL) + { + ULONG handle; + + handle = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + + if (handle) + { + ULONG size; + void *memory; + + size = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + /* redundancy is bad - it means you have to check consistency like + * this: */ + if (*(ULONG *)pBuffer != handle) + { + RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); + return pBuffer; + } + pBuffer += sizeof(ULONG); + /* redundancy is bad - it means you have to check consistency like + * this: */ + if (*(ULONG *)pBuffer != size) + { + RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); + return pBuffer; + } + pBuffer += sizeof(ULONG); + + /* FIXME: check size is not too big */ + + *phGlobal = GlobalAlloc(GMEM_MOVEABLE, size); + memory = GlobalLock(*phGlobal); + memcpy(memory, pBuffer, size); + pBuffer += size; + GlobalUnlock(*phGlobal); + } + else + *phGlobal = NULL; + } + else + RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); + + return pBuffer; +} + +/****************************************************************************** + * HGLOBAL_UserFree (combase.@) + * + * Frees an unmarshaled HGLOBAL. + * + * PARAMS + * pFlags [I] Flags. See notes. + * phGlobal [I] HGLOBAL to free. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of + * which the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) +{ + TRACE("%s, &%p.\n", debugstr_user_flags(pFlags), *phGlobal); + + if (LOWORD(*pFlags) != MSHCTX_INPROC && *phGlobal) + GlobalFree(*phGlobal); +} + /****************************************************************************** * HPALETTE_UserFree (combase.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 97618e08935..c3ee8f27f23 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -143,10 +143,10 @@ @ stdcall HENHMETAFILE_UserMarshal(ptr ptr ptr) @ stdcall HENHMETAFILE_UserSize(ptr long ptr) @ stdcall HENHMETAFILE_UserUnmarshal(ptr ptr ptr) -@ stdcall HGLOBAL_UserFree(ptr ptr) -@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) -@ stdcall HGLOBAL_UserSize(ptr long ptr) -@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserFree(ptr ptr) combase.HGLOBAL_UserFree +@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) combase.HGLOBAL_UserMarshal +@ stdcall HGLOBAL_UserSize(ptr long ptr) combase.HGLOBAL_UserSize +@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) combase.HGLOBAL_UserUnmarshal @ stdcall HICON_UserFree(ptr ptr) combase.HICON_UserFree @ stdcall HICON_UserMarshal(ptr ptr ptr) combase.HICON_UserMarshal @ stdcall HICON_UserSize(ptr long ptr) combase.HICON_UserSize diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 694ef60764f..a5daa949830 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -156,225 +156,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) IMPL_WIREM_HANDLE(HACCEL) -/****************************************************************************** - * HGLOBAL_UserSize [OLE32.@] - * - * Calculates the buffer size required to marshal an HGLOBAL. - * - * PARAMS - * pFlags [I] Flags. See notes. - * StartingSize [I] Starting size of the buffer. This value is added on to - * the buffer size required for the clip format. - * phGlobal [I] HGLOBAL to size. - * - * RETURNS - * The buffer size required to marshal an HGLOBAL plus the starting size. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *phGlobal) -{ - ULONG size = StartingSize; - - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, phGlobal); - - ALIGN_LENGTH(size, 3); - - size += sizeof(ULONG); - - if (LOWORD(*pFlags) == MSHCTX_INPROC) - size += sizeof(HGLOBAL); - else - { - size += sizeof(ULONG); - if (*phGlobal) - { - SIZE_T ret; - size += 3 * sizeof(ULONG); - ret = GlobalSize(*phGlobal); - size += (ULONG)ret; - } - } - - return size; -} - -/****************************************************************************** - * HGLOBAL_UserMarshal [OLE32.@] - * - * Marshals an HGLOBAL into a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format into. - * phGlobal [I] HGLOBAL to marshal. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) -{ - TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); - - ALIGN_POINTER(pBuffer, 3); - - if (LOWORD(*pFlags) == MSHCTX_INPROC) - { - if (sizeof(*phGlobal) == 8) - *(ULONG *)pBuffer = WDT_INPROC64_CALL; - else - *(ULONG *)pBuffer = WDT_INPROC_CALL; - pBuffer += sizeof(ULONG); - *(HGLOBAL *)pBuffer = *phGlobal; - pBuffer += sizeof(HGLOBAL); - } - else - { - *(ULONG *)pBuffer = WDT_REMOTE_CALL; - pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = HandleToULong(*phGlobal); - pBuffer += sizeof(ULONG); - if (*phGlobal) - { - const unsigned char *memory; - SIZE_T size = GlobalSize(*phGlobal); - *(ULONG *)pBuffer = (ULONG)size; - pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = HandleToULong(*phGlobal); - pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = (ULONG)size; - pBuffer += sizeof(ULONG); - - memory = GlobalLock(*phGlobal); - memcpy(pBuffer, memory, size); - pBuffer += size; - GlobalUnlock(*phGlobal); - } - } - - return pBuffer; -} - -/****************************************************************************** - * HGLOBAL_UserUnmarshal [OLE32.@] - * - * Unmarshals an HGLOBAL from a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format from. - * phGlobal [O] Address that receive the unmarshaled HGLOBAL. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to an ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is an ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) -{ - ULONG fContext; - - TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); - - ALIGN_POINTER(pBuffer, 3); - - fContext = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - - if (((fContext == WDT_INPROC_CALL) && (sizeof(*phGlobal) < 8)) || - ((fContext == WDT_INPROC64_CALL) && (sizeof(*phGlobal) == 8))) - { - *phGlobal = *(HGLOBAL *)pBuffer; - pBuffer += sizeof(*phGlobal); - } - else if (fContext == WDT_REMOTE_CALL) - { - ULONG handle; - - handle = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - - if (handle) - { - ULONG size; - void *memory; - - size = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - /* redundancy is bad - it means you have to check consistency like - * this: */ - if (*(ULONG *)pBuffer != handle) - { - RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - return pBuffer; - } - pBuffer += sizeof(ULONG); - /* redundancy is bad - it means you have to check consistency like - * this: */ - if (*(ULONG *)pBuffer != size) - { - RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - return pBuffer; - } - pBuffer += sizeof(ULONG); - - /* FIXME: check size is not too big */ - - *phGlobal = GlobalAlloc(GMEM_MOVEABLE, size); - memory = GlobalLock(*phGlobal); - memcpy(memory, pBuffer, size); - pBuffer += size; - GlobalUnlock(*phGlobal); - } - else - *phGlobal = NULL; - } - else - RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); - - return pBuffer; -} - -/****************************************************************************** - * HGLOBAL_UserFree [OLE32.@] - * - * Frees an unmarshaled HGLOBAL. - * - * PARAMS - * pFlags [I] Flags. See notes. - * phGlobal [I] HGLOBAL to free. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of - * which the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) -{ - TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *phGlobal); - - if (LOWORD(*pFlags) != MSHCTX_INPROC && *phGlobal) - GlobalFree(*phGlobal); -} - /****************************************************************************** * HMETAFILE_UserSize [OLE32.@] * -- 2.27.0

1 4

[PATCH 1/2] xactengine3_7: Move DllGetClassObject to it's own file
by Alistair Leslie-Hughes 04 Aug '20

04 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/Makefile.in | 1 + dlls/xactengine3_7/main.c | 42 ++++++++++++++++++++++++++++++++++ dlls/xactengine3_7/xact_dll.c | 14 +----------- 3 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 dlls/xactengine3_7/main.c diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in index 6fce27d1628..bbbf239daf5 100644 --- a/dlls/xactengine3_7/Makefile.in +++ b/dlls/xactengine3_7/Makefile.in @@ -4,6 +4,7 @@ EXTRALIBS = $(FAUDIO_LIBS) EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + main.c \ xact_dll.c IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_7/main.c b/dlls/xactengine3_7/main.c new file mode 100644 index 00000000000..659cbeeca9e --- /dev/null +++ b/dlls/xactengine3_7/main.c @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018 Ethan Lee 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "xact_classes.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xact3); + +extern IClassFactory XACTFactory; + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + if (IsEqualGUID(rclsid, &CLSID_XACTEngine37)) + { + TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&XACTFactory, riid, ppv); + } + + FIXME("Unknown class %s\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 69570e8ceff..d35bece8de9 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -488,7 +488,7 @@ static const IClassFactoryVtbl XACT3CF_Vtbl = XACT3CF_LockServer }; -static IClassFactory XACTFactory = { &XACT3CF_Vtbl }; +IClassFactory XACTFactory = { &XACT3CF_Vtbl }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) { @@ -509,18 +509,6 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) -{ - if (IsEqualGUID(rclsid, &CLSID_XACTEngine37)) - { - TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return IClassFactory_QueryInterface(&XACTFactory, riid, ppv); - } - - FIXME("Unknown class %s\n", debugstr_guid(rclsid)); - return CLASS_E_CLASSNOTAVAILABLE; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources(instance); -- 2.27.0

1 0

[PATCH] xactengine3_7: Return valid HRESULT from IXACT3Engine Initialize
by Alistair Leslie-Hughes 04 Aug '20

04 Aug '20

FAudio doesn't always return a valid HRESULT, ensure a valid code is passed back to the application. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 3a14db7460..69570e8cef 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -157,6 +157,7 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); FACTRuntimeParameters params; + UINT ret; TRACE("(%p)->(%p)\n", This, pParams); @@ -195,7 +196,11 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, params.fileIOCallbacks.readFileCallback = wrap_readfile; params.fileIOCallbacks.getOverlappedResultCallback = wrap_getoverlappedresult; - return FACTAudioEngine_Initialize(This->fact_engine, &params); + ret = FACTAudioEngine_Initialize(This->fact_engine, &params); + if (ret != 0) + WARN("FACTAudioEngine_Initialize returned %d\n", ret); + + return !ret ? S_OK : E_FAIL; } static HRESULT WINAPI IXACT3EngineImpl_ShutDown(IXACT3Engine *iface) -- 2.27.0

1 0

[PATCH 1/3] server: Introduce a callback to retrieve the parent device from a file descriptor.
by Zebediah Figura 04 Aug '20

04 Aug '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This patch series doesn't handle ntoskrnl device files. It is written with the ntoskrnl tests previously written in mind, and therefore is structured to make implementation somewhat easier, but the implementation is rather nontrivial and so far not known to be necessary. The equivalent Staging patch uses the object tree for device files. At least two problems immediately arise from this: firstly, there is no clean way to distinguish the root file name '\\' from the directly opened device (a distinction particularly important for file systems, but in fact even visible with named pipes); secondly, this cannot accomodate an implementation that must plumb requests through ntoskrnl, since object names are set at creation time. In general it also smacks of hacking a name into the object tree, since that name is not actually looked up directly as other names are. Another possible design would be to handle it all on the server side. This would mean changing the parameters of get_file_info to handle arbitrary buffers (or else adding a new callback specifically for ObjectNameInformation). It would also mean making get_object_info eventually asynchronous. After trying out that approach, this one seemed architecturally simpler. The equivalent Staging patch was originally written for msys2's strace.exe. msys2 and cygwin have been broken in Wine for a long time, perhaps unfixably. I'm not aware of other applications that need pipes, or similar objects, to return accurate names from ObjectNameInformation. I'm submitting this patch partly to upstream a long-standing Staging patch and fix tests, and partly because I believe it will help implementation of object/file name information for regular files with some of my local/planned changes to volume infrastructure. server/change.c | 1 + server/console.c | 3 +++ server/device.c | 1 + server/fd.c | 5 +++++ server/file.c | 1 + server/file.h | 3 +++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/serial.c | 1 + server/sock.c | 2 ++ 11 files changed, 24 insertions(+) diff --git a/server/change.c b/server/change.c index a8f3329c722..1eba2e4dd88 100644 --- a/server/change.c +++ b/server/change.c @@ -138,6 +138,7 @@ static const struct fd_ops dir_fd_ops = dir_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ dir_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/console.c b/server/console.c index 53910b3f46e..bd8cb1995e7 100644 --- a/server/console.c +++ b/server/console.c @@ -111,6 +111,7 @@ static const struct fd_ops console_input_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ console_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ @@ -168,6 +169,7 @@ static const struct fd_ops console_input_events_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ console_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ @@ -248,6 +250,7 @@ static const struct fd_ops screen_buffer_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ console_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/device.c b/server/device.c index 01e08f295f7..73c6edcb078 100644 --- a/server/device.c +++ b/server/device.c @@ -219,6 +219,7 @@ static const struct fd_ops device_file_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ device_file_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ device_file_read, /* read */ device_file_write, /* write */ device_file_flush, /* flush */ diff --git a/server/fd.c b/server/fd.c index 7ea8ac273e5..064defc34e8 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2246,6 +2246,11 @@ static void unmount_device( struct fd *device_fd ) release_object( device ); } +struct object *no_fd_get_parent( struct fd *fd ) +{ + return NULL; +} + /* default read() routine */ int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ) { diff --git a/server/file.c b/server/file.c index 38260cfd2b3..0b92d6aae46 100644 --- a/server/file.c +++ b/server/file.c @@ -105,6 +105,7 @@ static const struct fd_ops file_fd_ops = file_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ file_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/file.h b/server/file.h index e8ace7f49e4..b407c725db2 100644 --- a/server/file.h +++ b/server/file.h @@ -56,6 +56,8 @@ struct fd_ops void (*poll_event)(struct fd *,int event); /* get file information */ enum server_fd_type (*get_fd_type)(struct fd *fd); + /* get the parent (device) object */ + struct object *(*get_parent)(struct fd *fd); /* perform a read on the file */ int (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ @@ -109,6 +111,7 @@ extern void default_poll_event( struct fd *fd, int event ); extern void fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); +extern struct object *no_fd_get_parent( struct fd *fd ); extern int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_flush( struct fd *fd, struct async *async ); diff --git a/server/mailslot.c b/server/mailslot.c index 58d650cbb25..03f5308fcbf 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -101,6 +101,7 @@ static const struct fd_ops mailslot_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ mailslot_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ @@ -157,6 +158,7 @@ static const struct fd_ops mail_writer_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ mail_writer_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ @@ -245,6 +247,7 @@ static const struct fd_ops mailslot_device_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ mailslot_device_file_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/mapping.c b/server/mapping.c index db0debe0af5..5d0a1c402b5 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -180,6 +180,7 @@ static const struct fd_ops mapping_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ mapping_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/named_pipe.c b/server/named_pipe.c index b259abb8de4..7eb0905293e 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -180,6 +180,7 @@ static const struct fd_ops pipe_server_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ pipe_end_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_end_flush, /* flush */ @@ -222,6 +223,7 @@ static const struct fd_ops pipe_client_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ pipe_end_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_end_flush, /* flush */ @@ -297,6 +299,7 @@ static const struct fd_ops named_pipe_device_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ named_pipe_device_file_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/serial.c b/server/serial.c index 4292472613a..4d112b8c6ff 100644 --- a/server/serial.c +++ b/server/serial.c @@ -112,6 +112,7 @@ static const struct fd_ops serial_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ serial_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/sock.c b/server/sock.c index 1a53ce4b091..9f33bc0b95c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -164,6 +164,7 @@ static const struct fd_ops sock_fd_ops = sock_get_poll_events, /* get_poll_events */ sock_poll_event, /* poll_event */ sock_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ @@ -979,6 +980,7 @@ static const struct fd_ops ifchange_fd_ops = ifchange_get_poll_events, /* get_poll_events */ ifchange_poll_event, /* poll_event */ NULL, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ -- 2.27.0

1 2

[PATCH v2] sapi: Improve Get/SetDefaultTokenId stubs.
by Myah Caron 03 Aug '20

03 Aug '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Currently the new tests are skipped under wine due to missing registry keys. They can be added by running winetricks speechsdk. dlls/sapi/tests/token.c | 313 ++++++++++++++++++++++++++++++++++++++++ dlls/sapi/token.c | 140 +++++++++++++++++- 2 files changed, 449 insertions(+), 4 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 9f6689b83f..35e030cc87 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -83,6 +83,309 @@ static void test_token_category(void) ISpObjectTokenCategory_Release( cat ); } +static void backup_speech(HKEY root) +{ + LONG res; + HKEY key; + + res = RegDeleteTreeW( root, L"SOFTWARE\\Microsoft\\Speech_winetest" ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND || res == ERROR_ACCESS_DENIED, "got %08x\n", res ); + + res = RegCreateKeyW( root, L"SOFTWARE\\Microsoft\\Speech_winetest", &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + RegCopyTreeW( root, L"SOFTWARE\\Microsoft\\Speech", key ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + res = RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); +} + +static BOOL restore_speech(HKEY root, BOOL delete_backup) +{ + LONG res; + HKEY key; + BOOL returnvalue = FALSE; + + res = RegDeleteTreeW( root, L"SOFTWARE\\Microsoft\\Speech" ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND || res == ERROR_ACCESS_DENIED, "got %08x\n", res ); + if (res == ERROR_ACCESS_DENIED) + returnvalue = TRUE; + + res = RegCreateKeyW( root, L"SOFTWARE\\Microsoft\\Speech", &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + RegCopyTreeW( root, L"SOFTWARE\\Microsoft\\Speech_winetest", key ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + if (delete_backup) { + res = RegDeleteTreeW( root, L"SOFTWARE\\Microsoft\\Speech_winetest" ); + ok( res == ERROR_SUCCESS || res == ERROR_ACCESS_DENIED, "got %08x\n", res ); + } + + return returnvalue; +} + +static void test_token_default_id(LPCWSTR cat_name) +{ + ISpObjectTokenCategory *cat; + HRESULT hr; + LONG res; + HKEY key; + LPWSTR token_id = NULL; + WCHAR regvalue[512]; + WCHAR regvalue2[512]; + DWORD regvalue_size = sizeof( regvalue ); + WCHAR regcat[256]; + WCHAR cat_id[256]; + + wcscpy(regcat, L"SOFTWARE\\Microsoft\\Speech\\"); + wcscat(regcat, cat_name); + + wcscpy(cat_id, L"HKEY_LOCAL_MACHINE\\"); + wcscat(cat_id, regcat); + + res = RegOpenKeyExW( HKEY_LOCAL_MACHINE, regcat, 0, KEY_READ, &key ); + if (res == ERROR_FILE_NOT_FOUND) { + skip( "category %s not found in registry\n", wine_dbgstr_w(cat_name) ); + return; + } + RegCloseKey(key); + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( token_id == (LPWSTR)0xdeadbeef, "got %p\n", token_id ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + /* if missing, Get/SetDefaultTokenId should initialize HKEY_LOCAL_USER's + SOFTWARE\Microsoft\Speech\[cat_name] */ + res = RegDeleteTreeW( HKEY_CURRENT_USER, regcat ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + res = RegOpenKeyExW( HKEY_CURRENT_USER, regcat, 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + res = RegOpenKeyExW( HKEY_CURRENT_USER, regcat, 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + + /* AudioOutput under windows server returns this error */ + if (hr == SPERR_NOT_FOUND) { + /* also happens if TokenEnums/Tokens is empty or doesn't exist */ + skip( "category %s not found\n", wine_dbgstr_w(cat_name) ); + return; + } + + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + + regvalue_size = sizeof( regvalue ); + res = RegGetValueW( HKEY_CURRENT_USER, regcat, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + if (res == ERROR_FILE_NOT_FOUND) { + skip( "DefaultTokenId not found for category %s (%s)\n", wine_dbgstr_w(cat_name), wine_dbgstr_w(token_id)); + } else { + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should be equal to the DefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + } + + CoTaskMemFree(token_id); + + regvalue_size = sizeof( regvalue2 ); + regvalue2[0] = 0; + res = RegGetValueW( HKEY_LOCAL_MACHINE, regcat, L"DefaultdefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue2, &regvalue_size); + if (res == ERROR_FILE_NOT_FOUND) { + skip( "DefaultdefaultTokenId not found for category %s (%s)\n", wine_dbgstr_w(cat_name), wine_dbgstr_w(regvalue) ); + } else { + regvalue_size = sizeof( regvalue ); + regvalue[0] = 0; + res = RegGetValueW( HKEY_CURRENT_USER, regcat, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, regvalue2), + "DefaultTokenId (%s) should be equal to the DefaultdefaultTokenId key (%s)\n", + wine_dbgstr_w(regvalue), wine_dbgstr_w(regvalue2) ); + } + + /* todo: test subkeys */ + + res = RegOpenKeyExW( HKEY_CURRENT_USER, regcat, 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + wcscpy(regvalue, L"bogus"); + regvalue_size = (wcslen(regvalue) + 1) * sizeof( WCHAR ); + res = RegSetValueExW( key, L"DefaultTokenId", 0, REG_SZ, (const BYTE*)regvalue, regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + todo_wine ok( wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should not be equal to the bogus DefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + CoTaskMemFree(token_id); + + /* todo: add more tests for the resulting token_id */ + + res = restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + if (res == TRUE) { + skip( "Unable to delete HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Speech\n" ); + } else { + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + todo_wine ok( hr == 0x800703fa, "got %08x\n", hr ); + todo_wine ok( token_id == (LPWSTR)0xdeadbeef, "got %p\n", token_id ); + } + + ISpObjectTokenCategory_Release( cat ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + res = RegDeleteTreeW( HKEY_CURRENT_USER, regcat ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegDeleteTreeW( HKEY_LOCAL_MACHINE, regcat ); + if (res == ERROR_ACCESS_DENIED) { + skip( "Unable to delete HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Speech\n" ); + + restore_speech( HKEY_CURRENT_USER, FALSE ); + restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + } else { + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + + restore_speech( HKEY_CURRENT_USER, FALSE ); + + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + + restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + } + + res = RegDeleteTreeW( HKEY_CURRENT_USER, regcat ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + res = RegOpenKeyExW( HKEY_LOCAL_MACHINE, regcat, 0, KEY_WRITE, &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + wcscpy(regvalue, L"bogus"); + regvalue_size = (wcslen(regvalue) + 1) * sizeof( WCHAR ); + res = RegSetValueExW( key, L"DefaultdefaultTokenId", 0, REG_SZ, (const BYTE*)regvalue, regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + todo_wine ok( wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should not be equal to the bogus DefaultdefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + CoTaskMemFree(token_id); + + /* todo: test valid DefaultdefaultTokenId values + observation: if it doesn't begin with HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\ + it will return E_INVALIDARG */ + + ISpObjectTokenCategory_Release( cat ); + + res = RegDeleteTreeW( HKEY_CURRENT_USER, regcat ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegOpenKeyExW( HKEY_LOCAL_MACHINE, regcat, 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegDeleteValueW( key, L"DefaultdefaultTokenId" ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + if (token_id != (LPWSTR)0xdeadbeef) + CoTaskMemFree(token_id); + + ISpObjectTokenCategory_Release( cat ); + restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, NULL ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + wcscpy(regvalue, L"deadbeef"); + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, regvalue ); + ok( hr == S_OK, "got %08x\n", hr ); + + regvalue_size = sizeof( regvalue ); + regvalue[0] = 0; + res = RegGetValueW( HKEY_CURRENT_USER, regcat, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, L"deadbeef"), + "DefaultTokenId in registry (%s) should be equal to the set default token id (%s)\n", + wine_dbgstr_w(regvalue), wine_dbgstr_w(L"deadbeef") ); + + res = RegDeleteTreeW( HKEY_CURRENT_USER, regcat ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + wcscpy(regvalue, L"deadbeef"); + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, regvalue ); + ok( hr == S_OK, "got %08x\n", hr ); + regvalue_size = sizeof( regvalue ); + regvalue[0] = 0; + res = RegGetValueW( HKEY_CURRENT_USER, regcat, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, L"deadbeef"), + "GetDefaultTokenId (%s) should be equal to the set DefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(L"deadbeef") ); + + ISpObjectTokenCategory_Release( cat ); +} + static void test_token_enum(void) { ISpObjectTokenEnumBuilder *token_enum; @@ -121,6 +424,16 @@ START_TEST(token) CoInitialize( NULL ); test_data_key(); test_token_category(); + backup_speech( HKEY_LOCAL_MACHINE ); + backup_speech( HKEY_CURRENT_USER ); + test_token_default_id( L"AppLexicons" ); + test_token_default_id( L"AudioInput" ); + test_token_default_id( L"AudioOutput" ); + test_token_default_id( L"PhoneConverters" ); + test_token_default_id( L"Recognizers" ); + test_token_default_id( L"Voices" ); + restore_speech( HKEY_CURRENT_USER, TRUE ); + restore_speech( HKEY_LOCAL_MACHINE, TRUE ); test_token_enum(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index d2b70c95cf..ff96796dd2 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -232,6 +232,7 @@ struct token_category LONG ref; ISpRegDataKey *data_key; + WCHAR *subkey; }; static struct token_category *impl_from_ISpObjectTokenCategory( ISpObjectTokenCategory *iface ) @@ -421,6 +422,8 @@ static HRESULT WINAPI token_category_SetId( ISpObjectTokenCategory *iface, res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); if (res) return SPERR_INVALID_REGISTRY_KEY; + This->subkey = _wcsdup(subkey); + hr = CoCreateInstance( &CLSID_SpDataKey, NULL, CLSCTX_ALL, &IID_ISpRegDataKey, (void **)&This->data_key ); if (FAILED(hr)) goto fail; @@ -479,18 +482,147 @@ fail: return hr; } +static HRESULT get_user_speech_key( struct token_category *This, HKEY* key ) +{ + LONG res; + WCHAR regvalue[512]; + DWORD regvalue_size = sizeof( regvalue ); + struct data_key *this_data_key = impl_from_ISpRegDataKey( This->data_key ); + + res = RegOpenKeyExW( HKEY_CURRENT_USER, This->subkey, 0, KEY_ALL_ACCESS, key ); + if (res == ERROR_SUCCESS) { + return S_OK; + } + + FIXME( "(%p): semi-stub\n", This ); + + res = RegCreateKeyW( HKEY_CURRENT_USER, This->subkey, key ); + if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "returning %08x\n", res ); + return res; + } + + res = RegGetValueW( this_data_key->key, NULL, L"DefaultdefaultTokenId", + RRF_RT_REG_SZ, NULL, (LPVOID)&regvalue, &regvalue_size); + if (res == ERROR_SUCCESS) { + RegSetValueExW( *key, L"DefaultTokenId", 0, REG_SZ, (const BYTE*)regvalue, regvalue_size); + } else if (res != ERROR_FILE_NOT_FOUND) { + FIXME( "returning %08x\n", res ); + return res; + } + + return S_OK; +} + static HRESULT WINAPI token_category_SetDefaultTokenId( ISpObjectTokenCategory *iface, LPCWSTR id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + HRESULT hr; + LONG res; + HKEY key; + + TRACE( "(%p)->(%s)\n", iface, debugstr_w(id) ); + + if (!This->data_key) + return SPERR_UNINITIALIZED; + + if (!id) + return E_INVALIDARG; + + hr = get_user_speech_key( This, &key ); + if (FAILED(hr)) return hr; + + res = RegSetValueExW( key, L"DefaultTokenId", 0, REG_SZ, (const BYTE*)id, + wcslen( id) * sizeof( WCHAR )); + if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "unable to set DefaultTokenId, returning S_FALSE\n" ); + RegCloseKey( key ); + return S_FALSE; + } + + RegCloseKey( key ); + + return S_OK; +} + +static BOOL get_default_token_from_tokens( struct token_category *This, + LPWSTR token ) +{ + WCHAR subkey_name[256]; + WCHAR subkey_name1[256]; + HKEY key; + LONG res; + struct data_key *this_data_key = impl_from_ISpRegDataKey( This->data_key ); + + res = RegEnumKeyW( this_data_key->key, 0, &subkey_name, sizeof( subkey_name ) ); + if (res != ERROR_SUCCESS) + return FALSE; + + RegOpenKeyExW( this_data_key->key, subkey_name, 0, KEY_ALL_ACCESS, &key ); + if (res != ERROR_SUCCESS) { + WARN( "unable to open subkey %s (%08x)\n", debugstr_w( subkey_name ), res ); + return FALSE; + } + + res = RegEnumKeyW( key, 0, &subkey_name1, sizeof( subkey_name1 ) ); + if (res != ERROR_SUCCESS) + return FALSE; + + RegCloseKey( key ); + + wcscpy( token, L"HKEY_LOCAL_MACHINE\\" ); + wcscat( token, This->subkey ); + wcscat( token, L"\\" ); + wcscat( token, subkey_name ); + wcscat( token, L"\\" ); + wcscat( token, subkey_name1 ); + + return TRUE; } static HRESULT WINAPI token_category_GetDefaultTokenId( ISpObjectTokenCategory *iface, LPWSTR *id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + HRESULT hr; + LONG res; + HKEY key; + WCHAR regvalue[512]; + DWORD regvalue_size = sizeof( regvalue ); + + FIXME( "(%p)->(%p): semi-stub\n", iface, id ); + + if (!This->data_key) + return SPERR_UNINITIALIZED; + + if (!id) + return E_POINTER; + + hr = get_user_speech_key( This, &key ); + if (FAILED(hr)) return hr; + + res = RegGetValueW( key, NULL, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + &regvalue, &regvalue_size); + RegCloseKey( key ); + if (res == ERROR_FILE_NOT_FOUND) { + res = get_default_token_from_tokens( This, &regvalue ); + + if (res == FALSE) { + return SPERR_NOT_FOUND; + } + } else if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "returning %08x\n", res ); + return res; + } + + *id = CoTaskMemAlloc( regvalue_size ); + wcscpy( *id, regvalue ); + + return S_OK; } const struct ISpObjectTokenCategoryVtbl token_category_vtbl = -- 2.27.0

1 0

[PATCH] winevulkan: harden calibrated_timestamps failure paths
by Liam Middlebrook 03 Aug '20

03 Aug '20

Addresses some comments that Zhiyi had made on the initial review thread. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> --- dlls/winevulkan/vulkan.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index be614f1cef..0b3923dc15 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1333,6 +1333,8 @@ VkResult WINAPI wine_vkGetCalibratedTimestampsEXT(VkDevice device, } res = device->funcs.p_vkGetCalibratedTimestampsEXT(device->device, timestamp_count, host_timestamp_infos, timestamps, max_deviation); + if (res != VK_SUCCESS) + return res; for (i = 0; i < timestamp_count; i++) timestamps[i] = convert_timestamp(host_timestamp_infos[i].timeDomain, timestamp_infos[i].timeDomain, timestamps[i]); @@ -1366,7 +1368,10 @@ VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->phys_dev, &host_time_domain_count, host_time_domains); if (res != VK_SUCCESS) + { + heap_free(host_time_domains); return res; + } for (i = 0; i < host_time_domain_count; i++) { -- 2.26.2

2 1

[PATCH 3/3] msvcrt: Import sqrt from musl.
by Piotr Caban 03 Aug '20

03 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 123 ++++++++++++++++++++++++++++++++++++- dlls/ucrtbase/tests/misc.c | 4 +- 2 files changed, 123 insertions(+), 4 deletions(-)

2 1

[PATCH] kernelbase: Add missing consts to ScrollConsoleScreenBuffer declaration.
by Jacek Caban 03 Aug '20

03 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 10 +++++----- include/wincon.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 1/2] wininet: Move INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT handling to helper.
by Daniel Lehman 03 Aug '20

03 Aug '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/wininet/http.c | 62 ++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 56c995805b..220493718c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2083,6 +2083,38 @@ static DWORD str_to_buffer(const WCHAR *str, void *buffer, DWORD *size, BOOL uni } } +static DWORD get_security_cert_struct(http_request_t *req, INTERNET_CERTIFICATE_INFOA *info) +{ + PCCERT_CONTEXT context; + DWORD len; + + context = (PCCERT_CONTEXT)NETCON_GetCert(req->netconn); + if(!context) + return ERROR_NOT_SUPPORTED; + + memset(info, 0, sizeof(*info)); + info->ftExpiry = context->pCertInfo->NotAfter; + info->ftStart = context->pCertInfo->NotBefore; + len = CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); + info->lpszSubjectInfo = LocalAlloc(0, len); + if(info->lpszSubjectInfo) + CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, + info->lpszSubjectInfo, len); + len = CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); + info->lpszIssuerInfo = LocalAlloc(0, len); + if(info->lpszIssuerInfo) + CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, + info->lpszIssuerInfo, len); + info->dwKeySize = NETCON_GetCipherStrength(req->netconn); + + CertFreeCertificateContext(context); + return ERROR_SUCCESS; +} + static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { http_request_t *req = (http_request_t*)hdr; @@ -2235,8 +2267,6 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe } case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT: { - PCCERT_CONTEXT context; - if(!req->netconn) return ERROR_INTERNET_INVALID_OPERATION; @@ -2245,33 +2275,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_INSUFFICIENT_BUFFER; } - context = (PCCERT_CONTEXT)NETCON_GetCert(req->netconn); - if(context) { - INTERNET_CERTIFICATE_INFOA *info = (INTERNET_CERTIFICATE_INFOA*)buffer; - DWORD len; - - memset(info, 0, sizeof(*info)); - info->ftExpiry = context->pCertInfo->NotAfter; - info->ftStart = context->pCertInfo->NotBefore; - len = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); - info->lpszSubjectInfo = LocalAlloc(0, len); - if(info->lpszSubjectInfo) - CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, - info->lpszSubjectInfo, len); - len = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); - info->lpszIssuerInfo = LocalAlloc(0, len); - if(info->lpszIssuerInfo) - CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, - info->lpszIssuerInfo, len); - info->dwKeySize = NETCON_GetCipherStrength(req->netconn); - CertFreeCertificateContext(context); - return ERROR_SUCCESS; - } - return ERROR_NOT_SUPPORTED; + return get_security_cert_struct(req, (INTERNET_CERTIFICATE_INFOA*)buffer); } case INTERNET_OPTION_CONNECT_TIMEOUT: if (*size < sizeof(DWORD)) -- 2.25.1

3 7

[PATCH 1/3] ucrtbase: Support overriding return value in _matherr.
by Piotr Caban 03 Aug '20

03 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 130 ++++++++++++++++++++----------------- dlls/ucrtbase/tests/misc.c | 7 ++ 2 files changed, 76 insertions(+), 61 deletions(-)

2 1

[PATCH 2/3] msvcrt: Import sqrtf from musl.
by Piotr Caban 03 Aug '20

03 Aug '20

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

1 0

[PATCH] ole32/tests: Use wide string literal constants in more tests.
by Nikolay Sivov 03 Aug '20

03 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/defaulthandler.c | 5 +- dlls/ole32/tests/ole2.c | 33 ++-- dlls/ole32/tests/ole_server.c | 6 +- dlls/ole32/tests/propvariant.c | 8 +- dlls/ole32/tests/stg_prop.c | 8 +- dlls/ole32/tests/storage32.c | 258 ++++++++++++++---------------- dlls/ole32/tests/usrmarshal.c | 4 +- 7 files changed, 139 insertions(+), 183 deletions(-) diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index 60bc29c08dd..3853a271d75 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -96,14 +96,13 @@ static void test_olestream(void) IPersistStorage *persist; IStorage *stg; IStream *stm; - static const WCHAR olestream[] = {1,'O','l','e',0}; ULONG read; ole_stream_header_t header; hr = create_storage(&stg); ok(hr == S_OK, "got %08x\n", hr); - hr = IStorage_OpenStream(stg, olestream, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, 0, &stm); + hr = IStorage_OpenStream(stg, L"\1Ole", NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, 0, &stm); ok(hr == STG_E_FILENOTFOUND, "got %08x\n", hr); hr = OleCreateDefaultHandler(&non_existent_class, 0, &IID_IOleObject, (void**)&ole_obj); @@ -115,7 +114,7 @@ static void test_olestream(void) hr = IPersistStorage_InitNew(persist, stg); ok(hr == S_OK, "got %08x\n", hr); - hr = IStorage_OpenStream(stg, olestream, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, 0, &stm); + hr = IStorage_OpenStream(stg, L"\1Ole", NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, 0, &stm); ok(hr == S_OK, "got %08x\n", hr); hr = IStream_Read(stm, &header, sizeof(header), &read); ok(hr == S_OK, "got %08x\n", hr); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index cd7eb839233..20aa3dac0c2 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1149,7 +1149,6 @@ static void test_OleLoad(IStorage *pStorage) for (fmt = CF_TEXT; fmt < CF_MAX; fmt++) { - static const WCHAR olrepres[] = { 2,'O','l','e','P','r','e','s','0','0','0',0 }; IStorage *stg; IStream *stream; IUnknown *obj; @@ -1168,7 +1167,7 @@ static void test_OleLoad(IStorage *pStorage) hr = IStorage_SetClass(stg, &CLSID_WineTest); ok(hr == S_OK, "SetClass error %#x\n", hr); - hr = IStorage_CreateStream(stg, olrepres, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, &stream); + hr = IStorage_CreateStream(stg, L"\2OlePres000", STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, &stream); ok(hr == S_OK, "CreateStream error %#x\n", hr); data = ~0; @@ -1580,7 +1579,6 @@ static void test_data_cache(void) CLSID clsid; char szSystemDir[MAX_PATH]; WCHAR wszPath[MAX_PATH]; - static const WCHAR wszShell32[] = {'\\','s','h','e','l','l','3','2','.','d','l','l',0}; static const struct expected_method methods_cacheinitnew[] = { @@ -1748,7 +1746,7 @@ static void test_data_cache(void) ok_ole_success(hr, "IOleCache_Cache"); MultiByteToWideChar(CP_ACP, 0, szSystemDir, -1, wszPath, ARRAY_SIZE(wszPath)); - memcpy(wszPath+lstrlenW(wszPath), wszShell32, sizeof(wszShell32)); + lstrcatW(wszPath, L"\\shell32.dll"); fmtetc.cfFormat = CF_METAFILEPICT; stgmedium.tymed = TYMED_MFPICT; @@ -1948,8 +1946,6 @@ static void test_data_cache(void) IStorage_Release(pStorage); } -static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; - /* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ static BYTE file_dib[] = { @@ -1974,7 +1970,7 @@ static IStorage *create_storage( int num ) ok( hr == S_OK, "got %08x\n", hr); hr = IStorage_SetClass( stg, &CLSID_Picture_Dib ); ok( hr == S_OK, "got %08x\n", hr); - hr = IStorage_CreateStream( stg, CONTENTS, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, &stm ); + hr = IStorage_CreateStream( stg, L"CONTENTS", STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, &stm ); ok( hr == S_OK, "got %08x\n", hr); if (num == 1) /* Set biXPelsPerMeter = 0 */ { @@ -2829,9 +2825,6 @@ static void test_default_handler(void) IOleInPlaceObject *pInPlaceObj; IEnumOLEVERB *pEnumVerbs; DWORD dwRegister; - static const WCHAR wszUnknown[] = {'U','n','k','n','o','w','n',0}; - static const WCHAR wszHostName[] = {'W','i','n','e',' ','T','e','s','t',' ','P','r','o','g','r','a','m',0}; - static const WCHAR wszDelim[] = {'!',0}; static const struct expected_method methods_embeddinghelper[] = { @@ -2883,7 +2876,7 @@ static void test_default_handler(void) hr = IOleObject_GetUserType(pObject, USERCLASSTYPE_FULL, &pszUserType); todo_wine { ok_ole_success(hr, "IOleObject_GetUserType"); - ok(!lstrcmpW(pszUserType, wszUnknown), "Retrieved user type was wrong\n"); + ok(!lstrcmpW(pszUserType, L"Unknown"), "Retrieved user type was wrong\n"); } hr = IOleObject_InitFromData(pObject, NULL, TRUE, 0); @@ -2902,10 +2895,10 @@ static void test_default_handler(void) hr = IOleObject_SetExtent(pObject, DVASPECT_CONTENT, &sizel); ok(hr == OLE_E_NOTRUNNING, "IOleObject_SetExtent should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); - hr = IOleObject_SetHostNames(pObject, wszHostName, NULL); + hr = IOleObject_SetHostNames(pObject, L"Wine Test Program", NULL); ok_ole_success(hr, "IOleObject_SetHostNames"); - hr = CreateItemMoniker(wszDelim, wszHostName, &pMoniker); + hr = CreateItemMoniker(L"!", L"Wine Test Program", &pMoniker); ok_ole_success(hr, "CreateItemMoniker"); hr = IOleObject_SetMoniker(pObject, OLEWHICHMK_CONTAINER, pMoniker); ok_ole_success(hr, "IOleObject_SetMoniker"); @@ -3162,8 +3155,7 @@ static void test_OleDraw(void) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); } -static const WCHAR olepres0W[] = {2,'O','l','e','P','r','e','s','0','0','0',0}; -static const WCHAR comp_objW[] = {1,'C','o','m','p','O','b','j',0}; +static const WCHAR olepres0W[] = L"\2OlePres000"; static IStream *comp_obj_stream; static IStream *ole_stream; static IStream *olepres_stream; @@ -3193,7 +3185,7 @@ static HRESULT WINAPI Storage_CreateStream(IStorage *iface, LPCOLESTR pwcsName, LARGE_INTEGER pos = {{0}}; HRESULT hr; - if (!lstrcmpW(pwcsName, comp_objW)) + if (!lstrcmpW(pwcsName, L"\1CompObj")) { CHECK_EXPECT(Storage_CreateStream_CompObj); *ppstm = comp_obj_stream; @@ -3242,7 +3234,8 @@ static HRESULT WINAPI Storage_OpenStream(IStorage *iface, LPCOLESTR pwcsName, vo ok(!reserved2, "reserved2 = %x\n", reserved2); ok(!!ppstm, "ppstm = NULL\n"); - if(!lstrcmpW(pwcsName, comp_objW)) { + if (!lstrcmpW(pwcsName, L"\1CompObj")) + { CHECK_EXPECT2(Storage_OpenStream_CompObj); ok(grfMode == STGM_SHARE_EXCLUSIVE, "grfMode = %x\n", grfMode); @@ -3409,7 +3402,6 @@ static IStorage Storage = { &StorageVtbl }; static void test_OleDoAutoConvert(void) { - static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; static struct { DWORD reserved1; DWORD version; @@ -3471,7 +3463,7 @@ static void test_OleDoAutoConvert(void) CHECK_CALLED(Storage_Stat); ok(IsEqualIID(&clsid, &CLSID_WineTestOld), "clsid = %s\n", wine_dbgstr_guid(&clsid)); - lstrcpyW(buf, clsidW); + lstrcpyW(buf, L"CLSID\\"); StringFromGUID2(&CLSID_WineTestOld, buf+6, 39); ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, buf, 0, NULL, 0, @@ -3599,7 +3591,6 @@ static const unsigned char mf_blank_bits[] = static void test_data_cache_save(void) { - static const WCHAR contentsW[] = { 'C','o','n','t','e','n','t','s',0 }; HRESULT hr; ILockBytes *ilb; IStorage *doc; @@ -3619,7 +3610,7 @@ static void test_data_cache_save(void) hr = IStorage_SetClass(doc, &CLSID_WineTest); ok(hr == S_OK, "unexpected %#x\n", hr); - hr = IStorage_CreateStream(doc, contentsW, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + hr = IStorage_CreateStream(doc, L"Contents", STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); ok(hr == S_OK, "unexpected %#x\n", hr); hr = IStream_Write(stm, bmpimage, sizeof(bmpimage), NULL); ok(hr == S_OK, "unexpected %#x\n", hr); diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index b0bf01d96e8..d3633697c97 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -286,7 +286,6 @@ static void ole_server(void) /******************************* OLE client *******************************/ static BOOL register_server(const char *server, BOOL inproc_handler) { - static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; DWORD ret; HKEY root; WCHAR buf[39 + 6]; @@ -295,7 +294,7 @@ static BOOL register_server(const char *server, BOOL inproc_handler) lstrcpyA(server_path, server); lstrcatA(server_path, " ole_server"); - lstrcpyW(buf, clsidW); + lstrcpyW(buf, L"CLSID\\"); StringFromGUID2(&CLSID_WineTestObject, buf + 6, 39); ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, buf, 0, NULL, 0, @@ -319,12 +318,11 @@ static BOOL register_server(const char *server, BOOL inproc_handler) static void unregister_server(void) { - static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; DWORD ret; HKEY root; WCHAR buf[39 + 6]; - lstrcpyW(buf, clsidW); + lstrcpyW(buf, L"CLSID\\"); StringFromGUID2(&CLSID_WineTestObject, buf + 6, 39); ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, buf, 0, NULL, 0, diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 2b7e6d72851..f9913607bf7 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -538,7 +538,6 @@ static void test_propertytovariant(void) PMemoryAllocator allocator; struct _PMemoryAllocator_vtable vtable; BOOLEAN ret; - static const WCHAR test_string[] = {'t','e','s','t',0}; hole32 = GetModuleHandleA("ole32"); @@ -577,7 +576,7 @@ static void test_propertytovariant(void) ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); - ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); + ok(!lstrcmpW(U(propvar).bstrVal, L"test"), "unexpected string value\n"); PropVariantClear(&propvar); ret = pStgConvertPropertyToVariant((SERIALIZEDPROPERTYVALUE*)serialized_bstr_mb, @@ -585,7 +584,7 @@ static void test_propertytovariant(void) ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); - ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); + ok(!lstrcmpW(U(propvar).bstrVal, L"test"), "unexpected string value\n"); PropVariantClear(&propvar); } @@ -597,7 +596,6 @@ static void test_varianttoproperty(void) SERIALIZEDPROPERTYVALUE* (__stdcall *pStgConvertVariantToProperty)( const PROPVARIANT*,USHORT,SERIALIZEDPROPERTYVALUE*,ULONG*,PROPID,BOOLEAN,ULONG*); ULONG len; - static const WCHAR test_string[] = {'t','e','s','t',0}; BSTR test_string_bstr; hole32 = GetModuleHandleA("ole32"); @@ -658,7 +656,7 @@ static void test_varianttoproperty(void) ok(len == 4, "unexpected length %d\n", len); ok(!memcmp(propvalue, serialized_null, 4), "got wrong data\n"); - test_string_bstr = SysAllocString(test_string); + test_string_bstr = SysAllocString(L"test"); propvar.vt = VT_BSTR; U(propvar).bstrVal = test_string_bstr; diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 0184693f2a5..d11844db258 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -45,8 +45,6 @@ static void init_function_pointers(void) */ static void testPropsHelper(IPropertySetStorage **propSetStorage) { - static const WCHAR szDot[] = { '.',0 }; - static const WCHAR szPrefix[] = { 's','t','g',0 }; static const WCHAR szSummaryInfo[] = { 5,'S','u','m','m','a','r','y', 'I','n','f','o','r','m','a','t','i','o','n',0 }; static WCHAR propName[] = { 'p','r','o','p',0 }; @@ -68,7 +66,7 @@ static void testPropsHelper(IPropertySetStorage **propSetStorage) else trace("Testing property storage without a set...\n"); - if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) + if(!GetTempFileNameW(L".", L"stg", 0, filename)) return; DeleteFileW(filename); @@ -432,8 +430,6 @@ static void testProps(void) static void testCodepage(void) { - static const WCHAR szDot[] = { '.',0 }; - static const WCHAR szPrefix[] = { 's','t','g',0 }; static CHAR aval[] = "hi"; static WCHAR wval[] = { 'h','i',0 }; HRESULT hr; @@ -444,7 +440,7 @@ static void testCodepage(void) PROPVARIANT var; WCHAR fileName[MAX_PATH]; - if(!GetTempFileNameW(szDot, szPrefix, 0, fileName)) + if(!GetTempFileNameW(L".", L"stg", 0, fileName)) return; hr = StgCreateDocfile(fileName, diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 9d2c970e867..58493a6d088 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -38,15 +38,17 @@ DEFINE_GUID( test_stg_cls, 0x88888888, 0x0425, 0x0000, 0,0,0,0,0,0,0,0); static CHAR filenameA[MAX_PATH]; static WCHAR filename[MAX_PATH]; -static const char file1_nameA[] = {'c','o','p','y','t','e','s','t','A',0}; -static const WCHAR file1_name[] = {'c','o','p','y','t','e','s','t','A',0}; -static const char file2_nameA[] = {'c','o','p','y','t','e','s','t','B',0}; -static const WCHAR file2_name[] = {'c','o','p','y','t','e','s','t','B',0}; -static const WCHAR stgA_name[] = {'S','t','o','r','a','g','e','A',0}; -static const WCHAR stgB_name[] = {'S','t','o','r','a','g','e','B',0}; -static const WCHAR strmA_name[] = {'S','t','r','e','a','m','A',0}; -static const WCHAR strmB_name[] = {'S','t','r','e','a','m','B',0}; -static const WCHAR strmC_name[] = {'S','t','r','e','a','m','C',0}; +static const char file1_nameA[] = "copytestA"; +static const WCHAR file1_name[] = L"copytestA"; +static const char file2_nameA[] = "copytestB"; +static const WCHAR file2_name[] = L"copytestB"; +static const WCHAR stgA_name[] = L"StorageA"; +static const WCHAR stgB_name[] = L"StorageB"; +static const WCHAR strmA_name[] = L"StreamA"; +static const WCHAR strmB_name[] = L"StreamB"; +static const WCHAR strmC_name[] = L"StreamC"; + +static const WCHAR contentsW[] = L"CONTENTS"; /* Win9x and WinMe don't have lstrcmpW */ static int strcmp_ww(LPCWSTR strw1, LPCWSTR strw2) @@ -200,7 +202,7 @@ static HRESULT WINAPI TestLockBytes_Stat(ILockBytes *iface, STATSTG *pstatstg, DWORD grfStatFlag) { TestLockBytes *This = impl_from_ILockBytes(iface); - static const WCHAR dummy_name[] = {'d','u','m','m','y',0}; + static const WCHAR dummy_name[] = L"dummy"; if (!pstatstg) return E_INVALIDARG; @@ -499,11 +501,7 @@ static void test_stgcreatestorageex(void) static void test_storage_stream(void) { - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR longname[] = { - 'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a', - 'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a',0 - }; + static const WCHAR longname[] = L"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; IStorage *stg = NULL; HRESULT r; IStream *stm = NULL; @@ -521,30 +519,30 @@ static void test_storage_stream(void) ok(r==S_OK, "StgCreateDocfile failed\n"); /* try create some invalid streams */ - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 1, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 1, 0, &stm ); ok(r==STG_E_INVALIDPARAMETER, "IStorage->CreateStream wrong error\n"); - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 1, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 1, &stm ); ok(r==STG_E_INVALIDPARAMETER, "IStorage->CreateStream wrong error\n"); - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, NULL ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, NULL ); ok(r==STG_E_INVALIDPOINTER, "IStorage->CreateStream wrong error\n"); r = IStorage_CreateStream(stg, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==STG_E_INVALIDNAME, "IStorage->CreateStream wrong error\n"); r = IStorage_CreateStream(stg, longname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==STG_E_INVALIDNAME || broken(r==S_OK) /* nt4 */, "IStorage->CreateStream wrong error, got %d GetLastError()=%d\n", r, GetLastError()); - r = IStorage_CreateStream(stg, stmname, STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_READWRITE, 0, 0, &stm ); ok(r==STG_E_INVALIDFLAG, "IStorage->CreateStream wrong error\n"); - r = IStorage_CreateStream(stg, stmname, STGM_READ, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_READ, 0, 0, &stm ); ok(r==STG_E_INVALIDFLAG, "IStorage->CreateStream wrong error\n"); - r = IStorage_CreateStream(stg, stmname, STGM_WRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_WRITE, 0, 0, &stm ); ok(r==STG_E_INVALIDFLAG, "IStorage->CreateStream wrong error\n"); - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_DENY_NONE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_DENY_NONE | STGM_READWRITE, 0, 0, &stm ); ok(r==STG_E_INVALIDFLAG, "IStorage->CreateStream wrong error\n"); - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_DENY_NONE | STGM_READ, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_DENY_NONE | STGM_READ, 0, 0, &stm ); ok(r==STG_E_INVALIDFLAG, "IStorage->CreateStream wrong error\n"); /* now really create a stream and delete it */ - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); /* test for support interfaces */ @@ -555,13 +553,13 @@ static void test_storage_stream(void) r = IStream_Release(stm); ok(r == 0, "wrong ref count\n"); - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==STG_E_FILEALREADYEXISTS, "IStorage->CreateStream failed\n"); - r = IStorage_DestroyElement(stg,stmname); + r = IStorage_DestroyElement(stg, contentsW); ok(r==S_OK, "IStorage->DestroyElement failed\n"); /* create a stream and write to it */ - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStream_Clone(stm, &stm2); @@ -666,7 +664,7 @@ static void test_storage_stream(void) ok(r == 0, "wrong ref count\n"); /* create a stream and write to it */ - r = IStorage_CreateStream(stg, stmname, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm2 ); + r = IStorage_CreateStream(stg, contentsW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm2 ); ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p); @@ -687,7 +685,7 @@ static void test_storage_stream(void) ok(r == S_OK, "should succeed\n"); if (stg) { - r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); ok(r == STG_E_INVALIDFLAG, "IStorage->OpenStream should return STG_E_INVALIDFLAG instead of 0x%08x\n", r); IStorage_Release(stg); } @@ -736,7 +734,6 @@ static BOOL is_existing_file(LPCSTR filename) static void test_open_storage(void) { - static const WCHAR szNonExist[] = { 'n','o','n','e','x','i','s','t',0 }; IStorage *stg = NULL, *stg2 = NULL; HRESULT r; DWORD stgm; @@ -777,7 +774,7 @@ static void test_open_storage(void) ok(r==STG_E_INVALIDPOINTER, "StgOpenStorage wrong error\n"); r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, NULL, 1, &stg); ok(r==STG_E_INVALIDPARAMETER, "StgOpenStorage wrong error\n"); - r = StgOpenStorage( szNonExist, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, NULL, 0, &stg); + r = StgOpenStorage( L"nonexist", NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, NULL, 0, &stg); ok(r==STG_E_FILENOTFOUND, "StgOpenStorage failed\n"); r = StgOpenStorage( filename, NULL, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, NULL, 0, &stg); ok(r==STG_E_INVALIDFLAG, "StgOpenStorage failed\n"); @@ -830,14 +827,13 @@ static void test_open_storage(void) ok(r==S_OK, "StgOpenStorage failed\n"); if(stg) { - static const WCHAR stmname[] = { 'w','i','n','e','t','e','s','t',0}; IStream *stm = NULL; IStorage *stg2 = NULL; - r = IStorage_CreateStream( stg, stmname, STGM_WRITE | STGM_SHARE_EXCLUSIVE, + r = IStorage_CreateStream( stg, L"winetest", STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); ok(r == STG_E_ACCESSDENIED, "CreateStream should fail\n"); - r = IStorage_CreateStorage( stg, stmname, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + r = IStorage_CreateStorage( stg, L"winetest", STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); ok(r == STG_E_ACCESSDENIED, "CreateStream should fail\n"); r = IStorage_Release(stg); @@ -1018,7 +1014,6 @@ static void test_storage_refcount(void) IStorage *stgprio = NULL; HRESULT r; IStream *stm = NULL; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; LARGE_INTEGER pos; ULARGE_INTEGER upos; STATSTG stat; @@ -1038,7 +1033,7 @@ static void test_storage_refcount(void) ok( r == S_OK, "IStorage_Commit failed\n"); /* now create a stream */ - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStorage_Release( stg ); @@ -1078,9 +1073,7 @@ static void test_storage_refcount(void) ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); if(stg) { - static const WCHAR stgname[] = { ' ',' ',' ','2','9',0 }; - static const WCHAR stgname2[] = { 'C','V','_','i','e','w',0 }; - static const WCHAR stmname2[] = { 'V','a','r','2','D','a','t','a',0 }; + static const WCHAR stgname[] = L" 29"; IStorage *stg2; IStorage *stg3; STATSTG statstg; @@ -1115,10 +1108,10 @@ static void test_storage_refcount(void) ok(statstg.reserved == 0, "Statstg reserved should have been 0 instead of %d\n", statstg.reserved); CoTaskMemFree(statstg.pwcsName); - r = IStorage_CreateStorage( stg2, stgname2, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stg3 ); + r = IStorage_CreateStorage( stg2, L"CV_iew", STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stg3 ); ok(r == STG_E_ACCESSDENIED, "CreateStorage should have returned STG_E_ACCESSDENIED instead of 0x%08x\n", r); - r = IStorage_CreateStream( stg2, stmname2, STGM_CREATE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); + r = IStorage_CreateStream( stg2, L"Var2Data", STGM_CREATE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); ok(r == STG_E_ACCESSDENIED, "CreateStream should have returned STG_E_ACCESSDENIED instead of 0x%08x\n", r); IStorage_Release(stg2); @@ -1227,9 +1220,8 @@ static void test_streamenum(void) IStorage *stg = NULL; HRESULT r; IStream *stm = NULL; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR stmname2[] = { 'A','B','C','D','E','F','G','H','I',0 }; - static const WCHAR stmname3[] = { 'A','B','C','D','E','F','G','H','I','J',0 }; + static const WCHAR stmname2[] = L"ABCDEFGHI"; + static const WCHAR stmname3[] = L"ABCDEFGHIJ"; static const STATSTG stat_null; STATSTG stat; IEnumSTATSTG *ee = NULL; @@ -1249,7 +1241,7 @@ static void test_streamenum(void) ok( r == S_OK, "IStorage_Commit failed\n"); /* now create a stream */ - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); IStream_Release(stm); @@ -1273,7 +1265,7 @@ static void test_streamenum(void) r = IStorage_EnumElements(stg, 0, NULL, 0, &ee); ok(r==S_OK, "IStorage->EnumElements failed\n"); - r = IStorage_DestroyElement(stg, stmname); + r = IStorage_DestroyElement(stg, contentsW); ok(r==S_OK, "IStorage->DestroyElement failed\n"); memset(&stat, 0xad, sizeof(stat)); @@ -1296,7 +1288,7 @@ static void test_streamenum(void) r = IEnumSTATSTG_Reset(ee); ok(r==S_OK, "IEnumSTATSTG->Reset failed\n"); - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStream_Release(stm); @@ -1309,7 +1301,7 @@ static void test_streamenum(void) if (r == S_OK) { - ok(lstrcmpiW(stat.pwcsName, stmname) == 0, "expected CONTENTS, got %s\n", wine_dbgstr_w(stat.pwcsName)); + ok(!lstrcmpiW(stat.pwcsName, contentsW), "expected CONTENTS, got %s\n", wine_dbgstr_w(stat.pwcsName)); CoTaskMemFree(stat.pwcsName); } @@ -1347,11 +1339,11 @@ static void test_streamenum(void) if (r == S_OK) { - ok(lstrcmpiW(stat.pwcsName, stmname) == 0, "expected CONTENTS, got %s\n", wine_dbgstr_w(stat.pwcsName)); + ok(!lstrcmpiW(stat.pwcsName, contentsW), "expected CONTENTS, got %s\n", wine_dbgstr_w(stat.pwcsName)); CoTaskMemFree(stat.pwcsName); } - r = IStorage_DestroyElement(stg, stmname); + r = IStorage_DestroyElement(stg, contentsW); ok(r==S_OK, "IStorage->DestroyElement failed\n"); r = IStorage_DestroyElement(stg, stmname2); @@ -1404,10 +1396,9 @@ static void test_transact(void) IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; HRESULT r; IStream *stm = NULL; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR stmname2[] = { 'F','O','O',0 }; - static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; - static const WCHAR stgname2[] = { 'T','E','M','P','S','T','G',0 }; + static const WCHAR stmname2[] = L"FOO"; + static const WCHAR stgname[] = L"PERMSTG"; + static const WCHAR stgname2[] = L"TEMPSTG"; BOOL ret; DeleteFileA(filenameA); @@ -1452,7 +1443,7 @@ static void test_transact(void) /* now create a stream and storage, but don't commit them */ stm = NULL; - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStream_Write(stm, "this is stream 2\n", 16, NULL); @@ -1480,19 +1471,19 @@ static void test_transact(void) if (!stg) return; - r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_DENY_NONE|STGM_READ, 0, &stm ); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_SHARE_DENY_NONE|STGM_READ, 0, &stm ); ok(r==STG_E_INVALIDFLAG, "IStorage->OpenStream failed %08x\n", r); - r = IStorage_OpenStream(stg, stmname, NULL, STGM_DELETEONRELEASE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_DELETEONRELEASE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08x\n", r); - r = IStorage_OpenStream(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08x\n", r); - r = IStorage_OpenStorage(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + r = IStorage_OpenStorage(stg, contentsW, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); - r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStream_Release(stm); @@ -1538,9 +1529,8 @@ static void test_substorage_share(void) IStorage *stg, *stg2, *stg3; IStream *stm, *stm2; HRESULT r; - static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR othername[] = { 'N','E','W','N','A','M','E',0 }; + static const WCHAR stgname[] = L"PERMSTG"; + static const WCHAR othername[] = L"NEWNAME"; BOOL ret; DeleteFileA(filenameA); @@ -1577,7 +1567,7 @@ static void test_substorage_share(void) r = IStorage_DestroyElement(stg, stgname); ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); - r = IStorage_CreateStream(stg2, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + r = IStorage_CreateStream(stg2, contentsW, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); ok(r==STG_E_REVERTED, "IStorage->CreateStream failed, hr=%08x\n", r); if (r == S_OK) @@ -1587,30 +1577,30 @@ static void test_substorage_share(void) } /* create a read/write stream and try to open it again */ - r = IStorage_CreateStream(stg, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + r = IStorage_CreateStream(stg, contentsW, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); ok(r==S_OK, "IStorage->CreateStream failed, hr=%08x\n", r); if (r == S_OK) { - r = IStorage_OpenStream(stg, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm2); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm2); ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStream_Release(stm2); - r = IStorage_OpenStream(stg, stmname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm2); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm2); ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStream_Release(stm2); /* cannot rename the stream while it's open */ - r = IStorage_RenameElement(stg, stmname, othername); + r = IStorage_RenameElement(stg, contentsW, othername); ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); - if (SUCCEEDED(r)) IStorage_RenameElement(stg, othername, stmname); + if (SUCCEEDED(r)) IStorage_RenameElement(stg, othername, contentsW); /* destroying an object while it's open invalidates it */ - r = IStorage_DestroyElement(stg, stmname); + r = IStorage_DestroyElement(stg, contentsW); ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); @@ -1630,10 +1620,9 @@ static void test_revert(void) IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; HRESULT r; IStream *stm = NULL, *stm2 = NULL; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR stmname2[] = { 'F','O','O',0 }; - static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; - static const WCHAR stgname2[] = { 'T','E','M','P','S','T','G',0 }; + static const WCHAR stmname2[] = L"FOO"; + static const WCHAR stgname[] = L"PERMSTG"; + static const WCHAR stgname2[] = L"TEMPSTG"; STATSTG statstg; BOOL ret; @@ -1674,7 +1663,7 @@ static void test_revert(void) } /* now create a stream and storage, then revert */ - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm2 ); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm2 ); ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStream_Write(stm2, "this is stream 2\n", 16, NULL); @@ -1704,19 +1693,19 @@ static void test_revert(void) IStorage_Release(stg2); IStorage_Release(stg3); - r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_DENY_NONE|STGM_READ, 0, &stm ); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_SHARE_DENY_NONE|STGM_READ, 0, &stm ); ok(r==STG_E_INVALIDFLAG, "IStorage->OpenStream failed %08x\n", r); - r = IStorage_OpenStream(stg, stmname, NULL, STGM_DELETEONRELEASE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_DELETEONRELEASE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08x\n", r); - r = IStorage_OpenStream(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08x\n", r); - r = IStorage_OpenStorage(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + r = IStorage_OpenStorage(stg, contentsW, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); - r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStream_Release(stm); @@ -1782,8 +1771,7 @@ static void test_parent_free(void) IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; HRESULT r; IStream *stm = NULL; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + static const WCHAR stgname[] = L"PERMSTG"; ULONG ref; STATSTG statstg; BOOL ret; @@ -1802,7 +1790,7 @@ static void test_parent_free(void) if (r == S_OK) { /* now create a stream inside the new storage */ - r = IStorage_CreateStream(stg2, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg2, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); if (r == S_OK) @@ -1845,9 +1833,8 @@ static void test_nonroot_transacted(void) IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; HRESULT r; IStream *stm = NULL; - static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR stmname2[] = { 'F','O','O',0 }; + static const WCHAR stgname[] = L"PERMSTG"; + static const WCHAR stmname2[] = L"FOO"; BOOL ret; DeleteFileA(filenameA); @@ -1864,7 +1851,7 @@ static void test_nonroot_transacted(void) if (r == S_OK) { /* create and commit stmname */ - r = IStorage_CreateStream(stg2, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg2, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); if (r == S_OK) IStream_Release(stm); @@ -1880,7 +1867,7 @@ static void test_nonroot_transacted(void) IStorage_Revert(stg2); /* check that Commit and Revert really worked */ - r = IStorage_OpenStream(stg2, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + r = IStorage_OpenStream(stg2, contentsW, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==S_OK, "IStorage->OpenStream should succeed %08x\n", r); if (r == S_OK) IStream_Release(stm); @@ -1926,7 +1913,7 @@ static void test_nonroot_transacted(void) if (r == S_OK) { /* create and commit stmname */ - r = IStorage_CreateStream(stg2, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + r = IStorage_CreateStream(stg2, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); if (r == S_OK) IStream_Release(stm); @@ -1942,7 +1929,7 @@ static void test_nonroot_transacted(void) IStorage_Revert(stg2); /* check that Commit and Revert really worked */ - r = IStorage_OpenStream(stg2, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + r = IStorage_OpenStream(stg2, contentsW, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==S_OK, "IStorage->OpenStream should succeed %08x\n", r); if (r == S_OK) IStream_Release(stm); @@ -2119,7 +2106,7 @@ static void _test_file_access(LPCSTR file, const struct access_res *ares, DWORD static void test_access(void) { - static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; + static const WCHAR fileW[] = L"winetest"; static const char fileA[] = "winetest"; IStorage *stg; HRESULT hr; @@ -2237,9 +2224,9 @@ static void test_readonly(void) IStorage *stg, *stg2, *stg3; IStream *stream; HRESULT hr; - static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; - static const WCHAR storageW[] = {'s','t','o','r','a','g','e',0}; - static const WCHAR streamW[] = {'s','t','r','e','a','m',0}; + static const WCHAR fileW[] = L"winetest"; + static const WCHAR storageW[] = L"storage"; + static const WCHAR streamW[] = L"stream"; hr = StgCreateDocfile( fileW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); ok(hr == S_OK, "should succeed, res=%x\n", hr); @@ -2315,9 +2302,8 @@ static void test_simple(void) IStorage *stg, *stg2; HRESULT r; IStream *stm; - static const WCHAR stgname[] = { 'S','t','g',0 }; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR stmname2[] = { 'S','m','a','l','l',0 }; + static const WCHAR stgname[] = L"Stg"; + static const WCHAR stmname2[] = L"Small"; LARGE_INTEGER pos; ULARGE_INTEGER upos; DWORD count; @@ -2332,9 +2318,9 @@ static void test_simple(void) ok(r == STG_E_INVALIDFUNCTION, "got %08x\n", r); if (SUCCEEDED(r)) IStorage_Release(stg2); - r = IStorage_CreateStream(stg, stmname, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + r = IStorage_CreateStream(stg, contentsW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); ok(r == STG_E_INVALIDFLAG, "got %08x\n", r); - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); ok(r == S_OK, "got %08x\n", r); upos.QuadPart = 6000; @@ -2400,7 +2386,7 @@ static void test_simple(void) ok(r == STG_E_INVALIDFUNCTION, "got %08x\n", r); if (SUCCEEDED(r)) IStorage_Release(stg2); - r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); ok(r == S_OK, "got %08x\n", r); r = IStream_Stat(stm, &stat, STATFLAG_NONAME); @@ -2429,13 +2415,11 @@ static void test_fmtusertypestg(void) IStorage *stg; IEnumSTATSTG *stat; HRESULT hr; - static const char fileA[] = {'f','m','t','t','e','s','t',0}; - static const WCHAR fileW[] = {'f','m','t','t','e','s','t',0}; - static WCHAR userTypeW[] = {'S','t','g','U','s','r','T','y','p','e',0}; - static const WCHAR strmNameW[] = {1,'C','o','m','p','O','b','j',0}; + static WCHAR userTypeW[] = L"StgUsrType"; + static const WCHAR strmNameW[] = L"\1CompObj"; static const STATSTG statstg_null; - hr = StgCreateDocfile( fileW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); + hr = StgCreateDocfile( L"fmttest", STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); ok(hr == S_OK, "should succeed, res=%x\n", hr); if (SUCCEEDED(hr)) @@ -2493,7 +2477,7 @@ static void test_fmtusertypestg(void) } IStorage_Release(stg); - DeleteFileA( fileA ); + DeleteFileW( L"fmttest" ); } } @@ -2502,7 +2486,6 @@ static void test_references(void) IStorage *stg,*stg2; HRESULT hr; unsigned c1,c2; - static const WCHAR StorName[] = { 'D','a','t','a','S','p','a','c','e','I','n','f','o',0 }; DeleteFileA(filenameA); @@ -2518,7 +2501,7 @@ static void test_references(void) if (SUCCEEDED(hr)) { - hr = IStorage_CreateStorage(stg,StorName,STGM_READWRITE | STGM_SHARE_EXCLUSIVE,0,0,&stg2); + hr = IStorage_CreateStorage(stg, L"DataSpaceInfo", STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); ok(hr == S_OK, "IStorage_CreateStorage failed (result=%x)\n",hr); if (SUCCEEDED(hr)) @@ -2948,10 +2931,9 @@ static void test_rename(void) IStorage *stg, *stg2; IStream *stm; HRESULT r; - static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; - static const WCHAR stgname2[] = { 'S','T','G',0 }; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR stmname2[] = { 'E','N','T','S',0 }; + static const WCHAR stgname[] = L"PERMSTG"; + static const WCHAR stgname2[] = L"STG"; + static const WCHAR stmname2[] = L"ENTS"; BOOL ret; DeleteFileA(filenameA); @@ -2966,16 +2948,16 @@ static void test_rename(void) ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); /* create a stream in the substorage */ - r = IStorage_CreateStream(stg2, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + r = IStorage_CreateStream(stg2, contentsW, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); ok(r==S_OK, "IStorage->CreateStream failed, hr=%08x\n", r); IStream_Release(stm); /* rename the stream */ - r = IStorage_RenameElement(stg2, stmname, stmname2); + r = IStorage_RenameElement(stg2, contentsW, stmname2); ok(r==S_OK, "IStorage->RenameElement failed, hr=%08x\n", r); /* cannot open stream with old name */ - r = IStorage_OpenStream(stg2, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + r = IStorage_OpenStream(stg2, contentsW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); ok(r==STG_E_FILENOTFOUND, "IStorage_OpenStream should fail, hr=%08x\n", r); if (SUCCEEDED(r)) IStream_Release(stm); @@ -3095,7 +3077,7 @@ static void test_substorage_enum(void) IEnumSTATSTG *ee; HRESULT r; ULONG ref; - static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + static const WCHAR stgname[] = L"PERMSTG"; BOOL ret; DeleteFileA(filenameA); @@ -3141,9 +3123,6 @@ static void test_copyto_locking(void) IStorage *stg, *stg2, *stg3, *stg4; IStream *stm; HRESULT r; - static const WCHAR stgname[] = { 'S','T','G','1',0 }; - static const WCHAR stgname2[] = { 'S','T','G','2',0 }; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; BOOL ret; DeleteFileA(filenameA); @@ -3154,15 +3133,15 @@ static void test_copyto_locking(void) ok(r==S_OK, "StgCreateDocfile failed\n"); /* create a substorage */ - r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + r = IStorage_CreateStorage(stg, L"STG1", STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); /* create another substorage */ - r = IStorage_CreateStorage(stg, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + r = IStorage_CreateStorage(stg, L"STG2", STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); /* add a stream, and leave it open */ - r = IStorage_CreateStream(stg2, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + r = IStorage_CreateStream(stg2, contentsW, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); ok(r==S_OK, "IStorage->CreateStream failed, hr=%08x\n", r); /* Try to copy the storage while the stream is open */ @@ -3172,7 +3151,7 @@ static void test_copyto_locking(void) IStream_Release(stm); /* create a substorage */ - r = IStorage_CreateStorage(stg2, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg4); + r = IStorage_CreateStorage(stg2, L"STG", STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg4); ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); /* Try to copy the storage while the substorage is open */ @@ -3192,8 +3171,6 @@ static void test_copyto_recursive(void) { IStorage *stg, *stg2, *stg3, *stg4; HRESULT r; - static const WCHAR stgname[] = { 'S','T','G','1',0 }; - static const WCHAR stgname2[] = { 'S','T','G','2',0 }; BOOL ret; DeleteFileA(filenameA); @@ -3204,7 +3181,7 @@ static void test_copyto_recursive(void) ok(r==S_OK, "StgCreateDocfile failed\n"); /* create a substorage */ - r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + r = IStorage_CreateStorage(stg, L"STG1", STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); /* copy the parent to the child */ @@ -3212,7 +3189,7 @@ static void test_copyto_recursive(void) ok(r==STG_E_ACCESSDENIED, "IStorage->CopyTo failed, hr=%08x\n", r); /* create a transacted substorage */ - r = IStorage_CreateStorage(stg, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, 0, &stg3); + r = IStorage_CreateStorage(stg, L"STG2", STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, 0, &stg3); ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); /* copy the parent to the transacted child */ @@ -3220,7 +3197,7 @@ static void test_copyto_recursive(void) ok(r==STG_E_ACCESSDENIED, "IStorage->CopyTo failed, hr=%08x\n", r); /* create a transacted subsubstorage */ - r = IStorage_CreateStorage(stg3, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, 0, &stg4); + r = IStorage_CreateStorage(stg3, L"STG2", STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, 0, &stg4); ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); /* copy the parent to the transacted child of the transacted child */ @@ -3288,7 +3265,7 @@ static void test_hglobal_storage_creation(void) static void test_convert(void) { - static const WCHAR filename[] = {'s','t','o','r','a','g','e','.','s','t','g',0}; + static const WCHAR filename[] = L"storage.stg"; IStorage *stg; HRESULT hr; @@ -3317,7 +3294,7 @@ static void test_convert(void) static void test_direct_swmr(void) { - static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; + static const WCHAR fileW[] = L"winetest"; IDirectWriterLock *dwlock; ULONG ref, ref2; IStorage *stg; @@ -3485,7 +3462,7 @@ static void check_access(LPCWSTR filename, const struct lock_test *current, static void test_locking(void) { - static const WCHAR filename[] = {'w','i','n','e','t','e','s','t',0}; + static const WCHAR filename[] = L"winetest"; int i; IStorage *stg; HRESULT hr; @@ -3645,7 +3622,6 @@ static void test_transacted_shared(void) IStorage *stgrw = NULL; HRESULT r; IStream *stm = NULL; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; LARGE_INTEGER pos; ULARGE_INTEGER upos; char buffer[10]; @@ -3661,7 +3637,7 @@ static void test_transacted_shared(void) r = WriteClassStg(stg, &test_stg_cls); ok(r == S_OK, "WriteClassStg failed %x\n", r); - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); ok(r==S_OK, "IStorage->CreateStream failed %x\n", r); pos.QuadPart = 0; @@ -3700,7 +3676,7 @@ static void test_transacted_shared(void) IStream_Release(stm); /* we can still read the old content from the second storage */ - r = IStorage_OpenStream(stgrw, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + r = IStorage_OpenStream(stgrw, contentsW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); ok(r==S_OK, "IStorage->OpenStream failed %x\n", r); pos.QuadPart = 0; @@ -3734,7 +3710,7 @@ static void test_transacted_shared(void) r = IStorage_Revert(stg); ok(r==S_OK, "IStorage->Revert failed %x\n", r); - r = IStorage_OpenStream(stg, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + r = IStorage_OpenStream(stg, contentsW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); ok(r==S_OK, "IStorage->CreateStream failed %x\n", r); pos.QuadPart = 0; @@ -3763,8 +3739,7 @@ static void test_overwrite(void) IStorage *stg = NULL; HRESULT r; IStream *stm = NULL; - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; - static const WCHAR stmname2[] = { 'C','O','N','T','E','N','T','2',0 }; + static const WCHAR stmname2[] = L"CONTENTS2"; LARGE_INTEGER pos; ULARGE_INTEGER upos; char buffer[4096]; @@ -3781,7 +3756,7 @@ static void test_overwrite(void) r = WriteClassStg(stg, &test_stg_cls); ok(r == S_OK, "WriteClassStg failed %x\n", r); - r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + r = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); ok(r==S_OK, "IStorage->CreateStream failed %x\n", r); pos.QuadPart = 0; @@ -3821,7 +3796,7 @@ static void test_overwrite(void) IStream_Release(stm); - IStorage_RenameElement(stg, stmname, stmname2); + IStorage_RenameElement(stg, contentsW, stmname2); r = IStorage_Commit(stg, STGC_OVERWRITE); ok(r==S_OK, "IStorage->Commit failed %x\n", r); @@ -3873,7 +3848,6 @@ static void test_overwrite(void) static void test_custom_lockbytes(void) { - static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; TestLockBytes* lockbytes; HRESULT hr; IStorage* stg; @@ -3884,7 +3858,7 @@ static void test_custom_lockbytes(void) hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); ok(hr==S_OK, "StgCreateDocfileOnILockBytes failed %x\n", hr); - hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); + hr = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); IStream_Release(stm); @@ -3900,7 +3874,7 @@ static void test_custom_lockbytes(void) hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); ok(hr==S_OK, "StgCreateDocfileOnILockBytes failed %x\n", hr); - hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); + hr = IStorage_CreateStream(stg, contentsW, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); IStream_Release(stm); diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index bbe7fb5da7f..b176588133b 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -996,8 +996,8 @@ static void test_marshal_STGMEDIUM(void) static void test_marshal_SNB(void) { - static const WCHAR str1W[] = {'s','t','r','i','n','g','1',0}; - static const WCHAR str2W[] = {'s','t','r','2',0}; + static const WCHAR str1W[] = L"string1"; + static const WCHAR str2W[] = L"str2"; unsigned char *buffer, *src, *mbuf; MIDL_STUB_MESSAGE stub_msg; WCHAR **ptrW, *dataW; -- 2.27.0

2 1

[PATCH] prntvpt: Fix a null check (Coverity).
by Sven Baars 03 Aug '20

03 Aug '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/prntvpt/ticket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 132a117a249..13aaf80423f 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -740,7 +740,7 @@ HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stre if (hr != S_OK) return hr; *dm = heap_alloc(sizeof(**dm)); - if (!dm) return E_OUTOFMEMORY; + if (!*dm) return E_OUTOFMEMORY; ticket_to_devmode(&ticket, *dm); *size = sizeof(**dm); -- 2.24.0

2 6

[PATCH v2] dsound: Select the nth effect matching the given CLSID in GetObjectInPath().
by Zebediah Figura 03 Aug '20

03 Aug '20

Instead of selecting the nth effect overall and checking whether it matches. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsound/buffer.c | 32 +++++++++++++++----------------- dlls/dsound/tests/dsound8.c | 24 ++++++++++-------------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index ea428c08166..bc30a8a5448 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -845,27 +845,25 @@ static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources(IDirectSoundBuffer } static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(IDirectSoundBuffer8 *iface, - REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, void **ppObject) + REFGUID clsid, DWORD index, REFGUID iid, void **out) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); + DWORD i, count = 0; - TRACE("(%p,%s,%u,%s,%p)\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject); + TRACE("(%p,%s,%u,%s,%p)\n", This, debugstr_guid(clsid), index, debugstr_guid(iid), out); - if (dwIndex >= This->num_filters) - return DSERR_CONTROLUNAVAIL; - - if (!ppObject) - return E_INVALIDARG; + if (!out) + return E_INVALIDARG; - if (IsEqualGUID(rguidObject, &This->filters[dwIndex].guid) || IsEqualGUID(rguidObject, &GUID_All_Objects)) { - if (SUCCEEDED(IMediaObject_QueryInterface(This->filters[dwIndex].obj, rguidInterface, ppObject))) - return DS_OK; - else - return E_NOINTERFACE; - } else { - WARN("control unavailable\n"); - return DSERR_OBJECTNOTFOUND; - } + for (i = 0; i < This->num_filters; i++) + { + if (IsEqualGUID(clsid, &This->filters[i].guid) || IsEqualGUID(clsid, &GUID_All_Objects)) + { + if (count++ == index) + return IMediaObject_QueryInterface(This->filters[i].obj, iid, out); + } + } + return DSERR_OBJECTNOTFOUND; } static HRESULT WINAPI IDirectSoundBufferImpl_Initialize(IDirectSoundBuffer8 *iface, diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index fcac31ba637..81c5710dbaf 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1678,7 +1678,7 @@ static void test_effects(void) dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); ok(dmo == (IMediaObject *)0xdeadbeef, "Got object %p.\n", dmo); effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; @@ -1705,9 +1705,8 @@ static void test_effects(void) echo = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - reverb = dmo; + ok(hr == DS_OK, "Got hr %#x.\n", hr); + reverb = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); ok(hr == DS_OK, "Got hr %#x.\n", hr); @@ -1716,12 +1715,12 @@ static void test_effects(void) hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); ok(hr == DS_OK, "Got hr %#x.\n", hr); - todo_wine ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); + ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); IMediaObject_Release(dmo); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 1, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXParamEq, (void **)&unk); ok(hr == DS_OK, "Got hr %#x.\n", hr); @@ -1743,14 +1742,11 @@ static void test_effects(void) hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - IUnknown_Release(unk); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); - if (echo) - IMediaObject_Release(echo); - if (reverb) - IMediaObject_Release(reverb); + IMediaObject_Release(echo); + IMediaObject_Release(reverb); got_Process = CreateEventA(NULL, TRUE, FALSE, NULL); @@ -1786,7 +1782,7 @@ static void test_effects(void) ok(hr == DS_OK, "Got hr %#x.\n", hr); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); CloseHandle(got_Process); IDirectSoundBuffer8_Release(buffer8); -- 2.27.0

2 1

[PATCH] iphlpapi: Update comment for SOCK_DGRAM since Linux also supports it from 3.0.
by Gabriel Ivăncescu 03 Aug '20

03 Aug '20

Linux does require the user to be in the range specified by /proc/sys/net/ipv4/ping_group_range though, but otherwise works fine. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/iphlpapi/icmp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 0dc2f12..8e425ea 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -160,7 +160,8 @@ HANDLE WINAPI Icmp6CreateFile(VOID) int sid=socket(AF_INET6,SOCK_RAW,IPPROTO_ICMPV6); if (sid < 0) { - /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + /* Some systems (e.g. Linux 3.0+ and Mac OS X) support + non-privileged ICMP via SOCK_DGRAM type. */ sid=socket(AF_INET6,SOCK_DGRAM,IPPROTO_ICMPV6); } if (sid < 0) { @@ -217,7 +218,8 @@ HANDLE WINAPI IcmpCreateFile(VOID) int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); if (sid < 0) { - /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + /* Some systems (e.g. Linux 3.0+ and Mac OS X) support + non-privileged ICMP via SOCK_DGRAM type. */ sid=socket(AF_INET,SOCK_DGRAM,IPPROTO_ICMP); } if (sid < 0) { -- 2.21.0

1 0

[PATCH] msvcrt/tests: Fix some tests on Windows 2003 and earlier.
by Zebediah Figura 03 Aug '20

03 Aug '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msvcrt/tests/string.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8e23f9cffee..3970f703f65 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1983,7 +1983,8 @@ static void test__strtod(void) ok(d == tests[i].ret, "%d) d = %.16e\n", i, d); ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", i, (int)(end - tests[i].str)); - ok(errno == tests[i].err, "%d) errno = %d\n", i, errno); + ok(errno == tests[i].err || (!tests[i].err && errno == 0xdeadbeef) /* <= 2003 */, + "%d) errno = %d\n", i, errno); } if (!p__strtod_l) -- 2.27.0

2 1

[PATCH] comdlg32: Filename should be filled after CDN_INITDONE (fixes bug #33590)
by Mikołaj Zalewski 03 Aug '20

03 Aug '20

2 1

[PATCH] maintainers: Add combase to the OLE RPC section.
by Huw Davies 03 Aug '20

03 Aug '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6cc16996650..46b3d40ec33 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -195,6 +195,7 @@ F: dlls/ole32/oleobj.c OLE RPC M: Huw Davies <huw(a)codeweavers.com> +F: dlls/combase/ F: dlls/ole32/compobj.c F: dlls/ole32/marshal.c F: dlls/ole32/rpc.c -- 2.23.0

1 0

[PATCH 1/5] combase: Mark 64-bit only stubs as such.
by Nikolay Sivov 03 Aug '20

03 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c2342cc9f88..115a5ecc568 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -194,13 +194,13 @@ @ stdcall HMENU_UserSize(ptr long ptr) @ stdcall HMENU_UserUnmarshal(ptr ptr ptr) @ stub HSTRING_UserFree -@ stub HSTRING_UserFree64 +@ stub -arch=win64 HSTRING_UserFree64 @ stub HSTRING_UserMarshal -@ stub HSTRING_UserMarshal64 +@ stub -arch=win64 HSTRING_UserMarshal64 @ stub HSTRING_UserSize -@ stub HSTRING_UserSize64 +@ stub -arch=win64 HSTRING_UserSize64 @ stub HSTRING_UserUnmarshal -@ stub HSTRING_UserUnmarshal64 +@ stub -arch=win64 HSTRING_UserUnmarshal64 @ stdcall HWND_UserFree(ptr ptr) @ stdcall HWND_UserMarshal(ptr ptr ptr) @ stdcall HWND_UserSize(ptr long ptr) @@ -298,13 +298,13 @@ @ stdcall StringFromIID(ptr ptr) ole32.StringFromIID @ stub UpdateDCOMSettings @ stdcall WdtpInterfacePointer_UserFree(ptr) -@ stub WdtpInterfacePointer_UserFree64 +@ stub -arch=win64 WdtpInterfacePointer_UserFree64 @ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) -@ stub WdtpInterfacePointer_UserMarshal64 +@ stub -arch=win64 WdtpInterfacePointer_UserMarshal64 @ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) -@ stub WdtpInterfacePointer_UserSize64 +@ stub -arch=win64 WdtpInterfacePointer_UserSize64 @ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) -@ stub WdtpInterfacePointer_UserUnmarshal64 +@ stub -arch=win64 WdtpInterfacePointer_UserUnmarshal64 @ stdcall WindowsCompareStringOrdinal(ptr ptr ptr) @ stdcall WindowsConcatString(ptr ptr ptr) @ stdcall WindowsCreateString(wstr long ptr) -- 2.27.0

3 13

[PATCH] d3dx10/tests: Add more test images for DDS format.
by Ziqing Hui 03 Aug '20

03 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 292 ++++++++++++++++++++++++++++++++-- 1 file changed, 278 insertions(+), 14 deletions(-)

2 2

[PATCH] ntdll: Return from Thumb to ARM move after assembling raise_func_trampoline_thumb.
by Mikołaj Zalewski 02 Aug '20

02 Aug '20

1 0

[PATCH] user32: Fix wsprintfA's buffer usage when using %S.
by Akihiro Sagawa 02 Aug '20

02 Aug '20

This fixes a regression introduced by 08bf605acb4d319e016a7eafe0c675509445bd4a. It could lead to stack corruption because ret can be negative when the output position, p, doesn't point the beginning of the buffer before the inner loop. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/wsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] server: Use a separate object for each opened mailslot device file.
by Zebediah Figura 02 Aug '20

02 Aug '20

This is essentially a straight port of 2600ecd4ed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/file.c | 4 +- dlls/ntdll/tests/om.c | 4 +- server/mailslot.c | 117 +++++++++++++++++++++++++++++----------- 3 files changed, 89 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 9c749ace1fe..8b9ec4f624d 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3813,7 +3813,6 @@ static void test_file_mode(void) UNICODE_STRING *file_name; ULONG options; ULONG mode; - BOOL todo; } option_tests[] = { { &file_name, 0, 0 }, { &file_name, FILE_NON_DIRECTORY_FILE, 0 }, @@ -3827,7 +3826,7 @@ static void test_file_mode(void) { &pipe_dev_name, 0, 0 }, { &pipe_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT }, { &mailslot_dev_name, 0, 0 }, - { &mailslot_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT, TRUE }, + { &mailslot_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT }, { &mountmgr_dev_name, 0, 0 }, { &mountmgr_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT } }; @@ -3879,7 +3878,6 @@ static void test_file_mode(void) memset(&mode, 0xcc, sizeof(mode)); status = pNtQueryInformationFile(file, &io, &mode, sizeof(mode), FileModeInformation); ok(status == STATUS_SUCCESS, "[%u] can't get FileModeInformation: %x\n", i, status); - todo_wine_if(option_tests[i].todo) ok(mode.Mode == option_tests[i].mode, "[%u] Mode = %x, expected %x\n", i, mode.Mode, option_tests[i].mode); diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c83052d2881..a9da114cb5c 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1445,8 +1445,8 @@ static void test_query_object(void) handle = CreateFileA( "\\\\.\\mailslot", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); - test_object_name( handle, L"\\Device\\Mailslot", FALSE ); - test_object_type_todo( handle, L"File" ); + test_object_name( handle, L"\\Device\\Mailslot", TRUE ); + test_object_type( handle, L"File" ); test_file_info( handle ); pNtClose( handle ); diff --git a/server/mailslot.c b/server/mailslot.c index 781e6f3141a..58d650cbb25 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -171,19 +171,23 @@ static const struct fd_ops mail_writer_fd_ops = struct mailslot_device { struct object obj; /* object header */ - struct fd *fd; /* pseudo-fd for ioctls */ struct namespace *mailslots; /* mailslot namespace */ }; +struct mailslot_device_file +{ + struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ + struct mailslot_device *device; /* mailslot device */ +}; + static void mailslot_device_dump( struct object *obj, int verbose ); static struct object_type *mailslot_device_get_type( struct object *obj ); -static struct fd *mailslot_device_get_fd( struct object *obj ); static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *mailslot_device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static void mailslot_device_destroy( struct object *obj ); -static enum server_fd_type mailslot_device_get_fd_type( struct fd *fd ); static const struct object_ops mailslot_device_ops = { @@ -195,7 +199,7 @@ static const struct object_ops mailslot_device_ops = NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - mailslot_device_get_fd, /* get_fd */ + no_get_fd, /* get_fd */ no_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -204,23 +208,51 @@ static const struct object_ops mailslot_device_ops = default_unlink_name, /* unlink_name */ mailslot_device_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ mailslot_device_destroy /* destroy */ }; +static void mailslot_device_file_dump( struct object *obj, int verbose ); +static struct fd *mailslot_device_file_get_fd( struct object *obj ); +static void mailslot_device_file_destroy( struct object *obj ); +static enum server_fd_type mailslot_device_file_get_fd_type( struct fd *fd ); + +static const struct object_ops mailslot_device_file_ops = +{ + sizeof(struct mailslot_device_file), /* size */ + mailslot_device_file_dump, /* dump */ + file_get_type, /* get_type */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + default_fd_signaled, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + mailslot_device_file_get_fd, /* get_fd */ + default_fd_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + fd_close_handle, /* close_handle */ + mailslot_device_file_destroy /* destroy */ +}; + static const struct fd_ops mailslot_device_fd_ops = { - default_fd_get_poll_events, /* get_poll_events */ - default_poll_event, /* poll_event */ - mailslot_device_get_fd_type, /* get_fd_type */ - no_fd_read, /* read */ - no_fd_write, /* write */ - no_fd_flush, /* flush */ - default_fd_get_file_info, /* get_file_info */ - no_fd_get_volume_info, /* get_volume_info */ - default_fd_ioctl, /* ioctl */ - default_fd_queue_async, /* queue_async */ - default_fd_reselect_async /* reselect_async */ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + mailslot_device_file_get_fd_type, /* get_fd_type */ + no_fd_read, /* read */ + no_fd_write, /* write */ + no_fd_flush, /* flush */ + default_fd_get_file_info, /* get_file_info */ + no_fd_get_volume_info, /* get_volume_info */ + default_fd_ioctl, /* ioctl */ + default_fd_queue_async, /* queue_async */ + default_fd_reselect_async /* reselect_async */ }; static void mailslot_destroy( struct object *obj) @@ -357,12 +389,6 @@ static struct object_type *mailslot_device_get_type( struct object *obj ) return get_object_type( &str ); } -static struct fd *mailslot_device_get_fd( struct object *obj ) -{ - struct mailslot_device *device = (struct mailslot_device *)obj; - return (struct fd *)grab_object( device->fd ); -} - static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { @@ -382,22 +408,26 @@ static struct object *mailslot_device_lookup_name( struct object *obj, struct un static struct object *mailslot_device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) { - return grab_object( obj ); + struct mailslot_device_file *file; + + if (!(file = alloc_object( &mailslot_device_file_ops ))) return NULL; + file->device = (struct mailslot_device *)grab_object( obj ); + if (!(file->fd = alloc_pseudo_fd( &mailslot_device_fd_ops, obj, options ))) + { + release_object( file ); + return NULL; + } + allow_fd_caching( file->fd ); + return &file->obj; } static void mailslot_device_destroy( struct object *obj ) { struct mailslot_device *device = (struct mailslot_device*)obj; assert( obj->ops == &mailslot_device_ops ); - if (device->fd) release_object( device->fd ); free( device->mailslots ); } -static enum server_fd_type mailslot_device_get_fd_type( struct fd *fd ) -{ - return FD_TYPE_DEVICE; -} - struct object *create_mailslot_device( struct object *root, const struct unicode_str *name ) { struct mailslot_device *dev; @@ -406,8 +436,7 @@ struct object *create_mailslot_device( struct object *root, const struct unicode get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->mailslots = NULL; - if (!(dev->fd = alloc_pseudo_fd( &mailslot_device_fd_ops, &dev->obj, 0 )) || - !(dev->mailslots = create_namespace( 7 ))) + if (!(dev->mailslots = create_namespace( 7 ))) { release_object( dev ); dev = NULL; @@ -416,6 +445,32 @@ struct object *create_mailslot_device( struct object *root, const struct unicode return &dev->obj; } +static void mailslot_device_file_dump( struct object *obj, int verbose ) +{ + struct mailslot_device_file *file = (struct mailslot_device_file *)obj; + + fprintf( stderr, "File on mailslot device %p\n", file->device ); +} + +static struct fd *mailslot_device_file_get_fd( struct object *obj ) +{ + struct mailslot_device_file *file = (struct mailslot_device_file *)obj; + return (struct fd *)grab_object( file->fd ); +} + +static void mailslot_device_file_destroy( struct object *obj ) +{ + struct mailslot_device_file *file = (struct mailslot_device_file*)obj; + assert( obj->ops == &mailslot_device_file_ops ); + if (file->fd) release_object( file->fd ); + release_object( file->device ); +} + +static enum server_fd_type mailslot_device_file_get_fd_type( struct fd *fd ) +{ + return FD_TYPE_DEVICE; +} + static struct mailslot *create_mailslot( struct object *root, const struct unicode_str *name, unsigned int attr, int max_msgsize, timeout_t read_timeout, -- 2.27.0

1 0

Wine staging 5.14 release
by Alistair Leslie-Hughes 02 Aug '20

02 Aug '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.14 (639 patches are applied to wine vanilla) NOTE: Currently the esync patchset has been disabled until it can be rebased. Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Include <signal.h> for sigset_t * ntdll: Fix NtGetContextThread on i386 with PE syscall thunks. * winevulkan: Avoid returning 0 for swapchain maxImageCount. Added: * [35254] findstr: Add minimal implementation Updated: * ntdll-WRITECOPY 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] sapi: Improve Get/SetDefaultTokenId stubs.
by Myah Caron 01 Aug '20

01 Aug '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Progressing towards fixing #49641. This patch alone doesn't fix the issue, but I'm not sure when I'll get to the next patch, so I'm sending this one in by itself for the moment. dlls/sapi/tests/token.c | 253 ++++++++++++++++++++++++++++++++++++++++ dlls/sapi/token.c | 96 ++++++++++++++- 2 files changed, 345 insertions(+), 4 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 9f6689b83f..4d12ddb1c9 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -83,6 +83,254 @@ static void test_token_category(void) ISpObjectTokenCategory_Release( cat ); } +static void backup_speech(HKEY root) +{ + LONG res; + HKEY key; + + res = RegDeleteTreeW( root, L"SOFTWARE\\Microsoft\\Speech_winetest" ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + res = RegCreateKeyW( root, L"SOFTWARE\\Microsoft\\Speech_winetest", &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + RegCopyTreeW( root, L"SOFTWARE\\Microsoft\\Speech", key ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); +} + +static void restore_speech(HKEY root, BOOL delete_backup) +{ + LONG res; + HKEY key; + + res = RegDeleteTreeW( root, L"SOFTWARE\\Microsoft\\Speech" ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + res = RegCreateKeyW( root, L"SOFTWARE\\Microsoft\\Speech", &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + RegCopyTreeW( root, L"SOFTWARE\\Microsoft\\Speech_winetest", key ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + if (delete_backup) { + res = RegDeleteTreeW( root, L"SOFTWARE\\Microsoft\\Speech_winetest" ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + } +} + +static void test_token_default_id(void) +{ + ISpObjectTokenCategory *cat; + HRESULT hr; + LONG res; + HKEY key; + LPWSTR token_id = NULL; + WCHAR regvalue[512]; + WCHAR regvalue2[512]; + DWORD regvalue_size = sizeof( regvalue ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( token_id == (LPWSTR)0xdeadbeef, "got %p\n", token_id ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + /* if missing, Get/SetDefaultTokenId should initialize HKEY_LOCAL_USER's + SOFTWARE\Microsoft\Speech\AudioOutput */ + res = RegDeleteTreeW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput" ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + res = RegOpenKeyExW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + res = RegOpenKeyExW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + + regvalue_size = sizeof( regvalue ); + res = RegGetValueW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", + L"DefaultTokenId", RRF_RT_REG_SZ, NULL, (LPVOID)&regvalue, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should be equal to the DefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + CoTaskMemFree(token_id); + + regvalue_size = sizeof( regvalue ); + res = RegGetValueW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", + L"DefaultTokenId", RRF_RT_REG_SZ, NULL, (LPVOID)&regvalue, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + regvalue_size = sizeof( regvalue2 ); + res = RegGetValueW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", + L"DefaultdefaultTokenId", RRF_RT_REG_SZ, NULL, (LPVOID)&regvalue2, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, regvalue2), + "DefaultTokenId (%s) should be equal to the DefaultdefaultTokenId key (%s)\n", + wine_dbgstr_w(regvalue), wine_dbgstr_w(regvalue2) ); + + /* todo: test subkeys */ + + res = RegOpenKeyExW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + wcscpy(regvalue, L"bogus"); + regvalue_size = (wcslen(regvalue) + 1) * sizeof( WCHAR ); + res = RegSetValueExW( key, L"DefaultTokenId", 0, REG_SZ, (const BYTE*)regvalue, regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + todo_wine ok( wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should not be equal to the bogus DefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + CoTaskMemFree(token_id); + + /* todo: add more tests for the resulting token_id */ + + restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + todo_wine ok( hr == 0x800703fa, "got %08x\n", hr ); + todo_wine ok( token_id == (LPWSTR)0xdeadbeef, "got %p\n", token_id ); + + ISpObjectTokenCategory_Release( cat ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + res = RegDeleteTreeW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput" ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegDeleteTreeW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput" ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + + restore_speech( HKEY_CURRENT_USER, FALSE ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + + restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + res = RegDeleteTreeW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput" ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + res = RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + wcscpy(regvalue, L"bogus"); + regvalue_size = (wcslen(regvalue) + 1) * sizeof( WCHAR ); + res = RegSetValueExW( key, L"DefaultdefaultTokenId", 0, REG_SZ, (const BYTE*)regvalue, regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + todo_wine ok( wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should not be equal to the bogus DefaultdefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + CoTaskMemFree(token_id); + + /* todo: test valid DefaultdefaultTokenId values */ + + ISpObjectTokenCategory_Release( cat ); + + res = RegDeleteTreeW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput" ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegDeleteValueW( key, L"DefaultdefaultTokenId" ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + if (token_id != (LPWSTR)0xdeadbeef) + CoTaskMemFree(token_id); + + ISpObjectTokenCategory_Release( cat ); + restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, NULL ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + wcscpy(regvalue, L"deadbeef"); + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, regvalue ); + ok( hr == S_OK, "got %08x\n", hr ); + + regvalue_size = sizeof( regvalue ); + res = RegGetValueW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", + L"DefaultTokenId", RRF_RT_REG_SZ, NULL, (LPVOID)&regvalue, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, L"deadbeef"), + "DefaultTokenId in registry (%s) should be equal to the set default token id (%s)\n", + wine_dbgstr_w(regvalue), wine_dbgstr_w(L"deadbeef") ); + + res = RegDeleteTreeW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput" ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + wcscpy(regvalue, L"deadbeef"); + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, regvalue ); + ok( hr == S_OK, "got %08x\n", hr ); + regvalue_size = sizeof( regvalue ); + res = RegGetValueW( HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", + L"DefaultTokenId", RRF_RT_REG_SZ, NULL, (LPVOID)&regvalue, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, L"deadbeef"), + "GetDefaultTokenId (%s) should be equal to the set DefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(L"deadbeef") ); + + ISpObjectTokenCategory_Release( cat ); +} + static void test_token_enum(void) { ISpObjectTokenEnumBuilder *token_enum; @@ -121,6 +369,11 @@ START_TEST(token) CoInitialize( NULL ); test_data_key(); test_token_category(); + backup_speech( HKEY_LOCAL_MACHINE ); + backup_speech( HKEY_CURRENT_USER ); + test_token_default_id(); + restore_speech( HKEY_CURRENT_USER, TRUE ); + restore_speech( HKEY_LOCAL_MACHINE, TRUE ); test_token_enum(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index d2b70c95cf..78c5d2cdd5 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -232,6 +232,7 @@ struct token_category LONG ref; ISpRegDataKey *data_key; + WCHAR *subkey; }; static struct token_category *impl_from_ISpObjectTokenCategory( ISpObjectTokenCategory *iface ) @@ -421,6 +422,8 @@ static HRESULT WINAPI token_category_SetId( ISpObjectTokenCategory *iface, res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); if (res) return SPERR_INVALID_REGISTRY_KEY; + This->subkey = _wcsdup(subkey); + hr = CoCreateInstance( &CLSID_SpDataKey, NULL, CLSCTX_ALL, &IID_ISpRegDataKey, (void **)&This->data_key ); if (FAILED(hr)) goto fail; @@ -479,18 +482,103 @@ fail: return hr; } +static HRESULT get_user_speech_key( struct token_category *This, HKEY* key ) +{ + LONG res; + WCHAR regvalue[512]; + DWORD regvalue_size = sizeof( regvalue ); + + res = RegOpenKeyExW( HKEY_CURRENT_USER, This->subkey, 0, KEY_ALL_ACCESS, key ); + if (res == ERROR_SUCCESS) { + return S_OK; + } + + FIXME( "(%p): semi-stub\n", This ); + + res = RegCreateKeyW( HKEY_CURRENT_USER, This->subkey, key ); + if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "returning %08x\n", res ); + return res; + } + + res = RegGetValueW( HKEY_LOCAL_MACHINE, This->subkey, L"DefaultdefaultTokenId", + RRF_RT_REG_SZ, NULL, (LPVOID)&regvalue, &regvalue_size); + if (res == ERROR_SUCCESS) { + RegSetValueExW( *key, L"DefaultTokenId", 0, REG_SZ, (const BYTE*)regvalue, regvalue_size); + } + + return S_OK; +} + static HRESULT WINAPI token_category_SetDefaultTokenId( ISpObjectTokenCategory *iface, LPCWSTR id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + HRESULT hr; + LONG res; + HKEY key; + + FIXME( "(%p)->(%s): semi-stub\n", iface, debugstr_w(id) ); + + if (!This->data_key) + return SPERR_UNINITIALIZED; + + if (!id) + return E_INVALIDARG; + + hr = get_user_speech_key( This, &key ); + if (FAILED(hr)) return hr; + + res = RegSetValueExW( key, L"DefaultTokenId", 0, REG_SZ, (const BYTE*)id, + wcslen( id) * sizeof( WCHAR )); + if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "unable to set DefaultTokenId, returning S_FALSE\n" ); + RegCloseKey( key ); + return S_FALSE; + } + + RegCloseKey( key ); + + return S_OK; } static HRESULT WINAPI token_category_GetDefaultTokenId( ISpObjectTokenCategory *iface, LPWSTR *id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + HRESULT hr; + LONG res; + HKEY key; + WCHAR regvalue[512]; + DWORD regvalue_size = sizeof( regvalue ); + + FIXME( "(%p)->(%p): semi-stub\n", iface, id ); + + if (!This->data_key) + return SPERR_UNINITIALIZED; + + if (!id) + return E_POINTER; + + hr = get_user_speech_key( This, &key ); + if (FAILED(hr)) return hr; + + res = RegGetValueW( key, NULL, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + &regvalue, &regvalue_size); + if (res != ERROR_SUCCESS) { + FIXME( "DefaultTokenId is missing, returning S_FALSE\n" ); + RegCloseKey( key ); + return S_FALSE; + } + + *id = CoTaskMemAlloc( regvalue_size ); + wcscpy( *id, regvalue ); + + RegCloseKey( key ); + + return S_OK; } const struct ISpObjectTokenCategoryVtbl token_category_vtbl = -- 2.27.0

2 2

[PATCH] Revert "winegstreamer: Check for failure from gst_video_info_set_format()."
by Zebediah Figura 01 Aug '20

01 Aug '20

This reverts commit ddd43e0a80bfd4c2e6f3ec650ed4b7d37890c46d. This function returns void before 1.12. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49647 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index fe5fe0e60df..e8f65a0e6ed 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -413,11 +413,7 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) return NULL; } - if (!gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight)) - { - ERR("Failed to set format.\n"); - return NULL; - } + gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); if ((caps = gst_video_info_to_caps(&info))) { /* Clear some fields that shouldn't prevent us from connecting. */ -- 2.27.0

1 0

[PATCH] ws2_32: Avoid depending on system getservby(name|port) functions
by Alex Henrie 01 Aug '20

01 Aug '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- These functions are incredibly slow on Windows. To avoid timeouts, I had to put the tests in protocol.c rather than the crowded sock.c. --- configure.ac | 1 - dlls/ws2_32/socket.c | 339 ++++++++++++++++++++++++--------- dlls/ws2_32/tests/protocol.c | 359 +++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 66 ------- 4 files changed, 609 insertions(+), 156 deletions(-) diff --git a/configure.ac b/configure.ac index dea25b0c3f..2ad8552de7 100644 --- a/configure.ac +++ b/configure.ac @@ -2241,7 +2241,6 @@ AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ getnetbyname \ - getservbyport \ ) dnl Check for clock_gettime which may be in -lrt diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eb21e4b4b3..2713be675a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -649,7 +649,7 @@ static FARPROC blocking_hook = (FARPROC)WSA_DefaultBlockingHook; static struct WS_hostent *WS_create_he(char *name, int aliases, int aliases_size, int addresses, int address_length); static struct WS_hostent *WS_dup_he(const struct hostent* p_he); static struct WS_protoent *WS_create_pe( const char *name, char **aliases, int prot ); -static struct WS_servent *WS_dup_se(const struct servent* p_se); +static struct WS_servent *WS_create_se( const char *name, char **aliases, int port, const char *proto ); static int ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size); int WSAIOCTL_GetInterfaceCount(void); @@ -1488,20 +1488,6 @@ static int convert_sockopt(INT *level, INT *optname) /* ----------------------------------- Per-thread info (or per-process?) */ -static char *strdup_lower(const char *str) -{ - int i; - char *ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ); - - if (ret) - { - for (i = 0; str[i]; i++) ret[i] = tolower(str[i]); - ret[i] = 0; - } - else SetLastError(WSAENOBUFS); - return ret; -} - /* Utility: get the SO_RCVTIMEO or SO_SNDTIMEO socket option * from an fd and return the value converted to milli seconds * or 0 if there is an infinite time out */ @@ -6560,41 +6546,258 @@ struct WS_protoent* WINAPI WS_getprotobynumber(int number) } +static const struct +{ + unsigned short port; + const char *names[3]; + const char *protos[2]; +} +services[] = +{ + { 7, {"echo"}, {"tcp", "udp"} }, + { 9, {"discard", "sink"}, {"tcp", "udp"} }, + { 11, {"systat", "users"}, {"tcp", "udp"} }, + { 13, {"daytime"}, {"tcp", "udp"} }, + { 17, {"qotd", "quote"}, {"tcp", "udp"} }, + { 19, {"chargen", "ttytst"}, {"tcp", "udp"} }, + { 20, {"ftp-data"}, {"tcp"} }, + { 21, {"ftp"}, {"tcp"} }, + { 22, {"ssh"}, {"tcp"} }, + { 23, {"telnet"}, {"tcp"} }, + { 25, {"smtp", "mail"}, {"tcp"} }, + { 37, {"time", "timserver"}, {"tcp", "udp"} }, + { 39, {"rlp", "resource"}, {"udp"} }, + { 42, {"nameserver", "name"}, {"tcp", "udp"} }, + { 43, {"nicname", "whois"}, {"tcp"} }, + { 53, {"domain"}, {"tcp", "udp"} }, + { 67, {"bootps", "dhcps"}, {"udp"} }, + { 68, {"bootpc", "dhcpc"}, {"udp"} }, + { 69, {"tftp"}, {"udp"} }, + { 70, {"gopher"}, {"tcp"} }, + { 79, {"finger"}, {"tcp"} }, + { 80, {"http", "www"}, {"tcp"} }, + { 81, {"hosts2-ns"}, {"tcp", "udp"} }, + { 88, {"kerberos", "krb5"}, {"tcp", "udp"} }, + { 101, {"hostname", "hostnames"}, {"tcp"} }, + { 102, {"iso-tsap"}, {"tcp"} }, + { 107, {"rtelnet"}, {"tcp"} }, + { 109, {"pop2", "postoffice"}, {"tcp"} }, + { 110, {"pop3"}, {"tcp"} }, + { 111, {"sunrpc", "rpcbind"}, {"tcp", "udp"} }, + { 113, {"auth", "ident"}, {"tcp"} }, + { 117, {"uucp-path"}, {"tcp"} }, + { 118, {"sqlserv"}, {"tcp"} }, + { 119, {"nntp", "usenet"}, {"tcp"} }, + { 123, {"ntp"}, {"udp"} }, + { 135, {"epmap", "loc-srv"}, {"tcp", "udp"} }, + { 137, {"netbios-ns", "nbname"}, {"tcp", "udp"} }, + { 138, {"netbios-dgm", "nbdatagram"}, {"udp"} }, + { 139, {"netbios-ssn", "nbsession"}, {"tcp"} }, + { 143, {"imap", "imap4"}, {"tcp"} }, + { 150, {"sql-net"}, {"tcp"} }, + { 156, {"sqlsrv"}, {"tcp"} }, + { 158, {"pcmail-srv"}, {"tcp"} }, + { 161, {"snmp"}, {"udp"} }, + { 162, {"snmptrap", "snmp-trap"}, {"udp"} }, + { 170, {"print-srv"}, {"tcp"} }, + { 179, {"bgp"}, {"tcp"} }, + { 194, {"irc"}, {"tcp"} }, + { 213, {"ipx"}, {"udp"} }, + { 322, {"rtsps"}, {"tcp", "udp"} }, + { 349, {"mftp"}, {"tcp", "udp"} }, + { 389, {"ldap"}, {"tcp"} }, + { 443, {"https", "MCom"}, {"tcp", "udp"} }, + { 445, {"microsoft-ds"}, {"tcp", "udp"} }, + { 464, {"kpasswd"}, {"tcp", "udp"} }, + { 500, {"isakmp", "ike"}, {"udp"} }, + { 507, {"crs"}, {"tcp", "udp"} }, + { 512, {"exec"}, {"tcp"} }, + { 512, {"biff", "comsat"}, {"udp", "tcp"} }, + { 513, {"login"}, {"tcp"} }, + { 513, {"who", "whod"}, {"udp", "tcp"} }, + { 514, {"cmd", "shell"}, {"tcp"} }, + { 514, {"syslog"}, {"udp", "tcp"} }, + { 515, {"printer", "spooler"}, {"tcp"} }, + { 517, {"talk"}, {"udp"} }, + { 518, {"ntalk"}, {"udp"} }, + { 520, {"efs"}, {"tcp"} }, + { 520, {"router", "route"}, {"udp", "tcp"} }, + { 522, {"ulp"}, {"tcp", "udp"} }, + { 525, {"timed", "timeserver"}, {"udp"} }, + { 526, {"tempo", "newdate"}, {"tcp"} }, + { 529, {"irc-serv"}, {"tcp", "udp"} }, + { 530, {"courier", "rpc"}, {"tcp"} }, + { 531, {"conference", "chat"}, {"tcp"} }, + { 532, {"netnews", "readnews"}, {"tcp"} }, + { 533, {"netwall"}, {"udp"} }, + { 540, {"uucp", "uucpd"}, {"tcp"} }, + { 543, {"klogin"}, {"tcp"} }, + { 544, {"kshell", "krcmd"}, {"tcp"} }, + { 546, {"dhcpv6-client"}, {"tcp", "udp"} }, + { 547, {"dhcpv6-server"}, {"tcp", "udp"} }, + { 548, {"afpovertcp"}, {"tcp", "udp"} }, + { 550, {"new-rwho", "new-who"}, {"udp"} }, + { 554, {"rtsp"}, {"tcp", "udp"} }, + { 556, {"remotefs", "rfs"}, {"tcp"} }, + { 560, {"rmonitor", "rmonitord"}, {"udp"} }, + { 561, {"monitor"}, {"udp"} }, + { 563, {"nntps", "snntp"}, {"tcp", "udp"} }, + { 565, {"whoami"}, {"tcp", "udp"} }, + { 568, {"ms-shuttle"}, {"tcp", "udp"} }, + { 569, {"ms-rome"}, {"tcp", "udp"} }, + { 593, {"http-rpc-epmap"}, {"tcp", "udp"} }, + { 612, {"hmmp-ind"}, {"tcp", "udp"} }, + { 613, {"hmmp-op"}, {"tcp", "udp"} }, + { 636, {"ldaps", "sldap"}, {"tcp"} }, + { 666, {"doom"}, {"tcp", "udp"} }, + { 691, {"msexch-routing"}, {"tcp", "udp"} }, + { 749, {"kerberos-adm"}, {"tcp", "udp"} }, + { 750, {"kerberos-iv"}, {"udp"} }, + { 800, {"mdbs_daemon"}, {"tcp", "udp"} }, + { 989, {"ftps-data"}, {"tcp"} }, + { 990, {"ftps"}, {"tcp"} }, + { 992, {"telnets"}, {"tcp"} }, + { 993, {"imaps"}, {"tcp"} }, + { 994, {"ircs"}, {"tcp"} }, + { 995, {"pop3s", "spop3"}, {"tcp", "udp"} }, + { 1034, {"activesync"}, {"tcp"} }, + { 1109, {"kpop"}, {"tcp"} }, + { 1110, {"nfsd-status"}, {"tcp"} }, + { 1110, {"nfsd-keepalive"}, {"udp"} }, + { 1155, {"nfa"}, {"tcp", "udp"} }, + { 1167, {"phone"}, {"udp"} }, + { 1270, {"opsmgr"}, {"tcp", "udp"} }, + { 1433, {"ms-sql-s"}, {"tcp", "udp"} }, + { 1434, {"ms-sql-m"}, {"tcp", "udp"} }, + { 1477, {"ms-sna-server"}, {"tcp", "udp"} }, + { 1478, {"ms-sna-base"}, {"tcp", "udp"} }, + { 1512, {"wins"}, {"tcp", "udp"} }, + { 1524, {"ingreslock", "ingres"}, {"tcp"} }, + { 1607, {"stt"}, {"tcp", "udp"} }, + { 1701, {"l2tp"}, {"udp"} }, + { 1711, {"pptconference"}, {"tcp", "udp"} }, + { 1723, {"pptp"}, {"tcp"} }, + { 1731, {"msiccp"}, {"tcp", "udp"} }, + { 1745, {"remote-winsock"}, {"tcp", "udp"} }, + { 1755, {"ms-streaming"}, {"tcp", "udp"} }, + { 1801, {"msmq"}, {"tcp", "udp"} }, + { 1812, {"radius"}, {"udp"} }, + { 1813, {"radacct"}, {"udp"} }, + { 1863, {"msnp"}, {"tcp", "udp"} }, + { 1900, {"ssdp"}, {"tcp", "udp"} }, + { 1944, {"close-combat"}, {"tcp", "udp"} }, + { 2049, {"nfsd", "nfs"}, {"udp"} }, + { 2053, {"knetd"}, {"tcp"} }, + { 2106, {"mzap"}, {"tcp", "udp"} }, + { 2177, {"qwave"}, {"tcp", "udp"} }, + { 2234, {"directplay"}, {"tcp", "udp"} }, + { 2382, {"ms-olap3"}, {"tcp", "udp"} }, + { 2383, {"ms-olap4"}, {"tcp", "udp"} }, + { 2393, {"ms-olap1"}, {"tcp", "udp"} }, + { 2394, {"ms-olap2"}, {"tcp", "udp"} }, + { 2460, {"ms-theater"}, {"tcp", "udp"} }, + { 2504, {"wlbs"}, {"tcp", "udp"} }, + { 2525, {"ms-v-worlds"}, {"tcp", "udp"} }, + { 2701, {"sms-rcinfo"}, {"tcp", "udp"} }, + { 2702, {"sms-xfer"}, {"tcp", "udp"} }, + { 2703, {"sms-chat"}, {"tcp", "udp"} }, + { 2704, {"sms-remctrl"}, {"tcp", "udp"} }, + { 2725, {"msolap-ptp2"}, {"tcp", "udp"} }, + { 2869, {"icslap"}, {"tcp", "udp"} }, + { 3020, {"cifs"}, {"tcp", "udp"} }, + { 3074, {"xbox"}, {"tcp", "udp"} }, + { 3126, {"ms-dotnetster"}, {"tcp", "udp"} }, + { 3132, {"ms-rule-engine"}, {"tcp", "udp"} }, + { 3268, {"msft-gc"}, {"tcp", "udp"} }, + { 3269, {"msft-gc-ssl"}, {"tcp", "udp"} }, + { 3343, {"ms-cluster-net"}, {"tcp", "udp"} }, + { 3389, {"ms-wbt-server"}, {"tcp", "udp"} }, + { 3535, {"ms-la"}, {"tcp", "udp"} }, + { 3540, {"pnrp-port"}, {"tcp", "udp"} }, + { 3544, {"teredo"}, {"tcp", "udp"} }, + { 3587, {"p2pgroup"}, {"tcp", "udp"} }, + { 3702, {"ws-discovery", "upnp-discovery"}, {"udp", "tcp"} }, + { 3776, {"dvcprov-port"}, {"tcp", "udp"} }, + { 3847, {"msfw-control"}, {"tcp"} }, + { 3882, {"msdts1"}, {"tcp"} }, + { 3935, {"sdp-portmapper"}, {"tcp", "udp"} }, + { 4350, {"net-device"}, {"tcp", "udp"} }, + { 4500, {"ipsec-msft"}, {"tcp", "udp"} }, + { 5355, {"llmnr"}, {"tcp", "udp"} }, + { 5357, {"wsd"}, {"tcp"} }, + { 5358, {"wsd"}, {"tcp"} }, + { 5678, {"rrac"}, {"tcp", "udp"} }, + { 5679, {"dccm"}, {"tcp", "udp"} }, + { 5720, {"ms-licensing"}, {"tcp", "udp"} }, + { 6073, {"directplay8"}, {"tcp", "udp"} }, + { 9535, {"man"}, {"tcp"} }, + { 9753, {"rasadv"}, {"tcp", "udp"} }, + { 11320, {"imip-channels"}, {"tcp", "udp"} }, + { 47624, {"directplaysrvr"}, {"tcp", "udp"} }, +}; + /*********************************************************************** * getservbyname (WS2_32.55) */ struct WS_servent* WINAPI WS_getservbyname(const char *name, const char *proto) { struct WS_servent* retval = NULL; - struct servent* serv; - char *name_str; - char *proto_str = NULL; - - if (!(name_str = strdup_lower(name))) return NULL; - - if (proto && *proto) + int i, j, k; + for (i = 0; i < ARRAY_SIZE(services); i++) { - if (!(proto_str = strdup_lower(proto))) + for (j = 0; services[i].names[j]; j++) { - HeapFree( GetProcessHeap(), 0, name_str ); - return NULL; + if (_strnicmp(services[i].names[j], name, -1) != 0) continue; + for (k = 0; k < ARRAY_SIZE(services[0].protos) && services[i].protos[k]; k++) + { + if (proto && _strnicmp(services[i].protos[k], proto, -1) != 0) continue; + retval = WS_create_se(services[i].names[0], (char **)services[i].names + 1, + services[i].port, services[i].protos[k]); + goto found; + } + break; } } + if (!retval) + { + WARN("service %s/%s not found\n", debugstr_a(name), debugstr_a(proto)); + SetLastError(WSANO_DATA); + } +found: + TRACE("%s/%s ret %p\n", debugstr_a(name), debugstr_a(proto), retval); + return retval; +} - EnterCriticalSection( &csWSgetXXXbyYYY ); - serv = getservbyname(name_str, proto_str); - if( serv != NULL ) +/*********************************************************************** + * getservbyport (WS2_32.56) + */ +struct WS_servent* WINAPI WS_getservbyport(int port, const char *proto) +{ + struct WS_servent* retval = NULL; + int i, j; + port = ntohs(port); + for (i = 0; i < ARRAY_SIZE(services); i++) + { + if (services[i].port != port) continue; + for (j = 0; j < ARRAY_SIZE(services[0].protos) && services[i].protos[j]; j++) + { + if (proto && _strnicmp(services[i].protos[j], proto, -1) != 0) continue; + retval = WS_create_se(services[i].names[0], (char **)services[i].names + 1, + services[i].port, services[i].protos[j]); + goto found; + } + } + if (!retval) { - retval = WS_dup_se(serv); + WARN("service %d/%s not found\n", port, debugstr_a(proto)); + SetLastError(WSANO_DATA); } - else SetLastError(WSANO_DATA); - LeaveCriticalSection( &csWSgetXXXbyYYY ); - HeapFree( GetProcessHeap(), 0, proto_str ); - HeapFree( GetProcessHeap(), 0, name_str ); - TRACE( "%s, %s ret %p\n", debugstr_a(name), debugstr_a(proto), retval ); +found: + TRACE("%d/%s ret %p\n", port, debugstr_a(proto), retval); return retval; } + /*********************************************************************** * freeaddrinfo (WS2_32.@) */ @@ -7285,32 +7488,6 @@ int WINAPI GetNameInfoW(const SOCKADDR *sa, WS_socklen_t salen, PWCHAR host, return ret; } -/*********************************************************************** - * getservbyport (WS2_32.56) - */ -struct WS_servent* WINAPI WS_getservbyport(int port, const char *proto) -{ - struct WS_servent* retval = NULL; -#ifdef HAVE_GETSERVBYPORT - struct servent* serv; - char *proto_str = NULL; - - if (proto && *proto) - { - if (!(proto_str = strdup_lower(proto))) return NULL; - } - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (serv = getservbyport(port, proto_str)) != NULL ) { - retval = WS_dup_se(serv); - } - else SetLastError(WSANO_DATA); - LeaveCriticalSection( &csWSgetXXXbyYYY ); - HeapFree( GetProcessHeap(), 0, proto_str ); -#endif - TRACE("%d (i.e. port %d), %s ret %p\n", port, (int)ntohl(port), debugstr_a(proto), retval); - return retval; -} - /*********************************************************************** * gethostname (WS2_32.57) @@ -7795,12 +7972,7 @@ INT WINAPI WSAUnhookBlockingHook(void) /* ----------------------------------- end of API stuff */ -/* ----------------------------------- helper functions - - * - * TODO: Merge WS_dup_..() stuff into one function that - * would operate with a generic structure containing internal - * pointers (via a template of some kind). - */ +/* ----------------------------------- helper functions */ static int list_size(char** l, int item_size) { @@ -7935,31 +8107,20 @@ static struct WS_protoent *WS_create_pe( const char *name, char **aliases, int p /* ----- servent */ -static struct WS_servent *WS_dup_se(const struct servent* p_se) +static struct WS_servent *WS_create_se( const char *name, char **aliases, int port, const char *proto ) { - char *p; - struct WS_servent *p_to; - - int size = (sizeof(*p_se) + - strlen(p_se->s_proto) + 1 + - strlen(p_se->s_name) + 1 + - list_size(p_se->s_aliases, 0)); - - if (!(p_to = check_buffer_se(size))) return NULL; - p_to->s_port = p_se->s_port; - - p = (char *)(p_to + 1); - p_to->s_name = p; - strcpy(p, p_se->s_name); - p += strlen(p) + 1; - - p_to->s_proto = p; - strcpy(p, p_se->s_proto); - p += strlen(p) + 1; + struct WS_servent *ret; + unsigned int size = sizeof(*ret) + strlen(name) + 1 + strlen(proto) + sizeof(char *) + list_size(aliases, 0); - p_to->s_aliases = (char **)p; - list_dup(p_se->s_aliases, p_to->s_aliases, 0); - return p_to; + if (!(ret = check_buffer_se( size ))) return NULL; + ret->s_port = htons(port); + ret->s_name = (char *)(ret + 1); + ret->s_proto = (char *)ret->s_name + strlen(name) + 1; + strcpy( ret->s_name, name ); + strcpy( ret->s_proto, proto ); + ret->s_aliases = (char **)ret->s_proto + strlen(proto) / sizeof(char *) + 1; + list_dup( aliases, ret->s_aliases, 0 ); + return ret; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index d6e454a5fb..b230ac80c8 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -39,6 +39,13 @@ | XP1_SUPPORT_MULTIPOINT \ | XP1_IFS_HANDLES) +#define PRIVATE_PORT_START 49152 + +#define TEST_TIMEOUT 30 /* Seconds to wait before killing child threads + after server initialization, if something hangs */ +#define NUM_THREADS 3 /* Number of threads to run getservbyname */ +#define NUM_QUERIES 250 /* Number of getservbyname queries per thread */ + static void test_service_flags(int family, int version, int socktype, int protocol, DWORD testflags) { DWORD expectedflags = 0; @@ -290,6 +297,356 @@ static void test_getprotobynumber(void) } } +struct service +{ + unsigned short port; + const char *names[2]; + const char *protos[2]; + enum { MISSING = 0x1, RENAMED = 0x2 } flags; +}; + +static const struct service services[] = +{ + { 7, {"echo"}, {"tcp", "udp"} }, + { 9, {"discard", "sink"}, {"tcp", "udp"} }, + { 11, {"systat", "users"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 13, {"daytime"}, {"tcp", "udp"} }, + { 17, {"qotd", "quote"}, {"tcp", "udp"} }, + { 19, {"chargen", "ttytst"}, {"tcp", "udp"} }, + { 20, {"ftp-data"}, {"tcp"} }, + { 21, {"ftp"}, {"tcp"} }, + { 22, {"ssh"}, {"tcp"}, MISSING /* xp */ }, + { 23, {"telnet"}, {"tcp"} }, + { 25, {"smtp", "mail"}, {"tcp"} }, + { 37, {"time", "timserver"}, {"tcp", "udp"} }, + { 39, {"rlp", "resource"}, {"udp"} }, + { 42, {"nameserver", "name"}, {"tcp", "udp"} }, + { 43, {"nicname", "whois"}, {"tcp"} }, + { 53, {"domain"}, {"tcp", "udp"} }, + { 67, {"bootps", "dhcps"}, {"udp"} }, + { 68, {"bootpc", "dhcpc"}, {"udp"} }, + { 69, {"tftp"}, {"udp"} }, + { 70, {"gopher"}, {"tcp"} }, + { 79, {"finger"}, {"tcp"} }, + { 80, {"http", "www"}, {"tcp"} }, + { 81, {"hosts2-ns"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 88, {"kerberos", "krb5"}, {"tcp", "udp"} }, + { 101, {"hostname", "hostnames"}, {"tcp"} }, + { 102, {"iso-tsap"}, {"tcp"} }, + { 107, {"rtelnet"}, {"tcp"} }, + { 109, {"pop2", "postoffice"}, {"tcp"} }, + { 110, {"pop3"}, {"tcp"} }, + { 111, {"sunrpc", "rpcbind"}, {"tcp", "udp"} }, + { 113, {"auth", "ident"}, {"tcp"} }, + { 117, {"uucp-path"}, {"tcp"} }, + { 118, {"sqlserv"}, {"tcp"}, MISSING /* xp */ }, + { 119, {"nntp", "usenet"}, {"tcp"} }, + { 123, {"ntp"}, {"udp"} }, + { 135, {"epmap", "loc-srv"}, {"tcp", "udp"} }, + { 137, {"netbios-ns", "nbname"}, {"tcp", "udp"} }, + { 138, {"netbios-dgm", "nbdatagram"}, {"udp"} }, + { 139, {"netbios-ssn", "nbsession"}, {"tcp"} }, + { 143, {"imap", "imap4"}, {"tcp"} }, + { 150, {"sql-net"}, {"tcp"}, MISSING /* xp */ }, + { 156, {"sqlsrv"}, {"tcp"}, MISSING /* xp */ }, + { 158, {"pcmail-srv"}, {"tcp"} }, + { 161, {"snmp"}, {"udp"} }, + { 162, {"snmptrap", "snmp-trap"}, {"udp"} }, + { 170, {"print-srv"}, {"tcp"} }, + { 179, {"bgp"}, {"tcp"} }, + { 194, {"irc"}, {"tcp"} }, + { 213, {"ipx"}, {"udp"} }, + { 322, {"rtsps"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 349, {"mftp"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 389, {"ldap"}, {"tcp"} }, + { 443, {"https", "MCom"}, {"tcp", "udp"} }, + { 445, {"microsoft-ds"}, {"tcp", "udp"} }, + { 464, {"kpasswd"}, {"tcp", "udp"} }, + { 500, {"isakmp", "ike"}, {"udp"} }, + { 507, {"crs"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 512, {"exec"}, {"tcp"} }, + { 512, {"biff", "comsat"}, {"udp", "tcp"}, MISSING /* win10 */ }, + { 513, {"login"}, {"tcp"} }, + { 513, {"who", "whod"}, {"udp", "tcp"}, MISSING /* win10 */ }, + { 514, {"cmd", "shell"}, {"tcp"} }, + { 514, {"syslog"}, {"udp", "tcp"}, MISSING /* win10 */ }, + { 515, {"printer", "spooler"}, {"tcp"} }, + { 517, {"talk"}, {"udp"} }, + { 518, {"ntalk"}, {"udp"} }, + { 520, {"efs"}, {"tcp"} }, + { 520, {"router", "route"}, {"udp", "tcp"}, MISSING /* win10 */ }, + { 522, {"ulp"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 525, {"timed", "timeserver"}, {"udp"} }, + { 526, {"tempo", "newdate"}, {"tcp"} }, + { 529, {"irc-serv"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 530, {"courier", "rpc"}, {"tcp"} }, + { 531, {"conference", "chat"}, {"tcp"} }, + { 532, {"netnews", "readnews"}, {"tcp"} }, + { 533, {"netwall"}, {"udp"} }, + { 540, {"uucp", "uucpd"}, {"tcp"} }, + { 543, {"klogin"}, {"tcp"} }, + { 544, {"kshell", "krcmd"}, {"tcp"} }, + { 546, {"dhcpv6-client"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 547, {"dhcpv6-server"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 548, {"afpovertcp"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 550, {"new-rwho", "new-who"}, {"udp"} }, + { 554, {"rtsp"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 556, {"remotefs", "rfs"}, {"tcp"} }, + { 560, {"rmonitor", "rmonitord"}, {"udp"} }, + { 561, {"monitor"}, {"udp"} }, + { 563, {"nntps", "snntp"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 565, {"whoami"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 568, {"ms-shuttle"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 569, {"ms-rome"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 593, {"http-rpc-epmap"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 612, {"hmmp-ind"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 613, {"hmmp-op"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 636, {"ldaps", "sldap"}, {"tcp"} }, + { 666, {"doom"}, {"tcp", "udp"} }, + { 691, {"msexch-routing"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 749, {"kerberos-adm"}, {"tcp", "udp"} }, + { 750, {"kerberos-iv"}, {"udp"} }, + { 800, {"mdbs_daemon"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 989, {"ftps-data"}, {"tcp"}, MISSING /* xp */ }, + { 990, {"ftps"}, {"tcp"}, MISSING /* xp */ }, + { 992, {"telnets"}, {"tcp"}, MISSING /* xp */ }, + { 993, {"imaps"}, {"tcp"}, MISSING /* xp */ }, + { 994, {"ircs"}, {"tcp"}, MISSING /* xp */ }, + { 995, {"pop3s", "spop3"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1034, {"activesync"}, {"tcp"}, MISSING /* xp */ }, + { 1109, {"kpop"}, {"tcp"} }, + { 1110, {"nfsd-status"}, {"tcp"}, MISSING /* xp */ }, + { 1110, {"nfsd-keepalive"}, {"udp"}, MISSING /* xp */ }, + { 1155, {"nfa"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1167, {"phone"}, {"udp"} }, + { 1270, {"opsmgr"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1433, {"ms-sql-s"}, {"tcp", "udp"} }, + { 1434, {"ms-sql-m"}, {"tcp", "udp"} }, + { 1477, {"ms-sna-server"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1478, {"ms-sna-base"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1512, {"wins"}, {"tcp", "udp"} }, + { 1524, {"ingreslock", "ingres"}, {"tcp"} }, + { 1607, {"stt"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1701, {"l2tp"}, {"udp"} }, + { 1711, {"pptconference"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1723, {"pptp"}, {"tcp"} }, + { 1731, {"msiccp"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1745, {"remote-winsock"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1755, {"ms-streaming"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1801, {"msmq"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1812, {"radius"}, {"udp"} }, + { 1813, {"radacct"}, {"udp"} }, + { 1863, {"msnp"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1900, {"ssdp"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 1944, {"close-combat"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2049, {"nfsd", "nfs"}, {"udp"} }, + { 2053, {"knetd"}, {"tcp"} }, + { 2106, {"mzap"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2177, {"qwave"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2234, {"directplay"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2382, {"ms-olap3"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2383, {"ms-olap4"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2393, {"ms-olap1"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2394, {"ms-olap2"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2460, {"ms-theater"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2504, {"wlbs"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2525, {"ms-v-worlds"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2701, {"sms-rcinfo"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2702, {"sms-xfer"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2703, {"sms-chat"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2704, {"sms-remctrl"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2725, {"msolap-ptp2"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 2869, {"icslap"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3020, {"cifs"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3074, {"xbox"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3126, {"ms-dotnetster"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3132, {"ms-rule-engine"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3268, {"msft-gc"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3269, {"msft-gc-ssl"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3343, {"ms-cluster-net"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3389, {"ms-wbt-server"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3535, {"ms-la"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3540, {"pnrp-port"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3544, {"teredo"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3587, {"p2pgroup"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3702, {"ws-discovery", "upnp-discovery"}, {"udp", "tcp"}, MISSING /* xp */ | RENAMED /* 2008 */ }, + { 3776, {"dvcprov-port"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 3847, {"msfw-control"}, {"tcp"}, MISSING /* xp */ }, + { 3882, {"msdts1"}, {"tcp"}, MISSING /* xp */ }, + { 3935, {"sdp-portmapper"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 4350, {"net-device"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 4500, {"ipsec-msft"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 5355, {"llmnr"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 5357, {"wsd"}, {"tcp"}, MISSING /* xp */ }, + { 5358, {"wsd"}, {"tcp"}, MISSING /* xp */ }, + { 5678, {"rrac"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 5679, {"dccm"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 5720, {"ms-licensing"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 6073, {"directplay8"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 9535, {"man"}, {"tcp"} }, + { 9753, {"rasadv"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 11320, {"imip-channels"}, {"tcp", "udp"}, MISSING /* xp */ }, + { 47624, {"directplaysrvr"}, {"tcp", "udp"}, MISSING /* xp */ }, +}; + +static const struct service *find_service(int port, const char *proto) +{ + int i, j; + for (i = 0; i < ARRAY_SIZE(services) && services[i].port <= port; i++) + { + if (services[i].port != port) continue; + for (j = 0; j < ARRAY_SIZE(services[0].protos) && services[i].protos[j]; j++) + { + if (!proto || _stricmp(proto, services[i].protos[j]) == 0) + return &services[i]; + } + } + return NULL; +} + +static DWORD WINAPI do_getservbyname(void *param) +{ + HANDLE *starttest = param; + int i, j, k, l; + struct servent *results[ARRAY_SIZE(services)]; + char all_caps_name[16]; + + if (starttest) + { + ok(WaitForSingleObject(*starttest, TEST_TIMEOUT * 1000) != WAIT_TIMEOUT, + "test_getservbyname: timeout waiting for start signal\n"); + } + + /* ensure that necessary buffer resizes are completed */ + for (i = 0; i < 2; i++) + results[i] = getservbyname(services[i].names[0], NULL); + + for (i = 0; i < (starttest ? NUM_QUERIES / 2 : 1); i++) + { + for (j = 0; j < (starttest ? 2 : ARRAY_SIZE(services)); j++) + { + if (j > 0 && strcmp(services[j].names[0], services[j-1].names[0]) == 0) continue; + for (k = 0; k < ARRAY_SIZE(services[0].names) && services[j].names[k]; k++) + { + for (l = 0; services[j].names[k][l]; l++) + all_caps_name[l] = toupper(services[j].names[k][l]); + all_caps_name[l] = 0; + for (l = 0; l < ARRAY_SIZE(services[0].protos); l++) + { + results[j] = getservbyname(services[j].names[k], services[j].protos[l]); + ok(results[j] != NULL || broken(services[j].flags & MISSING), + "getservbyname could not retrieve information for %s/%s: %d\n", + services[j].names[k], wine_dbgstr_a(services[j].protos[l]), WSAGetLastError()); + if (!results[j]) continue; + ok(ntohs(results[j]->s_port) == services[j].port, + "getservbyname returned the wrong port for %s/%s: %d\n", + services[j].names[k], wine_dbgstr_a(services[j].protos[l]), ntohs(results[j]->s_port)); + ok(!strcmp(results[j]->s_proto, services[j].protos[l] ? services[j].protos[l] : services[j].protos[0]), + "getservbyname returned the wrong protocol for %s/%s: %s\n", + services[j].names[k], wine_dbgstr_a(services[j].protos[l]), results[j]->s_proto); + ok(!strcmp(results[j]->s_name, services[j].names[0]) || + broken((services[j].flags & RENAMED) && !strcmp(results[j]->s_name, services[j].names[1])), + "getservbyname returned the wrong name for %s/%s: %s\n", + services[j].names[k], wine_dbgstr_a(services[j].protos[l]), results[j]->s_name); + + results[j] = getservbyname(all_caps_name, services[j].protos[l]); + ok(ntohs(results[j]->s_port) == services[j].port, + "getservbyname returned the wrong port for %s/%s: %d\n", + all_caps_name, wine_dbgstr_a(services[j].protos[l]), ntohs(results[j]->s_port)); + ok(!strcmp(results[j]->s_proto, services[j].protos[l] ? services[j].protos[l] : services[j].protos[0]), + "getservbyname returned the wrong protocol for %s/%s: %s\n", + all_caps_name, wine_dbgstr_a(services[j].protos[l]), results[j]->s_proto); + ok(!strcmp(results[j]->s_name, services[j].names[0]) || + broken((services[j].flags & RENAMED) && !strcmp(results[j]->s_name, services[j].names[1])), + "getservbyname returned the wrong name for %s/%s: %s\n", + all_caps_name, wine_dbgstr_a(services[j].protos[l]), results[j]->s_name); + } + } + } + ok(results[0] == results[1], + "getservbyname: winsock resized servent buffer when not necessary\n"); + } + + return 0; +} + +static void test_getservbyname(void) +{ + int i; + HANDLE starttest, thread[NUM_THREADS]; + DWORD thread_id[NUM_THREADS]; + + /* test the complete list of service entries */ + do_getservbyname(NULL); + + /* test thread safety using just the first two service entries */ + starttest = CreateEventA(NULL, 1, 0, "test_getservbyname_starttest"); + + /* create threads */ + for (i = 0; i < NUM_THREADS; i++) + thread[i] = CreateThread(NULL, 0, do_getservbyname, &starttest, 0, &thread_id[i]); + + /* signal threads to start */ + SetEvent(starttest); + + for (i = 0; i < NUM_THREADS; i++) + WaitForSingleObject(thread[i], TEST_TIMEOUT * 1000); +} + +static void test_getservbyport(void) +{ + static const char *test_protos[] = { NULL, "tcp", "udp", "icmp", "Tcp", "udP" }; + struct servent *ent; + const struct service *ref; + int i, j; + + /* Testing all port/protocol combinations takes a very long time on Windows. To avoid timeouts, + * don't test the private port range and skip the tests for specific protocols if there is no + * defined service on a particular port for any protocol. */ + for (i = 0; i <= PRIVATE_PORT_START; i++) + { + for (j = 0; j < ARRAY_SIZE(test_protos); j++) + { + ent = getservbyport(htons(i), test_protos[j]); + ref = find_service(i, test_protos[j]); + + if (!ref) + { + ok(!ent, "Expected service %d/%s to be undefined, got %s\n", + i, wine_dbgstr_a(test_protos[j]), wine_dbgstr_a(ent ? ent->s_name : NULL)); + if (!ent && j == 0) break; + continue; + } + + ok((ent && ent->s_name && strcmp(ent->s_name, ref->names[0]) == 0) || + broken((ref->flags & MISSING) && !ent) || + broken((ref->flags & RENAMED) && ent && ent->s_name && strcmp(ent->s_name, ref->names[1]) == 0), + "Expected service %d/%s to be %s, got %s\n", + i, wine_dbgstr_a(test_protos[j]), wine_dbgstr_a(ref->names[0]), + wine_dbgstr_a(ent ? ent->s_name : NULL)); + + if (ref->names[1]) + { + ok((ent && ent->s_aliases && ent->s_aliases[0] && + strcmp(ent->s_aliases[0], ref->names[1]) == 0) || + broken((ref->flags & MISSING) && !ent) || + broken((ref->flags & RENAMED) && ent && ent->s_aliases && !ent->s_aliases[0]), + "Expected service %d/%s alias 0 to be %s, got %s\n", + i, wine_dbgstr_a(test_protos[j]), wine_dbgstr_a(ref->names[1]), + wine_dbgstr_a(ent && ent->s_aliases ? ent->s_aliases[0] : NULL)); + } + else + { + ok((ent && ent->s_aliases && !ent->s_aliases[0]) || + broken((ref->flags & MISSING) && !ent), + "Expected service %d/%s alias 0 to be undefined, got %s\n", + i, wine_dbgstr_a(test_protos[j]), + wine_dbgstr_a(ent && ent->s_aliases ? ent->s_aliases[0] : NULL)); + } + } + } +} + START_TEST( protocol ) { WSADATA data; @@ -301,4 +658,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsW(); test_getprotobyname(); test_getprotobynumber(); + test_getservbyname(); + test_getservbyport(); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b7a3fc4453..511fbf5f1d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -45,9 +45,6 @@ #define NUM_UDP_PEERS 3 /* Number of UDP sockets to create and test > 1 */ -#define NUM_THREADS 3 /* Number of threads to run getservbyname */ -#define NUM_QUERIES 250 /* Number of getservbyname queries per thread */ - #define SERVERIP "127.0.0.1" /* IP to bind to */ #define SERVERPORT 9374 /* Port number to bind to */ @@ -2401,68 +2398,6 @@ static void test_UDP(void) } } -static DWORD WINAPI do_getservbyname( void *param ) -{ - struct { - const char *name; - const char *proto; - int port; - } serv[2] = { {"domain", "udp", 53}, {"telnet", "tcp", 23} }; - - HANDLE *starttest = param; - int i, j; - struct servent *pserv[2]; - - ok ( WaitForSingleObject ( *starttest, TEST_TIMEOUT * 1000 ) != WAIT_TIMEOUT, - "test_getservbyname: timeout waiting for start signal\n" ); - - /* ensure that necessary buffer resizes are completed */ - for ( j = 0; j < 2; j++) { - pserv[j] = getservbyname ( serv[j].name, serv[j].proto ); - } - - for ( i = 0; i < NUM_QUERIES / 2; i++ ) { - for ( j = 0; j < 2; j++ ) { - pserv[j] = getservbyname ( serv[j].name, serv[j].proto ); - ok ( pserv[j] != NULL || broken(pserv[j] == NULL) /* win8, fixed in win81 */, - "getservbyname could not retrieve information for %s: %d\n", serv[j].name, WSAGetLastError() ); - if ( !pserv[j] ) continue; - ok ( pserv[j]->s_port == htons(serv[j].port), - "getservbyname returned the wrong port for %s: %d\n", serv[j].name, ntohs(pserv[j]->s_port) ); - ok ( !strcmp ( pserv[j]->s_proto, serv[j].proto ), - "getservbyname returned the wrong protocol for %s: %s\n", serv[j].name, pserv[j]->s_proto ); - ok ( !strcmp ( pserv[j]->s_name, serv[j].name ), - "getservbyname returned the wrong name for %s: %s\n", serv[j].name, pserv[j]->s_name ); - } - - ok ( pserv[0] == pserv[1] || broken(pserv[0] != pserv[1]) /* win8, fixed in win81 */, - "getservbyname: winsock resized servent buffer when not necessary\n" ); - } - - return 0; -} - -static void test_getservbyname(void) -{ - int i; - HANDLE starttest, thread[NUM_THREADS]; - DWORD thread_id[NUM_THREADS]; - - starttest = CreateEventA ( NULL, 1, 0, "test_getservbyname_starttest" ); - - /* create threads */ - for ( i = 0; i < NUM_THREADS; i++ ) { - thread[i] = CreateThread ( NULL, 0, do_getservbyname, &starttest, 0, &thread_id[i] ); - } - - /* signal threads to start */ - SetEvent ( starttest ); - - for ( i = 0; i < NUM_THREADS; i++) { - WaitForSingleObject ( thread[i], TEST_TIMEOUT * 1000 ); - } -} - static void test_WSASocket(void) { SOCKET sock = INVALID_SOCKET; @@ -11374,7 +11309,6 @@ START_TEST( sock ) test_UDP(); - test_getservbyname(); test_WSASocket(); test_WSADuplicateSocket(); test_WSAEnumNetworkEvents(); -- 2.27.0

1 0

[PATCH] quartz/tests: Fix a test in test_basic_video().
by Zebediah Figura 01 Aug '20

01 Aug '20

Fixes: 8725564f68332c9129ca701de9b85799a00ddebf Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 9e6a618a36e..c2b6271021a 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2733,6 +2733,7 @@ static void test_basic_video(void) vih.bmiHeader.biWidth = 16; vih.bmiHeader.biHeight = 16; + vih.bmiHeader.biSizeImage = 0; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.27.0

1 0

[RFC PATCH] dxva2: Stub out DXVA-HD API.
by Jeff Smith 31 Jul '20

31 Jul '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/dxva2/Makefile.in | 3 +- dlls/dxva2/dxva2.spec | 1 + dlls/dxva2/dxvahd.c | 465 ++++++++++++++++++++++++++++++++++ dlls/dxva2/tests/Makefile.in | 3 +- dlls/dxva2/tests/dxvahd.c | 293 ++++++++++++++++++++++ include/Makefile.in | 1 + include/dxvahd.idl | 473 +++++++++++++++++++++++++++++++++++ 7 files changed, 1237 insertions(+), 2 deletions(-) create mode 100644 dlls/dxva2/dxvahd.c create mode 100644 dlls/dxva2/tests/dxvahd.c create mode 100644 include/dxvahd.idl diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index e3fc2fd6c3a..0248c7f20b0 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -5,4 +5,5 @@ IMPORTLIB = dxva2 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c + main.c \ + dxvahd.c diff --git a/dlls/dxva2/dxva2.spec b/dlls/dxva2/dxva2.spec index 024a972697d..ea7a98718b0 100644 --- a/dlls/dxva2/dxva2.spec +++ b/dlls/dxva2/dxva2.spec @@ -1,6 +1,7 @@ @ stdcall CapabilitiesRequestAndCapabilitiesReply(ptr ptr long) @ stdcall DXVA2CreateDirect3DDeviceManager9(ptr ptr) @ stdcall DXVA2CreateVideoService(ptr ptr ptr) +@ stdcall DXVAHD_CreateDevice(ptr ptr long ptr ptr) @ stdcall DegaussMonitor(ptr) @ stdcall DestroyPhysicalMonitor(ptr) @ stdcall DestroyPhysicalMonitors(long ptr) diff --git a/dlls/dxva2/dxvahd.c b/dlls/dxva2/dxvahd.c new file mode 100644 index 00000000000..7c197b9a2f8 --- /dev/null +++ b/dlls/dxva2/dxvahd.c @@ -0,0 +1,465 @@ +#define COBJMACROS + +#include "d3d9.h" +#include "initguid.h" +#include "dxvahd.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxva2); + + +static const D3DFORMAT output_formats[] = { + D3DFMT_R8G8B8 +}; + +static const D3DFORMAT input_formats[] = { + MAKEFOURCC('N','V','1','2') +}; + +static const DXVAHD_VPCAPS video_processors[] = { + {{0x00000000,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}, 0, 0, 0, 0, 0} +}; + +static const DXVAHD_VPDEVCAPS dev_caps = { + DXVAHD_DEVICE_TYPE_HARDWARE, + 0, /* DeviceCaps */ + 0, /* FeatureCaps */ + 0, /* FilterCaps */ + 0, /* InputFormatCaps */ + D3DPOOL_DEFAULT, + ARRAY_SIZE(output_formats), + ARRAY_SIZE(input_formats), + ARRAY_SIZE(video_processors), + 1, /* MaxInputStreams */ + 1 /* MaxStreamStates */ +}; + + +struct dxvahd_device +{ + IDXVAHD_Device IDXVAHD_Device_iface; + LONG refcount; + IDirect3DDevice9Ex *d3d_device; +}; + +struct dxvahd_vp +{ + IDXVAHD_VideoProcessor IDXVAHD_VideoProcessor_iface; + LONG refcount; + GUID guid; +}; + + +/******************************************** + * Utility functions + */ + +static struct dxvahd_device *impl_from_IDXVAHD_Device(IDXVAHD_Device *iface) +{ + return CONTAINING_RECORD(iface, struct dxvahd_device, IDXVAHD_Device_iface); +} + +static struct dxvahd_vp *impl_from_IDXVAHD_VideoProcessor(IDXVAHD_VideoProcessor *iface) +{ + return CONTAINING_RECORD(iface, struct dxvahd_vp, IDXVAHD_VideoProcessor_iface); +} + +static const char *debug_dxvahd_bltstate(DXVAHD_BLT_STATE blt_state) +{ + switch (blt_state) + { +#define STATE_TO_STR(e) case e: return #e + STATE_TO_STR(DXVAHD_BLT_STATE_TARGET_RECT); + STATE_TO_STR(DXVAHD_BLT_STATE_BACKGROUND_COLOR); + STATE_TO_STR(DXVAHD_BLT_STATE_OUTPUT_COLOR_SPACE); + STATE_TO_STR(DXVAHD_BLT_STATE_ALPHA_FILL); + STATE_TO_STR(DXVAHD_BLT_STATE_CONSTRICTION); + STATE_TO_STR(DXVAHD_BLT_STATE_PRIVATE); +#undef STATE_TO_STR + default: + FIXME("Unrecognized blt state %#x.\n", blt_state); + return "unrecognized"; + } +} + +static const char *debug_dxvahd_streamstate(DXVAHD_STREAM_STATE stream_state) +{ + switch (stream_state) + { +#define STATE_TO_STR(e) case e: return #e + STATE_TO_STR(DXVAHD_STREAM_STATE_D3DFORMAT); + STATE_TO_STR(DXVAHD_STREAM_STATE_FRAME_FORMAT); + STATE_TO_STR(DXVAHD_STREAM_STATE_INPUT_COLOR_SPACE); + STATE_TO_STR(DXVAHD_STREAM_STATE_OUTPUT_RATE); + STATE_TO_STR(DXVAHD_STREAM_STATE_SOURCE_RECT); + STATE_TO_STR(DXVAHD_STREAM_STATE_DESTINATION_RECT); + STATE_TO_STR(DXVAHD_STREAM_STATE_ALPHA); + STATE_TO_STR(DXVAHD_STREAM_STATE_PALETTE); + STATE_TO_STR(DXVAHD_STREAM_STATE_LUMA_KEY); + STATE_TO_STR(DXVAHD_STREAM_STATE_ASPECT_RATIO); + STATE_TO_STR(DXVAHD_STREAM_STATE_FILTER_BRIGHTNESS); + STATE_TO_STR(DXVAHD_STREAM_STATE_FILTER_CONTRAST); + STATE_TO_STR(DXVAHD_STREAM_STATE_FILTER_HUE); + STATE_TO_STR(DXVAHD_STREAM_STATE_FILTER_SATURATION); + STATE_TO_STR(DXVAHD_STREAM_STATE_FILTER_NOISE_REDUCTION); + STATE_TO_STR(DXVAHD_STREAM_STATE_FILTER_EDGE_ENHANCEMENT); + STATE_TO_STR(DXVAHD_STREAM_STATE_FILTER_ANAMORPHIC_SCALING); + STATE_TO_STR(DXVAHD_STREAM_STATE_PRIVATE); +#undef STATE_TO_STR + default: + FIXME("Unrecognized stream state %#x.\n", stream_state); + return "unrecognized"; + } +} + +static const char *debug_dxvahd_surface_type(DXVAHD_SURFACE_TYPE surface_type) +{ + switch (surface_type) + { +#define SURFACE_TYPE_TO_STR(e) case e: return #e + SURFACE_TYPE_TO_STR(DXVAHD_SURFACE_TYPE_VIDEO_INPUT); + SURFACE_TYPE_TO_STR(DXVAHD_SURFACE_TYPE_VIDEO_INPUT_PRIVATE); + SURFACE_TYPE_TO_STR(DXVAHD_SURFACE_TYPE_VIDEO_OUTPUT); +#undef SURFACE_TYPE_TO_STR + default: + FIXME("Unrecognized surface type %#x.\n", surface_type); + return "unrecognized"; + } +} + +static const char *debug_dxvahd_filter(DXVAHD_FILTER filter) +{ + switch (filter) + { +#define FILTER_TO_STR(e) case e: return #e + FILTER_TO_STR(DXVAHD_FILTER_BRIGHTNESS); + FILTER_TO_STR(DXVAHD_FILTER_CONTRAST); + FILTER_TO_STR(DXVAHD_FILTER_HUE); + FILTER_TO_STR(DXVAHD_FILTER_SATURATION); + FILTER_TO_STR(DXVAHD_FILTER_NOISE_REDUCTION); + FILTER_TO_STR(DXVAHD_FILTER_EDGE_ENHANCEMENT); + FILTER_TO_STR(DXVAHD_FILTER_ANAMORPHIC_SCALING); +#undef FILTER_TO_STR + default: + FIXME("Unrecognized surface type %#x.\n", filter); + return "unrecognized"; + } +} + +static const char *debug_dxvahd_device_usage(DXVAHD_DEVICE_USAGE usage) +{ + switch (usage) + { +#define USAGE_TO_STR(e) case e: return #e + USAGE_TO_STR(DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL); + USAGE_TO_STR(DXVAHD_DEVICE_USAGE_OPTIMAL_SPEED); + USAGE_TO_STR(DXVAHD_DEVICE_USAGE_OPTIMAL_QUALITY); +#undef USAGE_TO_STR + default: + FIXME("Unrecognized device usage %#x.\n", usage); + return "unrecognized"; + } +} + + +/******************************************** + * IDXVAHD_VideoProcessor functions + */ + +static HRESULT WINAPI dxvahd_vp_QueryInterface(IDXVAHD_VideoProcessor *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dxvahd_vp_AddRef(IDXVAHD_VideoProcessor *iface) +{ + struct dxvahd_vp *processor = impl_from_IDXVAHD_VideoProcessor(iface); + ULONG refcount = InterlockedIncrement(&processor->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI dxvahd_vp_Release(IDXVAHD_VideoProcessor *iface) +{ + struct dxvahd_vp *processor = impl_from_IDXVAHD_VideoProcessor(iface); + ULONG refcount = InterlockedDecrement(&processor->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(processor); + } + + return refcount; +} + +static HRESULT WINAPI dxvahd_vp_SetVideoProcessBltState(IDXVAHD_VideoProcessor *iface, + DXVAHD_BLT_STATE State, UINT DataSize, const void *pData) +{ + FIXME("%p, %s, %u, %p.\n", iface, debug_dxvahd_bltstate(State), DataSize, pData); + return S_OK; +} + +static HRESULT WINAPI dxvahd_vp_GetVideoProcessBltState(IDXVAHD_VideoProcessor *iface, + DXVAHD_BLT_STATE State, UINT DataSize, void *pData) +{ + FIXME("%p, %s, %u, %p.\n", iface, debug_dxvahd_bltstate(State), DataSize, pData); + return S_OK; +} + +static HRESULT WINAPI dxvahd_vp_SetVideoProcessStreamState(IDXVAHD_VideoProcessor *iface, + UINT StreamNumber, DXVAHD_STREAM_STATE State, UINT DataSize, const void *pData) +{ + FIXME("%p, %u, %s, %u, %p.\n", iface, StreamNumber, debug_dxvahd_streamstate(State), DataSize, pData); + return S_OK; +} + +static HRESULT WINAPI dxvahd_vp_GetVideoProcessStreamState(IDXVAHD_VideoProcessor *iface, + UINT StreamNumber, DXVAHD_STREAM_STATE State, UINT DataSize, void *pData) +{ + FIXME("%p, %u, %s, %u, %p.\n", iface, StreamNumber, debug_dxvahd_streamstate(State), DataSize, pData); + return S_OK; +} + +static HRESULT WINAPI dxvahd_vp_VideoProcessBltHD(IDXVAHD_VideoProcessor *iface, + IDirect3DSurface9 *pOutputSurface, UINT OutputFrame, UINT StreamCount, + const DXVAHD_STREAM_DATA *pStreams) +{ + UINT i; + + FIXME("%p, %p, %u, %u, %p.\n", iface, pOutputSurface, OutputFrame, StreamCount, pStreams); + + for (i = 0; i < StreamCount; i++) + { + TRACE("stream[%d]: %d %u %u %u %u %p %p %p\n", i, pStreams[i].Enable, pStreams[i].OutputIndex, + pStreams[i].InputFrameOrField, pStreams[i].PastFrames, pStreams[i].FutureFrames, + pStreams[i].ppPastSurfaces, pStreams[i].pInputSurface, pStreams[i].ppFutureSurfaces); + } + + return S_OK; +} + +static const IDXVAHD_VideoProcessorVtbl dxvahd_vp_vtbl = +{ + dxvahd_vp_QueryInterface, + dxvahd_vp_AddRef, + dxvahd_vp_Release, + dxvahd_vp_SetVideoProcessBltState, + dxvahd_vp_GetVideoProcessBltState, + dxvahd_vp_SetVideoProcessStreamState, + dxvahd_vp_GetVideoProcessStreamState, + dxvahd_vp_VideoProcessBltHD, +}; + + +/******************************************** + * IDXVAHD_Device functions + */ + +static HRESULT WINAPI dxvahd_device_QueryInterface(IDXVAHD_Device *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dxvahd_device_AddRef(IDXVAHD_Device *iface) +{ + struct dxvahd_device *dev = impl_from_IDXVAHD_Device(iface); + ULONG refcount = InterlockedIncrement(&dev->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI dxvahd_device_Release(IDXVAHD_Device *iface) +{ + struct dxvahd_device *dev = impl_from_IDXVAHD_Device(iface); + ULONG refcount = InterlockedDecrement(&dev->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(dev); + } + + return refcount; +} + +static HRESULT WINAPI dxvahd_device_CreateVideoSurface(IDXVAHD_Device *iface, UINT width, UINT height, + D3DFORMAT format, D3DPOOL pool, DWORD usage, DXVAHD_SURFACE_TYPE type, UINT num_surfaces, + IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle) +{ + struct dxvahd_device *dev = impl_from_IDXVAHD_Device(iface); + UINT i; + + FIXME("%p, %u, %u, %#x, %#x, %#x, %s, %u, %p, %p.\n", iface, width, height, format, pool, usage, + debug_dxvahd_surface_type(type), num_surfaces, ppSurface, pSharedHandle); + + if (pool != dev_caps.InputPool || num_surfaces < 1) + return E_INVALIDARG; + + // FIXME: Return error result (D3DERR_INVALIDCALL or E_INVALIDARG) on invalid format. + // The formats returned by GetVideoProcessor[Input|Output]Formats functions + // may not comprise the entire set of valid formats. + + for (i = 0; i < num_surfaces; i++) + { + // TODO: Determine if CreateOffscreenPlainSurface is sufficient to the task, + // or if a separate implementation of IDirect3DSurface9 is warranted. + IDirect3DDevice9Ex_CreateOffscreenPlainSurface(dev->d3d_device, width, height, format, pool, + ppSurface + i, pSharedHandle); + TRACE("Created surface %d: %p.\n", i, ppSurface[i]); + } + + return S_OK; +} + +static HRESULT WINAPI dxvahd_device_GetVideoProcessorDeviceCaps(IDXVAHD_Device *iface, + DXVAHD_VPDEVCAPS *pCaps) +{ + FIXME("%p, %p.\n", iface, pCaps); + + // TODO: use driver D3DDDICAPS_DXVAHD_GETVPDEVCAPS + + memcpy(pCaps, &dev_caps, sizeof(dev_caps)); + + return S_OK; +} + +static HRESULT WINAPI dxvahd_device_GetVideoProcessorOutputFormats(IDXVAHD_Device *iface, UINT count, + D3DFORMAT *pFormats) +{ + FIXME("%p, %u, %p.\n", iface, count, pFormats); + + // TODO: use driver D3DDDICAPS_DXVAHD_GETVPOUTPUTFORMATS + + if (count != dev_caps.OutputFormatCount) + return E_INVALIDARG; + memcpy(pFormats, output_formats, sizeof(output_formats)); + + return S_OK; +} + +static HRESULT WINAPI dxvahd_device_GetVideoProcessorInputFormats(IDXVAHD_Device *iface, UINT count, + D3DFORMAT *pFormats) +{ + FIXME("%p, %u, %p.\n", iface, count, pFormats); + + // TODO: use driver D3DDDICAPS_DXVAHD_GETVPINPUTFORMATS + + if (count != dev_caps.InputFormatCount) + return E_INVALIDARG; + memcpy(pFormats, input_formats, sizeof(input_formats)); + + return S_OK; +} + +static HRESULT WINAPI dxvahd_device_GetVideoProcessorCaps(IDXVAHD_Device *iface, UINT count, + DXVAHD_VPCAPS *pCaps) +{ + FIXME("%p, %u, %p.\n", iface, count, pCaps); + + // TODO: use driver D3DDDICAPS_DXVAHD_GETVPCAPS + + if (count != dev_caps.VideoProcessorCount) + return E_INVALIDARG; + memcpy(pCaps, video_processors, sizeof(video_processors)); + + return S_OK; +} + +static HRESULT WINAPI dxvahd_device_GetVideoProcessorCustomRates(IDXVAHD_Device *iface, + const GUID *pVPGuid, UINT count, DXVAHD_CUSTOM_RATE_DATA *pRates) +{ + FIXME("%p, %s, %u, %p.\n", iface, debugstr_guid(pVPGuid), count, pRates); + + // TODO: use driver D3DDDICAPS_DXVAHD_GETVPCUSTOMRATES + + return (!!count) ? E_INVALIDARG : S_OK; +} + +static HRESULT WINAPI dxvahd_device_GetVideoProcessorFilterRange(IDXVAHD_Device *iface, + DXVAHD_FILTER filter, DXVAHD_FILTER_RANGE_DATA *pRange) +{ + FIXME("%p, %s, %p.\n", iface, debug_dxvahd_filter(filter), pRange); + + // TODO: use driver D3DDDICAPS_DXVAHD_GETVPFILTERRANGE + + return E_INVALIDARG; +} + +static HRESULT WINAPI dxvahd_device_CreateVideoProcessor(IDXVAHD_Device *iface, const GUID *pVPGuid, + IDXVAHD_VideoProcessor **ppVideoProcessor) +{ + struct dxvahd_vp *object; + + FIXME("%p, %s, %p.\n", iface, debugstr_guid(pVPGuid), ppVideoProcessor); + + // TODO: use driver function CreateVideoProcessor + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IDXVAHD_VideoProcessor_iface.lpVtbl = &dxvahd_vp_vtbl; + object->refcount = 1; + memcpy(&object->guid, pVPGuid, sizeof(*pVPGuid)); + + *ppVideoProcessor = &object->IDXVAHD_VideoProcessor_iface; + + return S_OK; +} + +static const IDXVAHD_DeviceVtbl dxvahd_device_vtbl = +{ + dxvahd_device_QueryInterface, + dxvahd_device_AddRef, + dxvahd_device_Release, + dxvahd_device_CreateVideoSurface, + dxvahd_device_GetVideoProcessorDeviceCaps, + dxvahd_device_GetVideoProcessorOutputFormats, + dxvahd_device_GetVideoProcessorInputFormats, + dxvahd_device_GetVideoProcessorCaps, + dxvahd_device_GetVideoProcessorCustomRates, + dxvahd_device_GetVideoProcessorFilterRange, + dxvahd_device_CreateVideoProcessor, +}; + + +HRESULT WINAPI DXVAHD_CreateDevice(IDirect3DDevice9Ex *d3d_device, const DXVAHD_CONTENT_DESC *desc, + DXVAHD_DEVICE_USAGE usage, PDXVAHDSW_Plugin plugin, IDXVAHD_Device **device) +{ + struct dxvahd_device *object; + + TRACE("%p, %p, %s, %p, %p.\n", d3d_device, desc, debug_dxvahd_device_usage(usage), plugin, device); + + TRACE("Frame Format %d Input %ux%u @%.2f Output %ux%u @%.2f\n", + desc->InputFrameFormat, desc->InputWidth, desc->InputHeight, + (double)desc->InputFrameRate.Numerator / desc->InputFrameRate.Denominator, + desc->OutputWidth, desc->OutputHeight, + (double)desc->OutputFrameRate.Numerator / desc->OutputFrameRate.Denominator); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IDXVAHD_Device_iface.lpVtbl = &dxvahd_device_vtbl; + object->refcount = 1; + object->d3d_device = d3d_device; + + *device = &object->IDXVAHD_Device_iface; + + return S_OK; +} diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in index c86c5ab42fc..b5d70cd94f7 100644 --- a/dlls/dxva2/tests/Makefile.in +++ b/dlls/dxva2/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = dxva2.dll IMPORTS = dxva2 user32 d3d9 C_SRCS = \ - dxva2.c + dxva2.c \ + dxvahd.c diff --git a/dlls/dxva2/tests/dxvahd.c b/dlls/dxva2/tests/dxvahd.c new file mode 100644 index 00000000000..e67350dfdb7 --- /dev/null +++ b/dlls/dxva2/tests/dxvahd.c @@ -0,0 +1,293 @@ +/* + * Copyright 2020 Jeff Smith + * + * 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 "initguid.h" +#include "d3d9.h" +#include "dxvahd.h" + +#include "wine/test.h" +#include "wine/heap.h" + +IDirect3DDevice9Ex *d3d_device; + +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 IDirect3DDevice9Ex *create_device(IDirect3D9Ex *d3d9, HWND focus_window) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9Ex *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; + + IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, NULL, &device); + + return device; +} + +static void init_desc(DXVAHD_CONTENT_DESC *desc) +{ + desc->InputFrameFormat = DXVAHD_FRAME_FORMAT_PROGRESSIVE; + desc->InputFrameRate.Numerator = 30; + desc->InputFrameRate.Denominator = 1; + desc->InputWidth = 640; + desc->InputHeight = 480; + desc->OutputFrameRate.Numerator = 30; + desc->OutputFrameRate.Denominator = 1; + desc->OutputWidth = 640; + desc->OutputHeight = 480; +} + +static void test_dxvahd_device(void) +{ + IDXVAHD_Device *device, *device2; + IDirect3DSurface9 *surfaces[2]; + HRESULT hr; + DXVAHD_CONTENT_DESC desc = {0}; + DXVAHD_VPDEVCAPS caps = {0}; + D3DFORMAT *input_formats; + D3DFORMAT *output_formats; + DXVAHD_VPCAPS *vp_caps; + int i; + + init_desc(&desc); + hr = DXVAHD_CreateDevice(d3d_device, &desc, DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL, NULL, &device); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!device, "Failed to create DXVA-HD device.\n"); + + hr = IDXVAHD_Device_QueryInterface(device, &IID_IDXVAHD_Device, (void **)&device2); + ok(hr == E_NOINTERFACE, "IDXVAHD_Device::QueryInterface for IID_IDXVAHD_Device returned %08x, expected E_NOINTERFACE\n", hr); + ok(device2 == NULL, "QueryInterface returned interface %p, expected NULL\n", device2); + + hr = IDXVAHD_Device_QueryInterface(device, &IID_IUnknown, (void **)&device2); + ok(hr == E_NOINTERFACE, "IDXVAHD_Device::QueryInterface for IID_IUnknown returned %08x, expected E_NOINTERFACE\n", hr); + ok(device2 == NULL, "QueryInterface returned interface %p, expected NULL\n", device2); + + + hr = IDXVAHD_Device_GetVideoProcessorDeviceCaps(device, &caps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + output_formats = heap_alloc_zero(caps.OutputFormatCount * sizeof(*output_formats)); + hr = IDXVAHD_Device_GetVideoProcessorOutputFormats(device, caps.OutputFormatCount, output_formats); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDXVAHD_Device_GetVideoProcessorOutputFormats(device, caps.OutputFormatCount + 1, output_formats); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + if (caps.OutputFormatCount >= 1) + { + hr = IDXVAHD_Device_GetVideoProcessorOutputFormats(device, caps.OutputFormatCount - 1, output_formats); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + } + + input_formats = heap_alloc_zero(caps.InputFormatCount * sizeof(*input_formats)); + hr = IDXVAHD_Device_GetVideoProcessorInputFormats(device, caps.InputFormatCount, input_formats); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDXVAHD_Device_GetVideoProcessorInputFormats(device, caps.InputFormatCount + 1, input_formats); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + if (caps.InputFormatCount >= 1) + { + hr = IDXVAHD_Device_GetVideoProcessorInputFormats(device, caps.InputFormatCount - 1, input_formats); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + } + + vp_caps = heap_alloc_zero(caps.VideoProcessorCount * sizeof(*vp_caps)); + hr = IDXVAHD_Device_GetVideoProcessorCaps(device, caps.VideoProcessorCount, vp_caps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDXVAHD_Device_GetVideoProcessorCaps(device, caps.VideoProcessorCount + 1, vp_caps); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + if (caps.VideoProcessorCount >= 1) + { + hr = IDXVAHD_Device_GetVideoProcessorCaps(device, caps.VideoProcessorCount - 1, vp_caps); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + } + + + /* CreateVideoSurface: Try each input format */ + for (i = 0; i < caps.InputFormatCount; i++) + { + hr = IDXVAHD_Device_CreateVideoSurface(device, 2, 2, input_formats[i], caps.InputPool, 0, + DXVAHD_SURFACE_TYPE_VIDEO_INPUT, 1, surfaces, NULL); + ok(hr == S_OK, "Unexpected hr %#x for input format %#x.\n", hr, input_formats[i]); + IDirect3DSurface9_Release(surfaces[0]); + } + + /* NOTE: some video surface formats besides those returned by + * GetVideoProcessor[Input|Output]Formats may be allowed by CreateVideoSurface. */ + + /* CreateVideoSurface: Invalid input format */ + hr = IDXVAHD_Device_CreateVideoSurface(device, 2, 2, 0xdeadbeef, caps.InputPool, 0, + DXVAHD_SURFACE_TYPE_VIDEO_INPUT, 1, surfaces, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x for input format %#x.\n", hr, 0xdeadbeef); + + if (caps.InputFormatCount >= 1) + { + /* CreateVideoSurface: Request 0 surfaces */ + hr = IDXVAHD_Device_CreateVideoSurface(device, 2, 2, input_formats[0], caps.InputPool, 0, + DXVAHD_SURFACE_TYPE_VIDEO_INPUT, 0, surfaces, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* CreateVideoSurface: Wrong pool */ + hr = IDXVAHD_Device_CreateVideoSurface(device, 2, 2, input_formats[0], caps.InputPool + 1, 0, + DXVAHD_SURFACE_TYPE_VIDEO_INPUT, 1, surfaces, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + } + + + heap_free(output_formats); + heap_free(input_formats); + heap_free(vp_caps); + IDXVAHD_Device_Release(device); +} + +static void test_dxvahd_processor(void) +{ + IDXVAHD_Device *device; + DXVAHD_CONTENT_DESC desc = {0}; + DXVAHD_VPDEVCAPS caps = {0}; + D3DFORMAT *input_formats; + DXVAHD_VPCAPS *vp_caps; + IDXVAHD_VideoProcessor *processor; + void *data = heap_alloc_zero(64); + HRESULT hr; + int i; + + static struct { + DXVAHD_BLT_STATE state; + ULONG size; + } test_blt[] = { + {DXVAHD_BLT_STATE_TARGET_RECT, sizeof(DXVAHD_BLT_STATE_TARGET_RECT_DATA)}, + {DXVAHD_BLT_STATE_BACKGROUND_COLOR, sizeof(DXVAHD_BLT_STATE_BACKGROUND_COLOR_DATA)}, + {DXVAHD_BLT_STATE_OUTPUT_COLOR_SPACE, sizeof(DXVAHD_BLT_STATE_OUTPUT_COLOR_SPACE_DATA)}, + {DXVAHD_BLT_STATE_ALPHA_FILL, sizeof(DXVAHD_BLT_STATE_ALPHA_FILL_DATA)}, + {DXVAHD_BLT_STATE_CONSTRICTION, sizeof(DXVAHD_BLT_STATE_CONSTRICTION_DATA)}, + }; + + static struct { + DXVAHD_STREAM_STATE state; + ULONG size; + } test_stream[] = { + {DXVAHD_STREAM_STATE_D3DFORMAT, sizeof(DXVAHD_STREAM_STATE_D3DFORMAT_DATA)}, + {DXVAHD_STREAM_STATE_FRAME_FORMAT, sizeof(DXVAHD_STREAM_STATE_FRAME_FORMAT_DATA)}, + {DXVAHD_STREAM_STATE_INPUT_COLOR_SPACE, sizeof(DXVAHD_STREAM_STATE_INPUT_COLOR_SPACE_DATA)}, + {DXVAHD_STREAM_STATE_OUTPUT_RATE, sizeof(DXVAHD_STREAM_STATE_OUTPUT_RATE_DATA)}, + {DXVAHD_STREAM_STATE_SOURCE_RECT, sizeof(DXVAHD_STREAM_STATE_SOURCE_RECT_DATA)}, + {DXVAHD_STREAM_STATE_DESTINATION_RECT, sizeof(DXVAHD_STREAM_STATE_DESTINATION_RECT_DATA)}, + {DXVAHD_STREAM_STATE_ALPHA, sizeof(DXVAHD_STREAM_STATE_ALPHA_DATA)}, + {DXVAHD_STREAM_STATE_PALETTE, sizeof(DXVAHD_STREAM_STATE_PALETTE_DATA)}, + {DXVAHD_STREAM_STATE_LUMA_KEY, sizeof(DXVAHD_STREAM_STATE_LUMA_KEY_DATA)}, + {DXVAHD_STREAM_STATE_ASPECT_RATIO, sizeof(DXVAHD_STREAM_STATE_ASPECT_RATIO_DATA)}, + {DXVAHD_STREAM_STATE_FILTER_BRIGHTNESS, sizeof(DXVAHD_STREAM_STATE_FILTER_DATA)}, + {DXVAHD_STREAM_STATE_FILTER_CONTRAST, sizeof(DXVAHD_STREAM_STATE_FILTER_DATA)}, + {DXVAHD_STREAM_STATE_FILTER_HUE, sizeof(DXVAHD_STREAM_STATE_FILTER_DATA)}, + {DXVAHD_STREAM_STATE_FILTER_SATURATION, sizeof(DXVAHD_STREAM_STATE_FILTER_DATA)}, + {DXVAHD_STREAM_STATE_FILTER_NOISE_REDUCTION, sizeof(DXVAHD_STREAM_STATE_FILTER_DATA)}, + {DXVAHD_STREAM_STATE_FILTER_EDGE_ENHANCEMENT, sizeof(DXVAHD_STREAM_STATE_FILTER_DATA)}, + {DXVAHD_STREAM_STATE_FILTER_ANAMORPHIC_SCALING, sizeof(DXVAHD_STREAM_STATE_FILTER_DATA)}, + }; + + init_desc(&desc); + DXVAHD_CreateDevice(d3d_device, &desc, DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL, NULL, &device); + IDXVAHD_Device_GetVideoProcessorDeviceCaps(device, &caps); + input_formats = heap_alloc_zero(caps.InputFormatCount * sizeof(*input_formats)); + vp_caps = heap_alloc_zero(caps.VideoProcessorCount * sizeof(*vp_caps)); + IDXVAHD_Device_GetVideoProcessorCaps(device, caps.VideoProcessorCount, vp_caps); + + hr = IDXVAHD_Device_CreateVideoProcessor(device, &vp_caps[0].VPGuid, &processor); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(test_blt); i++) + { + hr = IDXVAHD_VideoProcessor_GetVideoProcessBltState(processor, test_blt[i].state, test_blt[i].size, data); + ok(hr == S_OK, "Unexpected hr %#x for blt state %#x.\n", hr, test_blt[i].state); + /* Pass wrong data size for state */ + hr = IDXVAHD_VideoProcessor_GetVideoProcessBltState(processor, test_blt[i].state, 64, data); + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x for blt state %#x.\n", hr, test_blt[i].state); + } + + for (i = 0; i < ARRAY_SIZE(test_stream); i++) + { + hr = IDXVAHD_VideoProcessor_GetVideoProcessStreamState(processor, 0, test_stream[i].state, test_stream[i].size, data); + ok(hr == S_OK, "Unexpected hr %#x for stream state %#x.\n", hr, test_stream[i].state); + /* Pass wrong data size for state */ + hr = IDXVAHD_VideoProcessor_GetVideoProcessStreamState(processor, 0, test_stream[i].state, 64, data); + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x for stream state %#x.\n", hr, test_stream[i].state); + } + + IDXVAHD_VideoProcessor_Release(processor); + + heap_free(data); + heap_free(input_formats); + heap_free(vp_caps); + IDXVAHD_Device_Release(device); +} + +START_TEST(dxvahd) +{ + IDXVAHD_Device *device = NULL; + IDirect3D9Ex *d3d; + HWND window; + HRESULT hr; + DXVAHD_CONTENT_DESC desc = {0}; + + hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &d3d); + if (hr != S_OK) + { + skip("Failed to create a D3D object, skipping tests.\n"); + return; + } + + window = create_window(); + + if (!(d3d_device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + } + + init_desc(&desc); + hr = DXVAHD_CreateDevice(d3d_device, &desc, DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL, NULL, &device); + if (hr == E_NOINTERFACE) + { + skip("Device does not support DXVA-HD, skipping tests.\n"); + goto done; + } + IDXVAHD_Device_Release(device); + + test_dxvahd_device(); + test_dxvahd_processor(); + +done: + IDirect3DDevice9_Release(d3d_device); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} diff --git a/include/Makefile.in b/include/Makefile.in index 216adf0d7ae..f986ef42dd5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -268,6 +268,7 @@ SOURCES = \ dxgitype.idl \ dxva.h \ dxva2api.idl \ + dxvahd.idl \ dyngraph.idl \ endpointvolume.idl \ errorrep.h \ diff --git a/include/dxvahd.idl b/include/dxvahd.idl new file mode 100644 index 00000000000..b6ed6b3217c --- /dev/null +++ b/include/dxvahd.idl @@ -0,0 +1,473 @@ +/* + * Copyright 2020 Jeff Smith + * + * 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"; + +cpp_quote("#if 0") +interface IDirect3DDevice9Ex; +interface IDirect3DSurface9; + +typedef DWORD D3DFORMAT; +typedef DWORD D3DPOOL; +typedef DWORD D3DCOLOR; +cpp_quote("#endif") + + +typedef enum _DXVAHD_FRAME_FORMAT +{ + DXVAHD_FRAME_FORMAT_PROGRESSIVE = 0, + DXVAHD_FRAME_FORMAT_INTERLACED_TOP_FIELD_FIRST = 1, + DXVAHD_FRAME_FORMAT_INTERLACED_BOTTOM_FIELD_FIRST = 2 +} DXVAHD_FRAME_FORMAT; + +typedef enum _DXVAHD_DEVICE_USAGE +{ + DXVAHD_DEVICE_USAGE_PLAYBACK_NORMAL = 0, + DXVAHD_DEVICE_USAGE_OPTIMAL_SPEED = 1, + DXVAHD_DEVICE_USAGE_OPTIMAL_QUALITY = 2 +} DXVAHD_DEVICE_USAGE; + +typedef enum _DXVAHD_FILTER +{ + DXVAHD_FILTER_BRIGHTNESS = 0, + DXVAHD_FILTER_CONTRAST = 1, + DXVAHD_FILTER_HUE = 2, + DXVAHD_FILTER_SATURATION = 3, + DXVAHD_FILTER_NOISE_REDUCTION = 4, + DXVAHD_FILTER_EDGE_ENHANCEMENT = 5, + DXVAHD_FILTER_ANAMORPHIC_SCALING = 6 +} DXVAHD_FILTER; + +typedef enum _DXVAHD_SURFACE_TYPE +{ + DXVAHD_SURFACE_TYPE_VIDEO_INPUT = 0, + DXVAHD_SURFACE_TYPE_VIDEO_INPUT_PRIVATE = 1, + DXVAHD_SURFACE_TYPE_VIDEO_OUTPUT = 2 +} DXVAHD_SURFACE_TYPE; + +typedef enum _DXVAHD_BLT_STATE +{ + DXVAHD_BLT_STATE_TARGET_RECT = 0, + DXVAHD_BLT_STATE_BACKGROUND_COLOR = 1, + DXVAHD_BLT_STATE_OUTPUT_COLOR_SPACE = 2, + DXVAHD_BLT_STATE_ALPHA_FILL = 3, + DXVAHD_BLT_STATE_CONSTRICTION = 4, + DXVAHD_BLT_STATE_PRIVATE = 1000 +} DXVAHD_BLT_STATE; + +typedef enum _DXVAHD_STREAM_STATE +{ + DXVAHD_STREAM_STATE_D3DFORMAT = 0, + DXVAHD_STREAM_STATE_FRAME_FORMAT = 1, + DXVAHD_STREAM_STATE_INPUT_COLOR_SPACE = 2, + DXVAHD_STREAM_STATE_OUTPUT_RATE = 3, + DXVAHD_STREAM_STATE_SOURCE_RECT = 4, + DXVAHD_STREAM_STATE_DESTINATION_RECT = 5, + DXVAHD_STREAM_STATE_ALPHA = 6, + DXVAHD_STREAM_STATE_PALETTE = 7, + DXVAHD_STREAM_STATE_LUMA_KEY = 8, + DXVAHD_STREAM_STATE_ASPECT_RATIO = 9, + DXVAHD_STREAM_STATE_FILTER_BRIGHTNESS = 100, + DXVAHD_STREAM_STATE_FILTER_CONTRAST = 101, + DXVAHD_STREAM_STATE_FILTER_HUE = 102, + DXVAHD_STREAM_STATE_FILTER_SATURATION = 103, + DXVAHD_STREAM_STATE_FILTER_NOISE_REDUCTION = 104, + DXVAHD_STREAM_STATE_FILTER_EDGE_ENHANCEMENT = 105, + DXVAHD_STREAM_STATE_FILTER_ANAMORPHIC_SCALING = 106, + DXVAHD_STREAM_STATE_PRIVATE = 1000 +} DXVAHD_STREAM_STATE; + +typedef enum _DXVAHD_DEVICE_TYPE +{ + DXVAHD_DEVICE_TYPE_HARDWARE = 0, + DXVAHD_DEVICE_TYPE_SOFTWARE = 1, + DXVAHD_DEVICE_TYPE_REFERENCE = 2, + DXVAHD_DEVICE_TYPE_OTHER = 3 +} DXVAHD_DEVICE_TYPE; + +typedef enum _DXVAHD_DEVICE_CAPS +{ + DXVAHD_DEVICE_CAPS_LINEAR_SPACE = 0x01, + DXVAHD_DEVICE_CAPS_xvYCC = 0x02, + DXVAHD_DEVICE_CAPS_RGB_RANGE_CONVERSION = 0x04, + DXVAHD_DEVICE_CAPS_YCbCr_MATRIX_CONVERSION = 0x08 + // Based on DDI, Windows 8.1 should support: + // ..._NOMINAL_RANGE = 0x10 + +} DXVAHD_DEVICE_CAPS; + +typedef enum _DXVAHD_FEATURE_CAPS +{ + DXVAHD_FEATURE_CAPS_ALPHA_FILL = 0x01, + DXVAHD_FEATURE_CAPS_CONSTRICTION = 0x02, + DXVAHD_FEATURE_CAPS_LUMA_KEY = 0x04, + DXVAHD_FEATURE_CAPS_ALPHA_PALETTE = 0x08 + // Based on DDI, Windows 8 should support: + // ..._ROTATION = 0x10 +} DXVAHD_FEATURE_CAPS; + +typedef enum _DXVAHD_FILTER_CAPS +{ + DXVAHD_FILTER_CAPS_BRIGHTNESS = 0x01, + DXVAHD_FILTER_CAPS_CONTRAST = 0x02, + DXVAHD_FILTER_CAPS_HUE = 0x04, + DXVAHD_FILTER_CAPS_SATURATION = 0x08, + DXVAHD_FILTER_CAPS_NOISE_REDUCTION = 0x10, + DXVAHD_FILTER_CAPS_EDGE_ENHANCEMENT = 0x20, + DXVAHD_FILTER_CAPS_ANAMORPHIC_SCALING = 0x40 +} DXVAHD_FILTER_CAPS; + +typedef enum _DXVAHD_INPUT_FORMAT_CAPS +{ + DXVAHD_INPUT_FORMAT_CAPS_RGB_INTERLACED = 0x01, + DXVAHD_INPUT_FORMAT_CAPS_RGB_PROCAMP = 0x02, + DXVAHD_INPUT_FORMAT_CAPS_RGB_LUMA_KEY = 0x04, + DXVAHD_INPUT_FORMAT_CAPS_PALETTE_INTERLACED = 0x08 +} DXVAHD_INPUT_FORMAT_CAPS; + +typedef enum _DXVAHD_ALPHA_FILL_MODE +{ + DXVAHD_ALPHA_FILL_MODE_OPAQUE = 0, + DXVAHD_ALPHA_FILL_MODE_BACKGROUND = 1, + DXVAHD_ALPHA_FILL_MODE_DESTINATION = 2, + DXVAHD_ALPHA_FILL_MODE_SOURCE_STREAM = 3 +} DXVAHD_ALPHA_FILL_MODE; + +typedef enum _DXVAHD_OUTPUT_RATE +{ + DXVAHD_OUTPUT_RATE_NORMAL = 0, + DXVAHD_OUTPUT_RATE_HALF = 1, + DXVAHD_OUTPUT_RATE_CUSTOM = 2 +} DXVAHD_OUTPUT_RATE; + + +typedef struct _DXVAHD_RATIONAL +{ + UINT Numerator; + UINT Denominator; +} DXVAHD_RATIONAL; + +typedef struct _DXVAHD_CONTENT_DESC +{ + DXVAHD_FRAME_FORMAT InputFrameFormat; + DXVAHD_RATIONAL InputFrameRate; + UINT InputWidth; + UINT InputHeight; + DXVAHD_RATIONAL OutputFrameRate; + UINT OutputWidth; + UINT OutputHeight; +} DXVAHD_CONTENT_DESC; + +typedef struct _DXVAHD_VPCAPS +{ + GUID VPGuid; + UINT PastFrames; + UINT FutureFrames; + UINT ProcessorCaps; + UINT ITelecineCaps; + UINT CustomRateCount; +} DXVAHD_VPCAPS; + +typedef struct _DXVAHD_CUSTOM_RATE_DATA +{ + DXVAHD_RATIONAL CustomRate; + UINT OutputFrames; + BOOL InputInterlaced; + UINT InputFramesOrFields; +} DXVAHD_CUSTOM_RATE_DATA; + +typedef struct _DXVAHD_FILTER_RANGE_DATA +{ + INT Minimum; + INT Maximum; + INT Default; + FLOAT Multiplier; +} DXVAHD_FILTER_RANGE_DATA; + +typedef struct _DXVAHD_VPDEVCAPS +{ + DXVAHD_DEVICE_TYPE DeviceType; + UINT DeviceCaps; + UINT FeatureCaps; + UINT FilterCaps; + UINT InputFormatCaps; + D3DPOOL InputPool; + UINT OutputFormatCount; + UINT InputFormatCount; + UINT VideoProcessorCount; + UINT MaxInputStreams; + UINT MaxStreamStates; +} DXVAHD_VPDEVCAPS; + +typedef struct _DXVAHD_STREAM_DATA +{ + BOOL Enable; + UINT OutputIndex; + UINT InputFrameOrField; + UINT PastFrames; + UINT FutureFrames; + IDirect3DSurface9 **ppPastSurfaces; + IDirect3DSurface9 *pInputSurface; + IDirect3DSurface9 **ppFutureSurfaces; +} DXVAHD_STREAM_DATA; + +typedef struct _DXVAHD_BLT_STATE_TARGET_RECT_DATA +{ + BOOL Enable; + RECT TargetRect; +} DXVAHD_BLT_STATE_TARGET_RECT_DATA; + +typedef struct _DXVAHD_COLOR_RGBA +{ + FLOAT R; + FLOAT G; + FLOAT B; + FLOAT A; +} DXVAHD_COLOR_RGBA; + +typedef struct _DXVAHD_COLOR_YCbCrA +{ + FLOAT Y; + FLOAT Cb; + FLOAT Cr; + FLOAT A; +} DXVAHD_COLOR_YCbCrA; + +typedef union _DXVAHD_COLOR +{ + DXVAHD_COLOR_RGBA RGB; + DXVAHD_COLOR_YCbCrA YCbCr; +} DXVAHD_COLOR; + +typedef struct _DXVAHD_BLT_STATE_BACKGROUND_COLOR_DATA +{ + BOOL YCbCr; + DXVAHD_COLOR BackgroundColor; +} DXVAHD_BLT_STATE_BACKGROUND_COLOR_DATA; + +typedef struct _DXVAHD_BLT_STATE_OUTPUT_COLOR_SPACE_DATA +{ + union + { + struct + { + UINT Usage : 1; + UINT RGB_Range : 1; + UINT YCbCr_Matrix : 1; + UINT YCbCr_xvYCC : 1; + UINT Reserved : 28; + }; + UINT Value; + }; +} DXVAHD_BLT_STATE_OUTPUT_COLOR_SPACE_DATA; + +typedef struct _DXVAHD_BLT_STATE_ALPHA_FILL_DATA +{ + DXVAHD_ALPHA_FILL_MODE Mode; + UINT StreamNumber; +} DXVAHD_BLT_STATE_ALPHA_FILL_DATA; + +typedef struct _DXVAHD_BLT_STATE_CONSTRICTION_DATA +{ + BOOL Enable; + SIZE Size; +} DXVAHD_BLT_STATE_CONSTRICTION_DATA; + +typedef struct _DXVAHD_BLT_STATE_PRIVATE_DATA +{ + GUID Guid; + UINT DataSize; + void *pData; +} DXVAHD_BLT_STATE_PRIVATE_DATA; + +typedef struct _DXVAHD_STREAM_STATE_D3DFORMAT_DATA +{ + D3DFORMAT Format; +} DXVAHD_STREAM_STATE_D3DFORMAT_DATA; + +typedef struct _DXVAHD_STREAM_STATE_FRAME_FORMAT_DATA +{ + DXVAHD_FRAME_FORMAT FrameFormat; +} DXVAHD_STREAM_STATE_FRAME_FORMAT_DATA; + +typedef struct _DXVAHD_STREAM_STATE_INPUT_COLOR_SPACE_DATA +{ + union + { + struct + { + UINT Type : 1; + UINT RGB_Range : 1; + UINT YCbCr_Matrix : 1; + UINT YCbCr_xvYCC : 1; + UINT Reserved : 28; + }; + UINT Value; + }; +} DXVAHD_STREAM_STATE_INPUT_COLOR_SPACE_DATA; + +typedef struct _DXVAHD_STREAM_STATE_OUTPUT_RATE_DATA +{ + BOOL RepeatFrame; + DXVAHD_OUTPUT_RATE OutputRate; + DXVAHD_RATIONAL CustomRate; +} DXVAHD_STREAM_STATE_OUTPUT_RATE_DATA; + +typedef struct _DXVAHD_STREAM_STATE_SOURCE_RECT_DATA +{ + BOOL Enable; + RECT SourceRect; +} DXVAHD_STREAM_STATE_SOURCE_RECT_DATA; + +typedef struct _DXVAHD_STREAM_STATE_DESTINATION_RECT_DATA +{ + BOOL Enable; + RECT DestinationRect; +} DXVAHD_STREAM_STATE_DESTINATION_RECT_DATA; + +typedef struct _DXVAHD_STREAM_STATE_ALPHA_DATA +{ + BOOL Enable; + FLOAT Alpha; +} DXVAHD_STREAM_STATE_ALPHA_DATA; + +typedef struct _DXVAHD_STREAM_STATE_PALETTE_DATA +{ + UINT Count; + D3DCOLOR *pEntries; +} DXVAHD_STREAM_STATE_PALETTE_DATA; + +typedef struct _DXVAHD_STREAM_STATE_LUMA_KEY_DATA +{ + BOOL Enable; + FLOAT Lower; + FLOAT Upper; +} DXVAHD_STREAM_STATE_LUMA_KEY_DATA; + +typedef struct _DXVAHD_STREAM_STATE_ASPECT_RATIO_DATA +{ + BOOL Enable; + DXVAHD_RATIONAL SourceAspectRatio; + DXVAHD_RATIONAL DestinationAspectRatio; +} DXVAHD_STREAM_STATE_ASPECT_RATIO_DATA; + +typedef struct _DXVAHD_STREAM_STATE_FILTER_DATA +{ + BOOL Enable; + INT Level; +} DXVAHD_STREAM_STATE_FILTER_DATA; + + +// FIXME +typedef void* PDXVAHDSW_Plugin; + + +interface IDXVAHD_Device; +interface IDXVAHD_VideoProcessor; + +cpp_quote("HRESULT WINAPI DXVAHD_CreateDevice(IDirect3DDevice9Ex *d3d_device, const DXVAHD_CONTENT_DESC *desc, DXVAHD_DEVICE_USAGE usage, PDXVAHDSW_Plugin plugin, IDXVAHD_Device **device);") + +/***************************************************************************** + * IDXVAHD_Device interface + */ +[ + object, + uuid(95f12dfd-d77e-49be-815f-57d579634d6d), + local +] +interface IDXVAHD_Device : IUnknown +{ + HRESULT CreateVideoSurface( + [in] UINT width, + [in] UINT height, + [in] D3DFORMAT format, + [in] D3DPOOL pool, + [in] DWORD usage, + [in] DXVAHD_SURFACE_TYPE type, + [in] UINT num_surfaces, + [out] IDirect3DSurface9 **ppSurface, + [in, out] HANDLE *pSharedHandle); + + HRESULT GetVideoProcessorDeviceCaps( + [out] DXVAHD_VPDEVCAPS *pCaps); + + HRESULT GetVideoProcessorOutputFormats( + [in] UINT count, + [out] D3DFORMAT *pFormats); + + HRESULT GetVideoProcessorInputFormats( + [in] UINT count, + [out] D3DFORMAT *pFormats); + + HRESULT GetVideoProcessorCaps( + [in] UINT count, + [out] DXVAHD_VPCAPS *pCaps); + + HRESULT GetVideoProcessorCustomRates( + [in] const GUID *pVPGuid, + [in] UINT count, + [out] DXVAHD_CUSTOM_RATE_DATA *pRates); + + HRESULT GetVideoProcessorFilterRange( + [in] DXVAHD_FILTER filter, + [out] DXVAHD_FILTER_RANGE_DATA *pRange); + + HRESULT CreateVideoProcessor( + [in] const GUID *pVPGuid, + [out] IDXVAHD_VideoProcessor **ppVideoProcessor); +} + + +/***************************************************************************** + * IDXVAHD_VideoProcessor interface + */ +[ + object, + uuid(95f4edf4-6e03-4cd7-be1b-3075d665aa52), + local +] +interface IDXVAHD_VideoProcessor : IUnknown +{ + HRESULT SetVideoProcessBltState( + [in] DXVAHD_BLT_STATE State, + [in] UINT DataSize, + [in] const void *pData); + + HRESULT GetVideoProcessBltState( + [in] DXVAHD_BLT_STATE State, + [in] UINT DataSize, + [out] void *pData); + + HRESULT SetVideoProcessStreamState( + [in] UINT StreamNumber, + [in] DXVAHD_STREAM_STATE State, + [in] UINT DataSize, + [in] const void *pData); + + HRESULT GetVideoProcessStreamState( + [in] UINT StreamNumber, + [in] DXVAHD_STREAM_STATE State, + [in] UINT DataSize, + [out] void *pData); + + HRESULT VideoProcessBltHD( + [in, out] IDirect3DSurface9 *pOutputSurface, + [in] UINT OutputFrame, + [in] UINT StreamCount, + [in] const DXVAHD_STREAM_DATA *pStreams); +} -- 2.23.0

3 3

RE: [PATCH 2/2] ntdll: Move InterlockedCompareExchange128 support to winnt.h.
by Puetz Kevin A 31 Jul '20

31 Jul '20

> Oh, I see, I didn't know it's already broken on aarch64. FWIW, I just wanted > to fix a warning on clang msvcrt target and while doing that, I generalized the > solution. We can wait with that for aarch64 solution. Though what I was waiting on was to find out whether or was my problem or somebody else's (i.e. would it still be an issue on our eventual BSP). Which is, at least a bit, independent of whether wine needs a solution in general. I probably should have at filed the bug anyway 😊 > Depending on -latomic may be problematic in PE builds. If I read libatomic Mingw should have a -latomic too, it's the underlying runtime for the C++11 atomics (but it just contains the C-API out-of-line implementations to fall back on when there aren't appropriate intrinsics). > source right, libatomic resorts to using lock in this case (pthread_mutex_lock > or equivalent, depending on host). Yes, that's what it does, which seemed equivalent to what wine had previously done, and was easy to drop in as a workaround. > We could probably just add a variant of affected RtlInterlocked*SList* functions > that would use critical section instead of interlocked operations. Yep. Or do what I think MS actually did, and implement the Header8 layout for when you can't use double-pointer compare-and-exchange. They need that anyway, (though maybe not anymore) since original amd64 CPUs don't have cmpxchg16b either. I don't know the details on SLIST_HEADER::Header8 (presumably the same, just with fewer bits in some of the fields), and there doesn't seem to be a lot of MSDN documentation But here's some references I've dug up that at least mention it existed for such cases... And obviously the Header8 struct in wine and reactos came from somewhere... https://docs.microsoft.com/en-us/windows/win32/sync/interlocked-singly-link… https://devblogs.microsoft.com/oldnewthing/20110819-00/?p=9853 https://docs.microsoft.com/en-us/previous-versions/windows/desktop/legacy/m… https://cbloomrants.blogspot.com/2010/05/05-29-10-lock-free-in-x64.html > Thanks, > > Jacek

1 0

[PATCH vkd3d] include: Correct the case of rbtree macros.
by Zebediah Figura 31 Jul '20

31 Jul '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/private/rbtree.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/private/rbtree.h b/include/private/rbtree.h index 7f44a0e..b4993da 100644 --- a/include/private/rbtree.h +++ b/include/private/rbtree.h @@ -127,33 +127,33 @@ static inline struct rb_entry *rb_postorder_next(struct rb_entry *iter) } /* iterate through the tree */ -#define rb_FOR_EACH(cursor, tree) \ +#define RB_FOR_EACH(cursor, tree) \ for ((cursor) = rb_head((tree)->root); (cursor); (cursor) = rb_next(cursor)) /* iterate through the tree using a tree entry */ -#define rb_FOR_EACH_ENTRY(elem, tree, type, field) \ - for ((elem) = rb_ENTRY_VALUE(rb_head((tree)->root), type, field); \ +#define RB_FOR_EACH_ENTRY(elem, tree, type, field) \ + for ((elem) = RB_ENTRY_VALUE(rb_head((tree)->root), type, field); \ &(elem)->field; \ - (elem) = rb_ENTRY_VALUE(rb_next(&elem->field), type, field)) + (elem) = RB_ENTRY_VALUE(rb_next(&elem->field), type, field)) /* iterate through the tree using using postorder, making it safe to free the entry */ -#define rb_FOR_EACH_DESTRUCTOR(cursor, cursor2, tree) \ +#define RB_FOR_EACH_DESTRUCTOR(cursor, cursor2, tree) \ for ((cursor) = rb_postorder_head((tree)->root); \ (cursor) && (((cursor2) = rb_postorder_next(cursor)) || 1); \ (cursor) = (cursor2)) /* iterate through the tree using a tree entry and postorder, making it safe to free the entry */ -#define rb_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \ - for ((elem) = rb_ENTRY_VALUE(rb_postorder_head((tree)->root), type, field); \ +#define RB_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \ + for ((elem) = RB_ENTRY_VALUE(rb_postorder_head((tree)->root), type, field); \ &(elem)->field \ - && (((elem2) = rb_ENTRY_VALUE(rb_postorder_next(&(elem)->field), type, field)) || 1); \ + && (((elem2) = RB_ENTRY_VALUE(rb_postorder_next(&(elem)->field), type, field)) || 1); \ (elem) = (elem2)) static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func *callback, void *context) { struct rb_entry *iter, *next; - rb_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context); + RB_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context); } static inline void rb_init(struct rb_tree *tree, rb_compare_func compare) @@ -165,7 +165,7 @@ static inline void rb_init(struct rb_tree *tree, rb_compare_func compare) static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func *callback, void *context) { struct rb_entry *iter; - rb_FOR_EACH(iter, tree) callback(iter, context); + RB_FOR_EACH(iter, tree) callback(iter, context); } static inline void rb_clear(struct rb_tree *tree, rb_traverse_func *callback, void *context) -- 2.27.0

2 1

[PATCH 2/2] ntdll: Move InterlockedCompareExchange128 support to winnt.h.
by Jacek Caban 31 Jul '20

31 Jul '20

Also properly declare intrinsic on msvc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/rtl.c | 26 ++++---------------------- include/winnt.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 22 deletions(-)

2 2

[PATCH v2] winevulkan: Avoid returning 0 for swapchain maxImageCount.
by Georg Lehmann 31 Jul '20

31 Jul '20

Many Windows games do not expect that maxImageCount can be set to 0. A value of 0 means that there is no limit on the number of images. Nvidia reports 8 on Windows, AMD 16. Based on a patch by Józef Kucia. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 4 +-- dlls/winevulkan/vulkan.c | 47 ++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 1 + dlls/winevulkan/vulkan_thunks.c | 8 ++---- dlls/winevulkan/vulkan_thunks.h | 4 +++ 5 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index fc0e2182dd..6a039bd268 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -183,12 +183,12 @@ FUNCTION_OVERRIDES = { # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, - "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_get_surface_capabilities2 - "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_win32_surface diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index be614f1cef..5f8046f1ba 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -723,6 +723,8 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; } + object->quirks |= WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT; + *instance = object; TRACE("Created instance %p (native instance %p).\n", object, object->instance); return VK_SUCCESS; @@ -1555,6 +1557,51 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } +static inline void adjust_max_image_count(VkPhysicalDevice phys_dev, VkSurfaceCapabilitiesKHR* capabilities) +{ + /* Many Windows games, for example Strange Brigade, No Man's Sky, Path of Exile + * and World War Z, do not expect that maxImageCount can be set to 0. + * A value of 0 means that there is no limit on the number of images. + * Nvidia reports 8 on Windows, AMD 16. + * https://vulkan.gpuinfo.org/displayreport.php?id=9122#surface + * https://vulkan.gpuinfo.org/displayreport.php?id=9121#surface + */ + if ((phys_dev->instance->quirks & WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT) && !capabilities->maxImageCount) + { + capabilities->maxImageCount = max(capabilities->minImageCount, 16); + } +} + +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice phys_dev, + VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *capabilities) +{ + VkResult res; + + TRACE("%p, 0x%s, %p\n", phys_dev, wine_dbgstr_longlong(surface), capabilities); + + res = thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, surface, capabilities); + + if (res == VK_SUCCESS) + adjust_max_image_count(phys_dev, capabilities); + + return res; +} + +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities) +{ + VkResult res; + + TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); + + res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, surface_info, capabilities); + + if (res == VK_SUCCESS) + adjust_max_image_count(phys_dev, &capabilities->surfaceCapabilities); + + return res; +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 17072d2341..b048108f7a 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -38,6 +38,7 @@ #define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE #define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 +#define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 struct vulkan_func { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fcefa6a767..4f75a4ec7c 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4998,26 +4998,22 @@ static VkResult WINAPI wine_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesC return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(physicalDevice->phys_dev, pCombinationCount, pCombinations); } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) { #if defined(USE_STRUCT_CONVERSION) VkResult result; VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host; - TRACE("%p, %p, %p\n", physicalDevice, pSurfaceInfo, pSurfaceCapabilities); - convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(pSurfaceInfo, &pSurfaceInfo_host); result = physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physicalDevice->phys_dev, &pSurfaceInfo_host, pSurfaceCapabilities); return result; #else - TRACE("%p, %p, %p\n", physicalDevice, pSurfaceInfo, pSurfaceCapabilities); return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physicalDevice->phys_dev, pSurfaceInfo, pSurfaceCapabilities); #endif } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) { - TRACE("%p, 0x%s, %p\n", physicalDevice, wine_dbgstr_longlong(surface), pSurfaceCapabilities); return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice->phys_dev, surface, pSurfaceCapabilities); } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index f2d650decf..d35e8c4269 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -42,6 +42,8 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties); void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities); +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) DECLSPEC_HIDDEN; @@ -51,6 +53,8 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physic VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; void thunk_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; void thunk_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; typedef struct VkAcquireNextImageInfoKHR_host { -- 2.28.0

3 2

[PATCH] configure: Use *-windows instead of *-windows-gnu as fallback cross compiler target.
by Jacek Caban 31 Jul '20

31 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This code path is used mostly when cross target can't be found, which means that mingw is most likely not available. *windows-gnu targets, however, require cross compiled libgcc (or compiler-rt), which is roughly a part of mingw distro, so they will most likely not work anyway. When using *-windows target (meaning msvc compatibility mode), Wine is self sufficient and doesn't need any external cross compiled bits. If someone has an unusual setup and wants the old behaviour, it's probably good idea to explicitly specify CROSSTARGET anyway. configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 2/2] winegcc: Try using msvc file align syntax if mingw-style is not supported.
by Jacek Caban 31 Jul '20

31 Jul '20

Allows setting file alignment on LLD 10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Martin already added support for mingw-style option to upstream LLD, so that it will not be needed with future versions. Supporting older versions is easy enough that I decided to send this patch, but I don't mind if it's dropped. tools/winegcc/winegcc.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 1/2] winegcc: Support file alignment on msvc target.
by Jacek Caban 31 Jul '20

31 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/2] configure: Build with -mcx16 on x86_64.
by Jacek Caban 31 Jul '20

31 Jul '20

This is needed on clang msvc target to allow _InterlockedCompareExchange128. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 1/2] ntdll: Read auxillary vector directly as fallback.
by Rémi Bernon 31 Jul '20

31 Jul '20

When getauxval isn't available we can read the auxillary vector after environment pointers according to System V ABI. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm not sure if this is very useful, but some runtimes (steamrt for instance) have old glibc where getauxval isn't available and it then causes SymInitializeW to fail because of NULL process image addresses. dlls/ntdll/unix/loader.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bd3a0958757..02ffc0ca775 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1343,6 +1343,27 @@ ULONG_PTR get_image_address(void) if (task_info(mach_task_self(), TASK_DYLD_INFO, (task_info_t)&dyld_info, &size) == KERN_SUCCESS) return dyld_info.all_image_info_addr; +#elif defined(__linux__) + ULONG_PTR size, num, phdr_addr; + ElfW(Phdr) *phdr; + Elf64_auxv_t *auxp; + char **envp = main_envp; + while (*envp++ != NULL); + + for (auxp = (Elf64_auxv_t *)envp; auxp->a_type != 0; auxp++) + { + if (auxp->a_type == AT_PHDR) phdr_addr = auxp->a_un.a_val; + if (auxp->a_type == AT_PHENT) size = auxp->a_un.a_val; + if (auxp->a_type == AT_PHNUM) num = auxp->a_un.a_val; + } + + if (!phdr_addr) return 0; + phdr = (ElfW(Phdr) *)phdr_addr; + while (num--) + { + if (phdr->p_type == PT_PHDR) return phdr_addr - phdr->p_offset; + phdr = (ElfW(Phdr) *)((char *)phdr + size); + } #endif return 0; } -- 2.27.0

2 4

[PATCH v2] server: Fix some alt + hotkeys dont' work if the msg param is WM_SYSKEYDOWN in queue_hotkey_message function.
by Yaoyongjie 31 Jul '20

31 Jul '20

1 0

[PATCH v2] dbghelp: Ignore missing debug info in SymInitializeW.
by Rémi Bernon 31 Jul '20

31 Jul '20

When fInvadeProcess is used, we return an error if the target process is found but its debug info is not. We should only return an error if the process is not found. This fixes a SymInitializeW popup error on Hard Reset Redux startup. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes 190026 dlls/dbghelp/dbghelp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index a2dba4cfe3e..a2045f97455 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -354,7 +354,9 @@ static BOOL check_live_target(struct process* pcs) if (!base) return FALSE; TRACE("got debug info address %#lx from PEB %p\n", base, pbi.PebBaseAddress); - return elf_read_wine_loader_dbg_info(pcs, base) || macho_read_wine_loader_dbg_info(pcs, base); + if (!elf_read_wine_loader_dbg_info(pcs, base) && !macho_read_wine_loader_dbg_info(pcs, base)) + WARN("couldn't load process debug info at %p\n", base); + return TRUE; } /****************************************************************** @@ -456,7 +458,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP { if (fInvadeProcess) EnumerateLoadedModulesW64(hProcess, process_invade_cb, hProcess); - pcs->loader->synchronize_module_list(pcs); + if (pcs->loader) pcs->loader->synchronize_module_list(pcs); } else if (fInvadeProcess) { -- 2.27.0

1 0

[PATCH] dbghelp: Replace another usage of GetEnvironmentVariable() with the target process's environment.
by Zebediah Figura 31 Jul '20

31 Jul '20

Fixes: 2b0977fc711e1faadfef69e3a46c2d1848b4826b Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/path.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 82ba032145e..a2057947a42 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -755,12 +755,9 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma WCHAR env_name[64]; swprintf(env_name, ARRAY_SIZE(env_name), L"WINEDLLDIR%u", i); if (!(env = process_getenv(process, env_name))) return FALSE; - len = lstrlenW(env); - if (!(buf = heap_alloc((len + lstrlenW(name) + 2) * sizeof(WCHAR)))) return FALSE; - - len = GetEnvironmentVariableW(env_name, buf, len); - buf[len++] = '\\'; - lstrcpyW(buf + len, name); + len = wcslen(env) + wcslen(name) + 2; + if (!(buf = heap_alloc(len * sizeof(WCHAR)))) return FALSE; + swprintf(buf, len, L"%s\\%s", env, name); file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) { -- 2.27.0

2 1

Modify the influence of FOS_PICKFOLDERS on the Save As dialog
by 陈江仪 31 Jul '20

31 Jul '20

1 0

[PATCH v2] fonts: Add initial version of Webdings font.
by Dmitry Timoshkov 31 Jul '20

31 Jul '20

Some applications confusingly use Webdings instead of Marlett to draw non-client areas of their custom controls, this initial version of Webdings contains just a few glyphs copied from Marlett to make these apps happy. webdings.ttf should be generated from webdings.sfd in maintainer mode. v2: Correct glyph names, thanks Huw. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/Makefile.in | 1 + fonts/webdings.sfd | 198 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 fonts/webdings.sfd diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 08c82646de..b802185198 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -10,4 +10,5 @@ FONT_SRCS = \ system.sfd \ tahoma.sfd \ tahomabd.sfd \ + webdings.sfd \ wingding.sfd diff --git a/fonts/webdings.sfd b/fonts/webdings.sfd new file mode 100644 index 0000000000..8f464f4c16 --- /dev/null +++ b/fonts/webdings.sfd @@ -0,0 +1,198 @@ +SplineFontDB: 3.0 +FontName: WineWebdings +FullName: Webdings +FamilyName: Webdings +Weight: Regular +Copyright: Copyright (C) 2020 Dmitry Timoshkov +UComments: "#pragma makedep install" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: 0 +UnderlineWidth: 0 +Ascent: 2048 +Descent: 0 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +FSType: 0 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 0 +PfmFamily: 81 +TTFWeight: 500 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 0 0 0 0 0 0 0 0 0 0 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'Wine' +DEI: 91125 +ShortTable: cvt 2 + 68 + 1297 +EndShort +LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "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.+AAoACgAA-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.+AAoACgAA-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+AAoA" "http://www.gnu.org/licenses/lgpl.html" +Encoding: Symbol +Compacted: 1 +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -72 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 26 10 +TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 +BeginChars: 257 8 + +StartChar: .notdef +Encoding: 0 61472 0 +AltUni2: 000000.ffffffff.0 +Width: 1024 +Flags: W +LayerCount: 2 +Fore +SplineSet +41 41 m 1,0,-1 + 819 41 l 1,1,-1 + 819 1324 l 1,2,-1 + 41 1324 l 1,3,-1 + 41 41 l 1,0,-1 +0 0 m 1,4,-1 + 0 1365 l 1,5,-1 + 860 1365 l 1,6,-1 + 860 0 l 1,7,-1 + 0 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: UIminimize +Encoding: 48 48 1 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +256 256 m 1,0,-1 + 256 512 l 1,1,-1 + 1280 512 l 1,2,-1 + 1280 256 l 1,3,-1 + 256 256 l 1,0,-1 +EndSplineSet +EndChar + +StartChar: UImaximize +Encoding: 49 49 2 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +256 384 m 1,0,-1 + 1536 384 l 1,1,-1 + 1536 1408 l 1,2,-1 + 256 1408 l 1,3,-1 + 256 384 l 1,0,-1 +128 256 m 1,4,-1 + 128 1664 l 1,5,-1 + 1664 1664 l 1,6,-1 + 1664 256 l 1,7,-1 + 128 256 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: UItile +Encoding: 50 50 3 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +128 256 m 1,0,-1 + 128 1152 l 1,1,-1 + 512 1152 l 1,2,-1 + 512 1664 l 1,3,-1 + 1664 1664 l 1,4,-1 + 1664 768 l 1,5,-1 + 1280 768 l 1,6,-1 + 1280 256 l 1,7,-1 + 128 256 l 1,0,-1 +256 384 m 1,8,-1 + 1152 384 l 1,9,-1 + 1152 896 l 1,10,-1 + 256 896 l 1,11,-1 + 256 384 l 1,8,-1 +640 1152 m 1,12,-1 + 1280 1152 l 1,13,-1 + 1280 896 l 1,14,-1 + 1536 896 l 1,15,-1 + 1536 1408 l 1,16,-1 + 640 1408 l 1,17,-1 + 640 1152 l 1,12,-1 +EndSplineSet +EndChar + +StartChar: UIback +Encoding: 51 51 4 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1150 1726 m 25,0,-1 + 1150 446 l 25,1,-1 + 510 1086 l 25,2,-1 + 1150 1726 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: UIforward +Encoding: 52 52 5 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +842 1732 m 25,0,-1 + 842 452 l 25,1,-1 + 1482 1092 l 25,2,-1 + 842 1732 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: UIup +Encoding: 53 53 6 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +320 768 m 25,0,-1 + 1600 768 l 25,1,-1 + 960 1408 l 25,2,-1 + 320 768 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: UIdown +Encoding: 54 54 7 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +320 1282 m 25,0,-1 + 1600 1282 l 25,1,-1 + 960 642 l 25,2,-1 + 320 1282 l 25,0,-1 +EndSplineSet +EndChar +EndChars +EndSplineFont -- 2.26.2

3 2

[PATCH 1/5] combase: Move Wdtp* marshalling functions.
by Nikolay Sivov 31 Jul '20

31 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/Makefile.in | 4 +- dlls/combase/combase.spec | 8 +- dlls/combase/usrmarshal.c | 231 ++++++++++++++++++++++++++++++++++++++ dlls/ole32/Makefile.in | 2 +- dlls/ole32/ole32.spec | 8 +- dlls/ole32/usrmarshal.c | 181 +---------------------------- 6 files changed, 249 insertions(+), 185 deletions(-) create mode 100644 dlls/combase/usrmarshal.c diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 0f3c9f86322..eedcbd8e1c2 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,8 +1,10 @@ MODULE = combase.dll +IMPORTLIB = combase IMPORTS = advapi32 ole32 uuid EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ roapi.c \ - string.c + string.c \ + usrmarshal.c diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 36005929da2..b5ca117717c 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -281,11 +281,13 @@ @ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 @ stdcall StringFromIID(ptr ptr) ole32.StringFromIID @ stub UpdateDCOMSettings -@ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) ole32.WdtpInterfacePointer_UserMarshal +@ stdcall WdtpInterfacePointer_UserFree(ptr) +@ stub WdtpInterfacePointer_UserFree64 +@ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) @ stub WdtpInterfacePointer_UserMarshal64 -@ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) ole32.WdtpInterfacePointer_UserSize +@ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) @ stub WdtpInterfacePointer_UserSize64 -@ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) ole32.WdtpInterfacePointer_UserUnmarshal +@ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) @ stub WdtpInterfacePointer_UserUnmarshal64 @ stdcall WindowsCompareStringOrdinal(ptr ptr ptr) @ stdcall WindowsConcatString(ptr ptr ptr) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c new file mode 100644 index 00000000000..3fc7c2743a0 --- /dev/null +++ b/dlls/combase/usrmarshal.c @@ -0,0 +1,231 @@ +/* + * Marshaling Routines + * + * Copyright 2005 Robert Shearman + * Copyright 2009 Huw Davies + * + * 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 +#define NONAMELESSUNION + +#include "ole2.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +#define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align))&~(_Align)) +#define ALIGNED_POINTER(_Ptr, _Align) ((LPVOID)ALIGNED_LENGTH((ULONG_PTR)(_Ptr), _Align)) +#define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align) +#define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) + +static const char* debugstr_user_flags(ULONG *pFlags) +{ + char buf[12]; + const char* loword; + switch (LOWORD(*pFlags)) + { + case MSHCTX_LOCAL: + loword = "MSHCTX_LOCAL"; + break; + case MSHCTX_NOSHAREDMEM: + loword = "MSHCTX_NOSHAREDMEM"; + break; + case MSHCTX_DIFFERENTMACHINE: + loword = "MSHCTX_DIFFERENTMACHINE"; + break; + case MSHCTX_INPROC: + loword = "MSHCTX_INPROC"; + break; + default: + sprintf(buf, "%d", LOWORD(*pFlags)); + loword=buf; + } + + if (HIWORD(*pFlags) == NDR_LOCAL_DATA_REPRESENTATION) + return wine_dbg_sprintf("MAKELONG(%s, NDR_LOCAL_DATA_REPRESENTATION)", loword); + else + return wine_dbg_sprintf("MAKELONG(%s, 0x%04x)", loword, HIWORD(*pFlags)); +} + +/****************************************************************************** + * WdtpInterfacePointer_UserSize (combase.@) + * + * Calculates the buffer size required to marshal an interface pointer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * RealFlags [I] The MSHCTX to use when marshaling the interface. + * punk [I] Interface pointer to size. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the clip format. + * riid [I] ID of interface to size. + * + * RETURNS + * The buffer size required to marshal an interface pointer plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + */ +ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, ULONG StartingSize, IUnknown *punk, REFIID riid) +{ + DWORD marshal_size = 0; + HRESULT hr; + + TRACE("%s, %#x, %u, %p, %s.\n", debugstr_user_flags(pFlags), RealFlags, StartingSize, punk, debugstr_guid(riid)); + + hr = CoGetMarshalSizeMax(&marshal_size, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL); + if (FAILED(hr)) return StartingSize; + + ALIGN_LENGTH(StartingSize, 3); + StartingSize += 2 * sizeof(DWORD); + return StartingSize + marshal_size; +} + +/****************************************************************************** + * WdtpInterfacePointer_UserMarshal (combase.@) + * + * Marshals an interface pointer into a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * RealFlags [I] The MSHCTX to use when marshaling the interface. + * pBuffer [I] Buffer to marshal the clip format into. + * punk [I] Interface pointer to marshal. + * riid [I] ID of interface to marshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + */ +unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG RealFlags, unsigned char *pBuffer, IUnknown *punk, REFIID riid) +{ + HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, 0); + IStream *stm; + DWORD size; + void *ptr; + + TRACE("%s, %#x, %p, &%p, %s.\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid)); + + if (!h) return NULL; + if (CreateStreamOnHGlobal(h, TRUE, &stm) != S_OK) + { + GlobalFree(h); + return NULL; + } + + if (CoMarshalInterface(stm, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL) != S_OK) + { + IStream_Release(stm); + return pBuffer; + } + + ALIGN_POINTER(pBuffer, 3); + size = GlobalSize(h); + + *(DWORD *)pBuffer = size; + pBuffer += sizeof(DWORD); + *(DWORD *)pBuffer = size; + pBuffer += sizeof(DWORD); + + ptr = GlobalLock(h); + memcpy(pBuffer, ptr, size); + GlobalUnlock(h); + + IStream_Release(stm); + return pBuffer + size; +} + +/****************************************************************************** + * WdtpInterfacePointer_UserUnmarshal (combase.@) + * + * Unmarshals an interface pointer from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format from. + * ppunk [I/O] Address that receives the unmarshaled interface pointer. + * riid [I] ID of interface to unmarshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an ULONG. + */ +unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, IUnknown **ppunk, REFIID riid) +{ + HRESULT hr; + HGLOBAL h; + IStream *stm; + DWORD size; + void *ptr; + IUnknown *orig; + + TRACE("%s, %p, %p, %s.\n", debugstr_user_flags(pFlags), pBuffer, ppunk, debugstr_guid(riid)); + + ALIGN_POINTER(pBuffer, 3); + + size = *(DWORD *)pBuffer; + pBuffer += sizeof(DWORD); + if (size != *(DWORD *)pBuffer) + RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); + + pBuffer += sizeof(DWORD); + + /* FIXME: sanity check on size */ + + h = GlobalAlloc(GMEM_MOVEABLE, size); + if (!h) RaiseException(RPC_X_NO_MEMORY, 0, 0, NULL); + + if (CreateStreamOnHGlobal(h, TRUE, &stm) != S_OK) + { + GlobalFree(h); + RaiseException(RPC_X_NO_MEMORY, 0, 0, NULL); + } + + ptr = GlobalLock(h); + memcpy(ptr, pBuffer, size); + GlobalUnlock(h); + + orig = *ppunk; + hr = CoUnmarshalInterface(stm, riid, (void**)ppunk); + IStream_Release(stm); + + if (hr != S_OK) RaiseException(hr, 0, 0, NULL); + + if (orig) IUnknown_Release(orig); + + return pBuffer + size; +} + +/****************************************************************************** + * WdtpInterfacePointer_UserFree (combase.@) + */ +void WINAPI WdtpInterfacePointer_UserFree(IUnknown *punk) +{ + TRACE("%p.\n", punk); + if (punk) IUnknown_Release(punk); +} diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 310f6fc1199..4738407d7fd 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -1,6 +1,6 @@ MODULE = ole32.dll IMPORTLIB = ole32 -IMPORTS = uuid advapi32 user32 gdi32 rpcrt4 +IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 DELAYIMPORTS = oleaut32 EXTRADEFS = -D_OLE32_ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 2c4428edf0f..e8466c20491 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -287,10 +287,10 @@ @ stub UtConvertDvtd32toDvtd16 @ stub UtGetDvtd16Info @ stub UtGetDvtd32Info -@ stdcall WdtpInterfacePointer_UserFree(ptr) -@ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) -@ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) -@ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) +@ stdcall WdtpInterfacePointer_UserFree(ptr) combase.WdtpInterfacePointer_UserFree +@ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) combase.WdtpInterfacePointer_UserMarshal +@ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) combase.WdtpInterfacePointer_UserSize +@ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) combase.WdtpInterfacePointer_UserUnmarshal @ stdcall WriteClassStg(ptr ptr) @ stdcall WriteClassStm(ptr ptr) @ stdcall WriteFmtUserTypeStg(ptr long ptr) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index ba318c66b62..cf07ae3cccf 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -48,6 +48,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); ( (DWORD)'U' | ( (DWORD)'s' << 8 ) | \ ( (DWORD)'e' << 16 ) | ( (DWORD)'r' << 24 ) ) +ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, ULONG StartingSize, IUnknown *punk, REFIID riid); +unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG RealFlags, unsigned char *pBuffer, + IUnknown *punk, REFIID riid); +unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, IUnknown **ppunk, REFIID riid); + static const char* debugstr_user_flags(ULONG *pFlags) { char buf[12]; @@ -1491,182 +1496,6 @@ void __RPC_USER HMETAFILEPICT_UserFree(ULONG *pFlags, HMETAFILEPICT *phMfp) } } -/****************************************************************************** - * WdtpInterfacePointer_UserSize [OLE32.@] - * - * Calculates the buffer size required to marshal an interface pointer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * RealFlags [I] The MSHCTX to use when marshaling the interface. - * punk [I] Interface pointer to size. - * StartingSize [I] Starting size of the buffer. This value is added on to - * the buffer size required for the clip format. - * riid [I] ID of interface to size. - * - * RETURNS - * The buffer size required to marshal an interface pointer plus the starting size. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - */ -ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, ULONG StartingSize, IUnknown *punk, REFIID riid) -{ - DWORD marshal_size = 0; - HRESULT hr; - - TRACE("(%s, 0%x, %d, %p, %s)\n", debugstr_user_flags(pFlags), RealFlags, StartingSize, punk, debugstr_guid(riid)); - - hr = CoGetMarshalSizeMax(&marshal_size, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL); - if(FAILED(hr)) return StartingSize; - - ALIGN_LENGTH(StartingSize, 3); - StartingSize += 2 * sizeof(DWORD); - return StartingSize + marshal_size; -} - -/****************************************************************************** - * WdtpInterfacePointer_UserMarshal [OLE32.@] - * - * Marshals an interface pointer into a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * RealFlags [I] The MSHCTX to use when marshaling the interface. - * pBuffer [I] Buffer to marshal the clip format into. - * punk [I] Interface pointer to marshal. - * riid [I] ID of interface to marshal. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - */ -unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG RealFlags, unsigned char *pBuffer, IUnknown *punk, REFIID riid) -{ - HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, 0); - IStream *stm; - DWORD size; - void *ptr; - - TRACE("(%s, 0x%x, %p, &%p, %s)\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid)); - - if(!h) return NULL; - if(CreateStreamOnHGlobal(h, TRUE, &stm) != S_OK) - { - GlobalFree(h); - return NULL; - } - - if(CoMarshalInterface(stm, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL) != S_OK) - { - IStream_Release(stm); - return pBuffer; - } - - ALIGN_POINTER(pBuffer, 3); - size = GlobalSize(h); - - *(DWORD *)pBuffer = size; - pBuffer += sizeof(DWORD); - *(DWORD *)pBuffer = size; - pBuffer += sizeof(DWORD); - - ptr = GlobalLock(h); - memcpy(pBuffer, ptr, size); - GlobalUnlock(h); - - IStream_Release(stm); - return pBuffer + size; -} - -/****************************************************************************** - * WdtpInterfacePointer_UserUnmarshal [OLE32.@] - * - * Unmarshals an interface pointer from a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format from. - * ppunk [I/O] Address that receives the unmarshaled interface pointer. - * riid [I] ID of interface to unmarshal. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to an ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is an ULONG. - */ -unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, IUnknown **ppunk, REFIID riid) -{ - HRESULT hr; - HGLOBAL h; - IStream *stm; - DWORD size; - void *ptr; - IUnknown *orig; - - TRACE("(%s, %p, %p, %s)\n", debugstr_user_flags(pFlags), pBuffer, ppunk, debugstr_guid(riid)); - - ALIGN_POINTER(pBuffer, 3); - - size = *(DWORD *)pBuffer; - pBuffer += sizeof(DWORD); - if(size != *(DWORD *)pBuffer) - RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - - pBuffer += sizeof(DWORD); - - /* FIXME: sanity check on size */ - - h = GlobalAlloc(GMEM_MOVEABLE, size); - if(!h) RaiseException(RPC_X_NO_MEMORY, 0, 0, NULL); - - if(CreateStreamOnHGlobal(h, TRUE, &stm) != S_OK) - { - GlobalFree(h); - RaiseException(RPC_X_NO_MEMORY, 0, 0, NULL); - } - - ptr = GlobalLock(h); - memcpy(ptr, pBuffer, size); - GlobalUnlock(h); - - orig = *ppunk; - hr = CoUnmarshalInterface(stm, riid, (void**)ppunk); - IStream_Release(stm); - - if(hr != S_OK) RaiseException(hr, 0, 0, NULL); - - if(orig) IUnknown_Release(orig); - - return pBuffer + size; -} - -/****************************************************************************** - * WdtpInterfacePointer_UserFree [OLE32.@] - * - * Releases an unmarshaled interface pointer. - * - * PARAMS - * punk [I] Interface pointer to release. - * - * RETURNS - * Nothing. - */ -void WINAPI WdtpInterfacePointer_UserFree(IUnknown *punk) -{ - TRACE("(%p)\n", punk); - if(punk) IUnknown_Release(punk); -} - /****************************************************************************** * STGMEDIUM_UserSize [OLE32.@] * -- 2.27.0

3 15

[PATCH 3/3] d3dx11: Partially implement D3DX11CompileFromFile{A, W}().
by Jactry Zeng 31 Jul '20

31 Jul '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3dx11_43/async.c | 31 +++++- dlls/d3dx11_43/tests/d3dx11.c | 203 ++++++++++++++++++++++++++++++++++ 2 files changed, 228 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index cde87cec60..f9d9d0cf9e 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -236,24 +236,43 @@ HRESULT WINAPI D3DX11CompileFromFileA(const char *filename, const D3D10_SHADER_M ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) { - FIXME("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " - "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p stub.\n", + WCHAR filename_w[MAX_PATH]; + DWORD len; + + TRACE("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " + "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); - return E_NOTIMPL; + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + MultiByteToWideChar(CP_ACP, 0, filename, -1, filename_w, len); + + return D3DX11CompileFromFileW(filename_w, defines, include, entry_point, target, + sflags, eflags, pump, shader, error_messages, hresult); } HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) { - FIXME("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " - "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p stub.\n", + HRESULT hr; + + TRACE("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " + "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", debugstr_w(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); - return E_NOTIMPL; + if (pump) + FIXME("Unimplemented ID3DX11ThreadPump handling.\n"); + + if (!include) + include = D3D_COMPILE_STANDARD_FILE_INCLUDE; + + hr = D3DCompileFromFile(filename, defines, include, entry_point, target, sflags, eflags, shader, error_messages); + if (hresult) + *hresult = hr; + + return hr; } HRESULT WINAPI D3DX11CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, ID3DX11DataLoader **loader) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index f7ced893b0..90d3417299 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -22,6 +22,63 @@ #include "d3dx11.h" #include "wine/test.h" +static WCHAR temp_dir[MAX_PATH]; + +static BOOL create_file(const WCHAR *filename, const char *data, const unsigned int size, WCHAR *out_path) +{ + WCHAR path[MAX_PATH]; + DWORD written; + HANDLE file; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + if (WriteFile(file, data, size, &written, NULL)) + { + CloseHandle(file); + + if (out_path) + lstrcpyW(out_path, path); + return TRUE; + } + + CloseHandle(file); + return FALSE; +} + +static void delete_file(const WCHAR *filename) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + DeleteFileW(path); +} + +static BOOL create_directory(const WCHAR *dir) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, dir); + return CreateDirectoryW(path, NULL); +} + +static void delete_directory(const WCHAR *dir) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, dir); + RemoveDirectoryW(path); +} + static void test_D3DX11CreateAsyncMemoryLoader(void) { ID3DX11DataLoader *loader; @@ -205,9 +262,155 @@ static void test_D3DX11CreateAsyncResourceLoader(void) ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); } +static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, + const char *filename, const void *parent_data, const void **data, UINT *bytes) +{ + static const char include1[] = + "#define LIGHT float4(0.0f, 0.2f, 0.5f, 1.0f)\n"; + static const char include2[] = + "#include \"include1.h\"\n" + "float4 light_color = LIGHT;\n"; + char *buffer; + + trace("filename %s.\n", filename); + trace("parent_data %p: %s.\n", parent_data, parent_data ? (char *)parent_data : "(null)"); + + if (!strcmp(filename, "include1.h")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, strlen(include1)); + CopyMemory(buffer, include1, strlen(include1)); + *bytes = strlen(include1); + ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type); + ok(parent_data != NULL && !strncmp(include2, parent_data, strlen(include2)), + "Wrong parent_data value.\n"); + } + else if (!strcmp(filename, "include\\include2.h")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, strlen(include2)); + CopyMemory(buffer, include2, strlen(include2)); + *bytes = strlen(include2); + ok(!parent_data, "Wrong parent_data value.\n"); + ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type); + } + else + { + ok(0, "Unexpected #include for file %s.\n", filename); + return E_INVALIDARG; + } + + *data = buffer; + return S_OK; +} + +static HRESULT WINAPI test_d3dinclude_close(ID3DInclude *iface, const void *data) +{ + HeapFree(GetProcessHeap(), 0, (void *)data); + return S_OK; +} + +static const struct ID3DIncludeVtbl test_d3dinclude_vtbl = +{ + test_d3dinclude_open, + test_d3dinclude_close +}; + +struct test_d3dinclude +{ + ID3DInclude ID3DInclude_iface; +}; + +static void test_D3DX11CompileFromFile(void) +{ + WCHAR filename[MAX_PATH], directory[MAX_PATH]; + ID3D10Blob *blob = NULL, *errors = NULL; + struct test_d3dinclude include; + CHAR filename_a[MAX_PATH]; + HRESULT hr, result; + DWORD len; + static const char ps_code[] = + "#include \"include\\include2.h\"\n" + "\n" + "float4 main() : COLOR\n" + "{\n" + " return light_color;\n" + "}"; + static const char include1[] = + "#define LIGHT float4(0.0f, 0.2f, 0.5f, 1.0f)\n"; + static const char include1_wrong[] = + "#define LIGHT nope\n"; + static const char include2[] = + "#include \"include1.h\"\n" + "float4 light_color = LIGHT;\n"; + + include.ID3DInclude_iface.lpVtbl = &test_d3dinclude_vtbl; + + create_file(L"source.ps", ps_code, strlen(ps_code), filename); + create_directory(L"include"); + create_file(L"include\\include1.h", include1_wrong, strlen(include1_wrong), NULL); + create_file(L"include1.h", include1, strlen(include1), NULL); + create_file(L"include\\include2.h", include2, strlen(include2), NULL); + + hr = D3DX11CompileFromFileW(filename, NULL, &include.ID3DInclude_iface, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); + todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + /* Windows always seems to resolve includes from the initial file location + * instead of using the immediate parent, as it would be the case for + * standard C preprocessor includes. */ + hr = D3DX11CompileFromFileW(filename, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); + todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + hr = D3DX11CompileFromFileA(filename_a, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); + todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + GetCurrentDirectoryW(MAX_PATH, directory); + SetCurrentDirectoryW(temp_dir); + + hr = D3DX11CompileFromFileW(L"source.ps", NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); + todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + SetCurrentDirectoryW(directory); + + delete_file(L"source.ps"); + delete_file(L"include\\include1.h"); + delete_file(L"include1.h"); + delete_file(L"include\\include2.h"); + delete_directory(L"include"); +} + START_TEST(d3dx11) { test_D3DX11CreateAsyncMemoryLoader(); test_D3DX11CreateAsyncFileLoader(); test_D3DX11CreateAsyncResourceLoader(); + test_D3DX11CompileFromFile(); } -- 2.27.0

1 0

[PATCH 2/3] d3dcompiler: Implement D3DCompileFromFile().
by Jactry Zeng 31 Jul '20

31 Jul '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 47 ++++++++++++++++++++++--- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 49 +++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index b3dd39a6f2..41bd01849a 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -1003,13 +1003,52 @@ HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const c return E_NOTIMPL; } -HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, +HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors) { - FIXME("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p\n", - debugstr_w(filename), defines, includes, debugstr_a(entrypoint), debugstr_a(target), flags1, flags2, code, errors); + CHAR filename_a[MAX_PATH], *source = NULL; + SIZE_T source_size; + DWORD read_size; + HANDLE file; + HRESULT hr; + ULONG len; - return E_NOTIMPL; + TRACE("filename %s, defines %p, include %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p.\n", + debugstr_w(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), flags1, flags2, code, errors); + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + source_size = GetFileSize(file, NULL); + if (source_size == INVALID_FILE_SIZE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto end; + } + + if (!(source = heap_alloc(source_size))) + { + hr = E_OUTOFMEMORY; + goto end; + } + + if (!ReadFile(file, source, source_size, &read_size, NULL) || (read_size != source_size)) + { + WARN("Failed to read file contents.\n"); + hr = E_FAIL; + goto end; + } + + len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + + hr = D3DCompile(source, source_size, filename_a, defines, include, entrypoint, target, flags1, flags2, code, errors); + +end: + heap_free(source); + CloseHandle(file); + return hr; } HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index cf13574c52..0614edf988 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -28,6 +28,8 @@ static pD3DCompile ppD3DCompile; static HRESULT (WINAPI *pD3DCompile2)(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, UINT secondary_flags, const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); +static HRESULT (WINAPI *pD3DCompileFromFile)(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, + const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors); static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); struct vec2 @@ -1330,6 +1332,7 @@ static BOOL load_d3dcompiler(void) #if D3D_COMPILER_VERSION == 47 if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; pD3DCompile2 = (void*)GetProcAddress(module, "D3DCompile2"); + pD3DCompileFromFile = (void*)GetProcAddress(module, "D3DCompileFromFile"); #else if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; #endif @@ -1491,6 +1494,42 @@ static void test_d3dcompile(void) blob = NULL; } + hr = pD3DCompileFromFile(L"nonexistent", NULL, NULL, "main", "vs_2_0", 0, 0, &blob, &errors); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got hr %#x.\n", hr); + ok(!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + + hr = pD3DCompileFromFile(filename, NULL, NULL, "main", "ps_2_0", 0, 0, &blob, &errors); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(!blob, "Got unexpected blob.\n"); + ok(!!errors, "Got unexpected errors.\n"); + trace("%s.\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + errors = NULL; + + hr = pD3DCompileFromFile(filename, NULL, &include.ID3DInclude_iface, "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + /* Windows always seems to resolve includes from the initial file location + * instead of using the immediate parent, as it would be the case for + * standard C preprocessor includes. */ + hr = pD3DCompileFromFile(filename, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + GetCurrentDirectoryW(MAX_PATH, directory); SetCurrentDirectoryW(temp_dir); @@ -1516,6 +1555,16 @@ static void test_d3dcompile(void) blob = NULL; } + hr = pD3DCompileFromFile(L"source.ps", NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + SetCurrentDirectoryW(directory); cleanup: -- 2.27.0

1 0

[PATCH 1/3] d3dcompiler: Add D3D_COMPILE_STANDARD_FILE_INCLUDE support for D3DCompile2().
by Jactry Zeng 31 Jul '20

31 Jul '20

This patch includes some improvements from Matteo. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 82 +++++++++ dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 250 ++++++++++++++++++++++++++ include/d3dcompiler.h | 2 + 3 files changed, 334 insertions(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index c400b83d8d..b3dd39a6f2 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -829,12 +829,88 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co return hr; } +static HRESULT WINAPI d3dcompiler_include_from_file_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, + const char *filename, const void *parent_data, const void **data, UINT *bytes) +{ + char *fullpath = NULL, *buffer = NULL, current_dir[MAX_PATH + 1]; + const char *initial_dir; + SIZE_T size; + HANDLE file; + ULONG read; + DWORD len; + + if ((initial_dir = strrchr(initial_filename, '\\'))) + { + len = initial_dir - initial_filename + 1; + initial_dir = initial_filename; + } + else + { + len = GetCurrentDirectoryA(MAX_PATH, current_dir); + current_dir[len] = '\\'; + len++; + initial_dir = current_dir; + } + fullpath = heap_alloc(len + strlen(filename) + 1); + if (!fullpath) + return E_OUTOFMEMORY; + memcpy(fullpath, initial_dir, len); + strcpy(fullpath + len, filename); + + file = CreateFileA(fullpath, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + goto error; + + TRACE("Include file found at %s.\n", debugstr_a(fullpath)); + + size = GetFileSize(file, NULL); + if (size == INVALID_FILE_SIZE) + goto error; + buffer = heap_alloc(size); + if (!buffer) + goto error; + if (!ReadFile(file, buffer, size, &read, NULL) || read != size) + goto error; + + *bytes = size; + *data = buffer; + + heap_free(fullpath); + CloseHandle(file); + return S_OK; + +error: + heap_free(fullpath); + heap_free(buffer); + CloseHandle(file); + WARN("Returning E_FAIL.\n"); + return E_FAIL; +} + +static HRESULT WINAPI d3dcompiler_include_from_file_close(ID3DInclude *iface, const void *data) +{ + heap_free((void *)data); + return S_OK; +} + +const struct ID3DIncludeVtbl d3dcompiler_include_from_file_vtbl = +{ + d3dcompiler_include_from_file_open, + d3dcompiler_include_from_file_close +}; + +struct d3dcompiler_include_from_file +{ + ID3DInclude ID3DInclude_iface; +}; + HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, UINT secondary_flags, const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages) { + struct d3dcompiler_include_from_file include_from_file; HRESULT hr; TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " @@ -850,6 +926,12 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen if (shader) *shader = NULL; if (error_messages) *error_messages = NULL; + if (include == D3D_COMPILE_STANDARD_FILE_INCLUDE) + { + include_from_file.ID3DInclude_iface.lpVtbl = &d3dcompiler_include_from_file_vtbl; + include = &include_from_file.ID3DInclude_iface; + } + EnterCriticalSection(&wpp_mutex); hr = preprocess_shader(data, data_size, filename, defines, include, error_messages); diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index ed148ff112..cf13574c52 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -25,6 +25,9 @@ static pD3DCompile ppD3DCompile; +static HRESULT (WINAPI *pD3DCompile2)(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, + ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); struct vec2 @@ -37,6 +40,63 @@ struct vec4 float x, y, z, w; }; +static WCHAR temp_dir[MAX_PATH]; + +static BOOL create_file(const WCHAR *filename, const char *data, const unsigned int size, WCHAR *out_path) +{ + WCHAR path[MAX_PATH]; + DWORD written; + HANDLE file; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + if (WriteFile(file, data, size, &written, NULL)) + { + CloseHandle(file); + + if (out_path) + lstrcpyW(out_path, path); + return TRUE; + } + + CloseHandle(file); + return FALSE; +} + +static void delete_file(const WCHAR *filename) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + DeleteFileW(path); +} + +static BOOL create_directory(const WCHAR *dir) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, dir); + return CreateDirectoryW(path, NULL); +} + +static void delete_directory(const WCHAR *dir) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, dir); + RemoveDirectoryW(path); +} + #define compile_shader(a, b) compile_shader_(__LINE__, a, b) static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const char *target) { @@ -1269,6 +1329,7 @@ static BOOL load_d3dcompiler(void) #if D3D_COMPILER_VERSION == 47 if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; + pD3DCompile2 = (void*)GetProcAddress(module, "D3DCompile2"); #else if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; #endif @@ -1277,6 +1338,194 @@ static BOOL load_d3dcompiler(void) return TRUE; } +static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, + const char *filename, const void *parent_data, const void **data, UINT *bytes) +{ + static const char include1[] = + "#define LIGHT float4(0.0f, 0.2f, 0.5f, 1.0f)\n"; + static const char include2[] = + "#include \"include1.h\"\n" + "float4 light_color = LIGHT;\n"; + char *buffer; + + trace("filename %s.\n", filename); + trace("parent_data %p: %s.\n", parent_data, parent_data ? (char *)parent_data : "(null)"); + + if (!strcmp(filename, "include1.h")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, strlen(include1)); + CopyMemory(buffer, include1, strlen(include1)); + *bytes = strlen(include1); + ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type); + ok(parent_data != NULL && !strncmp(include2, parent_data, strlen(include2)), + "Wrong parent_data value.\n"); + } + else if (!strcmp(filename, "include\\include2.h")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, strlen(include2)); + CopyMemory(buffer, include2, strlen(include2)); + *bytes = strlen(include2); + ok(!parent_data, "Wrong parent_data value.\n"); + ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type); + } + else + { + ok(0, "Unexpected #include for file %s.\n", filename); + return D3DERR_INVALIDCALL; + } + + *data = buffer; + return S_OK; +} + +static HRESULT WINAPI test_d3dinclude_close(ID3DInclude *iface, const void *data) +{ + HeapFree(GetProcessHeap(), 0, (void *)data); + return S_OK; +} + +static const struct ID3DIncludeVtbl test_d3dinclude_vtbl = +{ + test_d3dinclude_open, + test_d3dinclude_close +}; + +struct test_d3dinclude +{ + ID3DInclude ID3DInclude_iface; +}; + +static void test_d3dcompile(void) +{ + WCHAR filename[MAX_PATH], directory[MAX_PATH]; + ID3D10Blob *blob = NULL, *errors = NULL; + struct test_d3dinclude include; + CHAR filename_a[MAX_PATH]; + HRESULT hr; + DWORD len; + static const char ps_code[] = + "#include \"include\\include2.h\"\n" + "\n" + "float4 main() : COLOR\n" + "{\n" + " return light_color;\n" + "}"; + static const char include1[] = + "#define LIGHT float4(0.0f, 0.2f, 0.5f, 1.0f)\n"; + static const char include1_wrong[] = + "#define LIGHT nope\n"; + static const char include2[] = + "#include \"include1.h\"\n" + "float4 light_color = LIGHT;\n"; + + include.ID3DInclude_iface.lpVtbl = &test_d3dinclude_vtbl; + + create_file(L"source.ps", ps_code, strlen(ps_code), filename); + create_directory(L"include"); + create_file(L"include\\include1.h", include1_wrong, strlen(include1_wrong), NULL); + create_file(L"include1.h", include1, strlen(include1), NULL); + create_file(L"include\\include2.h", include2, strlen(include2), NULL); + + len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + + hr = ppD3DCompile(ps_code, sizeof(ps_code), filename_a, NULL, &include.ID3DInclude_iface, "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + /* Also skip tests of D3D_COMPILE_STANDARD_FILE_INCLUDE for D3DCompile() from + * d3dcompiler_43 or eailier since they crash on Windows. */ + if (!pD3DCompile2) + { + skip("D3DCompile2() isn't supported.\n"); + goto cleanup; + } + + hr = ppD3DCompile(ps_code, sizeof(ps_code), NULL, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", "ps_2_0", 0, 0, &blob, &errors); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(!blob, "Got unexpected blob.\n"); + ok(!!errors, "Got unexpected errors.\n"); + ID3D10Blob_Release(errors); + errors = NULL; + + /* Windows always seems to resolve includes from the initial file location + * instead of using the immediate parent, as it would be the case for + * standard C preprocessor includes. */ + hr = ppD3DCompile(ps_code, sizeof(ps_code), filename_a, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + hr = pD3DCompile2(ps_code, sizeof(ps_code), filename_a, NULL, &include.ID3DInclude_iface, + "main", "ps_2_0", 0, 0, 0, NULL, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + hr = pD3DCompile2(ps_code, sizeof(ps_code), filename_a, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", "ps_2_0", 0, 0, 0, NULL, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + GetCurrentDirectoryW(MAX_PATH, directory); + SetCurrentDirectoryW(temp_dir); + + hr = ppD3DCompile(ps_code, sizeof(ps_code), "source.ps", NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + hr = pD3DCompile2(ps_code, sizeof(ps_code), "source.ps", NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", "ps_2_0", 0, 0, 0, NULL, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + SetCurrentDirectoryW(directory); + +cleanup: + delete_file(L"source.ps"); + delete_file(L"include\\include1.h"); + delete_file(L"include1.h"); + delete_file(L"include\\include2.h"); + delete_directory(L"include"); +} + START_TEST(hlsl_d3d9) { HMODULE mod; @@ -1309,4 +1558,5 @@ START_TEST(hlsl_d3d9) test_constant_table(); test_fail(); + test_d3dcompile(); } diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index bd1b3d1d44..b892950aa7 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -81,6 +81,8 @@ static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e #define D3D_DISASM_INSTRUCTION_ONLY 0x00000040 #define D3D_DISASM_PRINT_HEX_LITERALS 0x00000080 +#define D3D_COMPILE_STANDARD_FILE_INCLUDE ((ID3DInclude *)(UINT_PTR)1) + HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); -- 2.27.0

1 0

[PATCH] dmime: Parse TimeSig track data.
by Michael Stefaniuc 30 Jul '20

30 Jul '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Pass the buffer/expected size to stream_chunk_get_data() dlls/dmime/timesigtrack.c | 54 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 697b3e3593b..a85f134e0f1 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -37,6 +37,11 @@ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, IDirectMusicTrack_iface); } +static inline IDirectMusicTimeSigTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ret_iface) { @@ -207,10 +212,55 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; + +static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *stream, + struct chunk_entry *timesig) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = timesig}; + DMUS_IO_TIMESIGNATURE_ITEM item; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(timesig)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if (chunk.id != DMUS_FOURCC_TIMESIGNATURE_TRACK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &item, sizeof(item)))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + + TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); + TRACE(" - lTime %d\n", item.lTime); + TRACE(" - bBeatsPerMeasure %d\n", item.bBeatsPerMeasure); + TRACE(" - bBeat %d\n", item.bBeat); + TRACE(" - wGridsPerBeat %d\n", item.wGridsPerBeat); + } + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_TIMESIGTRACK_LIST) + hr = parse_timetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.26.2

2 1

[PATCH v2 1/2] ntoskrnl.exe/tests: Add some tests for file names.
by Zebediah Figura 30 Jul '20

30 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I know of no application yet that requires this behaviour, or in fact even tries to query file/object information from a device file. These tests are rather meant to illustrate how ObjectNameInformation is implemented for files, which in turn may help to inform our implementation for server-based objects such as regular files and named pipes. dlls/ntoskrnl.exe/tests/driver.c | 120 +++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 114 +++++++++++++++++++++++++++ 2 files changed, 226 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0671a56efc7..d3f62879a40 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -37,6 +37,19 @@ #include "utils.h" +/* memcmp() isn't exported from ntoskrnl on i386 */ +static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) +{ + const unsigned char *p1, *p2; + + for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) + { + if (*p1 < *p2) return -1; + if (*p1 > *p2) return 1; + } + return 0; +} + static const WCHAR device_name[] = {'\\','D','e','v','i','c','e', '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; static const WCHAR upper_name[] = {'\\','D','e','v','i','c','e', @@ -55,6 +68,13 @@ static PETHREAD create_irp_thread; NTSTATUS WINAPI ZwQueryInformationProcess(HANDLE,PROCESSINFOCLASS,void*,ULONG,ULONG*); +struct file_context +{ + DWORD id; + ULONG namelen; + WCHAR name[10]; +}; + static void *get_proc_address(const char *name) { UNICODE_STRING name_u; @@ -2175,15 +2195,15 @@ static NTSTATUS get_fscontext(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *inf { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; char *buffer = irp->AssociatedIrp.SystemBuffer; - DWORD *context = stack->FileObject->FsContext; + struct file_context *context = stack->FileObject->FsContext; - if (!buffer || !context) + if (!buffer) return STATUS_ACCESS_VIOLATION; if (length < sizeof(DWORD)) return STATUS_BUFFER_TOO_SMALL; - *(DWORD*)buffer = *context; + *(DWORD*)buffer = context->id; *info = sizeof(DWORD); return STATUS_SUCCESS; } @@ -2271,13 +2291,21 @@ static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - DWORD *context = ExAllocatePool(PagedPool, sizeof(*context)); + struct file_context *context = ExAllocatePool(PagedPool, sizeof(*context)); - last_created_file = irpsp->FileObject; - ++create_count; - if (context) - *context = create_count; + if (!context) + { + irp->IoStatus.Status = STATUS_NO_MEMORY; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_NO_MEMORY; + } + + context->id = ++create_count; + context->namelen = min(irpsp->FileObject->FileName.Length, sizeof(context->name)); + memcpy(context->name, irpsp->FileObject->FileName.Buffer, context->namelen); irpsp->FileObject->FsContext = context; + + last_created_file = irpsp->FileObject; create_caller_thread = KeGetCurrentThread(); create_irp_thread = irp->Tail.Overlay.Thread; @@ -2356,6 +2384,81 @@ static NTSTATUS WINAPI driver_FlushBuffers(DEVICE_OBJECT *device, IRP *irp) return STATUS_PENDING; } +static BOOL compare_file_name(const struct file_context *context, const WCHAR *expect) +{ + return context->namelen == wcslen(expect) * sizeof(WCHAR) + && !kmemcmp(context->name, expect, context->namelen); +} + +static NTSTATUS WINAPI driver_QueryInformation(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + NTSTATUS ret; + + switch (stack->Parameters.QueryFile.FileInformationClass) + { + case FileNameInformation: + { + const struct file_context *context = stack->FileObject->FsContext; + FILE_NAME_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; + ULONG len; + + if (stack->Parameters.QueryFile.Length < sizeof(*info)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (compare_file_name(context, L"\\notimpl")) + { + ret = STATUS_NOT_IMPLEMENTED; + break; + } + else if (compare_file_name(context, L"")) + { + ret = STATUS_INVALID_DEVICE_REQUEST; + break; + } + else if (compare_file_name(context, L"\\badparam")) + { + ret = STATUS_INVALID_PARAMETER; + break; + } + else if (compare_file_name(context, L"\\genfail")) + { + ret = STATUS_UNSUCCESSFUL; + break; + } + else if (compare_file_name(context, L"\\badtype")) + { + ret = STATUS_OBJECT_TYPE_MISMATCH; + break; + } + + len = stack->Parameters.QueryFile.Length - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); + if (len < context->namelen) + ret = STATUS_BUFFER_OVERFLOW; + else + { + len = context->namelen; + ret = STATUS_SUCCESS; + } + irp->IoStatus.Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + len; + info->FileNameLength = context->namelen; + memcpy(info->FileName, context->name, len); + break; + } + + default: + ret = STATUS_NOT_IMPLEMENTED; + break; + } + + irp->IoStatus.Status = ret; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return ret; +} + static NTSTATUS WINAPI driver_Close(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -2400,6 +2503,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_CREATE] = driver_Create; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_IoControl; driver->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = driver_FlushBuffers; + driver->MajorFunction[IRP_MJ_QUERY_INFORMATION] = driver_QueryInformation; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index b4ef9d0dcb7..61b1e401c56 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -493,6 +493,119 @@ static void test_return_status(void) ok(ret_size == 3, "got size %u\n", ret_size); } +static BOOL compare_unicode_string(const WCHAR *buffer, ULONG len, const WCHAR *expect) +{ + return len == wcslen(expect) * sizeof(WCHAR) && !memcmp(buffer, expect, len); +} + +static void test_object_info(void) +{ + char buffer[200]; + OBJECT_NAME_INFORMATION *name_info = (OBJECT_NAME_INFORMATION *)buffer; + OBJECT_TYPE_INFORMATION *type_info = (OBJECT_TYPE_INFORMATION *)buffer; + FILE_NAME_INFORMATION *file_info = (FILE_NAME_INFORMATION *)buffer; + HANDLE file; + NTSTATUS status; + IO_STATUS_BLOCK io; + ULONG size; + + status = NtQueryObject(device, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + todo_wine ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryObject(device, ObjectTypeInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(type_info->TypeName.Buffer, type_info->TypeName.Length, L"File"), + "wrong name %s\n", debugstr_wn(type_info->TypeName.Buffer, type_info->TypeName.Length / sizeof(WCHAR))); + + status = NtQueryInformationFile(device, &io, buffer, sizeof(buffer), FileNameInformation); + todo_wine ok(status == STATUS_INVALID_DEVICE_REQUEST, "got %#x\n", status); + + file = CreateFileA("\\\\.\\WineTestDriver\\subfile", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + todo_wine ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + if (file == INVALID_HANDLE_VALUE) return; + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), &size); + ok(!status, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver\\subfile"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, size - 2, &size); + ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver\\subfil"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(*name_info), &size); + ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + + status = NtQueryObject(file, ObjectTypeInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(type_info->TypeName.Buffer, type_info->TypeName.Length, L"File"), + "wrong name %s\n", debugstr_wn(type_info->TypeName.Buffer, type_info->TypeName.Length / sizeof(WCHAR))); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(file_info->FileName, file_info->FileNameLength, L"\\subfile"), + "wrong name %s\n", debugstr_wn(file_info->FileName, file_info->FileNameLength / sizeof(WCHAR))); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\notimpl", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_NOT_IMPLEMENTED, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\badparam", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\genfail", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\badtype", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "got %#x\n", status); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "got %#x\n", status); + + CloseHandle(file); +} + static void test_driver3(void) { char filename[MAX_PATH]; @@ -644,6 +757,7 @@ START_TEST(ntoskrnl) test_load_driver(service2); test_file_handles(); test_return_status(); + test_object_info(); /* We need a separate ioctl to call IoDetachDevice(); calling it in the * driver unload routine causes a live-lock. */ -- 2.27.0

1 1

[PATCH v2] amstream: Return correct media type info when enumerating AMAudioStream media types.
by Gijs Vermeulen 30 Jul '20

30 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/audiostream.c | 21 ++++++++++++++++++++- dlls/amstream/tests/amstream.c | 11 ++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 072850aae7..dc6c810d19 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -837,6 +837,17 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface); + static const WAVEFORMATEX wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .nAvgBytesPerSec = 11025 * 2, + .nBlockAlign = 2, + .wBitsPerSample = 16, + .cbSize = 0, + }; + TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count); if (!ret_count) @@ -847,7 +858,15 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, mts[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); memset(mts[0], 0, sizeof(AM_MEDIA_TYPE)); mts[0]->majortype = MEDIATYPE_Audio; - mts[0]->subtype = MEDIASUBTYPE_PCM; + mts[0]->subtype = GUID_NULL; + mts[0]->bFixedSizeSamples = TRUE; + mts[0]->bTemporalCompression = FALSE; + mts[0]->lSampleSize = 2; + mts[0]->formattype = FORMAT_WaveFormatEx; + mts[0]->cbFormat = sizeof(WAVEFORMATEX); + mts[0]->pbFormat = CoTaskMemAlloc(sizeof(WAVEFORMATEX)); + memcpy(mts[0]->pbFormat, &wfx, sizeof(WAVEFORMATEX)); + ++enum_media_types->index; *ret_count = 1; return count == 1 ? S_OK : S_FALSE; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 130f9f0e0e..cf66538a7a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2515,20 +2515,21 @@ static void test_media_types(void) ok(count == 1, "Got count %u.\n", count); ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s\n", wine_dbgstr_guid(&pmt->majortype)); - todo_wine ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", + ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", wine_dbgstr_guid(&pmt->subtype)); - todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); - todo_wine ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); - todo_wine ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", wine_dbgstr_guid(&pmt->formattype)); ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); - todo_wine ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); + ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); ok(!memcmp(pmt->pbFormat, &expect_wfx, pmt->cbFormat), "Format blocks didn't match.\n"); hr = IPin_QueryAccept(pin, pmt); ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + CoTaskMemFree(pmt->pbFormat); CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); -- 2.27.0

2 1

[PATCH] winevulkan: Avoid returning 0 for swapchain maxImageCount.
by Georg Lehmann 30 Jul '20

30 Jul '20

Many Windows games do not expect that maxImageCount can be set to 0. A value of 0 means that there is no limit on the number of images. Nvidia reports 8 on Windows, AMD 16. Based on a patch by Józef Kucia. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/vulkan.c | 41 +++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 8 ++----- dlls/winevulkan/vulkan_thunks.h | 4 ++++ 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index fc0e2182dd..6a039bd268 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -183,12 +183,12 @@ FUNCTION_OVERRIDES = { # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, - "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_get_surface_capabilities2 - "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_win32_surface diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index be614f1cef..1e83defa18 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1555,6 +1555,47 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } +static inline void adjust_max_image_count(VkSurfaceCapabilitiesKHR* capabilities) +{ + /* Many Windows games do not expect that maxImageCount can be set to 0. + * A value of 0 means that there is no limit on the number of images. + * Nvidia reports 8 on Windows, AMD 16.*/ + if (!capabilities->maxImageCount) + { + capabilities->maxImageCount = 16; + } +} + +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice phys_dev, + VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *capabilities) +{ + VkResult res; + + TRACE("%p, 0x%s, %p\n", phys_dev, wine_dbgstr_longlong(surface), capabilities); + + res = thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, surface, capabilities); + + if (res == VK_SUCCESS) + adjust_max_image_count(capabilities); + + return res; +} + +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities) +{ + VkResult res; + + TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); + + res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, surface_info, capabilities); + + if (res == VK_SUCCESS) + adjust_max_image_count(&capabilities->surfaceCapabilities); + + return res; +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fcefa6a767..4f75a4ec7c 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4998,26 +4998,22 @@ static VkResult WINAPI wine_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesC return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(physicalDevice->phys_dev, pCombinationCount, pCombinations); } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) { #if defined(USE_STRUCT_CONVERSION) VkResult result; VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host; - TRACE("%p, %p, %p\n", physicalDevice, pSurfaceInfo, pSurfaceCapabilities); - convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(pSurfaceInfo, &pSurfaceInfo_host); result = physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physicalDevice->phys_dev, &pSurfaceInfo_host, pSurfaceCapabilities); return result; #else - TRACE("%p, %p, %p\n", physicalDevice, pSurfaceInfo, pSurfaceCapabilities); return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physicalDevice->phys_dev, pSurfaceInfo, pSurfaceCapabilities); #endif } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) { - TRACE("%p, 0x%s, %p\n", physicalDevice, wine_dbgstr_longlong(surface), pSurfaceCapabilities); return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice->phys_dev, surface, pSurfaceCapabilities); } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index f2d650decf..d35e8c4269 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -42,6 +42,8 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties); void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities); +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) DECLSPEC_HIDDEN; @@ -51,6 +53,8 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physic VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; void thunk_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; void thunk_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; typedef struct VkAcquireNextImageInfoKHR_host { -- 2.28.0

3 2

[PATCH 1/2] ntoskrnl.exe/tests: Add some tests for file names.
by Zebediah Figura 30 Jul '20

30 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I know of no application yet that requires this behaviour, or in fact even tries to query file/object information from a device file. These tests are rather meant to illustrate how ObjectNameInformation is implemented for files, which in turn may help to inform our implementation for server-based objects such as regular files and named pipes. dlls/ntoskrnl.exe/tests/driver.c | 120 +++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 114 +++++++++++++++++++++++++++ 2 files changed, 226 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0671a56efc7..d3f62879a40 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -37,6 +37,19 @@ #include "utils.h" +/* memcmp() isn't exported from ntoskrnl on i386 */ +static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) +{ + const unsigned char *p1, *p2; + + for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) + { + if (*p1 < *p2) return -1; + if (*p1 > *p2) return 1; + } + return 0; +} + static const WCHAR device_name[] = {'\\','D','e','v','i','c','e', '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; static const WCHAR upper_name[] = {'\\','D','e','v','i','c','e', @@ -55,6 +68,13 @@ static PETHREAD create_irp_thread; NTSTATUS WINAPI ZwQueryInformationProcess(HANDLE,PROCESSINFOCLASS,void*,ULONG,ULONG*); +struct file_context +{ + DWORD id; + ULONG namelen; + WCHAR name[10]; +}; + static void *get_proc_address(const char *name) { UNICODE_STRING name_u; @@ -2175,15 +2195,15 @@ static NTSTATUS get_fscontext(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *inf { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; char *buffer = irp->AssociatedIrp.SystemBuffer; - DWORD *context = stack->FileObject->FsContext; + struct file_context *context = stack->FileObject->FsContext; - if (!buffer || !context) + if (!buffer) return STATUS_ACCESS_VIOLATION; if (length < sizeof(DWORD)) return STATUS_BUFFER_TOO_SMALL; - *(DWORD*)buffer = *context; + *(DWORD*)buffer = context->id; *info = sizeof(DWORD); return STATUS_SUCCESS; } @@ -2271,13 +2291,21 @@ static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - DWORD *context = ExAllocatePool(PagedPool, sizeof(*context)); + struct file_context *context = ExAllocatePool(PagedPool, sizeof(*context)); - last_created_file = irpsp->FileObject; - ++create_count; - if (context) - *context = create_count; + if (!context) + { + irp->IoStatus.Status = STATUS_NO_MEMORY; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_NO_MEMORY; + } + + context->id = ++create_count; + context->namelen = min(irpsp->FileObject->FileName.Length, sizeof(context->name)); + memcpy(context->name, irpsp->FileObject->FileName.Buffer, context->namelen); irpsp->FileObject->FsContext = context; + + last_created_file = irpsp->FileObject; create_caller_thread = KeGetCurrentThread(); create_irp_thread = irp->Tail.Overlay.Thread; @@ -2356,6 +2384,81 @@ static NTSTATUS WINAPI driver_FlushBuffers(DEVICE_OBJECT *device, IRP *irp) return STATUS_PENDING; } +static BOOL compare_file_name(const struct file_context *context, const WCHAR *expect) +{ + return context->namelen == wcslen(expect) * sizeof(WCHAR) + && !kmemcmp(context->name, expect, context->namelen); +} + +static NTSTATUS WINAPI driver_QueryInformation(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + NTSTATUS ret; + + switch (stack->Parameters.QueryFile.FileInformationClass) + { + case FileNameInformation: + { + const struct file_context *context = stack->FileObject->FsContext; + FILE_NAME_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; + ULONG len; + + if (stack->Parameters.QueryFile.Length < sizeof(*info)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (compare_file_name(context, L"\\notimpl")) + { + ret = STATUS_NOT_IMPLEMENTED; + break; + } + else if (compare_file_name(context, L"")) + { + ret = STATUS_INVALID_DEVICE_REQUEST; + break; + } + else if (compare_file_name(context, L"\\badparam")) + { + ret = STATUS_INVALID_PARAMETER; + break; + } + else if (compare_file_name(context, L"\\genfail")) + { + ret = STATUS_UNSUCCESSFUL; + break; + } + else if (compare_file_name(context, L"\\badtype")) + { + ret = STATUS_OBJECT_TYPE_MISMATCH; + break; + } + + len = stack->Parameters.QueryFile.Length - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); + if (len < context->namelen) + ret = STATUS_BUFFER_OVERFLOW; + else + { + len = context->namelen; + ret = STATUS_SUCCESS; + } + irp->IoStatus.Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + len; + info->FileNameLength = context->namelen; + memcpy(info->FileName, context->name, len); + break; + } + + default: + ret = STATUS_NOT_IMPLEMENTED; + break; + } + + irp->IoStatus.Status = ret; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return ret; +} + static NTSTATUS WINAPI driver_Close(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -2400,6 +2503,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_CREATE] = driver_Create; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_IoControl; driver->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = driver_FlushBuffers; + driver->MajorFunction[IRP_MJ_QUERY_INFORMATION] = driver_QueryInformation; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index b4ef9d0dcb7..61b1e401c56 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -493,6 +493,119 @@ static void test_return_status(void) ok(ret_size == 3, "got size %u\n", ret_size); } +static BOOL compare_unicode_string(const WCHAR *buffer, ULONG len, const WCHAR *expect) +{ + return len == wcslen(expect) * sizeof(WCHAR) && !memcmp(buffer, expect, len); +} + +static void test_object_info(void) +{ + char buffer[200]; + OBJECT_NAME_INFORMATION *name_info = (OBJECT_NAME_INFORMATION *)buffer; + OBJECT_TYPE_INFORMATION *type_info = (OBJECT_TYPE_INFORMATION *)buffer; + FILE_NAME_INFORMATION *file_info = (FILE_NAME_INFORMATION *)buffer; + HANDLE file; + NTSTATUS status; + IO_STATUS_BLOCK io; + ULONG size; + + status = NtQueryObject(device, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + todo_wine ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryObject(device, ObjectTypeInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(type_info->TypeName.Buffer, type_info->TypeName.Length, L"File"), + "wrong name %s\n", debugstr_wn(type_info->TypeName.Buffer, type_info->TypeName.Length / sizeof(WCHAR))); + + status = NtQueryInformationFile(device, &io, buffer, sizeof(buffer), FileNameInformation); + todo_wine ok(status == STATUS_INVALID_DEVICE_REQUEST, "got %#x\n", status); + + file = CreateFileA("\\\\.\\WineTestDriver\\subfile", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + todo_wine ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + if (file == INVALID_HANDLE_VALUE) return; + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), &size); + ok(!status, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver\\subfile"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, size - 2, &size); + ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver\\subfil"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(*name_info), &size); + ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + + status = NtQueryObject(file, ObjectTypeInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(type_info->TypeName.Buffer, type_info->TypeName.Length, L"File"), + "wrong name %s\n", debugstr_wn(type_info->TypeName.Buffer, type_info->TypeName.Length / sizeof(WCHAR))); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(file_info->FileName, file_info->FileNameLength, L"\\subfile"), + "wrong name %s\n", debugstr_wn(file_info->FileName, file_info->FileNameLength / sizeof(WCHAR))); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\notimpl", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_NOT_IMPLEMENTED, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\badparam", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\genfail", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\badtype", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "got %#x\n", status); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "got %#x\n", status); + + CloseHandle(file); +} + static void test_driver3(void) { char filename[MAX_PATH]; @@ -644,6 +757,7 @@ START_TEST(ntoskrnl) test_load_driver(service2); test_file_handles(); test_return_status(); + test_object_info(); /* We need a separate ioctl to call IoDetachDevice(); calling it in the * driver unload routine causes a live-lock. */ -- 2.27.0

2 2

[PATCH 1/3] amstream/tests: Split test_IDirectDrawStreamSample().
by Gijs Vermeulen 30 Jul '20

30 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/tests/amstream.c | 326 +++++++++++++++++++++++---------- 1 file changed, 225 insertions(+), 101 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 130f9f0e0e..17ff110f11 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2542,106 +2542,6 @@ static void test_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_IDirectDrawStreamSample(void) -{ - IDirectDrawMediaStream *ddraw_stream = NULL; - IDirectDrawStreamSample *sample = NULL; - IDirectDrawSurface *surface, *surface2; - IMediaStream *stream2, *stream = NULL; - DDSURFACEDESC desc = { sizeof(desc) }; - IAMMultiMediaStream *mmstream; - IDirectDrawSurface7 *surface7; - HRESULT hr; - RECT rect; - - if (!(mmstream = create_ammultimediastream())) - return; - if (!create_directdraw()) - { - IAMMultiMediaStream_Release(mmstream); - return; - } - - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryVideo, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (FAILED(hr)) goto error; - - hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (FAILED(hr)) goto error; - - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); - ok(hr == S_OK, "got 0x%08x\n", hr); - - surface = NULL; - hr = IDirectDrawStreamSample_GetSurface(sample, &surface, &rect); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(surface != NULL, "got %p\n", surface); - - /* Crashes on native. */ - if (0) - { - hr = IDirectDrawStreamSample_GetMediaStream(sample, NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); - } - - hr = IDirectDrawStreamSample_GetMediaStream(sample, &stream2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); - IMediaStream_Release(stream2); - - hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDirectDrawSurface7_Release(surface7); - - hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(desc.dwWidth == 100, "width %d\n", desc.dwWidth); - ok(desc.dwHeight == 100, "height %d\n", desc.dwHeight); - ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "format flags %08x\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount, "dwRGBBitCount %d\n", desc.ddpfPixelFormat.dwRGBBitCount); - IDirectDrawSurface_Release(surface); - IDirectDrawStreamSample_Release(sample); - - hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void **)&surface); - ok(hr == S_OK, "got 0x%08x\n", hr); - - EXPECT_REF(surface, 1); - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); - ok(hr == S_OK, "got 0x%08x\n", hr); - EXPECT_REF(surface, 2); - - surface2 = NULL; - SetRectEmpty(&rect); - hr = IDirectDrawStreamSample_GetSurface(sample, &surface2, &rect); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(surface == surface2, "got %p\n", surface2); - ok(rect.right > 0 && rect.bottom > 0, "got %d, %d\n", rect.right, rect.bottom); - EXPECT_REF(surface, 3); - IDirectDrawSurface_Release(surface2); - - hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - IDirectDrawStreamSample_Release(sample); - IDirectDrawSurface_Release(surface); - -error: - if (ddraw_stream) - IDirectDrawMediaStream_Release(ddraw_stream); - if (stream) - IMediaStream_Release(stream); - - release_directdraw(); - IAMMultiMediaStream_Release(mmstream); -} - static IUnknown *create_audio_data(void) { IUnknown *audio_data = NULL; @@ -5727,6 +5627,227 @@ static void test_audiostreamsample_get_audio_data(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_create_sample(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IDirectDrawSurface *surface; + IMediaStream *stream; + IDirectDraw *ddraw; + DDSURFACEDESC desc; + HRESULT hr; + RECT rect; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Crashes on native. */ + if (0) + { + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + SetRectEmpty(&rect); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, &rect, 0, &sample); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + EXPECT_REF(stream, 3); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine EXPECT_REF(stream, 4); + IDirectDrawStreamSample_Release(sample); + EXPECT_REF(stream, 3); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + EXPECT_REF(surface, 1); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(surface, 2); + IDirectDrawStreamSample_Release(sample); + EXPECT_REF(surface, 1); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, &rect, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDrawSurface_Release(surface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ddrawstreamsample_get_media_stream(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IMediaStream *stream, *stream2; + IDirectDraw *ddraw; + HRESULT hr; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + 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); + + /* Crashes on native. */ + if (0) + { + hr = IDirectDrawStreamSample_GetMediaStream(sample, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + todo_wine EXPECT_REF(stream, 4); + hr = IDirectDrawStreamSample_GetMediaStream(sample, &stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); + todo_wine EXPECT_REF(stream, 5); + IMediaStream_Release(stream2); + todo_wine EXPECT_REF(stream, 4); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ddrawstreamsample_get_surface(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawSurface *surface, *surface2; + DDSURFACEDESC desc = { sizeof(desc) }; + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IMediaStream *stream; + IDirectDraw *ddraw; + HRESULT hr; + RECT rect; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + 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); + + hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_GetSurface(sample, NULL, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_GetSurface(sample, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface != NULL, "Expected non-NULL surface.\n"); + IDirectDrawSurface_Release(surface); + + surface = NULL; + hr = IDirectDrawStreamSample_GetSurface(sample, &surface, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface != NULL, "Expected non-NULL surface.\n"); + + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(desc.dwWidth == 100, "Expected width 100, got %d.\n", desc.dwWidth); + ok(desc.dwHeight == 100, "Expected height 100, got %d.\n", desc.dwHeight); + ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Expected format flags DDPF_RGB, got %#x.\n", desc.ddpfPixelFormat.dwFlags); + ok(desc.ddpfPixelFormat.dwRGBBitCount, "Expected non-zero RGB bit count.\n"); + IDirectDrawSurface_Release(surface); + IDirectDrawStreamSample_Release(sample); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + EXPECT_REF(surface, 1); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(surface, 2); + + surface2 = NULL; + SetRectEmpty(&rect); + hr = IDirectDrawStreamSample_GetSurface(sample, &surface2, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface2 == surface, "Expected surface %p, got %p.\n", surface, surface2); + ok(rect.right > 0 && rect.bottom > 0, "Got rect %d, %d.\n", rect.right, rect.bottom); + EXPECT_REF(surface, 3); + IDirectDrawSurface_Release(surface2); + EXPECT_REF(surface, 2); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDrawSurface_Release(surface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { const WCHAR *test_avi_path; @@ -5743,7 +5864,6 @@ START_TEST(amstream) test_set_state(); test_enum_media_types(); test_media_types(); - test_IDirectDrawStreamSample(); test_avi_path = load_resource(L"test.avi"); @@ -5779,6 +5899,10 @@ START_TEST(amstream) test_ddrawstream_initialize(); test_ddrawstream_getsetdirectdraw(); test_ddrawstream_receive_connection(); + test_ddrawstream_create_sample(); + + test_ddrawstreamsample_get_media_stream(); + test_ddrawstreamsample_get_surface(); test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); -- 2.27.0

1 2

[PATCH 7/8] kernel32/tets: Add more AllocConsole tests.
by Jacek Caban 30 Jul '20

30 Jul '20

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

2 1

[PATCH 8/8] kernelbase: Use init_console_std_handles in AttachConsole.
by Jacek Caban 30 Jul '20

30 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 9 +++------ server/console.c | 14 -------------- server/protocol.def | 4 ---- 3 files changed, 3 insertions(+), 24 deletions(-)

1 0

[PATCH 6/8] kernelbase: Close handles allocated by AllocConsole in FreeConsole.
by Jacek Caban 30 Jul '20

30 Jul '20

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

1 0

[PATCH 5/8] kernelbase: Fix handling processes using STARTF_USESTDHANDLES when setting standard handles in AllocConsole.
by Jacek Caban 30 Jul '20

30 Jul '20

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

1 0

[PATCH 4/8] kernelbase: Lock console critical section when changing current console.
by Jacek Caban 30 Jul '20

30 Jul '20

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

1 0

[PATCH 3/8] wineconsole: Use console in/out handles only in WINECON_Init.
by Jacek Caban 30 Jul '20

30 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/winecon_private.h | 2 -- programs/wineconsole/wineconsole.c | 29 ++++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-)

1 0

[PATCH 2/8] wineconsole: Move WINECON_Spawn call to WINECON_Init.
by Jacek Caban 30 Jul '20

30 Jul '20

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

1 0

[PATCH 1/8] wineconsole: Use renderer handle instead of hConIn where posibble.
by Jacek Caban 30 Jul '20

30 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/curses.c | 4 ++-- programs/wineconsole/user.c | 10 +++++----- programs/wineconsole/wineconsole.c | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-)

1 0

[PATCH] user32: Fix return value of ScrollWindowEx for invisible windows.
by Myah Caron 30 Jul '20

30 Jul '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This is a staging patch. I've added a test, but left the patch otherwise untouched. dlls/user32/painting.c | 4 ++-- dlls/user32/tests/win.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 313c5fa1e6..2b4b7937aa 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1484,10 +1484,10 @@ static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const REC rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ? RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE ; - if (!WIN_IsWindowDrawable( hwnd, TRUE )) return ERROR; hwnd = WIN_GetFullHandle( hwnd ); - GetClientRect(hwnd, &rc); + if (!WIN_IsWindowDrawable( hwnd, TRUE )) SetRectEmpty(&rc); + else GetClientRect(hwnd, &rc); if (clipRect) IntersectRect(&cliprc,&rc,clipRect); else cliprc = rc; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 700e60db17..354ed5a2c1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4920,6 +4920,7 @@ static void test_scrollwindow( HWND hwnd) HDC hdc; RECT rc, rc2, rc3; COLORREF colr; + INT ret; ShowWindow( hwnd, SW_SHOW); UpdateWindow( hwnd); @@ -4964,6 +4965,12 @@ static void test_scrollwindow( HWND hwnd) colr = GetPixel( hdc, (rc2.left+rc2.right)/ 2, rc2.bottom / 4 ); ok ( colr == 0, "pixel should be black, color is %08x\n", colr); + ShowWindow(hwnd, SW_HIDE); + UpdateWindow( hwnd); + flush_events( TRUE ); + ret = ScrollWindowEx( hwnd, 0, - rc2.top, &rc2, &rc3, NULL, NULL, SW_ERASE); + ok(ret == NULLREGION, "got ret %d\n", ret); + /* clean up */ ReleaseDC( hwnd, hdc); } -- 2.27.0

2 2

[PATCH 2/3] ddraw: Return DDERR_WRONGMODE when attempting to restore surfaces of a lost device.
by Henri Verbeet 30 Jul '20

30 Jul '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 189881. Call ddraw_update_lost_surfaces() before the device state check. dlls/ddraw/surface.c | 6 +++++- dlls/ddraw/tests/ddraw1.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw2.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw4.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw7.c | 12 ++++++++++++ 5 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7b7f16e2a3c..a5f032eabfc 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3785,9 +3785,13 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) } } + if (!ddraw_surface_can_be_lost(surface)) + return DD_OK; ddraw_update_lost_surfaces(surface->ddraw); - surface->is_lost = FALSE; + if (surface->ddraw->device_state == DDRAW_DEVICE_STATE_LOST) + return DDERR_WRONGMODE; + surface->is_lost = FALSE; for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) { if (surface->complex_array[i]) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2fc454a6069..532065a4796 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7381,12 +7381,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 311c7a159df..800dab0fe83 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8334,12 +8334,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8eee655bba4..d4f4f08e396 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9731,12 +9731,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface4_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 778b1738fa9..5ea81903c47 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9489,12 +9489,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface7_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1); -- 2.20.1

2 1

Wine Gecko compile issues with GCC 10.1+
by Michael Cronenworth 30 Jul '20

30 Jul '20

Hi Jacek, I'm encountering an internal compiler error when using GCC 10.1 or 10.2 to try and build Wine Gecko 2.47.1. Have you seen this already? In file included from /builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/widget/windows/WinIMEHandler.cpp:26, from /builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1-x86/widget/windows/Unified_cpp_widget_windows0.cpp:110: /usr/i686-w64-mingw32/sys-root/mingw/include/cfgmgr32.h: At global scope: /usr/i686-w64-mingw32/sys-root/mingw/include/cfgmgr32.h:19: internal compiler error: in linemap_compare_locations, at libcpp/line-map.c:1359 19 | typedef CONST VOID *PCVOID; | Please submit a full bug report, with preprocessed source if appropriate. See <http://bugzilla.redhat.com/bugzilla> for instructions. make[3]: *** [/builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/config/rules.mk:966: Unified_cpp_widget_windows0.o] Error 1 Thanks, Michael

2 2

[PATCH 3/3] ddraw: Check the foreground window in addition to the device state in ddraw_update_lost_surfaces().
by Henri Verbeet 30 Jul '20

30 Jul '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 189882. Handle this in ddraw_update_lost_surfaces(), instead of ddraw_surface7_Restore(). dlls/ddraw/ddraw.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3cbde6ea84b..d7545e5c82c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4975,6 +4975,19 @@ void ddraw_update_lost_surfaces(struct ddraw *ddraw) { struct ddraw_surface *surface; + /* Railroad Tycoon 2 tries to restore surfaces from within a + * WM_QUERYNEWPALETTE message handler and expects it to succeed. We + * haven't received the WM_ACTIVATEAPP message by that point, so the + * device state is still DDRAW_DEVICE_STATE_LOST, even though we are in + * the foreground. */ + if (ddraw->device_state == DDRAW_DEVICE_STATE_LOST) + { + HWND window = ddraw->focuswindow ? ddraw->focuswindow : ddraw->dest_window; + + if (window && GetForegroundWindow() == window) + ddraw->device_state = DDRAW_DEVICE_STATE_NOT_RESTORED; + } + if (ddraw->device_state != DDRAW_DEVICE_STATE_NOT_RESTORED) return; -- 2.20.1

2 1

[PATCH] wininet: Implement INTERNET_OPTION_SECURITY_CERTIFICATE flag for InternetQueryOption.
by Daniel Lehman 30 Jul '20

30 Jul '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/wininet/http.c | 120 ++++++++++++++++++++++++++++++++++++++ dlls/wininet/resource.h | 3 + dlls/wininet/tests/http.c | 112 ++++++++++++++++++++++++++++++++++- dlls/wininet/wininet.rc | 12 ++++ 4 files changed, 245 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 56c995805b..379455fddb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -35,6 +35,7 @@ #include <stdarg.h> #include <stdio.h> #include <time.h> +#include <math.h> #include <assert.h> #include <errno.h> #include <limits.h> @@ -54,6 +55,7 @@ #include "internet.h" #include "zlib.h" +#include "resource.h" #include "wine/debug.h" #include "wine/exception.h" @@ -2273,6 +2275,124 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe } return ERROR_NOT_SUPPORTED; } + case INTERNET_OPTION_SECURITY_CERTIFICATE: { + char fmt[256]; + const char nullA[] = "(null)"; /* always appears in English */ + CERT_CONTEXT *context; + char *subject = NULL; + char *issuer = NULL; + char *start_date = NULL; + char *start_time = NULL; + char *expiry_date = NULL; + char *expiry_time = NULL; + char strength[16]; + int subject_len, issuer_len; + int start_date_len, start_time_len; + int expiry_date_len, expiry_time_len; + SYSTEMTIME start, expiry; + DWORD needed, keysize; + + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + FIXME("INTERNET_OPTION_SECURITY_CERTIFICATE currently English-only\n"); + + if(!req->netconn) + return ERROR_INTERNET_INVALID_OPERATION; + + if(!size) + return ERROR_INVALID_PARAMETER; + + if(!buffer) { + *size = 1; + return ERROR_INSUFFICIENT_BUFFER; + } + + context = (CERT_CONTEXT *)NETCON_GetCert(req->netconn); + if(!context) + return ERROR_NOT_SUPPORTED; + + needed = LoadStringA(WININET_hModule, IDS_CERT_FORMAT, fmt, sizeof(fmt)); + needed += 1 - 20 * 2 + 9; /* include room for \0, subtract 20 format specifiers, add 9 \r */ + if(needed > *size) goto error; + + subject_len = CertNameToStrA(context->dwCertEncodingType, &context->pCertInfo->Subject, + CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); + needed += subject_len - 1; /* minus \0 */ + if(needed > *size) goto error; + + issuer_len = CertNameToStrA(context->dwCertEncodingType, &context->pCertInfo->Issuer, + CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); + needed += issuer_len - 1; + if(needed > *size) goto error; + + FileTimeToSystemTime(&context->pCertInfo->NotBefore, &start); + start_date_len = GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, NULL, 0); + start_time_len = GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, NULL, 0); + needed += start_date_len + start_time_len - 2; + if(needed > *size) goto error; + + FileTimeToSystemTime(&context->pCertInfo->NotAfter, &expiry); + expiry_date_len = GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, NULL, 0); + expiry_time_len = GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, NULL, 0); + needed += expiry_date_len + expiry_time_len - 2; + if(needed > *size) goto error; + + needed += sizeof(nullA) * 3 - 3; /* protocol, signature type, encryption type */ + if(needed > *size) goto error; + + keysize = NETCON_GetCipherStrength(req->netconn); + needed += keysize ? floor(log10(keysize))+1 : 1; + needed += LoadStringA(WININET_hModule, keysize >= 128 ? IDS_CERT_HIGH : IDS_CERT_LOW, + strength, sizeof(strength)); + if(needed > *size) goto error; + + if(!(subject = heap_alloc(subject_len)) || + !(issuer = heap_alloc(issuer_len)) || + !(start_date = heap_alloc(start_date_len)) || + !(start_time = heap_alloc(start_time_len)) || + !(expiry_date = heap_alloc(expiry_date_len)) || + !(expiry_time = heap_alloc(expiry_time_len))) + goto error; + + CertNameToStrA(context->dwCertEncodingType, &context->pCertInfo->Subject, + CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, subject, subject_len); + CertNameToStrA(context->dwCertEncodingType, &context->pCertInfo->Issuer, + CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, issuer, issuer_len); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_date, start_date_len); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_time, start_time_len); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_date, expiry_date_len); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_time, expiry_time_len); + + snprintf(buffer, *size, fmt, + '\r', subject, '\r', + '\r', issuer, '\r', + start_date, start_time, '\r', + expiry_date, expiry_time, '\r', + nullA, '\r', + nullA, '\r', + nullA, '\r', + strength, keysize); + + heap_free(subject); + heap_free(issuer); + heap_free(start_date); + heap_free(start_time); + heap_free(expiry_date); + heap_free(expiry_time); + *size = needed - 1; + CertFreeCertificateContext(context); + return ERROR_SUCCESS; + +error: + heap_free(subject); + heap_free(issuer); + heap_free(start_date); + heap_free(start_time); + heap_free(expiry_date); + heap_free(expiry_time); + *size = 1; + CertFreeCertificateContext(context); + return ERROR_INSUFFICIENT_BUFFER; + } case INTERNET_OPTION_CONNECT_TIMEOUT: if (*size < sizeof(DWORD)) return ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/wininet/resource.h b/dlls/wininet/resource.h index 256a374af0..190d3cc397 100644 --- a/dlls/wininet/resource.h +++ b/dlls/wininet/resource.h @@ -38,3 +38,6 @@ #define IDS_CERT_DATE_INVALID 0x502 #define IDS_CERT_CN_INVALID 0x503 #define IDS_CERT_ERRORS 0x504 +#define IDS_CERT_FORMAT 0x505 +#define IDS_CERT_HIGH 0x506 +#define IDS_CERT_LOW 0x507 diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c07d60d2a9..1eed1101c8 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6112,9 +6112,26 @@ static const cert_struct_test_t test_winehq_com_cert = { "webmaster(a)winehq.org" }; +static const char *cert_string_fmt = + "Subject:\r\n%s\r\n" + "Issuer:\r\n%s\r\n" + "Effective Date:\t%s %s\r\n" + "Expiration Date:\t%s %s\r\n" + "Security Protocol:\t%s\r\n" + "Signature Type:\t%s\r\n" + "Encryption Type:\t%s\r\n" + "Privacy Strength:\t%s (%u bits)"; + static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) { INTERNET_CERTIFICATE_INFOA info; + SYSTEMTIME start, expiry; + char expiry_date[32]; + char expiry_time[32]; + char start_date[32]; + char start_time[32]; + char expect[512]; + char actual[512]; DWORD size; BOOL res; @@ -6138,6 +6155,33 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); ok(info.dwKeySize >= 128 && info.dwKeySize <= 256, "dwKeySize = %u\n", info.dwKeySize); + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + { + skip("Non-English locale (test with hardcoded English)\n"); + release_cert_info(&info); + return; + } + + size = sizeof(actual); + memset(actual, 0xcc, sizeof(actual)); + res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size); + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); + + FileTimeToSystemTime(&info.ftStart, &start); + FileTimeToSystemTime(&info.ftExpiry, &expiry); + + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_date, sizeof(start_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &start, NULL, start_time, sizeof(start_time)); + GetDateFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_date, sizeof(expiry_date)); + GetTimeFormatA(LOCALE_USER_DEFAULT, 0, &expiry, NULL, expiry_time, sizeof(expiry_time)); + + snprintf(expect, sizeof(expect), cert_string_fmt, info.lpszSubjectInfo, info.lpszIssuerInfo, + start_date, start_time, expiry_date, expiry_time, + info.lpszSignatureAlgName, info.lpszEncryptionAlgName, info.lpszProtocolName, + info.dwKeySize >= 128 ? "High" : "Low", info.dwKeySize); + ok(size == strlen(actual), "size = %u\n", size); + ok(!strcmp(actual, expect), "cert = actual\n%s\n", actual); + release_cert_info(&info); } @@ -6217,7 +6261,7 @@ static void test_security_flags(void) INTERNET_CERTIFICATE_INFOA *cert; HINTERNET ses, conn, req; DWORD size, flags; - char buf[100]; + char buf[512]; BOOL res; if (!https_support) @@ -6378,6 +6422,26 @@ static void test_security_flags(void) } HeapFree(GetProcessHeap(), 0, cert); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, NULL, NULL); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetQueryOption failed: %d\n", GetLastError()); + + size = 0; + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, NULL, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + + size = 42; + memset(buf, 0x55, sizeof(buf)); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, buf, &size); + ok(!res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == 1, "unexpected size: %u\n", size); + ok(buf[0] == 0x55, "unexpected byte: %02x\n", buf[0]); + + size = sizeof(buf); + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, buf, &size); + ok(res && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size && size < sizeof(buf), "unexpected size: %u\n", size); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTED_TO_SERVER, 2); CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); @@ -6562,9 +6626,10 @@ static void test_secure_connection(void) static const WCHAR get[] = {'G','E','T',0}; static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; - DWORD size, flags, err; + DWORD size, size2, flags, err; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; + char certstr1[512], certstr2[512]; BOOL ret; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); @@ -6629,6 +6694,19 @@ static void test_secure_connection(void) } HeapFree(GetProcessHeap(), 0, certificate_structW); + SetLastError(0xdeadbeef); + size = sizeof(certstr1); + ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE, certstr1, &size); + ok(ret && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + size2 = sizeof(certstr2); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, certstr2, &size2); + ok(ret && GetLastError() == ERROR_SUCCESS, "InternetQueryOption failed: %d\n", GetLastError()); + + ok(size == size2, "expected same size\n"); + ok(!strcmp(certstr1, certstr2), "expected same string\n"); + InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses); @@ -7517,6 +7595,35 @@ static void test_concurrent_header_access(void) CloseHandle( wait ); } +static void test_cert_string(void) +{ + HINTERNET ses, con, req; + char actual[512]; + DWORD size; + BOOL res; + + ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, NULL, "/", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + size = sizeof(actual); + memset(actual, 0xcc, sizeof(actual)); + res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE, actual, &size); + ok(!res && GetLastError() == ERROR_INTERNET_INVALID_OPERATION, + "InternetQueryOption failed: %u\n", GetLastError()); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + START_TEST(http) { HMODULE hdll; @@ -7566,5 +7673,6 @@ START_TEST(http) test_connection_failure(); test_default_service_port(); test_concurrent_header_access(); + test_cert_string(); free_events(); } diff --git a/dlls/wininet/wininet.rc b/dlls/wininet/wininet.rc index b6e35629ca..7e2830e7ff 100644 --- a/dlls/wininet/wininet.rc +++ b/dlls/wininet/wininet.rc @@ -29,6 +29,18 @@ STRINGTABLE IDS_CERT_DATE_INVALID "The date on the certificate is invalid." IDS_CERT_CN_INVALID "The name on the certificate does not match the site." IDS_CERT_ERRORS "There is at least one unspecified security problem with this certificate." + + /* each %c is a \r */ + IDS_CERT_FORMAT "Subject:%c\n%s%c\n" \ + "Issuer:%c\n%s%c\n" \ + "Effective Date:\t%s %s%c\n" \ + "Expiration Date:\t%s %s%c\n" \ + "Security Protocol:\t%s%c\n" \ + "Signature Type:\t%s%c\n" \ + "Encryption Type:\t%s%c\n" \ + "Privacy Strength:\t%s (%u bits)" + IDS_CERT_HIGH "High" + IDS_CERT_LOW "Low" } IDD_PROXYDLG DIALOG 36, 24, 220, 146 -- 2.25.1

3 3

[PATCH 1/3] ddraw/tests: Test non-primary video memory surface in test_lost_device().
by Henri Verbeet 30 Jul '20

30 Jul '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 189880. Minor style changes. dlls/ddraw/tests/ddraw1.c | 99 +++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 99 +++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 104 +++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 104 +++++++++++++++++++++++++++++++++++++- 4 files changed, 402 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 652e52a05c4..2fc454a6069 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7309,8 +7309,8 @@ static void test_palette_alpha(void) static void test_lost_device(void) { + IDirectDrawSurface *sysmem_surface, *vidmem_surface; IDirectDrawSurface *surface, *back_buffer; - IDirectDrawSurface *sysmem_surface; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw *ddraw; @@ -7345,12 +7345,35 @@ static void test_lost_device(void) hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + if (FAILED(IDirectDraw_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL))) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -7360,6 +7383,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -7369,6 +7397,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7378,6 +7411,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7388,6 +7426,11 @@ static void test_lost_device(void) "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -7398,6 +7441,8 @@ static void test_lost_device(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = restore_surfaces(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7408,6 +7453,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -7415,6 +7465,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7422,6 +7477,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7429,6 +7489,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -7447,6 +7512,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7456,6 +7526,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7465,6 +7540,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7474,6 +7554,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7483,6 +7568,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7492,6 +7582,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_FLIP; @@ -7506,6 +7601,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(back_buffer); + if (vidmem_surface) + IDirectDrawSurface_Release(vidmem_surface); IDirectDrawSurface_Release(sysmem_surface); IDirectDrawSurface_Release(surface); refcount = IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index edaf868900c..311c7a159df 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8262,8 +8262,8 @@ static void test_palette_alpha(void) static void test_lost_device(void) { + IDirectDrawSurface *sysmem_surface, *vidmem_surface; IDirectDrawSurface *surface, *back_buffer; - IDirectDrawSurface *sysmem_surface; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw2 *ddraw; @@ -8298,12 +8298,35 @@ static void test_lost_device(void) hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + if (FAILED(IDirectDraw2_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL))) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -8313,6 +8336,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -8322,6 +8350,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8331,6 +8364,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8340,6 +8378,11 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -8350,6 +8393,8 @@ static void test_lost_device(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = restore_surfaces(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8360,6 +8405,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -8367,6 +8417,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8374,6 +8429,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8381,6 +8441,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -8399,6 +8464,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8408,6 +8478,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8417,6 +8492,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8426,6 +8506,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8435,6 +8520,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8444,6 +8534,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_FLIP; @@ -8458,6 +8553,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(back_buffer); + if (vidmem_surface) + IDirectDrawSurface_Release(vidmem_surface); IDirectDrawSurface_Release(sysmem_surface); IDirectDrawSurface_Release(surface); refcount = IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d1abde05ca0..8eee655bba4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9655,8 +9655,8 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { + IDirectDrawSurface4 *sysmem_surface, *vidmem_surface; IDirectDrawSurface4 *surface, *back_buffer; - IDirectDrawSurface4 *sysmem_surface; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw4 *ddraw; @@ -9691,6 +9691,24 @@ static void test_lost_device(void) hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + if (FAILED(IDirectDraw4_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL))) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDraw4_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); @@ -9699,6 +9717,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9710,6 +9733,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9721,6 +9749,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9732,6 +9765,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9743,6 +9781,11 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -9753,6 +9796,8 @@ static void test_lost_device(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw4_RestoreAllSurfaces(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw4_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9760,6 +9805,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9769,6 +9819,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9778,6 +9833,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9787,6 +9847,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9796,6 +9861,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface4_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -9816,6 +9886,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9827,6 +9902,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9838,6 +9918,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9849,6 +9934,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9860,6 +9950,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9869,6 +9964,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); @@ -9886,6 +9986,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface4_Release(back_buffer); + if (vidmem_surface) + IDirectDrawSurface4_Release(vidmem_surface); IDirectDrawSurface4_Release(sysmem_surface); IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 13eadfdf132..778b1738fa9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9413,8 +9413,8 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { + IDirectDrawSurface7 *sysmem_surface, *vidmem_surface; IDirectDrawSurface7 *surface, *back_buffer; - IDirectDrawSurface7 *sysmem_surface; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw7 *ddraw; @@ -9449,6 +9449,24 @@ static void test_lost_device(void) hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + if (FAILED(IDirectDraw7_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL))) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDraw7_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); @@ -9457,6 +9475,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9468,6 +9491,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9479,6 +9507,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9490,6 +9523,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9501,6 +9539,11 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -9513,6 +9556,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw7_RestoreAllSurfaces(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9520,6 +9565,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9529,6 +9579,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9538,6 +9593,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9547,6 +9607,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9556,6 +9621,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface7_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -9576,6 +9646,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9587,6 +9662,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9598,6 +9678,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9609,6 +9694,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9620,6 +9710,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9631,6 +9726,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_FLIP; @@ -9646,6 +9746,8 @@ static void test_lost_device(void) IDirectDrawSurface7_Release(back_buffer); + if (vidmem_surface) + IDirectDrawSurface7_Release(vidmem_surface); IDirectDrawSurface7_Release(sysmem_surface); IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); -- 2.20.1

2 1

[PATCH v3] vbscript: implement case insensitive comparison
by Dmitry Kislyuk 30 Jul '20

30 Jul '20

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Report error messages from vkd3d_shader_serialize_root_signature().
by Henri Verbeet 30 Jul '20

30 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 6 +- libs/vkd3d-shader/dxbc.c | 221 +++++++++++++++++++++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 21 ++- libs/vkd3d/vkd3d_main.c | 26 +++- tests/vkd3d_shader_api.c | 2 +- 5 files changed, 192 insertions(+), 84 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 8ee6724..140744c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -756,9 +756,8 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages); void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *root_signature); -/* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_root_signature_desc *root_signature, - struct vkd3d_shader_code *dxbc); + struct vkd3d_shader_code *dxbc, char **messages); int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signature_desc *dst, enum vkd3d_shader_root_signature_version version, const struct vkd3d_shader_versioned_root_signature_desc *src); @@ -788,7 +787,8 @@ typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_c typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_shader_versioned_root_signature_desc *root_signature); typedef int (*PFN_vkd3d_shader_serialize_root_signature)( - const struct vkd3d_shader_versioned_root_signature_desc *root_signature, struct vkd3d_shader_code *dxbc); + const struct vkd3d_shader_versioned_root_signature_desc *root_signature, + struct vkd3d_shader_code *dxbc, char **messages); typedef int (*PFN_vkd3d_shader_convert_root_signature)(struct vkd3d_shader_versioned_root_signature_desc *dst, enum vkd3d_shader_root_signature_version version, const struct vkd3d_shader_versioned_root_signature_desc *src); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 28159a9..df5f6a2 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2768,6 +2768,8 @@ static unsigned int versioned_root_signature_get_flags(const struct vkd3d_shader struct root_signature_writer_context { + struct vkd3d_shader_message_context message_context; + DWORD *data; size_t position; size_t capacity; @@ -2813,33 +2815,38 @@ static size_t get_chunk_offset(struct root_signature_writer_context *context) static int shader_write_root_signature_header(struct root_signature_writer_context *context) { if (!write_dword(context, TAG_DXBC)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; /* The checksum is computed when all data is generated. */ if (!write_dwords(context, 4, 0x00000000)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, 0x00000001)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; context->total_size_position = context->position; if (!write_dword(context, 0xffffffff)) /* total size */ - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, 1)) /* chunk count */ - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; /* chunk offset */ if (!write_dword(context, (context->position + 1) * sizeof(DWORD))) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, TAG_RTS0)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, 0xffffffff)) /* chunk size */ - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; context->chunk_position = context->position; return VKD3D_OK; + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature header."); + return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, @@ -2851,18 +2858,23 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * for (i = 0; i < table->descriptor_range_count; ++i) { if (!write_dword(context, ranges[i].range_type)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, ranges[i].descriptor_count)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, ranges[i].base_shader_register)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, ranges[i].register_space)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, ranges[i].descriptor_table_offset)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; } return VKD3D_OK; + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature descriptor ranges."); + return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, @@ -2874,79 +2886,109 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context for (i = 0; i < table->descriptor_range_count; ++i) { if (!write_dword(context, ranges[i].range_type)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, ranges[i].descriptor_count)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, ranges[i].base_shader_register)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, ranges[i].register_space)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, ranges[i].flags)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, ranges[i].descriptor_table_offset)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; } return VKD3D_OK; + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature descriptor ranges."); + return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_table(struct root_signature_writer_context *context, const struct vkd3d_shader_root_descriptor_table *table) { if (!write_dword(context, table->descriptor_range_count)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, get_chunk_offset(context) + sizeof(DWORD))) /* offset */ - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; return shader_write_descriptor_ranges(context, table); + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature root descriptor table."); + return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_table1(struct root_signature_writer_context *context, const struct vkd3d_shader_root_descriptor_table1 *table) { if (!write_dword(context, table->descriptor_range_count)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, get_chunk_offset(context) + sizeof(DWORD))) /* offset */ - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; return shader_write_descriptor_ranges1(context, table); + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature root descriptor table."); + return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_root_constants(struct root_signature_writer_context *context, const struct vkd3d_shader_root_constants *constants) { if (!write_dword(context, constants->shader_register)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, constants->register_space)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, constants->value_count)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; return VKD3D_OK; + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature root constants."); + return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_root_descriptor(struct root_signature_writer_context *context, const struct vkd3d_shader_root_descriptor *descriptor) { if (!write_dword(context, descriptor->shader_register)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, descriptor->register_space)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; return VKD3D_OK; + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature root descriptor."); + return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_root_descriptor1(struct root_signature_writer_context *context, const struct vkd3d_shader_root_descriptor1 *descriptor) { if (!write_dword(context, descriptor->shader_register)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, descriptor->register_space)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, descriptor->flags)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; return VKD3D_OK; + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature root descriptor."); + return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_root_parameters(struct root_signature_writer_context *context, @@ -2961,11 +3003,11 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co for (i = 0; i < parameter_count; ++i) { if (!write_dword(context, versioned_root_signature_get_parameter_type(desc, i))) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, versioned_root_signature_get_parameter_shader_visibility(desc, i))) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, 0xffffffff)) /* offset */ - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; } for (i = 0; i < parameter_count; ++i) @@ -2993,6 +3035,9 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co break; default: FIXME("Unrecognized type %#x.\n", versioned_root_signature_get_parameter_type(desc, i)); + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE, + "Invalid/unrecognised root signature root parameter type %#x.", + versioned_root_signature_get_parameter_type(desc, i)); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -3001,6 +3046,11 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co } return VKD3D_OK; + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature root parameters."); + return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_static_samplers(struct root_signature_writer_context *context, @@ -3012,34 +3062,39 @@ static int shader_write_static_samplers(struct root_signature_writer_context *co for (i = 0; i < versioned_root_signature_get_static_sampler_count(desc); ++i) { if (!write_dword(context, samplers[i].filter)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, samplers[i].address_u)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, samplers[i].address_v)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, samplers[i].address_w)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_float(context, samplers[i].mip_lod_bias)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, samplers[i].max_anisotropy)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, samplers[i].comparison_func)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, samplers[i].border_colour)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_float(context, samplers[i].min_lod)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_float(context, samplers[i].max_lod)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, samplers[i].shader_register)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, samplers[i].register_space)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, samplers[i].shader_visibility)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; } return VKD3D_OK; + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature static samplers."); + return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_root_signature(struct root_signature_writer_context *context, @@ -3049,30 +3104,36 @@ static int shader_write_root_signature(struct root_signature_writer_context *con int ret; if (!write_dword(context, desc->version)) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, versioned_root_signature_get_parameter_count(desc))) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, get_chunk_offset(context) + 4 * sizeof(DWORD))) /* offset */ - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, versioned_root_signature_get_static_sampler_count(desc))) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; samplers_offset_position = context->position; if (!write_dword(context, 0xffffffff)) /* offset */ - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if (!write_dword(context, versioned_root_signature_get_flags(desc))) - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; if ((ret = shader_write_root_parameters(context, desc)) < 0) return ret; context->data[samplers_offset_position] = get_chunk_offset(context); return shader_write_static_samplers(context, desc); + +fail: + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature."); + return VKD3D_ERROR_OUT_OF_MEMORY; } -static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table) +static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table, + struct vkd3d_shader_message_context *message_context) { bool have_srv_uav_cbv = false; bool have_sampler = false; @@ -3095,6 +3156,8 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri else { WARN("Invalid descriptor range type %#x.\n", r->range_type); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE, + "Invalid root signature descriptor range type %#x.", r->range_type); return VKD3D_ERROR_INVALID_ARGUMENT; } } @@ -3102,13 +3165,16 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri if (have_srv_uav_cbv && have_sampler) { WARN("Samplers cannot be mixed with CBVs/SRVs/UAVs in descriptor tables.\n"); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES, + "Encountered both CBV/SRV/UAV and sampler descriptor ranges in the same root descriptor table."); return VKD3D_ERROR_INVALID_ARGUMENT; } return VKD3D_OK; } -static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descriptor_table1 *descriptor_table) +static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descriptor_table1 *descriptor_table, + struct vkd3d_shader_message_context *message_context) { bool have_srv_uav_cbv = false; bool have_sampler = false; @@ -3131,6 +3197,8 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descri else { WARN("Invalid descriptor range type %#x.\n", r->range_type); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE, + "Invalid root signature descriptor range type %#x.", r->range_type); return VKD3D_ERROR_INVALID_ARGUMENT; } } @@ -3138,13 +3206,16 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descri if (have_srv_uav_cbv && have_sampler) { WARN("Samplers cannot be mixed with CBVs/SRVs/UAVs in descriptor tables.\n"); + vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES, + "Encountered both CBV/SRV/UAV and sampler descriptor ranges in the same root descriptor table."); return VKD3D_ERROR_INVALID_ARGUMENT; } return VKD3D_OK; } -static int validate_root_signature_desc(const struct vkd3d_shader_versioned_root_signature_desc *desc) +static int validate_root_signature_desc(const struct vkd3d_shader_versioned_root_signature_desc *desc, + struct vkd3d_shader_message_context *message_context) { int ret = VKD3D_OK; unsigned int i; @@ -3157,9 +3228,9 @@ static int validate_root_signature_desc(const struct vkd3d_shader_versioned_root if (type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) { if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0) - ret = validate_descriptor_table_v_1_0(&desc->u.v_1_0.parameters[i].u.descriptor_table); + ret = validate_descriptor_table_v_1_0(&desc->u.v_1_0.parameters[i].u.descriptor_table, message_context); else - ret = validate_descriptor_table_v_1_1(&desc->u.v_1_1.parameters[i].u.descriptor_table); + ret = validate_descriptor_table_v_1_1(&desc->u.v_1_1.parameters[i].u.descriptor_table, message_context); } if (ret < 0) @@ -3170,37 +3241,46 @@ static int validate_root_signature_desc(const struct vkd3d_shader_versioned_root } int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_root_signature_desc *root_signature, - struct vkd3d_shader_code *dxbc) + struct vkd3d_shader_code *dxbc, char **messages) { struct root_signature_writer_context context; size_t total_size, chunk_size; uint32_t checksum[4]; int ret; - TRACE("root_signature %p, dxbc %p.\n", root_signature, dxbc); + TRACE("root_signature %p, dxbc %p, messages %p.\n", root_signature, dxbc, messages); + + if (messages) + *messages = NULL; + + memset(&context, 0, sizeof(context)); + if (!vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO, NULL)) + return VKD3D_ERROR; if (root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0 && root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_1) { + ret = VKD3D_ERROR_INVALID_ARGUMENT; WARN("Root signature version %#x not supported.\n", root_signature->version); - return VKD3D_ERROR_INVALID_ARGUMENT; + vkd3d_shader_error(&context.message_context, VKD3D_SHADER_ERROR_RS_INVALID_VERSION, + "Root signature version %#x is not supported.", root_signature->version); + goto done; } - if ((ret = validate_root_signature_desc(root_signature)) < 0) - return ret; + if ((ret = validate_root_signature_desc(root_signature, &context.message_context)) < 0) + goto done; memset(dxbc, 0, sizeof(*dxbc)); - memset(&context, 0, sizeof(context)); if ((ret = shader_write_root_signature_header(&context)) < 0) { vkd3d_free(context.data); - return ret; + goto done; } if ((ret = shader_write_root_signature(&context, root_signature)) < 0) { vkd3d_free(context.data); - return ret; + goto done; } total_size = context.position * sizeof(DWORD); @@ -3214,7 +3294,14 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro vkd3d_compute_dxbc_checksum(dxbc->code, dxbc->size, checksum); memcpy((uint32_t *)dxbc->code + 1, checksum, sizeof(checksum)); - return VKD3D_OK; + ret = VKD3D_OK; + +done: + vkd3d_shader_message_context_trace_messages(&context.message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&context.message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_cleanup(&context.message_context); + return ret; } static void free_descriptor_ranges(const struct vkd3d_shader_root_parameter *parameters, unsigned int count) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 3161087..d728fdc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -61,13 +61,20 @@ enum vkd3d_shader_error { - VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1, - VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2, - VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM = 3, - VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION = 4, - VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_OFFSET = 5, - VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_SIZE = 6, - VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF = 1000, + VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1, + VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2, + VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM = 3, + VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION = 4, + VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_OFFSET = 5, + VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_SIZE = 6, + + VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF = 1000, + + VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, + VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001, + VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE = 3002, + VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE = 3003, + VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 3fd9c1b..327cdf8 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -543,6 +543,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, struct vkd3d_shader_versioned_root_signature_desc vkd3d_desc; struct vkd3d_shader_code dxbc; struct d3d_blob *blob_object; + char *messages; HRESULT hr; int ret; @@ -565,13 +566,19 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, vkd3d_desc.version = VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0; vkd3d_desc.u.v_1_0 = *(const struct vkd3d_shader_root_signature_desc *)desc; - if ((ret = vkd3d_shader_serialize_root_signature(&vkd3d_desc, &dxbc)) < 0) + if ((ret = vkd3d_shader_serialize_root_signature(&vkd3d_desc, &dxbc, &messages)) < 0) { WARN("Failed to serialize root signature, vkd3d result %d.\n", ret); - if (error_blob) - FIXME("Ignoring error blob %p.\n", error_blob); + if (error_blob && messages) + { + if (FAILED(hr = d3d_blob_create(messages, strlen(messages), &blob_object))) + ERR("Failed to create error blob, hr %#x.\n", hr); + else + *error_blob = &blob_object->ID3DBlob_iface; + } return hresult_from_vkd3d_result(ret); } + vkd3d_shader_free_messages(messages); if (FAILED(hr = d3d_blob_create((void *)dxbc.code, dxbc.size, &blob_object))) { @@ -591,6 +598,7 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN const struct vkd3d_shader_versioned_root_signature_desc *vkd3d_desc; struct vkd3d_shader_code dxbc; struct d3d_blob *blob_object; + char *messages; HRESULT hr; int ret; @@ -606,13 +614,19 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN *error_blob = NULL; vkd3d_desc = (const struct vkd3d_shader_versioned_root_signature_desc *)desc; - if ((ret = vkd3d_shader_serialize_root_signature(vkd3d_desc, &dxbc)) < 0) + if ((ret = vkd3d_shader_serialize_root_signature(vkd3d_desc, &dxbc, &messages)) < 0) { WARN("Failed to serialize root signature, vkd3d result %d.\n", ret); - if (error_blob) - FIXME("Ignoring error blob %p.\n", error_blob); + if (error_blob && messages) + { + if (FAILED(hr = d3d_blob_create(messages, strlen(messages), &blob_object))) + ERR("Failed to create error blob, hr %#x.\n", hr); + else + *error_blob = &blob_object->ID3DBlob_iface; + } return hresult_from_vkd3d_result(ret); } + vkd3d_shader_free_messages(messages); if (FAILED(hr = d3d_blob_create((void *)dxbc.code, dxbc.size, &blob_object))) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index a730c86..e25dd20 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -127,7 +127,7 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_compile = vkd3d_shader_compile; pfn_vkd3d_shader_scan = vkd3d_shader_scan; - rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc); + rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Report error messages from vkd3d_shader_parse_root_signature().
by Henri Verbeet 30 Jul '20

30 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 13 ++++++++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 6 ++---- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ libs/vkd3d/vkd3d_main.c | 4 ++-- tests/vkd3d_shader_api.c | 2 +- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0dd9829..8ee6724 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -753,7 +753,7 @@ void vkd3d_shader_free_messages(char *messages); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *root_signature); + struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages); void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *root_signature); /* FIXME: Add support for returning error messages (ID3DBlob). */ @@ -784,7 +784,7 @@ typedef void (*PFN_vkd3d_shader_free_messages)(char *messages); 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, - struct vkd3d_shader_versioned_root_signature_desc *root_signature); + struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages); typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_shader_versioned_root_signature_desc *root_signature); typedef int (*PFN_vkd3d_shader_serialize_root_signature)( diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a00dbe9..28159a9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2679,17 +2679,24 @@ static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *cont } int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *root_signature) + struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages) { struct vkd3d_shader_message_context message_context; int ret; - TRACE("dxbc {%p, %zu}, root_signature %p.\n", dxbc->code, dxbc->size, root_signature); + TRACE("dxbc {%p, %zu}, root_signature %p, messages %p.\n", dxbc->code, dxbc->size, root_signature, messages); memset(root_signature, 0, sizeof(*root_signature)); - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_NONE, NULL)) + if (messages) + *messages = NULL; + if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) return VKD3D_ERROR; + ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); + vkd3d_shader_message_context_trace_messages(&message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_cleanup(&message_context); if (ret < 0) vkd3d_shader_free_root_signature(root_signature); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6511a89..0785c14 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -133,15 +133,13 @@ void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *c vkd3d_string_buffer_cleanup(&context->messages); } -#define vkd3d_shader_message_context_trace_messages(context) \ - vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) -static void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, +void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, const char *function) { vkd3d_string_buffer_trace_(&context->messages, function); } -static char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) +char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) { char *messages; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 79056b3..3161087 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -830,8 +830,13 @@ struct vkd3d_shader_message_context }; void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; +char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; +void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, + const char *function) DECLSPEC_HIDDEN; +#define vkd3d_shader_message_context_trace_messages(context) \ + vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) void vkd3d_shader_error(struct vkd3d_shader_message_context *context, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 5d7c71e..3fd9c1b 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -174,7 +174,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_versioned_root_signature_desc desc, converted_desc; int ret; - if ((ret = vkd3d_shader_parse_root_signature(dxbc, &desc)) < 0) + if ((ret = vkd3d_shader_parse_root_signature(dxbc, &desc, NULL)) < 0) { WARN("Failed to parse root signature, vkd3d result %d.\n", ret); return ret; @@ -389,7 +389,7 @@ static HRESULT d3d12_versioned_root_signature_deserializer_init(struct d3d12_ver deserializer->ID3D12VersionedRootSignatureDeserializer_iface.lpVtbl = &d3d12_versioned_root_signature_deserializer_vtbl; deserializer->refcount = 1; - if ((ret = vkd3d_shader_parse_root_signature(dxbc, &deserializer->desc.vkd3d)) < 0) + if ((ret = vkd3d_shader_parse_root_signature(dxbc, &deserializer->desc.vkd3d, NULL)) < 0) { WARN("Failed to parse root signature, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 6977945..a730c86 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -129,7 +129,7 @@ static void test_vkd3d_shader_pfns(void) rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc); + rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_root_signature(&root_signature_desc); pfn_vkd3d_shader_free_shader_code(&dxbc); -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Report error messages from vkd3d_shader_parse_input_signature().
by Henri Verbeet 30 Jul '20

30 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 8 ++------ libs/vkd3d-shader/vkd3d_shader_main.c | 21 ++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- libs/vkd3d/state.c | 2 +- tests/vkd3d_shader_api.c | 2 +- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 96d0545..0dd9829 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -767,7 +767,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature); + struct vkd3d_shader_signature *signature, char **messages); struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index); @@ -798,7 +798,7 @@ typedef void (*PFN_vkd3d_shader_free_scan_descriptor_info)( struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); typedef int (*PFN_vkd3d_shader_parse_input_signature)(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature); + struct vkd3d_shader_signature *signature, char **messages); typedef struct vkd3d_shader_signature_element * (*PFN_vkd3d_shader_find_signature_element)( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index f738abe..a00dbe9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2132,17 +2132,13 @@ static int isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) } int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_signature *signature) + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature) { - struct vkd3d_shader_message_context message_context; int ret; memset(signature, 0, sizeof(*signature)); - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_NONE, NULL)) - return VKD3D_ERROR; - if ((ret = parse_dxbc(dxbc, dxbc_length, &message_context, isgn_handler, signature)) < 0) + if ((ret = parse_dxbc(dxbc, dxbc_length, message_context, isgn_handler, signature)) < 0) ERR("Failed to parse input signature.\n"); - vkd3d_shader_message_context_cleanup(&message_context); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5d50487..6511a89 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -971,11 +971,26 @@ void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signatu } int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature) + struct vkd3d_shader_signature *signature, char **messages) { - TRACE("dxbc {%p, %zu}, signature %p.\n", dxbc->code, dxbc->size, signature); + struct vkd3d_shader_message_context message_context; + int ret; + + TRACE("dxbc {%p, %zu}, signature %p, messages %p.\n", dxbc->code, dxbc->size, signature, messages); + + if (messages) + *messages = NULL; + if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) + return VKD3D_ERROR; - return shader_parse_input_signature(dxbc->code, dxbc->size, signature); + ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); + vkd3d_shader_message_context_trace_messages(&message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + + vkd3d_shader_message_context_cleanup(&message_context); + + return ret; } struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ae2f6c2..79056b3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -840,7 +840,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; struct vkd3d_dxbc_compiler; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 93f22ce..449f242 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2316,7 +2316,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s switch (shader_stages[i].stage) { case VK_SHADER_STAGE_VERTEX_BIT: - if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature)) < 0) + if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature, NULL)) < 0) { hr = hresult_from_vkd3d_result(ret); goto fail; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index be63b39..6977945 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -134,7 +134,7 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_free_root_signature(&root_signature_desc); pfn_vkd3d_shader_free_shader_code(&dxbc); - rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); + rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); element = pfn_vkd3d_shader_find_signature_element(&signature, "position", 0, 0); ok(element, "Could not find shader signature element.\n"); -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Pass a vkd3d_shader_compile_info structure to vkd3d_shader_scan_dxbc().
by Henri Verbeet 30 Jul '20

30 Jul '20

In order to allow it to handle different source types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 18 +++--- libs/vkd3d-shader/spirv.c | 33 ++--------- libs/vkd3d-shader/vkd3d_shader.map | 4 +- libs/vkd3d-shader/vkd3d_shader_main.c | 97 +++++++++++++++++++------------- libs/vkd3d-shader/vkd3d_shader_private.h | 23 +++++++- libs/vkd3d/state.c | 41 ++++++++++---- tests/vkd3d_shader_api.c | 20 +++++-- 7 files changed, 141 insertions(+), 95 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 69a98e0..96d0545 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -32,7 +32,7 @@ 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_SCAN_DESCRIPTOR_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO, VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, @@ -653,10 +653,11 @@ struct vkd3d_shader_descriptor_info unsigned int count; }; -struct vkd3d_shader_scan_info +/* Extends vkd3d_shader_compile_info. */ +struct vkd3d_shader_scan_descriptor_info { enum vkd3d_shader_structure_type type; - void *next; + const void *next; struct vkd3d_shader_descriptor_info *descriptors; unsigned int descriptor_count; @@ -762,9 +763,8 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signature_desc *dst, enum vkd3d_shader_root_signature_version version, const struct vkd3d_shader_versioned_root_signature_desc *src); -int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_scan_info *scan_info, char **messages); -void vkd3d_shader_free_scan_info(struct vkd3d_shader_scan_info *scan_info); +int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char **messages); +void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature); @@ -793,9 +793,9 @@ typedef int (*PFN_vkd3d_shader_serialize_root_signature)( typedef int (*PFN_vkd3d_shader_convert_root_signature)(struct vkd3d_shader_versioned_root_signature_desc *dst, enum vkd3d_shader_root_signature_version version, const struct vkd3d_shader_versioned_root_signature_desc *src); -typedef int (*PFN_vkd3d_shader_scan_dxbc)(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_scan_info *scan_info, char **messages); -typedef void (*PFN_vkd3d_shader_free_scan_info)(struct vkd3d_shader_scan_info *scan_info); +typedef int (*PFN_vkd3d_shader_scan)(const struct vkd3d_shader_compile_info *compile_info, char **messages); +typedef void (*PFN_vkd3d_shader_free_scan_descriptor_info)( + struct vkd3d_shader_scan_descriptor_info *scan_descriptor_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/spirv.c b/libs/vkd3d-shader/spirv.c index 3ece044..86ee263 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -111,27 +111,6 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, #endif /* HAVE_SPIRV_TOOLS */ -struct vkd3d_struct -{ - enum vkd3d_shader_structure_type type; - const void *next; -}; - -#define vkd3d_find_struct(c, t) vkd3d_find_struct_(c, VKD3D_SHADER_STRUCTURE_TYPE_##t) -static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, - enum vkd3d_shader_structure_type type) -{ - while (chain) - { - if (chain->type == type) - return chain; - - chain = chain->next; - } - - return NULL; -} - static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval_indexed(enum vkd3d_shader_sysval_semantic sysval, unsigned int index) { @@ -2103,7 +2082,7 @@ struct vkd3d_dxbc_compiler uint32_t binding_idx; - const struct vkd3d_shader_scan_info *scan_info; + const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info; unsigned int input_control_point_count; unsigned int output_control_point_count; bool use_vocp; @@ -2134,7 +2113,7 @@ static const char *vkd3d_dxbc_compiler_get_entry_point_name(const struct vkd3d_d 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) + const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_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; @@ -2216,7 +2195,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader } } - compiler->scan_info = scan_info; + compiler->scan_descriptor_info = scan_descriptor_info; vkd3d_dxbc_compiler_emit_initial_declarations(compiler); @@ -5177,13 +5156,13 @@ static const struct vkd3d_shader_descriptor_info *vkd3d_dxbc_compiler_get_descri 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_scan_descriptor_info *descriptor_info = compiler->scan_descriptor_info; const struct vkd3d_shader_descriptor_info *d; unsigned int i; - for (i = 0; i < scan_info->descriptor_count; ++i) + for (i = 0; i < descriptor_info->descriptor_count; ++i) { - d = &scan_info->descriptors[i]; + d = &descriptor_info->descriptors[i]; if (d->type == type && d->register_space == register_space && d->register_index == register_index) return d; } diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 55b50ad..9c9f0a5 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -6,12 +6,12 @@ global: vkd3d_shader_find_signature_element; vkd3d_shader_free_messages; vkd3d_shader_free_root_signature; - vkd3d_shader_free_scan_info; + vkd3d_shader_free_scan_descriptor_info; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; - vkd3d_shader_scan_dxbc; + vkd3d_shader_scan; vkd3d_shader_serialize_root_signature; local: *; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index cf8b289..5d50487 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -285,10 +285,11 @@ void vkd3d_shader_free_messages(char *messages) int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages) { + struct vkd3d_shader_scan_descriptor_info scan_descriptor_info; struct vkd3d_shader_message_context message_context; struct vkd3d_shader_instruction instruction; + struct vkd3d_shader_compile_info scan_info; struct vkd3d_dxbc_compiler *spirv_compiler; - struct vkd3d_shader_scan_info scan_info; struct vkd3d_shader_parser parser; int ret; @@ -300,9 +301,12 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, 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; - if ((ret = vkd3d_shader_scan_dxbc(&compile_info->source, &scan_info, messages)) < 0) + scan_info = *compile_info; + scan_descriptor_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO; + scan_descriptor_info.next = scan_info.next; + scan_info.next = &scan_descriptor_info; + + if ((ret = vkd3d_shader_scan(&scan_info, messages)) < 0) return ret; if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) @@ -317,15 +321,19 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_shader_message_context_cleanup(&message_context); if (ret < 0) + { + vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; + } vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compile_info, &scan_info))) + &parser.shader_desc, compile_info, &scan_descriptor_info))) { ERR("Failed to create DXBC compiler.\n"); vkd3d_shader_parser_destroy(&parser); + vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return VKD3D_ERROR; } @@ -336,9 +344,8 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); - vkd3d_dxbc_compiler_destroy(spirv_compiler); - vkd3d_shader_parser_destroy(&parser); - return VKD3D_ERROR_INVALID_ARGUMENT; + ret = VKD3D_ERROR_INVALID_SHADER; + break; } if ((ret = vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction)) < 0) @@ -350,13 +357,13 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); - vkd3d_shader_free_scan_info(&scan_info); + vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; } struct vkd3d_shader_scan_context { - struct vkd3d_shader_scan_info *scan_info; + struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info; size_t descriptors_size; struct vkd3d_shader_message_context message_context; @@ -385,11 +392,12 @@ struct vkd3d_shader_scan_context }; static bool vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *context, - struct vkd3d_shader_scan_info *scan_info) + struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, + enum vkd3d_shader_log_level log_level, const char *source_name) { memset(context, 0, sizeof(*context)); - context->scan_info = scan_info; - return vkd3d_shader_message_context_init(&context->message_context, VKD3D_SHADER_LOG_INFO, NULL); + context->scan_descriptor_info = scan_descriptor_info; + return vkd3d_shader_message_context_init(&context->message_context, log_level, source_name); } static void vkd3d_shader_scan_context_cleanup(struct vkd3d_shader_scan_context *context) @@ -471,7 +479,7 @@ static struct vkd3d_shader_descriptor_info *vkd3d_shader_scan_get_uav_descriptor 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 &context->scan_descriptor_info->descriptors[context->uav_ranges[i].descriptor_idx]; } return NULL; @@ -492,7 +500,7 @@ static void vkd3d_shader_scan_record_uav_read(struct vkd3d_shader_scan_context * { struct vkd3d_shader_descriptor_info *d; - if (!context->scan_info) + if (!context->scan_descriptor_info) return; d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); @@ -511,7 +519,7 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_contex { struct vkd3d_shader_descriptor_info *d; - if (!context->scan_info) + if (!context->scan_descriptor_info) return; d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); @@ -523,17 +531,17 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c 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_scan_descriptor_info *info = context->scan_descriptor_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))) + if (!vkd3d_array_reserve((void **)&info->descriptors, &context->descriptors_size, + info->descriptor_count + 1, sizeof(*info->descriptors))) { ERR("Failed to allocate descriptor info.\n"); return false; } - d = &scan_info->descriptors[scan_info->descriptor_count]; + d = &info->descriptors[info->descriptor_count]; d->type = type; d->register_space = register_space; d->register_index = register_index; @@ -541,7 +549,7 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c d->resource_data_type = resource_data_type; d->flags = flags; d->count = 1; - ++scan_info->descriptor_count; + ++info->descriptor_count; return true; } @@ -568,7 +576,7 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc { const struct vkd3d_shader_constant_buffer *cb = &instruction->declaration.cb; - if (!context->scan_info) + if (!context->scan_descriptor_info) return; vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, cb->register_space, @@ -581,7 +589,7 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte const struct vkd3d_shader_sampler *sampler = &instruction->declaration.sampler; unsigned int flags; - if (!context->scan_info) + if (!context->scan_descriptor_info) return; if (instruction->flags & VKD3DSI_SAMPLER_COMPARISON_MODE) @@ -598,7 +606,7 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont { enum vkd3d_shader_descriptor_type type; - if (!context->scan_info) + if (!context->scan_descriptor_info) return; if (resource->reg.reg.type == VKD3DSPR_UAV) @@ -609,7 +617,7 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont resource->register_index, resource_type, resource_data_type, 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); + context->scan_descriptor_info->descriptor_count - 1); } static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -811,31 +819,44 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte return VKD3D_OK; } -int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_scan_info *scan_info, char **messages) +int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char **messages) { + struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info; struct vkd3d_shader_message_context *message_context; struct vkd3d_shader_instruction instruction; struct vkd3d_shader_scan_context context; struct vkd3d_shader_parser parser; int ret; - TRACE("dxbc {%p, %zu}, scan_info %p, messages %p.\n", dxbc->code, dxbc->size, scan_info, messages); + TRACE("compile_info %p, messages %p.\n", compile_info, messages); if (messages) *messages = NULL; - if (scan_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO) + if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) { - WARN("Invalid structure type %#x.\n", scan_info->type); + WARN("Invalid structure type %#x.\n", compile_info->type); return VKD3D_ERROR_INVALID_ARGUMENT; } - if (!vkd3d_shader_scan_context_init(&context, scan_info)) + if (compile_info->source_type != VKD3D_SHADER_SOURCE_DXBC_TPF) + { + WARN("Unsupported source type %#x.\n", compile_info->source_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if ((scan_descriptor_info = vkd3d_find_struct(compile_info->next, SCAN_DESCRIPTOR_INFO))) + { + scan_descriptor_info->descriptors = NULL; + scan_descriptor_info->descriptor_count = 0; + } + + if (!vkd3d_shader_scan_context_init(&context, scan_descriptor_info, + compile_info->log_level, compile_info->source_name)) return VKD3D_ERROR; message_context = &context.message_context; - if ((ret = vkd3d_shader_parser_init(&parser, dxbc, message_context)) < 0) + if ((ret = vkd3d_shader_parser_init(&parser, &compile_info->source, message_context)) < 0) { vkd3d_shader_message_context_trace_messages(message_context); if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(message_context))) @@ -847,8 +868,6 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, if (TRACE_ON()) vkd3d_shader_trace(parser.data); - memset(scan_info, 0, sizeof(*scan_info)); - message_context->line = 2; /* Line 1 is the version token. */ message_context->column = 1; while (!shader_sm4_is_end(parser.data, &parser.ptr)) @@ -858,14 +877,14 @@ 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_free_scan_descriptor_info(scan_descriptor_info); ret = VKD3D_ERROR_INVALID_SHADER; goto done; } if ((ret = vkd3d_shader_scan_instruction(&context, &instruction)) < 0) { - vkd3d_shader_free_scan_info(scan_info); + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); goto done; } ++message_context->line; @@ -882,12 +901,12 @@ done: return ret; } -void vkd3d_shader_free_scan_info(struct vkd3d_shader_scan_info *scan_info) +void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { - if (!scan_info) + if (!scan_descriptor_info) return; - vkd3d_free(scan_info->descriptors); + vkd3d_free(scan_descriptor_info->descriptors); } void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 4fa17d6..ae2f6c2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -846,7 +846,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, const struct vkd3d_shader_compile_info *compile_info, - const struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN; + const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, @@ -941,6 +941,27 @@ static inline unsigned int vkd3d_compact_swizzle(unsigned int swizzle, unsigned return compacted_swizzle; } +struct vkd3d_struct +{ + enum vkd3d_shader_structure_type type; + const void *next; +}; + +#define vkd3d_find_struct(c, t) vkd3d_find_struct_(c, VKD3D_SHADER_STRUCTURE_TYPE_##t) +static inline void *vkd3d_find_struct_(const struct vkd3d_struct *chain, + enum vkd3d_shader_structure_type type) +{ + while (chain) + { + if (chain->type == type) + return (void *)chain; + + chain = chain->next; + } + + return NULL; +} + #define VKD3D_DXBC_MAX_SOURCE_COUNT 6 #define VKD3D_DXBC_HEADER_SIZE (8 * sizeof(uint32_t)) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 316132b..93f22ce 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1376,6 +1376,25 @@ static HRESULT create_shader_stage(struct d3d12_device *device, return S_OK; } +static int vkd3d_scan_dxbc(const D3D12_SHADER_BYTECODE *code, + struct vkd3d_shader_scan_descriptor_info *descriptor_info) +{ + struct vkd3d_shader_compile_info compile_info; + + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + compile_info.next = descriptor_info; + 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; + compile_info.log_level = VKD3D_SHADER_LOG_NONE; + compile_info.source_name = NULL; + + return vkd3d_shader_scan(&compile_info, NULL); +} + static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, VkPipelineLayout vk_pipeline_layout, VkPipeline *vk_pipeline) @@ -1409,7 +1428,7 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipeline_state *state, struct d3d12_device *device, const struct d3d12_root_signature *root_signature, - const struct vkd3d_shader_scan_info *shader_info) + const struct vkd3d_shader_scan_descriptor_info *shader_info) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_descriptor_set_context context; @@ -1503,11 +1522,10 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct vkd3d_shader_scan_descriptor_info shader_info; struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; - struct vkd3d_shader_scan_info shader_info; VkPipelineLayout vk_pipeline_layout; - struct vkd3d_shader_code dxbc; HRESULT hr; int ret; @@ -1525,11 +1543,9 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return E_INVALIDARG; } - dxbc.code = desc->CS.pShaderBytecode; - dxbc.size = desc->CS.BytecodeLength; - shader_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; + shader_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO; shader_info.next = NULL; - if ((ret = vkd3d_shader_scan_dxbc(&dxbc, &shader_info, NULL)) < 0) + if ((ret = vkd3d_scan_dxbc(&desc->CS, &shader_info)) < 0) { WARN("Failed to scan shader bytecode, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); @@ -1541,7 +1557,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); + vkd3d_shader_free_scan_descriptor_info(&shader_info); shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; @@ -2266,14 +2282,17 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { + struct vkd3d_shader_scan_descriptor_info shader_info = + { + .type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO, + }; const D3D12_SHADER_BYTECODE *b = (const void *)((uintptr_t)desc + shader_stages[i].offset); - struct vkd3d_shader_scan_info shader_info = {VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO}; const struct vkd3d_shader_code dxbc = {b->pShaderBytecode, b->BytecodeLength}; if (!b->pShaderBytecode) continue; - if ((ret = vkd3d_shader_scan_dxbc(&dxbc, &shader_info, NULL)) < 0) + if ((ret = vkd3d_scan_dxbc(b, &shader_info)) < 0) { WARN("Failed to scan shader bytecode, stage %#x, vkd3d result %d.\n", shader_stages[i].stage, ret); @@ -2291,7 +2310,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s break; } } - vkd3d_shader_free_scan_info(&shader_info); + vkd3d_shader_free_scan_descriptor_info(&shader_info); target_info = NULL; switch (shader_stages[i].stage) diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 079559a..be63b39 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -68,10 +68,14 @@ static void test_invalid_shaders(void) rc = vkd3d_shader_compile(&info, &spirv, NULL); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); + + rc = vkd3d_shader_scan(&info, NULL); + ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } static void test_vkd3d_shader_pfns(void) { + PFN_vkd3d_shader_free_scan_descriptor_info pfn_vkd3d_shader_free_scan_descriptor_info; PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; PFN_vkd3d_shader_free_shader_signature pfn_vkd3d_shader_free_shader_signature; @@ -79,13 +83,13 @@ 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_scan_dxbc pfn_vkd3d_shader_scan_dxbc; PFN_vkd3d_shader_compile pfn_vkd3d_shader_compile; + PFN_vkd3d_shader_scan pfn_vkd3d_shader_scan; struct vkd3d_shader_versioned_root_signature_desc root_signature_desc; + struct vkd3d_shader_scan_descriptor_info descriptor_info; 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; int rc; @@ -112,6 +116,7 @@ static void test_vkd3d_shader_pfns(void) }; static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; + pfn_vkd3d_shader_free_scan_descriptor_info = vkd3d_shader_free_scan_descriptor_info; pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; pfn_vkd3d_shader_free_shader_signature = vkd3d_shader_free_shader_signature; @@ -119,8 +124,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_scan_dxbc = vkd3d_shader_scan_dxbc; pfn_vkd3d_shader_compile = vkd3d_shader_compile; + pfn_vkd3d_shader_scan = vkd3d_shader_scan; rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); @@ -149,10 +154,13 @@ static void test_vkd3d_shader_pfns(void) ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_shader_code(&spirv); - memset(&scan_info, 0, sizeof(scan_info)); - scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; - rc = pfn_vkd3d_shader_scan_dxbc(&vs, &scan_info, NULL); + memset(&descriptor_info, 0, sizeof(descriptor_info)); + descriptor_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO; + compile_info.next = &descriptor_info; + + rc = pfn_vkd3d_shader_scan(&compile_info, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + pfn_vkd3d_shader_free_scan_descriptor_info(&descriptor_info); } START_TEST(vkd3d_shader_api) -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Validate control flow instructions in vkd3d_shader_scan_dxbc().
by Henri Verbeet 30 Jul '20

30 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 276 +++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 259 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5597992..cf8b289 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -359,6 +359,22 @@ struct vkd3d_shader_scan_context struct vkd3d_shader_scan_info *scan_info; size_t descriptors_size; + struct vkd3d_shader_message_context message_context; + + struct vkd3d_shader_cf_info + { + enum + { + VKD3D_SHADER_BLOCK_IF, + VKD3D_SHADER_BLOCK_LOOP, + VKD3D_SHADER_BLOCK_SWITCH, + } type; + bool inside_block; + bool has_default; + } *cf_info; + size_t cf_info_size; + size_t cf_info_count; + struct { unsigned int id; @@ -368,6 +384,85 @@ struct vkd3d_shader_scan_context size_t uav_range_count; }; +static bool vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *context, + struct vkd3d_shader_scan_info *scan_info) +{ + memset(context, 0, sizeof(*context)); + context->scan_info = scan_info; + return vkd3d_shader_message_context_init(&context->message_context, VKD3D_SHADER_LOG_INFO, NULL); +} + +static void vkd3d_shader_scan_context_cleanup(struct vkd3d_shader_scan_context *context) +{ + vkd3d_free(context->uav_ranges); + vkd3d_free(context->cf_info); + vkd3d_shader_message_context_cleanup(&context->message_context); +} + +static struct vkd3d_shader_cf_info *vkd3d_shader_scan_get_current_cf_info(struct vkd3d_shader_scan_context *context) +{ + if (!context->cf_info_count) + return NULL; + return &context->cf_info[context->cf_info_count - 1]; +} + +static struct vkd3d_shader_cf_info *vkd3d_shader_scan_push_cf_info(struct vkd3d_shader_scan_context *context) +{ + struct vkd3d_shader_cf_info *cf_info; + + if (!vkd3d_array_reserve((void **)&context->cf_info, &context->cf_info_size, + context->cf_info_count + 1, sizeof(*context->cf_info))) + { + ERR("Failed to allocate UAV range.\n"); + return false; + } + + cf_info = &context->cf_info[context->cf_info_count++]; + memset(cf_info, 0, sizeof(*cf_info)); + + return cf_info; +} + +static void vkd3d_shader_scan_pop_cf_info(struct vkd3d_shader_scan_context *context) +{ + assert(context->cf_info_count); + + --context->cf_info_count; +} + +static struct vkd3d_shader_cf_info *vkd3d_shader_scan_find_innermost_breakable_cf_info( + struct vkd3d_shader_scan_context *context) +{ + size_t count = context->cf_info_count; + struct vkd3d_shader_cf_info *cf_info; + + while (count) + { + cf_info = &context->cf_info[--count]; + if (cf_info->type == VKD3D_SHADER_BLOCK_LOOP + || cf_info->type == VKD3D_SHADER_BLOCK_SWITCH) + return cf_info; + } + + return NULL; +} + +static struct vkd3d_shader_cf_info *vkd3d_shader_scan_find_innermost_loop_cf_info( + struct vkd3d_shader_scan_context *context) +{ + size_t count = context->cf_info_count; + struct vkd3d_shader_cf_info *cf_info; + + while (count) + { + cf_info = &context->cf_info[--count]; + if (cf_info->type == VKD3D_SHADER_BLOCK_LOOP) + return cf_info; + } + + return NULL; +} + static struct vkd3d_shader_descriptor_info *vkd3d_shader_scan_get_uav_descriptor_info( const struct vkd3d_shader_scan_context *context, unsigned int range_id) { @@ -397,6 +492,9 @@ static void vkd3d_shader_scan_record_uav_read(struct vkd3d_shader_scan_context * { struct vkd3d_shader_descriptor_info *d; + if (!context->scan_info) + return; + d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ; } @@ -413,6 +511,9 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_contex { struct vkd3d_shader_descriptor_info *d; + if (!context->scan_info) + return; + d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER; } @@ -467,6 +568,9 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc { const struct vkd3d_shader_constant_buffer *cb = &instruction->declaration.cb; + if (!context->scan_info) + return; + 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, 0); } @@ -477,6 +581,9 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte const struct vkd3d_shader_sampler *sampler = &instruction->declaration.sampler; unsigned int flags; + if (!context->scan_info) + return; + if (instruction->flags & VKD3DSI_SAMPLER_COMPARISON_MODE) flags = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; else @@ -491,6 +598,9 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont { enum vkd3d_shader_descriptor_type type; + if (!context->scan_info) + return; + if (resource->reg.reg.type == VKD3DSPR_UAV) type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else @@ -534,9 +644,10 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca semantic->resource_type, resource_data_type); } -static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, +static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { + struct vkd3d_shader_cf_info *cf_info; unsigned int i; switch (instruction->handler_idx) @@ -561,6 +672,121 @@ static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *cont vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.structured_resource.resource, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); break; + case VKD3DSIH_IF: + cf_info = vkd3d_shader_scan_push_cf_info(context); + cf_info->type = VKD3D_SHADER_BLOCK_IF; + cf_info->inside_block = true; + break; + case VKD3DSIH_ELSE: + if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_IF) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered ‘else’ instruction without corresponding ‘if’ block."); + return VKD3D_ERROR_INVALID_SHADER; + } + cf_info->inside_block = true; + break; + case VKD3DSIH_ENDIF: + if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_IF) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered ‘endif’ instruction without corresponding ‘if’ block."); + return VKD3D_ERROR_INVALID_SHADER; + } + vkd3d_shader_scan_pop_cf_info(context); + break; + case VKD3DSIH_LOOP: + cf_info = vkd3d_shader_scan_push_cf_info(context); + cf_info->type = VKD3D_SHADER_BLOCK_LOOP; + break; + case VKD3DSIH_ENDLOOP: + if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_LOOP) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered ‘endloop’ instruction without corresponding ‘loop’ block."); + return VKD3D_ERROR_INVALID_SHADER; + } + vkd3d_shader_scan_pop_cf_info(context); + break; + case VKD3DSIH_SWITCH: + cf_info = vkd3d_shader_scan_push_cf_info(context); + cf_info->type = VKD3D_SHADER_BLOCK_SWITCH; + break; + case VKD3DSIH_ENDSWITCH: + if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) + || cf_info->type != VKD3D_SHADER_BLOCK_SWITCH || cf_info->inside_block) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered ‘endswitch’ instruction without corresponding ‘switch’ block."); + return VKD3D_ERROR_INVALID_SHADER; + } + vkd3d_shader_scan_pop_cf_info(context); + break; + case VKD3DSIH_CASE: + if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) + || cf_info->type != VKD3D_SHADER_BLOCK_SWITCH) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered ‘case’ instruction outside switch block."); + return VKD3D_ERROR_INVALID_SHADER; + } + cf_info->inside_block = true; + break; + case VKD3DSIH_DEFAULT: + if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) + || cf_info->type != VKD3D_SHADER_BLOCK_SWITCH) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered ‘default’ instruction outside switch block."); + return VKD3D_ERROR_INVALID_SHADER; + } + if (cf_info->has_default) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered duplicate ‘default’ instruction inside the current switch block."); + return VKD3D_ERROR_INVALID_SHADER; + } + cf_info->inside_block = true; + cf_info->has_default = true; + break; + case VKD3DSIH_BREAK: + if (!(cf_info = vkd3d_shader_scan_find_innermost_breakable_cf_info(context))) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered ‘break’ instruction outside breakable block."); + return VKD3D_ERROR_INVALID_SHADER; + } + cf_info->inside_block = false; + break; + case VKD3DSIH_BREAKP: + if (!(cf_info = vkd3d_shader_scan_find_innermost_loop_cf_info(context))) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered ‘breakp’ instruction outside loop."); + return VKD3D_ERROR_INVALID_SHADER; + } + break; + case VKD3DSIH_CONTINUE: + if (!(cf_info = vkd3d_shader_scan_find_innermost_loop_cf_info(context))) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered ‘continue’ instruction outside loop."); + return VKD3D_ERROR_INVALID_SHADER; + } + cf_info->inside_block = false; + break; + case VKD3DSIH_CONTINUEP: + if (!(cf_info = vkd3d_shader_scan_find_innermost_loop_cf_info(context))) + { + vkd3d_shader_error(&context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + "Encountered ‘continue’ instruction outside loop."); + return VKD3D_ERROR_INVALID_SHADER; + } + break; + case VKD3DSIH_RET: + if (context->cf_info_count) + context->cf_info[context->cf_info_count - 1].inside_block = false; + break; default: break; } @@ -581,12 +807,14 @@ 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, &instruction->src[0].reg); + + return VKD3D_OK; } int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_scan_info *scan_info, char **messages) { - struct vkd3d_shader_message_context message_context; + struct vkd3d_shader_message_context *message_context; struct vkd3d_shader_instruction instruction; struct vkd3d_shader_scan_context context; struct vkd3d_shader_parser parser; @@ -603,24 +831,26 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, return VKD3D_ERROR_INVALID_ARGUMENT; } - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) + if (!vkd3d_shader_scan_context_init(&context, scan_info)) return VKD3D_ERROR; - ret = vkd3d_shader_parser_init(&parser, dxbc, &message_context); - vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) - ret = VKD3D_ERROR_OUT_OF_MEMORY; - vkd3d_shader_message_context_cleanup(&message_context); - if (ret < 0) + message_context = &context.message_context; + + if ((ret = vkd3d_shader_parser_init(&parser, dxbc, message_context)) < 0) + { + vkd3d_shader_message_context_trace_messages(message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_scan_context_cleanup(&context); return ret; + } if (TRACE_ON()) vkd3d_shader_trace(parser.data); memset(scan_info, 0, sizeof(*scan_info)); - memset(&context, 0, sizeof(context)); - context.scan_info = scan_info; - + message_context->line = 2; /* Line 1 is the version token. */ + message_context->column = 1; while (!shader_sm4_is_end(parser.data, &parser.ptr)) { shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); @@ -628,18 +858,28 @@ 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; + ret = VKD3D_ERROR_INVALID_SHADER; + goto done; } - vkd3d_shader_scan_instruction(&context, &instruction); + if ((ret = vkd3d_shader_scan_instruction(&context, &instruction)) < 0) + { + vkd3d_shader_free_scan_info(scan_info); + goto done; + } + ++message_context->line; } - vkd3d_free(context.uav_ranges); + ret = VKD3D_OK; + +done: + vkd3d_shader_message_context_trace_messages(message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_scan_context_cleanup(&context); vkd3d_shader_parser_destroy(&parser); - return VKD3D_OK; + return ret; } void vkd3d_shader_free_scan_info(struct vkd3d_shader_scan_info *scan_info) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c6796bb..4fa17d6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -67,6 +67,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION = 4, VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_OFFSET = 5, VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_SIZE = 6, + VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF = 1000, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER -- 2.11.0

1 0

[PATCH] dmime: Parse TimeSig track data.
by Alistair Leslie-Hughes 30 Jul '20

30 Jul '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/timesigtrack.c | 54 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 697b3e3593b..5bb38254d43 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -37,6 +37,11 @@ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, IDirectMusicTrack_iface); } +static inline IDirectMusicTimeSigTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ret_iface) { @@ -207,10 +212,55 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; + +static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *stream, + struct chunk_entry *timesig) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = timesig}; + DMUS_IO_TIMESIGNATURE_ITEM item; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(timesig)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if (chunk.id != DMUS_FOURCC_TIMESIGNATURE_TRACK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &item, chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + + TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); + TRACE(" - lTime %d\n", item.lTime); + TRACE(" - bBeatsPerMeasure %d\n", item.bBeatsPerMeasure); + TRACE(" - bBeat %d\n", item.bBeat); + TRACE(" - wGridsPerBeat %d\n", item.wGridsPerBeat); + } + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_TIMESIGTRACK_LIST) + hr = parse_timetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.27.0

1 0

[PATCH] usp10: Fix typo in comment about box drawing unicode range.
by Jeff Smith 29 Jul '20

29 Jul '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 322091c5472..719fa3aae5c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -169,7 +169,7 @@ script_ranges[] = /* Control Pictures : U+2400 –U+243f */ /* Optical Character Recognition : U+2440 –U+245f */ /* Enclosed Alphanumerics : U+2460 –U+24ff */ - /* Box Drawing : U+2500 –U+25ff */ + /* Box Drawing : U+2500 –U+257f */ /* Block Elements : U+2580 –U+259f */ /* Geometric Shapes : U+25a0 –U+25ff */ /* Miscellaneous Symbols : U+2600 –U+26ff */ -- 2.23.0

1 0

[PATCH] user32: Support undocumented SC_SIZE flag that can be used to move window.
by Piotr Caban 29 Jul '20

29 Jul '20

Fixes main window moving in Quicken 2020. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/win.c | 40 +++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 4 ++-- dlls/winex11.drv/window.c | 1 + 3 files changed, 43 insertions(+), 2 deletions(-)

2 1

[PATCH 1/2] ntdll: Compare builtins by their device and inode number directly.
by Zebediah Figura 29 Jul '20

29 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/loader.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index afb6405864a..499d9bf58b1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -129,7 +129,8 @@ static HMODULE ntdll_module; struct file_id { - BYTE ObjectId[16]; + dev_t dev; + ino_t ino; }; struct builtin_module @@ -142,13 +143,17 @@ struct builtin_module static struct list builtin_modules = LIST_INIT( builtin_modules ); -static NTSTATUS add_builtin_module( void *module, void *handle, const FILE_OBJECTID_BUFFER *id ) +static NTSTATUS add_builtin_module( void *module, void *handle, const struct stat *st ) { struct builtin_module *builtin; if (!(builtin = malloc( sizeof(*builtin) ))) return STATUS_NO_MEMORY; builtin->handle = handle; builtin->module = module; - if (id) memcpy( &builtin->id, id->ObjectId, sizeof(builtin->id) ); + if (st) + { + builtin->id.dev = st->st_dev; + builtin->id.ino = st->st_ino; + } else memset( &builtin->id, 0, sizeof(builtin->id) ); list_add_tail( &builtin_modules, &builtin->entry ); return STATUS_SUCCESS; @@ -996,9 +1001,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t { struct builtin_module *builtin; OBJECT_ATTRIBUTES attr = { sizeof(attr) }; - IO_STATUS_BLOCK io; LARGE_INTEGER size; - FILE_OBJECTID_BUFFER id; struct stat st; SIZE_T len = 0; NTSTATUS status; @@ -1017,11 +1020,11 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t return STATUS_DLL_NOT_FOUND; } - if (!NtFsControlFile( handle, 0, NULL, NULL, &io, FSCTL_GET_OBJECT_ID, NULL, 0, &id, sizeof(id) )) + if (!stat( name, &st )) { LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { - if (!memcmp( &builtin->id, id.ObjectId, sizeof(builtin->id) )) + if (builtin->id.dev == st.st_dev && builtin->id.ino == st.st_ino) { TRACE( "%s is the same file as existing module %p\n", debugstr_a(name), builtin->module ); @@ -1032,7 +1035,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t } } } - else memset( id.ObjectId, 0, sizeof(id.ObjectId) ); + else memset( &st, 0, sizeof(st) ); size.QuadPart = 0; status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | @@ -1063,7 +1066,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; } - if (!status) status = add_builtin_module( *module, NULL, &id ); + if (!status) status = add_builtin_module( *module, NULL, &st ); if (status) { -- 2.27.0

1 1

[PATCH 1/6] amstream: Return correct media type info when enumerating AMAudioStream media types.
by Gijs Vermeulen 29 Jul '20

29 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/audiostream.c | 20 +++++++++++++++++++- dlls/amstream/tests/amstream.c | 10 +++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 112891eeb7..c3831544d6 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -821,6 +821,17 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface); + static const WAVEFORMATEX wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .nAvgBytesPerSec = 11025 * 2, + .nBlockAlign = 2, + .wBitsPerSample = 16, + .cbSize = 0, + }; + TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count); if (!ret_count) @@ -831,7 +842,14 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, mts[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); memset(mts[0], 0, sizeof(AM_MEDIA_TYPE)); mts[0]->majortype = MEDIATYPE_Audio; - mts[0]->subtype = MEDIASUBTYPE_PCM; + mts[0]->subtype = GUID_NULL; + mts[0]->bFixedSizeSamples = TRUE; + mts[0]->bTemporalCompression = FALSE; + mts[0]->lSampleSize = 2; + mts[0]->formattype = FORMAT_WaveFormatEx; + mts[0]->cbFormat = sizeof(WAVEFORMATEX); + mts[0]->pbFormat = (BYTE *)&wfx; + ++enum_media_types->index; *ret_count = 1; return count == 1 ? S_OK : S_FALSE; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 68d2b9c18f..da9633feec 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2426,15 +2426,15 @@ static void test_media_types(void) ok(count == 1, "Got count %u.\n", count); ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s\n", wine_dbgstr_guid(&pmt->majortype)); - todo_wine ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", + ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", wine_dbgstr_guid(&pmt->subtype)); - todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); - todo_wine ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); - todo_wine ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", wine_dbgstr_guid(&pmt->formattype)); ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); - todo_wine ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); + ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); ok(!memcmp(pmt->pbFormat, &expect_wfx, pmt->cbFormat), "Format blocks didn't match.\n"); hr = IPin_QueryAccept(pin, pmt); -- 2.27.0

2 9

[PATCH v2 1/2] amstream: Increase parent IAMMediaStream refcount in IAudioMediaStream::CreateSample().
by Gijs Vermeulen 29 Jul '20

29 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/audiostream.c | 2 ++ dlls/amstream/tests/amstream.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 112891eeb7..e888caaa98 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -201,6 +201,7 @@ static ULONG WINAPI IAudioStreamSampleImpl_Release(IAudioStreamSample *iface) if (!ref) { + IAMMediaStream_Release(&This->parent->IAMMediaStream_iface); CloseHandle(This->update_event); HeapFree(GetProcessHeap(), 0, This); } @@ -375,6 +376,7 @@ static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; object->ref = 1; object->parent = parent; + IAMMediaStream_AddRef(&parent->IAMMediaStream_iface); object->audio_data = audio_data; object->update_event = CreateEventW(NULL, FALSE, FALSE, NULL); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 68d2b9c18f..17f00dcdf9 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1421,8 +1421,11 @@ static void test_media_streams(void) hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); + + EXPECT_REF(audio_stream, 3); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); + EXPECT_REF(audio_stream, 4); hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, NULL); ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); -- 2.27.0

2 3

[PATCH v3 1/4] xinput: change to IMPORTS from DELAYIMPORTS
by Jordan Coppard 29 Jul '20

29 Jul '20

Using DELAYIMPORTS is breaking startup of old MapleStory clients using GameGuard. After discussion in #winehackers IRC, it was remarked that there is no good reason to keep setupapi under DELAYIMPORTS, thus I have moved all occurrences of it to IMPORTS instead which allows said old MapleStory clients to open successfully. Signed-off-by: Jordan Coppard <jordan(a)niau.io> --- dlls/xinput1_1/Makefile.in | 2 +- dlls/xinput1_2/Makefile.in | 2 +- dlls/xinput1_3/Makefile.in | 2 +- dlls/xinput1_4/Makefile.in | 2 +- dlls/xinput9_1_0/Makefile.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index a2b17a248c..c4a0fe4b3a 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_1.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index fd38c6f6cc..9e56513501 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_2.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index 3b4968fb6d..fd4e48b4a8 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index cdf4b4fed0..73ef49dbf5 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_4.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index dc8739c464..2efe7b31b6 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput9_1_0.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin -- 2.27.0

3 5

[PATCH 1/3 resend] setupapi/tests: Change return values from coinst functions.
by Jeff Smith 29 Jul '20

29 Jul '20

As co_error and class_error both return 0xdeadbeef, use of 0xdeadbeef as a canary value as well can lead to ambiguous tests results. As 0xdeadbeef is a typical canary value in wine, change the return values for co_error and class_error, avoiding the potential ambiguity. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- Patches 2 and 3 will work without patch 1. This patch just makes tests marginally more precise if an error does get caught. dlls/setupapi/tests/coinst.c | 4 ++-- dlls/setupapi/tests/devinst.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/tests/coinst.c b/dlls/setupapi/tests/coinst.c index 5e8d890cfa5..604bf74d1eb 100644 --- a/dlls/setupapi/tests/coinst.c +++ b/dlls/setupapi/tests/coinst.c @@ -47,7 +47,7 @@ DWORD WINAPI class_default(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA * DWORD WINAPI class_error(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device) { - return 0xdeadbeef; + return E_FAIL; } DWORD WINAPI co_success(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device, @@ -67,5 +67,5 @@ DWORD WINAPI CoDeviceInstall(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA DWORD WINAPI co_error(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device, COINSTALLER_CONTEXT_DATA *context) { - return 0xdeadbeef; + return E_FAIL; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index d4c82dea1f6..80abc44029c 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2727,17 +2727,17 @@ static void test_class_installer(void) ret = SetupDiCallClassInstaller(DIF_ALLOW_INSTALL, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == E_FAIL, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == E_FAIL, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); ret = SetupDiCallClassInstaller(DIF_REMOVE, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == E_FAIL, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); SetupDiDestroyDeviceInfoList(set); @@ -2875,12 +2875,12 @@ static void test_class_coinstaller(void) ret = SetupDiCallClassInstaller(DIF_ALLOW_INSTALL, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == E_FAIL, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == E_FAIL, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); SetupDiDestroyDeviceInfoList(set); -- 2.23.0

2 10

[PATCH] msvcp140_1: Add stub msvcp140_1.
by Daniel Lehman 29 Jul '20

29 Jul '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- configure.ac | 1 + dlls/msvcp140_1/Makefile.in | 1 + dlls/msvcp140_1/msvcp140_1.spec | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 dlls/msvcp140_1/Makefile.in create mode 100644 dlls/msvcp140_1/msvcp140_1.spec diff --git a/configure.ac b/configure.ac index f2d0c9cd26..dea25b0c3f 100644 --- a/configure.ac +++ b/configure.ac @@ -3512,6 +3512,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp120/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp120_app) WINE_CONFIG_MAKEFILE(dlls/msvcp140) WINE_CONFIG_MAKEFILE(dlls/msvcp140/tests) +WINE_CONFIG_MAKEFILE(dlls/msvcp140_1) WINE_CONFIG_MAKEFILE(dlls/msvcp60) WINE_CONFIG_MAKEFILE(dlls/msvcp60/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp70) diff --git a/dlls/msvcp140_1/Makefile.in b/dlls/msvcp140_1/Makefile.in new file mode 100644 index 0000000000..6582299d7d --- /dev/null +++ b/dlls/msvcp140_1/Makefile.in @@ -0,0 +1 @@ +MODULE = msvcp140_1.dll diff --git a/dlls/msvcp140_1/msvcp140_1.spec b/dlls/msvcp140_1/msvcp140_1.spec new file mode 100644 index 0000000000..bfe82ab00d --- /dev/null +++ b/dlls/msvcp140_1/msvcp140_1.spec @@ -0,0 +1,7 @@ +@ stub _Aligned_get_default_resource +@ stub _Aligned_new_delete_resource +@ stub _Aligned_set_default_resource +@ stub _Unaligned_get_default_resource +@ stub _Unaligned_new_delete_resource +@ stub _Unaligned_set_default_resource +@ stub null_memory_resource -- 2.25.1

2 1

[PATCH] bcrypt: Allow importing private ECDSA keys.
by Hans Leidekker 29 Jul '20

29 Jul '20

Based on a patch by Derek Lesho. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 4 ++++ dlls/bcrypt/gnutls.c | 1 + dlls/bcrypt/tests/bcrypt.c | 39 ++++++++++++++++++++++++++++++++------ 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index bea2001a67..b6bb73a715 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1201,6 +1201,10 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP key_size = 32; magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; break; + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + break; default: FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 19a00e2ee2..a80bce47f9 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -952,6 +952,7 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len ) switch (key->alg_id) { case ALG_ID_ECDH_P256: + case ALG_ID_ECDSA_P256: curve = GNUTLS_ECC_CURVE_SECP256R1; break; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index eb7a72e0ff..e37a33e38a 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1670,6 +1670,18 @@ static void test_key_import_export(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static BYTE eccPrivkey[] = +{ + /* X */ + 0x26, 0xff, 0x0e, 0xf9, 0x71, 0x93, 0xf8, 0xed, 0x59, 0xfa, 0x24, 0xec, 0x18, 0x13, 0xfe, 0xf5, + 0x0b, 0x4a, 0xb1, 0x27, 0xb7, 0xab, 0x3e, 0x4f, 0xc5, 0x5a, 0x91, 0xa3, 0x6e, 0x21, 0x61, 0x65, + /* Y */ + 0x62, 0x7b, 0x8b, 0x30, 0x7a, 0x63, 0x4c, 0x1a, 0xf4, 0x54, 0x54, 0xbb, 0x75, 0x59, 0x68, 0x36, + 0xfe, 0x49, 0x95, 0x75, 0x9e, 0x20, 0x3e, 0x69, 0x58, 0xb9, 0x7a, 0x84, 0x03, 0x45, 0x5c, 0x10, + /* d */ + 0xb9, 0xcd, 0xbe, 0xd4, 0x75, 0x5d, 0x05, 0xe5, 0x83, 0x0c, 0xd3, 0x37, 0x34, 0x15, 0xe3, 0x2c, + 0xe5, 0x85, 0x15, 0xa9, 0xee, 0xba, 0x94, 0x03, 0x03, 0x0b, 0x86, 0xea, 0x85, 0x40, 0xbd, 0x35, +}; static BYTE eccPubkey[] = { /* X */ @@ -1696,11 +1708,12 @@ static BYTE certSignature[] = static void test_ECDSA(void) { - BYTE buffer[sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey)]; + BYTE buffer[sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey)]; BCRYPT_ECCKEY_BLOB *ecckey = (void *)buffer; - BCRYPT_ALG_HANDLE alg = NULL; - BCRYPT_KEY_HANDLE key = NULL; + BCRYPT_ALG_HANDLE alg; + BCRYPT_KEY_HANDLE key; NTSTATUS status; + ULONG size; status = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); if (status) @@ -1713,11 +1726,12 @@ static void test_ECDSA(void) memcpy(ecckey + 1, eccPubkey, sizeof(eccPubkey)); ecckey->cbKey = 2; - status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey); + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); - ecckey->cbKey = sizeof(eccPubkey) / 2; - status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); @@ -1725,6 +1739,19 @@ static void test_ECDSA(void) status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); ok(!status, "BCryptVerifySignature failed: %08x\n", status); + pBCryptDestroyKey(key); + + ecckey->dwMagic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + memcpy(ecckey + 1, eccPrivkey, sizeof(eccPrivkey)); + + ecckey->cbKey = 2; + size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey); + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); + ok(!status, "BCryptImportKeyPair failed: %08x\n", status); pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0); -- 2.27.0

1 0

[PATCH] wininet: Handle empty expires for cookie setting.
by Jacek Caban 29 Jul '20

29 Jul '20

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/cookie.c | 2 +- dlls/wininet/tests/internet.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-)

2 1

[PATCH 9/9] server: Remove no longer needed open_console request.
by Jacek Caban 29 Jul '20

29 Jul '20

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

1 0

[PATCH 8/9] server: Remove no longer needed CONSOLE_RENDERER_ACTIVE_SB_EVENT events.
by Jacek Caban 29 Jul '20

29 Jul '20

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

1 0

[PATCH 7/9] wineconsole: Use renderer handle instead of hConOut where possible.
by Jacek Caban 29 Jul '20

29 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/curses.c | 2 +- programs/wineconsole/user.c | 2 +- programs/wineconsole/wineconsole.c | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-)

1 0

[PATCH 6/9] wineconsole: Rename hSynchro to console.
by Jacek Caban 29 Jul '20

29 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/winecon_private.h | 2 +- programs/wineconsole/wineconsole.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 5/9] server: Allow using console ioctls on renderer object.
by Jacek Caban 29 Jul '20

29 Jul '20

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

1 0

[PATCH 4/9] server: Use weak reference between console input and renderer objects.
by Jacek Caban 29 Jul '20

29 Jul '20

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

1 0

[PATCH 3/9] server: Remove no longer used move_console_output request.
by Jacek Caban 29 Jul '20

29 Jul '20

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

1 0

[PATCH 2/9] kernelbase: Use IOCTL_CONDRV_SCROLL in ScrollConsoleScreenBufferW.
by Jacek Caban 29 Jul '20

29 Jul '20

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

1 0

[PATCH 1/9] server: Introduce IOCTL_CONDRV_SCROLL ioctl.
by Jacek Caban 29 Jul '20

29 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 29 +++++++---- server/console.c | 118 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 135 insertions(+), 12 deletions(-)

1 0

[PATCH v2 5/5] ieframe/tests: Add some tests for IOleObject::Advise(), IOleObject::Unadvise() and IOleObject::EnumAdvise().
by Dmitry Timoshkov 29 Jul '20

29 Jul '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/tests/webbrowser.c | 107 +++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 7 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3ec5921a32..e0af0d4642 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -47,6 +47,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(outer_test_iid,0x06d4cd6c,0x18dd,0x11ea,0x8e,0x76,0xfc,0xaa,0x14,0x72,0x2d,0xac); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); +DEFINE_GUID(IID_IProxyManager,0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -157,6 +158,7 @@ DEFINE_EXPECT(OnFocus_TRUE); DEFINE_EXPECT(OnFocus_FALSE); DEFINE_EXPECT(GetExternal); DEFINE_EXPECT(outer_QI_test); +DEFINE_EXPECT(Advise_OnClose); static const WCHAR wszItem[] = {'i','t','e','m',0}; @@ -184,6 +186,7 @@ static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ static DWORD dwl_flags; +static IAdviseSink test_sink; /* Returns true if the user interface is in English. Note that this does not * presume of the formatting of dates, numbers, etc. @@ -1834,12 +1837,16 @@ static void test_DoVerb(IWebBrowser2 *unk) IOleObject *oleobj; RECT rect = {0,0,1000,1000}; HRESULT hres; + DWORD connection; hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); if(FAILED(hres)) return; + hres = IOleObject_Advise(oleobj, &test_sink, &connection); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + SET_EXPECT(CanInPlaceActivate); SET_EXPECT(Site_GetWindow); SET_EXPECT(OnInPlaceActivate); @@ -1874,6 +1881,9 @@ static void test_DoVerb(IWebBrowser2 *unk) 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + hres = IOleObject_Unadvise(oleobj, connection); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + IOleObject_Release(oleobj); } @@ -3681,6 +3691,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) }else { nav_back_todo = nav_forward_todo = TRUE; } + SET_EXPECT(Advise_OnClose); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); CHECK_CALLED(Frame_SetActiveObject); @@ -3702,6 +3713,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) }else { nav_back_todo = nav_forward_todo = FALSE; } + CHECK_CALLED(Advise_OnClose); hres = IOleObject_GetClientSite(oo, &ocs); ok(hres == S_OK, "hres = %x\n", hres); @@ -3728,16 +3740,66 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) SET_EXPECT(OnFocus_FALSE); SET_EXPECT(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); SET_EXPECT(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); + SET_EXPECT(Advise_OnClose); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); todo_wine CHECK_NOT_CALLED(OnFocus_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); + CHECK_CALLED(Advise_OnClose); test_close = FALSE; IOleObject_Release(oo); } +static void test_Advise(IWebBrowser2 *wb) +{ + IOleObject *oleobj; + IEnumSTATDATA *data; + DWORD connection[2]; + HRESULT hres; + + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void **)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, 0); + ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08x\n", hres); + + data = (void *)0xdeadbeef; + hres = IOleObject_EnumAdvise(oleobj, &data); + ok(hres == E_NOTIMPL, "EnumAdvise returned: %08x\n", hres); + ok(data == NULL, "got data %p\n", data); + + connection[0] = 0xdeadbeef; + hres = IOleObject_Advise(oleobj, NULL, &connection[0]); + ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); + ok(connection[0] == 0, "got connection %u\n", connection[0]); + + hres = IOleObject_Advise(oleobj, &test_sink, NULL); + ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); + + connection[0] = 0xdeadbeef; + hres = IOleObject_Advise(oleobj, &test_sink, &connection[0]); + ok(hres == S_OK, "Advise returned: %08x\n", hres); + ok(connection[0] != 0xdeadbeef, "got connection %u\n", connection[0]); + + connection[1] = 0xdeadbeef; + hres = IOleObject_Advise(oleobj, &test_sink, &connection[1]); + ok(hres == S_OK, "Advise returned: %08x\n", hres); + ok(connection[1] == connection[0] + 1, "got connection %u\n", connection[1]); + + hres = IOleObject_Unadvise(oleobj, connection[1]); + ok(hres == S_OK, "Unadvise returned: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, connection[1]); + ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, connection[0]); + ok(hres == S_OK, "Unadvise returned: %08x\n", hres); + + IOleObject_Release(oleobj); +} + #define TEST_DOWNLOAD 0x0001 #define TEST_NOOLECMD 0x0002 #define TEST_NODOCHOST 0x0004 @@ -3756,7 +3818,9 @@ static void init_test(IWebBrowser2 *webbrowser, DWORD flags) static void test_WebBrowser(DWORD flags, BOOL do_close) { IWebBrowser2 *webbrowser; - ULONG ref; + IOleObject *oleobj; + HRESULT hres; + ULONG ref, connection; webbrowser = create_webbrowser(); if(!webbrowser) @@ -3764,6 +3828,12 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) init_test(webbrowser, flags); + hres = IWebBrowser2_QueryInterface(webbrowser, &IID_IOleObject, (void **)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); + + hres = IOleObject_Advise(oleobj, &test_sink, &connection); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + test_QueryStatusWB(webbrowser, FALSE); test_ExecWB(webbrowser, FALSE); test_QueryInterface(webbrowser); @@ -3781,6 +3851,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_QueryStatusWB(webbrowser, TRUE); test_Persist(webbrowser, 2); test_OleObject(webbrowser, 2); + test_Advise(webbrowser); if(do_download) { IHTMLDocument2 *doc, *doc2; @@ -3866,6 +3937,11 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_ConnectionPoint(webbrowser, FALSE); test_IServiceProvider(webbrowser); + hres = IOleObject_Unadvise(oleobj, connection); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + + IOleObject_Release(oleobj); + ref = IWebBrowser2_Release(webbrowser); ok(ref == 0 || broken(do_download && !do_close), "ref=%d, expected 0\n", ref); } @@ -3873,7 +3949,8 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) static void test_WebBrowserV1(void) { IWebBrowser2 *wb; - ULONG ref; + IOleObject *oleobj; + ULONG ref, connection; HRESULT hres; hres = CoCreateInstance(&CLSID_WebBrowser_V1, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -3883,6 +3960,12 @@ static void test_WebBrowserV1(void) init_test(wb, 0); wb_version = 1; + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void **)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); + + hres = IOleObject_Advise(oleobj, &test_sink, &connection); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + test_QueryStatusWB(wb, FALSE); test_ExecWB(wb, FALSE); test_QueryInterface(wb); @@ -3891,6 +3974,12 @@ static void test_WebBrowserV1(void) test_EnumVerbs(wb); test_Persist(wb, 1); test_OleObject(wb, 1); + test_Advise(wb); + + hres = IOleObject_Unadvise(oleobj, connection); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + + IOleObject_Release(oleobj); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref); @@ -4038,6 +4127,9 @@ static HRESULT WINAPI sink_QueryInterface( IAdviseSink *iface, REFIID riid, void return S_OK; } + if (IsEqualGUID(riid, &IID_IProxyManager)) + return E_NOINTERFACE; + ok(0, "unexpected call QI(%s)\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -4054,27 +4146,28 @@ static ULONG WINAPI sink_Release(IAdviseSink *iface) static void WINAPI sink_OnDataChange(IAdviseSink *iface, FORMATETC *format, STGMEDIUM *medium) { - trace("%p, %p, %p\n", iface, format, medium); + trace("OnDataChange(%p, %p, %p)\n", iface, format, medium); } static void WINAPI sink_OnViewChange(IAdviseSink *iface, DWORD aspect, LONG index) { - trace("%p, %08x, %d\n", iface, aspect, index); + trace("OnViewChange(%p, %08x, %d)\n", iface, aspect, index); } static void WINAPI sink_OnRename(IAdviseSink *iface, IMoniker *moniker) { - trace("%p, %p\n", iface, moniker); + trace("OnRename(%p, %p) \n", iface, moniker); } static void WINAPI sink_OnSave(IAdviseSink *iface) { - trace("%p\n", iface); + trace("OnSave(%p)\n", iface); } static void WINAPI sink_OnClose(IAdviseSink *iface) { - trace("%p\n", iface); + trace("OnClose(%p)\n", iface); + CHECK_EXPECT(Advise_OnClose); } static const IAdviseSinkVtbl sink_vtbl = -- 2.26.2

2 1

[PATCH v2 4/5] ieframe: IOleObject::Close() should notify OnClose() advise sink.
by Dmitry Timoshkov 29 Jul '20

29 Jul '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index a3fa645334..031994caa5 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -610,6 +610,10 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) IOleClientSite_AddRef(This->client); hres = IOleObject_SetClientSite(iface, NULL); This->client_closed = client; + + if(This->advise_holder) + IOleAdviseHolder_SendOnClose(This->advise_holder); + return hres; } -- 2.26.2

2 1

[PATCH v2 3/5] ieframe: Implement IOleObject::EnumAdvise().
by Dmitry Timoshkov 29 Jul '20

29 Jul '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 80568fbf8a..a3fa645334 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -799,8 +799,11 @@ static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, ppenumAdvise); - return S_OK; + + TRACE("(%p)->(%p): returning E_NOTIMPL\n", This, ppenumAdvise); + + *ppenumAdvise = NULL; + return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) -- 2.26.2

2 1

[PATCH v2 2/5] ieframe: Implement IOleObject::Unadvise().
by Dmitry Timoshkov 29 Jul '20

29 Jul '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 9f5da4039d..80568fbf8a 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -787,8 +787,13 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, dwConnection); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, dwConnection); + + if(!This->advise_holder) + return OLE_E_NOCONNECTION; + + return IOleAdviseHolder_Unadvise(This->advise_holder, dwConnection); } static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) -- 2.26.2

2 1

[PATCH v2 1/5] ieframe: Implement IOleObject::Advise().
by Dmitry Timoshkov 29 Jul '20

29 Jul '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/ieframe.h | 2 ++ dlls/ieframe/oleobject.c | 23 ++++++++++++++++++++--- dlls/ieframe/webbrowser.c | 3 +++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8d238863be..329cea2f7c 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -199,6 +199,8 @@ struct WebBrowser { DWORD sink_aspects; DWORD sink_flags; + IOleAdviseHolder *advise_holder; + /* window context */ HWND frame_hwnd; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 62faaae6bd..9f5da4039d 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -760,11 +760,28 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, - DWORD* pdwConnection) + DWORD *pdwConnection) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p, %p)\n", This, pAdvSink, pdwConnection); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%p, %p)\n", This, pAdvSink, pdwConnection); + + if(!pdwConnection) + return E_INVALIDARG; + + *pdwConnection = 0; + + if(!pAdvSink) + return E_INVALIDARG; + + if(!This->advise_holder) + hr = CreateOleAdviseHolder(&This->advise_holder); + + if(hr == S_OK) + hr = IOleAdviseHolder_Advise(This->advise_holder, pAdvSink, pdwConnection); + + return hr; } static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 356b0a2833..87b74b8e01 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -170,6 +170,9 @@ static ULONG WINAPI WebBrowser_Release(IUnknown *iface) if(This->sink) IAdviseSink_Release(This->sink); + if(This->advise_holder) + IOleAdviseHolder_Release(This->advise_holder); + if(This->doc_host.document) IUnknown_Release(This->doc_host.document); -- 2.26.2

2 1

[PATCH resend] dsound: Select the nth effect matching the given CLSID in GetObjectInPath().
by Zebediah Figura 29 Jul '20

29 Jul '20

Instead of selecting the nth effect overall and checking whether it matches. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsound/buffer.c | 32 +++++++++++++++----------------- dlls/dsound/tests/dsound8.c | 22 +++++++++------------- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index ea428c08166..bc30a8a5448 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -845,27 +845,25 @@ static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources(IDirectSoundBuffer } static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(IDirectSoundBuffer8 *iface, - REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, void **ppObject) + REFGUID clsid, DWORD index, REFGUID iid, void **out) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); + DWORD i, count = 0; - TRACE("(%p,%s,%u,%s,%p)\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject); + TRACE("(%p,%s,%u,%s,%p)\n", This, debugstr_guid(clsid), index, debugstr_guid(iid), out); - if (dwIndex >= This->num_filters) - return DSERR_CONTROLUNAVAIL; - - if (!ppObject) - return E_INVALIDARG; + if (!out) + return E_INVALIDARG; - if (IsEqualGUID(rguidObject, &This->filters[dwIndex].guid) || IsEqualGUID(rguidObject, &GUID_All_Objects)) { - if (SUCCEEDED(IMediaObject_QueryInterface(This->filters[dwIndex].obj, rguidInterface, ppObject))) - return DS_OK; - else - return E_NOINTERFACE; - } else { - WARN("control unavailable\n"); - return DSERR_OBJECTNOTFOUND; - } + for (i = 0; i < This->num_filters; i++) + { + if (IsEqualGUID(clsid, &This->filters[i].guid) || IsEqualGUID(clsid, &GUID_All_Objects)) + { + if (count++ == index) + return IMediaObject_QueryInterface(This->filters[i].obj, iid, out); + } + } + return DSERR_OBJECTNOTFOUND; } static HRESULT WINAPI IDirectSoundBufferImpl_Initialize(IDirectSoundBuffer8 *iface, diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index fcac31ba637..468b460468b 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1678,7 +1678,7 @@ static void test_effects(void) dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); ok(dmo == (IMediaObject *)0xdeadbeef, "Got object %p.\n", dmo); effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; @@ -1705,9 +1705,8 @@ static void test_effects(void) echo = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - reverb = dmo; + ok(hr == DS_OK, "Got hr %#x.\n", hr); + reverb = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); ok(hr == DS_OK, "Got hr %#x.\n", hr); @@ -1716,12 +1715,12 @@ static void test_effects(void) hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); ok(hr == DS_OK, "Got hr %#x.\n", hr); - todo_wine ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); + ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); IMediaObject_Release(dmo); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 1, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXParamEq, (void **)&unk); ok(hr == DS_OK, "Got hr %#x.\n", hr); @@ -1743,14 +1742,11 @@ static void test_effects(void) hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - IUnknown_Release(unk); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); - if (echo) - IMediaObject_Release(echo); - if (reverb) - IMediaObject_Release(reverb); + IMediaObject_Release(echo); + IMediaObject_Release(reverb); got_Process = CreateEventA(NULL, TRUE, FALSE, NULL); -- 2.27.0

2 1

[PATCH] gdiplus/tests: Fix 'LogicalDpiY' typos in metafile tests.
by Shawn M. Chapla 28 Jul '20

28 Jul '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/metafile.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index e2d5171f8a7..47978d64d8b 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -500,7 +500,7 @@ static void test_empty(void) expect(100, header.Height); expect(28, header.EmfPlusHeaderSize); expect(96, header.LogicalDpiX); - expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(0, U(header).EmfHeader.rclBounds.left); expect(0, U(header).EmfHeader.rclBounds.top); @@ -539,7 +539,7 @@ static void test_empty(void) expect(100, header.Height); expect(28, header.EmfPlusHeaderSize); expect(96, header.LogicalDpiX); - expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(0, U(header).EmfHeader.rclBounds.left); expect(0, U(header).EmfHeader.rclBounds.top); @@ -586,7 +586,7 @@ static void test_empty(void) expect(100, header.Height); expect(28, header.EmfPlusHeaderSize); expect(96, header.LogicalDpiX); - expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(0, U(header).EmfHeader.rclBounds.left); expect(0, U(header).EmfHeader.rclBounds.top); @@ -875,7 +875,7 @@ static void test_emfonly(void) expect(100, header.Height); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); - expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(25, U(header).EmfHeader.rclBounds.left); expect(25, U(header).EmfHeader.rclBounds.top); @@ -971,7 +971,7 @@ static void test_emfonly(void) expect(100, header.Height); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); - expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(25, U(header).EmfHeader.rclBounds.left); expect(25, U(header).EmfHeader.rclBounds.top); @@ -1018,7 +1018,7 @@ static void test_emfonly(void) expect(100, header.Height); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); - expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(25, U(header).EmfHeader.rclBounds.left); expect(25, U(header).EmfHeader.rclBounds.top); -- 2.28.0.rc1

2 1

[PATCH] dsound: Select the nth effect matching the given CLSID in GetObjectInPath().
by Zebediah Figura 28 Jul '20

28 Jul '20

Instead of selecting the nth effect overall and checking whether it matches. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsound/buffer.c | 32 +++++++++++++++----------------- dlls/dsound/tests/dsound8.c | 22 +++++++++------------- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index ea428c08166..bc30a8a5448 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -845,27 +845,25 @@ static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources(IDirectSoundBuffer } static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(IDirectSoundBuffer8 *iface, - REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, void **ppObject) + REFGUID clsid, DWORD index, REFGUID iid, void **out) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); + DWORD i, count = 0; - TRACE("(%p,%s,%u,%s,%p)\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject); + TRACE("(%p,%s,%u,%s,%p)\n", This, debugstr_guid(clsid), index, debugstr_guid(iid), out); - if (dwIndex >= This->num_filters) - return DSERR_CONTROLUNAVAIL; - - if (!ppObject) - return E_INVALIDARG; + if (!out) + return E_INVALIDARG; - if (IsEqualGUID(rguidObject, &This->filters[dwIndex].guid) || IsEqualGUID(rguidObject, &GUID_All_Objects)) { - if (SUCCEEDED(IMediaObject_QueryInterface(This->filters[dwIndex].obj, rguidInterface, ppObject))) - return DS_OK; - else - return E_NOINTERFACE; - } else { - WARN("control unavailable\n"); - return DSERR_OBJECTNOTFOUND; - } + for (i = 0; i < This->num_filters; i++) + { + if (IsEqualGUID(clsid, &This->filters[i].guid) || IsEqualGUID(clsid, &GUID_All_Objects)) + { + if (count++ == index) + return IMediaObject_QueryInterface(This->filters[i].obj, iid, out); + } + } + return DSERR_OBJECTNOTFOUND; } static HRESULT WINAPI IDirectSoundBufferImpl_Initialize(IDirectSoundBuffer8 *iface, diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index fcac31ba637..468b460468b 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1678,7 +1678,7 @@ static void test_effects(void) dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); ok(dmo == (IMediaObject *)0xdeadbeef, "Got object %p.\n", dmo); effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; @@ -1705,9 +1705,8 @@ static void test_effects(void) echo = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - reverb = dmo; + ok(hr == DS_OK, "Got hr %#x.\n", hr); + reverb = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); ok(hr == DS_OK, "Got hr %#x.\n", hr); @@ -1716,12 +1715,12 @@ static void test_effects(void) hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); ok(hr == DS_OK, "Got hr %#x.\n", hr); - todo_wine ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); + ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); IMediaObject_Release(dmo); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 1, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXParamEq, (void **)&unk); ok(hr == DS_OK, "Got hr %#x.\n", hr); @@ -1743,14 +1742,11 @@ static void test_effects(void) hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - IUnknown_Release(unk); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); - if (echo) - IMediaObject_Release(echo); - if (reverb) - IMediaObject_Release(reverb); + IMediaObject_Release(echo); + IMediaObject_Release(reverb); got_Process = CreateEventA(NULL, TRUE, FALSE, NULL); -- 2.27.0

2 1

[PATCH] wpp: Correct the spelling of "ellipsis".
by Zebediah Figura 28 Jul '20

28 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- libs/wpp/ppl.l | 2 +- libs/wpp/ppy.y | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index a68124355be..566cf2f73f6 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -522,7 +522,7 @@ void pp_writestring(const char *format, ...) <pp_macro>{ws}+ ; <pp_macro>{cident} ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; <pp_macro>, return ','; -<pp_macro>"..." return tELIPSIS; +<pp_macro>"..." return tELLIPSIS; <pp_macro>(\\\r?)|(\n)|(.)|(\.\.?) ppy_error("Argument identifier expected"); <pp_macro>\\\r?\n newline(0); diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index eb4f15a4b8b..a6c09579942 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -140,7 +140,7 @@ static int nmacro_args; %token tRCINCLUDE %token tIF tIFDEF tIFNDEF tELSE tELIF tENDIF tDEFINED tNL %token tINCLUDE tLINE tGCCLINE tERROR tWARNING tPRAGMA tPPIDENT -%token tUNDEF tMACROEND tCONCAT tELIPSIS tSTRINGIZE +%token tUNDEF tMACROEND tCONCAT tELLIPSIS tSTRINGIZE %token <cptr> tIDENT tLITERAL tMACRO tDEFINE %token <cptr> tDQSTRING tSQSTRING tIQSTRING %token <uint> tUINT @@ -333,7 +333,7 @@ allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; } ; emargs : margs { $$ = $1; } - | margs ',' tELIPSIS { $$ = add_new_marg(NULL, arg_list); nmacro_args *= -1; } + | margs ',' tELLIPSIS { $$ = add_new_marg(NULL, arg_list); nmacro_args *= -1; } ; margs : margs ',' tIDENT { $$ = add_new_marg($3, arg_single); } -- 2.27.0

1 0

[PATCH v4] amstream: Implement IAMMultiMediaStream::GetDuration.
by Myah Caron 28 Jul '20

28 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v4: Check if AddMediaStream returns VFW_E_NO_AUDIO_HARDWARE for detecting broken windows server 2008 tests. I didn't implement the decimal duration printing in this revision, as I wasn't sure what a clean way to do this would be (as %lld and %llu appear to be unused except in unix sections of the code, and compiling with them produced warnings). I looked around to check what other parts of the codebase used in this situation, but I wasn't able to find anything other than wine_dbgstr_longlong (though my grep-fu does leave a lot to be desired). Sorry for the constant back-and-forth, and thank you for your patience.. I'm hoping my future patches will be cleaner from the get-go :) dlls/amstream/multimedia.c | 7 ++- dlls/amstream/tests/amstream.c | 81 ++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 200bd5c4a5..8f978b72ff 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -177,9 +177,12 @@ static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration); + TRACE("(%p/%p)->(%p)\n", This, iface, pDuration); - return E_NOTIMPL; + if (!This->media_seeking) + return E_NOINTERFACE; + + return IMediaSeeking_GetDuration(This->media_seeking, pDuration); } static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 48953684f9..ca5c13da3a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -335,6 +335,86 @@ static void test_openfile(const WCHAR *test_avi_path) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mmstream_get_duration(const WCHAR *test_avi_path) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + LONGLONG duration; + HRESULT hr; + ULONG ref; + BOOL no_audio = FALSE; + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); + ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#x.\n", hr); + if (hr == VFW_E_NO_AUDIO_HARDWARE) + no_audio = TRUE; + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + + ok(hr == S_OK || + broken(no_audio && hr == S_FALSE && duration == 0) /* win server */, + "Got hr %#x.\n", hr); + ok(duration == 1000000ULL || + broken(no_audio && hr == S_FALSE && duration == 0) /* win server */, + "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(duration == 0, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_NORENDER); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_renderfile(const WCHAR *test_avi_path) { IAMMultiMediaStream *pams; @@ -5351,6 +5431,7 @@ START_TEST(amstream) test_avi_path = load_resource(L"test.avi"); test_openfile(test_avi_path); + test_mmstream_get_duration(test_avi_path); test_renderfile(test_avi_path); unload_resource(test_avi_path); -- 2.27.0

2 1

[PATCH v5 1/3] amstream: Implement IMediaStreamFilter::GetDuration.
by Zebediah Figura 28 Jul '20

28 Jul '20

From: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v5: Style tweaks (adjust trace messages to be more consistent with standard format, remove a couple newlines) dlls/amstream/filter.c | 19 ++++- dlls/amstream/tests/amstream.c | 130 +++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0a06e78180c..b99cc4cda0c 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -773,9 +773,24 @@ static HRESULT WINAPI filter_seeking_SetTimeFormat(IMediaSeeking *iface, const G static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration) { - FIXME("iface %p, duration %p, stub!\n", iface, duration); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("filter %p, duration %p.\n", filter, duration); + + EnterCriticalSection(&filter->cs); + + if (!(seeking = get_seeking(filter->seekable_stream))) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + hr = IMediaSeeking_GetDuration(seeking, duration); + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + return hr; } static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 68d2b9c18fc..5402734b3df 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5099,6 +5099,135 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_duration(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + struct testfilter source1, source2, source3; + IAMMediaStream *stream1, *stream2, *stream3; + IMediaStreamFilter *filter; + IPin *pin1, *pin2, *pin3; + IMediaSeeking *seeking; + IGraphBuilder *graph; + LONGLONG duration; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + 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"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_FAIL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_NOTIMPL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5340,6 +5469,7 @@ START_TEST(amstream) test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); + test_mediastreamfilter_get_duration(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); -- 2.27.0

1 2

[PATCH 7/7] kernel32/tests: Add more console output reading tests.
by Jacek Caban 28 Jul '20

28 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 176 +++++++++++++++++++++++++++++++++- dlls/kernelbase/console.c | 2 + 2 files changed, 175 insertions(+), 3 deletions(-)

2 1

[PATCH 6/7] server: Remove no longer used read_console_output request.
by Jacek Caban 28 Jul '20

28 Jul '20

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

2 1

[PATCH v4 1/3] ddraw/tests: Test non-primary video memory surface in test_lost_device.
by Gabriel Ivăncescu 28 Jul '20

28 Jul '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 99 +++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 99 +++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 104 +++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 104 +++++++++++++++++++++++++++++++++++++- 4 files changed, 402 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 652e52a..a6b978e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7309,8 +7309,8 @@ static void test_palette_alpha(void) static void test_lost_device(void) { + IDirectDrawSurface *sysmem_surface, *vidmem_surface; IDirectDrawSurface *surface, *back_buffer; - IDirectDrawSurface *sysmem_surface; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw *ddraw; @@ -7345,12 +7345,36 @@ static void test_lost_device(void) hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL); + if (FAILED(hr)) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -7360,6 +7384,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -7369,6 +7398,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7378,6 +7412,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7388,6 +7427,11 @@ static void test_lost_device(void) "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -7398,6 +7442,8 @@ static void test_lost_device(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = restore_surfaces(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7408,6 +7454,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -7415,6 +7466,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7422,6 +7478,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7429,6 +7490,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -7447,6 +7513,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7456,6 +7527,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7465,6 +7541,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7474,6 +7555,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7483,6 +7569,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7492,6 +7583,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_FLIP; @@ -7506,6 +7602,7 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(back_buffer); + if (vidmem_surface) IDirectDrawSurface_Release(vidmem_surface); IDirectDrawSurface_Release(sysmem_surface); IDirectDrawSurface_Release(surface); refcount = IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index edaf868..41b9ed1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8262,8 +8262,8 @@ static void test_palette_alpha(void) static void test_lost_device(void) { + IDirectDrawSurface *sysmem_surface, *vidmem_surface; IDirectDrawSurface *surface, *back_buffer; - IDirectDrawSurface *sysmem_surface; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw2 *ddraw; @@ -8298,12 +8298,36 @@ static void test_lost_device(void) hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL); + if (FAILED(hr)) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -8313,6 +8337,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -8322,6 +8351,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8331,6 +8365,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8340,6 +8379,11 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -8350,6 +8394,8 @@ static void test_lost_device(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = restore_surfaces(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8360,6 +8406,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -8367,6 +8418,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8374,6 +8430,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8381,6 +8442,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -8399,6 +8465,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8408,6 +8479,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8417,6 +8493,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8426,6 +8507,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8435,6 +8521,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8444,6 +8535,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_FLIP; @@ -8458,6 +8554,7 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(back_buffer); + if (vidmem_surface) IDirectDrawSurface_Release(vidmem_surface); IDirectDrawSurface_Release(sysmem_surface); IDirectDrawSurface_Release(surface); refcount = IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d1abde0..10f39ae 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9655,8 +9655,8 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { + IDirectDrawSurface4 *sysmem_surface, *vidmem_surface; IDirectDrawSurface4 *surface, *back_buffer; - IDirectDrawSurface4 *sysmem_surface; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw4 *ddraw; @@ -9691,6 +9691,25 @@ static void test_lost_device(void) hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL); + if (FAILED(hr)) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDraw4_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); @@ -9699,6 +9718,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9710,6 +9734,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9721,6 +9750,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9732,6 +9766,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9743,6 +9782,11 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -9753,6 +9797,8 @@ static void test_lost_device(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw4_RestoreAllSurfaces(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw4_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9760,6 +9806,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9769,6 +9820,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9778,6 +9834,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9787,6 +9848,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9796,6 +9862,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface4_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -9816,6 +9887,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9827,6 +9903,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9838,6 +9919,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9849,6 +9935,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9860,6 +9951,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9869,6 +9965,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); @@ -9886,6 +9987,7 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface4_Release(back_buffer); + if (vidmem_surface) IDirectDrawSurface4_Release(vidmem_surface); IDirectDrawSurface4_Release(sysmem_surface); IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 13eadfd..9d579fa 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9413,8 +9413,8 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { + IDirectDrawSurface7 *sysmem_surface, *vidmem_surface; IDirectDrawSurface7 *surface, *back_buffer; - IDirectDrawSurface7 *sysmem_surface; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw7 *ddraw; @@ -9449,6 +9449,25 @@ static void test_lost_device(void) hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL); + if (FAILED(hr)) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDraw7_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); @@ -9457,6 +9476,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9468,6 +9492,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9479,6 +9508,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9490,6 +9524,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9501,6 +9540,11 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -9513,6 +9557,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw7_RestoreAllSurfaces(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9520,6 +9566,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9529,6 +9580,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9538,6 +9594,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9547,6 +9608,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9556,6 +9622,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface7_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -9576,6 +9647,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9587,6 +9663,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9598,6 +9679,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9609,6 +9695,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9620,6 +9711,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9631,6 +9727,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_FLIP; @@ -9646,6 +9747,7 @@ static void test_lost_device(void) IDirectDrawSurface7_Release(back_buffer); + if (vidmem_surface) IDirectDrawSurface7_Release(vidmem_surface); IDirectDrawSurface7_Release(sysmem_surface); IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); -- 2.21.0

2 5

[PATCH 1/7] condrv: Rename condrv_write_output_params to condrv_output_params.
by Jacek Caban 28 Jul '20

28 Jul '20

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

2 1

[PATCH 2/7] ieframe: Implement IOleObject::Advise().
by Dmitry Timoshkov 28 Jul '20

28 Jul '20

Based on ole32/defaulthandler.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/ieframe.h | 2 ++ dlls/ieframe/oleobject.c | 15 ++++++++++++--- dlls/ieframe/webbrowser.c | 3 +++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8d238863be..329cea2f7c 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -199,6 +199,8 @@ struct WebBrowser { DWORD sink_aspects; DWORD sink_flags; + IOleAdviseHolder *advise_holder; + /* window context */ HWND frame_hwnd; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 28ead0f687..39acd43028 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -760,11 +760,20 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, - DWORD* pdwConnection) + DWORD *pdwConnection) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p, %p)\n", This, pAdvSink, pdwConnection); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%p, %p)\n", This, pAdvSink, pdwConnection); + + if(!This->advise_holder) + hr = CreateOleAdviseHolder(&This->advise_holder); + + if(hr == S_OK) + hr = IOleAdviseHolder_Advise(This->advise_holder, pAdvSink, pdwConnection); + + return hr; } static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 356b0a2833..87b74b8e01 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -170,6 +170,9 @@ static ULONG WINAPI WebBrowser_Release(IUnknown *iface) if(This->sink) IAdviseSink_Release(This->sink); + if(This->advise_holder) + IOleAdviseHolder_Release(This->advise_holder); + if(This->doc_host.document) IUnknown_Release(This->doc_host.document); -- 2.26.2

2 4

[PATCH v3 2/3] amstream: Implement IAMMultiMediaStream::GetDuration.
by Myah Caron 28 Jul '20

28 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v3: - Fix test failure under windows server (as it doesn't have the necessary media components, mark it as broken) - Add an extra test using AMMSF_NORENDER dlls/amstream/multimedia.c | 7 ++- dlls/amstream/tests/amstream.c | 79 ++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 200bd5c4a5..8f978b72ff 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -177,9 +177,12 @@ static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration); + TRACE("(%p/%p)->(%p)\n", This, iface, pDuration); - return E_NOTIMPL; + if (!This->media_seeking) + return E_NOINTERFACE; + + return IMediaSeeking_GetDuration(This->media_seeking, pDuration); } static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 48953684f9..b0f1d42242 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -335,6 +335,84 @@ static void test_openfile(const WCHAR *test_avi_path) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mmstream_get_duration(const WCHAR *test_avi_path) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + LONGLONG duration; + HRESULT hr; + ULONG ref; + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); + ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + + ok(hr == S_OK || + broken(hr == S_FALSE && duration == 0) /* win server */, "Got hr %#x.\n", hr); + ok(duration == 0xf4240ULL || + broken(hr == S_FALSE && duration == 0) /* win server */, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(duration == 0, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(duration == 0, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_NORENDER); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(duration == 0, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_renderfile(const WCHAR *test_avi_path) { IAMMultiMediaStream *pams; @@ -5351,6 +5429,7 @@ START_TEST(amstream) test_avi_path = load_resource(L"test.avi"); test_openfile(test_avi_path); + test_mmstream_get_duration(test_avi_path); test_renderfile(test_avi_path); unload_resource(test_avi_path); -- 2.27.0

2 3

[PATCH v2] qdvd: Add a stub IDvdInfo2 interface.
by Gijs Vermeulen 28 Jul '20

28 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/qdvd/navigator.c | 436 ++++++++++++++++++++++++++++++++++++ dlls/qdvd/tests/navigator.c | 2 +- 2 files changed, 437 insertions(+), 1 deletion(-) diff --git a/dlls/qdvd/navigator.c b/dlls/qdvd/navigator.c index 00cb0af995..74bd9a3923 100644 --- a/dlls/qdvd/navigator.c +++ b/dlls/qdvd/navigator.c @@ -27,6 +27,7 @@ struct navigator { struct strmbase_filter filter; IDvdControl2 IDvdControl2_iface; + IDvdInfo2 IDvdInfo2_iface; }; static inline struct navigator *impl_from_strmbase_filter(struct strmbase_filter *filter) @@ -40,6 +41,8 @@ static HRESULT navigator_query_interface(struct strmbase_filter *iface, REFIID i if (IsEqualGUID(iid, &IID_IDvdControl2)) *out = &filter->IDvdControl2_iface; + else if (IsEqualGUID(iid, &IID_IDvdInfo2)) + *out = &filter->IDvdInfo2_iface; else return E_NOINTERFACE; @@ -504,6 +507,438 @@ static const struct IDvdControl2Vtbl dvd_control2_vtbl = dvd_control2_SelectDefaultSubpictureLanguage, }; +static struct navigator *impl_from_IDvdInfo2(IDvdInfo2 *iface) +{ + return CONTAINING_RECORD(iface, struct navigator, IDvdInfo2_iface); +} + +static HRESULT WINAPI dvd_info2_QueryInterface(IDvdInfo2 *iface, REFIID iid, void **out) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out); +} + +static ULONG WINAPI dvd_info2_AddRef(IDvdInfo2 *iface) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI dvd_info2_Release(IDvdInfo2 *iface) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI dvd_info2_GetCurrentDomain(IDvdInfo2 *iface, DVD_DOMAIN *domain) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, domain %p.\n", filter, domain); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentLocation(IDvdInfo2 *iface, DVD_PLAYBACK_LOCATION2 *location) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, location %p.\n", filter, location); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetTotalTitleTime(IDvdInfo2 *iface, DVD_HMSF_TIMECODE *time, ULONG *flags) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, time %p, flags %p.\n", filter, time, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentButton(IDvdInfo2 *iface, ULONG *count, ULONG *current) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p.\n", filter, count, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentAngle(IDvdInfo2 *iface, ULONG *count, ULONG *current) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p.\n", filter, count, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentAudio(IDvdInfo2 *iface, ULONG *count, ULONG *current) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p.\n", filter, count, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentSubpicture(IDvdInfo2 *iface, ULONG *count, ULONG *current, BOOL *enable) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p, enable %p.\n", filter, count, current, enable); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentUOPS(IDvdInfo2 *iface, ULONG *uops) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, uops %p.\n", filter, uops); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAllSPRMs(IDvdInfo2 *iface, SPRMARRAY *regs) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, regs %p.\n", filter, regs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAllGPRMs(IDvdInfo2 *iface, GPRMARRAY *regs) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, regs %p.\n", filter, regs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAudioLanguage(IDvdInfo2 *iface, ULONG stream, LCID *language) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, language %p.\n", filter, stream, language); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetSubpictureLanguage(IDvdInfo2 *iface, ULONG stream, LCID *language) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, language %p.\n", filter, stream, language); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetTitleAttributes(IDvdInfo2 *iface, ULONG index, + DVD_MenuAttributes *menu, DVD_TitleAttributes *title) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, index %u, menu %p, title %p.\n", filter, index, menu, title); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetVMGAttributes(IDvdInfo2 *iface, DVD_MenuAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, attr %p.\n", filter, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetVideoAttributes(IDvdInfo2 *iface, DVD_VideoAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, attr %p.\n", filter, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAudioAttributes(IDvdInfo2 *iface, ULONG stream, DVD_AudioAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetKaraokeAttributes(IDvdInfo2 *iface, ULONG stream, DVD_KaraokeAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetSubpictureAttributes(IDvdInfo2 *iface, ULONG stream, + DVD_SubpictureAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentVolumeInfo(IDvdInfo2 *iface, ULONG *volume_count, ULONG *current, + DVD_DISC_SIDE *side, ULONG *title_count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, volume_count %p, current %p, side %p, title_count %p.\n", + filter, volume_count, current, side, title_count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextNumberOfLanguages(IDvdInfo2 *iface, ULONG *count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p.\n", filter, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextLanguageInfo(IDvdInfo2 *iface, ULONG index, ULONG *string_count, + LCID *language, enum DVD_TextCharSet *character_set) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, index %u, string_count %p, language %p, character_set %p.\n", + filter, index, string_count, language, character_set); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextStringAsNative(IDvdInfo2 *iface, ULONG lang_index, ULONG string_index, + BYTE *string, ULONG size, ULONG *ret_size, enum DVD_TextStringType *type) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, lang_index %u, string_index %u, string %p, size %u, ret_size %p, type %p.\n", + filter, lang_index, string_index, string, size, ret_size, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextStringAsUnicode(IDvdInfo2 *iface, ULONG lang_index, ULONG string_index, + WCHAR *string, ULONG size, ULONG *ret_size, enum DVD_TextStringType *type) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, lang_index %u, string_index %u, string %p, size %u, ret_size %p, type %p.\n", + filter, lang_index, string_index, string, size, ret_size, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetPlayerParentalLevel(IDvdInfo2 *iface, ULONG *level, BYTE country_code[2]) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, level %p, country_code %p.\n", filter, level, country_code); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetNumberOfChapters(IDvdInfo2 *iface, ULONG title, ULONG *count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, title %u, count %p.\n", filter, title, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetTitleParentalLevels(IDvdInfo2 *iface, ULONG title, ULONG *levels) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, title %u, levels %p.\n", filter, title, levels); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDDirectory(IDvdInfo2 *iface, WCHAR *path, ULONG size, ULONG *ret_size) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, path %p, size %u, ret_size %p.\n", filter, path, size, ret_size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_IsAudioStreamEnabled(IDvdInfo2 *iface, ULONG stream, BOOL *enable) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, enable %p.\n", filter, stream, enable); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDiscID(IDvdInfo2 *iface, const WCHAR *path, ULONGLONG *id) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, path %s, id %p.\n", filter, debugstr_w(path), id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetState(IDvdInfo2 *iface, IDvdState **state) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, state %p.\n", filter, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetMenuLanguages(IDvdInfo2 *iface, LCID *languages, ULONG count, ULONG *ret_count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, languages %p, count %u, ret_count %p.\n", filter, languages, count, ret_count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetButtonAtPosition(IDvdInfo2 *iface, POINT point, ULONG *button) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, point %s, button %p.\n", filter, wine_dbgstr_point(&point), button); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCmdFromEvent(IDvdInfo2 *iface, LONG_PTR param, IDvdCmd **cmd) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, param %#lx, cmd %p.\n", filter, param, cmd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDefaultMenuLanguage(IDvdInfo2 *iface, LCID *language) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, language %p.\n", filter, language); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDefaultAudioLanguage(IDvdInfo2 *iface, LCID *language, + DVD_AUDIO_LANG_EXT *extension) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, language %p, extension %p.\n", filter, language, extension); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_SelectDefaultSubpictureLanguage(IDvdInfo2 *iface, LCID *language, + DVD_SUBPICTURE_LANG_EXT *extension) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, language %p, extension %p.\n", filter, language, extension); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDecoderCaps(IDvdInfo2 *iface, DVD_DECODER_CAPS *caps) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, caps %p.\n", filter, caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetButtonRect(IDvdInfo2 *iface, ULONG button, RECT *rect) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, button %u, rect %p.\n", filter, button, rect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_IsSubpictureStreamEnabled(IDvdInfo2 *iface, ULONG stream, BOOL *enable) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, enable %p.\n", filter, stream, enable); + + return E_NOTIMPL; +} + +static const struct IDvdInfo2Vtbl dvd_info2_vtbl = +{ + dvd_info2_QueryInterface, + dvd_info2_AddRef, + dvd_info2_Release, + dvd_info2_GetCurrentDomain, + dvd_info2_GetCurrentLocation, + dvd_info2_GetTotalTitleTime, + dvd_info2_GetCurrentButton, + dvd_info2_GetCurrentAngle, + dvd_info2_GetCurrentAudio, + dvd_info2_GetCurrentSubpicture, + dvd_info2_GetCurrentUOPS, + dvd_info2_GetAllSPRMs, + dvd_info2_GetAllGPRMs, + dvd_info2_GetAudioLanguage, + dvd_info2_GetSubpictureLanguage, + dvd_info2_GetTitleAttributes, + dvd_info2_GetVMGAttributes, + dvd_info2_GetVideoAttributes, + dvd_info2_GetAudioAttributes, + dvd_info2_GetKaraokeAttributes, + dvd_info2_GetSubpictureAttributes, + dvd_info2_GetCurrentVolumeInfo, + dvd_info2_GetDVDTextNumberOfLanguages, + dvd_info2_GetDVDTextLanguageInfo, + dvd_info2_GetDVDTextStringAsNative, + dvd_info2_GetDVDTextStringAsUnicode, + dvd_info2_GetPlayerParentalLevel, + dvd_info2_GetNumberOfChapters, + dvd_info2_GetTitleParentalLevels, + dvd_info2_GetDVDDirectory, + dvd_info2_IsAudioStreamEnabled, + dvd_info2_GetDiscID, + dvd_info2_GetState, + dvd_info2_GetMenuLanguages, + dvd_info2_GetButtonAtPosition, + dvd_info2_GetCmdFromEvent, + dvd_info2_GetDefaultMenuLanguage, + dvd_info2_GetDefaultAudioLanguage, + dvd_info2_SelectDefaultSubpictureLanguage, + dvd_info2_GetDecoderCaps, + dvd_info2_GetButtonRect, + dvd_info2_IsSubpictureStreamEnabled +}; + HRESULT navigator_create(IUnknown *outer, IUnknown **out) { struct navigator *object; @@ -513,6 +948,7 @@ HRESULT navigator_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_DVDNavigator, &filter_ops); object->IDvdControl2_iface.lpVtbl = &dvd_control2_vtbl; + object->IDvdInfo2_iface.lpVtbl = &dvd_info2_vtbl; TRACE("Created DVD Navigator filter %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qdvd/tests/navigator.c b/dlls/qdvd/tests/navigator.c index db2ba392dc..51999065cf 100644 --- a/dlls/qdvd/tests/navigator.c +++ b/dlls/qdvd/tests/navigator.c @@ -62,7 +62,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IDvdControl, TRUE); check_interface(filter, &IID_IDvdControl2, TRUE); todo_wine check_interface(filter, &IID_IDvdInfo, TRUE); - todo_wine check_interface(filter, &IID_IDvdInfo2, TRUE); + check_interface(filter, &IID_IDvdInfo2, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); todo_wine check_interface(filter, &IID_ISpecifyPropertyPages, TRUE); -- 2.27.0

2 1

[PATCH 5/7] kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputW.
by Jacek Caban 28 Jul '20

28 Jul '20

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

1 0

[PATCH 4/7] kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputAttribute.
by Jacek Caban 28 Jul '20

28 Jul '20

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

1 0

[PATCH 3/7] kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputCharacterW.
by Jacek Caban 28 Jul '20

28 Jul '20

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

1 0

[PATCH 2/7] server: Introduce IOCTL_CONDRV_READ_OUTPUT ioctl.
by Jacek Caban 28 Jul '20

28 Jul '20

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

1 0

[PATCH v2 1/3] ddraw/tests: Test non-primary surface in test_lost_device.
by Gabriel Ivăncescu 28 Jul '20

28 Jul '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 48 +++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 48 +++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 50 ++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 52 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 194 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 652e52a..a8e842e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7309,7 +7309,7 @@ static void test_palette_alpha(void) static void test_lost_device(void) { - IDirectDrawSurface *surface, *back_buffer; + IDirectDrawSurface *surface, *surface2, *back_buffer; IDirectDrawSurface *sysmem_surface; DDSURFACEDESC surface_desc; HWND window1, window2; @@ -7336,6 +7336,21 @@ static void test_lost_device(void) hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -7349,6 +7364,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7358,6 +7375,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7367,6 +7386,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7376,6 +7397,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7386,6 +7409,8 @@ static void test_lost_device(void) hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7406,6 +7431,8 @@ static void test_lost_device(void) ok(ret, "Failed to set foreground window.\n"); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST || broken(hr == DD_OK) /* WinXP */, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7413,6 +7440,8 @@ static void test_lost_device(void) ok(ret, "Failed to set foreground window.\n"); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST || broken(hr == DD_OK) /* WinXP */, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7420,6 +7449,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7427,6 +7458,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7445,6 +7478,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7454,6 +7489,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7463,6 +7500,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7472,6 +7511,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7481,6 +7522,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7490,6 +7533,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7507,6 +7552,7 @@ static void test_lost_device(void) IDirectDrawSurface_Release(back_buffer); IDirectDrawSurface_Release(sysmem_surface); + IDirectDrawSurface_Release(surface2); IDirectDrawSurface_Release(surface); refcount = IDirectDraw_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index edaf868..1c0ccd9 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8262,7 +8262,7 @@ static void test_palette_alpha(void) static void test_lost_device(void) { - IDirectDrawSurface *surface, *back_buffer; + IDirectDrawSurface *surface, *surface2, *back_buffer; IDirectDrawSurface *sysmem_surface; DDSURFACEDESC surface_desc; HWND window1, window2; @@ -8289,6 +8289,21 @@ static void test_lost_device(void) hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -8302,6 +8317,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8311,6 +8328,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8320,6 +8339,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8329,6 +8350,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8338,6 +8361,8 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8358,6 +8383,8 @@ static void test_lost_device(void) ok(ret, "Failed to set foreground window.\n"); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8365,6 +8392,8 @@ static void test_lost_device(void) ok(ret, "Failed to set foreground window.\n"); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8372,6 +8401,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8379,6 +8410,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8397,6 +8430,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8406,6 +8441,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8415,6 +8452,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8424,6 +8463,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8433,6 +8474,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8442,6 +8485,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8459,6 +8504,7 @@ static void test_lost_device(void) IDirectDrawSurface_Release(back_buffer); IDirectDrawSurface_Release(sysmem_surface); + IDirectDrawSurface_Release(surface2); IDirectDrawSurface_Release(surface); refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d1abde0..97318bd 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9655,7 +9655,7 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { - IDirectDrawSurface4 *surface, *back_buffer; + IDirectDrawSurface4 *surface, *surface2, *back_buffer; IDirectDrawSurface4 *sysmem_surface; DDSURFACEDESC2 surface_desc; HWND window1, window2; @@ -9682,6 +9682,21 @@ static void test_lost_device(void) hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -9697,6 +9712,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9708,6 +9725,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9719,6 +9738,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9730,6 +9751,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9741,6 +9764,8 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9758,6 +9783,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9767,6 +9794,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9776,6 +9805,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9785,6 +9816,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9794,6 +9827,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9814,6 +9849,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9825,6 +9862,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9836,6 +9875,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9847,6 +9888,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9858,6 +9901,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9867,6 +9912,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9887,6 +9934,7 @@ static void test_lost_device(void) IDirectDrawSurface4_Release(back_buffer); IDirectDrawSurface4_Release(sysmem_surface); + IDirectDrawSurface4_Release(surface2); IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 13eadfd..bd64134 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9413,7 +9413,7 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { - IDirectDrawSurface7 *surface, *back_buffer; + IDirectDrawSurface7 *surface, *surface2, *back_buffer; IDirectDrawSurface7 *sysmem_surface; DDSURFACEDESC2 surface_desc; HWND window1, window2; @@ -9440,6 +9440,21 @@ static void test_lost_device(void) hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -9455,6 +9470,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9466,6 +9483,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9477,6 +9496,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9488,6 +9509,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9499,6 +9522,8 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9511,6 +9536,8 @@ static void test_lost_device(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9518,6 +9545,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9527,6 +9556,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9536,6 +9567,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9545,6 +9578,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9554,6 +9589,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9574,6 +9611,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9585,6 +9624,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9596,6 +9637,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9607,6 +9650,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9618,6 +9663,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9629,6 +9676,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface2); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9647,6 +9696,7 @@ static void test_lost_device(void) IDirectDrawSurface7_Release(back_buffer); IDirectDrawSurface7_Release(sysmem_surface); + IDirectDrawSurface7_Release(surface2); IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); -- 2.21.0

4 11

[PATCH v3 1/3] ddraw/tests: Test non-primary video memory surface in test_lost_device.
by Gabriel Ivăncescu 28 Jul '20

28 Jul '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Make sure the surface resides in video memory (thanks Stefan). dlls/ddraw/tests/ddraw1.c | 97 ++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 97 ++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 102 ++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 109 +++++++++++++++++++++++++++++++++++++- 4 files changed, 400 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 652e52a..782a3c1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7309,8 +7309,8 @@ static void test_palette_alpha(void) static void test_lost_device(void) { + IDirectDrawSurface *sysmem_surface, *vidmem_surface; IDirectDrawSurface *surface, *back_buffer; - IDirectDrawSurface *sysmem_surface; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw *ddraw; @@ -7345,12 +7345,36 @@ static void test_lost_device(void) hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL); + if (FAILED(hr)) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -7360,6 +7384,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -7369,6 +7398,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7378,6 +7412,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7388,6 +7427,11 @@ static void test_lost_device(void) "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -7408,6 +7452,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST || broken(hr == DD_OK) /* WinXP */, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -7415,6 +7464,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST || broken(hr == DD_OK) /* WinXP */, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7422,6 +7476,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7429,6 +7488,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -7447,6 +7511,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7456,6 +7525,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7465,6 +7539,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7474,6 +7553,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7483,6 +7567,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -7492,6 +7581,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_FLIP; @@ -7506,6 +7600,7 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(back_buffer); + if (vidmem_surface) IDirectDrawSurface_Release(vidmem_surface); IDirectDrawSurface_Release(sysmem_surface); IDirectDrawSurface_Release(surface); refcount = IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index edaf868..6680171 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8262,8 +8262,8 @@ static void test_palette_alpha(void) static void test_lost_device(void) { + IDirectDrawSurface *sysmem_surface, *vidmem_surface; IDirectDrawSurface *surface, *back_buffer; - IDirectDrawSurface *sysmem_surface; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw2 *ddraw; @@ -8298,12 +8298,36 @@ static void test_lost_device(void) hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL); + if (FAILED(hr)) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDrawSurface_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -8313,6 +8337,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -8322,6 +8351,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8331,6 +8365,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8340,6 +8379,11 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -8360,6 +8404,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -8367,6 +8416,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8374,6 +8428,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = restore_surfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8381,6 +8440,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -8399,6 +8463,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8408,6 +8477,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8417,6 +8491,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8426,6 +8505,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8435,6 +8519,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw2_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -8444,6 +8533,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_FLIP; @@ -8458,6 +8552,7 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(back_buffer); + if (vidmem_surface) IDirectDrawSurface_Release(vidmem_surface); IDirectDrawSurface_Release(sysmem_surface); IDirectDrawSurface_Release(surface); refcount = IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d1abde0..11e5b46 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9655,8 +9655,8 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { + IDirectDrawSurface4 *sysmem_surface, *vidmem_surface; IDirectDrawSurface4 *surface, *back_buffer; - IDirectDrawSurface4 *sysmem_surface; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw4 *ddraw; @@ -9691,6 +9691,25 @@ static void test_lost_device(void) hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL); + if (FAILED(hr)) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } + hr = IDirectDraw4_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); @@ -9699,6 +9718,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9710,6 +9734,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9721,6 +9750,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9732,6 +9766,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9743,6 +9782,11 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -9760,6 +9804,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9769,6 +9818,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9778,6 +9832,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9787,6 +9846,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9796,6 +9860,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface4_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -9816,6 +9885,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9827,6 +9901,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9838,6 +9917,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9849,6 +9933,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9860,6 +9949,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9869,6 +9963,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); @@ -9886,6 +9985,7 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface4_Release(back_buffer); + if (vidmem_surface) IDirectDrawSurface4_Release(vidmem_surface); IDirectDrawSurface4_Release(sysmem_surface); IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 13eadfd..996471e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9413,8 +9413,8 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { + IDirectDrawSurface7 *sysmem_surface, *vidmem_surface; IDirectDrawSurface7 *surface, *back_buffer; - IDirectDrawSurface7 *sysmem_surface; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw7 *ddraw; @@ -9440,6 +9440,21 @@ static void test_lost_device(void) hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &vidmem_surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -9447,7 +9462,11 @@ static void test_lost_device(void) surface_desc.dwWidth = 100; surface_desc.dwHeight = 100; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); - ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Failed to create video memory surface, skipping related tests.\n"); + vidmem_surface = NULL; + } hr = IDirectDraw7_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9457,6 +9476,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9468,6 +9492,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9479,6 +9508,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9490,6 +9524,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9501,6 +9540,11 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -9513,6 +9557,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9520,6 +9569,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9529,6 +9583,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9538,6 +9597,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9547,6 +9611,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9556,6 +9625,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } IDirectDrawSurface7_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -9576,6 +9650,11 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9587,6 +9666,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9598,6 +9682,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9609,6 +9698,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9620,6 +9714,11 @@ static void test_lost_device(void) ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9631,6 +9730,11 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (vidmem_surface) + { + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + } memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_FLIP; @@ -9646,6 +9750,7 @@ static void test_lost_device(void) IDirectDrawSurface7_Release(back_buffer); + if (vidmem_surface) IDirectDrawSurface7_Release(vidmem_surface); IDirectDrawSurface7_Release(sysmem_surface); IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); -- 2.21.0

3 9

[PATCH v2 1/2] kernel32/tests: Add test for ini filename is NULL.
by Jiajin Cui 28 Jul '20

28 Jul '20

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Trace messages in vkd3d_shader_compile().
by Henri Verbeet 28 Jul '20

28 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c001883..5597992 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -308,6 +308,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) return VKD3D_ERROR; ret = vkd3d_shader_parser_init(&parser, &compile_info->source, &message_context); + vkd3d_shader_message_context_trace_messages(&message_context); if (messages) { vkd3d_shader_free_messages(*messages); -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Trace messages in vkd3d_shader_scan_dxbc().
by Henri Verbeet 28 Jul '20

28 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e4f14a7..c001883 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -100,6 +100,23 @@ static int VKD3D_PRINTF_FUNC(2, 3) vkd3d_string_buffer_printf(struct vkd3d_strin return ret; } +static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) +{ + const char *p, *q; + + if (!TRACE_ON()) + return; + + for (p = buffer->buffer; *p; p = q) + { + if (!(q = strstr(p, "\n"))) + q = p + strlen(p); + else + ++q; + vkd3d_dbg_printf(VKD3D_DBG_LEVEL_TRACE, function, "%.*s", (int)(q - p), p); + } +} + bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) { @@ -116,6 +133,14 @@ void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *c vkd3d_string_buffer_cleanup(&context->messages); } +#define vkd3d_shader_message_context_trace_messages(context) \ + vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) +static void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, + const char *function) +{ + vkd3d_string_buffer_trace_(&context->messages, function); +} + static char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) { char *messages; @@ -580,6 +605,7 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) return VKD3D_ERROR; ret = vkd3d_shader_parser_init(&parser, dxbc, &message_context); + vkd3d_shader_message_context_trace_messages(&message_context); if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Trace the shader in vkd3d_shader_scan_dxbc().
by Henri Verbeet 28 Jul '20

28 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 7548b90..e4f14a7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -295,9 +295,6 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); - if (TRACE_ON()) - vkd3d_shader_trace(parser.data); - if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, &parser.shader_desc, compile_info, &scan_info))) { @@ -589,6 +586,9 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, if (ret < 0) return ret; + if (TRACE_ON()) + vkd3d_shader_trace(parser.data); + memset(scan_info, 0, sizeof(*scan_info)); memset(&context, 0, sizeof(context)); -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Also copy the terminator in vkd3d_shader_message_context_copy_messages().
by Henri Verbeet 28 Jul '20

28 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c7161e4..7548b90 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -120,8 +120,8 @@ static char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_mess { char *messages; - if ((messages = vkd3d_malloc(context->messages.content_size))) - memcpy(messages, context->messages.buffer, context->messages.content_size); + if ((messages = vkd3d_malloc(context->messages.content_size + 1))) + memcpy(messages, context->messages.buffer, context->messages.content_size + 1); return messages; } -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d: Add trailing newlines to error messages in vkd3d_uav_clear_state_init().
by Henri Verbeet 28 Jul '20

28 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 55cb389..316132b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2953,14 +2953,14 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, 0, 1, &set_binding, set_layouts[i].set_layout))) { - ERR("Failed to create descriptor set layout %u, hr %#x.", i, hr); + ERR("Failed to create descriptor set layout %u, hr %#x.\n", i, hr); goto fail; } if (FAILED(hr = vkd3d_create_pipeline_layout(device, 1, set_layouts[i].set_layout, 1, &push_constant_range, set_layouts[i].pipeline_layout))) { - ERR("Failed to create pipeline layout %u, hr %#x.", i, hr); + ERR("Failed to create pipeline layout %u, hr %#x.\n", i, hr); goto fail; } } @@ -2986,7 +2986,7 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d if (FAILED(hr = vkd3d_create_compute_pipeline(device, &pipelines[i].code, &shader_interface, *pipelines[i].pipeline_layout, pipelines[i].pipeline))) { - ERR("Failed to create compute pipeline %u, hr %#x.", i, hr); + ERR("Failed to create compute pipeline %u, hr %#x.\n", i, hr); goto fail; } } -- 2.11.0

1 0

[PATCH v2 2/2] wbemprox: Support retrieving more than one object in IEnumWbemClassObject::Next().
by Hans Leidekker 28 Jul '20

28 Jul '20

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Patch by GitHub user pnevmoslon with some modifications. Fixes gamepad support in Mortal Kombat 11. v2: Release allocated objects on error. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/class.c | 23 ++++++++++++++--------- dlls/wbemprox/tests/query.c | 12 ++++++------ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index ba7720b098..db6017e0c9 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -116,24 +116,29 @@ static HRESULT WINAPI enum_class_object_Next( struct table *table; static int once = 0; HRESULT hr; + ULONG i, j; TRACE("%p, %d, %u, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned); - if (!uCount) return WBEM_S_FALSE; if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER; if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); *puReturned = 0; - if (ec->index >= view->result_count) return WBEM_S_FALSE; - table = get_view_table( view, ec->index ); - hr = create_class_object( table->name, iface, ec->index, NULL, apObjects ); - if (hr != S_OK) return hr; + for (i = 0; i < uCount; i++) + { + if (ec->index >= view->result_count) return WBEM_S_FALSE; + table = get_view_table( view, ec->index ); + hr = create_class_object( table->name, iface, ec->index, NULL, &apObjects[i] ); + if (hr != S_OK) + { + for (j = 0; j < i; j++) IWbemClassObject_Release( apObjects[j] ); + return hr; + } + ec->index++; + (*puReturned)++; + } - ec->index++; - *puReturned = 1; - if (ec->index == view->result_count && uCount > 1) return WBEM_S_FALSE; - if (uCount > 1) return WBEM_S_TIMEDOUT; return WBEM_S_NO_ERROR; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e99e221c30..e48722f3bc 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -181,8 +181,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 2; hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( count == 0, "expected 0, got %u\n", count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 0, "expected 0, got %u\n", count ); for (;;) { @@ -199,8 +199,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); @@ -210,8 +210,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count ); - todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); - todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_FALSE, "got %08x\n", hr ); + ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); -- 2.27.0

1 0

[PATCH v2 1/2] wbemprox/tests: Add IEnumWbemClassObject::Next() tests.
by Hans Leidekker 28 Jul '20

28 Jul '20

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 66 +++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73740f18c8..e99e221c30 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -25,6 +25,7 @@ #include "initguid.h" #include "objidl.h" #include "wbemcli.h" +#include "wine/heap.h" #include "wine/test.h" static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemClassObject **result ) @@ -158,6 +159,70 @@ static void test_associators( IWbemServices *services ) } } +static void test_IEnumWbemClassObject_Next( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_IP4RouteTable" ); + IWbemClassObject **obj, *obj1; + IEnumWbemClassObject *result; + DWORD count, num_objects = 0; + HRESULT hr; + int i; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 2; + hr = IEnumWbemClassObject_Next( result, 10000, 1, NULL, &count ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( count == 2, "expected 0, got %u\n", count ); + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + count = 2; + hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( count == 0, "expected 0, got %u\n", count ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, &count ); + if (hr != S_OK) break; + num_objects++; + IWbemClassObject_Release(obj1); + } + + hr = IEnumWbemClassObject_Reset( result ); + ok( hr == S_OK, "got %08x\n", hr ); + + obj = heap_alloc( num_objects * sizeof( IWbemClassObject * ) ); + + count = 0; + hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + + for (i = 0; i < count; i++) + IWbemClassObject_Release( obj[i] ); + + hr = IEnumWbemClassObject_Reset( result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0; + hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count ); + todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); + todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + + for (i = 0; i < count; i++) + IWbemClassObject_Release( obj[i] ); + + heap_free( obj ); + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *prop, VARTYPE vartype, CIMTYPE cimtype ) { CIMTYPE type = 0xdeadbeef; @@ -1636,6 +1701,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_GetNames( services ); + test_IEnumWbemClassObject_Next( services ); test_associators( services ); test_notification_query_async( services ); test_query_async( services ); -- 2.27.0

1 0

[PATCH 1/2] wbemprox/tests: Add IEnumWbemClassObject::Next() tests.
by Gijs Vermeulen 28 Jul '20

28 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wbemprox/tests/query.c | 66 +++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73740f18c8..e99e221c30 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -25,6 +25,7 @@ #include "initguid.h" #include "objidl.h" #include "wbemcli.h" +#include "wine/heap.h" #include "wine/test.h" static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemClassObject **result ) @@ -158,6 +159,70 @@ static void test_associators( IWbemServices *services ) } } +static void test_IEnumWbemClassObject_Next( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_IP4RouteTable" ); + IWbemClassObject **obj, *obj1; + IEnumWbemClassObject *result; + DWORD count, num_objects = 0; + HRESULT hr; + int i; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 2; + hr = IEnumWbemClassObject_Next( result, 10000, 1, NULL, &count ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( count == 2, "expected 0, got %u\n", count ); + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + count = 2; + hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( count == 0, "expected 0, got %u\n", count ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, &count ); + if (hr != S_OK) break; + num_objects++; + IWbemClassObject_Release(obj1); + } + + hr = IEnumWbemClassObject_Reset( result ); + ok( hr == S_OK, "got %08x\n", hr ); + + obj = heap_alloc( num_objects * sizeof( IWbemClassObject * ) ); + + count = 0; + hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + + for (i = 0; i < count; i++) + IWbemClassObject_Release( obj[i] ); + + hr = IEnumWbemClassObject_Reset( result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0; + hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count ); + todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); + todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + + for (i = 0; i < count; i++) + IWbemClassObject_Release( obj[i] ); + + heap_free( obj ); + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *prop, VARTYPE vartype, CIMTYPE cimtype ) { CIMTYPE type = 0xdeadbeef; @@ -1636,6 +1701,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_GetNames( services ); + test_IEnumWbemClassObject_Next( services ); test_associators( services ); test_notification_query_async( services ); test_query_async( services ); -- 2.27.0

1 1

[PATCH] qdvd: Add a stub IDvdInfo2 interface.
by Gijs Vermeulen 28 Jul '20

28 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/qdvd/navigator.c | 436 ++++++++++++++++++++++++++++++++++++ dlls/qdvd/tests/navigator.c | 2 +- 2 files changed, 437 insertions(+), 1 deletion(-) diff --git a/dlls/qdvd/navigator.c b/dlls/qdvd/navigator.c index 00cb0af995..3686e9e794 100644 --- a/dlls/qdvd/navigator.c +++ b/dlls/qdvd/navigator.c @@ -27,6 +27,7 @@ struct navigator { struct strmbase_filter filter; IDvdControl2 IDvdControl2_iface; + IDvdInfo2 IDvdInfo2_iface; }; static inline struct navigator *impl_from_strmbase_filter(struct strmbase_filter *filter) @@ -40,6 +41,8 @@ static HRESULT navigator_query_interface(struct strmbase_filter *iface, REFIID i if (IsEqualGUID(iid, &IID_IDvdControl2)) *out = &filter->IDvdControl2_iface; + else if ((IsEqualGUID(iid, &IID_IDvdInfo2))) + *out = &filter->IDvdInfo2_iface; else return E_NOINTERFACE; @@ -504,6 +507,438 @@ static const struct IDvdControl2Vtbl dvd_control2_vtbl = dvd_control2_SelectDefaultSubpictureLanguage, }; +static struct navigator *impl_from_IDvdInfo2(IDvdInfo2 *iface) +{ + return CONTAINING_RECORD(iface, struct navigator, IDvdInfo2_iface); +} + +static HRESULT WINAPI dvd_info2_QueryInterface(IDvdInfo2 *iface, REFIID iid, void **out) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out); +} + +static ULONG WINAPI dvd_info2_AddRef(IDvdInfo2 *iface) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI dvd_info2_Release(IDvdInfo2 *iface) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI dvd_info2_GetCurrentDomain(IDvdInfo2 *iface, DVD_DOMAIN *domain) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, domain %p.\n", filter, domain); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentLocation(IDvdInfo2 *iface, DVD_PLAYBACK_LOCATION2 *location) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, location %p.\n", filter, location); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetTotalTitleTime(IDvdInfo2 *iface, DVD_HMSF_TIMECODE *time, ULONG *flags) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, time %p, flags %p.\n", filter, time, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentButton(IDvdInfo2 *iface, ULONG *count, ULONG *current) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p.\n", filter, count, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentAngle(IDvdInfo2 *iface, ULONG *count, ULONG *current) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p.\n", filter, count, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentAudio(IDvdInfo2 *iface, ULONG *count, ULONG *current) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p.\n", filter, count, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentSubpicture(IDvdInfo2 *iface, ULONG *count, ULONG *current, BOOL *enable) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p, enable %p.\n", filter, count, current, enable); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentUOPS(IDvdInfo2 *iface, ULONG *uops) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, uops %p.\n", filter, uops); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAllSPRMs(IDvdInfo2 *iface, SPRMARRAY *regs) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, regs %p.\n", filter, regs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAllGPRMs(IDvdInfo2 *iface, GPRMARRAY *regs) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, regs %p.\n", filter, regs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAudioLanguage(IDvdInfo2 *iface, ULONG stream, LCID *language) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, language %p.\n", filter, stream, language); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetSubpictureLanguage(IDvdInfo2 *iface, ULONG stream, LCID *language) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, language %p.\n", filter, stream, language); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetTitleAttributes(IDvdInfo2 *iface, ULONG index, + DVD_MenuAttributes *menu, DVD_TitleAttributes *title) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, index %u, menu %p, title %p.\n", filter, index, menu, title); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetVMGAttributes(IDvdInfo2 *iface, DVD_MenuAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, attr %p.\n", filter, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetVideoAttributes(IDvdInfo2 *iface, DVD_VideoAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, attr %p.\n", filter, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAudioAttributes(IDvdInfo2 *iface, ULONG stream, DVD_AudioAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetKaraokeAttributes(IDvdInfo2 *iface, ULONG stream, DVD_KaraokeAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetSubpictureAttributes(IDvdInfo2 *iface, ULONG stream, + DVD_SubpictureAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentVolumeInfo(IDvdInfo2 *iface, ULONG *volume_count, ULONG *current, + DVD_DISC_SIDE *side, ULONG *title_count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, volume_count %p, current %p, side %p, title_count %p.\n", + filter, volume_count, current, side, title_count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextNumberOfLanguages(IDvdInfo2 *iface, ULONG *count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p.\n", filter, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextLanguageInfo(IDvdInfo2 *iface, ULONG index, ULONG *string_count, + LCID *language, enum DVD_TextCharSet *character_set) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, index %u, string_count %p, language %p, character_set %p.\n", + filter, index, string_count, language, character_set); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextStringAsNative(IDvdInfo2 *iface, ULONG lang_index, ULONG string_index, + BYTE *string, ULONG size, ULONG *ret_size, enum DVD_TextStringType *type) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, lang_index %u, string_index %u, string %p, size %u, ret_size %p, type %p.\n", + filter, lang_index, string_index, string, size, ret_size, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextStringAsUnicode(IDvdInfo2 *iface, ULONG lang_index, ULONG string_index, + WCHAR *string, ULONG size, ULONG *ret_size, enum DVD_TextStringType *type) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, lang_index %u, string_index %u, string %p, size %u, ret_size %p, type %p.\n", + filter, lang_index, string_index, string, size, ret_size, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetPlayerParentalLevel(IDvdInfo2 *iface, ULONG *level, BYTE country_code[2]) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, level %p, country_code %p.\n", filter, level, country_code); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetNumberOfChapters(IDvdInfo2 *iface, ULONG title, ULONG *count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, title %u, count %p.\n", filter, title, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetTitleParentalLevels(IDvdInfo2 *iface, ULONG title, ULONG *levels) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, title %u, levels %p.\n", filter, title, levels); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDDirectory(IDvdInfo2 *iface, WCHAR *path, ULONG size, ULONG *ret_size) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, path %p, size %u, ret_size %p.\n", filter, path, size, ret_size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_IsAudioStreamEnabled(IDvdInfo2 *iface, ULONG stream, BOOL *enable) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, enable %p.\n", filter, stream, enable); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDiscID(IDvdInfo2 *iface, const WCHAR *path, ULONGLONG *id) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, path %s, id %p.\n", filter, debugstr_w(path), id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetState(IDvdInfo2 *iface, IDvdState **state) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, state %p.\n", filter, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetMenuLanguages(IDvdInfo2 *iface, LCID *languages, ULONG count, ULONG *ret_count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, languages %p, count %u, ret_count %p.\n", filter, languages, count, ret_count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetButtonAtPosition(IDvdInfo2 *iface, POINT point, ULONG *button) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, point %s, button %p.\n", filter, wine_dbgstr_point(&point), button); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCmdFromEvent(IDvdInfo2 *iface, LONG_PTR param, IDvdCmd **cmd) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, param %#lx, cmd %p.\n", filter, param, cmd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDefaultMenuLanguage(IDvdInfo2 *iface, LCID *language) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, language %p.\n", filter, language); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDefaultAudioLanguage(IDvdInfo2 *iface, LCID *language, + DVD_AUDIO_LANG_EXT *extension) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, language %p, extension %p.\n", filter, language, extension); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_SelectDefaultSubpictureLanguage(IDvdInfo2 *iface, LCID *language, + DVD_SUBPICTURE_LANG_EXT *extension) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, language %p, extension %p.\n", filter, language, extension); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDecoderCaps(IDvdInfo2 *iface, DVD_DECODER_CAPS *caps) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, caps %p.\n", filter, caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetButtonRect(IDvdInfo2 *iface, ULONG button, RECT *rect) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, button %u, rect %p.\n", filter, button, rect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_IsSubpictureStreamEnabled(IDvdInfo2 *iface, ULONG stream, BOOL *enable) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, enable %p.\n", filter, stream, enable); + + return E_NOTIMPL; +} + +static const struct IDvdInfo2Vtbl dvd_info2_vtbl = +{ + dvd_info2_QueryInterface, + dvd_info2_AddRef, + dvd_info2_Release, + dvd_info2_GetCurrentDomain, + dvd_info2_GetCurrentLocation, + dvd_info2_GetTotalTitleTime, + dvd_info2_GetCurrentButton, + dvd_info2_GetCurrentAngle, + dvd_info2_GetCurrentAudio, + dvd_info2_GetCurrentSubpicture, + dvd_info2_GetCurrentUOPS, + dvd_info2_GetAllSPRMs, + dvd_info2_GetAllGPRMs, + dvd_info2_GetAudioLanguage, + dvd_info2_GetSubpictureLanguage, + dvd_info2_GetTitleAttributes, + dvd_info2_GetVMGAttributes, + dvd_info2_GetVideoAttributes, + dvd_info2_GetAudioAttributes, + dvd_info2_GetKaraokeAttributes, + dvd_info2_GetSubpictureAttributes, + dvd_info2_GetCurrentVolumeInfo, + dvd_info2_GetDVDTextNumberOfLanguages, + dvd_info2_GetDVDTextLanguageInfo, + dvd_info2_GetDVDTextStringAsNative, + dvd_info2_GetDVDTextStringAsUnicode, + dvd_info2_GetPlayerParentalLevel, + dvd_info2_GetNumberOfChapters, + dvd_info2_GetTitleParentalLevels, + dvd_info2_GetDVDDirectory, + dvd_info2_IsAudioStreamEnabled, + dvd_info2_GetDiscID, + dvd_info2_GetState, + dvd_info2_GetMenuLanguages, + dvd_info2_GetButtonAtPosition, + dvd_info2_GetCmdFromEvent, + dvd_info2_GetDefaultMenuLanguage, + dvd_info2_GetDefaultAudioLanguage, + dvd_info2_SelectDefaultSubpictureLanguage, + dvd_info2_GetDecoderCaps, + dvd_info2_GetButtonRect, + dvd_info2_IsSubpictureStreamEnabled +}; + HRESULT navigator_create(IUnknown *outer, IUnknown **out) { struct navigator *object; @@ -513,6 +948,7 @@ HRESULT navigator_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_DVDNavigator, &filter_ops); object->IDvdControl2_iface.lpVtbl = &dvd_control2_vtbl; + object->IDvdInfo2_iface.lpVtbl = &dvd_info2_vtbl; TRACE("Created DVD Navigator filter %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qdvd/tests/navigator.c b/dlls/qdvd/tests/navigator.c index db2ba392dc..51999065cf 100644 --- a/dlls/qdvd/tests/navigator.c +++ b/dlls/qdvd/tests/navigator.c @@ -62,7 +62,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IDvdControl, TRUE); check_interface(filter, &IID_IDvdControl2, TRUE); todo_wine check_interface(filter, &IID_IDvdInfo, TRUE); - todo_wine check_interface(filter, &IID_IDvdInfo2, TRUE); + check_interface(filter, &IID_IDvdInfo2, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); todo_wine check_interface(filter, &IID_ISpecifyPropertyPages, TRUE); -- 2.27.0

1 0

0001-server-Fix-some-alt-hotkeys-dont-work-if-the-msg-par
by yaoyongjie＠uniontech.com 28 Jul '20

28 Jul '20

yaoyongjie(a)uniontech.com

1 0

[PATCH 1/6] dsdmo: Add a stub I3DL2 reverb effect.
by Zebediah Figura 28 Jul '20

28 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsdmo/dsdmo.idl | 8 ++++++++ dlls/dsdmo/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index a967186af3f..e5735b42f73 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -18,6 +18,14 @@ #pragma makedep register +[ + threading(both), + progid("Microsoft.DirectSoundI3DL2ReverbDMO.1"), + vi_progid("Microsoft.DirectSoundI3DL2ReverbDMO"), + uuid(ef985e71-d5c7-42d4-ba4d-2d073e2e96f4) +] +coclass DirectSoundI3DL2ReverbDMO {} + [ threading(both), progid("Microsoft.DirectSoundWavesReverbDMO.1"), diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 1e992fe5419..f42d29f58ba 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -434,6 +434,48 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff effect->ops = ops; } +struct reverb +{ + struct effect effect; +}; + +static struct reverb *impl_reverb_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct reverb, effect); +} + +static void *reverb_query_interface(struct effect *iface, REFIID iid) +{ + return NULL; +} + +static void reverb_destroy(struct effect *iface) +{ + struct reverb *effect = impl_reverb_from_effect(iface); + + free(effect); +} + +static const struct effect_ops reverb_ops = +{ + .destroy = reverb_destroy, + .query_interface = reverb_query_interface, +}; + +static HRESULT reverb_create(IUnknown *outer, IUnknown **out) +{ + struct reverb *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &reverb_ops); + + TRACE("Created I3DL2 reverb effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct waves_reverb { struct effect effect; @@ -628,6 +670,7 @@ static struct } class_factories[] = { + {&GUID_DSFX_STANDARD_I3DL2REVERB, {{&class_factory_vtbl}, reverb_create}}, {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, }; -- 2.27.0

2 10

[PATCH v2 1/5] msacm32: Always initialize buffer lengths before calling RegEnumValue().
by Zebediah Figura 28 Jul '20

28 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msacm32/internal.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 9c4d1a75f3b..d6797bec40a 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -359,7 +359,7 @@ void MSACM_RegisterAllDrivers(void) 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'D','r','i','v','e','r','s','3','2','\0'}; - DWORD i, cnt, bufLen, lRet, type; + DWORD i, cnt, bufLen, lRet; WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; HKEY hKey; @@ -380,15 +380,16 @@ void MSACM_RegisterAllDrivers(void) *name = 0; MSACM_RegisterDriver(buf, name + 1, 0); } - i = 0; - cnt = ARRAY_SIZE(valname); - bufLen = sizeof(buf); - while(RegEnumValueW(hKey, i, valname, &cnt, 0, - &type, (BYTE*)buf, &bufLen) == ERROR_SUCCESS){ - if (!wcsnicmp(valname, msacmW, ARRAY_SIZE(msacmW))) - MSACM_RegisterDriver(valname, buf, 0); - ++i; - } + + for (i = 0; ; i++) + { + cnt = ARRAY_SIZE(valname); + bufLen = sizeof(buf); + if (RegEnumValueW(hKey, i, valname, &cnt, 0, NULL, (BYTE *)buf, &bufLen)) + break; + if (!wcsnicmp(valname, msacmW, ARRAY_SIZE(msacmW))) + MSACM_RegisterDriver(valname, buf, 0); + } RegCloseKey( hKey ); } -- 2.27.0

1 4

[PATCH v2] amstream: Accept more media subtypes in AMVideoStream::ReceiveConnection().
by Gijs Vermeulen 27 Jul '20

27 Jul '20

Fixes: a7c515fe01c4902a3e7c6b60608a54b77e252b47 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 26 +++++----- dlls/amstream/tests/amstream.c | 95 +++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 13 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 9f74eaf91a..4c94bacf52 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -632,16 +632,6 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA return E_UNEXPECTED; } -static BOOL check_media_type(const AM_MEDIA_TYPE *mt) -{ - if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) - && IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) - && IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - return TRUE; - - return FALSE; -} - static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { struct ddraw_stream *stream = impl_from_IPin(iface); @@ -657,7 +647,13 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons return VFW_E_ALREADY_CONNECTED; } - if (!check_media_type(mt)) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) + || (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) + || !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) { LeaveCriticalSection(&stream->cs); return VFW_E_TYPE_NOT_ACCEPTED; @@ -788,7 +784,13 @@ static HRESULT WINAPI ddraw_sink_QueryId(IPin *iface, WCHAR **id) static HRESULT WINAPI ddraw_sink_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) { TRACE("iface %p, mt %p.\n", iface, mt); - return check_media_type(mt) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED; + + if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) + && IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) + && IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return S_OK; + + return VFW_E_TYPE_NOT_ACCEPTED; } static HRESULT WINAPI ddraw_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 8adf9db934..68d2b9c18f 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "ksmedia.h" #include "dvdmedia.h" +#include "wmcodecdsp.h" #include "wine/strmbase.h" static const WAVEFORMATEX audio_format = @@ -2330,6 +2331,14 @@ static void test_media_types(void) &MEDIASUBTYPE_ARGB32, &MEDIASUBTYPE_ARGB1555, &MEDIASUBTYPE_ARGB4444, + &MEDIASUBTYPE_Avi, + &MEDIASUBTYPE_I420, + &MEDIASUBTYPE_AYUV, + &MEDIASUBTYPE_YV12, + &MEDIASUBTYPE_YUY2, + &MEDIASUBTYPE_UYVY, + &MEDIASUBTYPE_YVYU, + &MEDIASUBTYPE_NV12, &GUID_NULL, }; @@ -2364,7 +2373,7 @@ static void test_media_types(void) pmt->cbFormat = tests[i].size; pmt->pbFormat = tests[i].format; hr = IPin_QueryAccept(pin, pmt); - ok(hr == (i == 6) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == (i == 6 ? S_OK : VFW_E_TYPE_NOT_ACCEPTED), "Got hr %#x.\n", hr); } pmt->bFixedSizeSamples = FALSE; @@ -3243,6 +3252,89 @@ static void test_audiostream_receive_connection(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_receive_connection(void) +{ + static const VIDEOINFOHEADER req_vih; + IDirectDrawMediaStream *ddraw_stream; + IAMMultiMediaStream *mmstream; + struct testfilter source; + IMediaStream *stream; + AM_MEDIA_TYPE mt; + HRESULT hr; + ULONG ref; + IPin *pin; + int i; + + const AM_MEDIA_TYPE video_mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_RGB8, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(VIDEOINFOHEADER), + .pbFormat = (BYTE *)&req_vih, + }; + + static const GUID *subtypes[] = + { + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + &MEDIASUBTYPE_RGB555, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB1, + &MEDIASUBTYPE_RGB4, + &MEDIASUBTYPE_ARGB32, + &MEDIASUBTYPE_ARGB1555, + &MEDIASUBTYPE_ARGB4444, + &MEDIASUBTYPE_Avi, + &MEDIASUBTYPE_I420, + &MEDIASUBTYPE_AYUV, + &MEDIASUBTYPE_YV12, + &MEDIASUBTYPE_YUY2, + &MEDIASUBTYPE_UYVY, + &MEDIASUBTYPE_YVYU, + &MEDIASUBTYPE_NV12, + &GUID_NULL, + }; + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_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); + + testfilter_init(&source); + + mt = video_mt; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(subtypes); ++i) + { + mt = video_mt; + mt.subtype = *subtypes[i]; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == (i < 4 ? S_OK : VFW_E_TYPE_NOT_ACCEPTED), "Got hr %#x.\n", hr); + if (hr == S_OK) + { + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + } + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_audiostream_set_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5238,6 +5330,7 @@ START_TEST(amstream) test_ddrawstream_initialize(); test_ddrawstream_getsetdirectdraw(); + test_ddrawstream_receive_connection(); test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); -- 2.27.0

2 1

[PATCH 1/2] ddraw: Return DDERR_WRONGMODE when restoring a lost device's primary surface.
by Gabriel Ivăncescu 27 Jul '20

27 Jul '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ddraw/surface.c | 3 +++ dlls/ddraw/tests/ddraw1.c | 8 ++++++++ dlls/ddraw/tests/ddraw2.c | 8 ++++++++ dlls/ddraw/tests/ddraw4.c | 8 ++++++++ dlls/ddraw/tests/ddraw7.c | 8 ++++++++ 5 files changed, 35 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7b7f16e..3230410 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3758,6 +3758,9 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) struct wined3d_display_mode mode; HRESULT hr; + if (surface->ddraw->device_state == DDRAW_DEVICE_STATE_LOST) + return DDERR_WRONGMODE; + if (FAILED(hr = wined3d_swapchain_get_display_mode(swapchain, &mode, NULL))) { WARN("Failed to get display mode, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 652e52a..e543593 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7358,6 +7358,14 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index edaf868..e2a7f1e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8311,6 +8311,14 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d1abde0..072d783 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9708,6 +9708,14 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 13eadfd..eb3a215 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9466,6 +9466,14 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); -- 2.21.0

3 7

[PATCH] ieframe: Implement IOleObject::GetUserClassID().
by Jacek Caban 27 Jul '20

27 Jul '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/oleobject.c | 9 ++++++--- dlls/ieframe/tests/webbrowser.c | 23 ++++++++++++++++++++++- 2 files changed, 28 insertions(+), 4 deletions(-)

1 0

[PATCH v2] vbscript: implement case insensitive comparison functionality in InStr
by Dmitry Kislyuk 27 Jul '20

27 Jul '20

2 1

[PATCH v2 1/4] xinput: change to IMPORTS from DELAYIMPORTS
by Jordan Coppard 27 Jul '20

27 Jul '20

Using DELAYIMPORTS is breaking startup of some applications. After discussion in #winehackers IRC, it was remarked that there is no good reason to keep setupapi under DELAYIMPORTS, thus I have moved all occurrences of it to IMPORTS instead. Signed-off-by: Jordan Coppard <jordan(a)niau.io> --- v2: seperate commits to lower scope --- dlls/xinput1_1/Makefile.in | 2 +- dlls/xinput1_2/Makefile.in | 2 +- dlls/xinput1_3/Makefile.in | 2 +- dlls/xinput1_4/Makefile.in | 2 +- dlls/xinput9_1_0/Makefile.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index a2b17a248c..c4a0fe4b3a 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_1.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index fd38c6f6cc..9e56513501 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_2.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index 3b4968fb6d..fd4e48b4a8 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index cdf4b4fed0..73ef49dbf5 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_4.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index dc8739c464..2efe7b31b6 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput9_1_0.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = hid setupapi EXTRADLLFLAGS = -mno-cygwin -- 2.27.0

2 4

[PATCH 7/7] ieframe: Implement IDataObject::EnumDAdvise().
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Based on ole32/defaulthandler.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/view.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index f7b0765a5a..b3e8b10f95 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -245,8 +245,18 @@ static HRESULT WINAPI DataObject_DUnadvise(LPDATAOBJECT iface, DWORD dwConnectio static HRESULT WINAPI DataObject_EnumDAdvise(LPDATAOBJECT iface, IEnumSTATDATA **ppenumAdvise) { WebBrowser *This = impl_from_IDataObject(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppenumAdvise); + + if(!ppenumAdvise) + return E_POINTER; + + *ppenumAdvise = NULL; + + if(This->data_advise_holder) + return IDataAdviseHolder_EnumAdvise(This->data_advise_holder, ppenumAdvise); + + return S_OK; } static const IDataObjectVtbl DataObjectVtbl = { -- 2.26.2

1 0

[PATCH 6/7] ieframe: Implement IDataObject::DUnadvise().
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Based on ole32/defaulthandler.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/view.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 7bd9429c3d..f7b0765a5a 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -233,8 +233,13 @@ static HRESULT WINAPI DataObject_DAdvise(LPDATAOBJECT iface, FORMATETC *pformate static HRESULT WINAPI DataObject_DUnadvise(LPDATAOBJECT iface, DWORD dwConnection) { WebBrowser *This = impl_from_IDataObject(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, dwConnection); + + if(!This->data_advise_holder) + return OLE_E_NOCONNECTION; + + return IDataAdviseHolder_Unadvise(This->data_advise_holder, dwConnection); } static HRESULT WINAPI DataObject_EnumDAdvise(LPDATAOBJECT iface, IEnumSTATDATA **ppenumAdvise) -- 2.26.2

1 0

[PATCH 5/7] ieframe: Implement IDataObject::DAdvise().
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Based on ole32/defaulthandler.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/view.c | 13 +++++++++++-- dlls/ieframe/webbrowser.c | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 329cea2f7c..6b19fabaec 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -200,6 +200,7 @@ struct WebBrowser { DWORD sink_flags; IOleAdviseHolder *advise_holder; + IDataAdviseHolder *data_advise_holder; /* window context */ diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index d307bb5a00..7bd9429c3d 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -217,8 +217,17 @@ static HRESULT WINAPI DataObject_EnumFormatEtc(LPDATAOBJECT iface, DWORD dwDirec static HRESULT WINAPI DataObject_DAdvise(LPDATAOBJECT iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection) { WebBrowser *This = impl_from_IDataObject(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%p,%08x,%p,%p)\n", This, pformatetc, advf, pAdvSink, pdwConnection); + + if(!This->data_advise_holder) + hr = CreateDataAdviseHolder(&This->data_advise_holder); + + if(hr == S_OK) + hr = IDataAdviseHolder_Advise(This->data_advise_holder, iface, pformatetc, advf, pAdvSink, pdwConnection); + + return hr; } static HRESULT WINAPI DataObject_DUnadvise(LPDATAOBJECT iface, DWORD dwConnection) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 87b74b8e01..746e66c889 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -173,6 +173,9 @@ static ULONG WINAPI WebBrowser_Release(IUnknown *iface) if(This->advise_holder) IOleAdviseHolder_Release(This->advise_holder); + if(This->data_advise_holder) + IDataAdviseHolder_Release(This->data_advise_holder); + if(This->doc_host.document) IUnknown_Release(This->doc_host.document); -- 2.26.2

1 0

[PATCH 4/7] ieframe: Implement IOleObject::EnumAdvise().
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Based on ole32/defaulthandler.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index face9d16e9..a3fdc060a8 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -791,7 +791,17 @@ static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, ppenumAdvise); + + TRACE("(%p)->(%p)\n", This, ppenumAdvise); + + if(!ppenumAdvise) + return E_POINTER; + + *ppenumAdvise = NULL; + + if(This->advise_holder) + return IOleAdviseHolder_EnumAdvise(This->advise_holder, ppenumAdvise); + return S_OK; } -- 2.26.2

1 0

[PATCH 3/7] ieframe: Implement IOleObject::Unadvise().
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Based on ole32/defaulthandler.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 39acd43028..face9d16e9 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -779,8 +779,13 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, dwConnection); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, dwConnection); + + if(!This->advise_holder) + return OLE_E_NOCONNECTION; + + return IOleAdviseHolder_Unadvise(This->advise_holder, dwConnection); } static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) -- 2.26.2

1 0

[PATCH 1/7] ieframe: Implement IOleObject::GetUserClassID().
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 9 ++++++--- dlls/ieframe/tests/webbrowser.c | 23 ++++++++++++++++++++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 5c49845aa7..28ead0f687 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -719,11 +719,14 @@ static HRESULT WINAPI OleObject_IsUpToDate(IOleObject *iface) return E_NOTIMPL; } -static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID* pClsid) +static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, pClsid); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pClsid); + + *pClsid = This->version == 1 ? CLSID_WebBrowser_V1: CLSID_WebBrowser; + return S_OK; } static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 95d5fc4988..3ec5921a32 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2227,7 +2227,7 @@ static void test_Persist(IWebBrowser2 *wb, int version) HRESULT hr; hr = IWebBrowser2_QueryInterface(wb, &IID_IPersist, (void **)&persist); - ok(hr == S_OK, "QueryInterface(IID_IPersist failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IPersist) failed: %08x\n", hr); hr = IPersist_GetClassID(persist, &guid); ok(hr == S_OK, "GetClassID failed: %08x\n", hr); @@ -2239,6 +2239,25 @@ static void test_Persist(IWebBrowser2 *wb, int version) IPersist_Release(persist); } +static void test_OleObject(IWebBrowser2 *wb, int version) +{ + IOleObject *oleobj; + CLSID clsid; + HRESULT hr; + + hr = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void **)&oleobj); + ok(hr == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hr); + + hr = IOleObject_GetUserClassID(oleobj, &clsid); + ok(hr == S_OK, "GetUserClassID failed: %08x\n", hr); + if (version == 1) + ok(IsEqualGUID(&clsid, &CLSID_WebBrowser_V1), "got wrong CLSID: %s\n", wine_dbgstr_guid(&clsid)); + else + ok(IsEqualGUID(&clsid, &CLSID_WebBrowser), "got wrong CLSID: %s\n", wine_dbgstr_guid(&clsid)); + + IOleObject_Release(oleobj); +} + static void test_ie_funcs(IWebBrowser2 *wb) { IDispatch *disp; @@ -3761,6 +3780,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_Navigate2(webbrowser, L"about:blank"); test_QueryStatusWB(webbrowser, TRUE); test_Persist(webbrowser, 2); + test_OleObject(webbrowser, 2); if(do_download) { IHTMLDocument2 *doc, *doc2; @@ -3870,6 +3890,7 @@ static void test_WebBrowserV1(void) test_ClassInfo(wb); test_EnumVerbs(wb); test_Persist(wb, 1); + test_OleObject(wb, 1); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref); -- 2.26.2

1 0

[PATCH 2/6] winex11.drv: Support detaching adapters.
by Zhiyi Zhang 27 Jul '20

27 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 4 +-- dlls/winex11.drv/settings.c | 56 ++++++++++++++++++++++++++++--------- dlls/winex11.drv/xrandr.c | 21 ++++++++++++++ 3 files changed, 66 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 0d32dbfeef9..85fb2f080a7 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -612,10 +612,10 @@ static void test_ChangeDisplaySettingsEx(void) dd.cb = sizeof(dd); res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); ok(res, "EnumDisplayDevicesA %s failed, error %#x\n", devices[device].name, GetLastError()); - todo_wine ok(!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP), "Expect device %s detached.\n", devices[device].name); + ok(!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP), "Expect device %s detached.\n", devices[device].name); count = GetSystemMetrics(SM_CMONITORS); - todo_wine ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); + ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); } /* Test changing each adapter to every available mode */ diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 56f55e78b42..7c7d9507187 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -805,27 +805,33 @@ static void place_all_displays(struct x11drv_display_setting *displays, INT disp } } -static LONG apply_display_settings(struct x11drv_display_setting *displays, INT display_count) +static LONG apply_display_settings(struct x11drv_display_setting *displays, INT display_count, BOOL do_attach) { DEVMODEW *full_mode; + BOOL attached_mode; INT display_idx; LONG ret; for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (is_detached_mode(&displays[display_idx].desired_mode)) - { - FIXME("Detaching %s is currently unsupported.\n", - wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName)); + attached_mode = !is_detached_mode(&displays[display_idx].desired_mode); + if ((attached_mode && !do_attach) || (!attached_mode && do_attach)) continue; + + if (attached_mode) + { + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + return DISP_CHANGE_BADMODE; + + full_mode->dmFields |= DM_POSITION; + full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; + } + else + { + full_mode = &displays[display_idx].desired_mode; } - full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); - if (!full_mode) - return DISP_CHANGE_BADMODE; - - full_mode->dmFields |= DM_POSITION; - full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz " "depth:%ubits orientation:%#x.\n", handler.name, wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName), @@ -834,7 +840,8 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT full_mode->u1.s2.dmDisplayOrientation); ret = handler.set_current_mode(displays[display_idx].id, full_mode); - heap_free(full_mode); + if (attached_mode) + heap_free(full_mode); if (ret != DISP_CHANGE_SUCCESSFUL) return ret; } @@ -842,6 +849,19 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT return DISP_CHANGE_SUCCESSFUL; } +static BOOL all_detached_settings(const struct x11drv_display_setting *displays, INT display_count) +{ + INT display_idx; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (!is_detached_mode(&displays[display_idx].desired_mode)) + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -888,9 +908,19 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_SUCCESSFUL; } + if (all_detached_settings(displays, display_count)) + { + WARN("Detaching all displays is not permitted.\n"); + heap_free(displays); + return DISP_CHANGE_SUCCESSFUL; + } + place_all_displays(displays, display_count); - ret = apply_display_settings(displays, display_count); + /* Detach displays first to free up CRTCs */ + ret = apply_display_settings(displays, display_count, FALSE); + if (ret == DISP_CHANGE_SUCCESSFUL) + ret = apply_display_settings(displays, display_count, TRUE); if (ret == DISP_CHANGE_SUCCESSFUL) X11DRV_DisplayDevices_Update(TRUE); heap_free(displays); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 4fbb2e540dc..67fd2851825 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1306,6 +1306,27 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) if (!output_info || output_info->connection != RR_Connected) goto done; + if (is_detached_mode(mode)) + { + /* Already detached */ + if (!output_info->crtc) + { + ret = DISP_CHANGE_SUCCESSFUL; + goto done; + } + + /* Execute detach operation */ + status = pXRRSetCrtcConfig( gdi_display, screen_resources, output_info->crtc, + CurrentTime, 0, 0, None, RR_Rotate_0, NULL, 0 ); + if (status == RRSetConfigSuccess) + { + get_screen_size( screen_resources, &screen_width, &screen_height ); + set_screen_size( screen_width, screen_height ); + ret = DISP_CHANGE_SUCCESSFUL; + } + goto done; + } + /* Attached */ if (output_info->crtc) { -- 2.25.1

2 1

[PATCH 1/6] winex11.drv: Support automatic display position adjustment.
by Zhiyi Zhang 27 Jul '20

27 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 36 +--- dlls/winex11.drv/settings.c | 382 +++++++++++++++++++++++++++++++----- dlls/winex11.drv/xrandr.c | 7 +- 3 files changed, 337 insertions(+), 88 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 005627f28b0..0d32dbfeef9 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -283,29 +283,9 @@ struct device_info DEVMODEA original_mode; }; -static BOOL get_primary_adapter(CHAR *name) -{ - DISPLAY_DEVICEA dd; - DWORD i; - - dd.cb = sizeof(dd); - for (i = 0; EnumDisplayDevicesA(NULL, i, &dd, 0); ++i) - { - if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - { - lstrcpyA(name, dd.DeviceName); - return TRUE; - } - } - - return FALSE; -} - #define expect_dm(a, b, c) _expect_dm(__LINE__, a, b, c) static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD test) { - CHAR primary_adapter[CCHDEVICENAME]; - BOOL is_primary; DEVMODEA dm; BOOL ret; @@ -315,33 +295,23 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te ret = EnumDisplaySettingsA(device, ENUM_CURRENT_SETTINGS, &dm); ok_(__FILE__, line)(ret, "Device %s test %d EnumDisplaySettingsA failed, error %#x\n", device, test, GetLastError()); - ok(get_primary_adapter(primary_adapter), "Failed to get primary adapter name.\n"); - is_primary = !lstrcmpA(primary_adapter, device); - ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); /* Wine doesn't support changing color depth yet */ todo_wine_if(expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) ok_(__FILE__, line)(dm.dmBitsPerPel == expected.dmBitsPerPel, "Device %s test %d expect dmBitsPerPel %d, got %d\n", device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); - /* Wine currently reports primary monitor settings for non-primary monitors */ - todo_wine_if(!is_primary && dm.dmPelsWidth != expected.dmPelsWidth) ok_(__FILE__, line)(dm.dmPelsWidth == expected.dmPelsWidth, "Device %s test %d expect dmPelsWidth %d, got %d\n", device, test, expected.dmPelsWidth, dm.dmPelsWidth); - todo_wine_if(!is_primary && dm.dmPelsHeight != expected.dmPelsHeight) ok_(__FILE__, line)(dm.dmPelsHeight == expected.dmPelsHeight, "Device %s test %d expect dmPelsHeight %d, got %d\n", device, test, expected.dmPelsHeight, dm.dmPelsHeight); - todo_wine_if(!is_primary && dm.dmPosition.x != expected.dmPosition.x) ok_(__FILE__, line)(dm.dmPosition.x == expected.dmPosition.x, "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected.dmPosition.x, dm.dmPosition.x); - todo_wine_if(!is_primary && dm.dmPosition.y != expected.dmPosition.y) ok_(__FILE__, line)(dm.dmPosition.y == expected.dmPosition.y, "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected.dmPosition.y, dm.dmPosition.y); - todo_wine_if(!is_primary && dm.dmDisplayFrequency != expected.dmDisplayFrequency) ok_(__FILE__, line)(dm.dmDisplayFrequency == expected.dmDisplayFrequency, "Device %s test %d expect dmDisplayFrequency %d, got %d\n", device, test, expected.dmDisplayFrequency, dm.dmDisplayFrequency); - todo_wine_if(!is_primary && dm.dmDisplayOrientation != expected.dmDisplayOrientation) ok_(__FILE__, line)(dm.dmDisplayOrientation == expected.dmDisplayOrientation, "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected.dmDisplayOrientation, dm.dmDisplayOrientation); @@ -778,7 +748,7 @@ static void test_ChangeDisplaySettingsEx(void) if (res) { /* The secondary adapter should be to the right of the primary adapter */ - todo_wine ok(dm2.dmPosition.x == dm.dmPosition.x + dm.dmPelsWidth, + ok(dm2.dmPosition.x == dm.dmPosition.x + dm.dmPelsWidth, "Expected dm2.dmPosition.x %d, got %d.\n", dm.dmPosition.x + dm.dmPelsWidth, dm2.dmPosition.x); ok(dm2.dmPosition.y == dm.dmPosition.y, "Expected dm2.dmPosition.y %d, got %d.\n", @@ -795,7 +765,7 @@ static void test_ChangeDisplaySettingsEx(void) dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok((dm2.dmPosition.x == dm.dmPosition.x - dm2.dmPelsWidth), + ok(dm2.dmPosition.x == dm.dmPosition.x - dm2.dmPelsWidth, "Expected dmPosition.x %d, got %d.\n", dm.dmPosition.x - dm2.dmPelsWidth, dm2.dmPosition.x); @@ -889,7 +859,7 @@ static void test_ChangeDisplaySettingsEx(void) dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x == dm.dmPelsWidth, "Expect dmPosition.x %d, got %d\n", + ok(dm2.dmPosition.x == dm.dmPelsWidth, "Expect dmPosition.x %d, got %d\n", dm.dmPelsWidth, dm2.dmPosition.x); } else diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 02495756179..56f55e78b42 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -36,6 +36,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11settings); +struct x11drv_display_setting +{ + ULONG_PTR id; + BOOL placed; + RECT new_rect; + RECT desired_rect; + DEVMODEW desired_mode; +}; + static struct x11drv_mode_info *dd_modes = NULL; static unsigned int dd_mode_count = 0; static unsigned int dd_max_modes = 0; @@ -534,6 +543,305 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) return full_mode; } +static LONG get_display_settings(struct x11drv_display_setting **new_displays, + INT *new_display_count, const WCHAR *dev_name, DEVMODEW *dev_mode) +{ + struct x11drv_display_setting *displays; + DEVMODEW registry_mode, current_mode; + INT display_idx, display_count = 0; + DISPLAY_DEVICEW display_device; + LONG ret = DISP_CHANGE_FAILED; + + display_device.cb = sizeof(display_device); + for (display_idx = 0; EnumDisplayDevicesW(NULL, display_idx, &display_device, 0); ++display_idx) + ++display_count; + + displays = heap_calloc(display_count, sizeof(*displays)); + if (!displays) + goto done; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (!EnumDisplayDevicesW(NULL, display_idx, &display_device, 0)) + goto done; + + if (!handler.get_id(display_device.DeviceName, &displays[display_idx].id)) + { + ret = DISP_CHANGE_BADPARAM; + goto done; + } + + if (!dev_mode) + { + registry_mode.dmSize = sizeof(registry_mode); + if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_REGISTRY_SETTINGS, &registry_mode, 0)) + goto done; + + displays[display_idx].desired_mode = registry_mode; + } + else if (!lstrcmpiW(dev_name, display_device.DeviceName)) + { + displays[display_idx].desired_mode = *dev_mode; + if (!(dev_mode->dmFields & DM_POSITION)) + { + current_mode.dmSize = sizeof(current_mode); + if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) + goto done; + + displays[display_idx].desired_mode.dmFields |= DM_POSITION; + displays[display_idx].desired_mode.u1.s2.dmPosition = current_mode.u1.s2.dmPosition; + } + } + else + { + current_mode.dmSize = sizeof(current_mode); + if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) + goto done; + + displays[display_idx].desired_mode = current_mode; + } + + SetRect(&displays[display_idx].desired_rect, + displays[display_idx].desired_mode.u1.s2.dmPosition.x, + displays[display_idx].desired_mode.u1.s2.dmPosition.y, + displays[display_idx].desired_mode.u1.s2.dmPosition.x + displays[display_idx].desired_mode.dmPelsWidth, + displays[display_idx].desired_mode.u1.s2.dmPosition.y + displays[display_idx].desired_mode.dmPelsHeight); + lstrcpyW(displays[display_idx].desired_mode.dmDeviceName, display_device.DeviceName); + } + + *new_displays = displays; + *new_display_count = display_count; + return DISP_CHANGE_SUCCESSFUL; + +done: + heap_free(displays); + return ret; +} + +static INT offset_length(POINT offset) +{ + return offset.x * offset.x + offset.y * offset.y; +} + +/* Check if a rect overlaps with placed display rects */ +static BOOL overlap_placed_displays(const RECT *rect, const struct x11drv_display_setting *displays, INT display_count) +{ + INT display_idx; + RECT intersect; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (displays[display_idx].placed && + IntersectRect(&intersect, &displays[display_idx].new_rect, rect)) + return TRUE; + } + return FALSE; +} + +/* Get the offset with minimum length to place a display next to the placed displays with no spacing and overlaps */ +static POINT get_placement_offset(const struct x11drv_display_setting *displays, INT display_count, INT placing_idx) +{ + POINT points[8], left_top, offset, min_offset = {0, 0}; + INT display_idx, point_idx, point_count, vertex_idx; + BOOL has_placed = FALSE, first = TRUE; + INT width, height; + RECT rect; + + /* If the display to be placed is detached, no offset is needed to place it */ + if (IsRectEmpty(&displays[placing_idx].desired_rect)) + return min_offset; + + /* If there is no placed and attached display, place this display as it is */ + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (displays[display_idx].placed && !IsRectEmpty(&displays[display_idx].new_rect)) + { + has_placed = TRUE; + break; + } + } + + if (!has_placed) + return min_offset; + + /* Try to place this display with each of its four vertices at every vertex of the placed + * displays and see which combination has the minimum offset length */ + width = displays[placing_idx].desired_rect.right - displays[placing_idx].desired_rect.left; + height = displays[placing_idx].desired_rect.bottom - displays[placing_idx].desired_rect.top; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (!displays[display_idx].placed || IsRectEmpty(&displays[display_idx].new_rect)) + continue; + + /* Get four vertices of the placed display rectangle */ + points[0].x = displays[display_idx].new_rect.left; + points[0].y = displays[display_idx].new_rect.top; + points[1].x = displays[display_idx].new_rect.left; + points[1].y = displays[display_idx].new_rect.bottom; + points[2].x = displays[display_idx].new_rect.right; + points[2].y = displays[display_idx].new_rect.top; + points[3].x = displays[display_idx].new_rect.right; + points[3].y = displays[display_idx].new_rect.bottom; + point_count = 4; + + /* Intersected points when moving the display to be placed horizontally */ + if (displays[placing_idx].desired_rect.bottom >= displays[display_idx].new_rect.top && + displays[placing_idx].desired_rect.top <= displays[display_idx].new_rect.bottom) + { + points[point_count].x = displays[display_idx].new_rect.left; + points[point_count++].y = displays[placing_idx].desired_rect.top; + points[point_count].x = displays[display_idx].new_rect.right; + points[point_count++].y = displays[placing_idx].desired_rect.top; + } + /* Intersected points when moving the display to be placed vertically */ + if (displays[placing_idx].desired_rect.left <= displays[display_idx].new_rect.right && + displays[placing_idx].desired_rect.right >= displays[display_idx].new_rect.left) + { + points[point_count].x = displays[placing_idx].desired_rect.left; + points[point_count++].y = displays[display_idx].new_rect.top; + points[point_count].x = displays[placing_idx].desired_rect.left; + points[point_count++].y = displays[display_idx].new_rect.bottom; + } + + /* Try moving each vertex of the display rectangle to each points */ + for (point_idx = 0; point_idx < point_count; ++point_idx) + { + for (vertex_idx = 0; vertex_idx < 4; ++vertex_idx) + { + switch (vertex_idx) + { + /* Move the bottom right vertex to the point */ + case 0: + left_top.x = points[point_idx].x - width; + left_top.y = points[point_idx].y - height; + break; + /* Move the bottom left vertex to the point */ + case 1: + left_top.x = points[point_idx].x; + left_top.y = points[point_idx].y - height; + break; + /* Move the top right vertex to the point */ + case 2: + left_top.x = points[point_idx].x - width; + left_top.y = points[point_idx].y; + break; + /* Move the top left vertex to the point */ + case 3: + left_top.x = points[point_idx].x; + left_top.y = points[point_idx].y; + break; + } + + offset.x = left_top.x - displays[placing_idx].desired_rect.left; + offset.y = left_top.y - displays[placing_idx].desired_rect.top; + rect = displays[placing_idx].desired_rect; + OffsetRect(&rect, offset.x, offset.y); + if (!overlap_placed_displays(&rect, displays, display_count)) + { + if (first) + { + min_offset = offset; + first = FALSE; + continue; + } + + if (offset_length(offset) < offset_length(min_offset)) + min_offset = offset; + } + } + } + } + + return min_offset; +} + +static void place_all_displays(struct x11drv_display_setting *displays, INT display_count) +{ + INT left_most = INT_MAX, top_most = INT_MAX; + INT placing_idx, display_idx; + POINT min_offset, offset; + + /* Place all displays with no extra space between them and no overlapping */ + while (1) + { + /* Place the unplaced display with the minimum offset length first */ + placing_idx = -1; + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (displays[display_idx].placed) + continue; + + offset = get_placement_offset(displays, display_count, display_idx); + if (placing_idx == -1 || offset_length(offset) < offset_length(min_offset)) + { + min_offset = offset; + placing_idx = display_idx; + } + } + + /* If all displays are placed */ + if (placing_idx == -1) + break; + + displays[placing_idx].new_rect = displays[placing_idx].desired_rect; + OffsetRect(&displays[placing_idx].new_rect, min_offset.x, min_offset.y); + displays[placing_idx].placed = TRUE; + } + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + displays[display_idx].desired_mode.u1.s2.dmPosition.x = displays[display_idx].new_rect.left; + displays[display_idx].desired_mode.u1.s2.dmPosition.y = displays[display_idx].new_rect.top; + left_most = min(left_most, displays[display_idx].new_rect.left); + top_most = min(top_most, displays[display_idx].new_rect.top); + } + + /* Convert virtual screen coordinates to root coordinates */ + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + displays[display_idx].desired_mode.u1.s2.dmPosition.x -= left_most; + displays[display_idx].desired_mode.u1.s2.dmPosition.y -= top_most; + } +} + +static LONG apply_display_settings(struct x11drv_display_setting *displays, INT display_count) +{ + DEVMODEW *full_mode; + INT display_idx; + LONG ret; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (is_detached_mode(&displays[display_idx].desired_mode)) + { + FIXME("Detaching %s is currently unsupported.\n", + wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName)); + continue; + } + + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + return DISP_CHANGE_BADMODE; + + full_mode->dmFields |= DM_POSITION; + full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; + TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz " + "depth:%ubits orientation:%#x.\n", handler.name, + wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName), + full_mode->u1.s2.dmPosition.x, full_mode->u1.s2.dmPosition.y, full_mode->dmPelsWidth, + full_mode->dmPelsHeight, full_mode->dmDisplayFrequency, full_mode->dmBitsPerPel, + full_mode->u1.s2.dmDisplayOrientation); + + ret = handler.set_current_mode(displays[display_idx].id, full_mode); + heap_free(full_mode); + if (ret != DISP_CHANGE_SUCCESSFUL) + return ret; + } + + return DISP_CHANGE_SUCCESSFUL; +} + /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -541,10 +849,11 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { + struct x11drv_display_setting *displays; WCHAR primary_adapter[CCHDEVICENAME]; char bpp_buffer[16], freq_buffer[18]; - DEVMODEW default_mode, *full_mode; - ULONG_PTR id; + INT display_idx, display_count; + DEVMODEW default_mode; LONG ret; DWORD i; @@ -552,70 +861,39 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, if (!handler.name) goto old_interface; - if (!get_primary_adapter(primary_adapter)) - return DISP_CHANGE_FAILED; + ret = get_display_settings(&displays, &display_count, devname, devmode); + if (ret != DISP_CHANGE_SUCCESSFUL) + return ret; - if (!devname && !devmode) + if (flags & CDS_UPDATEREGISTRY && devname && devmode) { - default_mode.dmSize = sizeof(default_mode); - if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + for (display_idx = 0; display_idx < display_count; ++display_idx) { - ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); - return DISP_CHANGE_BADMODE; + if (!lstrcmpiW(displays[display_idx].desired_mode.dmDeviceName, devname)) + { + if (!write_registry_settings(devname, &displays[display_idx].desired_mode)) + { + ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); + heap_free(displays); + return DISP_CHANGE_NOTUPDATED; + } + break; + } } - - devname = primary_adapter; - devmode = &default_mode; - } - - if (!handler.get_id(devname, &id)) - { - ERR("Failed to get %s device id.\n", wine_dbgstr_w(devname)); - return DISP_CHANGE_BADPARAM; - } - - if (is_detached_mode(devmode)) - { - FIXME("Detaching adapters is currently unsupported.\n"); - return DISP_CHANGE_SUCCESSFUL; - } - - if (!(full_mode = get_full_mode(id, devmode))) - { - ERR("Failed to find a valid mode.\n"); - return DISP_CHANGE_BADMODE; - } - - if (flags & CDS_UPDATEREGISTRY && !write_registry_settings(devname, full_mode)) - { - ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); - heap_free(full_mode); - return DISP_CHANGE_NOTUPDATED; - } - - if (lstrcmpiW(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter %s settings is currently unsupported.\n", - wine_dbgstr_w(devname)); - heap_free(full_mode); - return DISP_CHANGE_SUCCESSFUL; } if (flags & (CDS_TEST | CDS_NORESET)) { - heap_free(full_mode); + heap_free(displays); return DISP_CHANGE_SUCCESSFUL; } - TRACE("handler:%s device:%s position:(%d,%d) resolution:%ux%u frequency:%uHz depth:%ubits " - "orientation:%#x.\n", handler.name, wine_dbgstr_w(devname), full_mode->u1.s2.dmPosition.x, - full_mode->u1.s2.dmPosition.y, full_mode->dmPelsWidth, full_mode->dmPelsHeight, - full_mode->dmDisplayFrequency, full_mode->dmBitsPerPel, full_mode->u1.s2.dmDisplayOrientation); + place_all_displays(displays, display_count); - ret = handler.set_current_mode(id, full_mode); + ret = apply_display_settings(displays, display_count); if (ret == DISP_CHANGE_SUCCESSFUL) X11DRV_DisplayDevices_Update(TRUE); - heap_free(full_mode); + heap_free(displays); return ret; old_interface: diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index d111b960fa6..4fbb2e540dc 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1367,12 +1367,13 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) goto done; get_screen_size( screen_resources, &screen_width, &screen_height ); - screen_width = max( screen_width, crtc_info->x + mode->dmPelsWidth ); - screen_height = max( screen_height, crtc_info->y + mode->dmPelsHeight ); + screen_width = max( screen_width, mode->u1.s2.dmPosition.x + mode->dmPelsWidth ); + screen_height = max( screen_height, mode->u1.s2.dmPosition.y + mode->dmPelsHeight ); set_screen_size( screen_width, screen_height ); status = pXRRSetCrtcConfig( gdi_display, screen_resources, crtc, CurrentTime, - crtc_info->x, crtc_info->y, rrmode, rotation, outputs, output_count ); + mode->u1.s2.dmPosition.x, mode->u1.s2.dmPosition.y, rrmode, + rotation, outputs, output_count ); if (status == RRSetConfigSuccess) ret = DISP_CHANGE_SUCCESSFUL; -- 2.25.1

2 1

[PATCH] wininet: Handle empty expires for cookie setting.
by Jactry Zeng 27 Jul '20

27 Jul '20

Superseded patch 189784. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/wininet/cookie.c | 2 +- dlls/wininet/tests/internet.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1786b3d281..090653864a 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -977,7 +977,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D substr_skip(&data, len); - if(end_ptr - data.str < ARRAY_SIZE(buf)-1) { + if (data.str[0] && (end_ptr - data.str < ARRAY_SIZE(buf) - 1)) { memcpy(buf, data.str, data.len*sizeof(WCHAR)); buf[data.len] = 0; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e69b45a7e6..ef1adefd1a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -510,7 +510,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -524,16 +524,26 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", "A", buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); /* test persistent cookies */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + /* test invalid expires parameter */ + ret = InternetSetCookieA("http://testing.example.com", NULL, "Q=R; expires="); + ok(ret, "InternetSetCookie failed %#x.\n", GetLastError()); + len = 1024; + memset(buffer, 0xac, sizeof(buffer)); + ret = InternetGetCookieA("http://testing.example.com/", NULL, buffer, &len); + ok(ret, "InternetGetCookie failed %#x.\n", GetLastError()); + ok(len == 29, "got len %u.\n", len); + ok(!!strstr(buffer, "Q=R"), "cookie is not present.\n"); + len = sizeof(buffer); ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); - ok(ret, "got error %u\n", GetLastError()); - ok(len == 24, "got len %u\n", len); + ok(ret, "got error %#x\n", GetLastError()); + ok(len == 29, "got len %u\n", len); ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */ -- 2.27.0

1 0

[PATCH] wininet: Handle empty expires for cookie setting.
by Jactry Zeng 27 Jul '20

27 Jul '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/wininet/cookie.c | 2 +- dlls/wininet/tests/internet.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1786b3d281..090653864a 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -977,7 +977,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D substr_skip(&data, len); - if(end_ptr - data.str < ARRAY_SIZE(buf)-1) { + if (data.str[0] && (end_ptr - data.str < ARRAY_SIZE(buf) - 1)) { memcpy(buf, data.str, data.len*sizeof(WCHAR)); buf[data.len] = 0; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e69b45a7e6..ef1adefd1a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -510,7 +510,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -524,16 +524,26 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", "A", buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); /* test persistent cookies */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + /* test invalid expires parameter */ + ret = InternetSetCookieA("http://testing.example.com", NULL, "Q=R; expires="); + ok(ret, "InternetSetCookie failed %#x.\n", GetLastError()); + len = 1024; + memset(buffer, 0xac, sizeof(buffer)); + ret = InternetGetCookieA("http://testing.example.com/", NULL, buffer, &len); + ok(ret, "InternetGetCookie failed %#x.\n", GetLastError()); + ok(len == 29, "got len %u.\n", len); + ok(!!strstr(buffer, "Q=R"), "cookie is not present.\n"); + len = sizeof(buffer); ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); - ok(ret, "got error %u\n", GetLastError()); - ok(len == 24, "got len %u\n", len); + ok(ret, "got error %#x\n", GetLastError()); + ok(len == 29, "got len %u\n", len); ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */ -- 2.27.0

2 1

[PATCH 1/2] wbemprox/tests: Fix test failures.
by Gijs Vermeulen 27 Jul '20

27 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wbemprox/tests/query.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index da47773da2..0fa091b739 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,8 +1144,10 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PhysicalMemory" ); IEnumWbemClassObject *result; IWbemClassObject *obj; - HRESULT hr; + CIMTYPE type; + VARIANT val; DWORD count; + HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); if (hr != S_OK) @@ -1154,21 +1156,39 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) return; } - hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - - if (count > 0) + for (;;) { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"BankLabel", VT_BSTR, CIM_STRING ); check_property( obj, L"Capacity", VT_BSTR, CIM_UINT64 ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceLocator", VT_BSTR, CIM_STRING ); check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 ); - check_property( obj, L"PartNumber", VT_NULL, CIM_STRING ); - check_property( obj, L"SerialNumber", VT_NULL, CIM_STRING ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "PartNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "SerialNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); -- 2.27.0

2 3

[PATCH] sc.exe: Fake succes for the SdSet argument
by Louis Lenders 27 Jul '20

27 Jul '20

https://bugs.winehq.org/show_bug.cgi?id=49620 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- programs/sc/sc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 1976c38a78..ad74cab74b 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -220,6 +220,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR startW[] = {'s','t','a','r','t',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; + static const WCHAR sdsetW[] = {'s','d','s','e','t',0}; SC_HANDLE manager, service; SERVICE_STATUS status; BOOL ret = FALSE; @@ -328,6 +329,11 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } + else if (!wcsicmp( argv[1], sdsetW )) + { + WINE_FIXME("command not supported, just faking success for now\n"); + ret = TRUE; + } else WINE_FIXME("command not supported\n"); -- 2.28.0.rc2

1 0

[PATCH] fonts: Add initial version of Webdings font.
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Some applications confusingly use Webdings instead of Marlett to draw non-client areas of their custom controls, this initial version of Webdings contains just a few glyphs copied from Marlett to make these apps happy. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/Makefile.in | 1 + fonts/webdings.sfd | 198 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 fonts/webdings.sfd diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 08c82646de..b802185198 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -10,4 +10,5 @@ FONT_SRCS = \ system.sfd \ tahoma.sfd \ tahomabd.sfd \ + webdings.sfd \ wingding.sfd diff --git a/fonts/webdings.sfd b/fonts/webdings.sfd new file mode 100644 index 0000000000..0a42dbe564 --- /dev/null +++ b/fonts/webdings.sfd @@ -0,0 +1,198 @@ +SplineFontDB: 3.0 +FontName: WineWebdings +FullName: Webdings +FamilyName: Webdings +Weight: Regular +Copyright: Copyright (C) 2020 Dmitry Timoshkov +UComments: "#pragma makedep install" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: 0 +UnderlineWidth: 0 +Ascent: 2048 +Descent: 0 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +FSType: 0 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 0 +PfmFamily: 81 +TTFWeight: 500 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 0 0 0 0 0 0 0 0 0 0 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'Wine' +DEI: 91125 +ShortTable: cvt 2 + 68 + 1297 +EndShort +LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "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.+AAoACgAA-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.+AAoACgAA-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+AAoA" "http://www.gnu.org/licenses/lgpl.html" +Encoding: Symbol +Compacted: 1 +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -72 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 26 10 +TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 +BeginChars: 257 8 + +StartChar: f020 +Encoding: 0 61472 0 +AltUni2: 000000.ffffffff.0 +Width: 1024 +Flags: W +LayerCount: 2 +Fore +SplineSet +41 41 m 1,0,-1 + 819 41 l 1,1,-1 + 819 1324 l 1,2,-1 + 41 1324 l 1,3,-1 + 41 41 l 1,0,-1 +0 0 m 1,4,-1 + 0 1365 l 1,5,-1 + 860 1365 l 1,6,-1 + 860 0 l 1,7,-1 + 0 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: zero +Encoding: 48 48 1 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +256 256 m 1,0,-1 + 256 512 l 1,1,-1 + 1280 512 l 1,2,-1 + 1280 256 l 1,3,-1 + 256 256 l 1,0,-1 +EndSplineSet +EndChar + +StartChar: one +Encoding: 49 49 2 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +256 384 m 1,0,-1 + 1536 384 l 1,1,-1 + 1536 1408 l 1,2,-1 + 256 1408 l 1,3,-1 + 256 384 l 1,0,-1 +128 256 m 1,4,-1 + 128 1664 l 1,5,-1 + 1664 1664 l 1,6,-1 + 1664 256 l 1,7,-1 + 128 256 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: two +Encoding: 50 50 3 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +128 256 m 1,0,-1 + 128 1152 l 1,1,-1 + 512 1152 l 1,2,-1 + 512 1664 l 1,3,-1 + 1664 1664 l 1,4,-1 + 1664 768 l 1,5,-1 + 1280 768 l 1,6,-1 + 1280 256 l 1,7,-1 + 128 256 l 1,0,-1 +256 384 m 1,8,-1 + 1152 384 l 1,9,-1 + 1152 896 l 1,10,-1 + 256 896 l 1,11,-1 + 256 384 l 1,8,-1 +640 1152 m 1,12,-1 + 1280 1152 l 1,13,-1 + 1280 896 l 1,14,-1 + 1536 896 l 1,15,-1 + 1536 1408 l 1,16,-1 + 640 1408 l 1,17,-1 + 640 1152 l 1,12,-1 +EndSplineSet +EndChar + +StartChar: three +Encoding: 51 51 4 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1150 1726 m 25,0,-1 + 1150 446 l 25,1,-1 + 510 1086 l 25,2,-1 + 1150 1726 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: four +Encoding: 52 52 5 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +842 1732 m 25,0,-1 + 842 452 l 25,1,-1 + 1482 1092 l 25,2,-1 + 842 1732 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: five +Encoding: 53 53 6 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +320 768 m 25,0,-1 + 1600 768 l 25,1,-1 + 960 1408 l 25,2,-1 + 320 768 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: six +Encoding: 54 54 7 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +320 1282 m 25,0,-1 + 1600 1282 l 25,1,-1 + 960 642 l 25,2,-1 + 320 1282 l 25,0,-1 +EndSplineSet +EndChar +EndChars +EndSplineFont -- 2.26.2

3 3

[PATCH v3] gdi32/tests: Add duplicate face name test for EnumFontFamilies.
by Myah Caron 27 Jul '20

27 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v3 doesn't consider a duplicate if the charset is the same. This should fix the test failure under Windows 10 Arabic. dlls/gdi32/tests/font.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ad894dfdca..7f9e35ed5f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2869,7 +2869,7 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) struct enum_font_dataW efdw; LOGFONTA lf; HDC hdc; - int i, ret, ansi_charset, symbol_charset, russian_charset; + int i, ret, ansi_charset, symbol_charset, russian_charset, duplicates; if (*font_name && !is_truetype_font_installed(font_name)) { @@ -2903,6 +2903,20 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) ok(russian_charset > 0 || broken(russian_charset == 0), /* NT4 */ "NULL family should enumerate RUSSIAN_CHARSET\n"); + + duplicates = 0; + for (i = 1; i < efdw.total; i++) { + ret = lstrcmpW(efdw.lf[i - 1].lfFaceName, efdw.lf[i].lfFaceName); + /* Windows 10 Arabic returns "Traditional Arabic" duplicated, but with the same charset (0) */ + if (!ret && efdw.lf[i - 1].lfCharSet != efdw.lf[i].lfCharSet) { + todo_wine ok(ret != 0, "duplicate font faces: (name: '%s', charset %i) (name: '%s', charset %i)\n", + wine_dbgstr_w(efdw.lf[i - 1].lfFaceName), efdw.lf[i - 1].lfCharSet, + wine_dbgstr_w(efdw.lf[i].lfFaceName), efdw.lf[i].lfCharSet); + duplicates++; + } + } + + todo_wine ok(duplicates == 0, "%i duplicate font faces returned\n", duplicates); } efdw.total = 0; -- 2.27.0

1 0

[PATCH v2] winemac.drv: Fix warnings for constants deprecated by macOS 10.12.
by Brendan Shanks 27 Jul '20

27 Jul '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.h | 35 +++++++++++++ dlls/winemac.drv/cocoa_app.m | 50 +++++++++--------- dlls/winemac.drv/cocoa_event.m | 7 ++- dlls/winemac.drv/cocoa_opengl.m | 3 +- dlls/winemac.drv/cocoa_status_item.m | 6 ++- dlls/winemac.drv/cocoa_window.m | 76 ++++++++++++++-------------- 6 files changed, 111 insertions(+), 66 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index c88b894b5cf..7abea0990e9 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -22,6 +22,41 @@ #include "macdrv_cocoa.h" +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.12. */ +#define NSCompositingOperationSourceOver NSCompositeSourceOver +#define NSEventMaskAny NSAnyEventMask +#define NSEventMaskLeftMouseDown NSLeftMouseDownMask +#define NSEventMaskOtherMouseDown NSOtherMouseDownMask +#define NSEventMaskRightMouseDown NSRightMouseDownMask +#define NSEventModifierFlagCommand NSCommandKeyMask +#define NSEventModifierFlagControl NSControlKeyMask +#define NSEventModifierFlagOption NSAlternateKeyMask +#define NSEventModifierFlagShift NSShiftKeyMask +#define NSEventTypeAppKitDefined NSAppKitDefined +#define NSEventTypeApplicationDefined NSApplicationDefined +#define NSEventTypeFlagsChanged NSFlagsChanged +#define NSEventTypeKeyDown NSKeyDown +#define NSEventTypeKeyUp NSKeyUp +#define NSEventTypeLeftMouseDown NSLeftMouseDown +#define NSEventTypeLeftMouseDragged NSLeftMouseDragged +#define NSEventTypeLeftMouseUp NSLeftMouseUp +#define NSEventTypeMouseMoved NSMouseMoved +#define NSEventTypeOtherMouseDown NSOtherMouseDown +#define NSEventTypeOtherMouseDragged NSOtherMouseDragged +#define NSEventTypeOtherMouseUp NSOtherMouseUp +#define NSEventTypeRightMouseDown NSRightMouseDown +#define NSEventTypeRightMouseUp NSRightMouseUp +#define NSEventTypeRightMouseDragged NSRightMouseDragged +#define NSEventTypeScrollWheel NSScrollWheel +#define NSWindowStyleMaskBorderless NSBorderlessWindowMask +#define NSWindowStyleMaskClosable NSClosableWindowMask +#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask +#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask +#define NSWindowStyleMaskResizable NSResizableWindowMask +#define NSWindowStyleMaskTitled NSTitledWindowMask +#define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask +#endif #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 8e66721da11..b4dcbfff473 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -258,7 +258,7 @@ - (void) transformProcessToForeground item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_HIDE_OTHERS) action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption]; item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_SHOW_ALL) action:@selector(unhideAllApplications:) @@ -271,7 +271,7 @@ - (void) transformProcessToForeground else title = WineLocalizedString(STRING_MENU_ITEM_QUIT); item = [submenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption]; item = [[[NSMenuItem alloc] init] autorelease]; [item setTitle:WineLocalizedString(STRING_MENU_WINE)]; [item setSubmenu:submenu]; @@ -290,7 +290,9 @@ - (void) transformProcessToForeground item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ENTER_FULL_SCREEN) action:@selector(toggleFullScreen:) keyEquivalent:@"f"]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask | NSControlKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | + NSEventModifierFlagOption | + NSEventModifierFlagControl]; } [submenu addItem:[NSMenuItem separatorItem]]; [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_BRING_ALL_TO_FRONT) @@ -317,7 +319,7 @@ - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(B if (processEvents) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask + NSEvent* event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:timeout inMode:NSDefaultRunLoopMode dequeue:YES]; @@ -1607,7 +1609,7 @@ - (void) handleWindowDrag:(NSEvent*)anEvent begin:(BOOL)begin - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; - BOOL drag = [anEvent type] != NSMouseMoved; + BOOL drag = [anEvent type] != NSEventTypeMouseMoved; if ([windowsBeingDragged count]) targetWindow = nil; @@ -1758,11 +1760,11 @@ - (void) handleMouseButton:(NSEvent*)theEvent WineWindow* windowBroughtForward = nil; BOOL process = FALSE; - if (type == NSLeftMouseUp && [windowsBeingDragged count]) + if (type == NSEventTypeLeftMouseUp && [windowsBeingDragged count]) [self handleWindowDrag:theEvent begin:NO]; if ([window isKindOfClass:[WineWindow class]] && - type == NSLeftMouseDown && + type == NSEventTypeLeftMouseDown && ![theEvent wine_commandKeyDown]) { NSWindowButton windowButton; @@ -1795,7 +1797,9 @@ - (void) handleMouseButton:(NSEvent*)theEvent if ([window isKindOfClass:[WineWindow class]]) { - BOOL pressed = (type == NSLeftMouseDown || type == NSRightMouseDown || type == NSOtherMouseDown); + BOOL pressed = (type == NSEventTypeLeftMouseDown || + type == NSEventTypeRightMouseDown || + type == NSEventTypeOtherMouseDown); CGPoint pt = CGEventGetLocation([theEvent CGEvent]); if (clippingCursor) @@ -1811,7 +1815,7 @@ - (void) handleMouseButton:(NSEvent*)theEvent NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; NSRect contentRect = [window contentRectForFrameRect:[window frame]]; process = NSMouseInRect(nspoint, contentRect, NO); - if (process && [window styleMask] & NSResizableWindowMask) + if (process && [window styleMask] & NSWindowStyleMaskResizable) { // Ignore clicks in the grow box (resize widget). HIPoint origin = { 0, 0 }; @@ -1821,7 +1825,7 @@ - (void) handleMouseButton:(NSEvent*)theEvent info.kind = kHIThemeGrowBoxKindNormal; info.direction = kThemeGrowRight | kThemeGrowDown; - if ([window styleMask] & NSUtilityWindowMask) + if ([window styleMask] & NSWindowStyleMaskUtilityWindow) info.size = kHIThemeGrowBoxSizeSmall; else info.size = kHIThemeGrowBoxSizeNormal; @@ -2063,27 +2067,27 @@ - (BOOL) handleEvent:(NSEvent*)anEvent BOOL ret = FALSE; NSEventType type = [anEvent type]; - if (type == NSFlagsChanged) + if (type == NSEventTypeFlagsChanged) self.lastFlagsChanged = anEvent; - else if (type == NSMouseMoved || type == NSLeftMouseDragged || - type == NSRightMouseDragged || type == NSOtherMouseDragged) + else if (type == NSEventTypeMouseMoved || type == NSEventTypeLeftMouseDragged || + type == NSEventTypeRightMouseDragged || type == NSEventTypeOtherMouseDragged) { [self handleMouseMove:anEvent]; ret = mouseCaptureWindow && ![windowsBeingDragged count]; } - else if (type == NSLeftMouseDown || type == NSLeftMouseUp || - type == NSRightMouseDown || type == NSRightMouseUp || - type == NSOtherMouseDown || type == NSOtherMouseUp) + else if (type == NSEventTypeLeftMouseDown || type == NSEventTypeLeftMouseUp || + type == NSEventTypeRightMouseDown || type == NSEventTypeRightMouseUp || + type == NSEventTypeOtherMouseDown || type == NSEventTypeOtherMouseUp) { [self handleMouseButton:anEvent]; ret = mouseCaptureWindow && ![windowsBeingDragged count]; } - else if (type == NSScrollWheel) + else if (type == NSEventTypeScrollWheel) { [self handleScrollWheel:anEvent]; ret = mouseCaptureWindow != nil; } - else if (type == NSKeyDown) + else if (type == NSEventTypeKeyDown) { // -[NSApplication sendEvent:] seems to consume presses of the Help // key (Insert key on PC keyboards), so we have to bypass it and @@ -2094,7 +2098,7 @@ - (BOOL) handleEvent:(NSEvent*)anEvent ret = TRUE; } } - else if (type == NSKeyUp) + else if (type == NSEventTypeKeyUp) { uint16_t keyCode = [anEvent keyCode]; if ([self isKeyPressed:keyCode]) @@ -2105,7 +2109,7 @@ - (BOOL) handleEvent:(NSEvent*)anEvent [window postKeyEvent:anEvent]; } } - else if (type == NSAppKitDefined) + else if (type == NSEventTypeAppKitDefined) { short subtype = [anEvent subtype]; @@ -2123,11 +2127,11 @@ - (void) didSendEvent:(NSEvent*)anEvent { NSEventType type = [anEvent type]; - if (type == NSKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) + if (type == NSEventTypeKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) { NSUInteger modifiers = [anEvent modifierFlags]; - if ((modifiers & NSCommandKeyMask) && - !(modifiers & (NSControlKeyMask | NSAlternateKeyMask))) + if ((modifiers & NSEventModifierFlagCommand) && + !(modifiers & (NSEventModifierFlagControl | NSEventModifierFlagOption))) { // Command-Tab and Command-Shift-Tab would normally be intercepted // by the system to switch applications. If we're seeing it, it's diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 40066ffda5e..868ce5a7813 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -44,7 +44,10 @@ @implementation NSEvent (WineExtensions) static BOOL wine_commandKeyDown(NSUInteger flags) { - return ((flags & (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)) == NSCommandKeyMask); + return ((flags & (NSEventModifierFlagShift | + NSEventModifierFlagControl | + NSEventModifierFlagOption | + NSEventModifierFlagCommand)) == NSEventModifierFlagCommand); } + (BOOL) wine_commandKeyDown @@ -754,7 +757,7 @@ void macdrv_set_query_done(macdrv_query *query) query->done = TRUE; macdrv_release_query(query); - event = [NSEvent otherEventWithType:NSApplicationDefined + event = [NSEvent otherEventWithType:NSEventTypeApplicationDefined location:NSZeroPoint modifierFlags:0 timestamp:[[NSProcessInfo processInfo] systemUptime] diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 96e27b76e5d..ce8788b4269 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -23,6 +23,7 @@ #import "cocoa_opengl.h" #include "macdrv_cocoa.h" +#include "cocoa_app.h" #include "cocoa_event.h" @@ -53,7 +54,7 @@ + (NSView*) dummyView dispatch_once(&once, ^{ OnMainThread(^{ dummyWindow = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) - styleMask:NSBorderlessWindowMask + styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]; }); diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index 23d78059585..1ffdeb8048d 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -117,7 +117,9 @@ - (void) postMouseButtonEvent:(NSEvent*)nsevent; event = macdrv_create_event(STATUS_ITEM_MOUSE_BUTTON, nil); event->status_item_mouse_button.item = (macdrv_status_item)self; event->status_item_mouse_button.button = [nsevent buttonNumber]; - event->status_item_mouse_button.down = (typeMask & (NSLeftMouseDownMask | NSRightMouseDownMask | NSOtherMouseDownMask)) != 0; + event->status_item_mouse_button.down = (typeMask & (NSEventMaskLeftMouseDown | + NSEventMaskRightMouseDown | + NSEventMaskOtherMouseDown)) != 0; event->status_item_mouse_button.count = [nsevent clickCount]; event->status_item_mouse_button.x = floor(point.x); event->status_item_mouse_button.y = floor(point.y); @@ -147,7 +149,7 @@ - (void) drawRect:(NSRect)rect [image drawAtPoint:imageOrigin fromRect:NSZeroRect - operation:NSCompositeSourceOver + operation:NSCompositingOperationSourceOver fraction:1]; } } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9c2ffb1623d..b6c5386469c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -41,7 +41,7 @@ NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7, NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8, NSWindowFullScreenButton = 7, - NSFullScreenWindowMask = 1 << 14, + NSWindowStyleMaskFullScreen = 1 << 14, }; @interface NSWindow (WineFullScreenExtensions) @@ -64,13 +64,13 @@ static NSUInteger style_mask_for_features(const struct macdrv_window_features* w if (wf->title_bar) { - style_mask = NSTitledWindowMask; - if (wf->close_button) style_mask |= NSClosableWindowMask; - if (wf->minimize_button) style_mask |= NSMiniaturizableWindowMask; - if (wf->resizable || wf->maximize_button) style_mask |= NSResizableWindowMask; - if (wf->utility) style_mask |= NSUtilityWindowMask; + style_mask = NSWindowStyleMaskTitled; + if (wf->close_button) style_mask |= NSWindowStyleMaskClosable; + if (wf->minimize_button) style_mask |= NSWindowStyleMaskMiniaturizable; + if (wf->resizable || wf->maximize_button) style_mask |= NSWindowStyleMaskResizable; + if (wf->utility) style_mask |= NSWindowStyleMaskUtilityWindow; } - else style_mask = NSBorderlessWindowMask; + else style_mask = NSWindowStyleMaskBorderless; return style_mask; } @@ -1058,7 +1058,7 @@ - (void) dealloc - (BOOL) preventResizing { BOOL preventForClipping = cursor_clipping_locks_windows && [[WineApplicationController sharedController] clippingCursor]; - return ([self styleMask] & NSResizableWindowMask) && (disabled || !resizable || preventForClipping); + return ([self styleMask] & NSWindowStyleMaskResizable) && (disabled || !resizable || preventForClipping); } - (BOOL) allowsMovingWithMaximized:(BOOL)inMaximized @@ -1075,11 +1075,11 @@ - (void) adjustFeaturesForState { NSUInteger style = [self styleMask]; - if (style & NSClosableWindowMask) + if (style & NSWindowStyleMaskClosable) [[self standardWindowButton:NSWindowCloseButton] setEnabled:!self.disabled]; - if (style & NSMiniaturizableWindowMask) + if (style & NSWindowStyleMaskMiniaturizable) [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!self.disabled]; - if (style & NSResizableWindowMask) + if (style & NSWindowStyleMaskResizable) [[self standardWindowButton:NSWindowZoomButton] setEnabled:!self.disabled]; if ([self respondsToSelector:@selector(toggleFullScreen:)]) { @@ -1110,7 +1110,7 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior NSUInteger style = [self styleMask]; if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && - style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized && + style & NSWindowStyleMaskResizable && !(style & NSWindowStyleMaskUtilityWindow) && !maximized && !(self.parentWindow || self.latentParentWindow)) { behavior |= NSWindowCollectionBehaviorFullScreenPrimary; @@ -1120,7 +1120,7 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior { behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary; behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; - if (style & NSFullScreenWindowMask) + if (style & NSWindowStyleMaskFullScreen) [super toggleFullScreen:nil]; } } @@ -1134,24 +1134,24 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { - static const NSUInteger usedStyles = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | - NSResizableWindowMask | NSUtilityWindowMask | NSBorderlessWindowMask; + static const NSUInteger usedStyles = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | + NSWindowStyleMaskResizable | NSWindowStyleMaskUtilityWindow | NSWindowStyleMaskBorderless; NSUInteger currentStyle = [self styleMask]; NSUInteger newStyle = style_mask_for_features(wf) | (currentStyle & ~usedStyles); if (newStyle != currentStyle) { NSString* title = [[[self title] copy] autorelease]; - BOOL showingButtons = (currentStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; - BOOL shouldShowButtons = (newStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; - if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSClosableWindowMask)) + BOOL showingButtons = (currentStyle & (NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable)) != 0; + BOOL shouldShowButtons = (newStyle & (NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable)) != 0; + if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSWindowStyleMaskClosable)) { - // -setStyleMask: is buggy on 10.7+ with respect to NSResizableWindowMask. - // If transitioning from NSTitledWindowMask | NSResizableWindowMask to - // just NSTitledWindowMask, the window buttons should disappear rather + // -setStyleMask: is buggy on 10.7+ with respect to NSWindowStyleMaskResizable. + // If transitioning from NSWindowStyleMaskTitled | NSWindowStyleMaskResizable to + // just NSWindowStyleMaskTitled, the window buttons should disappear rather // than just being disabled. But they don't. Similarly in reverse. - // The workaround is to also toggle NSClosableWindowMask at the same time. - [self setStyleMask:newStyle ^ NSClosableWindowMask]; + // The workaround is to also toggle NSWindowStyleMaskClosable at the same time. + [self setStyleMask:newStyle ^ NSWindowStyleMaskClosable]; } [self setStyleMask:newStyle]; @@ -1283,14 +1283,14 @@ - (void) setMacDrvState:(const struct macdrv_window_state*)state { if ([self wouldBeVisible]) { - if ([self styleMask] & NSFullScreenWindowMask) + if ([self styleMask] & NSWindowStyleMaskFullScreen) { [self postDidUnminimizeEvent]; discard &= ~event_mask_for_type(WINDOW_DID_UNMINIMIZE); } else { - [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; + [self setStyleMask:([self styleMask] | NSWindowStyleMaskMiniaturizable)]; [super miniaturize:nil]; discard |= event_mask_for_type(WINDOW_BROUGHT_FORWARD) | event_mask_for_type(WINDOW_GOT_FOCUS) | @@ -1765,7 +1765,7 @@ - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)a if (pendingMinimize) { - [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; + [self setStyleMask:([self styleMask] | NSWindowStyleMaskMiniaturizable)]; [super miniaturize:nil]; pendingMinimize = FALSE; } @@ -1814,7 +1814,7 @@ - (void) doOrderOut [parent grabDockIconSnapshotFromWindow:self force:NO]; [self becameIneligibleParentOrChild]; - if ([self isMiniaturized] || [self styleMask] & NSFullScreenWindowMask) + if ([self isMiniaturized] || [self styleMask] & NSWindowStyleMaskFullScreen) { fakingClose = TRUE; [self close]; @@ -1844,7 +1844,7 @@ - (void) doOrderOut - (void) updateFullscreen { NSRect contentRect = [self contentRectForFrameRect:self.wine_fractionalFrame]; - BOOL nowFullscreen = !([self styleMask] & NSFullScreenWindowMask) && screen_covered_by_rect(contentRect, [NSScreen screens]); + BOOL nowFullscreen = !([self styleMask] & NSWindowStyleMaskFullScreen) && screen_covered_by_rect(contentRect, [NSScreen screens]); if (nowFullscreen != fullscreen) { @@ -2077,7 +2077,7 @@ - (void) postKeyEvent:(NSEvent *)theEvent { [self flagsChanged:theEvent]; [self postKey:[theEvent keyCode] - pressed:[theEvent type] == NSKeyDown + pressed:[theEvent type] == NSEventTypeKeyDown modifiers:adjusted_modifiers_for_settings([theEvent modifierFlags]) event:theEvent]; } @@ -2120,9 +2120,9 @@ - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resi NSUInteger style = self.styleMask; if (isFullscreen) - style |= NSFullScreenWindowMask; + style |= NSWindowStyleMaskFullScreen; else - style &= ~NSFullScreenWindowMask; + style &= ~NSWindowStyleMaskFullScreen; frame = [[self class] contentRectForFrameRect:frame styleMask:style]; [[WineApplicationController sharedController] flipRect:&frame]; @@ -2302,7 +2302,7 @@ - (void) grabDockIconSnapshotFromWindow:(WineWindow*)window force:(BOOL)force CGContextDrawImage(cgcontext, rect, windowImage); [appImage drawInRect:NSMakeRect(156, 4, 96, 96) fromRect:NSZeroRect - operation:NSCompositeSourceOver + operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil]; @@ -2431,13 +2431,13 @@ - (void) sendEvent:(NSEvent*)event interface control. For example, Control-Tab switches focus among views. We want to bypass that feature, so directly route key-down events to -keyDown:. */ - if (type == NSKeyDown) + if (type == NSEventTypeKeyDown) [[self firstResponder] keyDown:event]; else { if (!draggingPhase && maximized && ![self isMovable] && ![self allowsMovingWithMaximized:YES] && [self allowsMovingWithMaximized:NO] && - type == NSLeftMouseDown && (self.styleMask & NSTitledWindowMask)) + type == NSEventTypeLeftMouseDown && (self.styleMask & NSWindowStyleMaskTitled)) { NSRect titleBar = self.frame; NSRect contentRect = [self contentRectForFrameRect:titleBar]; @@ -2480,7 +2480,7 @@ - (void) sendEvent:(NSEvent*)event } } } - else if (draggingPhase && (type == NSLeftMouseDragged || type == NSLeftMouseUp)) + else if (draggingPhase && (type == NSEventTypeLeftMouseDragged || type == NSEventTypeLeftMouseUp)) { if ([self isMovable]) { @@ -2502,7 +2502,7 @@ - (void) sendEvent:(NSEvent*)event [self setFrameTopLeftPoint:newTopLeft]; } - else if (draggingPhase == 1 && type == NSLeftMouseDragged) + else if (draggingPhase == 1 && type == NSEventTypeLeftMouseDragged) { macdrv_event* event; NSRect frame = [self contentRectForFrameRect:self.frame]; @@ -2518,7 +2518,7 @@ - (void) sendEvent:(NSEvent*)event draggingPhase = 2; } - if (type == NSLeftMouseUp) + if (type == NSEventTypeLeftMouseUp) [self endWindowDragging]; } @@ -2919,7 +2919,7 @@ - (void)windowDidResize:(NSNotification *)notification } [self postWindowFrameChanged:frame - fullscreen:([self styleMask] & NSFullScreenWindowMask) != 0 + fullscreen:([self styleMask] & NSWindowStyleMaskFullScreen) != 0 resizing:[self inLiveResize]]; [[[self contentView] inputContext] invalidateCharacterCoordinates]; -- 2.26.2

2 1

[PATCH 6/6] winex11.drv: Remove the old display settings handler interface.
by Zhiyi Zhang 27 Jul '20

27 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 228 ------------------------------------ dlls/winex11.drv/x11drv.h | 16 --- 2 files changed, 244 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 57b7faba8e8..a64d1de6500 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -45,9 +45,6 @@ struct x11drv_display_setting DEVMODEW desired_mode; }; -static struct x11drv_mode_info *dd_modes = NULL; -static unsigned int dd_mode_count = 0; -static unsigned int dd_max_modes = 0; /* All Windows drivers seen so far either support 32 bit depths, or 24 bit depths, but never both. So if we have * a 32 bit framebuffer, report 32 bit bpps, otherwise 24 bit ones. */ @@ -55,90 +52,6 @@ static const unsigned int depths_24[] = {8, 16, 24}; static const unsigned int depths_32[] = {8, 16, 32}; const unsigned int *depths; -/* pointers to functions that actually do the hard stuff */ -static int (*pGetCurrentMode)(void); -static LONG (*pSetCurrentMode)(int mode); -static const char *handler_name; - -/* - * Set the handlers for resolution changing functions - * and initialize the master list of modes - */ -struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, - int (*pNewGCM)(void), - LONG (*pNewSCM)(int), - unsigned int nmodes, - int reserve_depths) -{ - handler_name = name; - pGetCurrentMode = pNewGCM; - pSetCurrentMode = pNewSCM; - TRACE("Resolution settings now handled by: %s\n", name); - if (reserve_depths) - /* leave room for other depths */ - dd_max_modes = (3+1)*(nmodes); - else - dd_max_modes = nmodes; - - if (dd_modes) - { - TRACE("Destroying old display modes array\n"); - HeapFree(GetProcessHeap(), 0, dd_modes); - } - dd_modes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dd_modes) * dd_max_modes); - dd_mode_count = 0; - TRACE("Initialized new display modes array\n"); - return dd_modes; -} - -/* Add one mode to the master list */ -void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) -{ - struct x11drv_mode_info *info = &dd_modes[dd_mode_count]; - DWORD dwBpp = screen_bpp; - if (dd_mode_count >= dd_max_modes) - { - ERR("Maximum modes (%d) exceeded\n", dd_max_modes); - return; - } - if (bpp == 0) bpp = dwBpp; - info->width = width; - info->height = height; - info->refresh_rate = freq; - info->bpp = bpp; - TRACE("initialized mode %d: %dx%dx%d @%d Hz (%s)\n", - dd_mode_count, width, height, bpp, freq, handler_name); - dd_mode_count++; -} - -/* copy all the current modes using the other color depths */ -void X11DRV_Settings_AddDepthModes(void) -{ - int i, j; - int existing_modes = dd_mode_count; - DWORD dwBpp = screen_bpp; - const DWORD *depths = screen_bpp == 32 ? depths_32 : depths_24; - - for (j=0; j<3; j++) - { - if (depths[j] != dwBpp) - { - for (i=0; i < existing_modes; i++) - { - X11DRV_Settings_AddOneMode(dd_modes[i].width, dd_modes[i].height, - depths[j], dd_modes[i].refresh_rate); - } - } - } -} - -/* return the number of modes that are initialized */ -unsigned int X11DRV_Settings_GetModeCount(void) -{ - return dd_mode_count; -} - -/* TODO: Remove the old display settings handler interface once all backends are migrated to the new interface */ static struct x11drv_settings_handler handler; /* Cached display modes for a device, protected by modes_section */ @@ -440,10 +353,6 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo UINT mode_count; ULONG_PTR id; - /* Use the new interface if it is available */ - if (!handler.name) - goto old_interface; - if (n == ENUM_REGISTRY_SETTINGS) { if (!read_registry_settings(name, devmode)) @@ -503,56 +412,6 @@ done: devmode->dmDriverVersion = DM_SPECVERSION; lstrcpyW(devmode->dmDeviceName, dev_name); return TRUE; - -old_interface: - devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); - devmode->dmSpecVersion = DM_SPECVERSION; - devmode->dmDriverVersion = DM_SPECVERSION; - memcpy(devmode->dmDeviceName, dev_name, sizeof(dev_name)); - devmode->dmDriverExtra = 0; - devmode->u2.dmDisplayFlags = 0; - devmode->dmDisplayFrequency = 0; - devmode->u1.s2.dmPosition.x = 0; - devmode->u1.s2.dmPosition.y = 0; - devmode->u1.s2.dmDisplayOrientation = 0; - devmode->u1.s2.dmDisplayFixedOutput = 0; - - if (n == ENUM_CURRENT_SETTINGS) - { - TRACE("mode %d (current) -- getting current mode (%s)\n", n, handler_name); - n = pGetCurrentMode(); - } - if (n == ENUM_REGISTRY_SETTINGS) - { - TRACE("mode %d (registry) -- getting default mode (%s)\n", n, handler_name); - return read_registry_settings(name, devmode); - } - if (n < dd_mode_count) - { - devmode->dmPelsWidth = dd_modes[n].width; - devmode->dmPelsHeight = dd_modes[n].height; - devmode->dmBitsPerPel = dd_modes[n].bpp; - devmode->dmDisplayFrequency = dd_modes[n].refresh_rate; - devmode->dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | - DM_DISPLAYFLAGS; - if (devmode->dmDisplayFrequency) - { - devmode->dmFields |= DM_DISPLAYFREQUENCY; - TRACE("mode %d -- %dx%dx%dbpp @%d Hz (%s)\n", n, - devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, - devmode->dmDisplayFrequency, handler_name); - } - else - { - TRACE("mode %d -- %dx%dx%dbpp (%s)\n", n, - devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, - handler_name); - } - return TRUE; - } - TRACE("mode %d -- not present (%s)\n", n, handler_name); - SetLastError(ERROR_NO_MORE_FILES); - return FALSE; } BOOL is_detached_mode(const DEVMODEW *mode) @@ -939,16 +798,8 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { struct x11drv_display_setting *displays; - WCHAR primary_adapter[CCHDEVICENAME]; - char bpp_buffer[16], freq_buffer[18]; INT display_idx, display_count; - DEVMODEW default_mode; LONG ret; - DWORD i; - - /* Use the new interface if it is available */ - if (!handler.name) - goto old_interface; ret = get_display_settings(&displays, &display_count, devname, devmode); if (ret != DISP_CHANGE_SUCCESSFUL) @@ -994,83 +845,4 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, X11DRV_DisplayDevices_Update(TRUE); heap_free(displays); return ret; - -old_interface: - if (!get_primary_adapter(primary_adapter)) - return DISP_CHANGE_FAILED; - - if (!devname && !devmode) - { - default_mode.dmSize = sizeof(default_mode); - if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) - { - ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); - return DISP_CHANGE_BADMODE; - } - - devname = primary_adapter; - devmode = &default_mode; - } - - if (is_detached_mode(devmode)) - { - FIXME("Detaching adapters is currently unsupported.\n"); - return DISP_CHANGE_SUCCESSFUL; - } - - for (i = 0; i < dd_mode_count; i++) - { - if (devmode->dmFields & DM_BITSPERPEL) - { - if (devmode->dmBitsPerPel != dd_modes[i].bpp) - continue; - } - if (devmode->dmFields & DM_PELSWIDTH) - { - if (devmode->dmPelsWidth != dd_modes[i].width) - continue; - } - if (devmode->dmFields & DM_PELSHEIGHT) - { - if (devmode->dmPelsHeight != dd_modes[i].height) - continue; - } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].refresh_rate != 0) && - devmode->dmDisplayFrequency != 0 && devmode->dmDisplayFrequency != 1) - { - if (devmode->dmDisplayFrequency != dd_modes[i].refresh_rate) - continue; - } - /* we have a valid mode */ - TRACE("Requested display settings match mode %d (%s)\n", i, handler_name); - - if (flags & CDS_UPDATEREGISTRY && !write_registry_settings(devname, devmode)) - { - ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); - return DISP_CHANGE_NOTUPDATED; - } - - if (lstrcmpiW(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter %s settings is currently unsupported.\n", - wine_dbgstr_w(devname)); - return DISP_CHANGE_SUCCESSFUL; - } - - if (!(flags & (CDS_TEST | CDS_NORESET))) - return pSetCurrentMode(i); - - return DISP_CHANGE_SUCCESSFUL; - } - - /* no valid modes found, only print the fields we were trying to matching against */ - bpp_buffer[0] = freq_buffer[0] = 0; - if (devmode->dmFields & DM_BITSPERPEL) - sprintf(bpp_buffer, "bpp=%u ", devmode->dmBitsPerPel); - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (devmode->dmDisplayFrequency != 0)) - sprintf(freq_buffer, "freq=%u ", devmode->dmDisplayFrequency); - ERR("No matching mode found: width=%d height=%d %s%s(%s)\n", - devmode->dmPelsWidth, devmode->dmPelsHeight, bpp_buffer, freq_buffer, handler_name); - - return DISP_CHANGE_BADMODE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e4015891369..375fd1465fd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -649,14 +649,6 @@ extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_work_area( const RECT *monitor_rect ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; -struct x11drv_mode_info -{ - unsigned int width; - unsigned int height; - unsigned int bpp; - unsigned int refresh_rate; -}; - #define DEPTH_COUNT 3 extern const unsigned int *depths DECLSPEC_HIDDEN; @@ -714,15 +706,7 @@ extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL is_detached_mode(const DEVMODEW *) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern BOOL get_primary_adapter(WCHAR *) DECLSPEC_HIDDEN; -extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; -extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; -unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN; void X11DRV_Settings_Init(void) DECLSPEC_HIDDEN; -struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, - int (*pNewGCM)(void), - LONG (*pNewSCM)(int), - unsigned int nmodes, - int reserve_depths) DECLSPEC_HIDDEN; void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH 5/6] winex11.drv: Migrate NoRes display settings handler to a new interface.
by Zhiyi Zhang 27 Jul '20

27 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 93 ++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 7c7d9507187..57b7faba8e8 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -169,30 +169,99 @@ void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handle * Default handlers if resolution switching is not enabled * */ -static int X11DRV_nores_GetCurrentMode(void) +static BOOL nores_get_id(const WCHAR *device_name, ULONG_PTR *id) { - return 0; + WCHAR primary_adapter[CCHDEVICENAME]; + + if (!get_primary_adapter( primary_adapter )) + return FALSE; + + *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + return TRUE; } -static LONG X11DRV_nores_SetCurrentMode(int mode) +static BOOL nores_get_modes(ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count) { - if (mode == 0) return DISP_CHANGE_SUCCESSFUL; - TRACE("Ignoring mode change request mode=%d\n", mode); - return DISP_CHANGE_FAILED; + RECT primary = get_host_primary_monitor_rect(); + DEVMODEW *modes; + + modes = heap_calloc(1, sizeof(*modes)); + if (!modes) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + modes[0].dmSize = sizeof(*modes); + modes[0].dmDriverExtra = 0; + modes[0].dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + modes[0].u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + modes[0].dmBitsPerPel = screen_bpp; + modes[0].dmPelsWidth = primary.right; + modes[0].dmPelsHeight = primary.bottom; + modes[0].u2.dmDisplayFlags = 0; + modes[0].dmDisplayFrequency = 60; + + *new_modes = modes; + *mode_count = 1; + return TRUE; +} + +static void nores_free_modes(DEVMODEW *modes) +{ + heap_free(modes); +} + +static BOOL nores_get_current_mode(ULONG_PTR id, DEVMODEW *mode) +{ + RECT primary = get_host_primary_monitor_rect(); + + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->u2.dmDisplayFlags = 0; + mode->u1.s2.dmPosition.x = 0; + mode->u1.s2.dmPosition.y = 0; + + if (id != 1) + { + FIXME("Non-primary adapters are unsupported.\n"); + mode->dmBitsPerPel = 0; + mode->dmPelsWidth = 0; + mode->dmPelsHeight = 0; + mode->dmDisplayFrequency = 0; + return TRUE; + } + + mode->dmBitsPerPel = screen_bpp; + mode->dmPelsWidth = primary.right; + mode->dmPelsHeight = primary.bottom; + mode->dmDisplayFrequency = 60; + return TRUE; +} + +static LONG nores_set_current_mode(ULONG_PTR id, DEVMODEW *mode) +{ + WARN("NoRes settings handler, ignoring mode change request.\n"); + return DISP_CHANGE_SUCCESSFUL; } /* default handler only gets the current X desktop resolution */ void X11DRV_Settings_Init(void) { - RECT primary = get_host_primary_monitor_rect(); + struct x11drv_settings_handler nores_handler; depths = screen_bpp == 32 ? depths_32 : depths_24; - X11DRV_Settings_SetHandlers("NoRes", - X11DRV_nores_GetCurrentMode, - X11DRV_nores_SetCurrentMode, - 1, 0); - X11DRV_Settings_AddOneMode( primary.right - primary.left, primary.bottom - primary.top, 0, 60); + nores_handler.name = "NoRes"; + nores_handler.priority = 0; + nores_handler.get_id = nores_get_id; + nores_handler.get_modes = nores_get_modes; + nores_handler.free_modes = nores_free_modes; + nores_handler.get_current_mode = nores_get_current_mode; + nores_handler.set_current_mode = nores_set_current_mode; + X11DRV_Settings_SetHandler(&nores_handler); } static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) -- 2.25.1

1 0

[PATCH 4/6] winex11.drv: Migrate XVidMode display settings handler to a new interface.
by Zhiyi Zhang 27 Jul '20

27 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xvidmode.c | 267 +++++++++++++++++++++++------------- 1 file changed, 173 insertions(+), 94 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index a5884543163..c449157f6b3 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -2,6 +2,7 @@ * DirectDraw XVidMode interface * * Copyright 2001 TransGaming Technologies, Inc. + * Copyright 2020 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,10 +22,14 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #include <string.h> #include <stdio.h> #include <math.h> +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #include "x11drv.h" #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H @@ -38,6 +43,7 @@ #include "wingdi.h" #include "wine/debug.h" #include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xvidmode); @@ -52,11 +58,6 @@ static int xf86vm_gammaramp_size; static BOOL xf86vm_use_gammaramp; #endif /* X_XF86VidModeSetGammaRamp */ -static struct x11drv_mode_info *dd_modes; -static unsigned int dd_mode_count; -static XF86VidModeModeInfo** real_xf86vm_modes; -static unsigned int real_xf86vm_mode_count; - #define MAKE_FUNCPTR(f) static typeof(f) * p##f; MAKE_FUNCPTR(XF86VidModeGetAllModeLines) MAKE_FUNCPTR(XF86VidModeGetModeLine) @@ -76,86 +77,182 @@ MAKE_FUNCPTR(XF86VidModeSetGammaRamp) #endif #undef MAKE_FUNCPTR - -static void convert_modeinfo( const XF86VidModeModeInfo *mode) -{ - int rate; - if (mode->htotal!=0 && mode->vtotal!=0) - rate = mode->dotclock * 1000 / (mode->htotal * mode->vtotal); - else - rate = 0; - X11DRV_Settings_AddOneMode(mode->hdisplay, mode->vdisplay, 0, rate); -} - -static void convert_modeline(int dotclock, const XF86VidModeModeLine *mode, - struct x11drv_mode_info *info, unsigned int bpp) -{ - info->width = mode->hdisplay; - info->height = mode->vdisplay; - if (mode->htotal!=0 && mode->vtotal!=0) - info->refresh_rate = dotclock * 1000 / (mode->htotal * mode->vtotal); - else - info->refresh_rate = 0; - TRACE(" width=%d, height=%d, refresh=%d\n", - info->width, info->height, info->refresh_rate); - info->bpp = bpp; -} - static int XVidModeErrorHandler(Display *dpy, XErrorEvent *event, void *arg) { return 1; } -static int X11DRV_XF86VM_GetCurrentMode(void) +/* XF86VidMode display settings handler */ +static BOOL xf86vm_get_id(const WCHAR *device_name, ULONG_PTR *id) { - XF86VidModeModeLine line; - int dotclock; - unsigned int i; - struct x11drv_mode_info cmode; - DWORD dwBpp = screen_bpp; + WCHAR primary_adapter[CCHDEVICENAME]; - TRACE("Querying XVidMode current mode\n"); - pXF86VidModeGetModeLine(gdi_display, DefaultScreen(gdi_display), &dotclock, &line); - convert_modeline(dotclock, &line, &cmode, dwBpp); - for (i=0; i<dd_mode_count; i++) - if (memcmp(&dd_modes[i], &cmode, sizeof(cmode)) == 0) { - TRACE("mode=%d\n", i); - return i; + if (!get_primary_adapter( primary_adapter )) + return FALSE; + + /* XVidMode only supports changing the primary adapter settings. + * For non-primary adapters, an id is still provided but getting + * and changing non-primary adapters' settings will be ignored. */ + *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + return TRUE; +} + +static void add_xf86vm_mode(DEVMODEW *mode, DWORD depth, const XF86VidModeModeInfo *mode_info) +{ + mode->dmSize = sizeof(*mode); + mode->dmDriverExtra = sizeof(mode_info); + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS; + if (mode_info->htotal && mode_info->vtotal) + { + mode->dmFields |= DM_DISPLAYFREQUENCY; + mode->dmDisplayFrequency = mode_info->dotclock * 1000 / (mode_info->htotal * mode_info->vtotal); } - ERR("In unknown mode, returning default\n"); - return 0; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->dmBitsPerPel = depth; + mode->dmPelsWidth = mode_info->hdisplay; + mode->dmPelsHeight = mode_info->vdisplay; + mode->u2.dmDisplayFlags = 0; + memcpy((BYTE *)mode + sizeof(*mode), &mode_info, sizeof(mode_info)); } -static LONG X11DRV_XF86VM_SetCurrentMode(int mode) +static BOOL xf86vm_get_modes(ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count) { - DWORD dwBpp = screen_bpp; - /* only set modes from the original color depth */ - if (dwBpp != dd_modes[mode].bpp) - { - FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].bpp); - } - mode = mode % real_xf86vm_mode_count; + INT xf86vm_mode_idx, xf86vm_mode_count; + XF86VidModeModeInfo **xf86vm_modes; + UINT depth_idx, mode_idx = 0; + DEVMODEW *modes, *mode; + SIZE_T size; + BYTE *ptr; + Bool ret; - TRACE("Resizing X display to %dx%d\n", - real_xf86vm_modes[mode]->hdisplay, real_xf86vm_modes[mode]->vdisplay); - pXF86VidModeSwitchToMode(gdi_display, DefaultScreen(gdi_display), real_xf86vm_modes[mode]); -#if 0 /* it is said that SetViewPort causes problems with some X servers */ - pXF86VidModeSetViewPort(gdi_display, DefaultScreen(gdi_display), 0, 0); -#else - XWarpPointer(gdi_display, None, DefaultRootWindow(gdi_display), 0, 0, 0, 0, 0, 0); -#endif - XSync(gdi_display, False); - X11DRV_DisplayDevices_Update( TRUE ); - return DISP_CHANGE_SUCCESSFUL; + X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); + ret = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &xf86vm_mode_count, &xf86vm_modes); + if (X11DRV_check_error() || !ret || !xf86vm_mode_count) + return FALSE; + + /* Put a XF86VidModeModeInfo ** at the start to store the XF86VidMode modes pointer */ + size = sizeof(XF86VidModeModeInfo **); + /* Display modes in different color depth, with a XF86VidModeModeInfo * at the end of each + * DEVMODEW as driver private data */ + size += (xf86vm_mode_count * DEPTH_COUNT) * (sizeof(DEVMODEW) + sizeof(XF86VidModeModeInfo *)); + ptr = heap_alloc_zero(size); + if (!ptr) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + memcpy(ptr, &xf86vm_modes, sizeof(xf86vm_modes)); + modes = (DEVMODEW *)(ptr + sizeof(xf86vm_modes)); + + for (depth_idx = 0; depth_idx < DEPTH_COUNT; ++depth_idx) + { + for (xf86vm_mode_idx = 0; xf86vm_mode_idx < xf86vm_mode_count; ++xf86vm_mode_idx) + { + mode = (DEVMODEW *)((BYTE *)modes + (sizeof(DEVMODEW) + sizeof(XF86VidModeModeInfo *)) * mode_idx++); + add_xf86vm_mode(mode, depths[depth_idx], xf86vm_modes[xf86vm_mode_idx]); + } + } + + *new_modes = modes; + *mode_count = mode_idx; + return TRUE; } +static void xf86vm_free_modes(DEVMODEW *modes) +{ + XF86VidModeModeInfo **xf86vm_modes; + + if (modes) + { + assert(modes[0].dmDriverExtra == sizeof(XF86VidModeModeInfo *)); + memcpy(&xf86vm_modes, (BYTE *)modes - sizeof(xf86vm_modes), sizeof(xf86vm_modes)); + XFree(xf86vm_modes); + } + heap_free(modes); +} + +static BOOL xf86vm_get_current_mode(ULONG_PTR id, DEVMODEW *mode) +{ + XF86VidModeModeLine xf86vm_mode; + INT dotclock; + Bool ret; + + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->u2.dmDisplayFlags = 0; + mode->u1.s2.dmPosition.x = 0; + mode->u1.s2.dmPosition.y = 0; + + if (id != 1) + { + FIXME("Non-primary adapters are unsupported.\n"); + mode->dmBitsPerPel = 0; + mode->dmPelsWidth = 0; + mode->dmPelsHeight = 0; + mode->dmDisplayFrequency = 0; + return TRUE; + } + + X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); + ret = pXF86VidModeGetModeLine(gdi_display, DefaultScreen(gdi_display), &dotclock, &xf86vm_mode); + if (X11DRV_check_error() || !ret) + return FALSE; + + mode->dmBitsPerPel = screen_bpp; + mode->dmPelsWidth = xf86vm_mode.hdisplay; + mode->dmPelsHeight = xf86vm_mode.vdisplay; + if (xf86vm_mode.htotal && xf86vm_mode.vtotal) + mode->dmDisplayFrequency = dotclock * 1000 / (xf86vm_mode.htotal * xf86vm_mode.vtotal); + else + mode->dmDisplayFrequency = 0; + + if (xf86vm_mode.privsize) + XFree(xf86vm_mode.private); + return TRUE; +} + +static LONG xf86vm_set_current_mode(ULONG_PTR id, DEVMODEW *mode) +{ + XF86VidModeModeInfo *xf86vm_mode; + Bool ret; + + if (id != 1) + { + FIXME("Non-primary adapters are unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + + if (is_detached_mode(mode)) + { + FIXME("Detaching adapters is unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + + if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp) + WARN("Cannot change screen bit depth from %dbits to %dbits!\n", screen_bpp, mode->dmBitsPerPel); + + assert(mode->dmDriverExtra == sizeof(XF86VidModeModeInfo *)); + memcpy(&xf86vm_mode, (BYTE *)mode + sizeof(*mode), sizeof(xf86vm_mode)); + X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); + ret = pXF86VidModeSwitchToMode(gdi_display, DefaultScreen(gdi_display), xf86vm_mode); + if (X11DRV_check_error() || !ret) + return DISP_CHANGE_FAILED; +#if 0 /* it is said that SetViewPort causes problems with some X servers */ + pXF86VidModeSetViewPort(gdi_display, DefaultScreen(gdi_display), 0, 0); +#else + XWarpPointer(gdi_display, None, DefaultRootWindow(gdi_display), 0, 0, 0, 0, 0, 0); +#endif + XFlush(gdi_display); + return DISP_CHANGE_SUCCESSFUL; +} void X11DRV_XF86VM_Init(void) { + struct x11drv_settings_handler xf86vm_handler; void *xvidmode_handle; Bool ok; - int nmodes; - unsigned int i; if (xf86vm_major) return; /* already initialized? */ @@ -207,35 +304,17 @@ void X11DRV_XF86VM_Init(void) } #endif /* X_XF86VidModeSetGammaRamp */ - /* retrieve modes */ - if (usexvidmode && !is_virtual_desktop()) - { - X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); - ok = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes); - if (X11DRV_check_error() || !ok) return; - } - else return; /* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */ + if (!usexvidmode) + return; - TRACE("XVidMode modes: count=%d\n", nmodes); - - real_xf86vm_mode_count = nmodes; - - dd_modes = X11DRV_Settings_SetHandlers("XF86VidMode", - X11DRV_XF86VM_GetCurrentMode, - X11DRV_XF86VM_SetCurrentMode, - nmodes, 1); - - /* convert modes to x11drv_mode_info format */ - for (i=0; i<real_xf86vm_mode_count; i++) - { - convert_modeinfo(real_xf86vm_modes[i]); - } - /* add modes for different color depths */ - X11DRV_Settings_AddDepthModes(); - dd_mode_count = X11DRV_Settings_GetModeCount(); - - TRACE("Available DD modes: count=%d\n", dd_mode_count); - TRACE("Enabling XVidMode\n"); + xf86vm_handler.name = "XF86VidMode"; + xf86vm_handler.priority = 100; + xf86vm_handler.get_id = xf86vm_get_id; + xf86vm_handler.get_modes = xf86vm_get_modes; + xf86vm_handler.free_modes = xf86vm_free_modes; + xf86vm_handler.get_current_mode = xf86vm_get_current_mode; + xf86vm_handler.set_current_mode = xf86vm_set_current_mode; + X11DRV_Settings_SetHandler(&xf86vm_handler); return; sym_not_found: -- 2.25.1

1 0

[PATCH 3/6] winex11.drv: Migrate XRandR 1.0 display settings handler to a new interface.
by Zhiyi Zhang 27 Jul '20

27 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 304 +++++++++++++++++++++----------------- 1 file changed, 168 insertions(+), 136 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 67fd2851825..155bd85d811 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -83,11 +83,6 @@ MAKE_FUNCPTR(XRRFreeProviderInfo) #undef MAKE_FUNCPTR -static struct x11drv_mode_info *dd_modes; -static SizeID *xrandr10_modes; -static unsigned int xrandr_mode_count; -static int xrandr_current_mode = -1; - static int load_xrandr(void) { int r = 0; @@ -144,157 +139,187 @@ static int XRandRErrorHandler(Display *dpy, XErrorEvent *event, void *arg) return 1; } -static int xrandr10_get_current_mode(void) +/* XRandR 1.0 display settings handler */ +static BOOL xrandr10_get_id( const WCHAR *device_name, ULONG_PTR *id ) { - SizeID size; - Rotation rot; - XRRScreenConfiguration *sc; - short rate; - unsigned int i; - int res = -1; + WCHAR primary_adapter[CCHDEVICENAME]; - if (xrandr_current_mode != -1) - return xrandr_current_mode; + if (!get_primary_adapter( primary_adapter )) + return FALSE; - sc = pXRRGetScreenInfo (gdi_display, DefaultRootWindow( gdi_display )); - size = pXRRConfigCurrentConfiguration (sc, &rot); - rate = pXRRConfigCurrentRate (sc); - pXRRFreeScreenConfigInfo(sc); - - for (i = 0; i < xrandr_mode_count; ++i) - { - if (xrandr10_modes[i] == size && dd_modes[i].refresh_rate == rate) - { - res = i; - break; - } - } - if (res == -1) - { - ERR("In unknown mode, returning default\n"); - return 0; - } - - xrandr_current_mode = res; - return res; + /* RandR 1.0 only supports changing the primary adapter settings. + * For non-primary adapters, an id is still provided but getting + * and changing non-primary adapters' settings will be ignored. */ + *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + return TRUE; } -static LONG xrandr10_set_current_mode( int mode ) +static void add_xrandr10_mode( DEVMODEW *mode, DWORD depth, DWORD width, DWORD height, + DWORD frequency, SizeID size_id ) { - SizeID size; - Rotation rot; - Window root; - XRRScreenConfiguration *sc; - Status stat; + mode->dmSize = sizeof(*mode); + mode->dmDriverExtra = sizeof(SizeID); + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | + DM_PELSHEIGHT | DM_DISPLAYFLAGS; + if (frequency) + { + mode->dmFields |= DM_DISPLAYFREQUENCY; + mode->dmDisplayFrequency = frequency; + } + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->dmBitsPerPel = depth; + mode->dmPelsWidth = width; + mode->dmPelsHeight = height; + mode->u2.dmDisplayFlags = 0; + memcpy( (BYTE *)mode + sizeof(*mode), &size_id, sizeof(size_id) ); +} + +static BOOL xrandr10_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *new_mode_count ) +{ + INT size_idx, depth_idx, rate_idx, mode_idx = 0; + INT size_count, rate_count, mode_count = 0; + DEVMODEW *modes, *mode; + XRRScreenSize *sizes; + short *rates; + + sizes = pXRRSizes( gdi_display, DefaultScreen( gdi_display ), &size_count ); + if (size_count <= 0) + return FALSE; + + for (size_idx = 0; size_idx < size_count; ++size_idx) + { + rates = pXRRRates( gdi_display, DefaultScreen( gdi_display ), size_idx, &rate_count ); + if (rate_count) + mode_count += rate_count; + else + ++mode_count; + } + + /* Allocate space for reported modes in three depths, and put an SizeID at the end of DEVMODEW as + * driver private data */ + modes = heap_calloc( mode_count * DEPTH_COUNT, sizeof(*modes) + sizeof(SizeID) ); + if (!modes) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + for (size_idx = 0; size_idx < size_count; ++size_idx) + { + for (depth_idx = 0; depth_idx < DEPTH_COUNT; ++depth_idx) + { + rates = pXRRRates( gdi_display, DefaultScreen( gdi_display ), size_idx, &rate_count ); + if (!rate_count) + { + mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*mode) + sizeof(SizeID)) * mode_idx++); + add_xrandr10_mode( mode, depths[depth_idx], sizes[size_idx].width, + sizes[size_idx].height, 0, size_idx ); + continue; + } + + for (rate_idx = 0; rate_idx < rate_count; ++rate_idx) + { + mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*mode) + sizeof(SizeID)) * mode_idx++); + add_xrandr10_mode( mode, depths[depth_idx], sizes[size_idx].width, + sizes[size_idx].height, rates[rate_idx], size_idx ); + } + } + } + + *new_modes = modes; + *new_mode_count = mode_idx; + return TRUE; +} + +static void xrandr10_free_modes( DEVMODEW *modes ) +{ + heap_free( modes ); +} + +static BOOL xrandr10_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) +{ + XRRScreenConfiguration *screen_config; + XRRScreenSize *sizes; + Rotation rotation; + SizeID size_id; + INT size_count; short rate; - root = DefaultRootWindow( gdi_display ); - sc = pXRRGetScreenInfo (gdi_display, root); - pXRRConfigCurrentConfiguration (sc, &rot); - mode = mode % xrandr_mode_count; + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->u2.dmDisplayFlags = 0; + mode->u1.s2.dmPosition.x = 0; + mode->u1.s2.dmPosition.y = 0; - TRACE("Changing Resolution to %dx%d @%d Hz\n", - dd_modes[mode].width, - dd_modes[mode].height, - dd_modes[mode].refresh_rate); - - size = xrandr10_modes[mode]; - rate = dd_modes[mode].refresh_rate; - - if (rate) - stat = pXRRSetScreenConfigAndRate( gdi_display, sc, root, size, rot, rate, CurrentTime ); - else - stat = pXRRSetScreenConfig( gdi_display, sc, root, size, rot, CurrentTime ); - - pXRRFreeScreenConfigInfo(sc); - - if (stat == RRSetConfigSuccess) + if (id != 1) { - xrandr_current_mode = mode; - X11DRV_DisplayDevices_Update( TRUE ); + FIXME("Non-primary adapters are unsupported.\n"); + mode->dmBitsPerPel = 0; + mode->dmPelsWidth = 0; + mode->dmPelsHeight = 0; + mode->dmDisplayFrequency = 0; + return TRUE; + } + + sizes = pXRRSizes( gdi_display, DefaultScreen( gdi_display ), &size_count ); + if (size_count <= 0) + return FALSE; + + screen_config = pXRRGetScreenInfo( gdi_display, DefaultRootWindow( gdi_display ) ); + size_id = pXRRConfigCurrentConfiguration( screen_config, &rotation ); + rate = pXRRConfigCurrentRate( screen_config ); + pXRRFreeScreenConfigInfo( screen_config ); + + mode->dmBitsPerPel = screen_bpp; + mode->dmPelsWidth = sizes[size_id].width; + mode->dmPelsHeight = sizes[size_id].height; + mode->dmDisplayFrequency = rate; + return TRUE; +} + +static LONG xrandr10_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) +{ + XRRScreenConfiguration *screen_config; + Rotation rotation; + SizeID size_id; + Window root; + Status stat; + + if (id != 1) + { + FIXME("Non-primary adapters are unsupported.\n"); return DISP_CHANGE_SUCCESSFUL; } - ERR("Resolution change not successful -- perhaps display has changed?\n"); - return DISP_CHANGE_FAILED; -} - -static void xrandr10_init_modes(void) -{ - XRRScreenSize *sizes; - int sizes_count; - int i, j, nmodes = 0; - - sizes = pXRRSizes( gdi_display, DefaultScreen(gdi_display), &sizes_count ); - if (sizes_count <= 0) return; - - TRACE("XRandR: found %d sizes.\n", sizes_count); - for (i = 0; i < sizes_count; ++i) + if (is_detached_mode(mode)) { - int rates_count; - short *rates; - - rates = pXRRRates( gdi_display, DefaultScreen(gdi_display), i, &rates_count ); - TRACE("- at %d: %dx%d (%d rates):", i, sizes[i].width, sizes[i].height, rates_count); - if (rates_count) - { - nmodes += rates_count; - for (j = 0; j < rates_count; ++j) - { - if (j > 0) - TRACE(","); - TRACE(" %d", rates[j]); - } - } - else - { - ++nmodes; - TRACE(" <default>"); - } - TRACE(" Hz\n"); + FIXME("Detaching adapters is unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; } - TRACE("XRandR modes: count=%d\n", nmodes); + if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp) + WARN("Cannot change screen bit depth from %dbits to %dbits!\n", screen_bpp, mode->dmBitsPerPel); - if (!(xrandr10_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr10_modes) * nmodes ))) - { - ERR("Failed to allocate xrandr mode info array.\n"); - return; - } + root = DefaultRootWindow( gdi_display ); + screen_config = pXRRGetScreenInfo( gdi_display, root ); + pXRRConfigCurrentConfiguration( screen_config, &rotation ); - dd_modes = X11DRV_Settings_SetHandlers( "XRandR 1.0", - xrandr10_get_current_mode, - xrandr10_set_current_mode, - nmodes, 1 ); + assert( mode->dmDriverExtra == sizeof(SizeID) ); + memcpy( &size_id, (BYTE *)mode + sizeof(*mode), sizeof(size_id) ); - xrandr_mode_count = 0; - for (i = 0; i < sizes_count; ++i) - { - int rates_count; - short *rates; + if (mode->dmFields & DM_DISPLAYFREQUENCY && mode->dmDisplayFrequency) + stat = pXRRSetScreenConfigAndRate( gdi_display, screen_config, root, size_id, rotation, + mode->dmDisplayFrequency, CurrentTime ); + else + stat = pXRRSetScreenConfig( gdi_display, screen_config, root, size_id, rotation, CurrentTime ); + pXRRFreeScreenConfigInfo( screen_config ); - rates = pXRRRates( gdi_display, DefaultScreen(gdi_display), i, &rates_count ); + if (stat != RRSetConfigSuccess) + return DISP_CHANGE_FAILED; - if (rates_count) - { - for (j = 0; j < rates_count; ++j) - { - X11DRV_Settings_AddOneMode( sizes[i].width, sizes[i].height, 0, rates[j] ); - xrandr10_modes[xrandr_mode_count++] = i; - } - } - else - { - X11DRV_Settings_AddOneMode( sizes[i].width, sizes[i].height, 0, 0 ); - xrandr10_modes[xrandr_mode_count++] = i; - } - } - - X11DRV_Settings_AddDepthModes(); - nmodes = X11DRV_Settings_GetModeCount(); - - TRACE("Available DD modes: count=%d\n", nmodes); - TRACE("Enabling XRandR\n"); + XFlush( gdi_display ); + return DISP_CHANGE_SUCCESSFUL; } #ifdef HAVE_XRRGETPROVIDERRESOURCES @@ -1432,7 +1457,14 @@ void X11DRV_XRandR_Init(void) TRACE("Found XRandR %d.%d.\n", major, minor); - xrandr10_init_modes(); + settings_handler.name = "XRandR 1.0"; + settings_handler.priority = 200; + settings_handler.get_id = xrandr10_get_id; + settings_handler.get_modes = xrandr10_get_modes; + settings_handler.free_modes = xrandr10_free_modes; + settings_handler.get_current_mode = xrandr10_get_current_mode; + settings_handler.set_current_mode = xrandr10_set_current_mode; + X11DRV_Settings_SetHandler( &settings_handler ); #ifdef HAVE_XRRGETPROVIDERRESOURCES if (ret >= 4 && (major > 1 || (major == 1 && minor >= 4))) -- 2.25.1

1 0

[PATCH] include: Add IShellLinkDual interface.
by Myah Caron 27 Jul '20

27 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This is a first step towards fixing #49591. include/shldisp.idl | 76 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/include/shldisp.idl b/include/shldisp.idl index 19f2d73ed0..9032b94ea0 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -738,6 +738,82 @@ coclass ShellFolderView [default, source] dispinterface DShellFolderViewEvents; } +/***************************************************************************** + * IShellLinkDual interface + */ +[ + uuid (88a05c00-f000-11ce-8350-444553540000), + oleautomation, + dual, + hidden + ] +interface IShellLinkDual : IDispatch { + [propget] + HRESULT Path ([out, retval] BSTR *pbs); + + [propput] + HRESULT Path ([in] BSTR bs); + + [propget] + HRESULT Description ([out, retval] BSTR *pbs); + + [propput] + HRESULT Description ([in] BSTR bs); + + [propget] + HRESULT WorkingDirectory ([out, retval] BSTR *pbs); + + [propput] + HRESULT WorkingDirectory ([in] BSTR bs); + + [propget] + HRESULT Arguments ([out, retval] BSTR *pbs); + + [propput] + HRESULT Arguments ([in] BSTR bs); + + [propget] + HRESULT Hotkey ([out, retval] int *piHK); + + [propput] + HRESULT Hotkey ([in] int iHK); + + [propget] + HRESULT ShowCommand ([out, retval] int *piShowCommand); + + [propput] + HRESULT ShowCommand ([in] int iShowCommand); + + HRESULT Resolve ([in] int fFlags); + + HRESULT GetIconLocation ([out] BSTR *pbs, + [out, retval] int *piIcon); + + HRESULT SetIconLocation ([in] BSTR bs, + [in] int iIcon); + + HRESULT Save ([in, optional] VARIANT vWhere); +} + +[ + uuid (317ee249-f12e-11d2-b1e4-00c04f8eeb3e), + oleautomation, + dual, + hidden +] +interface IShellLinkDual2 : IShellLinkDual { + [propget] + HRESULT Target ([out, retval] FolderItem **ppfi); +} + +[ + uuid (11219420-1768-11d1-95be-00609797ea4f), + noncreatable +] +coclass ShellLinkObject { + [default] interface IShellLinkDual2; +} + } /* library Shell32 */ /***************************************************************************** -- 2.27.0

1 0

[PATCH] ws2_32/tests: Allow ESP and AH protocols to be missing on Windows
by Alex Henrie 27 Jul '20

27 Jul '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This fixes failures on one of the testbot's XP machines and one of the testbot's 2003 machines. --- dlls/ws2_32/tests/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index de5fe36d45..d6e454a5fb 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -214,8 +214,8 @@ static const struct protocol protocols[] = { 41, { "ipv6", "IPv6" }, TRUE}, { 43, { "ipv6-route", "IPv6-Route" }, TRUE}, { 44, { "ipv6-frag", "IPv6-Frag" }, TRUE}, - { 50, { "esp", "ESP" }}, - { 51, { "ah", "AH" }}, + { 50, { "esp", "ESP" }, TRUE}, + { 51, { "ah", "AH" }, TRUE}, { 58, { "ipv6-icmp", "IPv6-ICMP" }, TRUE}, { 59, { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE}, { 60, { "ipv6-opts", "IPv6-Opts" }, TRUE}, -- 2.27.0

1 0

[PATCH] ws2_32: Correct returned error code for an invalid socket.
by Alistair Leslie-Hughes 27 Jul '20

27 Jul '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 20 +++----------------- dlls/ws2_32/tests/sock.c | 7 ++----- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 12126372d5..a25a2cf738 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1119,8 +1119,8 @@ static DWORD NtStatusToWSAError( DWORD status ) { case STATUS_SUCCESS: return 0; case STATUS_PENDING: return WSA_IO_PENDING; + case STATUS_INVALID_HANDLE: case STATUS_OBJECT_TYPE_MISMATCH: return WSAENOTSOCK; - case STATUS_INVALID_HANDLE: return WSAEBADF; case STATUS_INVALID_PARAMETER: return WSAEINVAL; case STATUS_PIPE_DISCONNECTED: return WSAESHUTDOWN; case STATUS_NETWORK_BUSY: return WSAEALREADY; @@ -2890,18 +2890,12 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW fd = get_sock_fd( listener, FILE_READ_DATA, NULL ); if (fd == -1) - { - SetLastError(WSAENOTSOCK); return FALSE; - } release_sock_fd( listener, fd ); fd = get_sock_fd( acceptor, FILE_READ_DATA, NULL ); if (fd == -1) - { - SetLastError(WSAENOTSOCK); return FALSE; - } release_sock_fd( acceptor, fd ); wsa = (struct ws2_accept_async *)alloc_async_io( sizeof(*wsa), WS2_async_accept ); @@ -3148,10 +3142,8 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD fd = get_sock_fd( s, FILE_WRITE_DATA, NULL ); if (fd == -1) - { - WSASetLastError( WSAENOTSOCK ); return FALSE; - } + if (getpeername( fd, &uaddr.addr, &uaddrlen ) != 0) { release_sock_fd( s, fd ); @@ -3497,8 +3489,6 @@ int WINAPI WS_closesocket(SOCKET s) if (CloseHandle(SOCKET2HANDLE(s))) res = 0; } - else - SetLastError(WSAENOTSOCK); } else SetLastError(WSANOTINITIALISED); @@ -3610,10 +3600,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n fd = get_sock_fd( s, FILE_READ_DATA, NULL ); if (fd == -1) - { - SetLastError( WSAENOTSOCK ); return FALSE; - } TRACE("socket %04lx, ptr %p %s, length %d, sendptr %p, len %d, ov %p\n", s, name, debugstr_sockaddr(name), namelen, sendBuf, sendBufLen, ov); @@ -5207,8 +5194,7 @@ int WINAPI WS_listen(SOCKET s, int backlog) SetLastError(wsaErrno()); release_sock_fd( s, fd ); } - else - SetLastError(WSAENOTSOCK); + return ret; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d9ceca98cc..b7a3fc4453 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1565,7 +1565,6 @@ todo_wine size = sizeof(i); i = 1234; err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); -todo_wine ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAENOTSOCK), "got %d with %d (expected SOCKET_ERROR with WSAENOTSOCK)\n", err, WSAGetLastError()); @@ -3850,8 +3849,7 @@ static void test_select(void) SetLastError(0xdeadbeef); ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); -todo_wine - ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + ok(GetLastError() == WSAENOTSOCK, "got %d\n", GetLastError()); /* descriptor sets are unchanged */ ok(readfds.fd_count == 2, "expected 2, got %d\n", readfds.fd_count); ok(exceptfds.fd_count == 2, "expected 2, got %d\n", exceptfds.fd_count); @@ -3878,8 +3876,7 @@ todo_wine ret = select(0, NULL, NULL, &exceptfds, &select_timeout); todo_wine ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); -todo_wine - ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + ok(GetLastError() == WSAENOTSOCK, "got %d\n", GetLastError()); WaitForSingleObject (thread_handle, 1000); closesocket(fdRead); -- 2.27.0

2 1

[PATCH 7/7] kernel32/tests: Add more console output tests.
by Jacek Caban 26 Jul '20

26 Jul '20

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

3 2

wine-5.0.2-rc1 Available
by Michael Stefaniuc 26 Jul '20

26 Jul '20

Hello guys, I have pushed wine-5.0.2-rc1 (782cbd5ecf0bf917d9726cb3a761a01c7fbb41b8) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ Pretty boring release. So without further ado What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 5.0.2 (total 47): 8439 Multiple Microsoft product installers fail due missing shell app path expansion (Visual Studio .NET 2002, 2003, Visual Foxpro 9.0) 19239 Multiple applications crash with division by zero on edit control with zero line height (eBay Turbo Lister, Clarin TX control wrapper) 29806 Hype The Time Quest: DirectX Media (DXM) v6.0 runtime installer fails (advpack.ExecuteCab should extract the INF from CAB before running the install part) 30814 Age of Empires II scrolling gets stuck after Alt-Tab away and back 31890 Multiple applications need IAudioEndpointVolume::GetMasterVolumeLevelScalar method implementation (Cisco IP Communicator, Cairo Shell v0.3.x) 39534 Bad Mojo Redux crashes on start (ddraw1_vtbl and ddraw_surface1_vtbl need to be writable) 41559 (winecfg) Add ability to change windows version via command line 43638 Multiple 4k demoscene OpenGL demos crash on startup with 'No active WGL context found' (Yermom, 'End of time' by Alcatraz and Altair) 45839 Qt 5.8 SDK installer needs 'IFileSystem.MoveFile' method implementation for maintenance tool creation step 46949 DDraw games using older windowed mode wrappers such as DirectX Windower Embedded v2.3/D3D Windower v1.x crash (ddraw_palette_vtbl and ddraw_surface{1,2,3,4,7}_vtbl need to be writable) 47621 Command link buttons in task dialog are displayed in wrong style 47794 Rockstar Games Launcher installer button images do not display 47999 Gif pictures stored in PE files are not loaded into HTML web pages via Res protocol 48186 every wine process shows a definite leak in dlls/ntdll/env.c 48471 Mismatching behavior of GetEnvironmentVariableW for empty / long values 48490 Restored minimized windows have wrong height 48495 XCP-ng Center v8.x (.NET 4.6 app) can't connect to server with self-signed certificate 48593 Multiple games play only one frame of video (Fable: The Lost Chapters, Audiosurf, Dark Souls 2, Oddworld: Munch's Oddysee) 48611 Cairo Shell v0.3.x (.NET 4.7 app) crashes due to missing 'HKCU\\Software\\Microsoft\\Windows NT\\CurrentVersion\\WinLogon\\Shell' registry sub-key 48683 iTunes v12.10.4.2 crashes on unimplemented function wmvcore.dll.WMIsContentProtected when adding folders to directory scan 48731 Just Cause crashes while loading level with builtin d3dx9_26 48732 How to Survive crashes on start (fullscreen mode) 48738 cmd.exe crashes when running certain batch files 48739 ConEmu (Windows console emulator) v19.10.12 fails to set Wininet's INTERNET_OPTION_IGNORE_OFFLINE and shows error dialog at startup 48740 ConEmu is constantly loosing focus 48747 ConEmu flickers and scrolls randomly 48750 Few missing DirectSound3D Algorithms GUID Defs 48762 IExplore immediately crashes on www.msnbc.com with a failed assertion 48801 Multiple games crash on unimplemented function d3dx11_43.dll.D3DX11GetImageInfoFromFile (Assetto Corsa 1.14.x, Project Cars) 48803 FITietokanta crashes every time after ADD-button is pressed 48806 Panzer Corps 2 needs msvcp140.dll.?_XLgamma@std@@YANN@Z 48814 Microsoft Word 6.0 for Windows installer crashes after wine-4.8-247-g0d7d0427d0 48816 The explorer doesn't support '/cd' option 48832 Magic The Gathering Online: client does not start due to long file names since 2020-03-25 update 48844 Magical Scramble Demo 1.20P shows white boxes instead of pictures. 48932 Wine does not display any windows unless `xrandr --auto` has been run 48960 NtQueryDirectoryFile incorrectly returns STATUS_NO_MORE_FILES when it encounters an ignored entry 48974 Multiple MSI-based installers show 'newBinaryXX' text instead of bitmap on button controls (missing support for 'msidbControlAttributesBitmap') 49005 Listview header occasionally fails to redraw when list is scrolled vertically 49034 Enlarge list width in font selection dialog 49115 Hitman (2016) and Hitman 2 (2018) fail to launch in DX11 mode 49142 Horizontal mouse scroll events (X11 buttons 6 and 7) should not be translated to back/forward events 49146 Hearts of Iron IV needs api-ms-win-crt-private-l1-1-0.dll._o_sin 49173 widl generates invalid code for Gecko's ISimpleDOM.idl 49175 Duplicated checking canonicalized inside kernelbase/path.c 49198 Denuvo Anti-Cheat 'denuvo-anti-cheat.sys' crashes in entry point (incorrect page protection restored during relocation processing) 49203 Possible incorrect usage >= instead <= in shlview.c ---------------------------------------------------------------- Changes since 5.0.1: Akihiro Sagawa (2): ddraw/tests: Add more managed texture tests. ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps. Alex Henrie (2): mmdevapi: Report 100% volume in GetMasterVolumeLevelScalar stub. wine.inf: Add Winlogon keys. Alexandre Julliard (5): user.exe: Clear out the thunk array to catch invalid winprocs. ntdll: Don't abort directory search in single entry mode when a file is ignored. urlmon/tests: Update winehq.org's IP address. secur32/tests: Update for new WineHQ certificate. wininet/tests: Update for new WineHQ certificate. Alistair Leslie-Hughes (4): winmm: Use CreateFileA instead of OpenFile. d3dx9: Add support for D3DFMT_P8 in DDS files. ddraw: Make palette and remaining surface vtbls writable. shell32: Correct if condition. Andrew Eikum (1): winebus.sys: Don't return too early if SDL initialization succeeds. Andrey Gusev (1): d3dx11: Add D3DX11GetImageInfoFromFileA/W stub. Bernhard Übelacker (1): cmd: Fix crash in if condition parsing. Brendan Shanks (3): dinput: Fix crash in dump_DIEFFECT() when rglDirection is unexpectedly NULL. dinput: Fix crash in dump_DIEFFECT() when lpvTypeSpecificParams is unexpectedly NULL. vulkan-1: Set FILEVERSION to fix official Vulkan loader installer. Damjan Jovanovic (5): shell32/tests: Test shlexec argv[0], and same-named executables in a different directory. shell32: Simplify SHELL_execute(). shell32: Pass the executable's full path from SHELL_execute() to CreateProcess(). mshtml: Fix handling res protocol resource type ids without leading '#'. mshtml: Support implicit RT_FILE resource type in res protocol. Dmitry Timoshkov (4): server: All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value. ntdll: Don't try to map the PE file past the size of the backing file. kernel32: On process entry store PEB address in %ebx. kernel32/tests: Add a PE test image that resembles format of some of 8k demos. Emilio Cobos Álvarez (1): widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too. Gabriel Ivăncescu (3): quartz: Clear the WS_CHILD style instead of unparenting the window. winex11.drv: Use a helper to retrieve the decoration rect for managed windows. winex11.drv: Fix X11DRV_X_to_window_rect to handle windows smaller than the decoration. Gijs Vermeulen (2): advpack: Extract inf file before installing in ExecuteCab(). ucrtbase: Add more _o forwards. Hans Leidekker (1): msi: Add support for bitmap buttons. Ilia Mirkin (1): crypt32: Also check CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG. Jacek Caban (2): scrrun: Add MoveFile implementation. widl: Use DECLSPEC_ALIGN in MSVC compatible way. Jeff Smith (3): mshtml/tests: Add tests showing how toString has changed in IE9+. jscript: Set return object's class to 'object' in Object.create. msvcrt: Stop forwarding iswctype functions to ntdll. Markus Engel (1): user32: Force undefined bits in GetKeyState() and GetKeyboardState() to zero. Martin Storsjo (2): ntdll: Properly return errors when failing to unwind. ntdll: Pass a nonnull handler_data when continuing after a collided unwind on arm64. Mas Ahmad Muhammad (1): comdlg32: Enlarge list area in CHOOSE_FONT window. Michael Müller (2): opengl32: Treat invalid pixel types as PFD_TYPE_RGBA in wglChoosePixelFormat. ddraw: Make ddraw1_vtbl and ddraw_surface1_vtbl writable. Murray Colpman (1): winex11.drv: Interpret mouse 6/7 as horiz scroll. Nikolay Sivov (3): comctl32/button: Use duplicated image for drawing. comctl32/listview: Only apply horizontal offset when setting header position. dxgi: Translate DXGI_USAGE_UNORDERED_ACCESS to corresponding wined3d bind flag. Owen Rudge (2): winecfg: Add support for '/v' parameter allowing Windows version to be changed. winecfg: Return 0 on success when setting Windows version. Paul Gofman (1): d3d11: Use stricmp() instead of _strnicmp(..., -1). Piotr Caban (1): msvcp90: Add std:_XLgamma implementation. Roman Pišl (5): wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE. user32/edit: Avoid division by zero during initialization. wineconsole: Don't activate window when computing positions. wineconsole: Don't allow recurrent resizing while grabbing changes. comctl32/edit: Avoid division by zero during initialization. Rémi Bernon (1): winex11.drv: Remove frame when non-client area is empty. Sven Baars (6): ntdll: Fix a string leak in init_user_process_params (Valgrind). setupapi: Fix a memory leak (Valgrind). kernelbase: Fix a string leak in CreateProcessInternal (Valgrind). ntdll: Fix a memory leak in fork_and_exec. setupapi: Only copy driver info if SetupDiEnumDriverInfoW succeeded (Valgrind). setupapi: Make sure the class name is always set on success in SetupDiGetINFClassW (Valgrind). Vijay Kiran Kamuju (2): wmvcore: Add semi-stub implementation for WMIsContentProtected. include: Add missing GUIDs in dsound.h. Vladimir Panteleev (4): kernel32/tests: Fix GetLastError() checks in environment tests. kernelbase: Preserve last error when GetEnvironmentVariableA succeeds. kernelbase: Don't return ERROR_INSUFFICIENT_BUFFER from GetEnvironmentVariableW. kernelbase: Fix GetEnvironmentVariableW return for empty variables. Zebediah Figura (5): winegstreamer: Also use GST_QOS_TYPE_OVERFLOW for samples that arrive on time. winegstreamer: Clamp both timestamp and timestamp + diff to 0. ntoskrnl.exe: Protect relocated pages one at a time. ntoskrnl.exe: Protect the two relocated pages independently. ntdll: Avoid leaking the previous environment in RtlSetCurrentEnvironment(). Zhipeng Zhao (1): explorer: Support '/cd,' command line option. Zhiyi Zhang (5): winex11.drv: Ignore disconnected outputs when finding mirroring slaves. comctl32/tests: Test button styles. comctl32/button: Do not set BS_PUSHBUTTON and BS_DEFPUSHBUTTON style directly to Split Buttons and Command Links. kernelbase: Check NULL canonicalized_len parameter in UrlCanonicalizeW(). setupapi: Fix a registry key handle leak. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH v3 3/3] amstream: Implement IMediaStreamFilter::GetStopPosition.
by Myah Caron 26 Jul '20

26 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/filter.c | 24 +++++- dlls/amstream/tests/amstream.c | 150 ++++++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index ef23edfae3..6d1b107df5 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -800,9 +800,29 @@ static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - FIXME("iface %p, stop %p, stub!\n", iface, stop); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, stop %p\n", iface, stop); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetStopPosition(seeking, stop); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b0f1d42242..06b70d50e2 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -812,6 +812,7 @@ struct testfilter LONGLONG current_position; LONGLONG stop_position; HRESULT get_duration_hr; + HRESULT get_stop_position_hr; HRESULT set_positions_hr; HRESULT init_stream_hr; HRESULT cleanup_stream_hr; @@ -995,8 +996,12 @@ static HRESULT WINAPI testsource_seeking_GetDuration(IMediaSeeking *iface, LONGL static HRESULT WINAPI testsource_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IMediaSeeking(iface); + + if (SUCCEEDED(filter->get_stop_position_hr)) + *stop = 0x8000000000000000ULL; + + return filter->get_stop_position_hr; } static HRESULT WINAPI testsource_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) @@ -5225,6 +5230,146 @@ static void test_mediastreamfilter_get_duration(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_stop_position(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + IMediaStreamFilter *filter; + struct testfilter source1; + struct testfilter source2; + struct testfilter source3; + IAMMediaStream *stream1; + IAMMediaStream *stream2; + IAMMediaStream *stream3; + LONGLONG stop_position; + IMediaSeeking *seeking; + IGraphBuilder *graph; + IPin *pin1; + IPin *pin2; + IPin *pin3; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + 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"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stop_position == 0x8000000000000000ULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.get_stop_position_hr = E_FAIL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.get_stop_position_hr = E_NOTIMPL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5467,6 +5612,7 @@ START_TEST(amstream) test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); test_mediastreamfilter_get_duration(); + test_mediastreamfilter_get_stop_position(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); -- 2.27.0

1 0

[PATCH v3 1/3] amstream: Implement IMediaStreamFilter::GetDuration.
by Myah Caron 26 Jul '20

26 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/filter.c | 24 +++++- dlls/amstream/tests/amstream.c | 141 +++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0a06e78180..ef23edfae3 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -773,9 +773,29 @@ static HRESULT WINAPI filter_seeking_SetTimeFormat(IMediaSeeking *iface, const G static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration) { - FIXME("iface %p, duration %p, stub!\n", iface, duration); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, duration %p\n", iface, duration); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetDuration(seeking, duration); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 8adf9db934..48953684f9 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5007,6 +5007,146 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_duration(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + IMediaStreamFilter *filter; + struct testfilter source1; + struct testfilter source2; + struct testfilter source3; + IAMMediaStream *stream1; + IAMMediaStream *stream2; + IAMMediaStream *stream3; + LONGLONG duration; + IMediaSeeking *seeking; + IGraphBuilder *graph; + IPin *pin1; + IPin *pin2; + IPin *pin3; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + 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"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_FAIL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_NOTIMPL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5247,6 +5387,7 @@ START_TEST(amstream) test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); + test_mediastreamfilter_get_duration(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); -- 2.27.0

1 0

[PATCH v2 3/3] amstream: Implement IMediaStreamFilter::GetStopPosition.
by Myah Caron 25 Jul '20

25 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/filter.c | 24 +++++- dlls/amstream/tests/amstream.c | 150 ++++++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index ef23edfae3..6d1b107df5 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -800,9 +800,29 @@ static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - FIXME("iface %p, stop %p, stub!\n", iface, stop); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, stop %p\n", iface, stop); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetStopPosition(seeking, stop); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 70fc4f02d0..cc24d31e83 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -793,6 +793,7 @@ struct testfilter LONGLONG current_position; LONGLONG stop_position; HRESULT get_duration_hr; + HRESULT get_stop_position_hr; HRESULT set_positions_hr; HRESULT init_stream_hr; HRESULT cleanup_stream_hr; @@ -976,8 +977,12 @@ static HRESULT WINAPI testsource_seeking_GetDuration(IMediaSeeking *iface, LONGL static HRESULT WINAPI testsource_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IMediaSeeking(iface); + + if (SUCCEEDED(filter->get_stop_position_hr)) + *stop = 0x8000000000000000ULL; + + return filter->get_stop_position_hr; } static HRESULT WINAPI testsource_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) @@ -5206,6 +5211,146 @@ static void test_mediastreamfilter_get_duration(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_stop_position(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + IMediaStreamFilter *filter; + struct testfilter source1; + struct testfilter source2; + struct testfilter source3; + IAMMediaStream *stream1; + IAMMediaStream *stream2; + IAMMediaStream *stream3; + LONGLONG stop_position; + IMediaSeeking *seeking; + IGraphBuilder *graph; + IPin *pin1; + IPin *pin2; + IPin *pin3; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + 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"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stop_position == 0x8000000000000000ULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.get_stop_position_hr = E_FAIL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.get_stop_position_hr = E_NOTIMPL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop_position); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(stop_position)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5448,6 +5593,7 @@ START_TEST(amstream) test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); test_mediastreamfilter_get_duration(); + test_mediastreamfilter_get_stop_position(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); -- 2.27.0

2 1

[PATCH v2 2/3] amstream: Implement IAMMultiMediaStream::GetDuration.
by Myah Caron 25 Jul '20

25 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: Add test case, return E_NOINTERFACE if This->media_seeking is missing (as uncovered by test case). --- dlls/amstream/multimedia.c | 7 ++-- dlls/amstream/tests/amstream.c | 60 ++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 200bd5c4a5..8f978b72ff 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -177,9 +177,12 @@ static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration); + TRACE("(%p/%p)->(%p)\n", This, iface, pDuration); - return E_NOTIMPL; + if (!This->media_seeking) + return E_NOINTERFACE; + + return IMediaSeeking_GetDuration(This->media_seeking, pDuration); } static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 48953684f9..70fc4f02d0 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -335,6 +335,65 @@ static void test_openfile(const WCHAR *test_avi_path) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mmstream_get_duration(const WCHAR *test_avi_path) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + LONGLONG duration; + HRESULT hr; + ULONG ref; + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); + ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 0xf4240ULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(duration == 0, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(duration == 0, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_renderfile(const WCHAR *test_avi_path) { IAMMultiMediaStream *pams; @@ -5351,6 +5410,7 @@ START_TEST(amstream) test_avi_path = load_resource(L"test.avi"); test_openfile(test_avi_path); + test_mmstream_get_duration(test_avi_path); test_renderfile(test_avi_path); unload_resource(test_avi_path); -- 2.27.0

2 1

[PATCH v2 1/3] amstream: Implement IMediaStreamFilter::GetDuration.
by Myah Caron 25 Jul '20

25 Jul '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: Created a separate test function following Zebediah's feedback. The function is copied from test_mediastreamfilter_set_positions, with simple replacements for GetDuration. dlls/amstream/filter.c | 24 +++++- dlls/amstream/tests/amstream.c | 141 +++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0a06e78180..ef23edfae3 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -773,9 +773,29 @@ static HRESULT WINAPI filter_seeking_SetTimeFormat(IMediaSeeking *iface, const G static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration) { - FIXME("iface %p, duration %p, stub!\n", iface, duration); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, duration %p\n", iface, duration); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetDuration(seeking, duration); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 8adf9db934..48953684f9 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5007,6 +5007,146 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_duration(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + IMediaStreamFilter *filter; + struct testfilter source1; + struct testfilter source2; + struct testfilter source3; + IAMMediaStream *stream1; + IAMMediaStream *stream2; + IAMMediaStream *stream3; + LONGLONG duration; + IMediaSeeking *seeking; + IGraphBuilder *graph; + IPin *pin1; + IPin *pin2; + IPin *pin3; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + 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"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_FAIL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_NOTIMPL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5247,6 +5387,7 @@ START_TEST(amstream) test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); + test_mediastreamfilter_get_duration(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); -- 2.27.0

1 0

[PATCH] kernel32/tests: Relax a timing test.
by Zebediah Figura 25 Jul '20

25 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/mailslot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index da595e97143..9da960fba81 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -324,7 +324,7 @@ todo_wine ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); dwTimeout = GetTickCount() - dwTimeout; - ok( dwTimeout >= 990, "timeout too short %u\n", dwTimeout ); + ok( dwTimeout >= 900, "timeout too short %u\n", dwTimeout ); ok( CloseHandle( hSlot ), "closing the mailslot\n"); return 0; -- 2.27.0

1 0

[PATCH 1/5] dsdmo: Add a stub waves reverb effect.
by Zebediah Figura 25 Jul '20

25 Jul '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsdmo/Makefile.in | 4 + dlls/dsdmo/dsdmo.idl | 27 +++ dlls/dsdmo/main.c | 429 +++++++++++++++++++++++++++++++++++++-- dlls/dsdmo/tests/dsdmo.c | 42 ++-- 4 files changed, 462 insertions(+), 40 deletions(-) create mode 100644 dlls/dsdmo/dsdmo.idl diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index 99816ae0c08..3787415abd6 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,6 +1,10 @@ MODULE = dsdmo.dll +IMPORTS = dmoguids uuid EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +IDL_SRCS = \ + dsdmo.idl diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl new file mode 100644 index 00000000000..a967186af3f --- /dev/null +++ b/dlls/dsdmo/dsdmo.idl @@ -0,0 +1,27 @@ +/* + * Copyright 2020 Zebediah Figura + * + * 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 + */ + +#pragma makedep register + +[ + threading(both), + progid("Microsoft.DirectSoundWavesReverbDMO.1"), + vi_progid("Microsoft.DirectSoundWavesReverbDMO"), + uuid(87fc0268-9a55-4360-95aa-004a1d9de26c) +] +coclass DirectSoundWavesReverbDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 788381b7a45..44915ca8566 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -15,9 +15,13 @@ * 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 "ole2.h" +#define COBJMACROS +#include "dmo.h" +#include "mmreg.h" +#include "mmsystem.h" +#include "initguid.h" +#include "dsound.h" #include "rpcproxy.h" #include "wine/debug.h" @@ -26,19 +30,318 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsdmo); static HINSTANCE dsdmo_instance; -/****************************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +struct effect +{ + IMediaObject IMediaObject_iface; + IUnknown IUnknown_inner; + IUnknown *outer_unk; + LONG refcount; + + const struct effect_ops *ops; +}; + +struct effect_ops +{ + void *(*query_interface)(struct effect *effect, REFIID iid); + void (*destroy)(struct effect *effect); +}; + +static struct effect *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IUnknown_inner); +} + +static HRESULT WINAPI effect_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IUnknown(iface); + + TRACE("effect %p, iid %s, out %p.\n", effect, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown)) + *out = iface; + else if (IsEqualGUID(iid, &IID_IMediaObject)) + *out = &effect->IMediaObject_iface; + else if (!(*out = effect->ops->query_interface(effect, iid))) + { + WARN("%s not implemented; returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI effect_inner_AddRef(IUnknown *iface) +{ + struct effect *effect = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&effect->refcount); + + TRACE("%p increasing refcount to %u.\n", effect, refcount); + return refcount; +} + +static ULONG WINAPI effect_inner_Release(IUnknown *iface) { - TRACE("(%p %d %p)\n", inst, reason, reserved); + struct effect *effect = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&effect->refcount); + + TRACE("%p decreasing refcount to %u.\n", effect, refcount); + + if (!refcount) + { + effect->ops->destroy(effect); + } + return refcount; +} + +static const IUnknownVtbl effect_inner_vtbl = +{ + effect_inner_QueryInterface, + effect_inner_AddRef, + effect_inner_Release, +}; + +static struct effect *impl_from_IMediaObject(IMediaObject *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IMediaObject_iface); +} + +static HRESULT WINAPI effect_QueryInterface(IMediaObject *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IMediaObject(iface); + return IUnknown_QueryInterface(effect->outer_unk, iid, out); +} + +static ULONG WINAPI effect_AddRef(IMediaObject *iface) +{ + struct effect *effect = impl_from_IMediaObject(iface); + return IUnknown_AddRef(effect->outer_unk); +} + +static ULONG WINAPI effect_Release(IMediaObject *iface) +{ + struct effect *effect = impl_from_IMediaObject(iface); + return IUnknown_Release(effect->outer_unk); +} + +static HRESULT WINAPI effect_GetStreamCount(IMediaObject *iface, DWORD *input, DWORD *output) +{ + FIXME("iface %p, input %p, output %p, stub!\n", iface, input, output); + return E_NOTIMPL; +} +static HRESULT WINAPI effect_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) +{ + FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) +{ + FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) +{ + FIXME("iface %p, index %u, type %p, flags %#x, stub!\n", iface, index, type, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) +{ + FIXME("iface %p, index %u, type %p, flags %#x, stub!\n", iface, index, type, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) +{ + FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputSizeInfo(IMediaObject *iface, DWORD index, + DWORD *size, DWORD *lookahead, DWORD *alignment) +{ + FIXME("iface %p, index %u, size %p, lookahead %p, alignment %p, stub!\n", iface, index, size, lookahead, alignment); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment) +{ + FIXME("iface %p, index %u, size %p, alignment %p, stub!\n", iface, index, size, alignment); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) +{ + FIXME("iface %p, index %u, latency %p, stub!\n", iface, index, latency); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) +{ + FIXME("iface %p, index %u, latency %s, stub!\n", iface, index, wine_dbgstr_longlong(latency)); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_Flush(IMediaObject *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_Discontinuity(IMediaObject *iface, DWORD index) +{ + FIXME("iface %p, index %u, stub!\n", iface, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_AllocateStreamingResources(IMediaObject *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_FreeStreamingResources(IMediaObject *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) +{ + FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_ProcessInput(IMediaObject *iface, DWORD index, + IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength) +{ + FIXME("iface %p, index %u, buffer %p, flags %#x, timestamp %s, timelength %s, stub!\n", + iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_ProcessOutput(IMediaObject *iface, DWORD flags, + DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) +{ + FIXME("iface %p, flags %#x, count %u, buffers %p, status %p, stub!\n", iface, flags, count, buffers, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_Lock(IMediaObject *iface, LONG lock) +{ + FIXME("iface %p, lock %d, stub!\n", iface, lock); + return E_NOTIMPL; +} + +static const IMediaObjectVtbl effect_vtbl = +{ + effect_QueryInterface, + effect_AddRef, + effect_Release, + effect_GetStreamCount, + effect_GetInputStreamInfo, + effect_GetOutputStreamInfo, + effect_GetInputType, + effect_GetOutputType, + effect_SetInputType, + effect_SetOutputType, + effect_GetInputCurrentType, + effect_GetOutputCurrentType, + effect_GetInputSizeInfo, + effect_GetOutputSizeInfo, + effect_GetInputMaxLatency, + effect_SetInputMaxLatency, + effect_Flush, + effect_Discontinuity, + effect_AllocateStreamingResources, + effect_FreeStreamingResources, + effect_GetInputStatus, + effect_ProcessInput, + effect_ProcessOutput, + effect_Lock, +}; + +static void effect_init(struct effect *effect, IUnknown *outer, const struct effect_ops *ops) +{ + effect->outer_unk = outer ? outer : &effect->IUnknown_inner; + effect->refcount = 1; + effect->IUnknown_inner.lpVtbl = &effect_inner_vtbl; + effect->IMediaObject_iface.lpVtbl = &effect_vtbl; + + effect->ops = ops; +} + +struct waves_reverb +{ + struct effect effect; +}; + +static struct waves_reverb *impl_waves_reverb_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct waves_reverb, effect); +} + +static void *waves_reverb_query_interface(struct effect *iface, REFIID iid) +{ + return NULL; +} + +static void waves_reverb_destroy(struct effect *iface) +{ + struct waves_reverb *effect = impl_waves_reverb_from_effect(iface); + + free(effect); +} + +static const struct effect_ops waves_reverb_ops = +{ + .destroy = waves_reverb_destroy, + .query_interface = waves_reverb_query_interface, +}; + +static HRESULT waves_reverb_create(IUnknown *outer, IUnknown **out) +{ + struct waves_reverb *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &waves_reverb_ops); + + TRACE("Created waves reverb effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ switch(reason) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - dsdmo_instance = inst; + dsdmo_instance = instance; DisableThreadLibraryCalls(dsdmo_instance); break; } @@ -46,35 +349,117 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) return TRUE; } -/*********************************************************************** - * DllGetClassObject - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +struct class_factory { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + IClassFactory IClassFactory_iface; + HRESULT (*create_instance)(IUnknown *outer, IUnknown **out); +}; + +static struct class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, + IUnknown *outer, REFIID iid, void **out) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + IUnknown *unk; + HRESULT hr; + + TRACE("iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid(iid), out); + + *out = NULL; + + if (outer && !IsEqualGUID(iid, &IID_IUnknown)) + return E_NOINTERFACE; + + if (SUCCEEDED(hr = factory->create_instance(outer, &unk))) + { + hr = IUnknown_QueryInterface(unk, iid, out); + IUnknown_Release(unk); + } + return hr; +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock) +{ + FIXME("lock %d, stub!\n", lock); + return S_OK; +} + +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, +}; + +static struct +{ + const GUID *clsid; + struct class_factory factory; +} +class_factories[] = +{ + {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) +{ + unsigned int i; + + TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); + + for (i = 0; i < ARRAY_SIZE(class_factories); ++i) + { + if (IsEqualGUID(clsid, class_factories[i].clsid)) + return IClassFactory_QueryInterface(&class_factories[i].factory.IClassFactory_iface, iid, out); + } + + FIXME("%s not available, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow - */ HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; } -/*********************************************************************** - * DllRegisterServer - */ HRESULT WINAPI DllRegisterServer(void) { TRACE("()\n"); return __wine_register_resources(dsdmo_instance); } -/*********************************************************************** - * DllUnregisterServer - */ HRESULT WINAPI DllUnregisterServer(void) { TRACE("()\n"); diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index b8f0932790b..f236c95d43c 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -80,9 +80,7 @@ static void test_aggregation(const GUID *clsid) dmo = (IMediaObject *)0xdeadbeef; hr = CoCreateInstance(clsid, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - if (hr != E_NOINTERFACE) - return; + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!dmo, "Got interface %p.\n", dmo); hr = CoCreateInstance(clsid, &test_outer, CLSCTX_INPROC_SERVER, @@ -138,9 +136,7 @@ static void test_interfaces(const GUID *clsid, const GUID *iid) ULONG ref; hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, iid, (void **)&unk); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - return; + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IUnknown_QueryInterface(unk, &IID_IMediaObject, (void **)&unk2); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -204,9 +200,7 @@ static void test_media_types(const GUID *clsid) }; hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - return; + ok(hr == S_OK, "Got hr %#x.\n", hr); build_pcm_format(&wfx, WAVE_FORMAT_PCM, 16, 44100, 2); @@ -508,18 +502,19 @@ START_TEST(dsdmo) { const GUID *clsid; const GUID *iid; + BOOL todo; } tests[] = { - {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus}, - {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor}, - {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion}, - {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, - {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger}, - {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle}, - {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb}, - {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq}, - {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb}, + {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus, TRUE}, + {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor, TRUE}, + {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion, TRUE}, + {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho, TRUE}, + {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE}, + {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, + {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb, TRUE}, + {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq, TRUE}, + {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb, TRUE}, }; unsigned int i; @@ -527,6 +522,17 @@ START_TEST(dsdmo) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(tests[i].clsid, NULL, CLSCTX_INPROC_SERVER, tests[i].iid, (void **)&unk); + todo_wine_if(tests[i].todo) ok(hr == S_OK, "Failed to create %s, hr %#x.\n", + debugstr_guid(tests[i].clsid), hr); + if (hr == S_OK) + IUnknown_Release(unk); + else + continue; + test_aggregation(tests[i].clsid); test_interfaces(tests[i].clsid, tests[i].iid); test_media_types(tests[i].clsid); -- 2.27.0

2 7

[PATCH 1/4] wine.inf: Move the Drivers32 section to the registry.
by Zebediah Figura 25 Jul '20

25 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- The changes to msacm32 and msvfw32 need to be done in lockstep, to avoid reporting duplicate entries or omitting entries. dlls/msacm32/internal.c | 15 +-------------- dlls/msvfw32/msvideo_main.c | 19 ------------------- loader/wine.inf.in | 22 +++++++++------------- 3 files changed, 10 insertions(+), 46 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 9c4d1a75f3b..0ff3fea2af3 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -352,15 +352,13 @@ void MSACM_RegisterAllDrivers(void) { static const WCHAR msacm32[] = {'m','s','a','c','m','3','2','.','d','l','l','\0'}; static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; - static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'}; - static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'}; static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'D','r','i','v','e','r','s','3','2','\0'}; DWORD i, cnt, bufLen, lRet, type; - WCHAR buf[2048], valname[64], *name, *s; + WCHAR buf[2048], valname[64], *name; FILETIME lastWrite; HKEY hKey; @@ -392,17 +390,6 @@ void MSACM_RegisterAllDrivers(void) RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) - { - for(s = buf; *s; s += lstrlenW(s) + 1) - { - if (wcsnicmp(s, msacmW, ARRAY_SIZE(msacmW))) continue; - if (!(name = wcschr(s, '='))) continue; - *name = 0; - MSACM_RegisterDriver(s, name + 1, 0); - *name = '='; - } - } MSACM_ReorderDriversByPriority(); MSACM_RegisterDriver(msacm32, msacm32, 0); } diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index e3a3300e5a1..905be6e5afb 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -308,25 +308,6 @@ BOOL VFWAPI ICInfo(DWORD type, DWORD handler, ICINFO *info) RegCloseKey(key); } - if (GetPrivateProfileSectionA("drivers32", buf, sizeof(buf), "system.ini")) - { - char *s; - for (s = buf; *s; s += strlen(s) + 1) - { - if (s[4] != '.' || s[9] != '=') continue; - ret_type = mmioStringToFOURCCA(s, 0); - ret_handler = mmioStringToFOURCCA(s + 5, 0); - if (type && compare_fourcc(type, ret_type)) continue; - if (compare_fourcc(handler, ret_handler) && handler != count++) continue; - - info->fccType = ret_type; - info->fccHandler = ret_handler; - MultiByteToWideChar(CP_ACP, 0, s + 10, -1, info->szDriver, ARRAY_SIZE(info->szDriver)); - TRACE("Returning codec %s, driver %s.\n", debugstr_an(s, 9), debugstr_a(s + 10)); - return TRUE; - } - } - LIST_FOR_EACH_ENTRY(driver, &reg_driver_list, struct reg_driver, entry) { if (type && compare_fourcc(type, driver->fccType)) continue; diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 35992a01dfd..6f66f285569 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -556,7 +556,14 @@ HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" HKLM,%CurrentVersionNT%\Console,,16 -HKLM,%CurrentVersionNT%\Drivers32,,16 +HKLM,%CurrentVersionNT%\Drivers32,"msacm.imaadpcm",,"imaadp32.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.l3acm",,"l3codeca.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.msadpcm",,"msadp32.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.msg711",,"msg711.acm" +HKLM,%CurrentVersionNT%\Drivers32,"msacm.msgsm610",,"msgsm32.acm" +HKLM,%CurrentVersionNT%\Drivers32,"vidc.cvid",,"iccvid.dll" +HKLM,%CurrentVersionNT%\Drivers32,"vidc.mrle",,"msrle32.dll" +HKLM,%CurrentVersionNT%\Drivers32,"vidc.msvc",,"msvidc32.dll" HKLM,%CurrentVersionNT%\FontDpi,,16 HKLM,%CurrentVersionNT%\FontLink,,16 HKLM,%CurrentVersionNT%\FontMapper,,16 @@ -565,6 +572,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 +HKLM,%CurrentVersionNT%\IniFileMapping\system.ini,"drivers32",,"SYS:Microsoft\Windows NT\CurrentVersion\Drivers32" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions" @@ -2734,18 +2742,6 @@ system.ini, mci,,"vcr=mcivisca.drv" system.ini, mci,,"; videodisc=mcipionr.drv" system.ini, mci,,"waveaudio=mciwave.dll" -system.ini, drivers32,,"msacm.imaadpcm=imaadp32.acm" -system.ini, drivers32,,"msacm.msadpcm=msadp32.acm" -system.ini, drivers32,,"msacm.msg711=msg711.acm" -system.ini, drivers32,,"msacm.l3acm=l3codeca.acm" -system.ini, drivers32,,"msacm.msgsm610=msgsm32.acm" -system.ini, drivers32,,"vidc.mrle=msrle32.dll" -system.ini, drivers32,,"vidc.msvc=msvidc32.dll" -system.ini, drivers32,,"vidc.cvid=iccvid.dll" -system.ini, drivers32,,"; vidc.IV50=ir50_32.dll" -system.ini, drivers32,,"; vidc.IV31=ir32_32.dll" -system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" - [Timezones] ; The timezone information (TZI field) comes from the Olson timezone database ; http://www.twinsun.com/tz/tz-link.htm -- 2.27.0

2 7

[PATCH 03/10] xactengine3_7: Implement IXACT3SoundBank Interface.
by Vijay Kiran Kamuju 24 Jul '20

24 Jul '20

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

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel