- wine-devel - winehq.org

[PATCH] wineboot: Add network adapter information to the registry.
by Haoyang Chen 19 Jul '21

19 Jul '21

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- loader/wine.inf.in | 7 ++ programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 119 ++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 49e4f45da27..1f9e964d060 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -41,6 +41,7 @@ AddReg=\ Fonts,\ MCI,\ Misc,\ + Network,\ Nls,\ OLE,\ Printing,\ @@ -65,6 +66,7 @@ AddReg=\ Fonts,\ MCI,\ Misc,\ + Network,\ Nls,\ OLE,\ Printing,\ @@ -92,6 +94,7 @@ AddReg=\ Fonts,\ MCI,\ Misc,\ + Network,\ Nls,\ OLE,\ Printing,\ @@ -119,6 +122,7 @@ AddReg=\ Fonts,\ MCI,\ Misc,\ + Network,\ Nls,\ OLE,\ Printing,\ @@ -764,6 +768,9 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http" HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https" +[Network] +HKLM,System\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318} + [Nls] HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,"l_intl.nls" HKLM,System\CurrentControlSet\Control\Nls\Language,"0402",,"l_intl.nls" diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 0a1f5e4152f..5cb778f65cc 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,6 +1,6 @@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 ws2_32 kernelbase +IMPORTS = uuid advapi32 ws2_32 kernelbase oleaut32 ole32 DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev EXTRADLLFLAGS = -mno-cygwin diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 92276fcbe76..1d3a43fedff 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -79,6 +79,8 @@ #include <setupapi.h> #include <newdev.h> #include "resource.h" +#include "initguid.h" +#include <wbemcli.h> WINE_DEFAULT_DEBUG_CHANNEL(wineboot); @@ -1586,6 +1588,122 @@ done: return ret; } +static HRESULT query_property(IWbemClassObject *obj, const WCHAR *prop, WCHAR *buf, DWORD bufLen ) +{ + CIMTYPE type = 0xdeadbeef; + VARIANT val; + HRESULT hr = S_OK; + + if (!buf || !bufLen) return WBEM_E_INVALID_QUERY; + + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, prop, 0, &val, &type, NULL ); + if (hr != S_OK) return hr; + + if (V_VT(&val) == VT_BSTR) + wcscpy(buf,V_BSTR(&val)); + else + hr = WBEM_E_INVALID_QUERY_TYPE; + VariantClear( &val ); + return hr; +} + +static void insert_adapter(HKEY hkey, IWbemClassObject *obj) +{ + WCHAR value[MAX_PATH]; + WCHAR connection[MAX_PATH]; + HKEY subhkey; + LSTATUS status; + static int index = 0; + + if (S_OK != query_property( obj, L"GUID", value, ARRAYSIZE(value))) + return; + + swprintf( connection, ARRAYSIZE(connection), L"%s\\Connection", value); + + if ((status = RegCreateKeyExW( hkey, connection, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &subhkey, NULL ))) + return; + set_reg_value_dword(subhkey, L"DefaultNameIndex", index++); + set_reg_value_dword(subhkey, L"DefaultNameResourceId", 0x709); /* FIXME */ + + if (S_OK == query_property( obj, L"Name", value, ARRAYSIZE(value))) + set_reg_value(subhkey, L"Name", value); + if (S_OK == query_property( obj, L"PNPDeviceID", value, ARRAYSIZE(value))) + set_reg_value(subhkey, L"PnpInstanceID", value); + RegCloseKey( subhkey ); +} + +static void update_networkAdapter(void) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter" ); + IEnumWbemClassObject *result = NULL; + IWbemClassObject *obj = NULL; + HRESULT hr = S_OK; + DWORD count = 0; + BSTR path = SysAllocString( L"ROOT\\CIMV2" ); + IWbemLocator *locator = NULL; + IWbemServices *services = NULL; + HKEY key; + + CoInitialize( NULL ); + + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}", &key )) + { + WINE_WARN("can't open network adapter registry.\n"); + goto done; + } + + CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, + RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL ); + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, + (void **)&locator ); + if (hr != S_OK) + { + WINE_TRACE("can't create instance of WbemLocator\n"); + goto done; + } + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + if (hr != S_OK) + { + WINE_TRACE( "failed to get IWbemServices interface %08x\n", hr ); + goto done; + } + + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + if (hr != S_OK) + { + WINE_TRACE( "failed to set proxyBlanket %08x\n", hr ); + goto done; + } + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + WINE_TRACE( "failed to exec query %08x\n", hr ); + goto done; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + insert_adapter(key, obj); + + IWbemClassObject_Release( obj ); + } + +done: + if (result) IEnumWbemClassObject_Release( result ); + if (query) SysFreeString( query ); + if (wql) SysFreeString( wql ); + if (path) SysFreeString( path ); + if (services) IWbemServices_Release( services ); + if (locator) IWbemLocator_Release( locator ); + RegCloseKey( key ); + CoUninitialize(); +} + static void usage( int status ) { WINE_MESSAGE( "Usage: wineboot [options]\n" ); @@ -1713,6 +1831,7 @@ int __cdecl main( int argc, char *argv[] ) if (init || update) update_wineprefix( update ); create_volatile_environment_registry_key(); + update_networkAdapter(); ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE ); -- 2.20.1

2 2

[PATCH] gdi32: Fix a typo in unix_face_create().
by Jactry Zeng 19 Jul '21

19 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51382 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> This also fixes test failures in test_lang_names() when on Japanese system. --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 490e4c501aa..ee14bd25119 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1245,7 +1245,7 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->style_name = decode_opentype_name( &style_name.face_name ); memset( &full_name, 0, sizeof(full_name) ); - style_name.primary_langid = primary_langid; + full_name.primary_langid = primary_langid; opentype_enum_full_names( tt_name_v0, search_face_name_callback, &full_name ); This->full_name = decode_opentype_name( &full_name.face_name ); -- 2.30.2

2 1

[PATCH 11/15] gdi32: Introduce DC_ATTR struct and use it to store current position.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 24 +++++++++++++++++++----- dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/enhmfdrv/graphics.c | 8 ++++---- dlls/gdi32/font.c | 2 +- dlls/gdi32/ntgdi_private.h | 2 +- dlls/gdi32/painting.c | 30 +++++++++++++++--------------- dlls/gdi32/path.c | 2 +- include/ntgdi.h | 10 ++++++++++ 8 files changed, 53 insertions(+), 29 deletions(-)

2 1

[PATCH v2 10/15] gdi32: Handle metafiles directly in Arc implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed a typo spotted by Saulius. dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 5 +++++ dlls/gdi32/mfdrv/graphics.c | 20 +++++++++++++++----- dlls/gdi32/mfdrv/init.c | 4 ++-- dlls/gdi32/mfdrv/metafiledrv.h | 4 ++-- dlls/gdi32/tests/metafile.c | 3 +++ 6 files changed, 29 insertions(+), 9 deletions(-)

2 1

[PATCH 09/15] gdi32: Handle metafiles directly in Chord and Pie implementations.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/mfdrv/graphics.c | 20 ++++++++++---------- dlls/gdi32/mfdrv/init.c | 15 +++++++++++++-- dlls/gdi32/mfdrv/metafiledrv.h | 7 +++---- 5 files changed, 38 insertions(+), 16 deletions(-)

2 1

[PATCH v2 08/15] gdi32: Handle metafiles directly in MoveToEx implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed tests, spotted by Nikolay. dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/tests/metafile.c | 12 ++++-------- 6 files changed, 11 insertions(+), 13 deletions(-)

2 1

[PATCH 07/15] gdi32: Handle metafiles directly in LineTo implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Metafiles are handled entirely in user space on Windows, so we can't use driver interface for them, which will ultimately live kernel/unix part. On Windows, they don't even have a proper DC associated with them, which is easily observed by very different behaviour from other DC types in a number of functions. We even have some todo_wine tests for that. dlls/gdi32/gdi_private.h | 8 ++++++++ dlls/gdi32/gdidc.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 18 +++++++++++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 4 +++- include/ntgdi.h | 3 +++ 6 files changed, 36 insertions(+), 5 deletions(-)

2 1

[PATCH 06/15] gdi32: Use NtGdiArcInternal for Pie implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/painting.c | 28 ++++++---------------------- 2 files changed, 19 insertions(+), 22 deletions(-)

2 1

[PATCH 05/15] gdi32: Use NtGdiArcInternal for Chord implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/painting.c | 28 ++++++---------------------- 2 files changed, 19 insertions(+), 22 deletions(-)

2 1

[PATCH 04/15] gdi32: Use NtGdiArcInternal for ArcTo implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 13 +++++++++ dlls/gdi32/painting.c | 61 ++++++++++++++++--------------------------- 2 files changed, 36 insertions(+), 38 deletions(-)

2 1

[PATCH 03/15] gdi32: Use NtGdiArcInternal for Arc implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/painting.c | 27 +++++++++++++++++---------- include/ntgdi.h | 8 ++++++++ 3 files changed, 37 insertions(+), 10 deletions(-)

2 1

[PATCH 02/15] gdi32: Introduce NtGdiMoveTo.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/painting.c | 6 ++---- 2 files changed, 11 insertions(+), 4 deletions(-)

2 1

[PATCH 01/15] gdi32: Introduce NtGdiLineTo.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The new file is meant to DC-related stuff that will stay in gdi32. We may rename it to dc.c once the existing one is moved. dlls/gdi32/Makefile.in | 1 + dlls/gdi32/gdi_private.h | 6 ++++++ dlls/gdi32/gdidc.c | 35 +++++++++++++++++++++++++++++++++++ dlls/gdi32/objects.c | 6 +----- dlls/gdi32/painting.c | 6 ++---- 5 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 dlls/gdi32/gdidc.c

2 1

[PATCH] user32/tests: Remove the todo_wine from a test that succeeds in Wine.
by Francois Gouget 19 Jul '21

19 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- At least it does succeed in Wine on the TestBot VMs and the cw-gtx560 and cw-rx460 machines. Maybe it fails on some other machines? It even succeeds on my box (KDE) though not always and sometimes the following 'ShowWindow(SW_SHOWMINIMIZED):overlapped' test fails instead. --- dlls/user32/tests/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..b5228f8facb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5405,7 +5405,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) -- 2.20.1

3 3

[PATCH] kernel32/tests: Allow failure when loading the 268 bytes minimal PE image.
by Francois Gouget 19 Jul '21

19 Jul '21

Contrary to the comment Windows 7+ fails to load it (but maybe unpatched pre-SP1 Windows 7 versions could load it). So adjust the comment and allow ERROR_BAD_EXE_FORMAT as a valid result. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=51185 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Another option would be to remove this case entirely... https://test.winehq.org/data/patterns.html#kernel32:loader --- dlls/kernel32/tests/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1db68a191a3..ea4048d5634 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -860,15 +860,15 @@ static void test_Loader(void) 0, { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT } /* vista is more strict */ }, - /* Minimal PE image that Windows7 is able to load: 268 bytes */ + /* Minimal PE image that Windows Vista is able to load: 268 bytes */ { 0x04, 0, 0xf0, /* optional header size just forces 0xf0 bytes to be written, 0 or another number don't change the behaviour, what really matters is file size regardless of values in the headers */ 0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04, - 0x40, /* minimal image size that Windows7 accepts */ + 0x40, /* minimal image size that Vista accepts */ 0, - { ERROR_SUCCESS } + { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT } /* most win 7+ are more strict */ }, /* the following data mimics the PE image which 8k demos have */ { 0x04, -- 2.20.1

3 5

[PATCH 12/15] gdi32: Handle EMFs directly in LineTo implementation.
by Jacek Caban 18 Jul '21

18 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The consideration is similar to old-style metafiles: recording should be done in user space. However, EMFs have associated a special kind of DC, so they behave pretty much like regular DCs, except for the additional recording. dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 15 +++++++-------- dlls/gdi32/enhmfdrv/init.c | 3 ++- dlls/gdi32/gdi_private.h | 12 ++++++++++-- dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/objects.c | 2 +- include/ntgdi.h | 1 + 8 files changed, 38 insertions(+), 25 deletions(-)

1 1

[PATCH] kernel32/tests: Use WineTest contexts to simplify test_Loader().
by Francois Gouget 18 Jul '21

18 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This also fixes a few messages that did not show the loop counter. --- dlls/kernel32/tests/loader.c | 98 ++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ea4048d5634..f30a113f5a3 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -896,6 +896,7 @@ static void test_Loader(void) for (i = 0; i < ARRAY_SIZE(td); i++) { + winetest_push_context("%d", i); nt_header = nt_header_template; nt_header.FileHeader.NumberOfSections = td[i].number_of_sections; nt_header.FileHeader.SizeOfOptionalHeader = td[i].size_of_optional_header; @@ -915,56 +916,55 @@ static void test_Loader(void) MEMORY_BASIC_INFORMATION info; void *ptr; - ok( td[i].errors[0] == ERROR_SUCCESS, "%d: should have failed\n", i ); + ok( td[i].errors[0] == ERROR_SUCCESS, "should have failed\n" ); SetLastError(0xdeadbeef); size = VirtualQuery(hlib, &info, sizeof(info)); ok(size == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); - ok(info.BaseAddress == hlib, "%d: %p != %p\n", i, info.BaseAddress, hlib); - ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); - ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); - ok(info.RegionSize == ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size), "%d: got %lx != expected %x\n", - i, info.RegionSize, ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size)); - ok(info.State == MEM_COMMIT, "%d: %x != MEM_COMMIT\n", i, info.State); + ok(info.BaseAddress == hlib, "%p != %p\n", info.BaseAddress, hlib); + ok(info.AllocationBase == hlib, "%p != %p\n", info.AllocationBase, hlib); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.RegionSize == ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size), "got %lx != expected %x\n", + info.RegionSize, ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size)); + ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State); if (nt_header.OptionalHeader.SectionAlignment < page_size) - ok(info.Protect == PAGE_EXECUTE_WRITECOPY, "%d: %x != PAGE_EXECUTE_WRITECOPY\n", i, info.Protect); + ok(info.Protect == PAGE_EXECUTE_WRITECOPY, "%x != PAGE_EXECUTE_WRITECOPY\n", info.Protect); else - ok(info.Protect == PAGE_READONLY, "%d: %x != PAGE_READONLY\n", i, info.Protect); - ok(info.Type == SEC_IMAGE, "%d: %x != SEC_IMAGE\n", i, info.Type); + ok(info.Protect == PAGE_READONLY, "%x != PAGE_READONLY\n", info.Protect); + ok(info.Type == SEC_IMAGE, "%x != SEC_IMAGE\n", info.Type); SetLastError(0xdeadbeef); ptr = VirtualAlloc(hlib, page_size, MEM_COMMIT, info.Protect); - ok(!ptr, "%d: VirtualAlloc should fail\n", i); - ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + ok(!ptr, "VirtualAlloc should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); SetLastError(0xdeadbeef); size = VirtualQuery((char *)hlib + info.RegionSize, &info, sizeof(info)); - ok(size == sizeof(info), - "%d: VirtualQuery error %d\n", i, GetLastError()); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); if (nt_header.OptionalHeader.SectionAlignment == page_size || nt_header.OptionalHeader.SectionAlignment == nt_header.OptionalHeader.FileAlignment) { - ok(info.BaseAddress == (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size), "%d: got %p != expected %p\n", - i, info.BaseAddress, (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size)); - ok(info.AllocationBase == 0, "%d: %p != 0\n", i, info.AllocationBase); - ok(info.AllocationProtect == 0, "%d: %x != 0\n", i, info.AllocationProtect); + ok(info.BaseAddress == (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size), "got %p != expected %p\n", + info.BaseAddress, (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size)); + ok(info.AllocationBase == 0, "%p != 0\n", info.AllocationBase); + ok(info.AllocationProtect == 0, "%x != 0\n", info.AllocationProtect); /*ok(info.RegionSize == not_practical_value, "%d: %lx != not_practical_value\n", i, info.RegionSize);*/ - ok(info.State == MEM_FREE, "%d: %x != MEM_FREE\n", i, info.State); - ok(info.Type == 0, "%d: %x != 0\n", i, info.Type); - ok(info.Protect == PAGE_NOACCESS, "%d: %x != PAGE_NOACCESS\n", i, info.Protect); + ok(info.State == MEM_FREE, "%x != MEM_FREE\n", info.State); + ok(info.Type == 0, "%x != 0\n", info.Type); + ok(info.Protect == PAGE_NOACCESS, "%x != PAGE_NOACCESS\n", info.Protect); } else { - ok(info.Protect == PAGE_EXECUTE_WRITECOPY, "%d: %x != PAGE_EXECUTE_WRITECOPY\n", i, info.Protect); - ok(info.BaseAddress == hlib, "%d: got %p != expected %p\n", i, info.BaseAddress, hlib); - ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); - ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); - ok(info.RegionSize == ALIGN_SIZE(file_size, page_size), "%d: got %lx != expected %x\n", - i, info.RegionSize, ALIGN_SIZE(file_size, page_size)); - ok(info.State == MEM_COMMIT, "%d: %x != MEM_COMMIT\n", i, info.State); - ok(info.Protect == PAGE_READONLY, "%d: %x != PAGE_READONLY\n", i, info.Protect); - ok(info.Type == SEC_IMAGE, "%d: %x != SEC_IMAGE\n", i, info.Type); + ok(info.Protect == PAGE_EXECUTE_WRITECOPY, "%x != PAGE_EXECUTE_WRITECOPY\n", info.Protect); + ok(info.BaseAddress == hlib, "got %p != expected %p\n", info.BaseAddress, hlib); + ok(info.AllocationBase == hlib, "%p != %p\n", info.AllocationBase, hlib); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.RegionSize == ALIGN_SIZE(file_size, page_size), "got %lx != expected %x\n", + info.RegionSize, ALIGN_SIZE(file_size, page_size)); + ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State); + ok(info.Protect == PAGE_READONLY, "%x != PAGE_READONLY\n", info.Protect); + ok(info.Type == SEC_IMAGE, "%x != SEC_IMAGE\n", info.Type); } /* header: check the zeroing of alignment */ @@ -974,7 +974,7 @@ static void test_Loader(void) start = (const char *)hlib + nt_header.OptionalHeader.SizeOfHeaders; size = ALIGN_SIZE((ULONG_PTR)start, page_size) - (ULONG_PTR)start; - ok(!memcmp(start, filler, size), "%d: header alignment is not cleared\n", i); + ok(!memcmp(start, filler, size), "header alignment is not cleared\n"); } if (nt_header.FileHeader.NumberOfSections) @@ -982,25 +982,25 @@ static void test_Loader(void) SetLastError(0xdeadbeef); size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); ok(size == sizeof(info), - "%d: VirtualQuery error %d\n", i, GetLastError()); + "VirtualQuery error %d\n", GetLastError()); if (nt_header.OptionalHeader.SectionAlignment < page_size) { - ok(info.BaseAddress == hlib, "%d: got %p != expected %p\n", i, info.BaseAddress, hlib); - ok(info.RegionSize == ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size), "%d: got %lx != expected %x\n", - i, info.RegionSize, ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size)); - ok(info.Protect == PAGE_EXECUTE_WRITECOPY, "%d: %x != PAGE_EXECUTE_WRITECOPY\n", i, info.Protect); + ok(info.BaseAddress == hlib, "got %p != expected %p\n", info.BaseAddress, hlib); + ok(info.RegionSize == ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size), "got %lx != expected %x\n", + info.RegionSize, ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, page_size)); + ok(info.Protect == PAGE_EXECUTE_WRITECOPY, "%x != PAGE_EXECUTE_WRITECOPY\n", info.Protect); } else { - ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); - ok(info.RegionSize == ALIGN_SIZE(section.Misc.VirtualSize, page_size), "%d: got %lx != expected %x\n", - i, info.RegionSize, ALIGN_SIZE(section.Misc.VirtualSize, page_size)); - ok(info.Protect == PAGE_READONLY, "%d: %x != PAGE_READONLY\n", i, info.Protect); + ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)hlib + section.VirtualAddress); + ok(info.RegionSize == ALIGN_SIZE(section.Misc.VirtualSize, page_size), "got %lx != expected %x\n", + info.RegionSize, ALIGN_SIZE(section.Misc.VirtualSize, page_size)); + ok(info.Protect == PAGE_READONLY, "%x != PAGE_READONLY\n", info.Protect); } - ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); - ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); - ok(info.State == MEM_COMMIT, "%d: %x != MEM_COMMIT\n", i, info.State); - ok(info.Type == SEC_IMAGE, "%d: %x != SEC_IMAGE\n", i, info.Type); + ok(info.AllocationBase == hlib, "%p != %p\n", info.AllocationBase, hlib); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%x != SEC_IMAGE\n", info.Type); if (nt_header.OptionalHeader.SectionAlignment >= page_size) ok(!memcmp((const char *)hlib + section.VirtualAddress + section.PointerToRawData, &nt_header, section.SizeOfRawData), "wrong section data\n"); @@ -1014,14 +1014,14 @@ static void test_Loader(void) start = (const char *)hlib + section.VirtualAddress + section.PointerToRawData + section.SizeOfRawData; size = ALIGN_SIZE((ULONG_PTR)start, page_size) - (ULONG_PTR)start; - ok(memcmp(start, filler, size), "%d: alignment should not be cleared\n", i); + ok(memcmp(start, filler, size), "alignment should not be cleared\n"); } SetLastError(0xdeadbeef); ptr = VirtualAlloc((char *)hlib + section.VirtualAddress, page_size, MEM_COMMIT, info.Protect); - ok(!ptr, "%d: VirtualAlloc should fail\n", i); + ok(!ptr, "VirtualAlloc should fail\n"); ok(GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_ADDRESS, - "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); } SetLastError(0xdeadbeef); @@ -1120,6 +1120,7 @@ static void test_Loader(void) if (!file_size) { ok(0, "could not create %s\n", dll_name); + winetest_pop_context(); break; } @@ -1137,12 +1138,13 @@ static void test_Loader(void) { error_match = td[i].errors[error_index] == GetLastError(); } - ok(error_match, "%d: unexpected error %d\n", i, GetLastError()); + ok(error_match, "unexpected error %d\n", GetLastError()); } SetLastError(0xdeadbeef); ret = DeleteFileA(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); + winetest_pop_context(); } nt_header = nt_header_template; -- 2.20.1

1 0

[PATCH 10/15] gdi32: Handle metafiles directly in Arc implementation.
by Jacek Caban 18 Jul '21

18 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 5 +++++ dlls/gdi32/mfdrv/graphics.c | 20 +++++++++++++++----- dlls/gdi32/mfdrv/init.c | 4 ++-- dlls/gdi32/mfdrv/metafiledrv.h | 4 ++-- dlls/gdi32/tests/metafile.c | 3 +++ 6 files changed, 29 insertions(+), 9 deletions(-)

2 1

[PATCH 15/15] gdi32: Handle EMFs directly in arc functions.
by Jacek Caban 17 Jul '21

17 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 60 ++--------------------------- dlls/gdi32/enhmfdrv/graphics.c | 70 +++++++--------------------------- dlls/gdi32/enhmfdrv/init.c | 8 ++-- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 28 ++++++++++++++ 5 files changed, 53 insertions(+), 116 deletions(-)

1 0

[PATCH 14/15] gdi32: Store graphics mode in DC_ATTR.
by Jacek Caban 17 Jul '21

17 Jul '21

1 0

[PATCH 13/15] gdi32: Handle EMFs directly in MoveToEx.
by Jacek Caban 17 Jul '21

17 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 7 ++++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 4 ++++ 6 files changed, 11 insertions(+), 17 deletions(-)

1 0

[PATCH 08/15] gdi32: Handle metafiles directly in MoveToEx implementation.
by Jacek Caban 17 Jul '21

17 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/tests/metafile.c | 10 +++------- 6 files changed, 10 insertions(+), 12 deletions(-)

1 0

[PATCH v4 2/2] dbghelp: Initialize new structure members
by Alistair Leslie-Hughes 16 Jul '21

16 Jul '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/module.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index cadb285accb..247aadcef0e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -207,6 +207,8 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->module.TypeInfo = FALSE; module->module.SourceIndexed = FALSE; module->module.Publics = FALSE; + module->module.MachineType = 0; + module->module.Reserved = 0; module->reloc_delta = 0; module->type = type; @@ -1201,6 +1203,8 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, mi64.TypeInfo = miw64.TypeInfo; mi64.SourceIndexed = miw64.SourceIndexed; mi64.Publics = miw64.Publics; + mi64.MachineType = miw64.MachineType; + mi64.Reserved = miw64.Reserved; memcpy(ModuleInfo, &mi64, ModuleInfo->SizeOfStruct); -- 2.30.2

1 0

[PATCH v4 1/2] include: Updated _IMAGEHLP_MODULEW64 stucture
by Alistair Leslie-Hughes 16 Jul '21

16 Jul '21

This aligns the structure to the be the same found in the 10.0.19041.0 SDK. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index 1b234899195..303c0109d1f 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -280,6 +280,8 @@ typedef struct _IMAGEHLP_MODULE64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; typedef struct _IMAGEHLP_MODULEW64 @@ -307,6 +309,8 @@ typedef struct _IMAGEHLP_MODULEW64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; #if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) -- 2.30.2

1 0

[PATCH 1/2] api-ms-win-core-console-l3-2-0: Add stub dll.
by Esdras Tarsis 16 Jul '21

16 Jul '21

Needed for Pickup Basketball VR. Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-console-l3-2-0.spec | 32 +++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 37 insertions(+) create mode 100644 dlls/api-ms-win-core-console-l3-2-0/Makefile.in create mode 100644 dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec diff --git a/configure b/configure index 27a33234eb7..bf5c5b71992 100755 --- a/configure +++ b/configure @@ -936,6 +936,7 @@ enable_api_ms_win_core_comm_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_console_l1_2_0 enable_api_ms_win_core_console_l2_1_0 +enable_api_ms_win_core_console_l3_2_0 enable_api_ms_win_core_crt_l1_1_0 enable_api_ms_win_core_crt_l2_1_0 enable_api_ms_win_core_datetime_l1_1_0 @@ -20085,6 +20086,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-comm-l1-1-0 enable_api_ms_win_core_ wine_fn_config_makefile dlls/api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l1-2-0 enable_api_ms_win_core_console_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-console-l3-2-0 enable_api_ms_win_core_console_l3_2_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l2-1-0 enable_api_ms_win_core_crt_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 diff --git a/configure.ac b/configure.ac index b889947b65b..084990c0cd6 100644 --- a/configure.ac +++ b/configure.ac @@ -2756,6 +2756,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-comm-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l2-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l3-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-datetime-l1-1-0) diff --git a/dlls/api-ms-win-core-console-l3-2-0/Makefile.in b/dlls/api-ms-win-core-console-l3-2-0/Makefile.in new file mode 100644 index 00000000000..74f49d62710 --- /dev/null +++ b/dlls/api-ms-win-core-console-l3-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-console-l3-2-0.dll diff --git a/dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec b/dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec new file mode 100644 index 00000000000..a9923150866 --- /dev/null +++ b/dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec @@ -0,0 +1,32 @@ +@ stdcall AddConsoleAliasA(str str str) kernel32.AddConsoleAliasA +@ stdcall AddConsoleAliasW(wstr wstr wstr) kernel32.AddConsoleAliasW +@ stdcall ExpungeConsoleCommandHistoryA(str) kernel32.ExpungeConsoleCommandHistoryA +@ stdcall ExpungeConsoleCommandHistoryW(wstr) kernel32.ExpungeConsoleCommandHistoryW +@ stub GetConsoleAliasA +@ stub GetConsoleAliasExesA +@ stdcall GetConsoleAliasExesLengthA() kernel32.GetConsoleAliasExesLengthA +@ stdcall GetConsoleAliasExesLengthW() kernel32.GetConsoleAliasExesLengthW +@ stub GetConsoleAliasExesW +@ stdcall GetConsoleAliasW(wstr ptr long wstr) kernel32.GetConsoleAliasW +@ stub GetConsoleAliasesA +@ stdcall GetConsoleAliasesLengthA(str) kernel32.GetConsoleAliasesLengthA +@ stdcall GetConsoleAliasesLengthW(wstr) kernel32.GetConsoleAliasesLengthW +@ stub GetConsoleAliasesW +@ stdcall GetConsoleCommandHistoryA(long long long) kernel32.GetConsoleCommandHistoryA +@ stdcall GetConsoleCommandHistoryLengthA(str) kernel32.GetConsoleCommandHistoryLengthA +@ stdcall GetConsoleCommandHistoryLengthW(wstr) kernel32.GetConsoleCommandHistoryLengthW +@ stdcall GetConsoleCommandHistoryW(long long long) kernel32.GetConsoleCommandHistoryW +@ stdcall GetConsoleDisplayMode(ptr) kernel32.GetConsoleDisplayMode +@ stdcall GetConsoleFontSize(long long) kernel32.GetConsoleFontSize +@ stub GetConsoleHistoryInfo +@ stdcall GetConsoleProcessList(ptr long) kernel32.GetConsoleProcessList +@ stub GetConsoleSelectionInfo +@ stdcall GetConsoleWindow() kernel32.GetConsoleWindow +@ stdcall GetCurrentConsoleFont(long long ptr) kernel32.GetCurrentConsoleFont +@ stdcall GetCurrentConsoleFontEx(long long ptr) kernel32.GetCurrentConsoleFontEx +@ stdcall GetNumberOfConsoleMouseButtons(ptr) kernel32.GetNumberOfConsoleMouseButtons +@ stdcall SetConsoleDisplayMode(long long ptr) kernel32.SetConsoleDisplayMode +@ stub SetConsoleHistoryInfo +@ stub SetConsoleNumberOfCommandsA +@ stub SetConsoleNumberOfCommandsW +@ stdcall SetCurrentConsoleFontEx(long long ptr) kernel32.SetCurrentConsoleFontEx diff --git a/tools/make_specfiles b/tools/make_specfiles index d782beb27d7..50d848b4ce8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -232,6 +232,7 @@ my @dll_groups = "api-ms-win-core-console-l1-1-0", "api-ms-win-core-console-l1-2-0", "api-ms-win-core-console-l2-1-0", + "api-ms-win-core-console-l3-2-0", "api-ms-win-core-file-l1-1-0", "api-ms-win-core-file-l1-2-1", "api-ms-win-core-file-l1-2-0", -- 2.32.0

3 3

[PATCH v3 1/8] wined3d: Set the entire stream output state as a single CS operation.
by Zebediah Figura 16 Jul '21

16 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/device.c | 29 +++++++++----------- dlls/wined3d/cs.c | 49 ++++++++++++++++------------------ dlls/wined3d/device.c | 40 +++++++++++---------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 10 ++----- include/wine/wined3d.h | 10 +++++-- 6 files changed, 63 insertions(+), 77 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 93df97e59ae..46e2c8ba67f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1181,24 +1181,23 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetDepthStencilState(ID3D11 static void STDMETHODCALLTYPE d3d11_device_context_SOSetTargets(ID3D11DeviceContext1 *iface, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *offsets) { + struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS] = {0}; struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int count, i; TRACE("iface %p, buffer_count %u, buffers %p, offsets %p.\n", iface, buffer_count, buffers, offsets); - count = min(buffer_count, D3D11_SO_BUFFER_SLOT_COUNT); - wined3d_mutex_lock(); + count = min(buffer_count, ARRAY_SIZE(outputs)); for (i = 0; i < count; ++i) { struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - wined3d_device_context_set_stream_output(context->wined3d_context, i, - buffer ? buffer->wined3d_buffer : NULL, offsets ? offsets[i] : 0); - } - for (; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) - { - wined3d_device_context_set_stream_output(context->wined3d_context, i, NULL, 0); + outputs[i].buffer = buffer ? buffer->wined3d_buffer : NULL; + outputs[i].offset = offsets ? offsets[i] : 0; } + + wined3d_mutex_lock(); + wined3d_device_context_set_stream_outputs(context->wined3d_context, outputs); wined3d_mutex_unlock(); } @@ -4909,25 +4908,23 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device1 static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device1 *iface, UINT target_count, ID3D10Buffer *const *targets, const UINT *offsets) { + struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS] = {0}; struct d3d_device *device = impl_from_ID3D10Device(iface); unsigned int count, i; TRACE("iface %p, target_count %u, targets %p, offsets %p.\n", iface, target_count, targets, offsets); - count = min(target_count, D3D10_SO_BUFFER_SLOT_COUNT); - wined3d_mutex_lock(); + count = min(target_count, ARRAY_SIZE(outputs)); for (i = 0; i < count; ++i) { struct d3d_buffer *buffer = unsafe_impl_from_ID3D10Buffer(targets[i]); - wined3d_device_context_set_stream_output(device->immediate_context.wined3d_context, i, - buffer ? buffer->wined3d_buffer : NULL, offsets[i]); + outputs[i].buffer = buffer ? buffer->wined3d_buffer : NULL; + outputs[i].offset = offsets ? offsets[i] : 0; } - for (i = count; i < D3D10_SO_BUFFER_SLOT_COUNT; ++i) - { - wined3d_device_context_set_stream_output(device->immediate_context.wined3d_context, i, NULL, 0); - } + wined3d_mutex_lock(); + wined3d_device_context_set_stream_outputs(device->immediate_context.wined3d_context, outputs); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3593e5bfb48..3ed814093c8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -122,7 +122,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_VERTEX_DECLARATION, WINED3D_CS_OP_SET_STREAM_SOURCE, WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, - WINED3D_CS_OP_SET_STREAM_OUTPUT, + WINED3D_CS_OP_SET_STREAM_OUTPUTS, WINED3D_CS_OP_SET_INDEX_BUFFER, WINED3D_CS_OP_SET_CONSTANT_BUFFERS, WINED3D_CS_OP_SET_TEXTURE, @@ -273,12 +273,10 @@ struct wined3d_cs_set_stream_source_freq UINT flags; }; -struct wined3d_cs_set_stream_output +struct wined3d_cs_set_stream_outputs { enum wined3d_cs_op opcode; - UINT stream_idx; - struct wined3d_buffer *buffer; - UINT offset; + struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; }; struct wined3d_cs_set_index_buffer @@ -607,7 +605,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op) WINED3D_TO_STR(WINED3D_CS_OP_SET_VERTEX_DECLARATION); WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE); WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ); - WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_OUTPUT); + WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_OUTPUTS); WINED3D_TO_STR(WINED3D_CS_OP_SET_INDEX_BUFFER); WINED3D_TO_STR(WINED3D_CS_OP_SET_CONSTANT_BUFFERS); WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE); @@ -1475,35 +1473,34 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); } -static void wined3d_cs_exec_set_stream_output(struct wined3d_cs *cs, const void *data) +static void wined3d_cs_exec_set_stream_outputs(struct wined3d_cs *cs, const void *data) { - const struct wined3d_cs_set_stream_output *op = data; - struct wined3d_stream_output *stream; - struct wined3d_buffer *prev; + const struct wined3d_cs_set_stream_outputs *op = data; + unsigned int i; - stream = &cs->state.stream_output[op->stream_idx]; - prev = stream->buffer; - stream->buffer = op->buffer; - stream->offset = op->offset; + for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) + { + struct wined3d_buffer *prev = cs->state.stream_output[i].buffer; + struct wined3d_buffer *buffer = op->outputs[i].buffer; - if (op->buffer) - InterlockedIncrement(&op->buffer->resource.bind_count); - if (prev) - InterlockedDecrement(&prev->resource.bind_count); + if (buffer) + InterlockedIncrement(&buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); + } + memcpy(cs->state.stream_output, op->outputs, sizeof(op->outputs)); device_invalidate_state(cs->c.device, STATE_STREAM_OUTPUT); } -void wined3d_device_context_emit_set_stream_output(struct wined3d_device_context *context, unsigned int stream_idx, - struct wined3d_buffer *buffer, unsigned int offset) +void wined3d_device_context_emit_set_stream_outputs(struct wined3d_device_context *context, + const struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]) { - struct wined3d_cs_set_stream_output *op; + struct wined3d_cs_set_stream_outputs *op; op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_SET_STREAM_OUTPUT; - op->stream_idx = stream_idx; - op->buffer = buffer; - op->offset = offset; + op->opcode = WINED3D_CS_OP_SET_STREAM_OUTPUTS; + memcpy(op->outputs, outputs, sizeof(op->outputs)); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2932,7 +2929,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, - /* WINED3D_CS_OP_SET_STREAM_OUTPUT */ wined3d_cs_exec_set_stream_output, + /* WINED3D_CS_OP_SET_STREAM_OUTPUTS */ wined3d_cs_exec_set_stream_outputs, /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, /* WINED3D_CS_OP_SET_CONSTANT_BUFFERS */ wined3d_cs_exec_set_constant_buffers, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb37f6aff51..7a78a271aa1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1676,11 +1676,7 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte wined3d_device_context_emit_set_depth_stencil_view(context, state->fb.depth_stencil); wined3d_device_context_emit_set_vertex_declaration(context, state->vertex_declaration); - for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) - { - wined3d_device_context_emit_set_stream_output(context, i, - state->stream_output[i].buffer, state->stream_output[i].offset); - } + wined3d_device_context_emit_set_stream_outputs(context, state->stream_output); for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { @@ -2334,30 +2330,26 @@ void CDECL wined3d_device_context_set_vertex_declaration(struct wined3d_device_c wined3d_vertex_declaration_decref(prev); } -void CDECL wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, - struct wined3d_buffer *buffer, unsigned int offset) +void CDECL wined3d_device_context_set_stream_outputs(struct wined3d_device_context *context, + const struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]) { - struct wined3d_stream_output *stream; - struct wined3d_buffer *prev_buffer; + struct wined3d_state *state = context->state; + unsigned int i; - TRACE("context %p, idx %u, buffer %p, offset %u.\n", context, idx, buffer, offset); + TRACE("context %p, outputs %p.\n", context, outputs); - if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) + wined3d_device_context_emit_set_stream_outputs(context, outputs); + for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) { - WARN("Invalid stream output %u.\n", idx); - return; + struct wined3d_buffer *prev_buffer = state->stream_output[i].buffer; + struct wined3d_buffer *buffer = outputs[i].buffer; + + if (buffer) + wined3d_buffer_incref(buffer); + state->stream_output[i] = outputs[i]; + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); } - - stream = &context->state->stream_output[idx]; - prev_buffer = stream->buffer; - - if (buffer) - wined3d_buffer_incref(buffer); - stream->buffer = buffer; - stream->offset = offset; - wined3d_device_context_emit_set_stream_output(context, idx, buffer, offset); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); } void CDECL wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 13c8b218b65..ccd941af7a7 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -136,7 +136,7 @@ @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_shader_resource_views(ptr long long long ptr) @ cdecl wined3d_device_context_set_state(ptr ptr) -@ cdecl wined3d_device_context_set_stream_output(ptr long ptr long) +@ cdecl wined3d_device_context_set_stream_outputs(ptr ptr) @ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_views(ptr long long long ptr ptr) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36fdf56a73c..2708d5c7f32 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3660,12 +3660,6 @@ struct wined3d_rasterizer_state struct wine_rb_entry entry; }; -struct wined3d_stream_output -{ - struct wined3d_buffer *buffer; - UINT offset; -}; - #define LIGHTMAP_SIZE 43 #define LIGHTMAP_HASHFUNC(x) ((x) % LIGHTMAP_SIZE) @@ -4846,8 +4840,8 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte void wined3d_device_context_emit_set_shader_resource_views(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, struct wined3d_shader_resource_view *const *views) DECLSPEC_HIDDEN; -void wined3d_device_context_emit_set_stream_output(struct wined3d_device_context *context, unsigned int stream_idx, - struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_stream_outputs(struct wined3d_device_context *context, + const struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 21b9e01efd0..1369fffddf3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2212,6 +2212,12 @@ struct wined3d_stateblock_state struct wined3d_light_state *light_state; }; +struct wined3d_stream_output +{ + struct wined3d_buffer *buffer; + unsigned int offset; +}; + struct wined3d_parent_ops { void (__stdcall *wined3d_object_destroyed)(void *parent); @@ -2523,8 +2529,8 @@ void __cdecl wined3d_device_context_set_shader_resource_views(struct wined3d_dev enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, struct wined3d_shader_resource_view *const *views); void __cdecl wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state); -void __cdecl wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, - struct wined3d_buffer *buffer, unsigned int offset); +void __cdecl wined3d_device_context_set_stream_outputs(struct wined3d_device_context *context, + const struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]); HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride); void __cdecl wined3d_device_context_set_unordered_access_views(struct wined3d_device_context *context, -- 2.30.2

4 19

[PATCH] ntdll: Use a separate +unwind debug channel for unwinding on x86-64.
by Zebediah Figura 16 Jul '21

16 Jul '21

Constant spam from unwinding routines makes +seh logs hard to read, especially for programs that throw a lot of exceptions as part of normal execution. Since unwind information is rarely useful, don't display it unless specifically requested. Make +unwind the default channel in these files, though, since there are more unwind messages than exception messages. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 72 +++++++++++++++++---------------- dlls/ntdll/unix/signal_x86_64.c | 41 ++++++++++--------- 2 files changed, 58 insertions(+), 55 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 19146aea40b..de0eca6c11c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -34,7 +34,8 @@ #include "ntdll_misc.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DEFAULT_DEBUG_CHANNEL(unwind); +WINE_DECLARE_DEBUG_CHANNEL(seh); typedef struct _SCOPE_TABLE { @@ -366,10 +367,10 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C frame.Handler = nested_exception_handler; __wine_push_frame( &frame ); - TRACE( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); + TRACE_(seh)( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); - TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); + TRACE_(seh)( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); rec->ExceptionFlags &= EH_NONCONTINUABLE; __wine_pop_frame( &frame ); @@ -388,10 +389,10 @@ static DWORD call_teb_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCH { DWORD res; - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); + TRACE_(seh)( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); res = teb_frame->Handler( rec, teb_frame, context, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); - TRACE( "handler at %p returned %u\n", teb_frame->Handler, res ); + TRACE_(seh)( "handler at %p returned %u\n", teb_frame->Handler, res ); return res; } @@ -427,8 +428,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, - NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); + ERR_(seh)( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, + NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); rec->ExceptionFlags |= EH_STACK_INVALID; break; } @@ -443,7 +444,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + FIXME_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame; @@ -462,8 +463,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex /* hack: call wine handlers registered in the tib list */ else while ((ULONG64)teb_frame < context.Rsp) { - TRACE( "found wine frame %p rsp %p handler %p\n", - teb_frame, (void *)context.Rsp, teb_frame->Handler ); + TRACE_(seh)( "found wine frame %p rsp %p handler %p\n", + teb_frame, (void *)context.Rsp, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) { @@ -473,7 +474,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + FIXME_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame; @@ -503,9 +504,9 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) NTSTATUS status; DWORD c; - TRACE( "code=%x flags=%x addr=%p ip=%p tid=%04x\n", - rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, - (void *)context->Rip, GetCurrentThreadId() ); + TRACE_(seh)( "code=%x flags=%x addr=%p ip=%p tid=%04x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + (void *)context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) TRACE( " info[%d]=%016I64x\n", c, rec->ExceptionInformation[c] ); @@ -522,31 +523,32 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) { - WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + WARN_(seh)( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], + debugstr_a((char *)rec->ExceptionInformation[1]) ); } else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) { - WARN( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + WARN_(seh)( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); } else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_WIDE_C) { - WARN( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + WARN_(seh)( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); } else { if (rec->ExceptionCode == STATUS_ASSERTION_FAILURE) - ERR( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + ERR_(seh)( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); else - WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + WARN_(seh)( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); - TRACE(" rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n", - context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE(" rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n", - context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE(" r8=%016I64x r9=%016I64x r10=%016I64x r11=%016I64x\n", - context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%016I64x r13=%016I64x r14=%016I64x r15=%016I64x\n", - context->R12, context->R13, context->R14, context->R15 ); + TRACE_(seh)( " rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n", + context->Rax, context->Rbx, context->Rcx, context->Rdx ); + TRACE_(seh)( " rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n", + context->Rsi, context->Rdi, context->Rbp, context->Rsp ); + TRACE_(seh)( " r8=%016I64x r9=%016I64x r10=%016I64x r11=%016I64x\n", + context->R8, context->R9, context->R10, context->R11 ); + TRACE_(seh)( " r12=%016I64x r13=%016I64x r14=%016I64x r15=%016I64x\n", + context->R12, context->R13, context->R14, context->R15 ); } /* Legends of Runeterra depends on having SegDs == SegSs in an exception @@ -1184,18 +1186,18 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) { PVOID (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; - TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); + TRACE_(seh)( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); context->Rip = (ULONG64)call_consolidate_callback( context, consolidate, rec ); } /* hack: remove no longer accessible TEB frames */ while ((ULONG64)teb_frame < context->Rsp) { - TRACE( "removing TEB frame: %p\n", teb_frame ); + TRACE_(seh)( "removing TEB frame: %p\n", teb_frame ); teb_frame = __wine_pop_frame( teb_frame ); } - TRACE( "returning to %p stack %p\n", (void *)context->Rip, (void *)context->Rsp ); + TRACE_(seh)( "returning to %p stack %p\n", (void *)context->Rip, (void *)context->Rsp ); NtContinue( context, FALSE ); } @@ -1358,7 +1360,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, SCOPE_TABLE *table = dispatch->HandlerData; ULONG i; - TRACE( "%p %p %p %p\n", rec, frame, context, dispatch ); + TRACE_(seh)( "%p %p %p %p\n", rec, frame, context, dispatch ); if (TRACE_ON(seh)) dump_scope_table( dispatch->ImageBase, table ); if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) @@ -1382,7 +1384,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, handler = (PTERMINATION_HANDLER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); dispatch->ScopeIndex = i+1; - TRACE( "calling __finally %p frame %p\n", handler, frame ); + TRACE_(seh)( "calling __finally %p frame %p\n", handler, frame ); handler( TRUE, frame ); } } @@ -1403,7 +1405,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, filter = (PEXCEPTION_FILTER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); ptrs.ExceptionRecord = rec; ptrs.ContextRecord = context; - TRACE( "calling filter %p ptrs %p frame %p\n", filter, &ptrs, frame ); + TRACE_(seh)( "calling filter %p ptrs %p frame %p\n", filter, &ptrs, frame ); switch (filter( &ptrs, frame )) { case EXCEPTION_EXECUTE_HANDLER: diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6b668508d80..2769ebf24d6 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -81,7 +81,8 @@ #include "unix_private.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DEFAULT_DEBUG_CHANNEL(unwind); +WINE_DECLARE_DEBUG_CHANNEL(seh); /*********************************************************************** * signal context platform-specific definitions @@ -2404,23 +2405,23 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, if (!is_inside_syscall( sigcontext )) return FALSE; - TRACE( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", - rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, - context->Rip, GetCurrentThreadId() ); + TRACE_(seh)( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + context->Rip, GetCurrentThreadId() ); for (i = 0; i < rec->NumberParameters; i++) - TRACE( " info[%d]=%016lx\n", i, rec->ExceptionInformation[i] ); - TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", - context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", - context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", - context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", - context->R12, context->R13, context->R14, context->R15 ); + TRACE_(seh)( " info[%d]=%016lx\n", i, rec->ExceptionInformation[i] ); + TRACE_(seh)( " rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + context->Rax, context->Rbx, context->Rcx, context->Rdx ); + TRACE_(seh)( " rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + context->Rsi, context->Rdi, context->Rbp, context->Rsp ); + TRACE_(seh)( " r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + context->R8, context->R9, context->R10, context->R11 ); + TRACE_(seh)( " r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + context->R12, context->R13, context->R14, context->R15 ); if (ntdll_get_thread_data()->jmp_buf) { - TRACE( "returning to handler\n" ); + TRACE_(seh)( "returning to handler\n" ); RCX_sig(sigcontext) = (ULONG_PTR)ntdll_get_thread_data()->jmp_buf; RDX_sig(sigcontext) = 1; RIP_sig(sigcontext) = (ULONG_PTR)__wine_longjmp; @@ -2428,7 +2429,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, } else { - TRACE( "returning to user mode ip=%016lx ret=%08x\n", frame->rip, rec->ExceptionCode ); + TRACE_(seh)( "returning to user mode ip=%016lx ret=%08x\n", frame->rip, rec->ExceptionCode ); RCX_sig(sigcontext) = (ULONG_PTR)frame; RDX_sig(sigcontext) = rec->ExceptionCode; RIP_sig(sigcontext) = (ULONG_PTR)__wine_syscall_dispatcher_return; @@ -2451,8 +2452,8 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext ) if ((void *)RIP_sig( sigcontext ) != __wine_syscall_dispatcher) return FALSE; - TRACE( "ignoring trap in syscall rip=%p eflags=%08x\n", - (void *)RIP_sig(sigcontext), (ULONG)EFL_sig(sigcontext) ); + TRACE_(seh)( "ignoring trap in syscall rip=%p eflags=%08x\n", + (void *)RIP_sig(sigcontext), (ULONG)EFL_sig(sigcontext) ); frame->rip = *(ULONG64 *)RSP_sig( sigcontext ); frame->eflags = EFL_sig(sigcontext); @@ -2528,7 +2529,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; default: - ERR( "Got unexpected trap %ld\n", (ULONG_PTR)TRAP_sig(ucontext) ); + ERR_(seh)( "Got unexpected trap %ld\n", (ULONG_PTR)TRAP_sig(ucontext) ); /* fall through */ case TRAP_x86_NMI: /* NMI interrupt */ case TRAP_x86_DNA: /* Device not available exception */ @@ -2832,7 +2833,7 @@ void signal_init_thread( TEB *teb ) #ifdef __GNUC__ __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); #else - FIXME("FPU setup not implemented for this platform.\n"); + FIXME_(seh)("FPU setup not implemented for this platform.\n"); #endif } @@ -2868,7 +2869,7 @@ void signal_init_process(void) __wine_syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; if (getauxval( AT_HWCAP2 ) & 2) __wine_syscall_flags |= SYSCALL_HAVE_WRFSGSBASE; } - else ERR( "failed to allocate %%fs selector\n" ); + else ERR_(seh)( "failed to allocate %%fs selector\n" ); } #endif -- 2.30.2

1 0

[PATCH] mfplat: Add some Video Processor attributes to tracing.
by Nikolay Sivov 16 Jul '21

16 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 4 ++++ include/mfidl.idl | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5406ceb5063..bcad90c29da 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1530,11 +1530,13 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_TIMESTAMP_CAN_BE_DTS), X(MFT_CODEC_MERIT_Attribute), X(MF_TOPOLOGY_PLAYBACK_MAX_DIMS), + X(MF_XVP_DISABLE_FRC), X(MF_LOW_LATENCY), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_MPEG2_FLAGS), X(MF_MEDIA_ENGINE_AUDIO_CATEGORY), X(MF_MT_PIXEL_ASPECT_RATIO), + X(MF_VIDEO_PROCESSOR_ALGORITHM), X(MF_TOPOLOGY_ENABLE_XVP_FOR_PLAYBACK), X(MFT_CONNECTED_STREAM_ATTRIBUTE), X(MF_MT_REALTIME_CONTENT), @@ -1546,6 +1548,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_MAX_LUMINANCE_LEVEL), X(MFT_CONNECTED_TO_HW_STREAM), X(MF_SA_D3D_AWARE), + X(MF_XVP_SAMPLE_LOCK_TIMEOUT), X(MF_MT_MAX_KEYFRAME_SPACING), X(MFT_TRANSFORM_CLSID_Attribute), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), @@ -1741,6 +1744,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_RENDERER_EXTENSION_PROFILE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE), X(MF_MT_AUDIO_PREFER_WAVEFORMATEX), + X(MF_XVP_CALLER_ALLOCATES_OUTPUT), X(MF_MT_H264_SVC_CAPABILITIES), X(MF_TOPONODE_WORKQUEUE_ITEM_PRIORITY), X(MF_MT_SPATIAL_AUDIO_OBJECT_METADATA_LENGTH), diff --git a/include/mfidl.idl b/include/mfidl.idl index 76e0d0dfeb4..5b16c08bb90 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1573,4 +1573,9 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, 0xba491364, 0xb cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_VIDEO_PROCESSOR_ALGORITHM, 0x4a0a1e1f, 0x272c, 0x4fb6, 0x9e, 0xb1, 0xdb, 0x33, 0x0c, 0xbc, 0x97, 0xca);") +cpp_quote("EXTERN_GUID(MF_XVP_DISABLE_FRC, 0x2c0afa19, 0x7a97, 0x4d5a, 0x9e, 0xe8, 0x16, 0xd4, 0xfc, 0x51, 0x8d, 0x8c);") +cpp_quote("EXTERN_GUID(MF_XVP_CALLER_ALLOCATES_OUTPUT, 0x4a2cabc, 0x0cab, 0x40b1, 0xa1, 0xb9, 0x75, 0xbc, 0x36, 0x58, 0xf0, 0x00);") +cpp_quote("EXTERN_GUID(MF_XVP_SAMPLE_LOCK_TIMEOUT, 0xaa4ddb29, 0x5134, 0x4363, 0xac, 0x72, 0x83, 0xec, 0x4b, 0xc1, 0x04, 0x26);") + cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") -- 2.30.2

1 0

[PATCH] winegstreamer: Use consistent trace format for MF objects.
by Nikolay Sivov 16 Jul '21

16 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 54 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index cb7a447d66d..2d9fffad31a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -559,7 +559,7 @@ static HRESULT WINAPI media_stream_QueryInterface(IMFMediaStream *iface, REFIID { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%s %p)\n", stream, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFMediaStream) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || @@ -583,7 +583,7 @@ static ULONG WINAPI media_stream_AddRef(IMFMediaStream *iface) struct media_stream *stream = impl_from_IMFMediaStream(iface); ULONG ref = InterlockedIncrement(&stream->ref); - TRACE("(%p) ref=%u\n", stream, ref); + TRACE("%p, refcount %u.\n", iface, ref); return ref; } @@ -591,10 +591,9 @@ static ULONG WINAPI media_stream_AddRef(IMFMediaStream *iface) static ULONG WINAPI media_stream_Release(IMFMediaStream *iface) { struct media_stream *stream = impl_from_IMFMediaStream(iface); - ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("(%p) ref=%u\n", stream, ref); + TRACE("%p, refcount %u.\n", iface, ref); if (!ref) { @@ -610,7 +609,7 @@ static HRESULT WINAPI media_stream_GetEvent(IMFMediaStream *iface, DWORD flags, { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%#x, %p)\n", stream, flags, event); + TRACE("%p, %#x, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } @@ -619,7 +618,7 @@ static HRESULT WINAPI media_stream_BeginGetEvent(IMFMediaStream *iface, IMFAsync { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p, %p)\n", stream, callback, state); + TRACE("%p, %p, %p.\n", iface, callback, state); return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } @@ -628,7 +627,7 @@ static HRESULT WINAPI media_stream_EndGetEvent(IMFMediaStream *iface, IMFAsyncRe { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p, %p)\n", stream, result, event); + TRACE("%p, %p, %p.\n", stream, result, event); return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } @@ -638,7 +637,7 @@ static HRESULT WINAPI media_stream_QueueEvent(IMFMediaStream *iface, MediaEventT { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%d, %s, %#x, %p)\n", stream, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } @@ -647,7 +646,7 @@ static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMedi { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p)\n", stream, source); + TRACE("%p, %p.\n", iface, source); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; @@ -662,7 +661,7 @@ static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IM { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p)\n", stream, descriptor); + TRACE("%p, %p.\n", iface, descriptor); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; @@ -679,7 +678,7 @@ static HRESULT WINAPI media_stream_RequestSample(IMFMediaStream *iface, IUnknown struct source_async_command *command; HRESULT hr; - TRACE("(%p)->(%p)\n", iface, token); + TRACE("%p, %p.\n", iface, token); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; @@ -745,7 +744,8 @@ static HRESULT new_media_stream(struct media_source *source, if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail; - TRACE("->(%p)\n", object); + TRACE("Created stream object %p.\n", object); + *out_stream = object; return S_OK; @@ -1031,7 +1031,7 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%s %p)\n", source, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFMediaSource) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || @@ -1045,7 +1045,7 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID } else { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); + FIXME("%s, %p.\n", debugstr_guid(riid), out); *out = NULL; return E_NOINTERFACE; } @@ -1059,7 +1059,7 @@ static ULONG WINAPI media_source_AddRef(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); ULONG ref = InterlockedIncrement(&source->ref); - TRACE("(%p) ref=%u\n", source, ref); + TRACE("%p, refcount %u.\n", iface, ref); return ref; } @@ -1069,7 +1069,7 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); ULONG ref = InterlockedDecrement(&source->ref); - TRACE("(%p) ref=%u\n", source, ref); + TRACE("%p, refcount %u.\n", iface, ref); if (!ref) { @@ -1085,7 +1085,7 @@ static HRESULT WINAPI media_source_GetEvent(IMFMediaSource *iface, DWORD flags, { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%#x, %p)\n", source, flags, event); + TRACE("%p, %#x, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event); } @@ -1094,7 +1094,7 @@ static HRESULT WINAPI media_source_BeginGetEvent(IMFMediaSource *iface, IMFAsync { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p, %p)\n", source, callback, state); + TRACE("%p, %p, %p.\n", iface, callback, state); return IMFMediaEventQueue_BeginGetEvent(source->event_queue, callback, state); } @@ -1103,7 +1103,7 @@ static HRESULT WINAPI media_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncRe { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p, %p)\n", source, result, event); + TRACE("%p, %p, %p.\n", iface, result, event); return IMFMediaEventQueue_EndGetEvent(source->event_queue, result, event); } @@ -1113,7 +1113,7 @@ static HRESULT WINAPI media_source_QueueEvent(IMFMediaSource *iface, MediaEventT { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%d, %s, %#x, %p)\n", source, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value); } @@ -1122,7 +1122,7 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p)\n", source, characteristics); + TRACE("%p, %p.\n", iface, characteristics); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1136,7 +1136,7 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource * { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p)\n", source, descriptor); + TRACE("%p, %p.\n", iface, descriptor); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1151,7 +1151,7 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD struct source_async_command *command; HRESULT hr; - TRACE("(%p)->(%p, %p, %p)\n", source, descriptor, time_format, position); + TRACE("%p, %p, %p, %p.\n", iface, descriptor, time_format, position); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1177,7 +1177,7 @@ static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) struct source_async_command *command; HRESULT hr; - TRACE("(%p)\n", source); + TRACE("%p.\n", iface); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1192,7 +1192,7 @@ static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p): stub\n", source); + FIXME("%p: stub\n", iface); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1205,7 +1205,7 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); unsigned int i; - TRACE("(%p)\n", source); + TRACE("%p.\n", iface); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1731,7 +1731,7 @@ static HRESULT WINAPI winegstreamer_stream_handler_callback_GetParameters(IMFAsy static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_stream_handler *This, WCHAR *url, IMFByteStream *stream, DWORD flags, IPropertyStore *props, IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) { - TRACE("(%p %s %p %u %p %p %p)\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); + TRACE("%p, %s, %p, %u, %p, %p, %p.\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); if (flags & MF_RESOLUTION_MEDIASOURCE) { -- 2.30.2

1 0

[PATCH] user32/tests: Fix the keyboard layout id in an ok() message.
by Francois Gouget 16 Jul '21

16 Jul '21

The keyboard layout being tested is not the thread's default keyboard layout. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- See also https://bugs.winehq.org/show_bug.cgi?id=51478 dlls/user32/tests/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 654cabb76d9..08323c4f40e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3166,7 +3166,7 @@ static void test_keyboard_layout_name(void) swprintf( tmpklid, KL_NAMELENGTH, L"%08X", layouts_preload[j] ); if (!wcscmp( tmpklid, klid )) break; } - ok(j < len, "Could not find keyboard layout %p in preload list\n", layout); + ok(j < len, "Could not find keyboard layout %s in preload list\n", wine_dbgstr_w(klid)); if (id & 0x80000000) { -- 2.20.1

2 1

[PATCH 1/3] oleaut32/tests: Use EQ_DOUBLE() in vartype too.
by Francois Gouget 16 Jul '21

16 Jul '21

This simplifies the code and fixes support for negative values. Also trim unnecessary spaces from the EXPECT_DBL() failure messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartype.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c69db6cba17..aa57fb44142 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -50,6 +50,11 @@ DEFINE_GUID(UUID_test_struct, 0x4029f190, 0xca4a, 0x4611, 0xae,0xb9,0x67,0x39,0x # endif #endif +/* When comparing floating point values we cannot expect an exact match + * because the rounding errors depend on the exact algorithm. + */ +#define EQ_DOUBLE(a,b) (fabs((a)-(b)) / (1.0+fabs(a)+fabs(b)) < 1e-14) + static HMODULE hOleaut32; /* Has I8/UI8 data type? */ @@ -77,7 +82,7 @@ static BOOL has_locales; ok(hres == S_OK && out == (CONV_TYPE)(x), "expected " #x ", got " fs "; hres=0x%08x\n", out, hres) #define EXPECT(x) EXPECTRES(S_OK, (x)) #define EXPECT_DBL(x) \ - ok(hres == S_OK && fabs(out-(x))<=1e-14*(x), "expected %16.16g, got %16.16g; hres=0x%08x\n", (x), out, hres) + ok(hres == S_OK && EQ_DOUBLE(out, (x)), "expected %.16g, got %.16g; hres=0x%08x\n", (x), out, hres) #define CONVERT(func, val) in = val; hres = func(in, &out) #define CONVERTRANGE(func,start,end) for (i = start; i < end; i+=1) { CONVERT(func, i); EXPECT(i); }; -- 2.20.1

2 3

[PATCH 1/2] oleaut32/tests: Allow testing VarParseNumFromStr() using Unicode strings.
by Francois Gouget 16 Jul '21

16 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9a9ded10406..9fdd86956d8 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1262,21 +1262,27 @@ static void test_VariantCopyInd(void) "CopyInd(ref->ref): expected E_INVALIDARG, got 0x%08x\n", hres); } -static HRESULT (WINAPI *pVarParseNumFromStr)(OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); +static HRESULT (WINAPI *pVarParseNumFromStr)(const OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); /* Macros for converting and testing the result of VarParseNumFromStr */ #define FAILDIG 255 -static HRESULT convert_str( const char *str, INT dig, ULONG flags, +static HRESULT wconvert_str( const OLECHAR *str, INT dig, ULONG flags, NUMPARSE *np, BYTE rgb[128], LCID lcid ) { - OLECHAR buff[128]; - MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff )); memset( rgb, FAILDIG, 128 ); memset( np, 255, sizeof(*np) ); np->cDig = dig; np->dwInFlags = flags; - return pVarParseNumFromStr( buff, lcid, LOCALE_NOUSEROVERRIDE, np, rgb); + return pVarParseNumFromStr( str, lcid, LOCALE_NOUSEROVERRIDE, np, rgb); +} + +static HRESULT convert_str( const char *str, INT dig, ULONG flags, + NUMPARSE *np, BYTE rgb[128], LCID lcid ) +{ + OLECHAR buff[128]; + MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff )); + return wconvert_str(buff, dig, flags, np, rgb, lcid); } static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULONG b, ULONG c, @@ -1293,6 +1299,8 @@ static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULON } } +#define WCONVERTN(str,dig,flags) hres = wconvert_str( str, dig, flags, &np, rgb, lcid ) +#define WCONVERT(str,flags) WCONVERTN(str,sizeof(rgb),flags) #define CONVERTN(str,dig,flags) hres = convert_str( str, dig, flags, &np, rgb, lcid ) #define CONVERT(str,flags) CONVERTN(str,sizeof(rgb),flags) #define EXPECT(a,b,c,d,e,f) expect_NumFromStr( __LINE__, hres, &np, a, b, c, d, e, f ) @@ -1307,7 +1315,6 @@ static void test_VarParseNumFromStr(void) LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); NUMPARSE np; BYTE rgb[128]; - WCHAR str[128]; /** No flags **/ @@ -1731,10 +1738,9 @@ static void test_VarParseNumFromStr(void) EXPECT(1,NUMPRS_STD,NUMPRS_DECIMAL,4,0,-1); EXPECT2(1,0); - str[0] = 0x0660; - str[1] = 0; - hres = pVarParseNumFromStr(str, lcid, LOCALE_NOUSEROVERRIDE, &np, rgb); - ok(hres == DISP_E_TYPEMISMATCH, "VarParseNumFromStr returned %08x\n", hres); + /* Arabic numerals are not allowed "0" */ + WCONVERT(L"\x660", NUMPRS_STD); + EXPECTFAIL; } static HRESULT (WINAPI *pVarNumFromParseNum)(NUMPARSE*,BYTE*,ULONG,VARIANT*); -- 2.20.1

1 1

[PATCH] oleaut32: Fix the Var*FromStr() prototypes.
by Francois Gouget 16 Jul '21

16 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The only non-totally-trivial change is the VarDateFromStr() implementation. --- dlls/oleaut32/variant.c | 2 +- dlls/oleaut32/vartype.c | 35 ++++++++++++++++++----------------- include/oleauto.h | 30 +++++++++++++++--------------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b3a568c355c..fdc402c7a62 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1607,7 +1607,7 @@ static inline BOOL is_digit(WCHAR c) * - I am unsure if this function should parse non-Arabic (e.g. Thai) * numerals, so this has not been implemented. */ -HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, +HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, NUMPARSE *pNumprs, BYTE *rgbDig) { VARIANT_NUMBER_CHARS chars; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 4e3c4419567..5eacd43c5ae 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -84,7 +84,7 @@ static inline void VARIANT_CopyData(const VARIANT *srcVar, VARTYPE vt, void *pOu /* Coerce VT_BSTR to a numeric type */ -static HRESULT VARIANT_NumberFromBstr(OLECHAR* pStrIn, LCID lcid, ULONG ulFlags, +static HRESULT VARIANT_NumberFromBstr(const OLECHAR* pStrIn, LCID lcid, ULONG ulFlags, void* pOut, VARTYPE vt) { VARIANTARG dstVar; @@ -421,7 +421,7 @@ HRESULT WINAPI VarI1FromCy(CY cyIn, signed char* pcOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, signed char* pcOut) +HRESULT WINAPI VarI1FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, signed char* pcOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pcOut, VT_I1); } @@ -714,7 +714,7 @@ HRESULT WINAPI VarUI1FromDate(DATE dateIn, BYTE* pbOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarUI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut) +HRESULT WINAPI VarUI1FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pbOut, VT_UI1); } @@ -1015,7 +1015,7 @@ HRESULT WINAPI VarI2FromDate(DATE dateIn, SHORT* psOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, SHORT* psOut) +HRESULT WINAPI VarI2FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, SHORT* psOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, psOut, VT_I2); } @@ -1329,7 +1329,7 @@ HRESULT WINAPI VarUI2FromCy(CY cyIn, USHORT* pusOut) * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarUI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, USHORT* pusOut) +HRESULT WINAPI VarUI2FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, USHORT* pusOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pusOut, VT_UI2); } @@ -1605,7 +1605,7 @@ HRESULT WINAPI VarI4FromDate(DATE dateIn, LONG *piOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if strIn cannot be converted */ -HRESULT WINAPI VarI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG *piOut) +HRESULT WINAPI VarI4FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG *piOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, piOut, VT_I4); } @@ -1914,7 +1914,7 @@ HRESULT WINAPI VarUI4FromCy(CY cyIn, ULONG *pulOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if strIn cannot be converted */ -HRESULT WINAPI VarUI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG *pulOut) +HRESULT WINAPI VarUI4FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG *pulOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pulOut, VT_UI4); } @@ -2221,7 +2221,7 @@ HRESULT WINAPI VarI8FromDate(DATE dateIn, LONG64* pi64Out) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarI8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG64* pi64Out) +HRESULT WINAPI VarI8FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG64* pi64Out) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pi64Out, VT_I8); } @@ -2549,7 +2549,7 @@ HRESULT WINAPI VarUI8FromDate(DATE dateIn, ULONG64* pui64Out) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarUI8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG64* pui64Out) +HRESULT WINAPI VarUI8FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG64* pui64Out) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pui64Out, VT_UI8); } @@ -2824,7 +2824,7 @@ HRESULT WINAPI VarR4FromDate(DATE dateIn, float *pFltOut) * Failure: E_INVALIDARG, if strIn or pFltOut is invalid. * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarR4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, float *pFltOut) +HRESULT WINAPI VarR4FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, float *pFltOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pFltOut, VT_R4); } @@ -3145,7 +3145,7 @@ HRESULT WINAPI VarR8FromDate(DATE dateIn, double *pDblOut) * Failure: E_INVALIDARG, if strIn or pDblOut is invalid. * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarR8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, double *pDblOut) +HRESULT WINAPI VarR8FromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, double *pDblOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pDblOut, VT_R8); } @@ -3569,7 +3569,7 @@ HRESULT WINAPI VarCyFromDate(DATE dateIn, CY* pCyOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarCyFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, CY* pCyOut) +HRESULT WINAPI VarCyFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, CY* pCyOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pCyOut, VT_CY); } @@ -4267,7 +4267,7 @@ HRESULT WINAPI VarDecFromCy(CY cyIn, DECIMAL* pDecOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarDecFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DECIMAL* pDecOut) +HRESULT WINAPI VarDecFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DECIMAL* pDecOut) { return VARIANT_NumberFromBstr(strIn, lcid, dwFlags, pDecOut, VT_DECIMAL); } @@ -6108,7 +6108,7 @@ static BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) * - If the text is not numeric and does not match any of the above, then * DISP_E_TYPEMISMATCH is returned. */ -HRESULT WINAPI VarBoolFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL *pBoolOut) +HRESULT WINAPI VarBoolFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL *pBoolOut) { WCHAR szBuff[64]; LANGID langId = MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT); @@ -7595,7 +7595,7 @@ VARIANT_MakeDate_OK: * the date is invalid in that format, in which the most compatible format * that produces a valid date will be used. */ -HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pdateOut) +HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pdateOut) { static const USHORT ParseDateTokens[] = { @@ -7664,14 +7664,15 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd { if ('0' <= *strIn && *strIn <= '9') { + OLECHAR* end; if (dp.dwCount >= 6) { hRet = DISP_E_TYPEMISMATCH; break; } - dp.dwValues[dp.dwCount] = wcstoul(strIn, &strIn, 10); + dp.dwValues[dp.dwCount] = wcstoul(strIn, &end, 10); dp.dwCount++; - strIn--; + strIn = end - 1; } else if (iswalpha(*strIn)) { diff --git a/include/oleauto.h b/include/oleauto.h index f00bfa0c7f8..1d15efd26f3 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -237,7 +237,7 @@ HRESULT WINAPI VarUI1FromI1(signed char,BYTE*); HRESULT WINAPI VarUI1FromUI2(USHORT,BYTE*); HRESULT WINAPI VarUI1FromUI4(ULONG,BYTE*); HRESULT WINAPI VarUI1FromUI8(ULONG64,BYTE*); -HRESULT WINAPI VarUI1FromStr(OLECHAR*,LCID,ULONG,BYTE*); +HRESULT WINAPI VarUI1FromStr(const OLECHAR*,LCID,ULONG,BYTE*); HRESULT WINAPI VarUI1FromCy(CY,BYTE*); HRESULT WINAPI VarUI1FromDec(const DECIMAL*,BYTE*); HRESULT WINAPI VarUI1FromDisp(IDispatch*,LCID,BYTE*); @@ -253,7 +253,7 @@ HRESULT WINAPI VarI2FromI1(signed char,SHORT*); HRESULT WINAPI VarI2FromUI2(USHORT,SHORT*); HRESULT WINAPI VarI2FromUI4(ULONG,SHORT*); HRESULT WINAPI VarI2FromUI8(ULONG64,SHORT*); -HRESULT WINAPI VarI2FromStr(OLECHAR*,LCID,ULONG,SHORT*); +HRESULT WINAPI VarI2FromStr(const OLECHAR*,LCID,ULONG,SHORT*); HRESULT WINAPI VarI2FromCy(CY,SHORT*); HRESULT WINAPI VarI2FromDec(const DECIMAL*,SHORT*); HRESULT WINAPI VarI2FromDisp(IDispatch*,LCID,SHORT*); @@ -269,7 +269,7 @@ HRESULT WINAPI VarI4FromI1(signed char,LONG*); HRESULT WINAPI VarI4FromUI2(USHORT,LONG*); HRESULT WINAPI VarI4FromUI4(ULONG,LONG*); HRESULT WINAPI VarI4FromUI8(ULONG64,LONG*); -HRESULT WINAPI VarI4FromStr(OLECHAR*,LCID,ULONG,LONG*); +HRESULT WINAPI VarI4FromStr(const OLECHAR*,LCID,ULONG,LONG*); HRESULT WINAPI VarI4FromCy(CY,LONG*); HRESULT WINAPI VarI4FromDec(const DECIMAL*,LONG*); HRESULT WINAPI VarI4FromDisp(IDispatch*,LCID,LONG*); @@ -280,7 +280,7 @@ HRESULT WINAPI VarI8FromI4(LONG,LONG64*); HRESULT WINAPI VarI8FromR4(FLOAT,LONG64*); HRESULT WINAPI VarI8FromR8(DOUBLE,LONG64*); HRESULT WINAPI VarI8FromDate(DATE,LONG64*); -HRESULT WINAPI VarI8FromStr(OLECHAR*,LCID,ULONG,LONG64*); +HRESULT WINAPI VarI8FromStr(const OLECHAR*,LCID,ULONG,LONG64*); HRESULT WINAPI VarI8FromBool(VARIANT_BOOL,LONG64*); HRESULT WINAPI VarI8FromI1(signed char,LONG64*); HRESULT WINAPI VarI8FromUI2(USHORT,LONG64*); @@ -302,7 +302,7 @@ HRESULT WINAPI VarR4FromI1(signed char,FLOAT*); HRESULT WINAPI VarR4FromUI2(USHORT,FLOAT*); HRESULT WINAPI VarR4FromUI4(ULONG,FLOAT*); HRESULT WINAPI VarR4FromUI8(ULONG64,FLOAT*); -HRESULT WINAPI VarR4FromStr(OLECHAR*,LCID,ULONG,FLOAT*); +HRESULT WINAPI VarR4FromStr(const OLECHAR*,LCID,ULONG,FLOAT*); HRESULT WINAPI VarR4FromCy(CY,FLOAT*); HRESULT WINAPI VarR4FromDec(const DECIMAL*,FLOAT*); HRESULT WINAPI VarR4FromDisp(IDispatch*,LCID,FLOAT*); @@ -318,7 +318,7 @@ HRESULT WINAPI VarR8FromI1(signed char,double*); HRESULT WINAPI VarR8FromUI2(USHORT,double*); HRESULT WINAPI VarR8FromUI4(ULONG,double*); HRESULT WINAPI VarR8FromUI8(ULONG64,double*); -HRESULT WINAPI VarR8FromStr(OLECHAR*,LCID,ULONG,double*); +HRESULT WINAPI VarR8FromStr(const OLECHAR*,LCID,ULONG,double*); HRESULT WINAPI VarR8FromCy(CY,double*); HRESULT WINAPI VarR8FromDec(const DECIMAL*,double*); HRESULT WINAPI VarR8FromDisp(IDispatch*,LCID,double*); @@ -329,7 +329,7 @@ HRESULT WINAPI VarDateFromI4(LONG,DATE*); HRESULT WINAPI VarDateFromI8(LONG64,DATE*); HRESULT WINAPI VarDateFromR4(FLOAT,DATE*); HRESULT WINAPI VarDateFromR8(DOUBLE,DATE*); -HRESULT WINAPI VarDateFromStr(OLECHAR*,LCID,ULONG,DATE*); +HRESULT WINAPI VarDateFromStr(const OLECHAR*,LCID,ULONG,DATE*); HRESULT WINAPI VarDateFromI1(signed char,DATE*); HRESULT WINAPI VarDateFromUI2(USHORT,DATE*); HRESULT WINAPI VarDateFromUI4(ULONG,DATE*); @@ -346,7 +346,7 @@ HRESULT WINAPI VarCyFromI8(LONG64,CY*); HRESULT WINAPI VarCyFromR4(FLOAT,CY*); HRESULT WINAPI VarCyFromR8(DOUBLE,CY*); HRESULT WINAPI VarCyFromDate(DATE,CY*); -HRESULT WINAPI VarCyFromStr(OLECHAR*,LCID,ULONG,CY*); +HRESULT WINAPI VarCyFromStr(const OLECHAR*,LCID,ULONG,CY*); HRESULT WINAPI VarCyFromBool(VARIANT_BOOL,CY*); HRESULT WINAPI VarCyFromI1(signed char,CY*); HRESULT WINAPI VarCyFromUI2(USHORT,CY*); @@ -378,7 +378,7 @@ HRESULT WINAPI VarBoolFromI8(LONG64,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromR4(FLOAT,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromR8(DOUBLE,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromDate(DATE,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromStr(OLECHAR*,LCID,ULONG,VARIANT_BOOL*); +HRESULT WINAPI VarBoolFromStr(const OLECHAR*,LCID,ULONG,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromI1(signed char,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI2(USHORT,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI4(ULONG,VARIANT_BOOL*); @@ -394,7 +394,7 @@ HRESULT WINAPI VarI1FromI8(LONG64,signed char*); HRESULT WINAPI VarI1FromR4(FLOAT,signed char*); HRESULT WINAPI VarI1FromR8(DOUBLE,signed char*); HRESULT WINAPI VarI1FromDate(DATE,signed char*); -HRESULT WINAPI VarI1FromStr(OLECHAR*,LCID,ULONG,signed char*); +HRESULT WINAPI VarI1FromStr(const OLECHAR*,LCID,ULONG,signed char*); HRESULT WINAPI VarI1FromBool(VARIANT_BOOL,signed char*); HRESULT WINAPI VarI1FromUI2(USHORT,signed char*); HRESULT WINAPI VarI1FromUI4(ULONG,signed char*); @@ -410,7 +410,7 @@ HRESULT WINAPI VarUI2FromI8(LONG64,USHORT*); HRESULT WINAPI VarUI2FromR4(FLOAT,USHORT*); HRESULT WINAPI VarUI2FromR8(DOUBLE,USHORT*); HRESULT WINAPI VarUI2FromDate(DATE,USHORT*); -HRESULT WINAPI VarUI2FromStr(OLECHAR*,LCID,ULONG,USHORT*); +HRESULT WINAPI VarUI2FromStr(const OLECHAR*,LCID,ULONG,USHORT*); HRESULT WINAPI VarUI2FromBool(VARIANT_BOOL,USHORT*); HRESULT WINAPI VarUI2FromI1(signed char,USHORT*); HRESULT WINAPI VarUI2FromUI4(ULONG,USHORT*); @@ -419,7 +419,7 @@ HRESULT WINAPI VarUI2FromCy(CY,USHORT*); HRESULT WINAPI VarUI2FromDec(const DECIMAL*,USHORT*); HRESULT WINAPI VarUI2FromDisp(IDispatch*,LCID,USHORT*); -HRESULT WINAPI VarUI4FromStr(OLECHAR*,LCID,ULONG,ULONG*); +HRESULT WINAPI VarUI4FromStr(const OLECHAR*,LCID,ULONG,ULONG*); HRESULT WINAPI VarUI4FromUI1(BYTE,ULONG*); HRESULT WINAPI VarUI4FromI2(SHORT,ULONG*); HRESULT WINAPI VarUI4FromI4(LONG,ULONG*); @@ -442,7 +442,7 @@ HRESULT WINAPI VarUI8FromI8(LONG64,ULONG64*); HRESULT WINAPI VarUI8FromR4(FLOAT,ULONG64*); HRESULT WINAPI VarUI8FromR8(DOUBLE,ULONG64*); HRESULT WINAPI VarUI8FromDate(DATE,ULONG64*); -HRESULT WINAPI VarUI8FromStr(OLECHAR*,LCID,ULONG,ULONG64*); +HRESULT WINAPI VarUI8FromStr(const OLECHAR*,LCID,ULONG,ULONG64*); HRESULT WINAPI VarUI8FromBool(VARIANT_BOOL,ULONG64*); HRESULT WINAPI VarUI8FromI1(signed char,ULONG64*); HRESULT WINAPI VarUI8FromUI2(USHORT,ULONG64*); @@ -459,7 +459,7 @@ HRESULT WINAPI VarDecFromI8(LONG64,DECIMAL*); HRESULT WINAPI VarDecFromR4(FLOAT,DECIMAL*); HRESULT WINAPI VarDecFromR8(DOUBLE,DECIMAL*); HRESULT WINAPI VarDecFromDate(DATE,DECIMAL*); -HRESULT WINAPI VarDecFromStr(OLECHAR*,LCID,ULONG,DECIMAL*); +HRESULT WINAPI VarDecFromStr(const OLECHAR*,LCID,ULONG,DECIMAL*); HRESULT WINAPI VarDecFromBool(VARIANT_BOOL,DECIMAL*); HRESULT WINAPI VarDecFromI1(signed char,DECIMAL*); HRESULT WINAPI VarDecFromUI2(USHORT,DECIMAL*); @@ -647,7 +647,7 @@ typedef struct #define VTBIT_CY (1 << VT_CY) #define VTBIT_DECIMAL (1 << VT_DECIMAL) -HRESULT WINAPI VarParseNumFromStr(OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); +HRESULT WINAPI VarParseNumFromStr(const OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); HRESULT WINAPI VarNumFromParseNum(NUMPARSE*,BYTE*,ULONG,VARIANT*); INT WINAPI DosDateTimeToVariantTime(USHORT,USHORT,double*); -- 2.20.1

1 0

[PATCH 2/2] include: Declare NTSTATUS in propvarutils.h
by Jacek Caban 16 Jul '21

16 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/propvarutil.h | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 1/2] include: Fix C++ InitPropVariantFromGUIDAsBuffer implementation.
by Jacek Caban 16 Jul '21

16 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/propvarutil.h | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH vkd3d 1/3] tests: Add tests for a UAV counter in a graphics pipeline.
by Conor McCarthy 16 Jul '21

16 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3892c1db..ab13f397 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21984,6 +21984,139 @@ static void test_decrement_uav_counter(void) destroy_test_context(&context); } +static void test_graphics_uav_counters(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_DESCRIPTOR_RANGE descriptor_ranges[1]; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + ID3D12DescriptorHeap *cpu_heap, *gpu_heap; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *buffer, *counter_buffer; + D3D12_ROOT_PARAMETER root_parameters[1]; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12CommandQueue *queue; + ID3D12Device *device; + uint32_t counter; + D3D12_BOX box; + HRESULT hr; + + static const uint32_t clear_value[4] = {0}; + static const DWORD ps_code[] = + { +#if 0 + RWStructuredBuffer<uint> u; + + void main() + { + uint i = u.IncrementCounter(); + ++u[i]; + } +#endif + 0x43425844, 0x951850a3, 0xb2e7dcee, 0x6195cf5f, 0x3e1e6220, 0x00000001, 0x000000fc, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000a8, 0x00000050, 0x0000002a, 0x0100086a, + 0x0480009e, 0x0011e000, 0x00000000, 0x00000004, 0x02000068, 0x00000001, 0x050000b2, 0x00100012, + 0x00000000, 0x0011e000, 0x00000000, 0x8b0000a7, 0x80002302, 0x00199983, 0x00100022, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0011e006, 0x00000000, 0x0700001e, 0x00100022, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x090000a8, 0x0011e012, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = 64; + desc.rt_height = 1; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_ranges[0].NumDescriptors = 1; + descriptor_ranges[0].BaseShaderRegister = 0; + descriptor_ranges[0].RegisterSpace = 0; + descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_signature_desc.NumParameters = 1; + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + + cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + gpu_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + + buffer = create_default_buffer(device, 64 * sizeof(uint32_t), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + counter_buffer = create_default_buffer(device, D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT + sizeof(uint32_t), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps, NULL); + + memset(&uav_desc, 0, sizeof(uav_desc)); + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.NumElements = 64; + uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, + get_cpu_descriptor_handle(&context, cpu_heap, 0)); + uav_desc.Buffer.CounterOffsetInBytes = D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT; + ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + get_cpu_descriptor_handle(&context, gpu_heap, 0)); + + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); + + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, + get_gpu_descriptor_handle(&context, gpu_heap, 0), + get_cpu_descriptor_handle(&context, cpu_heap, 0), + buffer, clear_value, 0, NULL); + uav_barrier(command_list, buffer); + + counter = 0; + upload_buffer_data(counter_buffer, uav_desc.Buffer.CounterOffsetInBytes, + sizeof(counter), &counter, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(gpu_heap)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + counter = read_uav_counter(&context, counter_buffer, uav_desc.Buffer.CounterOffsetInBytes); + todo + ok(counter == 64, "Got %u, expected 64.\n", counter); + + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + set_box(&box, 0, 0, 0, uav_desc.Buffer.NumElements, 1, 1); + todo + check_readback_data_uint(&rb, &box, 1, 0); + release_resource_readback(&rb); + + ID3D12Resource_Release(buffer); + ID3D12Resource_Release(counter_buffer); + ID3D12DescriptorHeap_Release(cpu_heap); + ID3D12DescriptorHeap_Release(gpu_heap); + destroy_test_context(&context); +} + static void test_atomic_instructions(void) { ID3D12Resource *ps_buffer, *cs_buffer, *cs_buffer2; @@ -34249,6 +34382,7 @@ START_TEST(d3d12) run_test(test_cs_uav_store); run_test(test_uav_counters); run_test(test_decrement_uav_counter); + run_test(test_graphics_uav_counters); run_test(test_atomic_instructions); run_test(test_buffer_srv); run_test(test_create_query_heap); -- 2.31.1

3 5

[PATCH vkd3d] vkd3d: Add missing parenthesis in vkd3d_init_format_info().
by Andrey Gusev 16 Jul '21

16 Jul '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- libs/vkd3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 08e6af9..ec2b4b3 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -399,7 +399,7 @@ HRESULT vkd3d_init_format_info(struct d3d12_device *device) if (FAILED(hr = vkd3d_init_depth_stencil_formats(device))) return hr; - if FAILED(hr = vkd3d_init_format_compatibility_lists(device)) + if (FAILED(hr = vkd3d_init_format_compatibility_lists(device))) vkd3d_cleanup_depth_stencil_formats(device); return hr; -- 2.31.1

2 1

[PATCH] msvcrt: Make the cosh/sinh/tanh functions NAN preserving
by Martin Storsjo 16 Jul '21

16 Jul '21

When a NAN is fed as input, return it as-is without mangling it through the calculation (which e.g. loses the sign of the input value). This fixes a regression in a testcase of mine, after switching to the internal implementation of these functions. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- As these routines are imported from musl, I guess I should try to upstream the same fix to them too. --- dlls/msvcrt/math.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ecf5fdce4d8..2a12c02a4f5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1139,6 +1139,9 @@ float CDECL coshf( float x ) UINT32 ui = *(UINT32*)&x; float t; + if (isnan(x)) + return x; + /* |x| */ ui &= 0x7fffffff; x = *(float*)&ui; @@ -1676,6 +1679,9 @@ float CDECL sinhf( float x ) UINT32 ui = *(UINT32*)&x; float t, h, absx; + if (isnan(x)) + return x; + h = 0.5; if (ui >> 31) h = -h; @@ -1877,6 +1883,9 @@ float CDECL tanhf( float x ) int sign; float t; + if (isnan(x)) + return x; + /* x = |x| */ sign = ui >> 31; ui &= 0x7fffffff; @@ -2769,6 +2778,9 @@ double CDECL cosh( double x ) UINT32 w; double t; + if (isnan(x)) + return x; + /* |x| */ ux &= (uint64_t)-1 / 2; x = *(double*)&ux; @@ -4035,6 +4047,9 @@ double CDECL sinh( double x ) UINT32 w; double t, h, absx; + if (isnan(x)) + return x; + h = 0.5; if (ux >> 63) h = -h; @@ -4322,6 +4337,9 @@ double CDECL tanh( double x ) int sign; double t; + if (isnan(x)) + return x; + /* x = |x| */ sign = ui >> 63; ui &= (UINT64)-1 / 2; -- 2.25.1

2 1

[PATCH v3 2/2] dbghelp: Initialize new structure members
by Alistair Leslie-Hughes 16 Jul '21

16 Jul '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/coff.c | 2 ++ dlls/dbghelp/dwarf.c | 2 ++ dlls/dbghelp/module.c | 4 ++++ dlls/dbghelp/msc.c | 4 ++++ dlls/dbghelp/stabs.c | 2 ++ 5 files changed, 14 insertions(+) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 285182f682a..769e2c54196 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -452,6 +452,8 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg) msc_dbg->module->module.TypeInfo = FALSE; msc_dbg->module->module.SourceIndexed = TRUE; msc_dbg->module->module.Publics = TRUE; + msc_dbg->module->module.MachineType = 0; + msc_dbg->module->module.Reserved = 0; ret = TRUE; } diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 53274c4f597..b9726f5f4c8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3561,6 +3561,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->module->module.TypeInfo = TRUE; dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; + dwarf2_modfmt->module->module.MachineType = 0; + dwarf2_modfmt->module->module.Reserved = 0; /* set the word_size for eh_frame parsing */ dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index cadb285accb..247aadcef0e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -207,6 +207,8 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->module.TypeInfo = FALSE; module->module.SourceIndexed = FALSE; module->module.Publics = FALSE; + module->module.MachineType = 0; + module->module.Reserved = 0; module->reloc_delta = 0; module->type = type; @@ -1201,6 +1203,8 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, mi64.TypeInfo = miw64.TypeInfo; mi64.SourceIndexed = miw64.SourceIndexed; mi64.Publics = miw64.Publics; + mi64.MachineType = miw64.MachineType; + mi64.Reserved = miw64.Reserved; memcpy(ModuleInfo, &mi64, ModuleInfo->SizeOfStruct); diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b6811ea97f5..51edcaa2210 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2901,6 +2901,8 @@ static BOOL pdb_process_file(const struct process* pcs, msc_dbg->module->module.TypeInfo = TRUE; msc_dbg->module->module.SourceIndexed = TRUE; msc_dbg->module->module.Publics = TRUE; + msc_dbg->module->module.MachineType = 0; + msc_dbg->module->module.Reserved = 0; } else { @@ -3343,6 +3345,8 @@ static BOOL codeview_process_info(const struct process* pcs, msc_dbg->module->module.TypeInfo = TRUE; msc_dbg->module->module.SourceIndexed = TRUE; msc_dbg->module->module.Publics = TRUE; + msc_dbg->module->module.MachineType = 0; + msc_dbg->module->module.Reserved = 0; codeview_clear_type_table(); ret = TRUE; break; diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 517299897c4..e6aacc063aa 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1676,6 +1676,8 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, module->module.TypeInfo = TRUE; module->module.SourceIndexed = TRUE; module->module.Publics = TRUE; + module->module.MachineType = 0; + module->module.Reserved = 0; done: HeapFree(GetProcessHeap(), 0, stabbuff); stabs_free_includes(); -- 2.30.2

2 1

[PATCH v3 1/2] include: Updated _IMAGEHLP_MODULEW64 stucture
by Alistair Leslie-Hughes 16 Jul '21

16 Jul '21

This aligns the structure to the be the same found in the 10.0.19041.0 SDK. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index 1b234899195..303c0109d1f 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -280,6 +280,8 @@ typedef struct _IMAGEHLP_MODULE64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; typedef struct _IMAGEHLP_MODULEW64 @@ -307,6 +309,8 @@ typedef struct _IMAGEHLP_MODULEW64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; #if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) -- 2.30.2

1 0

WoW64 on Catalina
by Theodore Dubois 16 Jul '21

16 Jul '21

The latest I've found is that Alexandre's favorite solution is to insert thunks between 32-bit PE libraries and 64 bit host interface libraries. At the time PE libraries weren't really a thing yet, but they seem to be now. Is the PE work in a state where it would be possible to start generating thunks? Is anyone working on this? ~Theodore

1 0

WoW64 on Catalina
by Theodore Dubois 16 Jul '21

16 Jul '21

The latest I've found is that Alexandre's favorite solution is to insert thunks between 32-bit PE libraries and 64 bit host interface libraries. At the time PE libraries weren't really a thing yet, but they seem to be now. Is the PE work in a state where it would be possible to start generating thunks? Is anyone working on this? ~Theodore

1 0

[PATCH] user32: During destroy, don't send WM_ERASEBKGND to parent window if WS_CHILD is not set
by Andrew Eikum 15 Jul '21

15 Jul '21

Prior to this change, Wine would hang during the DestroyWindow(child) call because it is waiting for the parent window thread to process a WM_ERASEBKGND message. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/user32/tests/msg.c | 130 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 6 +- 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..a3d30dd005b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11374,6 +11374,20 @@ static const struct message destroy_window_with_children[] = { { 0 } }; +static const struct message destroy_child_window_with_ws_child[] = { + { HCBT_DESTROYWND, hook }, + { WM_PARENTNOTIFY, sent }, + { WM_ERASEBKGND, sent }, + { 0 } +}; + +static const struct message destroy_child_window_no_ws_child[] = { + { HCBT_DESTROYWND, hook }, + { WM_PAINT, sent }, + { WM_ERASEBKGND, sent|beginpaint }, + { 0 } +}; + static void test_DestroyWindow(void) { BOOL ret; @@ -11478,6 +11492,121 @@ static void test_DestroyWindow(void) ok(!test, "wrong capture window %p\n", test); } +struct destroy_child_window_test_data { + HANDLE evt; + HWND parent; + BOOL stop_processing; + BOOL quit; +}; + +static DWORD WINAPI destroy_child_window_parent_threadproc(void *user) +{ + struct destroy_child_window_test_data *data = user; + + data->parent = CreateWindowA("TestWindowClass", "test parent", + WS_VISIBLE | WS_OVERLAPPEDWINDOW, 100, 200, 300, 400, + NULL, NULL, NULL, NULL); + + SetEvent(data->evt); + + while(!data->stop_processing) + flush_events(); + + SetEvent(data->evt); + + while(data->stop_processing) + Sleep(10); + + flush_events(); + + SetEvent(data->evt); + + while(!data->quit) + Sleep(10); + + DestroyWindow(data->parent); + + flush_events(); + + return 0; +} + +static void test_destroy_child_window(void) +{ + struct destroy_child_window_test_data data = {0}; + HWND child; + HANDLE parent_thread; + + /* create parent on this thread to demonstrate WM_ERASEBKGND message */ + data.parent = CreateWindowA("TestWindowClass", "test parent", + WS_VISIBLE | WS_OVERLAPPEDWINDOW, 100, 200, 300, 400, + NULL, NULL, NULL, NULL); + ok(data.parent != NULL, "parent window create failed\n"); + + child = CreateWindowA("SimpleWindowClass", "test child", + WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + 100, 200, 50, 50, NULL, NULL, NULL, NULL); + ok(child != NULL, "child window create failed\n"); + + SetWindowLongPtrW(child, GWL_STYLE, GetWindowLongPtrW(child, GWL_STYLE) | WS_CHILD); + SetParent(child, data.parent); + + ShowWindow(child, SW_SHOW); + ShowWindow(data.parent, SW_SHOW); + + flush_events(); + flush_sequence(); + + DestroyWindow(child); + + ok_sequence(destroy_child_window_with_ws_child, "destroy child with WS_CHILD", FALSE); + + DestroyWindow(data.parent); + + /* create parent on separate thread to demonstrate avoiding deadlock on WM_ERASEBKGND message */ + data.evt = CreateEventW(NULL, FALSE, FALSE, NULL); + + parent_thread = CreateThread(NULL, 0, destroy_child_window_parent_threadproc, &data, 0, NULL); + + WaitForSingleObject(data.evt, INFINITE); + ok(data.parent != NULL, "parent window create failed\n"); + + child = CreateWindowA("SimpleWindowClass", "test child", + WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + 100, 200, 50, 50, NULL, NULL, NULL, NULL); + ok(child != NULL, "child window create failed\n"); + + SetWindowLongPtrW(child, GWL_STYLE, GetWindowLongPtrW(child, GWL_STYLE) | WS_CHILD); + SetParent(child, data.parent); + + ShowWindow(child, SW_SHOW); + ShowWindow(data.parent, SW_SHOW); + + /* removing WS_CHILD avoids deadlock on WM_PARENTNOTIFY */ + SetWindowLongPtrW(child, GWL_STYLE, GetWindowLongPtrW(child, GWL_STYLE) & ~WS_CHILD); + + data.stop_processing = TRUE; + WaitForSingleObject(data.evt, INFINITE); + + flush_events(); + flush_sequence(); + + DestroyWindow(child); + + data.stop_processing = FALSE; + WaitForSingleObject(data.evt, INFINITE); + + ok_sequence(destroy_child_window_no_ws_child, "destroy child without WS_CHILD", FALSE); + + data.quit = TRUE; + WaitForSingleObject(parent_thread, INFINITE); + + flush_events(); + flush_sequence(); + + CloseHandle(data.evt); + CloseHandle(parent_thread); +} static const struct message WmDispatchPaint[] = { { WM_NCPAINT, sent }, @@ -18333,6 +18462,7 @@ START_TEST(msg) test_recursive_hook(); } test_DestroyWindow(); + test_destroy_child_window(); test_DispatchMessage(); test_SendMessageTimeout(); test_edit_messages(); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b5964..d047d714e79 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2367,8 +2367,10 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE)) { HWND parent = GetAncestor( winpos->hwnd, GA_PARENT ); - if (!parent || parent == GetDesktopWindow()) parent = winpos->hwnd; - erase_now( parent, 0 ); + if (!parent || parent == GetDesktopWindow()) + erase_now( winpos->hwnd, 0 ); + else if((GetWindowLongW(winpos->hwnd, GWL_STYLE) & WS_CHILD) == WS_CHILD) + erase_now( parent, 0 ); } /* Give newly shown windows a chance to redraw */ -- 2.32.0

3 3

[PATCH 1/5] crypt32: Rename "crl" and "cloned" to "dst" and "src" in CRL_clone().
by Zebediah Figura 15 Jul '21

15 Jul '21

"cloned" is very ambiguous and can be interpreted as the destination rather than the source. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/crypt32/crl.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 31bf35bd041..4dc77c2a246 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -40,40 +40,38 @@ static const context_vtbl_t crl_vtbl; static context_t *CRL_clone(context_t *context, WINECRYPT_CERTSTORE *store, BOOL use_link) { - crl_t *crl; + crl_t *dst; if(use_link) { - crl = (crl_t*)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context, store); - if(!crl) + if (!(dst = (crl_t *)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context, store))) return NULL; }else { - const crl_t *cloned = (const crl_t*)context; + const crl_t *src = (const crl_t*)context; DWORD size = 0; BOOL res; - crl = (crl_t*)Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, store); - if(!crl) + if (!(dst = (crl_t *)Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, store))) return NULL; - Context_CopyProperties(&crl->ctx, &cloned->ctx); + Context_CopyProperties(&dst->ctx, &src->ctx); - crl->ctx.dwCertEncodingType = cloned->ctx.dwCertEncodingType; - crl->ctx.pbCrlEncoded = CryptMemAlloc(cloned->ctx.cbCrlEncoded); - memcpy(crl->ctx.pbCrlEncoded, cloned->ctx.pbCrlEncoded, cloned->ctx.cbCrlEncoded); - crl->ctx.cbCrlEncoded = cloned->ctx.cbCrlEncoded; + dst->ctx.dwCertEncodingType = src->ctx.dwCertEncodingType; + dst->ctx.pbCrlEncoded = CryptMemAlloc(src->ctx.cbCrlEncoded); + memcpy(dst->ctx.pbCrlEncoded, src->ctx.pbCrlEncoded, src->ctx.cbCrlEncoded); + dst->ctx.cbCrlEncoded = src->ctx.cbCrlEncoded; - /* FIXME: We don't need to decode the object here, we could just clone crl info. */ - res = CryptDecodeObjectEx(crl->ctx.dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED, - crl->ctx.pbCrlEncoded, crl->ctx.cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, - &crl->ctx.pCrlInfo, &size); + /* FIXME: We don't need to decode the object here, we could just clone dst info. */ + res = CryptDecodeObjectEx(dst->ctx.dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED, + dst->ctx.pbCrlEncoded, dst->ctx.cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, + &dst->ctx.pCrlInfo, &size); if(!res) { - CertFreeCRLContext(&crl->ctx); + CertFreeCRLContext(&dst->ctx); return NULL; } } - crl->ctx.hCertStore = store; - return &crl->base; + dst->ctx.hCertStore = store; + return &dst->base; } static const context_vtbl_t crl_vtbl = { -- 2.30.2

1 4

[PATCH 1/4] reg/tests: Test use of registry views when exporting registry data
by Hugh McMaster 15 Jul '21

15 Jul '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/export.c | 165 ++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index af00262212b..79135b0efb0 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -216,6 +216,15 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg file2.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /reg:32 /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /reg:32 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /reg:64 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* Test registry export with an empty key */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -429,6 +438,150 @@ static void test_export(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } +static void create_test_key(REGSAM sam) +{ + HKEY hkey, subkey; + DWORD dword = 0x100; + + add_key(HKEY_LOCAL_MACHINE, KEY_BASE, sam, &hkey); + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + + add_key(hkey, "Subkey1", sam, &subkey); + add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); + add_value(subkey, "Undefined hex", 0x100, "%PATH%", 7); + close_key(subkey); + + close_key(hkey); +} + +static const char *registry_view_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_LOCAL_MACHINE\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n" + "[HKEY_LOCAL_MACHINE\\" KEY_BASE "\\Subkey1]\r\n" + "\"Binary\"=hex:11,22,33,44\r\n" + "\"Undefined hex\"=hex(100):25,50,41,54,48,25,00\r\n\r\n"; + +static void test_registry_view_win32(void) +{ + DWORD r; + BOOL is_wow64, is_win32; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win32 = !is_wow64 && (sizeof(void *) == sizeof(int)); + + if (!is_win32) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 32-bit registry view (32-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 64-bit registry view, which doesn't exist on 32-bit Windows */ + create_test_key(KEY_WOW64_64KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_win64(void) +{ + DWORD r; + BOOL is_wow64, is_win64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win64 = !is_wow64 && (sizeof(void *) > sizeof(int)); + + if (!is_win64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 32-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", registry_view_test, TODO_REG_COMPARE), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try exporting from the 64-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_wow64(void) +{ + DWORD r; + BOOL is_wow64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (!is_wow64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 32-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try exporting from the 64-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + START_TEST(export) { DWORD r; @@ -439,4 +592,16 @@ START_TEST(export) } test_export(); + + /* Check if reg.exe is running with elevated privileges */ + if (!is_elevated_process()) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping registry view tests\n"); + return; + } + + test_registry_view_win32(); + test_registry_view_win64(); + test_registry_view_wow64(); } -- 2.32.0

1 3

[PATCH] evr/mixer: Set MF_MT_INTERLACE_MODE for the mixer output types.
by Nikolay Sivov 15 Jul '21

15 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 21 ++++++++++++++++++++- dlls/evr/tests/evr.c | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 187a13be364..66c3960511a 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -657,11 +657,28 @@ static void video_mixer_append_rt_format(struct rt_format *rt_formats, unsigned *count += 1; } +static unsigned int video_mixer_get_interlace_mode_from_video_desc(const DXVA2_VideoDesc *video_desc) +{ + switch (video_desc->SampleFormat.SampleFormat) + { + case DXVA2_SampleFieldInterleavedEvenFirst: + return MFVideoInterlace_FieldInterleavedUpperFirst; + case DXVA2_SampleFieldInterleavedOddFirst: + return MFVideoInterlace_FieldInterleavedLowerFirst; + case DXVA2_SampleFieldSingleEven: + return MFVideoInterlace_FieldSingleUpper; + case DXVA2_SampleFieldSingleOdd: + return MFVideoInterlace_FieldSingleLower; + default: + return MFVideoInterlace_Progressive; + } +} + static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, IMFMediaType *media_type, IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) { - unsigned int i, j, format_count, count; + unsigned int i, j, format_count, count, interlace_mode; struct rt_format *rt_formats = NULL, *ptr; HRESULT hr = MF_E_INVALIDMEDIATYPE; MFVideoArea aperture; @@ -702,6 +719,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const memset(&aperture, 0, sizeof(aperture)); aperture.Area.cx = video_desc->SampleWidth; aperture.Area.cy = video_desc->SampleHeight; + interlace_mode = video_mixer_get_interlace_mode_from_video_desc(video_desc); for (i = 0; i < count; ++i) { IMFMediaType *rt_media_type; @@ -714,6 +732,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); IMFMediaType_SetBlob(rt_media_type, &MF_MT_GEOMETRIC_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); IMFMediaType_SetBlob(rt_media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); + IMFMediaType_SetUINT32(rt_media_type, &MF_MT_INTERLACE_MODE, interlace_mode); mixer->output.rt_formats[i].media_type = rt_media_type; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 91fff21ebed..d240ebe4456 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1056,6 +1056,9 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == MFVideoInterlace_Progressive, "Unexpected interlace mode.\n"); IMFMediaType_Release(media_type); } -- 2.30.2

1 0

[PATCH] secur32: Use default recv timeout function
by Alistair Leslie-Hughes 15 Jul '21

15 Jul '21

Fixes a regression introduced in b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27 The poll function currently always returns 0 which signals to gnutls that no data is available. However this might not be the case. Using the default gnutls_system_recv_timeout function returns the expect value when data is available. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=51440 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bcf38e3f23f..ff678c6cee1 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -62,6 +62,8 @@ static void (*pgnutls_transport_set_pull_timeout_function)(gnutls_session_t, int (*)(gnutls_transport_ptr_t, unsigned int)); static void (*pgnutls_dtls_set_mtu)(gnutls_session_t, unsigned int); +static int (*pgnutls_system_recv_timeout)(gnutls_transport_ptr_t, unsigned int); + /* Not present in gnutls version < 3.2.0. */ static int (*pgnutls_alpn_get_selected_protocol)(gnutls_session_t, gnutls_datum_t *); static int (*pgnutls_alpn_set_protocols)(gnutls_session_t, const gnutls_datum_t *, @@ -165,6 +167,12 @@ static void compat_gnutls_transport_set_pull_timeout_function(gnutls_session_t s FIXME("\n"); } +static int compat_gnutls_system_recv_timeout(gnutls_transport_ptr_t ptr, unsigned int ms) +{ + FIXME("\n"); + return -1; +} + static int compat_gnutls_privkey_export_x509(gnutls_privkey_t privkey, gnutls_x509_privkey_t *key) { FIXME("\n"); @@ -292,7 +300,8 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - return 0; + TRACE("\n"); + return pgnutls_system_recv_timeout(transport, timeout); } static BOOL CDECL schan_create_session(schan_session *session, schan_credentials *cred) @@ -1024,6 +1033,12 @@ static BOOL gnutls_initialize(void) WARN("gnutls_transport_set_pull_timeout_function not found\n"); pgnutls_transport_set_pull_timeout_function = compat_gnutls_transport_set_pull_timeout_function; } + + if (!(pgnutls_system_recv_timeout = dlsym(libgnutls_handle, "gnutls_system_recv_timeout"))) + { + WARN("gnutls_system_recv_timeout not found\n"); + pgnutls_system_recv_timeout = compat_gnutls_system_recv_timeout; + } if (!(pgnutls_alpn_set_protocols = dlsym(libgnutls_handle, "gnutls_alpn_set_protocols"))) { WARN("gnutls_alpn_set_protocols not found\n"); -- 2.30.2

2 1

[PATCH] shell32: Implement SHBindToObject.
by Dmitry Timoshkov 15 Jul '21

15 Jul '21

Based on SHBindToParent implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/pidl.c | 35 +++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 36 insertions(+) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index e2746deb483..c831b6da6f7 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1333,6 +1333,41 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI return hr; } +HRESULT WINAPI SHBindToObject(IShellFolder *psf, LPCITEMIDLIST pidl, IBindCtx *pbc, REFIID riid, void **ppv) +{ + IShellFolder *psfDesktop = NULL; + HRESULT hr; + + TRACE_(shell)("%p,%p,%p,%s,%p\n", psf, pidl, pbc, debugstr_guid(riid), ppv); + pdump(pidl); + + if (!ppv) + return E_INVALIDARG; + + *ppv = NULL; + + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + } + + if (_ILIsPidlSimple(pidl)) + /* we are on desktop level */ + hr = IShellFolder_QueryInterface(psf, riid, ppv); + else + hr = IShellFolder_BindToObject(psf, pidl, pbc, riid, ppv); + + if (psfDesktop) + IShellFolder_Release(psfDesktop); + + TRACE_(shell)("-- ppv=%p ret=0x%08x\n", *ppv, hr); + return hr; +} + + /************************************************************************* * SHParseDisplayName [SHELL32.@] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index d4571212cee..f8bf8f246e8 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -332,6 +332,7 @@ @ stdcall SHAddToRecentDocs (long ptr) @ stdcall SHAppBarMessage(long ptr) @ stdcall SHAssocEnumHandlers(wstr long ptr) +@ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) -- 2.31.1

1 0

[PATCH 00/10] Beefing up tests for dbghelp (v2)
by Eric Pouech 15 Jul '21

15 Jul '21

The following series beefs up the tests about dbghelp DLL and fixes a couple of bugs in dbghelp. The idea is to have a set of files to get debug info from (debuggee*.*). This is supported in two different ways: A) to be compiled directly inside dbghelp_test: the default tools and options used in Wine will be covered (now: cross compile + dwarf version 2 debug format) B) but also the ability to run the same tests on an external process + image (made mainly out of the debuggee*.* only files). The idea is of course to use different compilers, debug format, options, 32/64bit targets... Those alternate images **ARE NOT** part (for now) of winetest. Unfortunately, with Winetest Bot, the A) won't work under windows: debug format of dbghelp_test.exe is dwarf2, while native dbghelp doesn't support it. So the tests are skipped. Anyway, most of the Windows setup:s don't have native dbghelp.dll installed <g>, so that shouldn't change much. I locally test every patch with: - A) on 32bit Wine (mingw + dwarf2) - A) on 64bit Wine (mingw + dwarf2) - A) on Windows10 as PE64 (msc + pdb) - B) image: mingw + dwarf2 + target=PE64bit + option -O1 on 64bit Wine - B) image: mingw + dwarf2 + target=PE32bit + option -O1 on 32bit Wine - B) image: ms compiler + pdb + target=PE64bit + option /O1 on 64 bit Wine This serie will be continued with: 1) more tests (and more fixes) (around 20+ patches to come) 2) support of dwarf3 and 4 (around 70+ patches to come) I also plan to add more local tests (dwarf3 and dwarf4; WoW; PE32 + pdb on Wine, cross 32/64 bit between tester and debuggee, other options O2). Changes introduced in v2: - make sure that dbghelp_test.exe embedded as resource inside winetest.exe isn't stripped, so that on can access its debug information. tools/makedep.c is fixed accordingly. This should fix all the TestBot failures. - the existing tests (before this series) for dbghelp, could somehow work when no debug information is available. Make sure we don't change this behavior (v1 was skipping those tests when no debug info is avail) A+ --- Eric Pouech (10): tools/makedep: added support for not stripping some test modules dbghelp/tests: Added dedicated structure to control the debuggee dbghelp/tests: Added ability to launch an external process instead of debugging self dbghelp/tests: Now properly getting base of main module inside debuggee structure dbghelp/tests: Added two new compilation units (debuggee1.c and debuggee2.c) dbghelp/tests: now building inside each debuggee a manifest dbghelp/tests: StackWalk64 testing now support external process dbghelp/tests: Added tests about getting symbol information dbghelp: returns name of compiland in SymGetTypeInfo dbghelp: handling of complex location in dwarf dlls/dbghelp/dwarf.c | 1 - dlls/dbghelp/tests/Makefile.in | 4 +- dlls/dbghelp/tests/dbghelp.c | 547 +++++++++++++++++++++++++++++++-- dlls/dbghelp/tests/debuggee.h | 30 ++ dlls/dbghelp/tests/debuggee1.c | 115 +++++++ dlls/dbghelp/tests/debuggee2.c | 7 + dlls/dbghelp/type.c | 3 +- tools/makedep.c | 11 +- 8 files changed, 673 insertions(+), 45 deletions(-) create mode 100644 dlls/dbghelp/tests/debuggee.h create mode 100644 dlls/dbghelp/tests/debuggee1.c create mode 100644 dlls/dbghelp/tests/debuggee2.c

1 10

[PATCH v2] include: Updated _IMAGEHLP_MODULEW64 stucture
by Alistair Leslie-Hughes 15 Jul '21

15 Jul '21

This aligns the structure to the be the same found in the 10.0.19041.0 SDK. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index 1b234899195..303c0109d1f 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -280,6 +280,8 @@ typedef struct _IMAGEHLP_MODULE64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; typedef struct _IMAGEHLP_MODULEW64 @@ -307,6 +309,8 @@ typedef struct _IMAGEHLP_MODULEW64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; #if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) -- 2.30.2

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel