- wine-devel - winehq.org

[PATCH] include: Add some more TOM interfaces.
by Nikolay Sivov 04 Oct '21

04 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/tom.idl | 123 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 2 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index fda81777db0..940b1f2e52c 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -269,12 +269,131 @@ interface ITextDocument2Old : ITextDocument interface ITextDisplays; interface ITextFont2; interface ITextPara2; -interface ITextRange2; -interface ITextSelection2; interface ITextStory; interface ITextStoryRanges2; interface ITextStrings; +[ + object, + uuid(c241f5ef-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextRow : IDispatch +{ + HRESULT GetAlignment([retval, out] LONG *value); + HRESULT SetAlignment([in] LONG value); + HRESULT GetCellCount([retval, out] LONG *value); + HRESULT SetCellCount([in] LONG value); + HRESULT GetCellCountCache([retval, out] LONG *value); + HRESULT SetCellCountCache([in] LONG value); + HRESULT GetCellIndex([retval, out] LONG *value); + HRESULT SetCellIndex([in] LONG value); + HRESULT GetCellMargin([retval, out] LONG *value); + HRESULT SetCellMargin([in] LONG value); + HRESULT GetHeight([retval, out] LONG *value); + HRESULT SetHeight([in] LONG value); + HRESULT GetIndent([retval, out] LONG *value); + HRESULT SetIndent([in] LONG value); + HRESULT GetKeepTogether([retval, out] LONG *value); + HRESULT SetKeepTogether([in] LONG value); + HRESULT GetKeepWithNext([retval, out] LONG *value); + HRESULT SetKeepWithNext([in] LONG value); + HRESULT GetNestLevel([retval, out] LONG *value); + HRESULT GetRTL([retval, out] LONG *value); + HRESULT SetRTL([in] LONG value); + HRESULT GetCellAlignment([retval, out] LONG *value); + HRESULT SetCellAlignment([in] LONG value); + HRESULT GetCellColorBack([retval, out] LONG *value); + HRESULT SetCellColorBack([in] LONG value); + HRESULT GetCellColorFore([retval, out] LONG *value); + HRESULT SetCellColorFore([in] LONG value); + HRESULT GetCellMergeFlags([retval, out] LONG *value); + HRESULT SetCellMergeFlags([in] LONG value); + HRESULT GetCellShading([retval, out] LONG *value); + HRESULT SetCellShading([in] LONG value); + HRESULT GetCellVerticalText([retval, out] LONG *value); + HRESULT SetCellVerticalText([in] LONG value); + HRESULT GetCellWidth([retval, out] LONG *value); + HRESULT SetCellWidth([in] LONG value); + HRESULT GetCellBorderColors([out] LONG *left, [out] LONG *top, + [out] LONG *right, [out] LONG *bottom); + HRESULT GetCellBorderWidths([out] LONG *left, [out] LONG *top, + [out] LONG *right, [out] LONG *bottom); + HRESULT SetCellBorderColors([in] LONG left, [in] LONG top, + [in] LONG right, [in] LONG bottom); + HRESULT SetCellBorderWidths([in] LONG left, [in] LONG top, + [in] LONG right, [in] LONG bottom); + HRESULT Apply([in] LONG row, [in] LONG flags); + HRESULT CanChange([retval, out] LONG *value); + HRESULT GetProperty([in] LONG type, [out] LONG *value); + HRESULT Insert([in] LONG row); + HRESULT IsEqual([in] ITextRow *row, [retval, out] LONG *r); + HRESULT Reset([in] LONG value); + HRESULT SetProperty([in] LONG type, [in] LONG value); +} + +[ + object, + uuid(c241f5e2-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextRange2 : ITextSelection +{ + HRESULT GetCch([retval, out] LONG *count); + HRESULT GetCells([retval, out] IUnknown **cells); + HRESULT GetColumn([retval, out] IUnknown **column); + HRESULT GetCount([retval, out] LONG *count); + HRESULT GetDuplicate2([retval, out] ITextRange2 **range); + HRESULT GetFont2([retval, out] ITextFont2 **font); + HRESULT SetFont2([in] ITextFont2 *font); + HRESULT GetFormattedText2([retval, out] ITextRange2 **range); + HRESULT SetFormattedText2([in] ITextRange2 *range); + HRESULT GetGravity([retval, out] LONG *value); + HRESULT SetGravity([in] LONG value); + HRESULT GetPara2([retval, out] ITextPara2 **para); + HRESULT SetPara2([in] ITextPara2 *para); + HRESULT GetRow([retval, out] ITextRow **row); + HRESULT GetStartPara([retval, out] LONG *value); + HRESULT GetTable([retval, out] IUnknown **table); + HRESULT GetURL([retval, out] BSTR *url); + HRESULT SetURL([in] BSTR url); + HRESULT AddSubrange([in] LONG cp1, [in] LONG cp2, [in] LONG activate); + HRESULT BuildUpMath([in] LONG flags); + HRESULT DeleteSubrange([in] LONG first, [in] LONG lim); + HRESULT Find([in] ITextRange2 *range, [in] LONG count, [in] LONG flags, [out] LONG *delta); + HRESULT GetChar2([out] LONG *ch, [in] LONG offset); + HRESULT GetDropCap([out] LONG *line, [out] LONG *pos); + HRESULT GetInlineObject([out] LONG *type, [out] LONG *align, [out] LONG *ch, + [out] LONG *ch1, [out] LONG *ch2, [out] LONG *count, [out] LONG *texstyle, + [out] LONG *ccol, [out] LONG *level); + HRESULT GetProperty([in] LONG type, [out] LONG *value); + HRESULT GetRect([in] LONG type, [out] LONG *left, [out] LONG *top, + [out] LONG *right, [out] LONG *bottom, [out] LONG *hit); + HRESULT GetSubrange([in] LONG subrange, [out] LONG *first, [out] LONG *limit); + HRESULT GetText2([in] LONG flags, [out] BSTR *str); + HRESULT HexToUnicode(); + HRESULT InsertTable([in] LONG col, [in] LONG row, [in] LONG autofit); + HRESULT Linearize([in] LONG flags); + HRESULT SetActiveSubrange([in] LONG anchor, [in] LONG active); + HRESULT SetDropCap([in] LONG line, [in] LONG pos); + HRESULT SetProperty([in] LONG type, [in] LONG value); + HRESULT SetText2([in] LONG flags, [in] BSTR str); + HRESULT UnicodeToHex(); + HRESULT SetInlineObject([in] LONG type, [in] LONG align, [in] LONG ch, + [in] LONG ch1, [in] LONG ch2, [in] LONG count, [in] LONG texstyle, + [in] LONG ccol); + HRESULT GetMathFunctionType([in] BSTR str, [out] LONG *value); + HRESULT InsertImage([in] LONG width, [in] LONG height, [in] LONG ascent, + [in] LONG type, [in] BSTR alttext, [in] IStream *stream); +} + +[ + object, + uuid(c241f5e1-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextSelection2 : ITextRange2 +{ +} + + [ object, uuid(c241f5e0-7206-11d8-a2c7-00a0d1d6c6b3) -- 2.33.0

1 0

[PATCH] wintrust: Cache provider functions in WintrustLoadFunctionPointers().
by Paul Gofman 04 Oct '21

04 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- As comment in WINTRUST_ReadProviderFromReg() says, there is no way to free a provider and module references are just leaked. This can potentially overflow module LoadCount (which is currently 16 bit in Wine) if the app calls WintrustLoadFunctionPointers() a lot. Then there is a specific issue with DeathLoop where every LoadLibrary call triggers wintrust.WintrustLoadFunctionPointers() call (the process is triggered from LDR notification callback while the actual call is from another thread). The latter either deadlocks or (with WIP relaxed loader locking patches) triggers an infinite loop and eventually crashes. Caching the providers data solves both problems. dlls/wintrust/register.c | 60 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index effe9d18f20..b15fbe5ab35 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -34,6 +34,7 @@ #include "mssip.h" #include "wintrust_priv.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); @@ -835,6 +836,23 @@ error_close_key: return Func; } +static CRITICAL_SECTION cache_cs; +static CRITICAL_SECTION_DEBUG cache_cs_debug = +{ + 0, 0, &cache_cs, + { &cache_cs_debug.ProcessLocksList, &cache_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cache_cs") } +}; +static CRITICAL_SECTION cache_cs = { &cache_cs_debug, -1, 0, 0, 0, 0 }; + +static struct provider_cache_entry +{ + GUID guid; + CRYPT_PROVIDER_FUNCTIONS provider_functions; +} +*provider_cache; +static unsigned int provider_cache_size; + /*********************************************************************** * WintrustLoadFunctionPointers (WINTRUST.@) */ @@ -842,6 +860,8 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, CRYPT_PROVIDER_FUNCTIONS* pPfns ) { WCHAR GuidString[39]; + BOOL cached = FALSE; + unsigned int i; TRACE("(%s %p)\n", debugstr_guid(pgActionID), pPfns); @@ -853,6 +873,20 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, } if (pPfns->cbStruct != sizeof(CRYPT_PROVIDER_FUNCTIONS)) return FALSE; + EnterCriticalSection( &cache_cs ); + for (i = 0; i < provider_cache_size; ++i) + { + if (IsEqualGUID( &provider_cache[i].guid, pgActionID )) + { + TRACE( "Using cached data.\n" ); + *pPfns = provider_cache[i].provider_functions; + cached = TRUE; + break; + } + } + LeaveCriticalSection( &cache_cs ); + if (cached) return TRUE; + /* Create this string only once, instead of in the helper function */ WINTRUST_Guid2Wstr( pgActionID, GuidString); @@ -873,6 +907,32 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, pPfns->pfnTestFinalPolicy = (PFN_PROVIDER_TESTFINALPOLICY_CALL)WINTRUST_ReadProviderFromReg(GuidString, DiagnosticPolicy); pPfns->pfnCleanupPolicy = (PFN_PROVIDER_CLEANUP_CALL)WINTRUST_ReadProviderFromReg(GuidString, Cleanup); + EnterCriticalSection( &cache_cs ); + for (i = 0; i < provider_cache_size; ++i) + if (IsEqualGUID( &provider_cache[i].guid, pgActionID )) break; + + if (i == provider_cache_size) + { + struct provider_cache_entry *new; + + new = heap_realloc( provider_cache, (provider_cache_size + 1) * sizeof(*new) ); + if (new) + { + provider_cache = new; + ++provider_cache_size; + } + else + { + ERR( "No memory.\n" ); + } + } + if (i < provider_cache_size) + { + provider_cache[i].guid = *pgActionID; + provider_cache[i].provider_functions = *pPfns; + } + LeaveCriticalSection( &cache_cs ); + return TRUE; } -- 2.31.1

1 0

[PATCH v4] gdi32: Create the registry keys recursively, if needed.
by Gabriel Ivăncescu 04 Oct '21

04 Oct '21

Fixes a regression introduced by 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd when creating new prefixes, as NtCreateKey does not recursively create keys. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/gdi32/font.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98c70a6..9b3d3e2 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -29,6 +29,8 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -569,11 +571,13 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; OBJECT_ATTRIBUTES attr; + NTSTATUS status; HANDLE ret; attr.Length = sizeof(attr); @@ -583,7 +587,32 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + static const WCHAR registry_rootW[] = { '\\','R','e','g','i','s','t','r','y','\\' }; + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + /* don't try to create registry root */ + if (!root && len > 10 && !memcmp( name, registry_rootW, 10 )) i += 10; + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + if (!NT_SUCCESS(status)) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } return ret; } -- 2.31.1

1 0

[PATCH v3] gdi32: Create the registry keys recursively, if needed.
by Gabriel Ivăncescu 04 Oct '21

04 Oct '21

Fixes a regression introduced by 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd when creating new prefixes, as NtCreateKey does not recursively create keys. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Most of the code is taken from kernelbase's create_key, but simplified to gdi32's cases only. v3: Minor whitespace issue... dlls/gdi32/font.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98c70a6..87d7934 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -29,6 +29,8 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -569,11 +571,13 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; OBJECT_ATTRIBUTES attr; + NTSTATUS status; HANDLE ret; attr.Length = sizeof(attr); @@ -583,7 +587,28 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + if (!NT_SUCCESS(status)) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } return ret; } -- 2.31.1

4 8

[PATCH 1/7] mshtml: Adjust the IWineHTMLWindowPrivate ids.
by Gabriel Ivăncescu 04 Oct '21

04 Oct '21

So it doesn't clash with IHTMLWindow2, which uses low ids ('console' clashes with 'history'). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is a patch series pre-requisite for the proper toString() and object names implementations, which fixes a bunch of things and implements some missing bits first. It's needed for those tests to pass properly while testing almost all of the objects, and to avoid sending too many patches at once, I decided to split them up into multiple series. dlls/mshtml/mshtml_private_iface.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 491f4af..2292e2c 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -83,9 +83,9 @@ interface IWineMSHTMLConsole : IDispatch ] interface IWineHTMLWindowPrivate : IDispatch { - [id(1)] + [id(50)] HRESULT requestAnimationFrame([in] VARIANT *expr, [retval, out] VARIANT *timer_id); - [propget, id(2)] + [propget, id(51)] HRESULT console([retval, out] IDispatch **console); } -- 2.31.1

3 18

[PATCH 0/6 v3] Seventh step towards dwarf 3/4 support in wine
by Eric Pouech 04 Oct '21

04 Oct '21

V1: - partly committed V2: - added new SymTag* values in cvconst.h V3: - amend configure.ac patch for coherency of config options for regular and cross compilation (from Jacek's suggestions) A+ --- Eric Pouech (6): dbghelp/dwarf: downgrade FIXME into WARN for empty range dbghelp/dwarf: added support for local variables with constant values dbghelp/dwarf: fix incorrect WARN dbghelp/dwarf: Bumping max supported version (by default) up to 4 configure: allow picking up dwarf version for compilation from command line include/cvconst.h: added enumeration for newest SymTag values configure.ac | 15 ++++++++---- dlls/dbghelp/dbghelp_private.h | 4 ++++ dlls/dbghelp/dwarf.c | 43 ++++++++++++++++++++-------------- dlls/dbghelp/symbol.c | 39 ++++++++++++++++++++++++++++++ dlls/dbghelp/type.c | 15 ++++++++++-- include/cvconst.h | 14 ++++++++++- 6 files changed, 104 insertions(+), 26 deletions(-)

3 11

[PATCH] d3dx9/tests: Clean up GetMatrixPointerArray() tests.
by Matteo Bruni 04 Oct '21

04 Oct '21

Inspired by a patch from Eric Pouech. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Eric, can you test this patch and see if it still fixes the warnings with GCC 11? --- dlls/d3dx9_36/tests/effect.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 86edb1ac65c..7fce65548ec 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1470,20 +1470,28 @@ static void test_effect_parameter_value_GetMatrixArray(const struct test_effect_ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) { + union + { + float f[sizeof(D3DXMATRIX) / sizeof(float)]; + D3DXMATRIX m; + } fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE * sizeof(float) / sizeof(D3DXMATRIX)]; const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; HRESULT hr; - DWORD cmp = 0xabababab; - FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; + D3DXMATRIX *matrix_pointer_array[ARRAY_SIZE(fvalue)]; UINT l, k, m, element, err = 0; + union + { + DWORD d; + float f; + } cmp = {0xabababab}; for (element = 0; element <= res_desc->Elements + 1; ++element) { memset(fvalue, 0xab, sizeof(fvalue)); for (l = 0; l < element; ++l) { - matrix_pointer_array[l] = (D3DXMATRIX *)&fvalue[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; + matrix_pointer_array[l] = &fvalue[l].m; } hr = effect->lpVtbl->GetMatrixPointerArray(effect, parameter, matrix_pointer_array, element); if (!element) @@ -1491,7 +1499,10 @@ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_ ok(hr == D3D_OK, "%u - %s[%u]: GetMatrixPointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3D_OK); - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[l].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else if (element <= res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) { @@ -1506,20 +1517,27 @@ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_ { if (k < res_desc->Columns && l < res_desc->Rows) { - if (!compare_float(fvalue[m * 16 + l * 4 + k], get_float(res_desc->Type, + if (!compare_float(fvalue[m].m.m[l][k], get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512)) ++err; } - else if (fvalue[m * 16 + l * 4 + k] != 0.0f) ++err; + else if (fvalue[m].m.m[l][k] != 0.0f) + ++err; } } } - for (l = element * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = element; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else { - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; ok(hr == D3DERR_INVALIDCALL, "%u - %s[%u]: GetMatrixPointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3DERR_INVALIDCALL); -- 2.26.3

3 3

[PATCH 3/3] configure: Stop checking for poll.h and sys/poll.h - always use poll.h.
by Huw Davies 04 Oct '21

04 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 2 -- dlls/dinput/joystick_linux.c | 4 +--- dlls/dinput/joystick_linuxinput.c | 4 +--- dlls/iphlpapi/icmp.c | 4 +--- dlls/ntdll/unix/file.c | 2 -- dlls/ntdll/unix/serial.c | 4 +--- dlls/ntdll/unix/sync.c | 5 ----- dlls/winebus.sys/bus_udev.c | 7 +------ dlls/wineoss.drv/midi.c | 5 ----- dlls/winex11.drv/event.c | 5 ----- dlls/ws2_32/unixlib.c | 5 ----- programs/winedbg/gdbproxy.c | 4 +--- server/change.c | 4 +--- server/fd.c | 5 ----- server/file.c | 2 -- server/object.h | 4 +--- server/process.c | 2 -- server/queue.c | 4 +--- server/request.c | 2 -- server/serial.c | 2 -- server/signal.c | 5 ----- server/sock.c | 4 +--- server/thread.c | 2 -- 23 files changed, 10 insertions(+), 77 deletions(-) diff --git a/configure.ac b/configure.ac index 6e82e4fbb8d..649f1e7127a 100644 --- a/configure.ac +++ b/configure.ac @@ -482,7 +482,6 @@ AC_CHECK_HEADERS(\ netinet/tcp.h \ netinet/tcp_fsm.h \ pcap/pcap.h \ - poll.h \ port.h \ pthread.h \ pwd.h \ @@ -505,7 +504,6 @@ AC_CHECK_HEADERS(\ sys/modem.h \ sys/mtio.h \ sys/param.h \ - sys/poll.h \ sys/prctl.h \ sys/protosw.h \ sys/ptrace.h \ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5b54e352c20..6df479ebfa3 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -50,9 +50,7 @@ # include <linux/joystick.h> # undef SW_MAX #endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 949fd1da081..ed385ef5b01 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -46,9 +46,7 @@ # define HAS_PROPER_HEADER # endif #endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 8ef03219e52..29ea074a5ab 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -59,9 +59,7 @@ #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #define USE_WS_PREFIX diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 43e85b0c955..2798fac2678 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -40,9 +40,7 @@ #ifdef HAVE_MNTENT_H #include <mntent.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index ab2ef9330a5..cbcf223ca1d 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -49,9 +49,7 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #ifdef HAVE_SYS_MODEM_H # include <sys/modem.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 5a5d49bf4bd..d9d0736a055 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -38,12 +38,7 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index f7f507f4f1f..7b789684bbc 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -32,12 +32,7 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_POLL_H -# include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #ifdef HAVE_LIBUDEV_H # include <libudev.h> #endif diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 24b3e7037b0..1e72dfcf898 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -54,12 +54,7 @@ #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #include <sys/soundcard.h> #include "windef.h" diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1772a27c48b..4e401faf403 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -21,12 +21,7 @@ #include "config.h" -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #include <X11/Xatom.h> #include <X11/keysym.h> #include <X11/Xlib.h> diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 25a38b46758..67edf06368e 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -63,12 +63,7 @@ #ifdef HAVE_IFADDRS_H # include <ifaddrs.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b64abd6f205..f8d40f3ed32 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -34,9 +34,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif diff --git a/server/change.c b/server/change.c index 5edeebf89d3..2573a315657 100644 --- a/server/change.c +++ b/server/change.c @@ -32,9 +32,7 @@ #include <limits.h> #include <dirent.h> #include <errno.h> -#ifdef HAVE_POLL_H -# include <poll.h> -#endif +#include <poll.h> #ifdef HAVE_SYS_INOTIFY_H #include <sys/inotify.h> #endif diff --git a/server/fd.c b/server/fd.c index ad1b7a1bd4a..cc81be06086 100644 --- a/server/fd.c +++ b/server/fd.c @@ -32,12 +32,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #ifdef HAVE_LINUX_MAJOR_H #include <linux/major.h> #endif diff --git a/server/file.c b/server/file.c index 2c7cb0ce5ca..a5fd150b37f 100644 --- a/server/file.c +++ b/server/file.c @@ -36,9 +36,7 @@ #ifdef HAVE_UTIME_H #include <utime.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/object.h b/server/object.h index 039bf4e7d4e..465cd9bfc44 100644 --- a/server/object.h +++ b/server/object.h @@ -21,9 +21,7 @@ #ifndef __WINE_SERVER_OBJECT_H #define __WINE_SERVER_OBJECT_H -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif +#include <poll.h> #include <sys/time.h> #include "wine/server_protocol.h" diff --git a/server/process.c b/server/process.c index 8109fbe8de4..a2dfc1bc3ee 100644 --- a/server/process.c +++ b/server/process.c @@ -34,9 +34,7 @@ # include <sys/socket.h> #endif #include <unistd.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/queue.c b/server/queue.c index e4903bcb79f..b2a27fb9075 100644 --- a/server/queue.c +++ b/server/queue.c @@ -25,9 +25,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_POLL_H -# include <poll.h> -#endif +#include <poll.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/request.c b/server/request.c index 29b63600f15..5a952faf8aa 100644 --- a/server/request.c +++ b/server/request.c @@ -48,9 +48,7 @@ #include <sys/un.h> #endif #include <unistd.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif #ifdef __APPLE__ # include <mach/mach_time.h> #endif diff --git a/server/serial.c b/server/serial.c index bdc27de8e4f..19f5ca41ec6 100644 --- a/server/serial.c +++ b/server/serial.c @@ -42,9 +42,7 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/signal.c b/server/signal.c index 0c22c157f2b..19b76d44c16 100644 --- a/server/signal.c +++ b/server/signal.c @@ -23,12 +23,7 @@ #include <signal.h> #include <stdio.h> #include <sys/time.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> #endif diff --git a/server/sock.c b/server/sock.c index 7b00cb3f4f4..59a009852c3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -39,9 +39,7 @@ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif -#ifdef HAVE_POLL_H -# include <poll.h> -#endif +#include <poll.h> #include <sys/time.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H diff --git a/server/thread.c b/server/thread.c index 9d412106809..827d5737cb5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -32,9 +32,7 @@ #include <sys/types.h> #include <unistd.h> #include <time.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif #ifdef HAVE_SCHED_H #include <sched.h> #endif -- 2.23.0

1 0

[PATCH 2/3] configure: Stop checking for poll(2).
by Huw Davies 04 Oct '21

04 Oct '21

In most places we're not dealing with its absence correctly anyway. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 1 - programs/winedbg/gdbproxy.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 7e85e46b87b..6e82e4fbb8d 100644 --- a/configure.ac +++ b/configure.ac @@ -2144,7 +2144,6 @@ AC_CHECK_FUNCS(\ lstat \ mach_continuous_time \ pipe2 \ - poll \ port_create \ posix_fadvise \ posix_fallocate \ diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index fb875cd1b29..b64abd6f205 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -53,11 +53,6 @@ # include <unistd.h> #endif -/* if we don't have poll support on this system - * we won't provide gdb proxy support here... - */ -#ifdef HAVE_POLL - #include "debugger.h" #include "windef.h" @@ -2311,11 +2306,9 @@ static int gdb_remote(unsigned flags, unsigned port) wait(NULL); return 0; } -#endif int gdb_main(int argc, char* argv[]) { -#ifdef HAVE_POLL unsigned gdb_flags = 0, port = 0; char *port_end; @@ -2350,8 +2343,6 @@ int gdb_main(int argc, char* argv[]) if (dbg_active_attach(argc, argv) == start_ok || dbg_active_launch(argc, argv) == start_ok) return gdb_remote(gdb_flags, port); -#else - fprintf(stderr, "GdbProxy mode not supported on this platform\n"); -#endif + return -1; } -- 2.23.0

1 0

[PATCH 1/3] configure: No longer use libpoll.
by Huw Davies 04 Oct '21

04 Oct '21

This became unnecessary after macOS 10.5. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 6 ------ dlls/ws2_32/Makefile.in | 1 - programs/winedbg/Makefile.in | 1 - server/Makefile.in | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 913692c828a..7e85e46b87b 100644 --- a/configure.ac +++ b/configure.ac @@ -2166,12 +2166,6 @@ dnl Check for -ldl AC_SEARCH_LIBS(dlopen, dl) WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS]) -dnl Check for -lpoll for Mac OS X/Darwin -if test "$ac_cv_func_poll" = no -then - AC_CHECK_LIB(poll,poll,[AC_DEFINE(HAVE_POLL,1) AC_SUBST(POLL_LIBS,"-lpoll")]) -fi - dnl Check for -lnsl for Solaris AC_SEARCH_LIBS(gethostbyname, nsl) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index bf9018260a4..232ce7f31fd 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -2,7 +2,6 @@ MODULE = ws2_32.dll UNIXLIB = ws2_32.so IMPORTLIB = ws2_32 DELAYIMPORTS = advapi32 iphlpapi user32 -EXTRALIBS = $(POLL_LIBS) C_SRCS = \ async.c \ diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index bf036fc9b01..620b70bdf40 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -1,7 +1,6 @@ MODULE = winedbg.exe IMPORTS = dbghelp advapi32 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32 -EXTRALIBS = $(POLL_LIBS) EXTRADLLFLAGS = -mconsole -mcygwin diff --git a/server/Makefile.in b/server/Makefile.in index 4264e3db108..b6197cffec3 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -49,6 +49,6 @@ MANPAGES = \ wineserver.fr.UTF-8.man.in \ wineserver.man.in -EXTRALIBS = $(LDEXECFLAGS) $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS) +EXTRALIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) unicode_EXTRADEFS = -DNLSDIR="\"${nlsdir}\"" -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" -- 2.23.0

1 0

[PATCH 6/8] gdi32: Don't use RtlDosPathNameToNtPathName_U get_unix_file name.
by Jacek Caban 04 Oct '21

04 Oct '21

Paths are already in NT format. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/freetype.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)

2 1

[PATCH v2 8/8] gdi32: Use local helpers for Unicode conversion in Unix lib.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Based on ntdll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 99 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 10 ++-- dlls/gdi32/win32u_private.h | 5 ++ 3 files changed, 106 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0b32a94f7fe..c6bc3a716be 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3200,6 +3200,7 @@ static UINT get_glyph_index_symbol( struct gdi_font *font, UINT glyph ) CPTABLEINFO *get_cptable( WORD cp ) { static CPTABLEINFO tables[100]; + CPTABLEINFO *info; unsigned int i; USHORT *ptr; SIZE_T size; @@ -3207,9 +3208,101 @@ CPTABLEINFO *get_cptable( WORD cp ) for (i = 0; i < ARRAY_SIZE(tables) && tables[i].CodePage; i++) if (tables[i].CodePage == cp) return &tables[i]; if (NtGetNlsSectionPtr( 11, cp, NULL, (void **)&ptr, &size )) return NULL; - if (i == ARRAY_SIZE(tables)) ERR( "too many code pages\n" ); - RtlInitCodePageTable( ptr, &tables[i] ); - return &tables[i]; + if (i == ARRAY_SIZE(tables)) + { + ERR( "too many code pages\n" ); + return NULL; + } + + info = &tables[i]; + info->CodePage = ptr[1]; + info->MaximumCharacterSize = ptr[2]; + info->DefaultChar = ptr[3]; + info->UniDefaultChar = ptr[4]; + info->TransDefaultChar = ptr[5]; + info->TransUniDefaultChar = ptr[6]; + memcpy( info->LeadByte, ptr + 7, sizeof(info->LeadByte) ); + ptr += ptr[0]; + + info->WideCharTable = ptr + ptr[0] + 1; + info->MultiByteTable = ++ptr; + ptr += 256; + if (*ptr++) ptr += 256; /* glyph table */ + info->DBCSRanges = ptr; + if (*ptr) /* dbcs ranges */ + { + info->DBCSCodePage = 1; + info->DBCSOffsets = ptr + 1; + } + else + { + info->DBCSCodePage = 0; + info->DBCSOffsets = NULL; + } + + return info; +} + +DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, DWORD srclen ) +{ + DWORD i, ret; + + if (!info && !(info = get_cptable( get_acp() ))) return 0; + + srclen /= sizeof(WCHAR); + if (info->DBCSCodePage) + { + WCHAR *uni2cp = info->WideCharTable; + + for (i = dstlen; srclen && i; i--, srclen--, src++) + { + if (uni2cp[*src] & 0xff00) + { + if (i == 1) break; /* do not output a partial char */ + i--; + *dst++ = uni2cp[*src] >> 8; + } + *dst++ = (char)uni2cp[*src]; + } + ret = dstlen - i; + } + else + { + char *uni2cp = info->WideCharTable; + ret = min( srclen, dstlen ); + for (i = 0; i < ret; i++) dst[i] = uni2cp[src[i]]; + } + return ret; +} + +DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, DWORD srclen ) +{ + DWORD i, ret; + + if (!info && !(info = get_cptable( get_acp() ))) return 0; + + dstlen /= sizeof(WCHAR); + if (info->DBCSOffsets) + { + for (i = dstlen; srclen && i; i--, srclen--, src++, dst++) + { + USHORT off = info->DBCSOffsets[(unsigned char)*src]; + if (off && srclen > 1) + { + src++; + srclen--; + *dst = info->DBCSOffsets[off + (unsigned char)*src]; + } + else *dst = info->MultiByteTable[(unsigned char)*src]; + } + ret = dstlen - i; + } + else + { + ret = min( srclen, dstlen ); + for (i = 0; i < ret; i++) dst[i] = info->MultiByteTable[(unsigned char)src[i]]; + } + return ret * sizeof(WCHAR); } static BOOL wc_to_index( UINT cp, WCHAR wc, unsigned char *dst, BOOL allow_default ) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 44d5dc26cff..04b24b7f570 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -602,7 +602,7 @@ static WCHAR *towstr(const char *str) { DWORD len = strlen(str) + 1; WCHAR *wstr = malloc( len * sizeof(WCHAR) ); - RtlMultiByteToUnicodeN( wstr, len * sizeof(WCHAR), &len, str, len ); + win32u_mbtowc( NULL, wstr, len * sizeof(WCHAR), str, len ); return wstr; } @@ -805,8 +805,8 @@ static WCHAR *copy_name_table_string( const FT_SfntName *name ) case TT_PLATFORM_MACINTOSH: if (!(cp = get_mac_code_page( name ))) return NULL; ret = malloc( (name->string_len + 1) * sizeof(WCHAR) ); - RtlCustomCPToUnicodeN( cp, ret, name->string_len * sizeof(WCHAR), &i, - (char *)name->string, name->string_len ); + i = win32u_mbtowc( cp, ret, name->string_len * sizeof(WCHAR), + (char *)name->string, name->string_len ); ret[i / sizeof(WCHAR)] = 0; return ret; } @@ -1165,7 +1165,7 @@ static WCHAR *decode_opentype_name( struct opentype_name *name ) { CPTABLEINFO *cptable = get_cptable( name->codepage ); if (!cptable) return NULL; - RtlCustomCPToUnicodeN( cptable, buffer, sizeof(buffer), &len, name->bytes, name->length ); + len = win32u_mbtowc( cptable, buffer, sizeof(buffer), name->bytes, name->length ); len /= sizeof(WCHAR); } @@ -2577,7 +2577,7 @@ static BOOL CDECL freetype_get_glyph_index( struct gdi_font *font, UINT *glyph, DWORD len; char ch; - RtlUnicodeToMultiByteN( &ch, 1, &len, &wc, sizeof(wc) ); + len = win32u_wctomb( NULL, &ch, 1, &wc, sizeof(wc) ); if (len) *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); } return TRUE; diff --git a/dlls/gdi32/win32u_private.h b/dlls/gdi32/win32u_private.h index d986bf339c3..f867c556bff 100644 --- a/dlls/gdi32/win32u_private.h +++ b/dlls/gdi32/win32u_private.h @@ -395,4 +395,9 @@ static inline LONG win32u_wcstol( LPCWSTR s, LPWSTR *end, INT base ) #define wcsrchr(s,c) win32u_wcsrchr(s,c) #define wcstol(s,e,b) win32u_wcstol(s,e,b) +DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, + DWORD srclen ) DECLSPEC_HIDDEN; +DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, + DWORD srclen ) DECLSPEC_HIDDEN; + #endif /* __WINE_WIN32U_PRIVATE */ -- 2.23.0

1 0

[PATCH v2 7/8] gdi32: Avoid using RtlOpenCurrentUser.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Based on open_hkcu_key. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0c08816945a..0b32a94f7fe 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6196,6 +6196,28 @@ static void load_registry_fonts(void) NtClose( hkey ); } +static HKEY open_hkcu(void) +{ + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + ascii_to_unicode( bufferW, buffer, len + 1 ); + + return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); +} + /*********************************************************************** * font_init */ @@ -6214,7 +6236,7 @@ UINT font_init(void) {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','o','n','t','s'}; static const WCHAR cacheW[] = {'C','a','c','h','e'}; - if (RtlOpenCurrentUser( MAXIMUM_ALLOWED, &hkcu )) return 0; + if (!(hkcu = open_hkcu())) return 0; wine_fonts_key = reg_create_key( hkcu, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); if (wine_fonts_key) dpi = init_font_options( hkcu ); NtClose( hkcu ); -- 2.23.0

1 0

[PATCH v2 6/8] gdi32: Don't use RtlDosPathNameToNtPathName_U in get_unix_file_name.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Paths are already in NT format. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bd4a29bb723..44d5dc26cff 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1364,7 +1364,7 @@ static WCHAR *get_dos_file_name( LPCSTR str ) return buffer; } -static char *get_unix_file_name( LPCWSTR dosW ) +static char *get_unix_file_name( LPCWSTR path ) { UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; @@ -1372,24 +1372,19 @@ static char *get_unix_file_name( LPCWSTR dosW ) ULONG size = 256; char *buffer; - if (!RtlDosPathNameToNtPathName_U( dosW, &nt_name, NULL, NULL )) return NULL; + nt_name.Buffer = (WCHAR *)path; + nt_name.MaximumLength = nt_name.Length = lstrlenW( path ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &nt_name, 0, 0, NULL ); for (;;) { - if (!(buffer = malloc( size ))) - { - RtlFreeUnicodeString( &nt_name ); - return NULL; - } + if (!(buffer = malloc( size ))) return NULL; status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN_IF ); if (status != STATUS_BUFFER_TOO_SMALL) break; free( buffer ); } - RtlFreeUnicodeString( &nt_name ); if (status && status != STATUS_NO_SUCH_FILE) { free( buffer ); - RtlSetLastWin32ErrorAndNtStatusFromNtStatus( status ); return NULL; } return buffer; -- 2.23.0

1 0

[PATCH v2 5/8] gdi32: Use win32u_wcsicmp instead of RtlCompareUnicodeStrings.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d8bae670d7f..bd4a29bb723 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1277,13 +1277,11 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); /* try to find another secondary name, preferring the lowest langids */ - if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), - This->second_name, lstrlenW( This->second_name ), TRUE )) + if (!wcsicmp( This->family_name, This->second_name )) { free( This->second_name ); This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); - if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), - This->second_name, lstrlenW( This->second_name ), TRUE )) + if (!wcsicmp( This->family_name, This->second_name )) { free( This->second_name ); This->second_name = NULL; -- 2.23.0

1 0

[PATCH v2 4/8] gdi32: Use pthread mutex in dib driver.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dibdrv/graphics.c | 16 +++++----------- dlls/gdi32/win32u_private.h | 3 --- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 875ae308546..410f29e8f19 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -23,6 +23,7 @@ #endif #include <assert.h> +#include <pthread.h> #include "ntgdi_private.h" #include "dibdrv.h" @@ -59,14 +60,7 @@ struct cached_font static struct list font_cache = LIST_INIT( font_cache ); -static CRITICAL_SECTION font_cache_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &font_cache_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": font_cache_cs") } -}; -static CRITICAL_SECTION font_cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t font_cache_lock = PTHREAD_MUTEX_INITIALIZER; static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip ) @@ -575,7 +569,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) font.aa_flags = aa_flags; font.hash = font_cache_hash( &font ); - EnterCriticalSection( &font_cache_cs ); + pthread_mutex_lock( &font_cache_lock ); LIST_FOR_EACH_ENTRY( ptr, &font_cache, struct cached_font, entry ) { if (!font_cache_cmp( &font, ptr )) @@ -608,7 +602,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) } else if (!(ptr = malloc( sizeof(*ptr) ))) { - LeaveCriticalSection( &font_cache_cs ); + pthread_mutex_unlock( &font_cache_lock ); return NULL; } @@ -617,7 +611,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) memset( ptr->glyphs, 0, sizeof(ptr->glyphs) ); done: list_add_head( &font_cache, &ptr->entry ); - LeaveCriticalSection( &font_cache_cs ); + pthread_mutex_unlock( &font_cache_lock ); TRACE( "%d %s -> %p\n", ptr->lf.lfHeight, debugstr_w(ptr->lf.lfFaceName), ptr ); return ptr; } diff --git a/dlls/gdi32/win32u_private.h b/dlls/gdi32/win32u_private.h index 836d8014f01..d986bf339c3 100644 --- a/dlls/gdi32/win32u_private.h +++ b/dlls/gdi32/win32u_private.h @@ -395,7 +395,4 @@ static inline LONG win32u_wcstol( LPCWSTR s, LPWSTR *end, INT base ) #define wcsrchr(s,c) win32u_wcsrchr(s,c) #define wcstol(s,e,b) win32u_wcstol(s,e,b) -#define EnterCriticalSection RtlEnterCriticalSection -#define LeaveCriticalSection RtlLeaveCriticalSection - #endif /* __WINE_WIN32U_PRIVATE */ -- 2.23.0

1 0

[PATCH v2 3/8] gdi32: Use pthread mutex in font.c.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 95 ++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 50 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98c70a6e2a8..0c08816945a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -29,6 +29,8 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include <pthread.h> + #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -508,14 +510,7 @@ static inline BOOL is_dbcs_ansi_cp(UINT ansi_cp) || ansi_cp == 950 ); /* CP950 for Chinese Traditional */ } -static CRITICAL_SECTION font_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &font_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": font_cs") } -}; -static CRITICAL_SECTION font_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t font_lock = PTHREAD_MUTEX_INITIALIZER; #ifndef WINE_FONT_DIR #define WINE_FONT_DIR "fonts" @@ -1068,7 +1063,7 @@ static int remove_font( const WCHAR *file, DWORD flags ) struct gdi_font_face *face, *face_next; int count = 0; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR( family, family_next, &family_name_tree, struct gdi_font_family, name_entry ) { family->refcount++; @@ -1085,7 +1080,7 @@ static int remove_font( const WCHAR *file, DWORD flags ) } release_family( family ); } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return count; } @@ -2565,7 +2560,7 @@ static void release_gdi_font( struct gdi_font *font ) TRACE( "font %p\n", font ); /* add it to the unused list */ - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); list_add_head( &unused_gdi_font_list, &font->unused_entry ); if (unused_font_count > UNUSED_CACHE_SIZE) { @@ -2576,7 +2571,7 @@ static void release_gdi_font( struct gdi_font *font ) free_gdi_font( font ); } else unused_font_count++; - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); } static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl, int dpi) @@ -3113,9 +3108,9 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi elf.elfLogFont.lfCharSet, type, debugstr_w(elf.elfScript), elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, ntm.ntmTm.ntmFlags ); /* release section before callback (FIXME) */ - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); if (!proc( &elf.elfLogFont, (TEXTMETRICW *)&ntm, type, lparam )) return FALSE; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); } return TRUE; } @@ -3134,7 +3129,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, count = create_enum_charset_list( charset, enum_charsets ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if (lf && lf->lfFaceName[0]) { @@ -3170,7 +3165,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, return FALSE; } } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3372,13 +3367,13 @@ static BOOL CDECL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, TRACE( "%p, %u, %u, %p\n", physdev->font, first, count, buffer ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (i = 0; i < count; i++) { c = chars ? chars[i] : first + i; get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, &buffer[i], 0, NULL, NULL ); } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3399,11 +3394,11 @@ static BOOL CDECL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, W TRACE( "%p, %u, %u, %p\n", physdev->font, first, count, buffer ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (c = 0; c < count; c++, buffer++) get_glyph_outline( physdev->font, gi ? gi[c] : first + c, GGO_METRICS | GGO_GLYPH_INDEX, NULL, buffer, 0, NULL, NULL ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3426,7 +3421,7 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, TRACE( "%p, %d, %d, %p\n", physdev->font, first, count, buffer ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (i = 0; i < count; i++) { c = chars ? chars[i] : i + first; @@ -3435,7 +3430,7 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, else buffer[i] = abc.abcA + abc.abcB + abc.abcC; } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3560,7 +3555,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun got_default = TRUE; } - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (i = 0; i < count; i++) { @@ -3589,7 +3584,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun else gi[i] = get_GSUB_vert_glyph( physdev->font, glyph ); } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return count; } @@ -3608,9 +3603,9 @@ static DWORD CDECL font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, dev = GET_NEXT_PHYSDEV( dev, pGetGlyphOutline ); return dev->funcs->pGetGlyphOutline( dev, glyph, format, gm, buflen, buf, mat ); } - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); ret = get_glyph_outline( physdev->font, glyph, format, gm, NULL, buflen, buf, mat ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return ret; } @@ -3628,11 +3623,11 @@ static DWORD CDECL font_GetKerningPairs( PHYSDEV dev, DWORD count, KERNINGPAIR * return dev->funcs->pGetKerningPairs( dev, count, pairs ); } - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if (physdev->font->kern_count == -1) physdev->font->kern_count = font_funcs->get_kerning_pairs( physdev->font, &physdev->font->kern_pairs ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); if (count && pairs) { @@ -3725,7 +3720,7 @@ static UINT CDECL font_GetOutlineTextMetrics( PHYSDEV dev, UINT size, OUTLINETEX if (!physdev->font->scalable) return 0; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if (font_funcs->set_outline_text_metrics( physdev->font )) { ret = physdev->font->otm.otmSize; @@ -3747,7 +3742,7 @@ static UINT CDECL font_GetOutlineTextMetrics( PHYSDEV dev, UINT size, OUTLINETEX scale_outline_font_metrics( physdev->font, metrics ); } } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return ret; } @@ -3786,14 +3781,14 @@ static BOOL CDECL font_GetTextExtentExPoint( PHYSDEV dev, const WCHAR *str, INT TRACE( "%p, %s, %d\n", physdev->font, debugstr_wn(str, count), count ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (i = pos = 0; i < count; i++) { get_glyph_outline( physdev->font, str[i], GGO_METRICS, NULL, &abc, 0, NULL, NULL ); pos += abc.abcA + abc.abcB + abc.abcC; dxs[i] = pos; } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3815,7 +3810,7 @@ static BOOL CDECL font_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, TRACE( "%p, %p, %d\n", physdev->font, indices, count ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (i = pos = 0; i < count; i++) { get_glyph_outline( physdev->font, indices[i], GGO_METRICS | GGO_GLYPH_INDEX, @@ -3823,7 +3818,7 @@ static BOOL CDECL font_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, pos += abc.abcA + abc.abcB + abc.abcC; dxs[i] = pos; } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3910,7 +3905,7 @@ static BOOL CDECL font_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) return dev->funcs->pGetTextMetrics( dev, metrics ); } - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if (font_funcs->set_outline_text_metrics( physdev->font ) || font_funcs->set_bitmap_text_metrics( physdev->font )) { @@ -3918,7 +3913,7 @@ static BOOL CDECL font_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) scale_font_metrics( physdev->font, metrics ); ret = TRUE; } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return ret; } @@ -4111,7 +4106,7 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) } TRACE( "DC transform %f %f %f %f\n", dcmat.eM11, dcmat.eM12, dcmat.eM21, dcmat.eM22 ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); font = select_font( &lf, dcmat, can_use_bitmap ); @@ -4128,7 +4123,7 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) *aa_flags = font_funcs->get_aa_flags( font, *aa_flags, antialias_fakes ); } TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); } physdev->font = font; if (prev) release_gdi_font( prev ); @@ -5891,16 +5886,16 @@ static int add_system_font_resource( const WCHAR *file, DWORD flags ) /* try in %WINDIR%/fonts, needed for Fotobuch Designer */ get_fonts_win_dir_path( file, path ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); ret = font_funcs->add_font( path, flags ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); /* try in datadir/fonts (or builddir/fonts), needed for Magic the Gathering Online */ if (!ret) { get_fonts_data_dir_path( file, path ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); ret = font_funcs->add_font( path, flags ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); } return ret; } @@ -5928,9 +5923,9 @@ static int add_font_resource( LPCWSTR file, DWORD flags ) DWORD addfont_flags = ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE; if (!(flags & FR_PRIVATE)) addfont_flags |= ADDFONT_ADD_TO_CACHE; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); ret = font_funcs->add_font( file, addfont_flags ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); } else if (!wcschr( file, '\\' )) ret = add_system_font_resource( file, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); @@ -6296,9 +6291,9 @@ HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG if (!(copy = malloc( size ))) return NULL; memcpy( copy, ptr, size ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); num_fonts = font_funcs->add_mem_font( copy, size, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); if (!num_fonts) { @@ -6436,7 +6431,7 @@ BOOL WINAPI NtGdiGetFontFileData( DWORD instance_id, DWORD file_index, UINT64 *o BOOL ret = FALSE; if (!font_funcs) return FALSE; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if ((font = get_font_from_handle( instance_id ))) { if (font->ttc_item_offset) tag = MS_TTCF_TAG; @@ -6446,7 +6441,7 @@ BOOL WINAPI NtGdiGetFontFileData( DWORD instance_id, DWORD file_index, UINT64 *o else SetLastError( ERROR_INVALID_PARAMETER ); } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return ret; } @@ -6460,7 +6455,7 @@ BOOL WINAPI NtGdiGetFontFileInfo( DWORD instance_id, DWORD file_index, struct fo struct gdi_font *font; BOOL ret = FALSE; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if ((font = get_font_from_handle( instance_id ))) { @@ -6475,7 +6470,7 @@ BOOL WINAPI NtGdiGetFontFileInfo( DWORD instance_id, DWORD file_index, struct fo else SetLastError( ERROR_INSUFFICIENT_BUFFER ); } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); if (needed) *needed = required_size; return ret; } -- 2.23.0

1 0

[PATCH v2 2/8] gdi32: Use pthread mutex instead of gdi_section.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 10 ++--- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdiobj.c | 83 ++++++++++++++++---------------------- dlls/gdi32/ntgdi_private.h | 1 - 4 files changed, 40 insertions(+), 56 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c21993a8ca5..a64522f34af 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -518,8 +518,6 @@ static BOOL DC_DeleteObject( HGDIOBJ handle ) TRACE( "%p\n", handle ); - GDI_CheckNotLock(); - if (!(dc = get_dc_ptr( handle ))) return FALSE; if (dc->refcount != 1) { @@ -528,7 +526,8 @@ static BOOL DC_DeleteObject( HGDIOBJ handle ) return FALSE; } - /* Call hook procedure to check whether is it OK to delete this DC */ + /* Call hook procedure to check whether is it OK to delete this DC, + * gdi_lock should not be locked */ if (dc->hookProc && !dc->hookProc( dc->hSelf, DCHC_DELETEDC, dc->dwHookData, 0 )) { release_dc_ptr( dc ); @@ -726,8 +725,7 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD HDC hdc; DC * dc; - GDI_CheckNotLock(); - + /* gdi_lock should not be locked */ if (is_display) funcs = get_display_driver(); else if (hspool) @@ -788,7 +786,7 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ) const struct gdi_dc_funcs *funcs; PHYSDEV physDev = NULL; - GDI_CheckNotLock(); + /* gdi_lock should not be locked */ if (hdc) { diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 0512307531d..f69713c8025 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -747,7 +747,7 @@ static inline struct windrv_physdev *get_windrv_physdev( PHYSDEV dev ) static inline void lock_surface( struct windrv_physdev *dev ) { - GDI_CheckNotLock(); + /* gdi_lock should not be locked */ dev->surface->funcs->lock( dev->surface ); if (is_rect_empty( dev->dibdrv->bounds )) dev->start_ticks = NtGetTickCount(); } diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 8381c9e2746..bbfe50d2c8b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -26,6 +26,7 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> +#include <pthread.h> #include "windef.h" #include "winbase.h" @@ -88,14 +89,7 @@ static const LOGBRUSH DkGrayBrush = { BS_SOLID, RGB(64,64,64), 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; -static CRITICAL_SECTION gdi_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &gdi_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": gdi_section") } -}; -static CRITICAL_SECTION gdi_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t gdi_lock; /**************************************************************************** @@ -469,9 +463,9 @@ void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set) { GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) entry_obj( entry )->system = !!set; - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); } /****************************************************************************** @@ -525,9 +519,9 @@ UINT GDI_get_ref_count( HGDIOBJ handle ) GDI_HANDLE_ENTRY *entry; UINT ret = 0; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) ret = entry_obj( entry )->selcount; - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return ret; } @@ -541,10 +535,10 @@ HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) { GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) entry_obj( entry )->selcount++; else handle = 0; - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return handle; } @@ -558,7 +552,7 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) { GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) { assert( entry_obj( entry )->selcount ); @@ -566,13 +560,13 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) { /* handle delayed DeleteObject*/ entry_obj( entry )->deleted = 0; - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); TRACE( "executing delayed DeleteObject for %p\n", handle ); NtGdiDeleteObjectApp( handle ); return TRUE; } } - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return entry != NULL; } @@ -736,7 +730,7 @@ static void dump_gdi_objects( void ) TRACE( "%u objects:\n", GDI_MAX_HANDLE_COUNT ); - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); for (entry = gdi_shared->Handles; entry < next_unused; entry++) { if (!entry->Type) @@ -747,7 +741,7 @@ static void dump_gdi_objects( void ) gdi_obj_type( entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT ), entry_obj( entry )->selcount, entry_obj( entry )->deleted ); } - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); } /*********************************************************************** @@ -762,7 +756,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g assert( type ); /* type 0 is reserved to mark free entries */ - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); entry = next_free; if (entry) @@ -771,7 +765,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g entry = next_unused++; else { - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); ERR( "out of GDI object handles, expect a crash\n" ); if (TRACE_ON(gdi)) dump_gdi_objects(); return 0; @@ -785,7 +779,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g entry->Type = entry->ExtType & 0x1f; if (++entry->Generation == 0xff) entry->Generation = 1; ret = entry_to_handle( entry ); - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); TRACE( "allocated %s %p %u/%u\n", gdi_obj_type(type), ret, InterlockedIncrement( &debug_count ), GDI_MAX_HANDLE_COUNT ); return ret; @@ -802,7 +796,7 @@ void *free_gdi_handle( HGDIOBJ handle ) void *object = NULL; GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) { TRACE( "freed %s %p %u/%u\n", gdi_obj_type( entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT ), @@ -812,7 +806,7 @@ void *free_gdi_handle( HGDIOBJ handle ) entry->Object = (UINT_PTR)next_free; next_free = entry; } - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return object; } @@ -840,7 +834,7 @@ void *get_any_obj_ptr( HGDIOBJ handle, DWORD *type ) void *ptr = NULL; GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) { @@ -848,7 +842,7 @@ void *get_any_obj_ptr( HGDIOBJ handle, DWORD *type ) *type = entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT; } - if (!ptr) LeaveCriticalSection( &gdi_section ); + if (!ptr) pthread_mutex_unlock( &gdi_lock ); return ptr; } @@ -877,20 +871,7 @@ void *GDI_GetObjPtr( HGDIOBJ handle, DWORD type ) */ void GDI_ReleaseObj( HGDIOBJ handle ) { - LeaveCriticalSection( &gdi_section ); -} - - -/*********************************************************************** - * GDI_CheckNotLock - */ -void GDI_CheckNotLock(void) -{ - if (RtlIsCriticalSectionLockedByThread(&gdi_section)) - { - ERR( "BUG: holding GDI lock\n" ); - assert( 0 ); - } + pthread_mutex_unlock( &gdi_lock ); } @@ -914,10 +895,10 @@ BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ) const struct gdi_obj_funcs *funcs = NULL; struct gdi_obj_header *header; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if (!(entry = handle_entry( obj ))) { - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return FALSE; } @@ -925,7 +906,7 @@ BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ) if (header->system) { TRACE("Preserving system object %p\n", obj); - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return TRUE; } @@ -938,7 +919,7 @@ BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ) } else funcs = header->funcs; - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); TRACE("%p\n", obj ); @@ -985,13 +966,13 @@ INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer ) TRACE("%p %d %p\n", handle, count, buffer ); - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) { funcs = entry_obj( entry )->funcs; handle = entry_to_handle( entry ); /* make it a full handle */ } - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); if (funcs && funcs->pGetObjectW) { @@ -1040,13 +1021,13 @@ BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ) const struct gdi_obj_funcs *funcs = NULL; GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( obj ))) { funcs = entry_obj( entry )->funcs; obj = entry_to_handle( entry ); /* make it a full handle */ } - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); if (funcs && funcs->pUnrealizeObject) return funcs->pUnrealizeObject( obj ); return funcs != NULL; @@ -1271,10 +1252,16 @@ static struct unix_funcs unix_funcs = NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) { + pthread_mutexattr_t attr; unsigned int dpi; if (reason != DLL_PROCESS_ATTACH) return 0; + pthread_mutexattr_init( &attr ); + pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); + pthread_mutex_init( &gdi_lock, &attr ); + pthread_mutexattr_destroy( &attr ); + NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); init_gdi_shared(); if (!gdi_shared) return STATUS_NO_MEMORY; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 1b55b5ad458..44d68d26b02 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -373,7 +373,6 @@ extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, DWORD ) DECLSPEC_HIDDEN; extern void *get_any_obj_ptr( HGDIOBJ, DWORD * ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; -extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; extern UINT GDI_get_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH v2 1/8] gdi32: Use pthread mutex in driver.c.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/driver.c | 31 +++++++++++++------------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index a1b153edf07..6a5df55bfeb 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -3,7 +3,7 @@ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) +EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) DELAYIMPORTS = setupapi C_SRCS = \ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 24b8a6b27b5..849be65c480 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -27,6 +27,8 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include <pthread.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -59,14 +61,7 @@ const struct gdi_dc_funcs *driver_funcs; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); -static CRITICAL_SECTION driver_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &driver_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": driver_section") } -}; -static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t driver_lock = PTHREAD_MUTEX_INITIALIZER; /********************************************************************** * get_display_driver @@ -802,7 +797,7 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) if (!desc || !desc->hAdapter) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) { if (adapter->handle == desc->hAdapter) @@ -813,7 +808,7 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) break; } } - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); return status; } @@ -848,10 +843,10 @@ NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc if (!(adapter = malloc( sizeof( *adapter ) ))) return STATUS_NO_MEMORY; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); desc->hAdapter = adapter->handle = ++handle_start; list_add_tail( &d3dkmt_adapters, &adapter->entry ); - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); return STATUS_SUCCESS; } @@ -870,7 +865,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) if (!desc) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) { if (adapter->handle == desc->hAdapter) @@ -879,7 +874,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) break; } } - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); if (!found) return STATUS_INVALID_PARAMETER; @@ -891,10 +886,10 @@ NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) if (!device) return STATUS_NO_MEMORY; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); device->handle = ++handle_start; list_add_tail( &d3dkmt_devices, &device->entry ); - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); desc->hDevice = device->handle; return STATUS_SUCCESS; @@ -914,7 +909,7 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) if (!desc || !desc->hDevice) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); LIST_FOR_EACH_ENTRY( device, &d3dkmt_devices, struct d3dkmt_device, entry ) { if (device->handle == desc->hDevice) @@ -928,7 +923,7 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) break; } } - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); return status; } -- 2.23.0

1 0

[PATCH 1/2] winedbg: Adapt build_command_line() from winevdm
by Robbert van der Helm 04 Oct '21

04 Oct '21

The only difference between the two versions is that this one doesn't prefix the result with the command line's length. Signed-off-by: Robbert van der Helm <mail(a)robbertvanderhelm.nl> --- Instead of having having four almost identical copies of this function spread around Wine's code base (two for WCHAR*, two for char*), someone who's more familiar with Wine's code base than I am should probably merge these and move them to somewhere in `include/wine/`. --- programs/winedbg/tgt_active.c | 110 ++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 508e1c58040..f499b26648a 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -774,6 +774,116 @@ static void output_system_info(void) } } +/*********************************************************************** + * build_command_line + * + * Build the command line of a process from the argv array. + * Copied from winevdm, which in turn adapted it from ENV_BuildCommandLine. The difference between + * this and the winevdm version is the command line is not prefixed with its length. + */ +static char *build_command_line(char **argv) +{ + int len; + char *p, **arg, *cmd_line; + + len = 0; + for (arg = argv; *arg; arg++) + { + BOOL has_space; + int bcount; + char* a; + + has_space=FALSE; + bcount=0; + a=*arg; + if( !*a ) has_space=TRUE; + while (*a!='\0') { + if (*a=='\\') { + bcount++; + } else { + if (*a==' ' || *a=='\t') { + has_space=TRUE; + } else if (*a=='"') { + /* doubling of '\' preceding a '"', + * plus escaping of said '"' + */ + len+=2*bcount+1; + } + bcount=0; + } + a++; + } + len+=(a-*arg)+1 /* for the separating space */; + if (has_space) + len+=2; /* for the quotes */ + } + + if (!(cmd_line = HeapAlloc( GetProcessHeap(), 0, len ? len : 1 ))) + return NULL; + + p = cmd_line; + for (arg = argv; *arg; arg++) + { + BOOL has_space,has_quote; + char* a; + + /* Check for quotes and spaces in this argument */ + has_space=has_quote=FALSE; + a=*arg; + if( !*a ) has_space=TRUE; + while (*a!='\0') { + if (*a==' ' || *a=='\t') { + has_space=TRUE; + if (has_quote) + break; + } else if (*a=='"') { + has_quote=TRUE; + if (has_space) + break; + } + a++; + } + + /* Now transfer it to the command line */ + if (has_space) + *p++='"'; + if (has_quote) { + int bcount; + + bcount=0; + a=*arg; + while (*a!='\0') { + if (*a=='\\') { + *p++=*a; + bcount++; + } else { + if (*a=='"') { + int i; + + /* Double all the '\\' preceding this '"', plus one */ + for (i=0;i<=bcount;i++) + *p++='\\'; + *p++='"'; + } else { + *p++=*a; + } + bcount=0; + } + a++; + } + } else { + strcpy(p,*arg); + p+=strlen(*arg); + } + if (has_space) + *p++='"'; + *p++=' '; + } + if (len) p--; /* remove last space */ + *p = '\0'; + return cmd_line; +} + /****************************************************************** * dbg_active_attach * -- 2.33.0

1 1

[PATCH 8/8] gdi32: Use local helpers for Unicode conversion in Unix lib.
by Jacek Caban 04 Oct '21

04 Oct '21

Based on ntdll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 99 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 10 ++-- dlls/gdi32/win32u_private.h | 5 ++ 3 files changed, 106 insertions(+), 8 deletions(-)

1 0

[PATCH 2/2] wpcap: Convert pcap_pkthdr structures.
by Hans Leidekker 04 Oct '21

04 Oct '21

Structure layout is different on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51818 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wpcap/unixlib.c | 60 ++++++++++++++++++++++++++++++++++++-------- dlls/wpcap/unixlib.h | 26 +++++++++++++------ dlls/wpcap/wpcap.c | 13 +++++----- 3 files changed, 75 insertions(+), 24 deletions(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index b48a5540edc..96e30fe2f11 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -28,6 +28,7 @@ #include <stdarg.h> #include <stdlib.h> +#include <limits.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -37,6 +38,7 @@ #include "wine/debug.h" #include "unixlib.h" +WINE_DEFAULT_DEBUG_CHANNEL(wpcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); static const struct pcap_callbacks *callbacks; @@ -101,12 +103,19 @@ static const char * CDECL wrap_datalink_val_to_name( int link ) static void wrap_pcap_handler( unsigned char *user, const struct pcap_pkthdr *hdr, const unsigned char *packet ) { struct handler_callback *cb = (struct handler_callback *)user; - callbacks->handler( cb, hdr, packet ); + struct pcap_pkthdr_win32 hdr_win32; + + if (hdr->ts.tv_sec > INT_MAX || hdr->ts.tv_usec > INT_MAX) WARN( "truncating timeval values(s)\n" ); + hdr_win32.ts.tv_sec = hdr->ts.tv_sec; + hdr_win32.ts.tv_usec = hdr->ts.tv_usec; + hdr_win32.caplen = hdr->caplen; + hdr_win32.len = hdr->len; + callbacks->handler( cb, &hdr_win32, packet ); } static int CDECL wrap_dispatch( struct pcap *pcap, int count, - void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), - unsigned char *user ) + void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, + const unsigned char *), unsigned char *user ) { if (callback) { @@ -118,9 +127,15 @@ static int CDECL wrap_dispatch( struct pcap *pcap, int count, return pcap_dispatch( pcap->handle, count, NULL, user ); } -static void CDECL wrap_dump( unsigned char *user, const void *hdr, const unsigned char *packet ) +static void CDECL wrap_dump( unsigned char *user, const struct pcap_pkthdr_win32 *hdr, const unsigned char *packet ) { - return pcap_dump( user, hdr, packet ); + struct pcap_pkthdr hdr_unix; + + hdr_unix.ts.tv_sec = hdr->ts.tv_sec; + hdr_unix.ts.tv_usec = hdr->ts.tv_usec; + hdr_unix.caplen = hdr->caplen; + hdr_unix.len = hdr->len; + return pcap_dump( user, &hdr_unix, packet ); } static void * CDECL wrap_dump_open( struct pcap *pcap, const char *name ) @@ -193,8 +208,8 @@ static int CDECL wrap_lookupnet( const char *device, unsigned int *net, unsigned } static int CDECL wrap_loop( struct pcap *pcap, int count, - void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), - unsigned char *user ) + void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, + const unsigned char *), unsigned char *user ) { if (callback) { @@ -216,14 +231,37 @@ static int CDECL wrap_minor_version( struct pcap *pcap ) return pcap_minor_version( pcap->handle ); } -static const unsigned char * CDECL wrap_next( struct pcap *pcap, void *hdr ) +static const unsigned char * CDECL wrap_next( struct pcap *pcap, struct pcap_pkthdr_win32 *hdr ) { - return pcap_next( pcap->handle, hdr ); + struct pcap_pkthdr hdr_unix; + const unsigned char *ret; + + if ((ret = pcap_next( pcap->handle, &hdr_unix ))) + { + if (hdr_unix.ts.tv_sec > INT_MAX || hdr_unix.ts.tv_usec > INT_MAX) WARN( "truncating timeval values(s)\n" ); + hdr->ts.tv_sec = hdr_unix.ts.tv_sec; + hdr->ts.tv_usec = hdr_unix.ts.tv_usec; + hdr->caplen = hdr_unix.caplen; + hdr->len = hdr_unix.len; + } + return ret; } -static int CDECL wrap_next_ex( struct pcap *pcap, void **hdr, const unsigned char **data ) +static int CDECL wrap_next_ex( struct pcap *pcap, struct pcap_pkthdr_win32 **hdr, const unsigned char **data ) { - return pcap_next_ex( pcap->handle, (struct pcap_pkthdr **)hdr, data ); + struct pcap_pkthdr *hdr_unix; + int ret; + + if ((ret = pcap_next_ex( pcap->handle, &hdr_unix, data )) == 1) + { + if (hdr_unix->ts.tv_sec > INT_MAX || hdr_unix->ts.tv_usec > INT_MAX) WARN( "truncating timeval values(s)\n" ); + pcap->hdr.ts.tv_sec = hdr_unix->ts.tv_sec; + pcap->hdr.ts.tv_usec = hdr_unix->ts.tv_usec; + pcap->hdr.caplen = hdr_unix->caplen; + pcap->hdr.len = hdr_unix->len; + *hdr = &pcap->hdr; + } + return ret; } static struct pcap * CDECL wrap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index c5279f860fd..aa00bc33153 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -23,14 +23,26 @@ struct pcap_if_hdr char *name; }; +struct pcap_pkthdr_win32 +{ + struct + { + int tv_sec; + int tv_usec; + } ts; + unsigned int caplen; + unsigned int len; +}; + struct pcap { void *handle; + struct pcap_pkthdr_win32 hdr; }; struct handler_callback { - void (CALLBACK *callback)( unsigned char *, const void *, const unsigned char * ); + void (CALLBACK *callback)( unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char * ); void *user; }; @@ -47,9 +59,9 @@ struct pcap_funcs const char * (CDECL *datalink_val_to_description)( int ); const char * (CDECL *datalink_val_to_name)( int ); int (CDECL *dispatch)( struct pcap *, int, - void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), + void (CALLBACK *)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), unsigned char * ); - void (CDECL *dump)( unsigned char *, const void *, const unsigned char * ); + void (CDECL *dump)( unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char * ); void * (CDECL *dump_open)( struct pcap *, const char * ); int (CDECL *findalldevs)( struct pcap_if_hdr **, char * ); void (CDECL *free_datalinks)( int * ); @@ -64,12 +76,12 @@ struct pcap_funcs int (CDECL *list_tstamp_types)( struct pcap *, int ** ); int (CDECL *lookupnet)( const char *, unsigned int *, unsigned int *, char * ); int (CDECL *loop)( struct pcap *, int, - void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), + void (CALLBACK *)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), unsigned char * ); int (CDECL *major_version)( struct pcap * ); int (CDECL *minor_version)( struct pcap * ); - const unsigned char * (CDECL *next)( struct pcap *, void * ); - int (CDECL *next_ex)( struct pcap *, void **, const unsigned char ** ); + const unsigned char * (CDECL *next)( struct pcap *, struct pcap_pkthdr_win32 * ); + int (CDECL *next_ex)( struct pcap *, struct pcap_pkthdr_win32 **, const unsigned char ** ); struct pcap * (CDECL *open_live)( const char *, int, int, int, char * ); int (CDECL *sendpacket)( struct pcap *, const unsigned char *, int ); int (CDECL *set_buffer_size)( struct pcap *, int ); @@ -92,5 +104,5 @@ struct pcap_funcs struct pcap_callbacks { - void (CDECL *handler)( struct handler_callback *, const void *, const unsigned char * ); + void (CDECL *handler)( struct handler_callback *, const struct pcap_pkthdr_win32 *, const unsigned char * ); }; diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index a190634ac22..ffdb1a3e8d3 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -94,14 +94,14 @@ const char * CDECL pcap_datalink_val_to_name( int link ) } int CDECL pcap_dispatch( struct pcap *pcap, int count, - void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), + void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), unsigned char *user ) { TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); return pcap_funcs->dispatch( pcap, count, callback, user ); } -void CDECL pcap_dump( unsigned char *user, const void *hdr, const unsigned char *packet ) +void CDECL pcap_dump( unsigned char *user, const struct pcap_pkthdr_win32 *hdr, const unsigned char *packet ) { TRACE( "%p, %p, %p\n", user, hdr, packet ); pcap_funcs->dump( user, hdr, packet ); @@ -249,7 +249,7 @@ int CDECL pcap_lookupnet( const char *device, unsigned int *net, unsigned int *m } int CDECL pcap_loop( struct pcap *pcap, int count, - void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), + void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), unsigned char *user) { TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); @@ -268,13 +268,13 @@ int CDECL pcap_minor_version( struct pcap *pcap ) return pcap_funcs->minor_version( pcap ); } -const unsigned char * CDECL pcap_next( struct pcap *pcap, void *hdr ) +const unsigned char * CDECL pcap_next( struct pcap *pcap, struct pcap_pkthdr_win32 *hdr ) { TRACE( "%p, %p\n", pcap, hdr ); return pcap_funcs->next( pcap, hdr ); } -int CDECL pcap_next_ex( struct pcap *pcap, void **hdr, const unsigned char **data ) +int CDECL pcap_next_ex( struct pcap *pcap, struct pcap_pkthdr_win32 **hdr, const unsigned char **data ) { TRACE( "%p, %p, %p\n", pcap, hdr, data ); return pcap_funcs->next_ex( pcap, hdr, data ); @@ -450,7 +450,8 @@ int CDECL wsockinit( void ) return 0; } -static void CDECL pcap_handler_cb( struct handler_callback *cb, const void *hdr, const unsigned char *packet ) +static void CDECL pcap_handler_cb( struct handler_callback *cb, const struct pcap_pkthdr_win32 *hdr, + const unsigned char *packet ) { TRACE( "%p, %p, %p\n", cb, hdr, packet ); cb->callback( cb->user, hdr, packet ); -- 2.30.2

1 0

[PATCH 1/2] wpcap: Wrap native handles in a structure.
by Hans Leidekker 04 Oct '21

04 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wpcap/unixlib.c | 150 +++++++++++++++++--------------- dlls/wpcap/unixlib.h | 73 +++++++++------- dlls/wpcap/wpcap.c | 200 +++++++++++++++++++++---------------------- 3 files changed, 222 insertions(+), 201 deletions(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index f3eb06a2849..b48a5540edc 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -27,6 +27,7 @@ #include <pcap/pcap.h> #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -40,39 +41,46 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static const struct pcap_callbacks *callbacks; -static int CDECL wrap_activate( void *handle ) +static int CDECL wrap_activate( struct pcap *pcap ) { - return pcap_activate( handle ); + return pcap_activate( pcap->handle ); } -static void CDECL wrap_breakloop( void *handle ) +static void CDECL wrap_breakloop( struct pcap *pcap ) { - return pcap_breakloop( handle ); + return pcap_breakloop( pcap->handle ); } -static int CDECL wrap_can_set_rfmon( void *handle ) +static int CDECL wrap_can_set_rfmon( struct pcap *pcap ) { - return pcap_can_set_rfmon( handle ); + return pcap_can_set_rfmon( pcap->handle ); } -static void CDECL wrap_close( void *handle ) +static void CDECL wrap_close( struct pcap *pcap ) { - pcap_close( handle ); + pcap_close( pcap->handle ); + free( pcap ); } -static int CDECL wrap_compile( void *handle, void *program, const char *buf, int optimize, unsigned int mask ) +static int CDECL wrap_compile( struct pcap *pcap, void *program, const char *buf, int optimize, unsigned int mask ) { - return pcap_compile( handle, program, buf, optimize, mask ); + return pcap_compile( pcap->handle, program, buf, optimize, mask ); } -static void * CDECL wrap_create( const char *src, char *errbuf ) +static struct pcap * CDECL wrap_create( const char *src, char *errbuf ) { - return pcap_create( src, errbuf ); + struct pcap *ret = malloc( sizeof(*ret) ); + if (ret && !(ret->handle = pcap_create( src, errbuf ))) + { + free( ret ); + return NULL; + } + return ret; } -static int CDECL wrap_datalink( void *handle ) +static int CDECL wrap_datalink( struct pcap *pcap ) { - return pcap_datalink( handle ); + return pcap_datalink( pcap->handle ); } static int CDECL wrap_datalink_name_to_val( const char *name ) @@ -96,7 +104,7 @@ static void wrap_pcap_handler( unsigned char *user, const struct pcap_pkthdr *hd callbacks->handler( cb, hdr, packet ); } -static int CDECL wrap_dispatch( void *handle, int count, +static int CDECL wrap_dispatch( struct pcap *pcap, int count, void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), unsigned char *user ) { @@ -105,9 +113,9 @@ static int CDECL wrap_dispatch( void *handle, int count, struct handler_callback cb; cb.callback = callback; cb.user = user; - return pcap_dispatch( handle, count, wrap_pcap_handler, (unsigned char *)&cb ); + return pcap_dispatch( pcap->handle, count, wrap_pcap_handler, (unsigned char *)&cb ); } - return pcap_dispatch( handle, count, NULL, user ); + return pcap_dispatch( pcap->handle, count, NULL, user ); } static void CDECL wrap_dump( unsigned char *user, const void *hdr, const unsigned char *packet ) @@ -115,9 +123,9 @@ static void CDECL wrap_dump( unsigned char *user, const void *hdr, const unsigne return pcap_dump( user, hdr, packet ); } -static void * CDECL wrap_dump_open( void *handle, const char *name ) +static void * CDECL wrap_dump_open( struct pcap *pcap, const char *name ) { - return pcap_dump_open( handle, name ); + return pcap_dump_open( pcap->handle, name ); } static int CDECL wrap_findalldevs( struct pcap_if_hdr **devs, char *errbuf ) @@ -149,19 +157,19 @@ static void CDECL wrap_freecode( void *program ) return pcap_freecode( program ); } -static int CDECL wrap_get_tstamp_precision( void *handle ) +static int CDECL wrap_get_tstamp_precision( struct pcap *pcap ) { - return pcap_get_tstamp_precision( handle ); + return pcap_get_tstamp_precision( pcap->handle ); } -static char * CDECL wrap_geterr( void *handle ) +static char * CDECL wrap_geterr( struct pcap *pcap ) { - return pcap_geterr( handle ); + return pcap_geterr( pcap->handle ); } -static int CDECL wrap_getnonblock( void *handle, char *errbuf ) +static int CDECL wrap_getnonblock( struct pcap *pcap, char *errbuf ) { - return pcap_getnonblock( handle, errbuf ); + return pcap_getnonblock( pcap->handle, errbuf ); } static const char * CDECL wrap_lib_version( void ) @@ -169,14 +177,14 @@ static const char * CDECL wrap_lib_version( void ) return pcap_lib_version(); } -static int CDECL wrap_list_datalinks( void *handle, int **buf ) +static int CDECL wrap_list_datalinks( struct pcap *pcap, int **buf ) { - return pcap_list_datalinks( handle, buf ); + return pcap_list_datalinks( pcap->handle, buf ); } -static int CDECL wrap_list_tstamp_types( void *handle, int **types ) +static int CDECL wrap_list_tstamp_types( struct pcap *pcap, int **types ) { - return pcap_list_tstamp_types( handle, types ); + return pcap_list_tstamp_types( pcap->handle, types ); } static int CDECL wrap_lookupnet( const char *device, unsigned int *net, unsigned int *mask, char *errbuf ) @@ -184,7 +192,7 @@ static int CDECL wrap_lookupnet( const char *device, unsigned int *net, unsigned return pcap_lookupnet( device, net, mask, errbuf ); } -static int CDECL wrap_loop( void *handle, int count, +static int CDECL wrap_loop( struct pcap *pcap, int count, void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), unsigned char *user ) { @@ -193,99 +201,105 @@ static int CDECL wrap_loop( void *handle, int count, struct handler_callback cb; cb.callback = callback; cb.user = user; - return pcap_loop( handle, count, wrap_pcap_handler, (unsigned char *)&cb ); + return pcap_loop( pcap->handle, count, wrap_pcap_handler, (unsigned char *)&cb ); } - return pcap_loop( handle, count, NULL, user ); + return pcap_loop( pcap->handle, count, NULL, user ); } -static int CDECL wrap_major_version( void *handle ) +static int CDECL wrap_major_version( struct pcap *pcap ) { - return pcap_major_version( handle ); + return pcap_major_version( pcap->handle ); } -static int CDECL wrap_minor_version( void *handle ) +static int CDECL wrap_minor_version( struct pcap *pcap ) { - return pcap_minor_version( handle ); + return pcap_minor_version( pcap->handle ); } -static const unsigned char * CDECL wrap_next( void *handle, void *hdr ) +static const unsigned char * CDECL wrap_next( struct pcap *pcap, void *hdr ) { - return pcap_next( handle, hdr ); + return pcap_next( pcap->handle, hdr ); } -static int CDECL wrap_next_ex( void *handle, void **hdr, const unsigned char **data ) +static int CDECL wrap_next_ex( struct pcap *pcap, void **hdr, const unsigned char **data ) { - return pcap_next_ex( handle, (struct pcap_pkthdr **)hdr, data ); + return pcap_next_ex( pcap->handle, (struct pcap_pkthdr **)hdr, data ); } -static void * CDECL wrap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) +static struct pcap * CDECL wrap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) { - return pcap_open_live( source, snaplen, promisc, to_ms, errbuf ); + struct pcap *ret = malloc( sizeof(*ret) ); + if (ret && !(ret->handle = pcap_open_live( source, snaplen, promisc, to_ms, errbuf ))) + { + free( ret ); + return NULL; + } + return ret; } -static int CDECL wrap_sendpacket( void *handle, const unsigned char *buf, int size ) +static int CDECL wrap_sendpacket( struct pcap *pcap, const unsigned char *buf, int size ) { - return pcap_sendpacket( handle, buf, size ); + return pcap_sendpacket( pcap->handle, buf, size ); } -static int CDECL wrap_set_buffer_size( void *handle, int size ) +static int CDECL wrap_set_buffer_size( struct pcap *pcap, int size ) { - return pcap_set_buffer_size( handle, size ); + return pcap_set_buffer_size( pcap->handle, size ); } -static int CDECL wrap_set_datalink( void *handle, int link ) +static int CDECL wrap_set_datalink( struct pcap *pcap, int link ) { - return pcap_set_datalink( handle, link ); + return pcap_set_datalink( pcap->handle, link ); } -static int CDECL wrap_set_promisc( void *handle, int enable ) +static int CDECL wrap_set_promisc( struct pcap *pcap, int enable ) { - return pcap_set_promisc( handle, enable ); + return pcap_set_promisc( pcap->handle, enable ); } -static int CDECL wrap_set_rfmon( void *handle, int enable ) +static int CDECL wrap_set_rfmon( struct pcap *pcap, int enable ) { - return pcap_set_rfmon( handle, enable ); + return pcap_set_rfmon( pcap->handle, enable ); } -static int CDECL wrap_set_snaplen( void *handle, int len ) +static int CDECL wrap_set_snaplen( struct pcap *pcap, int len ) { - return pcap_set_snaplen( handle, len ); + return pcap_set_snaplen( pcap->handle, len ); } -static int CDECL wrap_set_timeout( void *handle, int timeout ) +static int CDECL wrap_set_timeout( struct pcap *pcap, int timeout ) { - return pcap_set_timeout( handle, timeout ); + return pcap_set_timeout( pcap->handle, timeout ); } -static int CDECL wrap_set_tstamp_precision( void *handle, int precision ) +static int CDECL wrap_set_tstamp_precision( struct pcap *pcap, int precision ) { - return pcap_set_tstamp_precision( handle, precision ); + return pcap_set_tstamp_precision( pcap->handle, precision ); } -static int CDECL wrap_set_tstamp_type( void *handle, int type ) +static int CDECL wrap_set_tstamp_type( struct pcap *pcap, int type ) { - return pcap_set_tstamp_type( handle, type ); + return pcap_set_tstamp_type( pcap->handle, type ); } -static int CDECL wrap_setfilter( void *handle, void *program ) +static int CDECL wrap_setfilter( struct pcap *pcap, void *program ) { - return pcap_setfilter( handle, program ); + return pcap_setfilter( pcap->handle, program ); } -static int CDECL wrap_setnonblock( void *handle, int nonblock, char *errbuf ) +static int CDECL wrap_setnonblock( struct pcap *pcap, int nonblock, char *errbuf ) { - return pcap_setnonblock( handle, nonblock, errbuf ); + return pcap_setnonblock( pcap->handle, nonblock, errbuf ); } -static int CDECL wrap_snapshot( void *handle ) +static int CDECL wrap_snapshot( struct pcap *pcap ) { - return pcap_snapshot( handle ); + return pcap_snapshot( pcap->handle ); } -static int CDECL wrap_stats( void *handle, void *stats ) +static int CDECL wrap_stats( struct pcap *pcap, void *stats ) { - return pcap_stats( handle, stats ); + return pcap_stats( pcap->handle, stats ); } static const char * CDECL wrap_statustostr( int status ) diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index 71ee298e689..c5279f860fd 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -23,6 +23,11 @@ struct pcap_if_hdr char *name; }; +struct pcap +{ + void *handle; +}; + struct handler_callback { void (CALLBACK *callback)( unsigned char *, const void *, const unsigned char * ); @@ -31,52 +36,54 @@ struct handler_callback struct pcap_funcs { - int (CDECL *activate)( void * ); - void (CDECL *breakloop)( void * ); - int (CDECL *can_set_rfmon)( void * ); - void (CDECL *close)( void * ); - int (CDECL *compile)( void *, void *, const char *, int, unsigned int ); - void * (CDECL *create)( const char *, char * ); - int (CDECL *datalink)( void * ); + int (CDECL *activate)( struct pcap * ); + void (CDECL *breakloop)( struct pcap * ); + int (CDECL *can_set_rfmon)( struct pcap * ); + void (CDECL *close)( struct pcap * ); + int (CDECL *compile)( struct pcap *, void *, const char *, int, unsigned int ); + struct pcap * (CDECL *create)( const char *, char * ); + int (CDECL *datalink)( struct pcap * ); int (CDECL *datalink_name_to_val)( const char * ); const char * (CDECL *datalink_val_to_description)( int ); const char * (CDECL *datalink_val_to_name)( int ); - int (CDECL *dispatch)( void *, int, void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), + int (CDECL *dispatch)( struct pcap *, int, + void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), unsigned char * ); void (CDECL *dump)( unsigned char *, const void *, const unsigned char * ); - void * (CDECL *dump_open)( void *, const char * ); + void * (CDECL *dump_open)( struct pcap *, const char * ); int (CDECL *findalldevs)( struct pcap_if_hdr **, char * ); void (CDECL *free_datalinks)( int * ); void (CDECL *free_tstamp_types)( int * ); void (CDECL *freealldevs)( struct pcap_if_hdr * ); void (CDECL *freecode)( void * ); - int (CDECL *get_tstamp_precision)( void * ); - char * (CDECL *geterr)( void * ); - int (CDECL *getnonblock)( void *, char * ); + int (CDECL *get_tstamp_precision)( struct pcap * ); + char * (CDECL *geterr)( struct pcap * ); + int (CDECL *getnonblock)( struct pcap *, char * ); const char * (CDECL *lib_version)( void ); - int (CDECL *list_datalinks)( void *, int ** ); - int (CDECL *list_tstamp_types)( void *, int ** ); + int (CDECL *list_datalinks)( struct pcap *, int ** ); + int (CDECL *list_tstamp_types)( struct pcap *, int ** ); int (CDECL *lookupnet)( const char *, unsigned int *, unsigned int *, char * ); - int (CDECL *loop)( void *, int, void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), + int (CDECL *loop)( struct pcap *, int, + void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), unsigned char * ); - int (CDECL *major_version)( void * ); - int (CDECL *minor_version)( void * ); - const unsigned char * (CDECL *next)( void *, void * ); - int (CDECL *next_ex)( void *, void **, const unsigned char ** ); - void * (CDECL *open_live)( const char *, int, int, int, char * ); - int (CDECL *sendpacket)( void *, const unsigned char *, int ); - int (CDECL *set_buffer_size)( void *, int ); - int (CDECL *set_datalink)( void *, int ); - int (CDECL *set_promisc)( void *, int ); - int (CDECL *set_rfmon)( void *, int ); - int (CDECL *set_snaplen)( void *, int ); - int (CDECL *set_timeout)( void *, int ); - int (CDECL *set_tstamp_precision)( void *, int ); - int (CDECL *set_tstamp_type)( void *, int ); - int (CDECL *setfilter)( void *, void * ); - int (CDECL *setnonblock)( void *, int, char * ); - int (CDECL *snapshot)( void * ); - int (CDECL *stats)( void *, void * ); + int (CDECL *major_version)( struct pcap * ); + int (CDECL *minor_version)( struct pcap * ); + const unsigned char * (CDECL *next)( struct pcap *, void * ); + int (CDECL *next_ex)( struct pcap *, void **, const unsigned char ** ); + struct pcap * (CDECL *open_live)( const char *, int, int, int, char * ); + int (CDECL *sendpacket)( struct pcap *, const unsigned char *, int ); + int (CDECL *set_buffer_size)( struct pcap *, int ); + int (CDECL *set_datalink)( struct pcap *, int ); + int (CDECL *set_promisc)( struct pcap *, int ); + int (CDECL *set_rfmon)( struct pcap *, int ); + int (CDECL *set_snaplen)( struct pcap *, int ); + int (CDECL *set_timeout)( struct pcap *, int ); + int (CDECL *set_tstamp_precision)( struct pcap *, int ); + int (CDECL *set_tstamp_type)( struct pcap *, int ); + int (CDECL *setfilter)( struct pcap *, void * ); + int (CDECL *setnonblock)( struct pcap *, int, char * ); + int (CDECL *snapshot)( struct pcap * ); + int (CDECL *stats)( struct pcap *, void * ); const char * (CDECL *statustostr)( int ); int (CDECL *tstamp_type_name_to_val)( const char * ); const char * (CDECL *tstamp_type_val_to_description)( int ); diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 009a51c5a2b..a190634ac22 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -33,46 +33,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); const struct pcap_funcs *pcap_funcs = NULL; -int CDECL pcap_activate( void *handle ) +int CDECL pcap_activate( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->activate( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->activate( pcap ); } -void CDECL pcap_breakloop( void *handle ) +void CDECL pcap_breakloop( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - pcap_funcs->breakloop( handle ); + TRACE( "%p\n", pcap ); + pcap_funcs->breakloop( pcap ); } -int CDECL pcap_can_set_rfmon( void *handle ) +int CDECL pcap_can_set_rfmon( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->can_set_rfmon( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->can_set_rfmon( pcap ); } -void CDECL pcap_close( void *handle ) +void CDECL pcap_close( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - pcap_funcs->close( handle ); + TRACE( "%p\n", pcap ); + pcap_funcs->close( pcap ); } -int CDECL pcap_compile( void *handle, void *program, const char *buf, int optimize, unsigned int mask ) +int CDECL pcap_compile( struct pcap *pcap, void *program, const char *buf, int optimize, unsigned int mask ) { - TRACE( "%p, %p, %s, %d, %u\n", handle, program, debugstr_a(buf), optimize, mask ); - return pcap_funcs->compile( handle, program, buf, optimize, mask ); + TRACE( "%p, %p, %s, %d, %u\n", pcap, program, debugstr_a(buf), optimize, mask ); + return pcap_funcs->compile( pcap, program, buf, optimize, mask ); } -void * CDECL pcap_create( const char *src, char *errbuf ) +struct pcap * CDECL pcap_create( const char *src, char *errbuf ) { TRACE( "%s, %p\n", src, errbuf ); return pcap_funcs->create( src, errbuf ); } -int CDECL pcap_datalink( void *handle ) +int CDECL pcap_datalink( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->datalink( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->datalink( pcap ); } int CDECL pcap_datalink_name_to_val( const char *name ) @@ -93,12 +93,12 @@ const char * CDECL pcap_datalink_val_to_name( int link ) return pcap_funcs->datalink_val_to_name( link ); } -int CDECL pcap_dispatch( void *handle, int count, +int CDECL pcap_dispatch( struct pcap *pcap, int count, void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), unsigned char *user ) { - TRACE( "%p, %d, %p, %p\n", handle, count, callback, user ); - return pcap_funcs->dispatch( handle, count, callback, user ); + TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); + return pcap_funcs->dispatch( pcap, count, callback, user ); } void CDECL pcap_dump( unsigned char *user, const void *hdr, const unsigned char *packet ) @@ -118,13 +118,13 @@ static inline WCHAR *strdupAW( const char *str ) return ret; } -void * CDECL pcap_dump_open( void *handle, const char *filename ) +void * CDECL pcap_dump_open( struct pcap *pcap, const char *filename ) { void *dumper; WCHAR *filenameW; char *unix_path; - TRACE( "%p, %s\n", handle, debugstr_a(filename) ); + TRACE( "%p, %s\n", pcap, debugstr_a(filename) ); if (!(filenameW = strdupAW( filename ))) return NULL; unix_path = wine_get_unix_file_name( filenameW ); @@ -133,7 +133,7 @@ void * CDECL pcap_dump_open( void *handle, const char *filename ) TRACE( "unix_path %s\n", debugstr_a(unix_path) ); - dumper = pcap_funcs->dump_open( handle, unix_path ); + dumper = pcap_funcs->dump_open( pcap, unix_path ); RtlFreeHeap( GetProcessHeap(), 0, unix_path ); return dumper; } @@ -174,28 +174,28 @@ void CDECL pcap_freecode( void *program ) pcap_funcs->freecode( program ); } -void * CDECL pcap_get_airpcap_handle( void *handle ) +void * CDECL pcap_get_airpcap_handle( struct pcap *pcap ) { - TRACE( "%p\n", handle ); + TRACE( "%p\n", pcap ); return NULL; } -int CDECL pcap_get_tstamp_precision( void *handle ) +int CDECL pcap_get_tstamp_precision( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->get_tstamp_precision( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->get_tstamp_precision( pcap ); } -char * CDECL pcap_geterr( void *handle ) +char * CDECL pcap_geterr( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->geterr( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->geterr( pcap ); } -int CDECL pcap_getnonblock( void *handle, char *errbuf ) +int CDECL pcap_getnonblock( struct pcap *pcap, char *errbuf ) { - TRACE( "%p, %p\n", handle, errbuf ); - return pcap_funcs->getnonblock( handle, errbuf ); + TRACE( "%p, %p\n", pcap, errbuf ); + return pcap_funcs->getnonblock( pcap, errbuf ); } static char lib_version[256]; @@ -214,16 +214,16 @@ const char * CDECL pcap_lib_version( void ) return lib_version; } -int CDECL pcap_list_datalinks( void *handle, int **buf ) +int CDECL pcap_list_datalinks( struct pcap *pcap, int **buf ) { - TRACE( "%p, %p\n", handle, buf ); - return pcap_funcs->list_datalinks( handle, buf ); + TRACE( "%p, %p\n", pcap, buf ); + return pcap_funcs->list_datalinks( pcap, buf ); } -int CDECL pcap_list_tstamp_types( void *handle, int **types ) +int CDECL pcap_list_tstamp_types( struct pcap *pcap, int **types ) { - TRACE( "%p, %p\n", handle, types ); - return pcap_funcs->list_tstamp_types( handle, types ); + TRACE( "%p, %p\n", pcap, types ); + return pcap_funcs->list_tstamp_types( pcap, types ); } char * CDECL pcap_lookupdev( char *errbuf ) @@ -248,46 +248,46 @@ int CDECL pcap_lookupnet( const char *device, unsigned int *net, unsigned int *m return pcap_funcs->lookupnet( device, net, mask, errbuf ); } -int CDECL pcap_loop( void *handle, int count, +int CDECL pcap_loop( struct pcap *pcap, int count, void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), unsigned char *user) { - TRACE( "%p, %d, %p, %p\n", handle, count, callback, user ); - return pcap_funcs->loop( handle, count, callback, user ); + TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); + return pcap_funcs->loop( pcap, count, callback, user ); } -int CDECL pcap_major_version( void *handle ) +int CDECL pcap_major_version( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->major_version( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->major_version( pcap ); } -int CDECL pcap_minor_version( void *handle ) +int CDECL pcap_minor_version( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->minor_version( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->minor_version( pcap ); } -const unsigned char * CDECL pcap_next( void *handle, void *hdr ) +const unsigned char * CDECL pcap_next( struct pcap *pcap, void *hdr ) { - TRACE( "%p, %p\n", handle, hdr ); - return pcap_funcs->next( handle, hdr ); + TRACE( "%p, %p\n", pcap, hdr ); + return pcap_funcs->next( pcap, hdr ); } -int CDECL pcap_next_ex( void *handle, void **hdr, const unsigned char **data ) +int CDECL pcap_next_ex( struct pcap *pcap, void **hdr, const unsigned char **data ) { - TRACE( "%p, %p, %p\n", handle, hdr, data ); - return pcap_funcs->next_ex( handle, hdr, data ); + TRACE( "%p, %p, %p\n", pcap, hdr, data ); + return pcap_funcs->next_ex( pcap, hdr, data ); } #define PCAP_OPENFLAG_PROMISCUOUS 1 -void * CDECL pcap_open( const char *source, int snaplen, int flags, int timeout, void *auth, char *errbuf ) +struct pcap * CDECL pcap_open( const char *source, int snaplen, int flags, int timeout, void *auth, char *errbuf ) { FIXME( "%s, %d, %d, %d, %p, %p: partial stub\n", debugstr_a(source), snaplen, flags, timeout, auth, errbuf ); return pcap_funcs->open_live( source, snaplen, flags & PCAP_OPENFLAG_PROMISCUOUS, timeout, errbuf ); } -void * CDECL pcap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) +struct pcap * CDECL pcap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) { TRACE( "%s, %d, %d, %d, %p\n", debugstr_a(source), snaplen, promisc, to_ms, errbuf ); return pcap_funcs->open_live( source, snaplen, promisc, to_ms, errbuf ); @@ -334,88 +334,88 @@ int CDECL pcap_parsesrcstr( const char *source, int *type, char *host, char *por return 0; } -int CDECL pcap_sendpacket( void *handle, const unsigned char *buf, int size ) +int CDECL pcap_sendpacket( struct pcap *pcap, const unsigned char *buf, int size ) { - TRACE( "%p, %p, %d\n", handle, buf, size ); - return pcap_funcs->sendpacket( handle, buf, size ); + TRACE( "%p, %p, %d\n", pcap, buf, size ); + return pcap_funcs->sendpacket( pcap, buf, size ); } -int CDECL pcap_set_buffer_size( void *handle, int size ) +int CDECL pcap_set_buffer_size( struct pcap *pcap, int size ) { - TRACE( "%p, %d\n", handle, size ); - return pcap_funcs->set_buffer_size( handle, size ); + TRACE( "%p, %d\n", pcap, size ); + return pcap_funcs->set_buffer_size( pcap, size ); } -int CDECL pcap_set_datalink( void *handle, int link ) +int CDECL pcap_set_datalink( struct pcap *pcap, int link ) { - TRACE( "%p, %d\n", handle, link ); - return pcap_funcs->set_datalink( handle, link ); + TRACE( "%p, %d\n", pcap, link ); + return pcap_funcs->set_datalink( pcap, link ); } -int CDECL pcap_set_promisc( void *handle, int enable ) +int CDECL pcap_set_promisc( struct pcap *pcap, int enable ) { - TRACE( "%p, %d\n", handle, enable ); - return pcap_funcs->set_promisc( handle, enable ); + TRACE( "%p, %d\n", pcap, enable ); + return pcap_funcs->set_promisc( pcap, enable ); } -int CDECL pcap_set_rfmon( void *handle, int enable ) +int CDECL pcap_set_rfmon( struct pcap *pcap, int enable ) { - TRACE( "%p, %d\n", handle, enable ); - return pcap_funcs->set_rfmon( handle, enable ); + TRACE( "%p, %d\n", pcap, enable ); + return pcap_funcs->set_rfmon( pcap, enable ); } -int CDECL pcap_set_snaplen( void *handle, int len ) +int CDECL pcap_set_snaplen( struct pcap *pcap, int len ) { - TRACE( "%p, %d\n", handle, len ); - return pcap_funcs->set_snaplen( handle, len ); + TRACE( "%p, %d\n", pcap, len ); + return pcap_funcs->set_snaplen( pcap, len ); } -int CDECL pcap_set_timeout( void *handle, int timeout ) +int CDECL pcap_set_timeout( struct pcap *pcap, int timeout ) { - TRACE( "%p, %d\n", handle, timeout ); - return pcap_funcs->set_timeout( handle, timeout ); + TRACE( "%p, %d\n", pcap, timeout ); + return pcap_funcs->set_timeout( pcap, timeout ); } -int CDECL pcap_set_tstamp_precision( void *handle, int precision ) +int CDECL pcap_set_tstamp_precision( struct pcap *pcap, int precision ) { - TRACE( "%p, %d\n", handle, precision ); - return pcap_funcs->set_tstamp_precision( handle, precision ); + TRACE( "%p, %d\n", pcap, precision ); + return pcap_funcs->set_tstamp_precision( pcap, precision ); } -int CDECL pcap_set_tstamp_type( void *handle, int type ) +int CDECL pcap_set_tstamp_type( struct pcap *pcap, int type ) { - TRACE( "%p, %d\n", handle, type ); - return pcap_funcs->set_tstamp_type( handle, type ); + TRACE( "%p, %d\n", pcap, type ); + return pcap_funcs->set_tstamp_type( pcap, type ); } -int CDECL pcap_setbuff( void *handle, int size ) +int CDECL pcap_setbuff( struct pcap *pcap, int size ) { - FIXME( "%p, %d\n", handle, size ); + FIXME( "%p, %d\n", pcap, size ); return 0; } -int CDECL pcap_setfilter( void *handle, void *program ) +int CDECL pcap_setfilter( struct pcap *pcap, void *program ) { - TRACE( "%p, %p\n", handle, program ); - return pcap_funcs->setfilter( handle, program ); + TRACE( "%p, %p\n", pcap, program ); + return pcap_funcs->setfilter( pcap, program ); } -int CDECL pcap_setnonblock( void *handle, int nonblock, char *errbuf ) +int CDECL pcap_setnonblock( struct pcap *pcap, int nonblock, char *errbuf ) { - TRACE( "%p, %d, %p\n", handle, nonblock, errbuf ); - return pcap_funcs->setnonblock( handle, nonblock, errbuf ); + TRACE( "%p, %d, %p\n", pcap, nonblock, errbuf ); + return pcap_funcs->setnonblock( pcap, nonblock, errbuf ); } -int CDECL pcap_snapshot( void *handle ) +int CDECL pcap_snapshot( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->snapshot( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->snapshot( pcap ); } -int CDECL pcap_stats( void *handle, void *stats ) +int CDECL pcap_stats( struct pcap *pcap, void *stats ) { - TRACE( "%p, %p\n", handle, stats ); - return pcap_funcs->stats( handle, stats ); + TRACE( "%p, %p\n", pcap, stats ); + return pcap_funcs->stats( pcap, stats ); } const char * CDECL pcap_statustostr( int status ) -- 2.30.2

1 0

[PATCH 7/8] gdi32: Avoid using RtlOpenCurrentUser.
by Jacek Caban 04 Oct '21

04 Oct '21

Based on open_hkcu_key. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

1 0

[PATCH 5/8] gdi32: Use win32u_wcsicmp instead of RtlCompareUnicodeStrings.
by Jacek Caban 04 Oct '21

04 Oct '21

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

1 0

[PATCH 4/8] gdi32: Use pthread mutex in dib driver.
by Jacek Caban 04 Oct '21

04 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dibdrv/graphics.c | 16 +++++----------- dlls/gdi32/win32u_private.h | 3 --- 2 files changed, 5 insertions(+), 14 deletions(-)

1 0

[PATCH 3/8] gdi32: Use pthread mutex in font.c.
by Jacek Caban 04 Oct '21

04 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 95 ++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 50 deletions(-)

1 0

[PATCH 2/8] gdi32: Use pthread mutex instead of gdi_section.
by Jacek Caban 04 Oct '21

04 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- GDI_CheckNotLock can't be implemented directly on top of pthread, we would need to keep track of owning thread ourselves. Since it's used only for an assert, I replaced it with comments instead. dlls/gdi32/dc.c | 10 ++--- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdiobj.c | 83 ++++++++++++++++---------------------- dlls/gdi32/ntgdi_private.h | 1 - 4 files changed, 40 insertions(+), 56 deletions(-)

1 0

[PATCH 1/8] gdi32: Use pthread mutex in driver.c.
by Jacek Caban 04 Oct '21

04 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/driver.c | 31 +++++++++++++------------------ 2 files changed, 14 insertions(+), 19 deletions(-)

1 0

[PATCH 5/5] nsiproxy: Introduce a unix-side handle returned by icmp_send_echo().
by Huw Davies 04 Oct '21

04 Oct '21

This represents the state of the icmp request for use on the PE-side. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 10 +++- dlls/nsiproxy.sys/icmp_echo.c | 77 +++++++++++++++++++++++++++- dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 1 + dlls/nsiproxy.sys/unix_private.h | 1 + 5 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 5ae243a4111..cd0bc0e4db2 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -58,6 +58,7 @@ static NTSTATUS nsiproxy_call( unsigned int code, void *args ) enum unix_calls { + icmp_close, icmp_send_echo, nsi_enumerate_all_ex, nsi_get_all_parameters_ex, @@ -309,7 +310,7 @@ static void handle_queued_send_echo( IRP *irp ) status = nsiproxy_call( icmp_send_echo, &params ); TRACE( "icmp_send_echo rets %08x\n", status ); - if (1) + if (status != STATUS_PENDING) { irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) @@ -320,6 +321,13 @@ static void handle_queued_send_echo( IRP *irp ) } IoCompleteRequest( irp, IO_NO_INCREMENT ); } + else + { + /* FIXME */ + nsiproxy_call( icmp_close, params.handle ); + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } } static DWORD WINAPI request_thread_proc( void *arg ) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 8ec506f823c..90a779fb67e 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -104,6 +104,68 @@ struct icmp_data const struct family_ops *ops; }; +#define MAX_HANDLES 256 /* Max number of simultaneous pings - could become dynamic if need be */ +static struct icmp_data *handle_table[MAX_HANDLES]; +static pthread_mutex_t handle_lock = PTHREAD_MUTEX_INITIALIZER; +static struct icmp_data **next_free, **next_unused = handle_table; + +static HANDLE handle_alloc( struct icmp_data *data ) +{ + struct icmp_data **entry; + HANDLE h; + + pthread_mutex_lock( &handle_lock ); + entry = next_free; + if (entry) next_free = *(struct icmp_data ***)entry; + else if (next_unused < handle_table + MAX_HANDLES) entry = next_unused++; + else + { + pthread_mutex_unlock( &handle_lock ); + FIXME( "Exhausted icmp handle count\n" ); + return 0; + } + *entry = data; + h = LongToHandle( entry - handle_table + 1 ); + pthread_mutex_unlock( &handle_lock ); + TRACE( "returning handle %p\n", h ); + return h; +} + +static struct icmp_data **handle_entry( HANDLE h ) +{ + unsigned int idx = HandleToLong( h ); + + if (!idx || idx > MAX_HANDLES) + { + ERR( "Invalid icmp handle\n" ); + return NULL; + } + return handle_table + idx - 1; +} + +static struct icmp_data *handle_data( HANDLE h ) +{ + struct icmp_data **entry = handle_entry( h ); + + if (!entry) return NULL; + return *entry; +} + +static void handle_free( HANDLE h ) +{ + struct icmp_data **entry; + + TRACE( "%p\n", h ); + pthread_mutex_lock( &handle_lock ); + entry = handle_entry( h ); + if (entry) + { + *(struct icmp_data ***)entry = next_free; + next_free = entry; + } + pthread_mutex_unlock( &handle_lock ); +} + static void ipv4_init_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp_hdr ) { icmp_hdr->type = ICMP4_ECHO_REQUEST; @@ -315,7 +377,18 @@ NTSTATUS icmp_send_echo( void *args ) return STATUS_SUCCESS; } - /* FIXME */ + params->handle = handle_alloc( data ); + if (!params->handle) icmp_data_free( data ); + return params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; +} + +NTSTATUS icmp_close( void *args ) +{ + HANDLE handle = args; + struct icmp_data *data = handle_data( handle ); + + if (!data) return STATUS_INVALID_PARAMETER; icmp_data_free( data ); - return STATUS_NOT_SUPPORTED; + handle_free( handle ); + return STATUS_SUCCESS; } diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 25219a1c3fe..dec66ad6a33 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -147,6 +147,7 @@ static NTSTATUS unix_nsi_get_parameter_ex( void *args ) const unixlib_entry_t __wine_unix_call_funcs[] = { + icmp_close, icmp_send_echo, unix_nsi_enumerate_all_ex, unix_nsi_get_all_parameters_ex, diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 9831998793d..b40a6198c7c 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -24,5 +24,6 @@ struct icmp_send_echo_params void *request; DWORD request_size; BYTE ttl, tos; + HANDLE handle; ULONG ip_status; }; diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 0dfe9e69dbc..7f81336e3f1 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -157,4 +157,5 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) return ascii_strncasecmp( s1, s2, -1 ); } +NTSTATUS icmp_close( void *args ) DECLSPEC_HIDDEN; NTSTATUS icmp_send_echo( void *args ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 4/5] nsiproxy: Actually send the ICMP ECHO request.
by Huw Davies 04 Oct '21

04 Oct '21

However, don't yet wait for the reply. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 1 + dlls/nsiproxy.sys/device.c | 37 ++- dlls/nsiproxy.sys/icmp_echo.c | 321 +++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 28 +++ dlls/nsiproxy.sys/unix_private.h | 2 + 6 files changed, 387 insertions(+), 3 deletions(-) create mode 100644 dlls/nsiproxy.sys/icmp_echo.c create mode 100644 dlls/nsiproxy.sys/nsiproxy_private.h diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index 95f2a205816..87f7e165ef4 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ device.c \ + icmp_echo.c \ ip.c \ ndis.c \ nsi.c \ diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index f4cefd4b794..5ae243a4111 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -33,6 +33,8 @@ #include "wine/debug.h" #include "wine/unixlib.h" +#include "nsiproxy_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(nsi); static unixlib_handle_t nsiproxy_handle; @@ -56,6 +58,7 @@ static NTSTATUS nsiproxy_call( unsigned int code, void *args ) enum unix_calls { + icmp_send_echo, nsi_enumerate_all_ex, nsi_get_all_parameters_ex, nsi_get_parameter_ex, @@ -289,6 +292,36 @@ static int add_device( DRIVER_OBJECT *driver ) return 1; } +static void handle_queued_send_echo( IRP *irp ) +{ + struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; + struct nsiproxy_icmp_echo_reply *reply = (struct nsiproxy_icmp_echo_reply *)irp->AssociatedIrp.SystemBuffer; + struct icmp_send_echo_params params; + NTSTATUS status; + + TRACE( "\n" ); + params.request = in->data + ((in->opt_size + 3) & ~3); + params.request_size = in->req_size; + params.ttl = in->ttl; + params.tos = in->tos; + params.dst = &in->dst; + + status = nsiproxy_call( icmp_send_echo, &params ); + TRACE( "icmp_send_echo rets %08x\n", status ); + + if (1) + { + irp->IoStatus.Status = status; + if (status == STATUS_SUCCESS) + { + memset( reply, 0, sizeof(*reply) ); + reply->status = params.ip_status; + irp->IoStatus.Information = sizeof(*reply); + } + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } +} + static DWORD WINAPI request_thread_proc( void *arg ) { LIST_ENTRY *entry; @@ -309,9 +342,7 @@ static DWORD WINAPI request_thread_proc( void *arg ) continue; } - /* FIXME */ - irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + handle_queued_send_echo( irp ); } LeaveCriticalSection( &nsiproxy_cs ); } diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c new file mode 100644 index 00000000000..8ec506f823c --- /dev/null +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -0,0 +1,321 @@ +/* + * nsiproxy.sys icmp_echo implementation + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep unix +#endif + +#define _NTSYSTEM_ + +#include "config.h" +#include <stdarg.h> + +#include <stdlib.h> +#include <unistd.h> +#include <errno.h> +#include <limits.h> +#include <pthread.h> + +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#define USE_WS_PREFIX +#include "ddk/wdm.h" +#include "ifdef.h" +#include "netiodef.h" +#include "ipexport.h" +#include "ipmib.h" +#include "wine/nsi.h" +#include "wine/debug.h" + +#include "nsiproxy_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +static LONG icmp_sequence; + +struct ip_hdr +{ + uint8_t v_hl; /* version << 4 | hdr_len */ + uint8_t tos; + uint16_t tot_len; + uint16_t id; + uint16_t frag_off; + uint8_t ttl; + uint8_t protocol; + uint16_t checksum; + uint32_t saddr; + uint32_t daddr; +}; + +struct icmp_hdr +{ + uint8_t type; + uint8_t code; + uint16_t checksum; + union + { + struct + { + uint16_t id; + uint16_t sequence; + } echo; + } un; +}; + +struct family_ops; +struct icmp_data +{ + LARGE_INTEGER send_time; + int socket; + unsigned short id; + unsigned short seq; + const struct family_ops *ops; +}; + +static void ipv4_init_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp_hdr ) +{ + icmp_hdr->type = ICMP4_ECHO_REQUEST; + icmp_hdr->code = 0; + icmp_hdr->checksum = 0; + icmp_hdr->un.echo.id = data->id = getpid() & 0xffff; /* will be overwritten for linux ping socks */ + icmp_hdr->un.echo.sequence = data->seq = InterlockedIncrement( &icmp_sequence ) & 0xffff; +} + +/* rfc 1071 checksum */ +static unsigned short chksum( BYTE *data, unsigned int count ) +{ + unsigned int sum = 0, carry = 0; + unsigned short check, s; + + while (count > 1) + { + s = *(unsigned short *)data; + data += 2; + sum += carry; + sum += s; + carry = s > sum; + count -= 2; + } + sum += carry; /* This won't produce another carry */ + sum = (sum & 0xffff) + (sum >> 16); + + if (count) sum += *data; /* LE-only */ + + sum = (sum & 0xffff) + (sum >> 16); + /* fold in any carry */ + sum = (sum & 0xffff) + (sum >> 16); + + check = ~sum; + return check; +} + +#ifdef __linux__ +static unsigned short null_chksum( BYTE *data, unsigned int count ) +{ + return 0; +} +#endif + +static void ipv4_set_socket_opts( struct icmp_data *data, struct icmp_send_echo_params *params ) +{ + int val; + + val = params->ttl; + if (val) setsockopt( data->socket, IPPROTO_IP, IP_TTL, &val, sizeof(val) ); + val = params->tos; + if (val) setsockopt( data->socket, IPPROTO_IP, IP_TOS, &val, sizeof(val) ); +} + +#ifdef __linux__ +static void ipv4_linux_ping_set_socket_opts( struct icmp_data *data, struct icmp_send_echo_params *params ) +{ + static const int val = 1; + + ipv4_set_socket_opts( data, params ); + + setsockopt( data->socket, IPPROTO_IP, IP_RECVTTL, &val, sizeof(val) ); + setsockopt( data->socket, IPPROTO_IP, IP_RECVTOS, &val, sizeof(val) ); +} +#endif + +struct family_ops +{ + int family; + int icmp_protocol; + void (*init_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp_hdr ); + unsigned short (*chksum)( BYTE *data, unsigned int count ); + void (*set_socket_opts)( struct icmp_data *data, struct icmp_send_echo_params *params ); +}; + +static const struct family_ops ipv4 = +{ + AF_INET, + IPPROTO_ICMP, + ipv4_init_icmp_hdr, + chksum, + ipv4_set_socket_opts, +}; + +#ifdef __linux__ +/* linux ipv4 ping sockets behave more like ipv6 raw sockets */ +static const struct family_ops ipv4_linux_ping = +{ + AF_INET, + IPPROTO_ICMP, + ipv4_init_icmp_hdr, + null_chksum, + ipv4_linux_ping_set_socket_opts, +}; +#endif + +static IP_STATUS errno_to_ip_status( int err ) +{ + switch( err ) + { + case EHOSTUNREACH: return IP_DEST_HOST_UNREACHABLE; + default: return IP_GENERAL_FAILURE; + } +} + +static int SOCKADDR_INET_to_sockaddr( const SOCKADDR_INET *in, struct sockaddr *out, int len ) +{ + switch (in->si_family) + { + case WS_AF_INET: + { + struct sockaddr_in *sa = (struct sockaddr_in *)out; + + if (len < sizeof(*sa)) return 0; + sa->sin_family = AF_INET; + sa->sin_port = in->Ipv4.sin_port; + sa->sin_addr.s_addr = in->Ipv4.sin_addr.WS_s_addr; + return sizeof(*sa); + } + case WS_AF_INET6: + { + struct sockaddr_in6 *sa = (struct sockaddr_in6 *)out; + + if (len < sizeof(*sa)) return 0; + sa->sin6_family = AF_INET6; + sa->sin6_port = in->Ipv6.sin6_port; + sa->sin6_flowinfo = in->Ipv6.sin6_flowinfo; + memcpy( sa->sin6_addr.s6_addr, in->Ipv6.sin6_addr.WS_s6_addr, sizeof(sa->sin6_addr.s6_addr) ); + sa->sin6_scope_id = in->Ipv6.sin6_scope_id; + return sizeof(*sa); + } + } + return 0; +} + +static NTSTATUS icmp_data_create( ADDRESS_FAMILY win_family, struct icmp_data **icmp_data ) +{ + struct icmp_data *data; + const struct family_ops *ops; + + if (win_family == WS_AF_INET) ops = &ipv4; + else return STATUS_INVALID_PARAMETER; + + data = malloc( sizeof(*data) ); + if (!data) return STATUS_NO_MEMORY; + + data->socket = socket( ops->family, SOCK_RAW, ops->icmp_protocol ); + if (data->socket < 0) /* Try a ping-socket */ + { + TRACE( "failed to open raw sock, trying a dgram sock\n" ); + data->socket = socket( ops->family, SOCK_DGRAM, ops->icmp_protocol ); + if (data->socket < 0) + { + WARN( "Unable to create socket\n" ); + free( data ); + return STATUS_ACCESS_DENIED; + } +#ifdef __linux__ + if (ops->family == AF_INET) ops = &ipv4_linux_ping; +#endif + } + data->ops = ops; + + *icmp_data = data; + return STATUS_SUCCESS; +} + +static void icmp_data_free( struct icmp_data *data ) +{ + close( data->socket ); + free( data ); +} + +NTSTATUS icmp_send_echo( void *args ) +{ + struct icmp_send_echo_params *params = args; + struct icmp_hdr *icmp_hdr; /* this is the same for both ipv4 and ipv6 */ + struct sockaddr_storage dst_storage; + struct sockaddr *dst = (struct sockaddr *)&dst_storage; + struct icmp_data *data; + int dst_len, ret; + NTSTATUS status; + + status = icmp_data_create( params->dst->si_family, &data ); + if (status) return status; + data->ops->set_socket_opts( data, params ); + + icmp_hdr = malloc( sizeof(*icmp_hdr) + params->request_size ); + if (!icmp_hdr) + { + icmp_data_free( data ); + return STATUS_NO_MEMORY; + } + data->ops->init_icmp_hdr( data, icmp_hdr ); + memcpy( icmp_hdr + 1, params->request, params->request_size ); + icmp_hdr->checksum = data->ops->chksum( (BYTE *)icmp_hdr, sizeof(*icmp_hdr) + params->request_size ); + + dst_len = SOCKADDR_INET_to_sockaddr( params->dst, dst, sizeof(dst_storage) ); + + NtQueryPerformanceCounter( &data->send_time, NULL ); + ret = sendto( data->socket, icmp_hdr, sizeof(*icmp_hdr) + params->request_size, 0, dst, dst_len ); + free( icmp_hdr ); + + if (ret < 0) + { + TRACE( "sendto() rets %d errno %d\n", ret, errno ); + icmp_data_free( data ); + params->ip_status = errno_to_ip_status( errno ); + return STATUS_SUCCESS; + } + + /* FIXME */ + icmp_data_free( data ); + return STATUS_NOT_SUPPORTED; +} diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 565ae2d11dd..25219a1c3fe 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -147,6 +147,7 @@ static NTSTATUS unix_nsi_get_parameter_ex( void *args ) const unixlib_entry_t __wine_unix_call_funcs[] = { + icmp_send_echo, unix_nsi_enumerate_all_ex, unix_nsi_get_all_parameters_ex, unix_nsi_get_parameter_ex diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h new file mode 100644 index 00000000000..9831998793d --- /dev/null +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -0,0 +1,28 @@ +/* + * nsiproxy.sys + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +struct icmp_send_echo_params +{ + SOCKADDR_INET *dst; + void *request; + DWORD request_size; + BYTE ttl, tos; + ULONG ip_status; +}; diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 97e264e9b1a..0dfe9e69dbc 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -156,3 +156,5 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) { return ascii_strncasecmp( s1, s2, -1 ); } + +NTSTATUS icmp_send_echo( void *args ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 3/5] nsiproxy: Introduce IOCTL_NSIPROXY_WINE_ICMP_ECHO.
by Huw Davies 04 Oct '21

04 Oct '21

With this patch the irp is simply marked as pending and transferred to the request thread which completes the irp with STATUS_NOT_SUPPORTED. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 103 +++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 34 ++++++++++++ 2 files changed, 137 insertions(+) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index fb330ddfc93..f4cefd4b794 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -36,6 +36,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(nsi); static unixlib_handle_t nsiproxy_handle; +static HANDLE request_event; + +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION( nsiproxy_cs ); + +#define LIST_ENTRY_INIT( list ) { .Flink = &(list), .Blink = &(list) } +static LIST_ENTRY request_queue = LIST_ENTRY_INIT( request_queue ); static NTSTATUS nsiproxy_call( unsigned int code, void *args ) { @@ -162,6 +174,59 @@ static NTSTATUS nsiproxy_get_parameter( IRP *irp ) return status; } +static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) +{ + TRACE( "device %p, irp %p.\n", device, irp ); + + IoReleaseCancelSpinLock( irp->CancelIrql ); + + /* FIXME: at the moment just let the request thread bail */ + return; +} + +static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + + TRACE( "\n" ); + + if (in_len < offsetof(struct nsiproxy_icmp_echo, data[0]) || + in_len < offsetof(struct nsiproxy_icmp_echo, data[((in->opt_size + 3) & ~3) + in->req_size]) || + out_len < sizeof(struct nsiproxy_icmp_echo_reply)) + return STATUS_INVALID_PARAMETER; + + switch (in->dst.si_family) + { + case AF_INET: + if (in->dst.Ipv4.sin_addr.s_addr == INADDR_ANY) return STATUS_INVALID_ADDRESS_WILDCARD; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + EnterCriticalSection( &nsiproxy_cs ); + + IoSetCancelRoutine( irp, icmp_echo_cancel ); + if (irp->Cancel && !IoSetCancelRoutine( irp, NULL )) + { + /* IRP was canceled before we set cancel routine */ + InitializeListHead( &irp->Tail.Overlay.ListEntry ); + LeaveCriticalSection( &nsiproxy_cs ); + return STATUS_CANCELLED; + } + + InsertTailList( &request_queue, &irp->Tail.Overlay.ListEntry ); + IoMarkIrpPending( irp ); + + LeaveCriticalSection( &nsiproxy_cs ); + SetEvent( request_event ); + + return STATUS_PENDING; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -186,6 +251,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = nsiproxy_get_parameter( irp ); break; + case IOCTL_NSIPROXY_WINE_ICMP_ECHO: + status = nsiproxy_icmp_echo( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); status = STATUS_NOT_SUPPORTED; @@ -220,10 +289,40 @@ static int add_device( DRIVER_OBJECT *driver ) return 1; } +static DWORD WINAPI request_thread_proc( void *arg ) +{ + LIST_ENTRY *entry; + + while (WaitForSingleObject( request_event, INFINITE ) == WAIT_OBJECT_0) + { + TRACE( "request_event triggered\n" ); + EnterCriticalSection( &nsiproxy_cs ); + while ((entry = RemoveHeadList( &request_queue )) != &request_queue ) + { + IRP *irp = CONTAINING_RECORD( entry, IRP, Tail.Overlay.ListEntry ); + + if (irp->Cancel) + { + irp->IoStatus.Status = STATUS_CANCELLED; + TRACE( "already cancelled\n" ); + IoCompleteRequest( irp, IO_NO_INCREMENT ); + continue; + } + + /* FIXME */ + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } + LeaveCriticalSection( &nsiproxy_cs ); + } + return 0; +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { HMODULE instance; NTSTATUS status; + HANDLE thread; TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); @@ -236,5 +335,9 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) add_device( driver ); + request_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + thread = CreateThread( NULL, 0, request_thread_proc, NULL, 0, NULL ); + CloseHandle( thread ); + return STATUS_SUCCESS; } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 7b8cb29e9d5..9664b534b09 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -380,6 +380,7 @@ struct nsi_udp_endpoint_static #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) #define IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS CTL_CODE(FILE_DEVICE_NETWORK, 0x401, METHOD_BUFFERED, 0) #define IOCTL_NSIPROXY_WINE_GET_PARAMETER CTL_CODE(FILE_DEVICE_NETWORK, 0x402, METHOD_BUFFERED, 0) +#define IOCTL_NSIPROXY_WINE_ICMP_ECHO CTL_CODE(FILE_DEVICE_NETWORK, 0x403, METHOD_BUFFERED, 0) /* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ struct nsiproxy_enumerate_all @@ -420,6 +421,39 @@ struct nsiproxy_get_parameter BYTE key[1]; /* key_size */ }; +/* input for IOCTL_NSIPROXY_WINE_ICMP_ECHO */ +struct nsiproxy_icmp_echo +{ + SOCKADDR_INET src; + SOCKADDR_INET dst; + BYTE ttl; + BYTE tos; + BYTE flags; + DWORD opt_size; + DWORD req_size; + DWORD timeout; + BYTE data[1]; /* ((opt_size + 3) & ~3) + req_size */ +}; + +/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ +struct nsiproxy_icmp_echo_reply +{ + SOCKADDR_INET addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + DWORD data_offset; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + DWORD options_offset; + } opts; +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0 -- 2.23.0

1 0

[PATCH 2/5] nsiproxy: Let the general dispatch function update the irp's status.
by Huw Davies 04 Oct '21

04 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 77 ++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 41 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 3afd76487ff..fb330ddfc93 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -20,7 +20,6 @@ #include <stdarg.h> -#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -50,7 +49,7 @@ enum unix_calls nsi_get_parameter_ex, }; -static void nsiproxy_enumerate_all( IRP *irp ) +static NTSTATUS nsiproxy_enumerate_all( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_enumerate_all *in = (struct nsiproxy_enumerate_all *)irp->AssociatedIrp.SystemBuffer; @@ -58,18 +57,12 @@ static void nsiproxy_enumerate_all( IRP *irp ) void *out = irp->AssociatedIrp.SystemBuffer; DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsi_enumerate_all_ex enum_all; + NTSTATUS status; - if (in_len != sizeof(*in)) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + if (in_len != sizeof(*in)) return STATUS_INVALID_PARAMETER; if (out_len < sizeof(DWORD) + (in->key_size + in->rw_size + in->dynamic_size + in->static_size) * in->count) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + return STATUS_INVALID_PARAMETER; enum_all.unknown[0] = 0; enum_all.unknown[1] = 0; @@ -87,16 +80,18 @@ static void nsiproxy_enumerate_all( IRP *irp ) enum_all.static_size = in->static_size; enum_all.count = in->count; - irp->IoStatus.u.Status = nsiproxy_call( nsi_enumerate_all_ex, &enum_all ); - if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_BUFFER_OVERFLOW) + status = nsiproxy_call( nsi_enumerate_all_ex, &enum_all ); + if (status == STATUS_SUCCESS || status == STATUS_BUFFER_OVERFLOW) { irp->IoStatus.Information = out_len; *(DWORD *)out = enum_all.count; } else irp->IoStatus.Information = 0; + + return status; } -static void nsiproxy_get_all_parameters( IRP *irp ) +static NTSTATUS nsiproxy_get_all_parameters( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_get_all_parameters *in = (struct nsiproxy_get_all_parameters *)irp->AssociatedIrp.SystemBuffer; @@ -104,19 +99,14 @@ static void nsiproxy_get_all_parameters( IRP *irp ) BYTE *out = irp->AssociatedIrp.SystemBuffer; DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsi_get_all_parameters_ex get_all; + NTSTATUS status; - if (in_len < FIELD_OFFSET(struct nsiproxy_get_all_parameters, key[0]) || - in_len < FIELD_OFFSET(struct nsiproxy_get_all_parameters, key[in->key_size])) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + if (in_len < offsetof(struct nsiproxy_get_all_parameters, key[0]) || + in_len < offsetof(struct nsiproxy_get_all_parameters, key[in->key_size])) + return STATUS_INVALID_PARAMETER; if (out_len < in->rw_size + in->dynamic_size + in->static_size) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + return STATUS_INVALID_PARAMETER; get_all.unknown[0] = 0; get_all.unknown[1] = 0; @@ -133,11 +123,13 @@ static void nsiproxy_get_all_parameters( IRP *irp ) get_all.static_data = out + in->rw_size + in->dynamic_size; get_all.static_size = in->static_size; - irp->IoStatus.u.Status = nsiproxy_call( nsi_get_all_parameters_ex, &get_all ); - irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; + status = nsiproxy_call( nsi_get_all_parameters_ex, &get_all ); + irp->IoStatus.Information = (status == STATUS_SUCCESS) ? out_len : 0; + + return status; } -static void nsiproxy_get_parameter( IRP *irp ) +static NTSTATUS nsiproxy_get_parameter( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_get_parameter *in = (struct nsiproxy_get_parameter *)irp->AssociatedIrp.SystemBuffer; @@ -145,13 +137,11 @@ static void nsiproxy_get_parameter( IRP *irp ) void *out = irp->AssociatedIrp.SystemBuffer; DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsi_get_parameter_ex get_param; + NTSTATUS status; - if (in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[0]) || - in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[in->key_size])) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + if (in_len < offsetof(struct nsiproxy_get_parameter, key[0]) || + in_len < offsetof(struct nsiproxy_get_parameter, key[in->key_size])) + return STATUS_INVALID_PARAMETER; get_param.unknown[0] = 0; get_param.unknown[1] = 0; @@ -166,8 +156,10 @@ static void nsiproxy_get_parameter( IRP *irp ) get_param.data_size = out_len; get_param.data_offset = in->data_offset; - irp->IoStatus.u.Status = nsiproxy_call( nsi_get_parameter_ex, &get_param ); - irp->IoStatus.Information = irp->IoStatus.u.Status == STATUS_SUCCESS ? out_len : 0; + status = nsiproxy_call( nsi_get_parameter_ex, &get_param ); + irp->IoStatus.Information = (status == STATUS_SUCCESS) ? out_len : 0; + + return status; } static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) @@ -183,25 +175,28 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_NSIPROXY_WINE_ENUMERATE_ALL: - nsiproxy_enumerate_all( irp ); + status = nsiproxy_enumerate_all( irp ); break; case IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS: - nsiproxy_get_all_parameters( irp ); + status = nsiproxy_get_all_parameters( irp ); break; case IOCTL_NSIPROXY_WINE_GET_PARAMETER: - nsiproxy_get_parameter( irp ); + status = nsiproxy_get_parameter( irp ); break; default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + status = STATUS_NOT_SUPPORTED; break; } - status = irp->IoStatus.u.Status; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + if (status != STATUS_PENDING) + { + irp->IoStatus.Status = status; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } return status; } -- 2.23.0

1 0

[PATCH 1/5] nsiproxy: Rename private unixlib header to unix_private.h
by Huw Davies 04 Oct '21

04 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 2 +- dlls/nsiproxy.sys/ndis.c | 2 +- dlls/nsiproxy.sys/nsi.c | 2 +- dlls/nsiproxy.sys/tcp.c | 2 +- dlls/nsiproxy.sys/udp.c | 2 +- dlls/nsiproxy.sys/{nsiproxy_private.h => unix_private.h} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename dlls/nsiproxy.sys/{nsiproxy_private.h => unix_private.h} (99%) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 2e69c289c16..c7ec2e89b16 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -103,7 +103,7 @@ #include "wine/nsi.h" #include "wine/debug.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 8971b69c2db..3e37bcecc78 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -91,7 +91,7 @@ #include "wine/debug.h" #include "wine/unixlib.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index ccfc325a085..565ae2d11dd 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -36,7 +36,7 @@ #include "wine/nsi.h" #include "wine/debug.h" #include "wine/unixlib.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 55311a4affc..1ed80afbe4b 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -105,7 +105,7 @@ #include "wine/debug.h" #include "wine/server.h" -#include "nsiproxy_private.h" +#include "unix_private.h" #ifndef HAVE_NETINET_TCP_FSM_H #define TCPS_ESTABLISHED 1 diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 0cc2cadbc98..403431acbef 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -85,7 +85,7 @@ #include "wine/debug.h" #include "wine/server.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/unix_private.h similarity index 99% rename from dlls/nsiproxy.sys/nsiproxy_private.h rename to dlls/nsiproxy.sys/unix_private.h index acc60ce4806..97e264e9b1a 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -1,5 +1,5 @@ /* - * nsiproxy.sys + * nsiproxy.sys unixlib private header * * Copyright 2021 Huw Davies * -- 2.23.0

1 0

[PATCH 1/2] widl: Allow modules without attributes.
by Nikolay Sivov 04 Oct '21

04 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4c361e81dd1..51050a24fa3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1082,7 +1082,7 @@ dispinterfaceref: module: tMODULE typename { $$ = type_module_declare($2); } ; -moduledef: attributes module '{' int_statements '}' semicolon_opt +moduledef: m_attributes module '{' int_statements '}' semicolon_opt { $$ = type_module_define($2, $1, $4); } ; -- 2.33.0

1 1

[PATCH 1/4] oledb32/tests: modify size of buffers in order to handle GCC 11.2 warning (GCC11)
by Eric Pouech 04 Oct '21

04 Oct '21

in oledb32/tests/convert.c, gcc 11.2 complains (-Warray-bounds) about accessing fields from a pointer to VARIANT, while underlying storage buffer is strictly smaller than a VARIANT gcc doesn't check that accessed field is inside or not the underlying storage size of 20 used in most of the tests is not necessarly wrong wrt the fields adressed, even if I don't fully grasp the logic of a 20 byte buffer: - VARIANT is 16 bytes on 32bit systems, and 24 bytes on 64 bit systems - and all the other structures are 16 bytes at most anyway, make it always of the sizeof of a VARIANT, in order to keep gcc happy Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/oledb32/tests/convert.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 8ec64d40ae5..1f22851a2b3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -327,7 +327,7 @@ static void test_converttoi1(void) { HRESULT hr; signed char dst; - BYTE src[20]; + BYTE src[sizeof(VARIANT)]; /* assuming that VARIANT is larger than all the types used in src */ DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; @@ -638,7 +638,7 @@ static void test_converttoi2(void) { HRESULT hr; signed short dst; - BYTE src[20]; + BYTE src[sizeof(VARIANT)]; /* assuming that VARIANT is larger than all the types used in src */ DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; @@ -950,7 +950,7 @@ static void test_converttoi4(void) { HRESULT hr; INT i4; - BYTE src[20]; + BYTE src[sizeof(VARIANT)]; /* assuming that VARIANT is larger than all the types used in src */ DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; @@ -1224,7 +1224,7 @@ static void test_converttoi8(void) { HRESULT hr; LARGE_INTEGER dst; - BYTE src[20]; + BYTE src[sizeof(VARIANT)]; /* assuming that VARIANT is larger than all the types used in src */ DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; @@ -2774,7 +2774,7 @@ static void test_converttoui4(void) { HRESULT hr; DWORD dst; - BYTE src[20]; + BYTE src[sizeof(VARIANT)]; DBSTATUS dst_status; DBLENGTH dst_len;

5 7

[PATCH] kernelbase: Fix string size variable overflow in GetModuleFileNameW().
by Paul Gofman 04 Oct '21

04 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51833 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/module.c | 5 +++++ dlls/kernelbase/loader.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 2487b9d65ab..60654754302 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -190,6 +190,11 @@ static void testGetModuleFileName(const char* name) ok(len1A / 2 == len2A, "Correct length in GetModuleFilenameA with buffer too small (%d/%d)\n", len1A / 2, len2A); + + len1A = GetModuleFileNameA(hMod, bufA, 0x10000); + ok(len1A > 0, "Getting module filename for handle %p\n", hMod); + len1W = GetModuleFileNameW(hMod, bufW, 0x10000); + ok(len1W > 0, "Getting module filename for handle %p\n", hMod); } static void testGetModuleFileName_Wrong(void) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 145d721bc26..b2bbdc29234 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -311,7 +311,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameW( HMODULE module, LPWSTR filena } name.Buffer = filename; - name.MaximumLength = size * sizeof(WCHAR); + name.MaximumLength = min( size, (USHORT)~0 / sizeof(WCHAR) ) * sizeof(WCHAR); status = LdrGetDllFullName( module, &name ); if (!status || status == STATUS_BUFFER_TOO_SMALL) len = name.Length / sizeof(WCHAR); SetLastError( RtlNtStatusToDosError( status )); -- 2.31.1

1 0

[PATCH] winebus.sys: Use type and size of the current event, not the previous one.
by Rémi Bernon 04 Oct '21

04 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51831 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/unixlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 49a42ea04ad..be030255705 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -350,8 +350,8 @@ BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) tmp = LIST_ENTRY(entry, struct bus_event, entry); list_remove(entry); - if (event->type != BUS_EVENT_TYPE_INPUT_REPORT) size = sizeof(*event); - else size = offsetof(struct bus_event, input_report.buffer[event->input_report.length]); + if (tmp->type != BUS_EVENT_TYPE_INPUT_REPORT) size = sizeof(*tmp); + else size = offsetof(struct bus_event, input_report.buffer[tmp->input_report.length]); memcpy(event, tmp, size); free(tmp); -- 2.33.0

1 0

[PATCH] hidclass.sys: Don't send WM_INPUT_DEVICE_CHANGE for WINEXINPUT devices.
by Rémi Bernon 04 Oct '21

04 Oct '21

From: Arkadiusz Hiler <ahiler(a)codeweavers.com> For the same reason we don't send WM_INPUT messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/pnp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index a47af413dbd..dbf04c0a403 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -114,6 +114,8 @@ static void send_wm_input_device_change(BASE_DEVICE_EXTENSION *ext, LPARAM param RAWINPUT rawinput; INPUT input; + if (!IsEqualGUID( ext->class_guid, &GUID_DEVINTERFACE_HID )) return; + rawinput.header.dwType = RIM_TYPEHID; rawinput.header.dwSize = offsetof(RAWINPUT, data.hid.bRawData[2 * sizeof(USAGE)]); rawinput.header.hDevice = ULongToHandle(ext->u.pdo.rawinput_handle); -- 2.33.0

1 0

[PATCH] hidclass.sys: Overwrite queued reports as FIFO instead of LIFO.
by Rémi Bernon 04 Oct '21

04 Oct '21

Based on a patch from Ivo Ivanov <logos128(a)gmail.com>. The issue causes severe skipping and non smooth movement tracking in apps/games, when the HidP/HidD APIs are used to control the device (joysticks, controllers, steering wheels, etc.). Usually such devices use constant stream of INPUT reports to report their coords, so any report skipping or change of the sequence, when the interested apps are reading, would lead to such issues. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51824 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index ae8d80c2e95..39ae678d111 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -190,10 +190,12 @@ static void hid_queue_push_report( struct hid_queue *queue, struct hid_report *r KeAcquireSpinLock( &queue->lock, &irql ); prev = queue->reports[i]; queue->reports[i] = report; - if (next != queue->read_idx) queue->write_idx = next; + if (next == queue->read_idx) queue->read_idx = next + 1; + if (queue->read_idx >= queue->length) queue->read_idx = 0; KeReleaseSpinLock( &queue->lock, irql ); hid_report_decref( prev ); + queue->write_idx = next; } static struct hid_report *hid_queue_pop_report( struct hid_queue *queue ) -- 2.33.0

1 0

[PATCH 1/3] hidclass.sys: Use the report length when copying report data.
by Rémi Bernon 04 Oct '21

04 Oct '21

From: Ivo Ivanov <logos128(a)gmail.com> Instead of the HID descriptor input report length. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51828 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 026ec1efeb1..632e98ab740 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -216,7 +216,6 @@ static struct hid_report *hid_queue_pop_report( struct hid_queue *queue ) static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *packet ) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; const BOOL polled = ext->u.pdo.information.Polled; struct hid_report *last_report, *report; struct hid_queue *queue; @@ -270,7 +269,7 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack if (!(irp = hid_queue_pop_irp( queue ))) break; if (!(report = hid_queue_pop_report( queue ))) hid_report_incref( (report = last_report) ); - memcpy( irp->AssociatedIrp.SystemBuffer, report->buffer, desc->InputLength ); + memcpy( irp->AssociatedIrp.SystemBuffer, report->buffer, report->length ); irp->IoStatus.Information = report->length; irp->IoStatus.Status = STATUS_SUCCESS; hid_report_decref( report ); @@ -652,7 +651,7 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = 0; if ((report = hid_queue_pop_report( queue ))) { - memcpy( irp->AssociatedIrp.SystemBuffer, report->buffer, desc->InputLength ); + memcpy( irp->AssociatedIrp.SystemBuffer, report->buffer, report->length ); irp->IoStatus.Information = report->length; irp->IoStatus.Status = STATUS_SUCCESS; hid_report_decref( report ); -- 2.33.0

1 2

[PATCH 1/7] dinput8/tests: Add some HID joystick IDirectInputDevice8_EnumCreatedEffectObjects tests.
by Rémi Bernon 04 Oct '21

04 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 6bf887e4c7a..cc2f3268e6f 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3422,6 +3422,32 @@ static BOOL CALLBACK check_effect_count( const DIEFFECTINFOW *effect, void *args return DIENUM_CONTINUE; } +static BOOL CALLBACK check_no_created_effect_objects( IDirectInputEffect *effect, void *context ) +{ + ok( 0, "unexpected effect %p\n", effect ); + return DIENUM_CONTINUE; +} + +struct check_created_effect_params +{ + IDirectInputEffect *expect_effect; + DWORD count; +}; + +static BOOL CALLBACK check_created_effect_objects( IDirectInputEffect *effect, void *context ) +{ + struct check_created_effect_params *params = context; + ULONG ref; + + ok( effect == params->expect_effect, "got effect %p, expected %p\n", effect, params->expect_effect ); + params->count++; + + IDirectInputEffect_AddRef( effect ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 1, "got ref %u, expected 1\n", ref ); + return DIENUM_CONTINUE; +} + static void test_simple_joystick(void) { #include "psh_hid_macros.h" @@ -4721,6 +4747,15 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, NULL, effect, 0 ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumCreatedEffectObjects returned %#x\n", hr ); + hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, check_no_created_effect_objects, effect, 0xdeadbeef ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumCreatedEffectObjects returned %#x\n", hr ); + hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, check_no_created_effect_objects, (void *)0xdeadbeef, 0 ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_EnumCreatedEffectObjects returned %#x\n", hr ); + hr = IDirectInputDevice8_Escape( device, NULL ); todo_wine ok( hr == E_POINTER, "IDirectInputDevice8_Escape returned: %#x\n", hr ); @@ -5098,6 +5133,7 @@ static BOOL test_device_types(void) static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) { + struct check_created_effect_params check_params = {0}; IDirectInputEffect *effect; HRESULT hr; ULONG ref; @@ -5117,6 +5153,16 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( hr == DI_OK, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); if (hr != DI_OK) return; + hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, check_no_created_effect_objects, effect, 0xdeadbeef ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumCreatedEffectObjects returned %#x\n", hr ); + check_params.expect_effect = effect; + hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, check_created_effect_objects, &check_params, 0 ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_EnumCreatedEffectObjects returned %#x\n", hr ); + todo_wine + ok( check_params.count == 1, "got count %u, expected 1\n", check_params.count ); + ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); } -- 2.33.0

1 6

[PATCH] wininet: Clear cached credentials after the first failed attempt.
by Alistair Leslie-Hughes 04 Oct '21

04 Oct '21

Windows when using cached credentials will use them on the first challenge, if then a second 403 (ACCESS_DENIED) is received, the user is prompted again but this time with the password and save checkbox cleared. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/dialogs.c | 21 ++++++++++++++++++++- dlls/wininet/internet.h | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a48c75865ac..94def22350e 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -152,9 +152,25 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, p = wcschr( szUserPass, ':' ); if( p ) { + struct WININET_ErrorDlgParams *params; + HWND hwnd; + + params = (struct WININET_ErrorDlgParams*) + GetWindowLongPtrW( hdlg, GWLP_USERDATA ); + *p = 0; SetWindowTextW( hUserItem, szUserPass ); - SetWindowTextW( hPassItem, p+1 ); + + if (params->req->retrycnt == 0) + { + SetWindowTextW( hPassItem, p+1 ); + + hwnd = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); + if (hwnd) + SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); + } + else + WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); } return TRUE; @@ -264,6 +280,8 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, TRUE ); WININET_SetAuthorization( params->req, username, password, TRUE ); + params->req->retrycnt++; + EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; } @@ -340,6 +358,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, TRUE ); } WININET_SetAuthorization( params->req, username, password, FALSE ); + params->req->retrycnt++; EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 8538699811c..cccfc24898d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -361,6 +361,7 @@ typedef struct LPWSTR statusText; DWORD bytesToWrite; DWORD bytesWritten; + INT retrycnt; /* Count of number of Auth retries */ CRITICAL_SECTION headers_section; /* section to protect the headers array */ HTTPHEADERW *custHeaders; -- 2.33.0

1 0

[PATCH 1/3] winebuild: Move the CALL32_CBClient[Ex] implementation to krnl386.
by Zebediah Figura 04 Oct '21

04 Oct '21

Except for the return thunk. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/krnl386.exe16/thunk.c | 164 ++++++++++++++++++++++++++++++++++++- tools/winebuild/relay.c | 155 ----------------------------------- 2 files changed, 162 insertions(+), 157 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 98dbf31a770..4a373b6c7cb 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -1951,10 +1951,134 @@ void WINAPI CBClientGlueSL( CONTEXT *context ) context->Eip = OFFSETOF ( glue ); } +/******************************************************************* + * CALL32_CBClient + * + * Call a CBClient relay stub from 32-bit code (KERNEL.620). + * + * Since the relay stub is itself 32-bit, this should not be a problem; + * unfortunately, the relay stubs are expected to switch back to a + * 16-bit stack (and 16-bit code) after completion :-( + * + * This would conflict with our 16- vs. 32-bit stack handling, so + * we simply switch *back* to our 32-bit stack before returning to + * the caller ... + * + * The CBClient relay stub expects to be called with the following + * 16-bit stack layout, and with ebp and ebx pointing into the 16-bit + * stack at the designated places: + * + * ... + * (ebp+14) original arguments to the callback routine + * (ebp+10) far return address to original caller + * (ebp+6) Thunklet target address + * (ebp+2) Thunklet relay ID code + * (ebp) BP (saved by CBClientGlueSL) + * (ebp-2) SI (saved by CBClientGlueSL) + * (ebp-4) DI (saved by CBClientGlueSL) + * (ebp-6) DS (saved by CBClientGlueSL) + * + * ... buffer space used by the 16-bit side glue for temp copies + * + * (ebx+4) far return address to 16-bit side glue code + * (ebx) saved 16-bit ss:sp (pointing to ebx+4) + * + * The 32-bit side glue code accesses both the original arguments (via ebp) + * and the temporary copies prepared by the 16-bit side glue (via ebx). + * After completion, the stub will load ss:sp from the buffer at ebx + * and perform a far return to 16-bit code. + * + * To trick the relay stub into returning to us, we replace the 16-bit + * return address to the glue code by a cs:ip pair pointing to our + * return entry point (the original return address is saved first). + * Our return stub thus called will then reload the 32-bit ss:esp and + * return to 32-bit code (by using and ss:esp value that we have also + * pushed onto the 16-bit stack before and a cs:eip values found at + * that position on the 32-bit stack). The ss:esp to be restored is + * found relative to the 16-bit stack pointer at: + * + * (ebx-4) ss (flat) + * (ebx-8) sp (32-bit stack pointer) + * + * The second variant of this routine, CALL32_CBClientEx, which is used + * to implement KERNEL.621, has to cope with yet another problem: Here, + * the 32-bit side directly returns to the caller of the CBClient thunklet, + * restoring registers saved by CBClientGlueSL and cleaning up the stack. + * As we have to return to our 32-bit code first, we have to adapt the + * layout of our temporary area so as to include values for the registers + * that are to be restored, and later (in the implementation of KERNEL.621) + * we *really* restore them. The return stub restores DS, DI, SI, and BP + * from the stack, skips the next 8 bytes (CBClient relay code / target), + * and then performs a lret NN, where NN is the number of arguments to be + * removed. Thus, we prepare our temporary area as follows: + * + * (ebx+22) 16-bit cs (this segment) + * (ebx+20) 16-bit ip ('16-bit' return entry point) + * (ebx+16) 32-bit ss (flat) + * (ebx+12) 32-bit sp (32-bit stack pointer) + * (ebx+10) 16-bit bp (points to ebx+24) + * (ebx+8) 16-bit si (ignored) + * (ebx+6) 16-bit di (ignored) + * (ebx+4) 16-bit ds (we actually use the flat DS here) + * (ebx+2) 16-bit ss (16-bit stack segment) + * (ebx+0) 16-bit sp (points to ebx+4) + * + * Note that we ensure that DS is not changed and remains the flat segment, + * and the 32-bit stack pointer our own return stub needs fits just + * perfectly into the 8 bytes that are skipped by the Windows stub. + * One problem is that we have to determine the number of removed arguments, + * as these have to be really removed in KERNEL.621. Thus, the BP value + * that we place in the temporary area to be restored, contains the value + * that SP would have if no arguments were removed. By comparing the actual + * value of SP with this value in our return stub we can compute the number + * of removed arguments. This is then returned to KERNEL.621. + * + * The stack layout of this function: + * (ebp+20) nArgs pointer to variable receiving nr. of args (Ex only) + * (ebp+16) esi pointer to caller's esi value + * (ebp+12) arg ebp value to be set for relay stub + * (ebp+8) func CBClient relay stub address + * (ebp+4) ret addr + * (ebp) ebp + */ +extern DWORD CALL32_CBClient( FARPROC proc, LPWORD args, WORD *stackLin, DWORD *esi ); +__ASM_GLOBAL_FUNC( CALL32_CBClient, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-4\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + "movl 16(%ebp),%ebx\n\t" + "leal -8(%esp),%eax\n\t" + "movl %eax,-8(%ebx)\n\t" + "movl 20(%ebp),%esi\n\t" + "movl (%esi),%esi\n\t" + "movl 8(%ebp),%eax\n\t" + "movl 12(%ebp),%ebp\n\t" + "pushl %cs\n\t" + "call *%eax\n\t" + "movl 32(%esp),%edi\n\t" + "movl %esi,(%edi)\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret\n\t" ) + /*********************************************************************** * CBClientThunkSL (KERNEL.620) */ -extern DWORD CALL32_CBClient( FARPROC proc, LPWORD args, WORD *stackLin, DWORD *esi ); void WINAPI CBClientThunkSL( CONTEXT *context ) { /* Call 32-bit relay code */ @@ -1976,10 +2100,46 @@ void WINAPI CBClientThunkSL( CONTEXT *context ) stack16_pop( 12 ); } +extern DWORD CALL32_CBClientEx( FARPROC proc, LPWORD args, WORD *stackLin, DWORD *esi, INT *nArgs ); +__ASM_GLOBAL_FUNC( CALL32_CBClientEx, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-4\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + "movl 16(%ebp),%ebx\n\t" + "leal -8(%esp),%eax\n\t" + "movl %eax,12(%ebx)\n\t" + "movl 20(%ebp),%esi\n\t" + "movl (%esi),%esi\n\t" + "movl 8(%ebp),%eax\n\t" + "movl 12(%ebp),%ebp\n\t" + "pushl %cs\n\t" + "call *%eax\n\t" + "movl 32(%esp),%edi\n\t" + "movl %esi,(%edi)\n\t" + "movl 36(%esp),%ebx\n\t" + "movl %ebp,(%ebx)\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret\n\t" ) + /*********************************************************************** * CBClientThunkSLEx (KERNEL.621) */ -extern DWORD CALL32_CBClientEx( FARPROC proc, LPWORD args, WORD *stackLin, DWORD *esi, INT *nArgs ); void WINAPI CBClientThunkSLEx( CONTEXT *context ) { /* Call 32-bit relay code */ diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index abe2bdae6ed..eaa70888986 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -564,163 +564,8 @@ static void BuildRet16Func(void) } -/******************************************************************* - * BuildCallTo32CBClient - * - * Call a CBClient relay stub from 32-bit code (KERNEL.620). - * - * Since the relay stub is itself 32-bit, this should not be a problem; - * unfortunately, the relay stubs are expected to switch back to a - * 16-bit stack (and 16-bit code) after completion :-( - * - * This would conflict with our 16- vs. 32-bit stack handling, so - * we simply switch *back* to our 32-bit stack before returning to - * the caller ... - * - * The CBClient relay stub expects to be called with the following - * 16-bit stack layout, and with ebp and ebx pointing into the 16-bit - * stack at the designated places: - * - * ... - * (ebp+14) original arguments to the callback routine - * (ebp+10) far return address to original caller - * (ebp+6) Thunklet target address - * (ebp+2) Thunklet relay ID code - * (ebp) BP (saved by CBClientGlueSL) - * (ebp-2) SI (saved by CBClientGlueSL) - * (ebp-4) DI (saved by CBClientGlueSL) - * (ebp-6) DS (saved by CBClientGlueSL) - * - * ... buffer space used by the 16-bit side glue for temp copies - * - * (ebx+4) far return address to 16-bit side glue code - * (ebx) saved 16-bit ss:sp (pointing to ebx+4) - * - * The 32-bit side glue code accesses both the original arguments (via ebp) - * and the temporary copies prepared by the 16-bit side glue (via ebx). - * After completion, the stub will load ss:sp from the buffer at ebx - * and perform a far return to 16-bit code. - * - * To trick the relay stub into returning to us, we replace the 16-bit - * return address to the glue code by a cs:ip pair pointing to our - * return entry point (the original return address is saved first). - * Our return stub thus called will then reload the 32-bit ss:esp and - * return to 32-bit code (by using and ss:esp value that we have also - * pushed onto the 16-bit stack before and a cs:eip values found at - * that position on the 32-bit stack). The ss:esp to be restored is - * found relative to the 16-bit stack pointer at: - * - * (ebx-4) ss (flat) - * (ebx-8) sp (32-bit stack pointer) - * - * The second variant of this routine, CALL32_CBClientEx, which is used - * to implement KERNEL.621, has to cope with yet another problem: Here, - * the 32-bit side directly returns to the caller of the CBClient thunklet, - * restoring registers saved by CBClientGlueSL and cleaning up the stack. - * As we have to return to our 32-bit code first, we have to adapt the - * layout of our temporary area so as to include values for the registers - * that are to be restored, and later (in the implementation of KERNEL.621) - * we *really* restore them. The return stub restores DS, DI, SI, and BP - * from the stack, skips the next 8 bytes (CBClient relay code / target), - * and then performs a lret NN, where NN is the number of arguments to be - * removed. Thus, we prepare our temporary area as follows: - * - * (ebx+22) 16-bit cs (this segment) - * (ebx+20) 16-bit ip ('16-bit' return entry point) - * (ebx+16) 32-bit ss (flat) - * (ebx+12) 32-bit sp (32-bit stack pointer) - * (ebx+10) 16-bit bp (points to ebx+24) - * (ebx+8) 16-bit si (ignored) - * (ebx+6) 16-bit di (ignored) - * (ebx+4) 16-bit ds (we actually use the flat DS here) - * (ebx+2) 16-bit ss (16-bit stack segment) - * (ebx+0) 16-bit sp (points to ebx+4) - * - * Note that we ensure that DS is not changed and remains the flat segment, - * and the 32-bit stack pointer our own return stub needs fits just - * perfectly into the 8 bytes that are skipped by the Windows stub. - * One problem is that we have to determine the number of removed arguments, - * as these have to be really removed in KERNEL.621. Thus, the BP value - * that we place in the temporary area to be restored, contains the value - * that SP would have if no arguments were removed. By comparing the actual - * value of SP with this value in our return stub we can compute the number - * of removed arguments. This is then returned to KERNEL.621. - * - * The stack layout of this function: - * (ebp+20) nArgs pointer to variable receiving nr. of args (Ex only) - * (ebp+16) esi pointer to caller's esi value - * (ebp+12) arg ebp value to be set for relay stub - * (ebp+8) func CBClient relay stub address - * (ebp+4) ret addr - * (ebp) ebp - */ static void BuildCallTo32CBClient( int isEx ) { - function_header( isEx ? "CALL32_CBClientEx" : "CALL32_CBClient" ); - - /* Entry code */ - - output_cfi( ".cfi_startproc" ); - output( "\tpushl %%ebp\n" ); - output_cfi( ".cfi_adjust_cfa_offset 4" ); - output_cfi( ".cfi_rel_offset %%ebp,0" ); - output( "\tmovl %%esp,%%ebp\n" ); - output_cfi( ".cfi_def_cfa_register %%ebp" ); - output( "\tpushl %%edi\n" ); - output_cfi( ".cfi_rel_offset %%edi,-4" ); - output( "\tpushl %%esi\n" ); - output_cfi( ".cfi_rel_offset %%esi,-8" ); - output( "\tpushl %%ebx\n" ); - output_cfi( ".cfi_rel_offset %%ebx,-12" ); - - /* Get pointer to temporary area and save the 32-bit stack pointer */ - - output( "\tmovl 16(%%ebp), %%ebx\n" ); - output( "\tleal -8(%%esp), %%eax\n" ); - - if ( !isEx ) - output( "\tmovl %%eax, -8(%%ebx)\n" ); - else - output( "\tmovl %%eax, 12(%%ebx)\n" ); - - /* Set up registers and call CBClient relay stub (simulating a far call) */ - - output( "\tmovl 20(%%ebp), %%esi\n" ); - output( "\tmovl (%%esi), %%esi\n" ); - - output( "\tmovl 8(%%ebp), %%eax\n" ); - output( "\tmovl 12(%%ebp), %%ebp\n" ); - - output( "\tpushl %%cs\n" ); - output( "\tcall *%%eax\n" ); - - /* Return new esi value to caller */ - - output( "\tmovl 32(%%esp), %%edi\n" ); - output( "\tmovl %%esi, (%%edi)\n" ); - - /* Return argument size to caller */ - if ( isEx ) - { - output( "\tmovl 36(%%esp), %%ebx\n" ); - output( "\tmovl %%ebp, (%%ebx)\n" ); - } - - /* Restore registers and return */ - - output( "\tpopl %%ebx\n" ); - output_cfi( ".cfi_same_value %%ebx" ); - output( "\tpopl %%esi\n" ); - output_cfi( ".cfi_same_value %%esi" ); - output( "\tpopl %%edi\n" ); - output_cfi( ".cfi_same_value %%edi" ); - output( "\tpopl %%ebp\n" ); - output_cfi( ".cfi_def_cfa %%esp,4" ); - output_cfi( ".cfi_same_value %%ebp" ); - output( "\tret\n" ); - output_cfi( ".cfi_endproc" ); - output_function_size( isEx ? "CALL32_CBClientEx" : "CALL32_CBClient" ); - /* '16-bit' return stub */ function_header( isEx ? "CALL32_CBClientEx_Ret" : "CALL32_CBClient_Ret" ); -- 2.33.0

1 2

[PATCH] user32: Implement WindowFromPhysicalPoint
by Jinoh Kang 03 Oct '21

03 Oct '21

physical<->logical is an identity mapping in other functions and also >win8, so make it consistent with those. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- .../ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec | 2 +- .../ext-ms-win-ntuser-window-l1-1-1.spec | 2 +- dlls/user32/sysparams.c | 8 ++++++++ dlls/user32/user32.spec | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec index ea155c098d9..acc03f665de 100644 --- a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec +++ b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec @@ -51,5 +51,5 @@ @ stub SoundSentry @ stdcall UnhookWindowsHookEx(long) user32.UnhookWindowsHookEx @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) user32.UpdateLayeredWindow -@ stub WindowFromPhysicalPoint +@ stdcall WindowFromPhysicalPoint(int64) user32.WindowFromPhysicalPoint @ stdcall WindowFromPoint(int64) user32.WindowFromPoint diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec index ea155c098d9..acc03f665de 100644 --- a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec +++ b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec @@ -51,5 +51,5 @@ @ stub SoundSentry @ stdcall UnhookWindowsHookEx(long) user32.UnhookWindowsHookEx @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) user32.UpdateLayeredWindow -@ stub WindowFromPhysicalPoint +@ stdcall WindowFromPhysicalPoint(int64) user32.WindowFromPhysicalPoint @ stdcall WindowFromPoint(int64) user32.WindowFromPoint diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index d6f08654ab0..733acd3d3c6 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4506,6 +4506,14 @@ BOOL WINAPI SetPhysicalCursorPos( INT x, INT y ) return SetCursorPos( x, y ); } +/*********************************************************************** + * WindowFromPhysicalPoint (USER32.@) + */ +HWND WINAPI WindowFromPhysicalPoint( POINT pt ) +{ + return WindowFromPoint( pt ); +} + /*********************************************************************** * LogicalToPhysicalPoint (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8d3ac70210c..8d5f1bc4145 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -820,6 +820,7 @@ # @ stub WinOldAppHackoMatic @ stdcall WindowFromDC(long) @ stdcall WindowFromPoint(int64) +@ stdcall WindowFromPhysicalPoint(int64) # @ stub YieldTask # @ stub _SetProcessDefaultLayout @ stdcall keybd_event(long long long long) -- 2.31.1

1 0

GCC 11
by Eric Pouech 03 Oct '21

03 Oct '21

For sharing : - newest gcc version (11) sets by default of bunch of new tests for code correctness - it spits out around ten thousand lines of warnings (*), making it quite impossible to look into compiler output there are a couple of genuine issues reported by gcc11 - Rémi and I already sent a serie of patches for addressing those - a strange indentation waiting for a volunteer (in dlls/wininet/internet.c:2878, the line lpwhh->ErrorMask = *(ULONG*)lpBuffer; at the end of the if/else chain is misindented) unfortunately, most of the generated warnings are false positives, that need to be fixed (or removerd) before GCC11 becomes mainstream - Fedora 35 with GCC11 is in beta right now, and GA is mid of October - I haven't checked other distros though, but I expect similar evolution in coming weeks/months - in Fedora both gcc and mingw-gcc have been upgraded to version 11 The false positives we need to tackle: A) misleading indentation =================== GCC11 complains about code like: foo; todo_wine ok(tst, ...); bar; (gcc11 warns about 'bar ' not being properly indented wrt todo_wine) there are (as of today) 817 occurrences of those in wine tree (spread across 127 files) and counts for ~90% (*) of the line of warnings generated by GCC only 2 true positives are generated by this GCC warning Remarks: - constructs on a single line don't generate the warning todo_wine ok(tst, ...); // ok no warning, whatever the indentation of the line wrt the rest of the code - having the ok(tst, ...) inside a block after the todo_wine doesn't generate the warning possible solutions: - disable the warning in configure cons: will not trigger on true positive pros: minor impact on code base (either committed and under progress in dev:s trees) - merge the todo_wine and ok() line into a single one pros: keep current indentation, coherent with todo_wine + block cons: harder to read, esp. for todo_wine_if cons: for todo_wine_if, could generate too long lines cons: large impact on code base pros/cons: git blame on ok() line will tell who removed the todo_wine, not who wrote the test - reindent only problematic todo_wine foo; todo_wine ok(tst, ...); bar; ^ without indenting the line ok(tst, ...); ^ without indenting the "todo_wine {\n<...>\n}" nor the "todo_wine ok()" on a single line constructs as they don't generate warnings pros/cons: indentation isn't used for adding comments to the code (that's what comments are for) cons: large impact on code base - reindent all todo_wine same as above, but also reindenting the "todo_wine {\n<...>\n}" and the "todo_wine ok()" on a single line constructs pros/cons: indentation isn't used for adding comments to the code (that's what comments are for) cons: large impact on code base B) uninitialized objects =============== GCC11 warns on code like: void foo(const TYPE* s); ..... TYPE s; foo(&s); because, s isn't initialized, and is passed as const ptr, hence could be read by function foo without being initialized proposal: - depending on context, different fixes are at hand: either initialize s, or when applicable, play with aliasing C) partial structures ============ In a bunch of places, we use a pointer to a structure, where underlying allocated object is smaller than the actual size of the structure. (roughly 400 lines of warnings (*)) It's used: - when dealing with two structures sharing their first fields (like in BITMAP for example) - in tests, to test behavior will various sizes of objects as input... proposal: disable this warning in configure D) sizeof/sizeof ========= GCC11 warns when sizeof(foo)/sizeof(bar) is used and cannot be reduced to computing the number of elements of an array proposal: rewrite as sizeof(foo)/(sizeof(bar)) (note the parenthesis around sizeof(bar), as suggested by GCC) A+ (*) those values are rough estimates, only consider the order of magnitude

3 8

[PATCH v2] gdi32: Create the registry keys recursively, if needed.
by Gabriel Ivăncescu 03 Oct '21

03 Oct '21

Fixes a regression introduced by 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd when creating new prefixes, as NtCreateKey does not recursively create keys. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Most of the code is taken from kernelbase's create_key, but simplified to gdi32's cases only. dlls/gdi32/font.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98c70a6..d54f9a5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -29,6 +29,8 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -569,11 +571,13 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; OBJECT_ATTRIBUTES attr; + NTSTATUS status; HANDLE ret; attr.Length = sizeof(attr); @@ -583,7 +587,28 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + if(status == STATUS_OBJECT_NAME_NOT_FOUND) + { + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + if (!NT_SUCCESS(status)) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } return ret; } -- 2.31.1

2 1

[PATCH] gdi32: Create the Software\Wine\Fonts keys one at a time.
by Gabriel Ivăncescu 03 Oct '21

03 Oct '21

Fixes a regression introduced by 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd when creating new prefixes, as NtCreateKey does not recursively create keys. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/gdi32/font.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98c70a6..31310b1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6209,19 +6209,31 @@ UINT font_init(void) OBJECT_ATTRIBUTES attr = { sizeof(attr) }; UNICODE_STRING name; HANDLE mutex, hkcu; + HKEY key, wine_key; DWORD disposition; UINT dpi = 0; static WCHAR wine_font_mutexW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', '\\','_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_'}; - static const WCHAR wine_fonts_keyW[] = - {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','o','n','t','s'}; + static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e'}; + static const WCHAR wineW[] = {'W','i','n','e'}; + static const WCHAR fontsW[] = {'F','o','n','t','s'}; static const WCHAR cacheW[] = {'C','a','c','h','e'}; if (RtlOpenCurrentUser( MAXIMUM_ALLOWED, &hkcu )) return 0; - wine_fonts_key = reg_create_key( hkcu, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); - if (wine_fonts_key) dpi = init_font_options( hkcu ); + key = reg_create_key( hkcu, softwareW, sizeof(softwareW), 0, NULL ); + if (key) + { + wine_key = reg_create_key( key, wineW, sizeof(wineW), 0, NULL ); + NtClose( key ); + if (wine_key) + { + wine_fonts_key = reg_create_key( wine_key, fontsW, sizeof(fontsW), 0, NULL ); + NtClose( wine_key ); + if (wine_fonts_key) dpi = init_font_options( hkcu ); + } + } NtClose( hkcu ); if (!dpi) return 96; update_codepage( dpi ); -- 2.31.1

4 4

RFC: Reparse Point/NT Symlink Support [3]
by Erich E. Hoover 02 Oct '21

02 Oct '21

I would love any and all feedback on updated versions of my "Reparse Point" patches, which are now available in staging: https://github.com/wine-staging/wine-staging/tree/master/patches/ntdll-Junc… Major changes since the last RFC version are: 1) Deletion of symlinks is now atomic (where supported). 2) Regular Unix symlinks are now reported as WSL Unix symlinks. 3) FILE_OPEN_REPARSE_POINT is now properly supported for applications that wish to access reparse points directly (symlink operations by file descriptor instead of by path). 4) Wine's cmd "dir" command now shows reparse point types and targets. 5) Wine's cmd "mklink" command now supports creating junction points and NT symlinks. 6) Absolute reparse points that are outside of the prefix no longer contain the path to drive Z (or appropriate drive letter). 7) Absolute reparse points now contain a string identifying the end of the Wine prefix that is used to modify the target path on file access if a prefix has been relocated (if the target is within the prefix). 8) Many, many bug fixes. Thank you in advance to those who look these patches over, and previous iterations, your feedback is greatly appreciated! I know that these patches have been a long time coming, but I believe that we're finally getting to a place where we've figured out all the gotchas. Hopefully other folks agree ;) === Context: For those of you that wonder "why do these patches exist?", I have been putting these together over the past few years for several reasons: 1) More modern Windows programs use NT symlinks to avoid duplicating files and taking up extra disk space (particularly .NET). 2) Wine currently has no mechanism to make symlinks on the "PE" side of the dividing line, these patches allow this for Windows file paths and a small additional patch (creating WSL Unix symlinks) allows the same behavior for Unix paths. 3) Wine currently takes up a lot of space with system DLLs that are duplicates of the system-wide files, a logical extension to these patches is a Wine-specific reparse tag that allows these system DLLs to be "copy-on-write" so that Wine prefixes don't take up unnecessary disk space. Please note that this feature is not a focus of the patchset (not included), as I would like to get the infrastructure in place before tackling that problem. Not currently supported: 1) Reparse points of type other than junction points, NT symlinks, and WSL Unix symlinks. 2) Creating WSL Unix symlinks. 3) Changing ownership permissions (lrwxrwxrwx) on the symlink instead of the target (currently a Linux limitation). Implementation overview: • Reparse points are implemented as Unix symlinks where relative symlinks always start with "./" and absolute symlinks start with "/". • Following the relative/absolute flag the 32-bit reparse point tag (junction point or NT symlink) is encoded as a relative path where each bit is encoded as "/" (0) or "./" (1). When creating WSL Unix symlinks (future feature) this tag encoding will be skipped. • For NT symlinks this is followed by a file/directory flag ("./" for directories, "/" for files) so that dangling symlinks can still be deleted properly with RemoveFile or RemoveDirectory (as appropriate). • After the reparse tag (and file/directory flag) the Unix path is then appended, relative paths are included unmodified and absolute paths have some minor modifications. • If the path is an absolute path and points outside the prefix then the portion of the path to drive Z (or appropriate drive letter) is removed. • If the path is an absolute path that points inside the prefix then after the prefix path an 8-bit 'P' is encoded the same way that the reparse point tag is ("/"=0, "./"=1). • If an absolute symlink is opened by the wineserver then the prefix path is checked (if appropriate) and if it doesn't match the path of the current Wine prefix then the symlink is modified to replace the old prefix path with the current prefix path. • Because reparse points involve a modification to an existing empty file/directory, symlink creation and "removal" is implemented by creating the symlink at a temporary location and then replacing the original with an atomic renameat2 call (on supported systems), equivalent call (BSD/Mac), or by unlinking the original and moving the symlink into place (for legacy systems that do not support atomic replacement). Best, Erich

4 17

[PATCH] d3dx10_34/tests: Enable tests.
by Nikolay Sivov 02 Oct '21

02 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_34/Makefile.in | 1 + dlls/d3dx10_34/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) create mode 100644 dlls/d3dx10_34/tests/Makefile.in diff --git a/configure b/configure index db592f0868d..d4d14333b24 100755 --- a/configure +++ b/configure @@ -20339,6 +20339,7 @@ wine_fn_config_makefile dlls/d3drm enable_d3drm wine_fn_config_makefile dlls/d3drm/tests enable_tests wine_fn_config_makefile dlls/d3dx10_33 enable_d3dx10_33 wine_fn_config_makefile dlls/d3dx10_34 enable_d3dx10_34 +wine_fn_config_makefile dlls/d3dx10_34/tests enable_tests wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35 wine_fn_config_makefile dlls/d3dx10_35/tests enable_tests wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 diff --git a/configure.ac b/configure.ac index 0bc46a1427b..0d5eba21d1c 100644 --- a/configure.ac +++ b/configure.ac @@ -3063,6 +3063,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3drm) WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) WINE_CONFIG_MAKEFILE(dlls/d3dx10_34) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_34/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) WINE_CONFIG_MAKEFILE(dlls/d3dx10_35/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) diff --git a/dlls/d3dx10_34/Makefile.in b/dlls/d3dx10_34/Makefile.in index ffe8d90dbaf..6a7aa8446d9 100644 --- a/dlls/d3dx10_34/Makefile.in +++ b/dlls/d3dx10_34/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_34.dll +IMPORTLIB = d3dx10_34 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx10_34/tests/Makefile.in b/dlls/d3dx10_34/tests/Makefile.in new file mode 100644 index 00000000000..9d07ee26b9a --- /dev/null +++ b/dlls/d3dx10_34/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_34.dll +IMPORTS = d3dx10_34 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.33.0

3 2

[PATCH v2 1/7] ntdll: Protect module list access in LdrFindEntryForAddress() with SRW lock.
by Paul Gofman 01 Oct '21

01 Oct '21

Fixes racy access to LDR lists in lookup_function_info(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 215952-215974. dlls/ntdll/actctx.c | 6 ------ dlls/ntdll/loader.c | 21 ++++++++++++++++++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f9afb655885..bc222dadf27 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -705,10 +705,8 @@ static inline const char* debugstr_version(const struct assembly_version *ver) static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsigned int extra_len ) { NTSTATUS status; - ULONG_PTR magic; LDR_DATA_TABLE_ENTRY *pldr; - LdrLockLoaderLock(0, NULL, &magic); status = LdrFindEntryForAddress( module, &pldr ); if (status == STATUS_SUCCESS) { @@ -721,7 +719,6 @@ static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsign } else status = STATUS_NO_MEMORY; } - LdrUnlockLoaderLock(0, magic); return status; } @@ -3301,12 +3298,10 @@ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class ) } else if (flags & (QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS|QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE)) { - ULONG_PTR magic; LDR_DATA_TABLE_ENTRY *pldr; if (!*handle) return STATUS_INVALID_PARAMETER; - LdrLockLoaderLock( 0, NULL, &magic ); if (!LdrFindEntryForAddress( *handle, &pldr )) { if ((flags & QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE) && *handle != pldr->DllBase) @@ -3315,7 +3310,6 @@ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class ) *handle = pldr->ActivationContext; } else status = STATUS_DLL_NOT_FOUND; - LdrUnlockLoaderLock( 0, magic ); } else if (!*handle && (class != ActivationContextBasicInformation)) *handle = process_actctx; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e00c1e0c31d..55a6213d906 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -176,6 +176,10 @@ static PEB_LDR_DATA ldr = { &ldr.InMemoryOrderModuleList, &ldr.InMemoryOrderModuleList }, { &ldr.InInitializationOrderModuleList, &ldr.InInitializationOrderModuleList } }; +/* Ldr data is modified with loader locked and exclusive lock held. + * Taking shared lock to access the data is required outside of loader lock only. + */ +static RTL_SRWLOCK ldr_data_srw_lock = RTL_SRWLOCK_INIT; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; @@ -1245,10 +1249,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.EntryPoint = (char *)hModule + nt->OptionalHeader.AddressOfEntryPoint; } + RtlAcquireSRWLockExclusive( &ldr_data_srw_lock ); InsertTailList(&NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderLinks); InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderLinks); + RtlReleaseSRWLockExclusive( &ldr_data_srw_lock ); /* wait until init is called for inserting into InInitializationOrderModuleList */ if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) @@ -1454,8 +1460,12 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) } if (!wm->ldr.InInitializationOrderLinks.Flink) + { + RtlAcquireSRWLockExclusive( &ldr_data_srw_lock ); InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList, &wm->ldr.InInitializationOrderLinks); + RtlReleaseSRWLockExclusive( &ldr_data_srw_lock ); + } /* Call DLL entry point */ if (status == STATUS_SUCCESS) @@ -1578,13 +1588,14 @@ NTSTATUS WINAPI LdrDisableThreadCalloutsForDll(HMODULE hModule) /****************************************************************** * LdrFindEntryForAddress (NTDLL.@) * - * The loader_section must be locked while calling this function */ NTSTATUS WINAPI LdrFindEntryForAddress( const void *addr, PLDR_DATA_TABLE_ENTRY *pmod ) { + NTSTATUS ret = STATUS_NO_MORE_ENTRIES; PLIST_ENTRY mark, entry; PLDR_DATA_TABLE_ENTRY mod; + RtlAcquireSRWLockShared( &ldr_data_srw_lock ); mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; for (entry = mark->Flink; entry != mark; entry = entry->Flink) { @@ -1593,10 +1604,12 @@ NTSTATUS WINAPI LdrFindEntryForAddress( const void *addr, PLDR_DATA_TABLE_ENTRY (const char *)addr < (char*)mod->DllBase + mod->SizeOfImage) { *pmod = mod; - return STATUS_SUCCESS; + ret = STATUS_SUCCESS; + break; } } - return STATUS_NO_MORE_ENTRIES; + RtlReleaseSRWLockShared( &ldr_data_srw_lock ); + return ret; } /****************************************************************** @@ -3510,10 +3523,12 @@ void WINAPI LdrShutdownThread(void) */ static void free_modref( WINE_MODREF *wm ) { + RtlAcquireSRWLockExclusive( &ldr_data_srw_lock ); RemoveEntryList(&wm->ldr.InLoadOrderLinks); RemoveEntryList(&wm->ldr.InMemoryOrderLinks); if (wm->ldr.InInitializationOrderLinks.Flink) RemoveEntryList(&wm->ldr.InInitializationOrderLinks); + RtlReleaseSRWLockExclusive( &ldr_data_srw_lock ); TRACE(" unloading %s\n", debugstr_w(wm->ldr.FullDllName.Buffer)); if (!TRACE_ON(module)) -- 2.31.1

2 8

[PATCH 1/5] winegstreamer: Move the GstAutoplugSelectResult definition to wg_parser.c.
by Zebediah Figura 01 Oct '21

01 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 7 ------- dlls/winegstreamer/wg_parser.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 49e06b31369..923bba25d38 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -36,13 +36,6 @@ #include "wine/debug.h" #include "wine/strmbase.h" -typedef enum -{ - GST_AUTOPLUG_SELECT_TRY, - GST_AUTOPLUG_SELECT_EXPOSE, - GST_AUTOPLUG_SELECT_SKIP, -} GstAutoplugSelectResult; - static inline const char *debugstr_time(REFERENCE_TIME time) { ULONGLONG abstime = time >= 0 ? time : -time; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f0815e37689..dde137ef186 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -34,6 +34,13 @@ #include <gst/video/video.h> #include <gst/audio/audio.h> +typedef enum +{ + GST_AUTOPLUG_SELECT_TRY, + GST_AUTOPLUG_SELECT_EXPOSE, + GST_AUTOPLUG_SELECT_SKIP, +} GstAutoplugSelectResult; + /* GStreamer callbacks may be called on threads not created by Wine, and * therefore cannot access the Wine TEB. This means that we must use GStreamer * debug logging instead of Wine debug logging. In order to be safe we forbid -- 2.33.0

1 4

[PATCH 22/22] kernel32/tests: Add tests for loader locking.
by Paul Gofman 01 Oct '21

01 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/Makefile.in | 2 + dlls/kernel32/tests/actctx.c | 2 +- dlls/kernel32/tests/loader.c | 579 +++++++++++++++++++++++++++ dlls/kernel32/tests/locking_dll.c | 50 +++ dlls/kernel32/tests/locking_dll.spec | 1 + 5 files changed, 633 insertions(+), 1 deletion(-) create mode 100644 dlls/kernel32/tests/locking_dll.c create mode 100644 dlls/kernel32/tests/locking_dll.spec diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e9516603ce9..be3a8fc8dfa 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -21,6 +21,8 @@ SOURCES = \ heap.c \ loader.c \ locale.c \ + locking_dll.c \ + locking_dll.spec \ mailslot.c \ module.c \ path.c \ diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 163ea405222..f37796a6aba 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2584,7 +2584,7 @@ static void delete_manifest_file(const char *filename) DeleteFileA(path); } -static void extract_resource(const char *name, const char *type, const char *path) +void extract_resource(const char *name, const char *type, const char *path) { DWORD written; HANDLE file; diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4f1b11338a6..df530055db4 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -70,6 +70,10 @@ static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG_PTR *); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static NTSTATUS (WINAPI *pLdrLoadDll)(LPCWSTR,DWORD,const UNICODE_STRING *,HMODULE*); static NTSTATUS (WINAPI *pLdrUnloadDll)(HMODULE); + +typedef void (CALLBACK *LDRENUMPROC)(LDR_DATA_TABLE_ENTRY *, void *, BOOLEAN *); +static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)( void *unknown, LDRENUMPROC callback, void *context ); + static void (WINAPI *pRtlInitUnicodeString)(PUNICODE_STRING,LPCWSTR); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); @@ -88,6 +92,8 @@ static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static HMODULE (WINAPI *pLoadPackagedLibrary)(LPCWSTR lpwLibFileName, DWORD Reserved); +void extract_resource(const char *name, const char *type, const char *path); + static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { if (rva == 0) @@ -4036,6 +4042,574 @@ static void test_Wow64Transition(void) debugstr_wn(name->SectionFileName.Buffer, name->SectionFileName.Length / sizeof(WCHAR))); } +static BOOL test_loader_lock_repeat_lock; +static DWORD test_loader_lock_expected_wait_result; +static unsigned int test_loader_notification_count; +static unsigned int test_loader_expected_notification_count; +static const WCHAR *ldr_notify_track_dll; +static HMODULE lock_dll_handle; +static HANDLE lock_ready_event, next_test_event; +static BOOL test_loader_lock_test_failed; +static volatile LONG test_loader_lock_timeout_count; + +#define BLOCKING_TESTS_ENABLED 1 + +static void CALLBACK test_loader_lock_module_enum_locking_callback(LDR_DATA_TABLE_ENTRY *mod, + void *context, BOOLEAN *stop) +{ + DWORD *result = context; + + SetEvent(lock_ready_event); + *result = WaitForSingleObject(next_test_event, 3000); + *stop = TRUE; +} + +static void CALLBACK test_loader_lock_dummy_callback(LDR_DATA_TABLE_ENTRY *mod, + void *context, BOOLEAN *stop) +{ + *stop = TRUE; +} + +static void CALLBACK test_loader_lock_ldr_notify_locking(ULONG reason, LDR_DLL_NOTIFICATION_DATA *data, void *context) +{ + DWORD *result = context; + NTSTATUS status; + HMODULE hmodule; + void *cookie; + BOOL bret; + + if (reason != LDR_DLL_NOTIFICATION_REASON_UNLOADED) return; + + status = LdrRegisterDllNotification(0, test_loader_lock_ldr_notify_locking, NULL, &cookie); + ok(!status, "Got unexpected status %#x.\n", status); + status = LdrUnregisterDllNotification( cookie ); + ok(!status, "Got unexpected status %#x.\n", status); + + hmodule = LoadLibraryW(L"winmm.dll"); + ok(!!hmodule, "GetModuleHandleW failed, err %u.\n", GetLastError()); + bret = FreeLibrary(hmodule); + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + + bret = GetModuleHandleExW(0, L"lock.dll", &hmodule); + ok(bret, "GetModuleHandleExW failed, err %u.\n", GetLastError()); + ok(!!hmodule, "GetModuleHandleW failed, err %u.\n", GetLastError()); + bret = FreeLibrary(hmodule); + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + + hmodule = LoadLibraryW(L"authz.dll"); + ok(!hmodule, "LoadLibraryW succeeded.\n"); + ok(GetLastError() == ERROR_NOT_FOUND, "Got unexpected error %u.\n", GetLastError()); + + status = pLdrEnumerateLoadedModules(NULL, test_loader_lock_dummy_callback, NULL); + ok(!status, "Got unexpected status %#x.\n", status); + + SetEvent(lock_ready_event); + *result = WaitForSingleObject(next_test_event, 3000); +} + +static DWORD WINAPI test_loader_lock_thread(void *param) +{ + static const WCHAR env_var[] = L"test_wait_reason_value"; + void (WINAPI *p_set_lock_result_addr)( DWORD *addr ); + unsigned int test, iter; + ULONG_PTR magic; + NTSTATUS status; + HMODULE hmodule; + void *cookie; + DWORD result; + WCHAR str[8]; + BOOL bret; + + WaitForSingleObject(next_test_event, INFINITE); + + test = 1; + /* 1. Test with loader lock held. */ + iter = 0; + do + { + status = pLdrLockLoaderLock(0, NULL, &magic); + ok(!status, "Got unexpected status %#x.\n", status); + SetEvent(lock_ready_event); + + result = WaitForSingleObject(next_test_event, 3000); + + if (!iter && result == WAIT_TIMEOUT) + { + /* First test timed out, likely the old loader. */ + test_loader_lock_test_failed = TRUE; + status = pLdrUnlockLoaderLock(0, magic); + ok(!status, "Got unexpected status %#x.\n", status); + SetEvent(lock_ready_event); + return 0; + } + + ok(result == test_loader_lock_expected_wait_result, + "Got unexpected wait result %#x, expected %#x, test %u.%u.\n", + result, test_loader_lock_expected_wait_result, test, iter); + + todo_wine_if(test && iter == 1) + ok(test_loader_notification_count == test_loader_expected_notification_count, + "Got unexpected notification count %u, expected %u, test %u.%u.\n", + test_loader_notification_count, test_loader_expected_notification_count, test, iter); + + status = pLdrUnlockLoaderLock(0, magic); + ok(!status, "Got unexpected status %#x.\n", status); + + if (result == WAIT_TIMEOUT) + WaitForSingleObject(next_test_event, INFINITE); + ++iter; + } while (test_loader_lock_repeat_lock); + + SetEvent(lock_ready_event); + WaitForSingleObject(next_test_event, INFINITE); + /* 2. Test with the thread blocked in DLL entry point during process attach. */ + swprintf(str, ARRAY_SIZE(str), L"%u", DLL_PROCESS_ATTACH); + bret = SetEnvironmentVariableW(env_var, str); + ok(bret, "SetEnvironmentVariableW failed.\n"); + ++test; + iter = 0; + do + { + hmodule = LoadLibraryA("lock.dll"); + ok(!!hmodule, "LoadLibrary failed, err %u.\n", GetLastError()); + p_set_lock_result_addr = (void *)GetProcAddress(hmodule, "set_lock_result_addr"); + p_set_lock_result_addr(&result); + + if (result == WAIT_TIMEOUT) + InterlockedIncrement(&test_loader_lock_timeout_count); + + bret = FreeLibrary(hmodule); + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + + ok(result == test_loader_lock_expected_wait_result, + "Got unexpected wait result %#x, expected %#x, test %u.%u.\n", + result, test_loader_lock_expected_wait_result, test, iter); + + if (result == WAIT_TIMEOUT) + WaitForSingleObject(next_test_event, INFINITE); + ++iter; + } while (test_loader_lock_repeat_lock); + + SetEvent(lock_ready_event); + WaitForSingleObject(next_test_event, INFINITE); + + /* 3. Test with the thread blocked in DLL entry point during process detach. */ + swprintf(str, ARRAY_SIZE(str), L"%u", DLL_PROCESS_DETACH); + bret = SetEnvironmentVariableW(env_var, str); + ok(bret, "SetEnvironmentVariableW failed.\n"); + ++test; + iter = 0; + do + { + lock_dll_handle = hmodule = LoadLibraryA("lock.dll"); + ok(!!hmodule, "LoadLibrary failed, err %u.\n", GetLastError()); + p_set_lock_result_addr = (void *)GetProcAddress(hmodule, "set_lock_result_addr"); + ok(!!p_set_lock_result_addr, "Got NULL p_set_lock_result_addr.\n"); + p_set_lock_result_addr(&result); + bret = FreeLibrary(hmodule); + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + + lock_dll_handle = NULL; + + if (result == WAIT_TIMEOUT) + InterlockedIncrement(&test_loader_lock_timeout_count); + + ok(result == test_loader_lock_expected_wait_result, + "Got unexpected wait result %#x, expected %#x, test %u.%u.\n", + result, test_loader_lock_expected_wait_result, test, iter); + + if (result == WAIT_TIMEOUT) + WaitForSingleObject(next_test_event, INFINITE); + ++iter; + } while (test_loader_lock_repeat_lock); + + SetEvent(lock_ready_event); + WaitForSingleObject(next_test_event, INFINITE); + + /* 4. Test with the thread blocked in LdrEnumerateLoadedModules callback. */ + ++test; + iter = 0; + do + { + pLdrEnumerateLoadedModules(NULL, test_loader_lock_module_enum_locking_callback, &result); + + if (result == WAIT_TIMEOUT) + InterlockedIncrement(&test_loader_lock_timeout_count); + + ok(result == test_loader_lock_expected_wait_result, + "Got unexpected wait result %#x, expected %#x, test %u.%u.\n", + result, test_loader_lock_expected_wait_result, test, iter); + ok(test_loader_notification_count == test_loader_expected_notification_count, + "Got unexpected notification count %u, expected %u, test %u.%u.\n", + test_loader_notification_count, test_loader_expected_notification_count, test, iter); + + if (result == WAIT_TIMEOUT) + WaitForSingleObject(next_test_event, INFINITE); + ++iter; + } while (test_loader_lock_repeat_lock); + + SetEvent(lock_ready_event); + WaitForSingleObject(next_test_event, INFINITE); + + /* 5. Test with the thread blocked in LDR notification callback. */ + LdrRegisterDllNotification(0, test_loader_lock_ldr_notify_locking, &result, &cookie); + /* lock.dll will return FALSE from the DLL entry point. */ + bret = SetEnvironmentVariableW(env_var, L"-1"); + ok(bret, "SetEnvironmentVariableW failed.\n"); + + ++test; + iter = 0; + do + { + hmodule = LoadLibraryA("lock.dll"); + ok(!!hmodule, "LoadLibrary failed, err %u.\n", GetLastError()); + bret = FreeLibrary(hmodule); + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + + if (result == WAIT_TIMEOUT) + InterlockedIncrement(&test_loader_lock_timeout_count); + + ok(result == test_loader_lock_expected_wait_result, + "Got unexpected wait result %#x, expected %#x, test %u.%u.\n", + result, test_loader_lock_expected_wait_result, test, iter); + ok(test_loader_notification_count == test_loader_expected_notification_count, + "Got unexpected notification count %u, expected %u, test %u.%u.\n", + test_loader_notification_count, test_loader_expected_notification_count, test, iter); + + if (result == WAIT_TIMEOUT) + WaitForSingleObject(next_test_event, INFINITE); + ++iter; + } while (test_loader_lock_repeat_lock); + LdrUnregisterDllNotification( cookie ); + SetEvent(lock_ready_event); + return 0; +} + +static void CALLBACK test_loader_lock_ldr_notify(ULONG reason, LDR_DLL_NOTIFICATION_DATA *data, void *context) +{ + if (!lstrcmpW(data->Loaded.BaseDllName->Buffer, ldr_notify_track_dll)) + ++test_loader_notification_count; +} + +static void CALLBACK test_loader_lock_enum_callback(LDR_DATA_TABLE_ENTRY *mod, void *context, BOOLEAN *stop) +{ + *stop = TRUE; +} + +static void test_loader_lock(void) +{ +#define CHECK ok(!test_loader_lock_timeout_count, "Got timeout count %d.\n", test_loader_lock_timeout_count) + static const WCHAR not_loaded_dll_name[] = L"authz.dll"; + static const WCHAR preloaded_dll_name[] = L"winmm.dll"; + HMODULE hmodule_preloaded, hmodule; + ULONG_PTR magic; + NTSTATUS status; + HANDLE thread; + void *cookie; + void *proc; + BOOL bret; + + extract_resource("locking_dll.dll", "TESTDLL", "lock.dll"); + + lock_ready_event = CreateEventA(NULL, FALSE, FALSE, "test_lock_ready_event"); + next_test_event = CreateEventA(NULL, FALSE, FALSE, "test_next_test_event"); + + thread = CreateThread(NULL, 0, test_loader_lock_thread, NULL, 0, NULL); + + hmodule_preloaded = LoadLibraryW(preloaded_dll_name); + ok(!!hmodule_preloaded, "LoadLibrary failed, err %u.\n", GetLastError()); + hmodule = GetModuleHandleW(not_loaded_dll_name); + ok(!hmodule, "%s is already loaded.\n", not_loaded_dll_name); + + test_loader_notification_count = 0; + + /* 1. Test with loader lock held. */ + trace("Test 1.\n"); + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + test_loader_lock_expected_wait_result = WAIT_OBJECT_0; + + status = LdrRegisterDllNotification(0, test_loader_lock_ldr_notify, NULL, &cookie); + ok(!status, "Got unexpected status %#x.\n", status); + CHECK; + ldr_notify_track_dll = not_loaded_dll_name; + + bret = GetModuleHandleExW(0, preloaded_dll_name, &hmodule); + ok(bret, "GetModuleHandleEx failed, err %u.\n", GetLastError()); + ok(hmodule == hmodule_preloaded, "Got unexpected hmodule %p, expected %p.\n", hmodule, hmodule_preloaded); + CHECK; + + bret = FreeLibrary(hmodule); + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + CHECK; + + ok(!test_loader_notification_count, "Got unexpected test_loader_notification_count %u.\n", test_loader_notification_count); + + if (BLOCKING_TESTS_ENABLED) + { + CHECK; + test_loader_lock_repeat_lock = TRUE; + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + if (test_loader_lock_test_failed) + { + win_skip("Old loader, tests skipped.\n"); + goto done; + } + + /* With loader lock held notification callback is called which should mean that: + * - LDR notifications themselves do not wait on loader lock; + * - The library load goes far enough to call the LDR notification until it blocks on the loader lock. + */ + test_loader_expected_notification_count = 1; + test_loader_lock_expected_wait_result = WAIT_TIMEOUT; + hmodule = LoadLibraryW(not_loaded_dll_name); + ok(!!hmodule, "LoadLibrary failed, err %u.\n", GetLastError()); + + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + test_loader_notification_count = 0; + test_loader_expected_notification_count = 0; + bret = FreeLibrary(hmodule); + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + + ok(test_loader_notification_count == 1, "Got unexpected notification count %u, expected %u.\n", + test_loader_notification_count, 1); + test_loader_notification_count = 0; + test_loader_expected_notification_count = 0; + + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + pLdrEnumerateLoadedModules(NULL, test_loader_lock_enum_callback, NULL); + + test_loader_lock_repeat_lock = FALSE; + } + + LdrUnregisterDllNotification( cookie ); + + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + if (test_loader_lock_test_failed) + { + win_skip("Old loader, tests skipped.\n"); + goto done; + } + + /* 2. Test with the thread blocked in DLL entry point during process attach. */ + trace("Test 2.\n"); + SetEvent(next_test_event); + + WaitForSingleObject(lock_ready_event, INFINITE); + test_loader_lock_expected_wait_result = WAIT_OBJECT_0; + + status = LdrRegisterDllNotification(0, test_loader_lock_ldr_notify, NULL, &cookie); + ok(!status, "Got unexpected status %#x.\n", status); + CHECK; + + bret = GetModuleHandleExW(0, preloaded_dll_name, &hmodule); + CHECK; + ok(bret, "GetModuleHandleEx failed, err %u.\n", GetLastError()); + ok(hmodule == hmodule_preloaded, "Got unexpected hmodule %p, expected %p.\n", hmodule, hmodule_preloaded); + + proc = GetProcAddress(hmodule, "timeGetTime"); + CHECK; + ok(!!proc, "GetProcAddress failed.\n"); + + bret = FreeLibrary(hmodule); + CHECK; + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + + hmodule = GetModuleHandleA("lock.dll"); + CHECK; + ok(!!hmodule, "GetModuleHandleA failed, err %u.\n", GetLastError()); + + bret = GetModuleHandleExW(0, L"lock.dll", &hmodule); + CHECK; + ok(bret, "GetModuleHandleEx failed, err %u.\n", GetLastError()); + + lock_dll_handle = hmodule; + + status = LdrAddRefDll(0, hmodule); + CHECK; + ok(!status, "Got unexpected status %#x.\n", status); + + bret = FreeLibrary(hmodule); + CHECK; + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + + bret = FreeLibrary(hmodule); + CHECK; + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + + hmodule = LoadLibraryW(preloaded_dll_name); + CHECK; + ok(!!hmodule, "LoadLibrary failed, err %u.\n", GetLastError()); + + bret = FreeLibrary(hmodule); + CHECK; + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + + if (BLOCKING_TESTS_ENABLED) + { + test_loader_lock_repeat_lock = TRUE; + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + test_loader_lock_expected_wait_result = WAIT_TIMEOUT; + + ok(!!lock_dll_handle, "Got NULL lock_dll_handle.\n"); + proc = GetProcAddress(lock_dll_handle, "unknown"); + ok(!proc, "GetProcAddress succeeded.\n"); + + test_loader_lock_repeat_lock = FALSE; + } + + LdrUnregisterDllNotification( cookie ); + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + /* 3. Test with the thread blocked in DLL entry point during process detach. */ + trace("Test 3.\n"); + + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + test_loader_lock_timeout_count = 0; + test_loader_lock_expected_wait_result = WAIT_OBJECT_0; + + status = LdrRegisterDllNotification(0, test_loader_lock_ldr_notify, NULL, &cookie); + ok(!status, "Got unexpected status %#x.\n", status); + CHECK; + + bret = GetModuleHandleExW(0, preloaded_dll_name, &hmodule); + ok(bret, "GetModuleHandleEx failed, err %u.\n", GetLastError()); + ok(hmodule == hmodule_preloaded, "Got unexpected hmodule %p, expected %p.\n", hmodule, hmodule_preloaded); + CHECK; + + proc = GetProcAddress(hmodule, "timeGetTime"); + ok(!!proc, "GetProcAddress failed.\n"); + CHECK; + + bret = FreeLibrary(hmodule); + ok(bret, "FreeLibrary failed, err %u.\n", GetLastError()); + CHECK; + + ok(!!lock_dll_handle, "Got NULL lock_dll_handle.\n"); + + proc = GetProcAddress(lock_dll_handle, "set_lock_result_addr"); + CHECK; + + ok(!proc, "GetProcAddress failed, err %u.\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %u.\n", GetLastError()); + + status = LdrAddRefDll(0, lock_dll_handle); + CHECK; + ok(status == STATUS_DLL_NOT_FOUND, "Got unexpected status %#x.\n", status); + + if (BLOCKING_TESTS_ENABLED) + { + test_loader_lock_repeat_lock = TRUE; + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + test_loader_lock_expected_wait_result = WAIT_TIMEOUT; + hmodule = GetModuleHandleW(L"lock.dll"); + ok(!hmodule, "GetModuleHandleW succeeded.\n", GetLastError()); + ok(GetLastError() == ERROR_MOD_NOT_FOUND, "Got unexpected error %u.\n", GetLastError()); + test_loader_lock_repeat_lock = FALSE; + } + + LdrUnregisterDllNotification( cookie ); + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + /* 4. Test with the thread blocked in LdrEnumerateLoadedModules callback. */ + trace("Test 4.\n"); + + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + test_loader_lock_timeout_count = 0; + test_loader_lock_expected_wait_result = WAIT_OBJECT_0; + + status = LdrRegisterDllNotification(0, test_loader_lock_ldr_notify, NULL, &cookie); + ok(!status, "Got unexpected status %#x.\n", status); + CHECK; + + hmodule = GetModuleHandleW(preloaded_dll_name); + ok(!!hmodule, "LoadLibrary failed, err %u.\n", GetLastError()); + CHECK; + + if (BLOCKING_TESTS_ENABLED) + { + test_loader_lock_repeat_lock = TRUE; + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + test_loader_lock_expected_wait_result = WAIT_TIMEOUT; + + status = pLdrLockLoaderLock(0, NULL, &magic); + ok(!status, "Got unexpected status %#x.\n", status); + status = pLdrUnlockLoaderLock(0, magic); + ok(!status, "Got unexpected status %#x.\n", status); + + test_loader_lock_repeat_lock = FALSE; + } + + LdrUnregisterDllNotification( cookie ); + + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + /* 5. Test with the thread blocked in LDR notification callback. */ + trace("Test 5.\n"); + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + test_loader_lock_timeout_count = 0; + test_loader_lock_expected_wait_result = WAIT_OBJECT_0; + + hmodule = GetModuleHandleW(preloaded_dll_name); + ok(!!hmodule, "LoadLibrary failed, err %u.\n", GetLastError()); + CHECK; + + if (BLOCKING_TESTS_ENABLED) + { + test_loader_lock_repeat_lock = TRUE; + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + test_loader_lock_expected_wait_result = WAIT_TIMEOUT; + + status = LdrRegisterDllNotification(0, test_loader_lock_ldr_notify, NULL, &cookie); + ok(!status, "Got unexpected status %#x.\n", status); + LdrUnregisterDllNotification( cookie ); + + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + /* This doesn't block in load notifications on Windows, only unload. */ + status = pLdrLockLoaderLock(0, NULL, &magic); + ok(!status, "Got unexpected status %#x.\n", status); + status = pLdrUnlockLoaderLock(0, magic); + ok(!status, "Got unexpected status %#x.\n", status); + + test_loader_lock_repeat_lock = FALSE; + } + + SetEvent(next_test_event); + WaitForSingleObject(lock_ready_event, INFINITE); + + + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + +done: + DeleteFileA("lock.dll"); + FreeLibrary(hmodule_preloaded); + CloseHandle(lock_ready_event); + CloseHandle(next_test_event); +} + START_TEST(loader) { int argc; @@ -4060,6 +4634,7 @@ START_TEST(loader) pLdrUnlockLoaderLock = (void *)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); pLdrLoadDll = (void *)GetProcAddress(ntdll, "LdrLoadDll"); pLdrUnloadDll = (void *)GetProcAddress(ntdll, "LdrUnloadDll"); + pLdrEnumerateLoadedModules = (void *)GetProcAddress(ntdll, "LdrEnumerateLoadedModules"); pRtlInitUnicodeString = (void *)GetProcAddress(ntdll, "RtlInitUnicodeString"); pRtlAcquirePebLock = (void *)GetProcAddress(ntdll, "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(ntdll, "RtlReleasePebLock"); @@ -4099,6 +4674,7 @@ START_TEST(loader) return; } +if(0){ test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); @@ -4113,6 +4689,9 @@ START_TEST(loader) test_dll_file( "advapi32.dll" ); test_dll_file( "user32.dll" ); test_Wow64Transition(); +} + test_loader_lock(); +return; /* loader test must be last, it can corrupt the internal loader state on Windows */ test_Loader(); } diff --git a/dlls/kernel32/tests/locking_dll.c b/dlls/kernel32/tests/locking_dll.c new file mode 100644 index 00000000000..31aff05fe84 --- /dev/null +++ b/dlls/kernel32/tests/locking_dll.c @@ -0,0 +1,50 @@ +#include <stdarg.h> +#include <stdlib.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +static DWORD last_lock_result, *lock_result_addr; + +BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, LPVOID reserved ) +{ + HANDLE lock_ready_event, next_test_event; + DWORD wait_reason; + NTSTATUS status; + char str[8]; + + GetEnvironmentVariableA("test_wait_reason_value", str, sizeof(str)); + wait_reason = atoi(str); + + if (reason != wait_reason) return TRUE; + + lock_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_lock_ready_event"); + next_test_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_next_test_event"); + + SetEvent( lock_ready_event ); + last_lock_result = WaitForSingleObject(next_test_event, 2000); + + if (0) + { + if (reason == DLL_PROCESS_DETACH) + { + status = LdrAddRefDll(0, instance); + if (status) last_lock_result = ~0u; + status = LdrAddRefDll(LDR_ADDREF_DLL_PIN, instance); + if (status != STATUS_UNSUCCESSFUL) last_lock_result = ~0u - 1; + } + } + if (lock_result_addr) *lock_result_addr = last_lock_result; + + CloseHandle(lock_ready_event); + CloseHandle(next_test_event); + return TRUE; +} + +void WINAPI set_lock_result_addr( DWORD *addr ) +{ + lock_result_addr = addr; + *addr = last_lock_result; +} diff --git a/dlls/kernel32/tests/locking_dll.spec b/dlls/kernel32/tests/locking_dll.spec new file mode 100644 index 00000000000..327515590c3 --- /dev/null +++ b/dlls/kernel32/tests/locking_dll.spec @@ -0,0 +1 @@ +@ stdcall set_lock_result_addr(ptr) -- 2.31.1

2 1

[PATCH 00/22] ntdll: Relax the loader locking to match newer Windows behaviour.
by Paul Gofman 01 Oct '21

01 Oct '21

I actually mean to send first 7 patches from this series for review and not 22 at once but it feels like the changes introduced by these first patches make sense in this exact form only if the general idea of locking rework is accepted. So I am sending the whole thing in its current state in a hope it would be possible to see what I am suggesting and make a decision on the general idea at least. I did some cleanup on all the functional patches, although would look once again at those below patch 7 at least before sending that for review. The test in the last patch obviously needs more work, it works well for me on the recent enough Windows 10 but not that well yet on earlier versions, also needs cleaning up and splitting. Some facts about the current Windows loader behaviour: - It seems that loader lock (the one that can be managed externally through LdrLockLoaderLock) is held only when calling the app's functions from the loader: DLL entry point, TLS callbacks, LDR notifications and LdrEnumerateLoadedModules callback. There is a quirk (at least on the newer Win10) with LDR notifications: the loader lock is held during the unload event but not during the load event, at least the first one. I am guessing that maybe it is unheld only until the first dependency DLL entry point is called (so they take it once there and then keep until process attach ends, leaving first load notification behind), but I didn't test that with the DLL with dependencies yet. In any case it looks to me this quirk may be left for later. - There is apparently other lock mechanics involved as Windows does not allow loading process of different DLLs to go in parallel; - It looks like any function which does not end up requiring actual loading or unloading of the DLL and does not query anything from the module currently being loaded or unloaded can be executed in parallel with the current load process. E. g., LoadLibrary("b.dll") won't ever block if the DLL is already loaded, LdrAddRefDll never blocks at all even if called for the module currently being loaded (hanging in dll entry point process attach) or unloaded (hanging in detach), LdrUnloadDll will only block if it decrements load count to zero. - The behaviour of the functions operating on the module being currently loaded or unloaded looks quirky. Here is what I recovered from testing on the 19043.1237 (that is mostly covered in the test in the last patch): - LdrUnloadDll blocks until the DLL load sequence is complete and succeeds without waiting if unload sequence is in progress; - LdrAddRefDll never blocks but behaviour depends on whether it is called from the app callback (tested with entry point and LDR notification) or outside of that (patch 0014). - LdrGetDllHandleEx blocks during module unload but not load; - LdrGetProcedureAddress waits until the module is being loaded and immediately returns an error if module is being unloaded; - Looks like calling functions from LDR notifications is the special case. Those that wouldn't block work, but those that would block if called from outside return error STATUS_NOT_FOUND. That is apparently not how that behaves from DLL entry points and TLS callbacks. I think the main patch in the series is patch 0008 which introduces exclusive locks downgrade / upgrade functions. The idea is that we can take shared or exclusive lock from loader function. The exclusive lock can be downgraded to shared. However, the thread still holds exlusiveness in this state in a sense that other exclusive lock cannot be taken until the initial exclusive lock is released. Shared lock waiters can joing when the exlusive lock is downgraded. This works recursively so loader functions can call each other and call outside callbacks with the lock held, with the exception that exclusive lock cannot be taken recursively if shared is currently held. So, the way of using it is: - Never call the callbacks with read lock held: that will assert once the application calls some loader function which takes the exclusive lock. - The way to call the callbacks is to have an exclusive lock and downgrade it to shared, then the recursive taking of exclusive lock is ok; - If it is unclear at function start whether exclusive lock is needed or not, the way to go is to start from shared lock, try to perform the operation (in case of LdrAddRefDll / LdrUnloadLibrary I used an extra short lived SRW lock), and if that is not possible release the shared lock and restart from scratch with exclusive. I think maybe it would be technically possible not to introduce the limitation and allow upgrading shared locks to exclusive but it seems it would make things much more complicated than they are: it would require some neater and finer grained structure access sync to avoid invalidating all the data the shared locker depends on at the moment it wants to upgrade to exclusive and yields to exclusive library load / unload sequence. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> -- 2.31.1

2 39

[v2 PATCH 1/7] d3d10/effect: Fix handling samplers array binding.
by Nikolay Sivov 01 Oct '21

01 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 50 ++++++++++++--------- dlls/d3d10/tests/effect.c | 91 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 70a99601eea..8ff7ed53963 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3973,6 +3973,29 @@ static void update_buffer(ID3D10Device *device, struct d3d10_effect_variable *v) b->changed = FALSE; } +static void set_sampler(ID3D10Device *device, D3D10_SHADER_VARIABLE_TYPE shader_type, + struct d3d10_effect_variable *v, unsigned int bind_point) +{ + switch (shader_type) + { + case D3D10_SVT_VERTEXSHADER: + ID3D10Device_VSSetSamplers(device, bind_point, 1, &v->u.state.object.sampler); + break; + + case D3D10_SVT_PIXELSHADER: + ID3D10Device_PSSetSamplers(device, bind_point, 1, &v->u.state.object.sampler); + break; + + case D3D10_SVT_GEOMETRYSHADER: + ID3D10Device_GSSetSamplers(device, bind_point, 1, &v->u.state.object.sampler); + break; + + default: + WARN("Incorrect shader type to bind sampler.\n"); + break; + } +} + static void apply_shader_resources(ID3D10Device *device, struct ID3D10EffectShaderVariable *variable) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(variable); @@ -3980,7 +4003,7 @@ static void apply_shader_resources(ID3D10Device *device, struct ID3D10EffectShad struct d3d10_effect_shader_resource *sr; struct d3d10_effect_variable *rsrc_v; ID3D10ShaderResourceView **srv; - unsigned int i; + unsigned int i, j; for (i = 0; i < sv->resource_count; ++i) { @@ -4045,27 +4068,14 @@ static void apply_shader_resources(ID3D10Device *device, struct ID3D10EffectShad break; case D3D10_SIT_SAMPLER: - switch (v->type->basetype) + if (!rsrc_v->type->element_count) { - case D3D10_SVT_VERTEXSHADER: - ID3D10Device_VSSetSamplers(device, sr->bind_point, sr->bind_count, - &rsrc_v->u.state.object.sampler); - break; - - case D3D10_SVT_PIXELSHADER: - ID3D10Device_PSSetSamplers(device, sr->bind_point, sr->bind_count, - &rsrc_v->u.state.object.sampler); - break; - - case D3D10_SVT_GEOMETRYSHADER: - ID3D10Device_GSSetSamplers(device, sr->bind_point, sr->bind_count, - &rsrc_v->u.state.object.sampler); - break; - - default: - WARN("Incorrect shader type to bind sampler.\n"); - break; + set_sampler(device, v->type->basetype, rsrc_v, sr->bind_point); + break; } + + for (j = 0; j < sr->bind_count; ++j) + set_sampler(device, v->type->basetype, &rsrc_v->elements[j], sr->bind_point + j); break; default: diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 60be8186f8b..f7b536b2fb0 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5769,6 +5769,55 @@ static DWORD fx_test_resource_variable[] = 0x00070000, 0x02120000, 0x00070000, 0x00000000, 0x00070000, 0x057a0000, 0x00000000, }; +#if 0 +Texture2D t_a[2]; + +SamplerState s[2] : register(s1); + +float4 PS( float4 pos : SV_POSITION ) : SV_Target +{ + return t_a[1].Sample(s[1], float2(0, 0)); +} + +technique10 rsrc_test +{ + pass p0 + { + SetPixelShader(CompileShader(ps_4_0, PS())); + } +} +#endif +static DWORD fx_test_resource_variable2[] = +{ + 0x43425844, 0xb62313ac, 0x8116090b, 0xdc1d2951, 0xfc18ca42, 0x00000001, 0x0000035a, 0x00000001, + 0x00000024, 0x30315846, 0x0000032e, 0xfeff1001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x0000028a, 0x00000000, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x74786554, + 0x32657275, 0x00040044, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x000c0000, + 0x5f740000, 0x61530061, 0x656c706d, 0x61745372, 0x2e006574, 0x02000000, 0x02000000, 0x00000000, + 0x00000000, 0x00000000, 0x15000000, 0x73000000, 0x72737200, 0x65745f63, 0x70007473, 0x02180030, + 0x58440000, 0xb2424342, 0x3c889e83, 0xb8b8fc18, 0x749f2920, 0x0001877a, 0x02180000, 0x00050000, + 0x00340000, 0x00c80000, 0x00fc0000, 0x01300000, 0x019c0000, 0x44520000, 0x008c4645, 0x00000000, + 0x00000000, 0x00020000, 0x001c0000, 0x04000000, 0x0100ffff, 0x00620000, 0x005c0000, 0x00030000, + 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00020000, 0x00010000, 0x005e0000, 0x00020000, + 0x00050000, 0x00040000, 0xffff0000, 0x0000ffff, 0x00020000, 0x000c0000, 0x00730000, 0x00615f74, + 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, + 0x31207265, 0x00312e30, 0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, + 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, + 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, + 0x000f0000, 0x56530000, 0x7261545f, 0x00746567, 0x4853abab, 0x00645244, 0x00400000, 0x00190000, + 0x005a0000, 0x60000300, 0x00020010, 0x18580000, 0x70000400, 0x00010010, 0x55550000, 0x00650000, + 0x20f20300, 0x00000010, 0x00450000, 0x20f20c00, 0x00000010, 0x40020000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x7e460000, 0x00010010, 0x60000000, 0x00020010, 0x003e0000, 0x54530100, + 0x00745441, 0x00020000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, + 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660000, 0x00000000, + 0x002a0000, 0x000e0000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00570000, 0x003b0000, 0x00000000, + 0xffff0000, 0x0000ffff, 0x00000000, 0x00000000, 0x00590000, 0x00010000, 0x00000000, 0x00630000, + 0x00010000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x02820000, 0x00000000, +}; + static void create_effect_texture_resource(ID3D10Device *device, ID3D10ShaderResourceView **srv, ID3D10Texture2D **tex) { @@ -5812,10 +5861,13 @@ static ID3D10EffectShaderResourceVariable *get_effect_shader_resource_variable_( static void test_effect_resource_variable(void) { + ID3D10SamplerState *samplers[D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT]; ID3D10ShaderResourceView *srv0, *srv_a[2], *srv_tmp[2]; ID3D10EffectShaderResourceVariable *t0, *t_a, *t_a_0; ID3D10EffectTechnique *technique; ID3D10Texture2D *tex0, *tex_a[2]; + ID3D10EffectSamplerVariable *s; + ID3D10SamplerState *sampler[2]; D3D10_EFFECT_DESC effect_desc; D3D10_PASS_DESC pass_desc; ID3D10EffectVariable *var; @@ -5938,6 +5990,45 @@ static void test_effect_resource_variable(void) effect->lpVtbl->Release(effect); + hr = create_effect(fx_test_resource_variable2, 0, device, NULL, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); + ok(!!technique, "Got unexpected technique %p.\n", technique); + pass = technique->lpVtbl->GetPassByName(technique, "p0"); + ok(!!pass, "Got unexpected pass %p.\n", pass); + + var = effect->lpVtbl->GetVariableByName(effect, "s"); + ok(var->lpVtbl->IsValid(var), "Expected valid variable.\n"); + + s = var->lpVtbl->AsSampler(var); + ok(s->lpVtbl->IsValid(s), "Expected valid sample variable.\n"); + + hr = s->lpVtbl->GetSampler(s, 0, &sampler[0]); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = s->lpVtbl->GetSampler(s, 1, &sampler[1]); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D10Device_PSGetSamplers(device, 0, ARRAY_SIZE(samplers), samplers); + for (i = 0; i < ARRAY_SIZE(samplers); ++i) + { + if (i == 1 || i == 2) + { + ok(samplers[i] == sampler[i - 1], "Unexpected sampler at %u.\n", i); + } + else + ok(!samplers[i], "Unexpected sampler at %u.\n", i); + if (samplers[i]) + ID3D10SamplerState_Release(samplers[i]); + } + for (i = 0; i < ARRAY_SIZE(sampler); ++i) + ID3D10SamplerState_Release(sampler[i]); + + effect->lpVtbl->Release(effect); + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } -- 2.33.0

3 20

[PATCH 1/3] configure: Don't use -fPIC on mingw targets.
by Jacek Caban 01 Oct '21

01 Oct '21

Fixes PE-only builds with llvm-mingw. The option is not relevant on mingw. While mingw GCC ignores it, Clags issues an error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

2 3

[PATCH vkd3d 5/5] vkd3d-shader/sm4: Maintain the parser location in the vkd3d_shader_parser structure.
by Henri Verbeet 01 Oct '21

01 Oct '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 11 +++++++---- libs/vkd3d-shader/glsl.c | 14 ++++---------- libs/vkd3d-shader/spirv.c | 10 ++++------ libs/vkd3d-shader/vkd3d_shader_main.c | 13 +++++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 21 +++++++++++---------- 5 files changed, 35 insertions(+), 34 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index cc5b1b8d..f6d99ea6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -970,8 +970,9 @@ static enum vkd3d_data_type map_data_type(char t) } } -static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) +static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t *byte_code, + size_t byte_code_size, const char *source_name, const struct vkd3d_shader_signature *output_signature, + struct vkd3d_shader_message_context *message_context) { struct vkd3d_shader_version version; uint32_t version_token, token_count; @@ -1029,7 +1030,7 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t version.major = VKD3D_SM4_VERSION_MAJOR(version_token); version.minor = VKD3D_SM4_VERSION_MINOR(version_token); - vkd3d_shader_parser_init(&sm4->p, message_context, &version); + vkd3d_shader_parser_init(&sm4->p, message_context, source_name, &version); sm4->p.ptr = sm4->start; memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); @@ -1550,6 +1551,8 @@ void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3 } remaining = sm4->end - *ptr; + ++parser->location.line; + opcode_token = *(*ptr)++; opcode = opcode_token & VKD3D_SM4_OPCODE_MASK; @@ -1687,7 +1690,7 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi } if (!shader_sm4_init(sm4, shader_desc->byte_code, shader_desc->byte_code_size, - &shader_desc->output_signature, message_context)) + compile_info->source_name, &shader_desc->output_signature, message_context)) { WARN("Failed to initialise shader parser.\n"); free_shader_desc(shader_desc); diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 7e028d23..9858098b 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -22,14 +22,13 @@ struct vkd3d_glsl_generator { struct vkd3d_shader_version version; struct vkd3d_string_buffer buffer; - struct vkd3d_shader_location location; + const struct vkd3d_shader_location *location; struct vkd3d_shader_message_context *message_context; bool failed; }; struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_version *version, - const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_message_context *message_context) + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location) { struct vkd3d_glsl_generator *generator; @@ -39,8 +38,7 @@ struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shad memset(generator, 0, sizeof(*generator)); generator->version = *version; vkd3d_string_buffer_init(&generator->buffer); - generator->location.source_name = compile_info->source_name; - generator->location.line = 2; /* Line 1 is the version token. */ + generator->location = location; generator->message_context = message_context; return generator; } @@ -52,10 +50,9 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_glsl_compiler_error( va_list args; va_start(args, fmt); - vkd3d_shader_verror(generator->message_context, &generator->location, error, fmt, args); + vkd3d_shader_verror(generator->message_context, generator->location, error, fmt, args); va_end(args); generator->failed = true; - return; } static void shader_glsl_ret(struct vkd3d_glsl_generator *generator, @@ -91,9 +88,6 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator "Unhandled instruction %#x", instruction->handler_idx); break; } - - ++generator->location.line; - return; } int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f604b8ef..0be17e39 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2208,7 +2208,7 @@ struct vkd3d_dxbc_compiler struct vkd3d_spirv_builder spirv_builder; struct vkd3d_shader_message_context *message_context; - struct vkd3d_shader_location location; + const struct vkd3d_shader_location *location; bool failed; bool strip_debug; @@ -2286,7 +2286,7 @@ static const char *vkd3d_dxbc_compiler_get_entry_point_name(const struct vkd3d_d struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, - struct vkd3d_shader_message_context *message_context) + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location) { const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; @@ -2301,8 +2301,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader memset(compiler, 0, sizeof(*compiler)); compiler->message_context = message_context; - compiler->location.source_name = compile_info->source_name; - compiler->location.line = 2; /* Line 1 is the version token. */ + compiler->location = location; if ((target_info = vkd3d_find_struct(compile_info->next, SPIRV_TARGET_INFO))) { @@ -2518,7 +2517,7 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_dxbc_compiler_error(struct vkd3d_dxbc_ va_list args; va_start(args, format); - vkd3d_shader_verror(compiler->message_context, &compiler->location, error, format, args); + vkd3d_shader_verror(compiler->message_context, compiler->location, error, format, args); va_end(args); compiler->failed = true; } @@ -9747,7 +9746,6 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, FIXME("Unhandled instruction %#x.\n", instruction->handler_idx); } - ++compiler->location.line; return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ef3ed955..c566ac3d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -373,9 +373,13 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, } void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, - struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_version *version) + struct vkd3d_shader_message_context *message_context, const char *source_name, + const struct vkd3d_shader_version *version) { parser->message_context = message_context; + parser->location.source_name = source_name; + parser->location.line = 1; + parser->location.column = 0; parser->shader_version = *version; } @@ -1049,7 +1053,8 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info { struct vkd3d_glsl_generator *glsl_generator; - if (!(glsl_generator = vkd3d_glsl_generator_create(&parser->shader_version, compile_info, message_context))) + if (!(glsl_generator = vkd3d_glsl_generator_create(&parser->shader_version, + message_context, &parser->location))) { ERR("Failed to create GLSL generator.\n"); vkd3d_shader_parser_destroy(parser); @@ -1065,8 +1070,8 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return ret; } - if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser->shader_version, - &parser->shader_desc, compile_info, &scan_descriptor_info, message_context))) + if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser->shader_version, &parser->shader_desc, + compile_info, &scan_descriptor_info, message_context, &parser->location))) { ERR("Failed to create DXBC compiler.\n"); vkd3d_shader_parser_destroy(parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 87d21381..0f1967bf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -887,9 +887,16 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg return reg->type == VKD3DSPR_OUTPUT || reg->type == VKD3DSPR_COLOROUT; } +struct vkd3d_shader_location +{ + const char *source_name; + unsigned int line, column; +}; + struct vkd3d_shader_parser { struct vkd3d_shader_message_context *message_context; + struct vkd3d_shader_location location; struct vkd3d_shader_desc shader_desc; struct vkd3d_shader_version shader_version; @@ -897,7 +904,8 @@ struct vkd3d_shader_parser }; void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, - struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_version *version); + struct vkd3d_shader_message_context *message_context, const char *source_name, + const struct vkd3d_shader_version *version); void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); @@ -967,12 +975,6 @@ static inline size_t bytecode_get_size(struct vkd3d_bytecode_buffer *buffer) return buffer->size; } -struct vkd3d_shader_location -{ - const char *source_name; - unsigned int line, column; -}; - struct vkd3d_shader_message_context { enum vkd3d_shader_log_level log_level; @@ -1015,8 +1017,7 @@ int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, struct vkd3d_glsl_generator; struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_version *version, - const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_message_context *message_context); + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location); int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, struct vkd3d_shader_parser *parser, struct vkd3d_shader_code *out); void vkd3d_glsl_generator_destroy(struct vkd3d_glsl_generator *generator); @@ -1026,7 +1027,7 @@ struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, - struct vkd3d_shader_message_context *message_context); + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location); int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction); int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, -- 2.20.1

1 0

[PATCH vkd3d 4/5] vkd3d-shader/sm4: Store the message context pointer in the vkd3d_shader_parser structure.
by Henri Verbeet 01 Oct '21

01 Oct '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 26 ++++++++++++------------ libs/vkd3d-shader/vkd3d_shader_main.c | 7 +++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b93d6181..cc5b1b8d 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -97,7 +97,6 @@ struct vkd3d_shader_sm4_parser struct list src; struct vkd3d_shader_immediate_constant_buffer icb; - struct vkd3d_shader_message_context *message_context; struct vkd3d_shader_parser p; }; @@ -176,13 +175,13 @@ static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *sm4) return version->major >= 5 && version->minor >= 1; } -static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_parser *priv, +static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_parser *sm4, enum vkd3d_shader_error error, const char *format, ...) { va_list args; va_start(args, format); - vkd3d_shader_verror(priv->message_context, NULL, error, format, args); + vkd3d_shader_verror(sm4->p.message_context, NULL, error, format, args); va_end(args); } @@ -974,6 +973,7 @@ static enum vkd3d_data_type map_data_type(char t) static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) { + struct vkd3d_shader_version version; uint32_t version_token, token_count; unsigned int i; @@ -1000,34 +1000,36 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t switch (version_token >> 16) { case VKD3D_SM4_PS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_PIXEL; + version.type = VKD3D_SHADER_TYPE_PIXEL; break; case VKD3D_SM4_VS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_VERTEX; + version.type = VKD3D_SHADER_TYPE_VERTEX; break; case VKD3D_SM4_GS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY; + version.type = VKD3D_SHADER_TYPE_GEOMETRY; break; case VKD3D_SM5_HS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_HULL; + version.type = VKD3D_SHADER_TYPE_HULL; break; case VKD3D_SM5_DS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_DOMAIN; + version.type = VKD3D_SHADER_TYPE_DOMAIN; break; case VKD3D_SM5_CS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_COMPUTE; + version.type = VKD3D_SHADER_TYPE_COMPUTE; break; default: FIXME("Unrecognised shader type %#x.\n", version_token >> 16); } - sm4->p.shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token); - sm4->p.shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + version.major = VKD3D_SM4_VERSION_MAJOR(version_token); + version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + + vkd3d_shader_parser_init(&sm4->p, message_context, &version); sm4->p.ptr = sm4->start; memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); @@ -1047,8 +1049,6 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t list_init(&sm4->src_free); list_init(&sm4->src); - sm4->message_context = message_context; - return true; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f253e479..ef3ed955 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -372,6 +372,13 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, shader_get_source_type_suffix(source_type), shader->code, shader->size); } +void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_version *version) +{ + parser->message_context = message_context; + parser->shader_version = *version; +} + static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) { shader_sm4_free(parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 905b5200..87d21381 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -889,11 +889,16 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg struct vkd3d_shader_parser { + struct vkd3d_shader_message_context *message_context; + struct vkd3d_shader_desc shader_desc; struct vkd3d_shader_version shader_version; const uint32_t *ptr; }; +void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_version *version); + void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); const char *shader_get_type_prefix(enum vkd3d_shader_type type); -- 2.20.1

1 0

[PATCH vkd3d 3/5] vkd3d-shader/sm4: Get rid of the redundant "shader_version" field in the vkd3d_shader_sm4_parser structure.
by Henri Verbeet 01 Oct '21

01 Oct '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 40 ++++++++++-------------- libs/vkd3d-shader/trace.c | 3 +- libs/vkd3d-shader/vkd3d_shader_private.h | 1 - 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0c2647e8..b93d6181 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -87,7 +87,6 @@ struct vkd3d_shader_src_param_entry struct vkd3d_shader_sm4_parser { - struct vkd3d_shader_version shader_version; const DWORD *start, *end; unsigned int output_map[MAX_REG_OUTPUT]; @@ -170,9 +169,10 @@ static struct vkd3d_shader_sm4_parser *vkd3d_shader_sm4_parser(struct vkd3d_shad return CONTAINING_RECORD(parser, struct vkd3d_shader_sm4_parser, p); } -static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *priv) +static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *sm4) { - const struct vkd3d_shader_version *version = &priv->shader_version; + const struct vkd3d_shader_version *version = &sm4->p.shader_version; + return version->major >= 5 && version->minor >= 1; } @@ -920,23 +920,23 @@ static const struct vkd3d_sm4_opcode_info *get_opcode_info(enum vkd3d_sm4_opcode return NULL; } -static void map_register(const struct vkd3d_shader_sm4_parser *priv, struct vkd3d_shader_register *reg) +static void map_register(const struct vkd3d_shader_sm4_parser *sm4, struct vkd3d_shader_register *reg) { - switch (priv->shader_version.type) + switch (sm4->p.shader_version.type) { case VKD3D_SHADER_TYPE_PIXEL: if (reg->type == VKD3DSPR_OUTPUT) { unsigned int reg_idx = reg->idx[0].offset; - if (reg_idx >= ARRAY_SIZE(priv->output_map)) + if (reg_idx >= ARRAY_SIZE(sm4->output_map)) { ERR("Invalid output index %u.\n", reg_idx); break; } reg->type = VKD3DSPR_COLOROUT; - reg->idx[0].offset = priv->output_map[reg_idx]; + reg->idx[0].offset = sm4->output_map[reg_idx]; } break; @@ -1000,34 +1000,35 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t switch (version_token >> 16) { case VKD3D_SM4_PS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_PIXEL; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_PIXEL; break; case VKD3D_SM4_VS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_VERTEX; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_VERTEX; break; case VKD3D_SM4_GS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY; break; case VKD3D_SM5_HS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_HULL; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_HULL; break; case VKD3D_SM5_DS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_DOMAIN; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_DOMAIN; break; case VKD3D_SM5_CS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_COMPUTE; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_COMPUTE; break; default: FIXME("Unrecognised shader type %#x.\n", version_token >> 16); } - sm4->shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token); - sm4->shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + sm4->p.shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token); + sm4->p.shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + sm4->p.ptr = sm4->start; memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); for (i = 0; i < output_signature->element_count; ++i) @@ -1087,14 +1088,6 @@ static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_shader_sm4_pars return &e->param; } -void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version) -{ - struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); - - parser->ptr = sm4->start; - *shader_version = sm4->shader_version; -} - static bool shader_sm4_read_reg_idx(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, const uint32_t *end, uint32_t addressing, struct vkd3d_shader_register_index *reg_idx) { @@ -1702,7 +1695,6 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi return VKD3D_ERROR_INVALID_ARGUMENT; } - shader_sm4_read_header(&sm4->p, &sm4->p.shader_version); *parser = &sm4->p; return VKD3D_OK; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 45f38d13..2858c7f9 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1883,12 +1883,13 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; - shader_sm4_read_header(parser, shader_version); + *shader_version = parser->shader_version; vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); indent = 0; + shader_sm4_reset(parser); while (!shader_sm4_is_end(parser)) { struct vkd3d_shader_instruction ins; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 0ac5ecef..905b5200 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -901,7 +901,6 @@ const char *shader_get_type_prefix(enum vkd3d_shader_type type); struct vkd3d_shader_message_context; void shader_sm4_free(struct vkd3d_shader_parser *parser); -void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins); bool shader_sm4_is_end(struct vkd3d_shader_parser *parser); void shader_sm4_reset(struct vkd3d_shader_parser *parser); -- 2.20.1

1 0

[PATCH vkd3d 2/5] vkd3d-shader/sm4: Rename the vkd3d_sm4_data structure to vkd3d_shader_sm4_parser.
by Henri Verbeet 01 Oct '21

01 Oct '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 226 +++++++++++++++++---------------------- 1 file changed, 96 insertions(+), 130 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index da919b1d..0c2647e8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -85,7 +85,7 @@ struct vkd3d_shader_src_param_entry struct vkd3d_shader_src_param param; }; -struct vkd3d_sm4_data +struct vkd3d_shader_sm4_parser { struct vkd3d_shader_version shader_version; const DWORD *start, *end; @@ -108,9 +108,8 @@ struct vkd3d_sm4_opcode_info enum vkd3d_shader_opcode handler_idx; const char *dst_info; const char *src_info; - void (*read_opcode_func)(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv); + void (*read_opcode_func)(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, + const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv); }; static const enum vkd3d_primitive_type output_primitive_type_table[] = @@ -166,18 +165,18 @@ static const enum vkd3d_data_type data_type_table[] = /* VKD3D_SM4_DATA_UNUSED */ VKD3D_DATA_UNUSED, }; -static struct vkd3d_sm4_data *vkd3d_sm4_data(struct vkd3d_shader_parser *parser) +static struct vkd3d_shader_sm4_parser *vkd3d_shader_sm4_parser(struct vkd3d_shader_parser *parser) { - return CONTAINING_RECORD(parser, struct vkd3d_sm4_data, p); + return CONTAINING_RECORD(parser, struct vkd3d_shader_sm4_parser, p); } -static bool shader_is_sm_5_1(const struct vkd3d_sm4_data *priv) +static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *priv) { const struct vkd3d_shader_version *version = &priv->shader_version; return version->major >= 5 && version->minor >= 1; } -static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_sm4_data *priv, +static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_parser *priv, enum vkd3d_shader_error error, const char *format, ...) { va_list args; @@ -187,13 +186,13 @@ static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_sm4_data *priv va_end(args); } -static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, - enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); -static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, - enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param); +static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, + const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); +static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, + const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param); -static bool shader_sm4_read_register_space(struct vkd3d_sm4_data *priv, - const DWORD **ptr, const DWORD *end, unsigned int *register_space) +static bool shader_sm4_read_register_space(struct vkd3d_shader_sm4_parser *priv, + const uint32_t **ptr, const uint32_t *end, unsigned int *register_space) { *register_space = 0; @@ -210,18 +209,16 @@ static bool shader_sm4_read_register_space(struct vkd3d_sm4_data *priv, return true; } -static void shader_sm4_read_conditional_op(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_conditional_op(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_UINT, &priv->src_param[0]); ins->flags = (opcode_token & VKD3D_SM4_CONDITIONAL_NZ) ? VKD3D_SHADER_CONDITIONAL_OP_NZ : VKD3D_SHADER_CONDITIONAL_OP_Z; } -static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, + const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { enum vkd3d_sm4_shader_data_type type; unsigned int icb_size; @@ -248,7 +245,7 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, ins->declaration.icb = &priv->icb; } -static void shader_sm4_set_descriptor_register_range(struct vkd3d_sm4_data *priv, +static void shader_sm4_set_descriptor_register_range(struct vkd3d_shader_sm4_parser *priv, struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) { range->first = reg->idx[1].offset; @@ -261,9 +258,8 @@ static void shader_sm4_set_descriptor_register_range(struct vkd3d_sm4_data *priv } } -static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_semantic *semantic = &ins->declaration.semantic; enum vkd3d_sm4_resource_type resource_type; @@ -309,9 +305,8 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, shader_sm4_read_register_space(priv, &tokens, end, &semantic->resource.range.space); } -static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { const DWORD *end = &tokens[token_count]; @@ -336,9 +331,8 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction } } -static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, + const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { const DWORD *end = &tokens[token_count]; @@ -350,18 +344,16 @@ static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.sampler.range.space); } -static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_OPAQUE, &ins->declaration.index_range.dst); ins->declaration.index_range.register_count = *tokens; } -static void shader_sm4_read_dcl_output_topology(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_dcl_output_topology(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { enum vkd3d_sm4_output_primitive_type primitive_type; @@ -375,9 +367,8 @@ static void shader_sm4_read_dcl_output_topology(struct vkd3d_shader_instruction FIXME("Unhandled output primitive type %#x.\n", primitive_type); } -static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { enum vkd3d_sm4_input_primitive_type primitive_type; @@ -400,40 +391,35 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction FIXME("Unhandled input primitive type %#x.\n", primitive_type); } -static void shader_sm4_read_declaration_count(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_declaration_count(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.count = *tokens; } -static void shader_sm4_read_declaration_dst(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_declaration_dst(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_FLOAT, &ins->declaration.dst); } -static void shader_sm4_read_declaration_register_semantic(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_declaration_register_semantic(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_FLOAT, &ins->declaration.register_semantic.reg); ins->declaration.register_semantic.sysval_semantic = *tokens; } -static void shader_sm4_read_dcl_input_ps(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_dcl_input_ps(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->flags = (opcode_token & VKD3D_SM4_INTERPOLATION_MODE_MASK) >> VKD3D_SM4_INTERPOLATION_MODE_SHIFT; shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_FLOAT, &ins->declaration.dst); } -static void shader_sm4_read_dcl_input_ps_siv(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_dcl_input_ps_siv(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->flags = (opcode_token & VKD3D_SM4_INTERPOLATION_MODE_MASK) >> VKD3D_SM4_INTERPOLATION_MODE_SHIFT; shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_FLOAT, @@ -441,48 +427,42 @@ static void shader_sm4_read_dcl_input_ps_siv(struct vkd3d_shader_instruction *in ins->declaration.register_semantic.sysval_semantic = *tokens; } -static void shader_sm4_read_dcl_indexable_temp(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_dcl_indexable_temp(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.indexable_temp.register_idx = *tokens++; ins->declaration.indexable_temp.register_size = *tokens++; ins->declaration.indexable_temp.component_count = *tokens; } -static void shader_sm4_read_dcl_global_flags(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm4_read_dcl_global_flags(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->flags = (opcode_token & VKD3D_SM4_GLOBAL_FLAGS_MASK) >> VKD3D_SM4_GLOBAL_FLAGS_SHIFT; } -static void shader_sm5_read_fcall(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_fcall(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, + const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { priv->src_param[0].reg.u.fp_body_idx = *tokens++; shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_OPAQUE, &priv->src_param[0]); } -static void shader_sm5_read_dcl_function_body(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_function_body(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.index = *tokens; } -static void shader_sm5_read_dcl_function_table(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_function_table(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.index = *tokens++; FIXME("Ignoring set of function bodies (count %u).\n", *tokens); } -static void shader_sm5_read_dcl_interface(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_interface(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.fp.index = *tokens++; ins->declaration.fp.body_count = *tokens++; @@ -491,57 +471,50 @@ static void shader_sm5_read_dcl_interface(struct vkd3d_shader_instruction *ins, FIXME("Ignoring set of function tables (count %u).\n", ins->declaration.fp.table_count); } -static void shader_sm5_read_control_point_count(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_control_point_count(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.count = (opcode_token & VKD3D_SM5_CONTROL_POINT_COUNT_MASK) >> VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT; } -static void shader_sm5_read_dcl_tessellator_domain(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_tessellator_domain(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.tessellator_domain = (opcode_token & VKD3D_SM5_TESSELLATOR_MASK) - >> VKD3D_SM5_TESSELLATOR_SHIFT; + >> VKD3D_SM5_TESSELLATOR_SHIFT; } -static void shader_sm5_read_dcl_tessellator_partitioning(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_tessellator_partitioning(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.tessellator_partitioning = (opcode_token & VKD3D_SM5_TESSELLATOR_MASK) >> VKD3D_SM5_TESSELLATOR_SHIFT; } -static void shader_sm5_read_dcl_tessellator_output_primitive(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_tessellator_output_primitive(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.tessellator_output_primitive = (opcode_token & VKD3D_SM5_TESSELLATOR_MASK) >> VKD3D_SM5_TESSELLATOR_SHIFT; } -static void shader_sm5_read_dcl_hs_max_tessfactor(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_hs_max_tessfactor(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.max_tessellation_factor = *(float *)tokens; } -static void shader_sm5_read_dcl_thread_group(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_thread_group(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.thread_group_size.x = *tokens++; ins->declaration.thread_group_size.y = *tokens++; ins->declaration.thread_group_size.z = *tokens++; } -static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, + const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_raw_resource *resource = &ins->declaration.raw_resource; const DWORD *end = &tokens[token_count]; @@ -552,9 +525,8 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } -static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_structured_resource *resource = &ins->declaration.structured_resource; const DWORD *end = &tokens[token_count]; @@ -568,9 +540,8 @@ static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction * shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } -static void shader_sm5_read_dcl_tgsm_raw(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_tgsm_raw(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_FLOAT, &ins->declaration.tgsm_raw.reg); ins->declaration.tgsm_raw.byte_count = *tokens; @@ -578,9 +549,8 @@ static void shader_sm5_read_dcl_tgsm_raw(struct vkd3d_shader_instruction *ins, FIXME("Byte count %u is not multiple of 4.\n", ins->declaration.tgsm_raw.byte_count); } -static void shader_sm5_read_dcl_tgsm_structured(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_tgsm_structured(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_FLOAT, &ins->declaration.tgsm_structured.reg); @@ -590,9 +560,8 @@ static void shader_sm5_read_dcl_tgsm_structured(struct vkd3d_shader_instruction FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.tgsm_structured.byte_stride); } -static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_structured_resource *resource = &ins->declaration.structured_resource; const DWORD *end = &tokens[token_count]; @@ -605,9 +574,8 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } -static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *ins, uint32_t opcode, + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_raw_resource *resource = &ins->declaration.raw_resource; const DWORD *end = &tokens[token_count]; @@ -617,9 +585,8 @@ static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *in shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } -static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins, - DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, - struct vkd3d_sm4_data *priv) +static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, + const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->flags = (opcode_token & VKD3D_SM5_SYNC_FLAGS_MASK) >> VKD3D_SM5_SYNC_FLAGS_SHIFT; } @@ -953,7 +920,7 @@ static const struct vkd3d_sm4_opcode_info *get_opcode_info(enum vkd3d_sm4_opcode return NULL; } -static void map_register(const struct vkd3d_sm4_data *priv, struct vkd3d_shader_register *reg) +static void map_register(const struct vkd3d_shader_sm4_parser *priv, struct vkd3d_shader_register *reg) { switch (priv->shader_version.type) { @@ -1004,7 +971,7 @@ static enum vkd3d_data_type map_data_type(char t) } } -static bool shader_sm4_init(struct vkd3d_sm4_data *sm4, const uint32_t *byte_code, size_t byte_code_size, +static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) { uint32_t version_token, token_count; @@ -1086,7 +1053,7 @@ static bool shader_sm4_init(struct vkd3d_sm4_data *sm4, const uint32_t *byte_cod void shader_sm4_free(struct vkd3d_shader_parser *parser) { - struct vkd3d_sm4_data *sm4 = vkd3d_sm4_data(parser); + struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); struct vkd3d_shader_src_param_entry *e1, *e2; list_move_head(&sm4->src_free, &sm4->src); @@ -1098,7 +1065,7 @@ void shader_sm4_free(struct vkd3d_shader_parser *parser) vkd3d_free(sm4); } -static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv) +static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_src_param_entry *e; struct list *elem; @@ -1122,14 +1089,14 @@ static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv) void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version) { - struct vkd3d_sm4_data *sm4 = vkd3d_sm4_data(parser); + struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); parser->ptr = sm4->start; *shader_version = sm4->shader_version; } -static bool shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, - DWORD addressing, struct vkd3d_shader_register_index *reg_idx) +static bool shader_sm4_read_reg_idx(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, + const uint32_t *end, uint32_t addressing, struct vkd3d_shader_register_index *reg_idx) { if (addressing & VKD3D_SM4_ADDRESSING_RELATIVE) { @@ -1171,9 +1138,8 @@ static bool sm4_register_is_descriptor(enum vkd3d_sm4_register_type register_typ } } -static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, - enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, - enum vkd3d_shader_src_modifier *modifier) +static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, const uint32_t *end, + enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, enum vkd3d_shader_src_modifier *modifier) { enum vkd3d_sm4_register_precision precision; enum vkd3d_sm4_register_type register_type; @@ -1396,8 +1362,8 @@ static uint32_t swizzle_from_sm4(uint32_t s) return vkd3d_shader_create_swizzle(s & 0x3, (s >> 2) & 0x3, (s >> 4) & 0x3, (s >> 6) & 0x3); } -static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, - enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) +static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, + const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) { DWORD token; @@ -1450,8 +1416,8 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * return true; } -static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, - enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param) +static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, + const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param) { enum vkd3d_shader_src_modifier modifier; DWORD token; @@ -1573,7 +1539,7 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins) { - struct vkd3d_sm4_data *sm4 = vkd3d_sm4_data(parser); + struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); const struct vkd3d_sm4_opcode_info *opcode_info; uint32_t opcode_token, opcode, previous_token; const uint32_t **ptr = &parser->ptr; @@ -1693,14 +1659,14 @@ fail: bool shader_sm4_is_end(struct vkd3d_shader_parser *parser) { - struct vkd3d_sm4_data *sm4 = vkd3d_sm4_data(parser); + struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); return parser->ptr == sm4->end; } void shader_sm4_reset(struct vkd3d_shader_parser *parser) { - struct vkd3d_sm4_data *sm4 = vkd3d_sm4_data(parser); + struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); parser->ptr = sm4->start; } @@ -1709,7 +1675,7 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser) { struct vkd3d_shader_desc *shader_desc; - struct vkd3d_sm4_data *sm4; + struct vkd3d_shader_sm4_parser *sm4; int ret; if (!(sm4 = vkd3d_calloc(1, sizeof(*sm4)))) -- 2.20.1

1 0

[PATCH vkd3d 1/5] vkd3d-shader/sm4: Store a vkd3d_shader_parser structure in the vkd3d_sm4_data structure.
by Henri Verbeet 01 Oct '21

01 Oct '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 103 +++++++++++++++-------- libs/vkd3d-shader/vkd3d_shader_main.c | 70 +++++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +- 3 files changed, 95 insertions(+), 84 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 23814a35..da919b1d 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -99,6 +99,7 @@ struct vkd3d_sm4_data struct vkd3d_shader_immediate_constant_buffer icb; struct vkd3d_shader_message_context *message_context; + struct vkd3d_shader_parser p; }; struct vkd3d_sm4_opcode_info @@ -165,6 +166,11 @@ static const enum vkd3d_data_type data_type_table[] = /* VKD3D_SM4_DATA_UNUSED */ VKD3D_DATA_UNUSED, }; +static struct vkd3d_sm4_data *vkd3d_sm4_data(struct vkd3d_shader_parser *parser) +{ + return CONTAINING_RECORD(parser, struct vkd3d_sm4_data, p); +} + static bool shader_is_sm_5_1(const struct vkd3d_sm4_data *priv) { const struct vkd3d_shader_version *version = &priv->shader_version; @@ -998,17 +1004,16 @@ static enum vkd3d_data_type map_data_type(char t) } } -void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, +static bool shader_sm4_init(struct vkd3d_sm4_data *sm4, const uint32_t *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) { - DWORD version_token, token_count; - struct vkd3d_sm4_data *priv; + uint32_t version_token, token_count; unsigned int i; if (byte_code_size / sizeof(*byte_code) < 2) { WARN("Invalid byte code size %lu.\n", (long)byte_code_size); - return NULL; + return false; } version_token = byte_code[0]; @@ -1019,82 +1024,77 @@ void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, if (token_count < 2 || byte_code_size / sizeof(*byte_code) < token_count) { WARN("Invalid token count %u.\n", token_count); - return NULL; - } - - if (!(priv = vkd3d_malloc(sizeof(*priv)))) - { - ERR("Failed to allocate private data\n"); - return NULL; + return false; } - priv->start = &byte_code[2]; - priv->end = &byte_code[token_count]; + sm4->start = &byte_code[2]; + sm4->end = &byte_code[token_count]; switch (version_token >> 16) { case VKD3D_SM4_PS: - priv->shader_version.type = VKD3D_SHADER_TYPE_PIXEL; + sm4->shader_version.type = VKD3D_SHADER_TYPE_PIXEL; break; case VKD3D_SM4_VS: - priv->shader_version.type = VKD3D_SHADER_TYPE_VERTEX; + sm4->shader_version.type = VKD3D_SHADER_TYPE_VERTEX; break; case VKD3D_SM4_GS: - priv->shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY; + sm4->shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY; break; case VKD3D_SM5_HS: - priv->shader_version.type = VKD3D_SHADER_TYPE_HULL; + sm4->shader_version.type = VKD3D_SHADER_TYPE_HULL; break; case VKD3D_SM5_DS: - priv->shader_version.type = VKD3D_SHADER_TYPE_DOMAIN; + sm4->shader_version.type = VKD3D_SHADER_TYPE_DOMAIN; break; case VKD3D_SM5_CS: - priv->shader_version.type = VKD3D_SHADER_TYPE_COMPUTE; + sm4->shader_version.type = VKD3D_SHADER_TYPE_COMPUTE; break; default: FIXME("Unrecognised shader type %#x.\n", version_token >> 16); } - priv->shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token); - priv->shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + sm4->shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token); + sm4->shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token); - memset(priv->output_map, 0xff, sizeof(priv->output_map)); + memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); for (i = 0; i < output_signature->element_count; ++i) { struct vkd3d_shader_signature_element *e = &output_signature->elements[i]; - if (e->register_index >= ARRAY_SIZE(priv->output_map)) + if (e->register_index >= ARRAY_SIZE(sm4->output_map)) { WARN("Invalid output index %u.\n", e->register_index); continue; } - priv->output_map[e->register_index] = e->semantic_index; + sm4->output_map[e->register_index] = e->semantic_index; } - list_init(&priv->src_free); - list_init(&priv->src); + list_init(&sm4->src_free); + list_init(&sm4->src); - priv->message_context = message_context; + sm4->message_context = message_context; - return priv; + return true; } void shader_sm4_free(struct vkd3d_shader_parser *parser) { + struct vkd3d_sm4_data *sm4 = vkd3d_sm4_data(parser); struct vkd3d_shader_src_param_entry *e1, *e2; - struct vkd3d_sm4_data *sm4 = parser->data; list_move_head(&sm4->src_free, &sm4->src); LIST_FOR_EACH_ENTRY_SAFE(e1, e2, &sm4->src_free, struct vkd3d_shader_src_param_entry, entry) { vkd3d_free(e1); } + free_shader_desc(&parser->shader_desc); vkd3d_free(sm4); } @@ -1122,7 +1122,7 @@ static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv) void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version) { - struct vkd3d_sm4_data *sm4 = parser->data; + struct vkd3d_sm4_data *sm4 = vkd3d_sm4_data(parser); parser->ptr = sm4->start; *shader_version = sm4->shader_version; @@ -1573,9 +1573,9 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins) { + struct vkd3d_sm4_data *sm4 = vkd3d_sm4_data(parser); const struct vkd3d_sm4_opcode_info *opcode_info; uint32_t opcode_token, opcode, previous_token; - struct vkd3d_sm4_data *sm4 = parser->data; const uint32_t **ptr = &parser->ptr; unsigned int i, len; size_t remaining; @@ -1693,18 +1693,55 @@ fail: bool shader_sm4_is_end(struct vkd3d_shader_parser *parser) { - struct vkd3d_sm4_data *sm4 = parser->data; + struct vkd3d_sm4_data *sm4 = vkd3d_sm4_data(parser); return parser->ptr == sm4->end; } void shader_sm4_reset(struct vkd3d_shader_parser *parser) { - struct vkd3d_sm4_data *sm4 = parser->data; + struct vkd3d_sm4_data *sm4 = vkd3d_sm4_data(parser); parser->ptr = sm4->start; } +int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser) +{ + struct vkd3d_shader_desc *shader_desc; + struct vkd3d_sm4_data *sm4; + int ret; + + if (!(sm4 = vkd3d_calloc(1, sizeof(*sm4)))) + { + ERR("Failed to allocate parser.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + shader_desc = &sm4->p.shader_desc; + if ((ret = shader_extract_from_dxbc(compile_info->source.code, compile_info->source.size, + message_context, compile_info->source_name, shader_desc)) < 0) + { + WARN("Failed to extract shader, vkd3d result %d.\n", ret); + vkd3d_free(sm4); + return ret; + } + + if (!shader_sm4_init(sm4, shader_desc->byte_code, shader_desc->byte_code_size, + &shader_desc->output_signature, message_context)) + { + WARN("Failed to initialise shader parser.\n"); + free_shader_desc(shader_desc); + vkd3d_free(sm4); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + shader_sm4_read_header(&sm4->p, &sm4->p.shader_version); + *parser = &sm4->p; + + return VKD3D_OK; +} + static bool require_space(size_t offset, size_t count, size_t size, size_t data_size) { return !count || (data_size - offset) / count >= size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e38261b4..f253e479 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -372,35 +372,9 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, shader_get_source_type_suffix(source_type), shader->code, shader->size); } -static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context) -{ - struct vkd3d_shader_desc *shader_desc = &parser->shader_desc; - int ret; - - if ((ret = shader_extract_from_dxbc(compile_info->source.code, compile_info->source.size, - message_context, compile_info->source_name, shader_desc)) < 0) - { - WARN("Failed to extract shader, vkd3d result %d.\n", ret); - return ret; - } - - if (!(parser->data = shader_sm4_init(shader_desc->byte_code, - shader_desc->byte_code_size, &shader_desc->output_signature, message_context))) - { - WARN("Failed to initialize shader parser.\n"); - free_shader_desc(shader_desc); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - - shader_sm4_read_header(parser, &parser->shader_version); - return VKD3D_OK; -} - static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) { shader_sm4_free(parser); - free_shader_desc(&parser->shader_desc); } static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info, @@ -939,7 +913,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info; struct vkd3d_shader_instruction instruction; struct vkd3d_shader_scan_context context; - struct vkd3d_shader_parser parser; + struct vkd3d_shader_parser *parser; int ret; if ((scan_descriptor_info = vkd3d_find_struct(compile_info->next, SCAN_DESCRIPTOR_INFO))) @@ -950,7 +924,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, vkd3d_shader_scan_context_init(&context, compile_info, scan_descriptor_info, message_context); - if ((ret = vkd3d_shader_parser_init(&parser, compile_info, message_context)) < 0) + if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) { vkd3d_shader_scan_context_cleanup(&context); return ret; @@ -958,13 +932,13 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, if (TRACE_ON()) { - vkd3d_shader_trace(&parser); - shader_sm4_reset(&parser); + vkd3d_shader_trace(parser); + shader_sm4_reset(parser); } - while (!shader_sm4_is_end(&parser)) + while (!shader_sm4_is_end(parser)) { - shader_sm4_read_instruction(&parser, &instruction); + shader_sm4_read_instruction(parser, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { @@ -987,7 +961,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, done: vkd3d_shader_scan_context_cleanup(&context); - vkd3d_shader_parser_destroy(&parser); + vkd3d_shader_parser_destroy(parser); return ret; } @@ -1037,7 +1011,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info struct vkd3d_shader_instruction instruction; struct vkd3d_shader_compile_info scan_info; struct vkd3d_dxbc_compiler *spirv_compiler; - struct vkd3d_shader_parser parser; + struct vkd3d_shader_parser *parser; int ret; scan_info = *compile_info; @@ -1048,19 +1022,19 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if ((ret = scan_dxbc(&scan_info, message_context)) < 0) return ret; - if ((ret = vkd3d_shader_parser_init(&parser, compile_info, message_context)) < 0) + if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) { vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; } - vkd3d_shader_dump_shader(compile_info->source_type, parser.shader_version.type, &compile_info->source); + vkd3d_shader_dump_shader(compile_info->source_type, parser->shader_version.type, &compile_info->source); if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - ret = vkd3d_dxbc_binary_to_text(&parser, compile_info, out); - vkd3d_shader_parser_destroy(&parser); + ret = vkd3d_dxbc_binary_to_text(parser, compile_info, out); + vkd3d_shader_parser_destroy(parser); return ret; } @@ -1068,34 +1042,34 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info { struct vkd3d_glsl_generator *glsl_generator; - if (!(glsl_generator = vkd3d_glsl_generator_create(&parser.shader_version, compile_info, message_context))) + if (!(glsl_generator = vkd3d_glsl_generator_create(&parser->shader_version, compile_info, message_context))) { ERR("Failed to create GLSL generator.\n"); - vkd3d_shader_parser_destroy(&parser); + vkd3d_shader_parser_destroy(parser); vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return VKD3D_ERROR; } - ret = vkd3d_glsl_generator_generate(glsl_generator, &parser, out); + ret = vkd3d_glsl_generator_generate(glsl_generator, parser, out); vkd3d_glsl_generator_destroy(glsl_generator); - vkd3d_shader_parser_destroy(&parser); + vkd3d_shader_parser_destroy(parser); vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; } - if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compile_info, &scan_descriptor_info, message_context))) + if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser->shader_version, + &parser->shader_desc, compile_info, &scan_descriptor_info, message_context))) { ERR("Failed to create DXBC compiler.\n"); - vkd3d_shader_parser_destroy(&parser); + vkd3d_shader_parser_destroy(parser); vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return VKD3D_ERROR; } - while (!shader_sm4_is_end(&parser)) + while (!shader_sm4_is_end(parser)) { - shader_sm4_read_instruction(&parser, &instruction); + shader_sm4_read_instruction(parser, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { @@ -1112,7 +1086,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, compile_info, out); vkd3d_dxbc_compiler_destroy(spirv_compiler); - vkd3d_shader_parser_destroy(&parser); + vkd3d_shader_parser_destroy(parser); vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8b3e7624..0ac5ecef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -891,7 +891,6 @@ struct vkd3d_shader_parser { struct vkd3d_shader_desc shader_desc; struct vkd3d_shader_version shader_version; - void *data; const uint32_t *ptr; }; @@ -901,8 +900,6 @@ const char *shader_get_type_prefix(enum vkd3d_shader_type type); struct vkd3d_shader_message_context; -void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context); void shader_sm4_free(struct vkd3d_shader_parser *parser); void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins); @@ -1001,6 +998,9 @@ void vkd3d_shader_trace_text_(const char *text, size_t size, const char *functio #define vkd3d_shader_trace_text(text, size) \ vkd3d_shader_trace_text_(text, size, __FUNCTION__) +int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser); + int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc); void free_shader_desc(struct vkd3d_shader_desc *desc); -- 2.20.1

1 0

[PATCH 3/3] makedep: Don't use -fno-builtin for importlibs.
by Jacek Caban 01 Oct '21

01 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- While not very important, the original check was mostly for msvcrt importlibs. We disable builtins for entire crt modules anyway and other importlibs should be fine with builtins enabled. tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[v4 PATCH vkd3d 1/2] vkd3d-shader: Don't resize the buffer when there is enough free space.
by Matteo Bruni 01 Oct '21

01 Oct '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Handle rc < 0 case, use vkd3d_array_reserve(). v3: Fully make use of vkd3d_array_reserve() (thanks Henri). v4: Make buffer_size and content_size size_t. libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e38261b4..baf25612 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,20 +41,14 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = buffer->buffer_size * 2; - char *new_buffer; + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(buffer->buffer_size * 2, 32); - new_buffer_size = max(new_buffer_size, 32); - while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) - new_buffer_size *= 2; - if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) + if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; return false; } - buffer->buffer = new_buffer; - buffer->buffer_size = new_buffer_size; return true; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8b3e7624..fa56ba1d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -912,8 +912,7 @@ void shader_sm4_reset(struct vkd3d_shader_parser *parser); struct vkd3d_string_buffer { char *buffer; - unsigned int buffer_size; - unsigned int content_size; + size_t buffer_size, content_size; }; struct vkd3d_string_buffer_cache -- 2.26.3

2 3

[PATCH vkd3d v2 1/6] vkd3d-shader/hlsl: Parse state blocks in variable definitions.
by Zebediah Figura 01 Oct '21

01 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl.y | 54 ++++++- tests/hlsl-state-block-syntax.shader_test | 173 ++++++++++++++++++++++ 4 files changed, 223 insertions(+), 7 deletions(-) create mode 100644 tests/hlsl-state-block-syntax.shader_test diff --git a/Makefile.am b/Makefile.am index 4a2bf8e18..bc33e0f60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,6 +74,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ + tests/hlsl-state-block-syntax.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 27afeedd4..abc870f4f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -469,6 +469,8 @@ struct hlsl_ctx size_t count, size; } constant_defs; uint32_t temp_count; + + uint32_t in_state_block : 1; }; enum hlsl_error_level diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 19745e725..8ad892f9e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2558,6 +2558,23 @@ variable_decl: $$->reg_reservation = $3.reg_reservation; } +state: + any_identifier '=' expr ';' + { + vkd3d_free($1); + hlsl_free_instr_list($3); + } + +state_block_start: + %empty + { + ctx->in_state_block = 1; + } + +state_block: + %empty + | state_block state + variable_def: variable_decl | variable_decl '=' complex_initializer @@ -2565,6 +2582,11 @@ variable_def: $$ = $1; $$->initializer = $3; } + | variable_decl '{' state_block_start state_block '}' + { + $$ = $1; + ctx->in_state_block = 0; + } arrays: %empty @@ -2861,13 +2883,10 @@ primary_expr: hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Variable \"%s\" is not defined.", $1); YYABORT; } - if ((load = hlsl_new_var_load(ctx, var, @1))) - { - if (!($$ = make_list(ctx, &load->node))) - YYABORT; - } - else - $$ = NULL; + if (!(load = hlsl_new_var_load(ctx, var, @1))) + YYABORT; + if (!($$ = make_list(ctx, &load->node))) + YYABORT; } | '(' expr ')' { @@ -2878,6 +2897,27 @@ primary_expr: if (!($$ = add_call(ctx, $1, &$3, @1))) YYABORT; } + | NEW_IDENTIFIER + { + if (ctx->in_state_block) + { + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + + if (!(var = hlsl_new_synthetic_var(ctx, "<state-block-expr>", + ctx->builtin_types.scalar[HLSL_TYPE_INT], @1))) + YYABORT; + if (!(load = hlsl_new_var_load(ctx, var, @1))) + YYABORT; + if (!($$ = make_list(ctx, &load->node))) + YYABORT; + } + else + { + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Identifier \"%s\" is not declared.\n", $1); + YYABORT; + } + } postfix_expr: primary_expr diff --git a/tests/hlsl-state-block-syntax.shader_test b/tests/hlsl-state-block-syntax.shader_test new file mode 100644 index 000000000..26853bf40 --- /dev/null +++ b/tests/hlsl-state-block-syntax.shader_test @@ -0,0 +1,173 @@ +[pixel shader fail] +sampler s +{ + foo = float; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s = sampler_state +{ + foo = float; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s +{ + 2 = 3; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s +{ + 2; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s +{ + foo; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s +{ + foo = bar +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s {} + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f {} = 1; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f = 1 {}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +sampler s = sampler_state; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f {} : register(c1); + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f +{ + foo = (sampler)2; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f +{ + foo = (faketype)2; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f +{ + foo = (sampler)bar; +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float f +{ + foo = bar(); +}; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader] +float u : register(c1) {}; +float4 main() : sv_target +{ + float zero = 0; + float a {}; + float b + { + foo = bar; + foo = bar; + foo = (int)2; + foo = (int)bar; + foo = float4(bar, baz, qux, xyzzy); + foo = zero++; + }; + float c {}, d = 1, e; + struct {int a;} s {foo = bar;}; + return float4(0, 1, zero, 1); +} + +[test] +draw quad +probe all rgba (0, 1, 0, 1) -- 2.33.0

4 23

[PATCH 2/3] makedep: Use -fno-builtin for CRT DLLs on PE targets.
by Jacek Caban 01 Oct '21

01 Oct '21

Just like we do for other targets with cross compiler enabled. Fixes PE-only i686 build with llvm-mingw, which otherwise uses unexpected optimizations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH vkd3d 1/2] tests: Add tests for output merger logic ops.
by Conor McCarthy 01 Oct '21

01 Oct '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 89b1f000..972ec766 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -673,6 +673,21 @@ static bool is_shader_float64_supported(ID3D12Device *device) return options.DoublePrecisionFloatShaderOps; } +static bool is_output_merger_logic_op_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return false; + } + + return options.OutputMergerLogicOp; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -30895,6 +30910,128 @@ static void test_dual_source_blending(void) destroy_test_context(&context); } +static void test_output_merger_logic_op(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + ID3D12PipelineState *logic_pso; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + unsigned int i, do_test; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint4 c0; + + void main(const in float4 position : SV_Position, out uint4 target : SV_Target0) + { + target = c0; + } +#endif + 0x43425844, 0xb1d5d133, 0xbd9958bf, 0xe4a12856, 0x0197481b, 0x00000001, 0x000000e0, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, + 0x00000011, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const uint32_t clear_values[4] = {0xffffffff, 0x00000000, 0xffffffff, 0x00000000}; + static const uint32_t test_values[4] = {0xffffffff, 0xffffffff, 0x00000000, 0x00000000}; + static const struct + { + D3D12_LOGIC_OP logic_op; + unsigned int expected_colour; + } + tests[] = + { + {D3D12_LOGIC_OP_CLEAR, 0x00000000}, + {D3D12_LOGIC_OP_SET, 0xffffffff}, + {D3D12_LOGIC_OP_COPY, 0x0000ffff}, + {D3D12_LOGIC_OP_COPY_INVERTED, 0xffff0000}, + {D3D12_LOGIC_OP_NOOP, 0x00ff00ff}, + {D3D12_LOGIC_OP_INVERT, 0xff00ff00}, + {D3D12_LOGIC_OP_AND, 0x000000ff}, + {D3D12_LOGIC_OP_NAND, 0xffffff00}, + {D3D12_LOGIC_OP_OR, 0x00ffffff}, + {D3D12_LOGIC_OP_NOR, 0xff000000}, + {D3D12_LOGIC_OP_XOR, 0x00ffff00}, + {D3D12_LOGIC_OP_EQUIV, 0xff0000ff}, + {D3D12_LOGIC_OP_AND_REVERSE, 0x0000ff00}, + {D3D12_LOGIC_OP_AND_INVERTED, 0x00ff0000}, + {D3D12_LOGIC_OP_OR_REVERSE, 0xff00ffff}, + {D3D12_LOGIC_OP_OR_INVERTED, 0xffff00ff}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + desc.ps = &ps; + desc.rt_format = DXGI_FORMAT_R8G8B8A8_UINT; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + if (!is_output_merger_logic_op_supported(context.device)) + { + skip("The device does not support output merger logic ops.\n"); + destroy_test_context(&context); + return; + } + + context.root_signature = create_32bit_constants_root_signature(context.device, + 0, sizeof(clear_values) / sizeof(uint32_t), D3D12_SHADER_VISIBILITY_PIXEL); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, &ps, NULL); + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + pso_desc.BlendState.RenderTarget[0].LogicOpEnable = true; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + pso_desc.BlendState.RenderTarget[0].LogicOp = tests[i].logic_op; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&logic_pso); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + for (do_test = 0; do_test < 2; ++do_test) + { + vkd3d_test_set_context(do_test ? "Test %u" : "Clear %u", i); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, do_test ? logic_pso : context.pipeline_state); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, + do_test ? test_values : clear_values, 0); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + todo_if(do_test && tests[i].logic_op != D3D12_LOGIC_OP_COPY) + check_sub_resource_uint(context.render_target, 0, queue, command_list, + do_test ? tests[i].expected_colour : 0x00ff00ff, 1); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12PipelineState_Release(logic_pso); + } + vkd3d_test_set_context(NULL); + + destroy_test_context(&context); +} + static void test_multisample_rendering(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -35273,6 +35410,7 @@ START_TEST(d3d12) run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor); run_test(test_dual_source_blending); + run_test(test_output_merger_logic_op); run_test(test_multisample_rendering); run_test(test_sample_mask); run_test(test_coverage); -- 2.32.0

1 1

[PATCH 2/4] nsiproxy: Use str(n)casecmp() instead of _strnicmp().
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 22 +++++++++++----------- dlls/nsiproxy.sys/ndis.c | 2 +- dlls/nsiproxy.sys/tcp.c | 4 ++-- dlls/nsiproxy.sys/udp.c | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 12fae3f2f12..aabf82d4d86 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -261,10 +261,10 @@ static NTSTATUS ipv4_icmpstats_get_all_parameters( const void *key, DWORD key_si while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -427,13 +427,13 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si while (*value == ' ') value++; if ((ptr = strchr( value, '\n' ))) *ptr='\0'; - if (!_strnicmp( buf, "Icmp6InMsgs", -1 )) + if (!strcasecmp( buf, "Icmp6InMsgs" )) { if (sscanf( value, "%d", &res )) dyn.in_msgs = res; continue; } - if (!_strnicmp( buf, "Icmp6InErrors", -1 )) + if (!strcasecmp( buf, "Icmp6InErrors" )) { if (sscanf( value, "%d", &res )) dyn.in_errors = res; continue; @@ -441,7 +441,7 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si for (i = 0; i < ARRAY_SIZE(in_list); i++) { - if (!_strnicmp( buf, in_list[i].name, -1 )) + if (!strcasecmp( buf, in_list[i].name )) { if (sscanf( value, "%d", &res )) dyn.in_type_counts[in_list[i].pos] = res; @@ -449,13 +449,13 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si } } - if (!_strnicmp( buf, "Icmp6OutMsgs", -1 )) + if (!strcasecmp( buf, "Icmp6OutMsgs" )) { if (sscanf( value, "%d", &res )) dyn.out_msgs = res; continue; } - if (!_strnicmp( buf, "Icmp6OutErrors", -1 )) + if (!strcasecmp( buf, "Icmp6OutErrors" )) { if (sscanf( value, "%d", &res )) dyn.out_errors = res; continue; @@ -463,7 +463,7 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si for (i = 0; i < ARRAY_SIZE(out_list); i++) { - if (!_strnicmp( buf, out_list[i].name, -1 )) + if (!strcasecmp( buf, out_list[i].name )) { if (sscanf( value, "%d", &res )) dyn.out_type_counts[out_list[i].pos] = res; @@ -504,10 +504,10 @@ static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { DWORD in_recv, in_hdr_errs, fwd_dgrams, in_delivers, out_reqs; ptr += sizeof(hdr); @@ -643,7 +643,7 @@ static NTSTATUS ipv6_ipstats_get_all_parameters( const void *key, DWORD key_size if ((ptr = strchr( value, '\n' ))) *ptr = '\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!_strnicmp( buf, ipstatlist[i].name, -1 )) + if (!strcasecmp( buf, ipstatlist[i].name )) { if (ipstatlist[i].size == sizeof(long)) *(long *)ipstatlist[i].elem = strtoul( value, NULL, 10 ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 1d0e69c593c..d75855dcf67 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -354,7 +354,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ while ((ptr = fgets( buf, sizeof(buf), fp ))) { while (*ptr && isspace( *ptr )) ptr++; - if (!_strnicmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') + if (!strncasecmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') { unsigned long long values[9]; ptr += name_len + 1; diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index f9ddf1a2b23..32939251dbe 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -147,10 +147,10 @@ static NTSTATUS tcp_stats_get_all_parameters( const void *key, DWORD key_size, v while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { DWORD in_segs, out_segs; ptr += sizeof(hdr); diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index a0ace071753..efd18392a45 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -123,10 +123,10 @@ static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, v while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1) ) continue; + if (strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) + if (!strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { unsigned int in_dgrams, out_dgrams; ptr += sizeof(hdr); @@ -176,7 +176,7 @@ static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, v if ((ptr = strchr( value, '\n' ))) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udp_stat_list); i++) - if (!_strnicmp( buf, udp_stat_list[i].name, -1 ) && sscanf( value, "%d", &res )) + if (!strcasecmp( buf, udp_stat_list[i].name ) && sscanf( value, "%d", &res )) *udp_stat_list[i].elem = res; } dyn.in_dgrams = in_dgrams; -- 2.25.1

2 2

[PATCH v2 4/4] nsiproxy: Build with msvcrt.
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 5 +++-- dlls/nsiproxy.sys/device.c | 30 ++++++++++++++++++++++++++---- dlls/nsiproxy.sys/ip.c | 6 ++++++ dlls/nsiproxy.sys/ndis.c | 9 +++++++-- dlls/nsiproxy.sys/nsi.c | 30 ++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/tcp.c | 4 ++++ dlls/nsiproxy.sys/udp.c | 4 ++++ 7 files changed, 80 insertions(+), 8 deletions(-) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index b33ea0e4c8a..95f2a205816 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,8 +1,9 @@ MODULE = nsiproxy.sys -IMPORTS = ntoskrnl uuid +UNIXLIB = nsiproxy.so +IMPORTS = ntoskrnl EXTRALIBS = $(PROCSTAT_LIBS) -EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ device.c \ diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 80a025acfc9..ee2feec96be 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -32,10 +32,24 @@ #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" -#include "nsiproxy_private.h" +#include "wine/unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static unixlib_handle_t nsiproxy_handle; + +static NTSTATUS nsiproxy_call( unsigned int code, void *args ) +{ + return __wine_unix_call( nsiproxy_handle, code, args ); +} + +enum unix_calls +{ + nsi_enumerate_all_ex, + nsi_get_all_parameters_ex, + nsi_get_parameter_ex, +}; + static void nsiproxy_enumerate_all( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -73,7 +87,7 @@ static void nsiproxy_enumerate_all( IRP *irp ) enum_all.static_size = in->static_size; enum_all.count = in->count; - irp->IoStatus.u.Status = nsi_enumerate_all_ex( &enum_all ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_enumerate_all_ex, &enum_all ); if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_BUFFER_OVERFLOW) { irp->IoStatus.Information = out_len; @@ -119,7 +133,7 @@ static void nsiproxy_get_all_parameters( IRP *irp ) get_all.static_data = out + in->rw_size + in->dynamic_size; get_all.static_size = in->static_size; - irp->IoStatus.u.Status = nsi_get_all_parameters_ex( &get_all ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_get_all_parameters_ex, &get_all ); irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; } @@ -152,7 +166,7 @@ static void nsiproxy_get_parameter( IRP *irp ) get_param.data_size = out_len; get_param.data_offset = in->data_offset; - irp->IoStatus.u.Status = nsi_get_parameter_ex( &get_param ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_get_parameter_ex, &get_param ); irp->IoStatus.Information = irp->IoStatus.u.Status == STATUS_SUCCESS ? out_len : 0; } @@ -215,8 +229,16 @@ static int add_device( DRIVER_OBJECT *driver ) NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { + HMODULE instance; + NTSTATUS status; + TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); + RtlPcToFileHeader( &DriverEntry, (void *)&instance ); + status = NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, + &nsiproxy_handle, sizeof(nsiproxy_handle), NULL ); + if (status) return status; + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = nsi_ioctl; add_device( driver ); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 90ea7957204..2e69c289c16 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -18,6 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + +#define _NTSYSTEM_ + #include "config.h" #include <stdarg.h> diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 90112da31bb..8971b69c2db 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -18,6 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> @@ -85,6 +89,7 @@ #include "wine/nsi.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/unixlib.h" #include "nsiproxy_private.h" @@ -251,9 +256,9 @@ static WCHAR *strdupAtoW( const char *str ) DWORD len; if (!str) return ret; - len = MultiByteToWideChar( CP_UNIXCP, 0, str, -1, NULL, 0 ); + len = strlen( str ) + 1; ret = malloc( len * sizeof(WCHAR) ); - if (ret) MultiByteToWideChar( CP_UNIXCP, 0, str, -1, ret, len ); + if (ret) ntdll_umbstowcs( str, len, ret, len ); return ret; } diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index e29446abb50..ccfc325a085 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> @@ -28,9 +31,11 @@ #include "winioctl.h" #include "ddk/wdm.h" #include "ifdef.h" +#define __WINE_INIT_NPI_MODULEID #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" +#include "wine/unixlib.h" #include "nsiproxy_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); @@ -121,3 +126,28 @@ NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) return entry->get_parameter( params->key, params->key_size, params->param_type, params->data, params->data_size, params->data_offset ); } + +static NTSTATUS unix_nsi_enumerate_all_ex( void *args ) +{ + struct nsi_enumerate_all_ex *params = (struct nsi_enumerate_all_ex *)args; + return nsi_enumerate_all_ex( params ); +} + +static NTSTATUS unix_nsi_get_all_parameters_ex( void *args ) +{ + struct nsi_get_all_parameters_ex *params = (struct nsi_get_all_parameters_ex *)args; + return nsi_get_all_parameters_ex( params ); +} + +static NTSTATUS unix_nsi_get_parameter_ex( void *args ) +{ + struct nsi_get_parameter_ex *params = (struct nsi_get_parameter_ex *)args; + return nsi_get_parameter_ex( params ); +} + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + unix_nsi_enumerate_all_ex, + unix_nsi_get_all_parameters_ex, + unix_nsi_get_parameter_ex +}; diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index b60e53ea15e..55311a4affc 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -19,6 +19,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index f25aac98ba0..0cc2cadbc98 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -18,6 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> #include <stddef.h> -- 2.25.1

1 0

[PATCH v2 3/4] nsiproxy: Switch memory allocations to malloc().
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 13 ++++++------- dlls/nsiproxy.sys/ndis.c | 11 +++++------ dlls/nsiproxy.sys/tcp.c | 33 ++++++++++++++++----------------- dlls/nsiproxy.sys/udp.c | 9 ++++----- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 7308e4a687e..90ea7957204 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -94,7 +94,6 @@ #include "ifdef.h" #include "ipmib.h" #include "netiodef.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" @@ -933,12 +932,12 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) return STATUS_NO_MEMORY; if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) { - heap_free( buf ); + free( buf ); return STATUS_NOT_SUPPORTED; } @@ -982,7 +981,7 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo } next += rtm->rtm_msglen; } - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -1122,12 +1121,12 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) < 0) return STATUS_NOT_SUPPORTED; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) return STATUS_NO_MEMORY; if (sysctl( mib, 6, buf, &needed, NULL, 0 ) < 0) { - heap_free( buf ); + free( buf ); return STATUS_NOT_SUPPORTED; } @@ -1225,7 +1224,7 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void } num++; } - HeapFree( GetProcessHeap (), 0, buf ); + free( buf ); } #else FIXME( "not implemented\n" ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index b46b53b536c..90112da31bb 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -84,7 +84,6 @@ #include "ddk/wdm.h" #include "wine/nsi.h" #include "wine/list.h" -#include "wine/heap.h" #include "wine/debug.h" #include "nsiproxy_private.h" @@ -253,7 +252,7 @@ static WCHAR *strdupAtoW( const char *str ) if (!str) return ret; len = MultiByteToWideChar( CP_UNIXCP, 0, str, -1, NULL, 0 ); - ret = heap_alloc( len * sizeof(WCHAR) ); + ret = malloc( len * sizeof(WCHAR) ); if (ret) MultiByteToWideChar( CP_UNIXCP, 0, str, -1, ret, len ); return ret; } @@ -264,7 +263,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) int name_len = strlen( name ); if (name_len >= IFNAMSIZ - 1) return NULL; - entry = heap_alloc( sizeof(*entry) ); + entry = malloc( sizeof(*entry) ); if (!entry) return NULL; entry->if_index = index; @@ -272,7 +271,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) entry->if_name = strdupAtoW( name ); if (!entry->if_name) { - heap_free( entry ); + free( entry ); return NULL; } @@ -385,7 +384,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ struct if_data ifdata; if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) goto done; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) goto done; if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) goto done; for (end = buf + needed; buf < end; buf += ifm->ifm_msglen) @@ -408,7 +407,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ } } done: - heap_free( buf ); + free( buf ); } #endif } diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 6b431e93c8e..b60e53ea15e 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -97,7 +97,6 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "tcpmib.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "wine/server.h" @@ -269,7 +268,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = heap_realloc( table, table_size * sizeof(table[0]) ))) + if (!(table = realloc( table, table_size * sizeof(table[0]) ))) { fclose( fp ); goto failed; @@ -301,7 +300,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = heap_realloc( table, table_size * sizeof(table[0]) ))) + if (!(table = realloc( table, table_size * sizeof(table[0]) ))) { freeifaddrs( addrs ); goto failed; @@ -325,7 +324,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) return table; failed: - heap_free( table ); + free( table ); return NULL; } @@ -356,7 +355,7 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) NTSTATUS ret; char *buffer = NULL, *new_buffer; - if (!(buffer = heap_alloc( buffer_len ))) return NULL; + if (!(buffer = malloc( buffer_len ))) return NULL; for (;;) { @@ -371,17 +370,17 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) if (ret != STATUS_INFO_LENGTH_MISMATCH) break; - if (!(new_buffer = heap_realloc( buffer, buffer_len ))) + if (!(new_buffer = realloc( buffer, buffer_len ))) { - heap_free( buffer ); + free( buffer ); return NULL; } buffer = new_buffer; } - if (!(map = heap_alloc( process_count * sizeof(*map) ))) + if (!(map = malloc( process_count * sizeof(*map) ))) { - heap_free( buffer ); + free( buffer ); return NULL; } @@ -400,7 +399,7 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) pos += process->thread_count * sizeof(struct thread_info); } - heap_free( buffer ); + free( buffer ); *num_entries = process_count; return map; } @@ -495,7 +494,7 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN int fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); if (fd_len <= 0) continue; - fds = heap_alloc( fd_len ); + fds = malloc( fd_len ); if (!fds) continue; proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, fds, fd_len ); @@ -507,12 +506,12 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN proc_pidfdinfo( map[i].unix_pid, fds[j].proc_fd, PROC_PIDFDSOCKETINFO, &sock, sizeof(sock) ); if (sock.psi.soi_pcb == inode) { - heap_free( fds ); + free( fds ); return map[i].pid; } } - heap_free( fds ); + free( fds ); } return 0; #else @@ -638,7 +637,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * goto err; } - buf = heap_alloc( len ); + buf = malloc( len ); if (!buf) { status = STATUS_NO_MEMORY; @@ -728,7 +727,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * num++; } err: - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -738,8 +737,8 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; - heap_free( pid_map ); - heap_free( addr_scopes ); + free( pid_map ); + free( addr_scopes ); return status; } diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index c2dcc2c38e8..f25aac98ba0 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -77,7 +77,6 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "udpmib.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "wine/server.h" @@ -309,7 +308,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void goto err; } - buf = heap_alloc( len ); + buf = malloc( len ); if (!buf) { status = STATUS_NO_MEMORY; @@ -386,7 +385,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void num++; } err: - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -396,8 +395,8 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; - heap_free( pid_map ); - heap_free( addr_scopes ); + free( pid_map ); + free( addr_scopes ); return status; } -- 2.25.1

1 0

[PATCH v2 2/4] nsiproxy: Use an ascii version of str(n)casecmp() instead of _strnicmp().
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 22 +++++++++++----------- dlls/nsiproxy.sys/ndis.c | 2 +- dlls/nsiproxy.sys/nsiproxy_private.h | 21 +++++++++++++++++++++ dlls/nsiproxy.sys/tcp.c | 4 ++-- dlls/nsiproxy.sys/udp.c | 6 +++--- 5 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 12fae3f2f12..7308e4a687e 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -261,10 +261,10 @@ static NTSTATUS ipv4_icmpstats_get_all_parameters( const void *key, DWORD key_si while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -427,13 +427,13 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si while (*value == ' ') value++; if ((ptr = strchr( value, '\n' ))) *ptr='\0'; - if (!_strnicmp( buf, "Icmp6InMsgs", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6InMsgs" )) { if (sscanf( value, "%d", &res )) dyn.in_msgs = res; continue; } - if (!_strnicmp( buf, "Icmp6InErrors", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6InErrors" )) { if (sscanf( value, "%d", &res )) dyn.in_errors = res; continue; @@ -441,7 +441,7 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si for (i = 0; i < ARRAY_SIZE(in_list); i++) { - if (!_strnicmp( buf, in_list[i].name, -1 )) + if (!ascii_strcasecmp( buf, in_list[i].name )) { if (sscanf( value, "%d", &res )) dyn.in_type_counts[in_list[i].pos] = res; @@ -449,13 +449,13 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si } } - if (!_strnicmp( buf, "Icmp6OutMsgs", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6OutMsgs" )) { if (sscanf( value, "%d", &res )) dyn.out_msgs = res; continue; } - if (!_strnicmp( buf, "Icmp6OutErrors", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6OutErrors" )) { if (sscanf( value, "%d", &res )) dyn.out_errors = res; continue; @@ -463,7 +463,7 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si for (i = 0; i < ARRAY_SIZE(out_list); i++) { - if (!_strnicmp( buf, out_list[i].name, -1 )) + if (!ascii_strcasecmp( buf, out_list[i].name )) { if (sscanf( value, "%d", &res )) dyn.out_type_counts[out_list[i].pos] = res; @@ -504,10 +504,10 @@ static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { DWORD in_recv, in_hdr_errs, fwd_dgrams, in_delivers, out_reqs; ptr += sizeof(hdr); @@ -643,7 +643,7 @@ static NTSTATUS ipv6_ipstats_get_all_parameters( const void *key, DWORD key_size if ((ptr = strchr( value, '\n' ))) *ptr = '\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!_strnicmp( buf, ipstatlist[i].name, -1 )) + if (!ascii_strcasecmp( buf, ipstatlist[i].name )) { if (ipstatlist[i].size == sizeof(long)) *(long *)ipstatlist[i].elem = strtoul( value, NULL, 10 ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 1d0e69c593c..b46b53b536c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -354,7 +354,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ while ((ptr = fgets( buf, sizeof(buf), fp ))) { while (*ptr && isspace( *ptr )) ptr++; - if (!_strnicmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') + if (!ascii_strncasecmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') { unsigned long long values[9]; ptr += name_len + 1; diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 7dd8748e3f7..acc60ce4806 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -135,3 +135,24 @@ extern const struct module ipv4_module DECLSPEC_HIDDEN; extern const struct module ipv6_module DECLSPEC_HIDDEN; extern const struct module tcp_module DECLSPEC_HIDDEN; extern const struct module udp_module DECLSPEC_HIDDEN; + +static inline int ascii_strncasecmp( const char *s1, const char *s2, size_t n ) +{ + int l1, l2; + + while (n--) + { + l1 = (unsigned char)((*s1 >= 'A' && *s1 <= 'Z') ? *s1 + ('a' - 'A') : *s1); + l2 = (unsigned char)((*s2 >= 'A' && *s2 <= 'Z') ? *s2 + ('a' - 'A') : *s2); + if (l1 != l2) return l1 - l2; + if (!l1) return 0; + s1++; + s2++; + } + return 0; +} + +static inline int ascii_strcasecmp( const char *s1, const char *s2 ) +{ + return ascii_strncasecmp( s1, s2, -1 ); +} diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index f9ddf1a2b23..6b431e93c8e 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -147,10 +147,10 @@ static NTSTATUS tcp_stats_get_all_parameters( const void *key, DWORD key_size, v while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { DWORD in_segs, out_segs; ptr += sizeof(hdr); diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index a0ace071753..c2dcc2c38e8 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -123,10 +123,10 @@ static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, v while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1) ) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { unsigned int in_dgrams, out_dgrams; ptr += sizeof(hdr); @@ -176,7 +176,7 @@ static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, v if ((ptr = strchr( value, '\n' ))) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udp_stat_list); i++) - if (!_strnicmp( buf, udp_stat_list[i].name, -1 ) && sscanf( value, "%d", &res )) + if (!ascii_strcasecmp( buf, udp_stat_list[i].name ) && sscanf( value, "%d", &res )) *udp_stat_list[i].elem = res; } dyn.in_dgrams = in_dgrams; -- 2.25.1

1 0

[PATCH v2 1/4] nsiproxy: Use a pthread_mutex to guard the interface list.
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ndis.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index bf237ea16db..1d0e69c593c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -66,6 +66,8 @@ #include <net/if_types.h> #endif +#include <pthread.h> + #define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS @@ -102,15 +104,7 @@ struct if_entry }; static struct list if_list = LIST_INIT( if_list ); - -static CRITICAL_SECTION if_list_cs; -static CRITICAL_SECTION_DEBUG if_list_cs_debug = -{ - 0, 0, &if_list_cs, - { &if_list_cs_debug.ProcessLocksList, &if_list_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": if_list_cs") } -}; -static CRITICAL_SECTION if_list_cs = { &if_list_cs_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t if_list_lock = PTHREAD_MUTEX_INITIALIZER; static struct if_entry *find_entry_from_index( DWORD index ) { @@ -468,7 +462,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -485,7 +479,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d num++; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; @@ -503,7 +497,7 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -514,7 +508,7 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void status = STATUS_SUCCESS; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -565,7 +559,7 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -583,7 +577,7 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par } } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -599,7 +593,7 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD if (param_type != NSI_PARAM_TYPE_STATIC || data_size != sizeof(NET_LUID) || data_offset != 0) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -609,7 +603,7 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD *(NET_LUID *)data = entry->if_luid; status = STATUS_SUCCESS; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -618,7 +612,7 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) struct if_entry *entry; BOOL ret = FALSE; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -629,7 +623,7 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) ret = TRUE; break; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return ret; } @@ -639,7 +633,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) struct if_entry *entry; BOOL ret = FALSE; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -650,7 +644,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) ret = TRUE; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return ret; } -- 2.25.1

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 01 Oct '21

01 Oct '21

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 222 +++++++++++++++++-------------------------------------- 1 file changed, 66 insertions(+), 156 deletions(-) diff --git a/po/fi.po b/po/fi.po index 6349aa70e7b..05288ee3542 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3702,30 +3702,24 @@ msgid "&Disable" msgstr "&Poista käytöstä" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Nollaa" +msgstr "&Nollaa" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" -msgstr "&Ota käyttöön" +msgstr "&Käytä" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Muokkaa ohitusta" +msgstr "&Ohita" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Yhdistetty" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Äänen sisääntulolaite:" +msgstr "Liitetty (xinput-laite)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -10346,13 +10340,11 @@ msgstr "" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "UTC-aika" +msgstr "(UTC+12:00) Koordinoitu yleisaika +12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10388,7 +10380,7 @@ msgstr "Haitin kesäaika" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) Haiti" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10416,25 +10408,19 @@ msgstr "" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "UTC-aika" +msgstr "(UTC-08:00) Koordinoitu yleisaika -08" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "Atlantin normaaliaika" +msgstr "Altain normaaliaika" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "Atlantin kesäaika" +msgstr "Altain kesäaika" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" @@ -10473,26 +10459,20 @@ msgid "Saint Pierre Daylight Time" msgstr "Saint-Pierren kesäaika" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "Saint-Pierren normaaliaika" +msgstr "(UTC-03:00) Saint-Pierre ja Miquelon" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "Samoan normaaliaika" +msgstr "Sao Tomen normaaliaika" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "Samoan kesäaika" +msgstr "Sao Tomen kesäaika" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) Sao Tome" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10580,13 +10560,11 @@ msgstr "" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "UTC-aika" +msgstr "(UTC+13:00) Koordinoitu yleisaika +13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10613,16 +10591,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "" #: dlls/tzres/tzres.rc:345 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "Jordanian normaaliaika" +msgstr "Sudanin normaaliaika" #: dlls/tzres/tzres.rc:346 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "Jordanian kesäaika" +msgstr "Sudanin kesäaika" #: dlls/tzres/tzres.rc:347 msgid "(UTC+02:00) Khartoum" @@ -10793,16 +10767,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "" #: dlls/tzres/tzres.rc:414 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "Tongan normaaliaika" +msgstr "Volgogradin normaaliaika" #: dlls/tzres/tzres.rc:415 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "Tongan kesäaika" +msgstr "Volgogradin kesäaika" #: dlls/tzres/tzres.rc:416 msgid "(UTC+04:00) Volgograd" @@ -10834,13 +10804,11 @@ msgstr "" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "UTC-aika" +msgstr "(UTC-11:00) Koordinoitu yleisaika -11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -10855,20 +10823,16 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "" #: dlls/tzres/tzres.rc:375 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "Turkin normaaliaika" +msgstr "Turks- ja Caicossaarten normaaliaika" #: dlls/tzres/tzres.rc:376 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "Turkin kesäaika" +msgstr "Turks- ja Caicossaarten kesäaika" #: dlls/tzres/tzres.rc:377 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Turks- ja Caicossaaret" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -10896,13 +10860,11 @@ msgstr "" #: dlls/tzres/tzres.rc:387 dlls/tzres/tzres.rc:388 msgid "Coordinated Universal Time" -msgstr "UTC-aika" +msgstr "Koordinoitu yleisaika" #: dlls/tzres/tzres.rc:389 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "UTC-aika" +msgstr "(UTC) Koordinoitu yleisaika" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -10941,20 +10903,16 @@ msgid "(UTC+03:00) Istanbul" msgstr "" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "Arabian normaaliaika" +msgstr "Astrahanin normaaliaika" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "Arabian kesäaika" +msgstr "Astrahanin kesäaika" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) Astrahan, Uljanovsk" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -10966,7 +10924,7 @@ msgstr "Fidžin kesäaika" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) Fidži" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -10981,20 +10939,16 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "" #: dlls/tzres/tzres.rc:441 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "Jakutskin normaaliaika" +msgstr "Yukonin normaaliaika" #: dlls/tzres/tzres.rc:442 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "Jakutskin kesäaika" +msgstr "Yukonin kesäaika" #: dlls/tzres/tzres.rc:443 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:351 msgid "Taipei Standard Time" @@ -11045,20 +10999,16 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "" #: dlls/tzres/tzres.rc:363 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "Tokion normaaliaika" +msgstr "Tomskin normaaliaika" #: dlls/tzres/tzres.rc:364 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "Tokion kesäaika" +msgstr "Tomskin kesäaika" #: dlls/tzres/tzres.rc:365 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11070,7 +11020,7 @@ msgstr "Kaukasuksen kesäaika" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) Jerevan" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11109,32 +11059,24 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "" #: dlls/tzres/tzres.rc:369 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "Tasmanian normaaliaika" +msgstr "Taka-Baikalian normaaliaika" #: dlls/tzres/tzres.rc:370 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "Tasmanian kesäaika" +msgstr "Taka-Baikalian kesäaika" #: dlls/tzres/tzres.rc:371 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) Tšita" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "Länsi-Euroopan normaaliaika" +msgstr "Itä-Euroopan normaaliaika" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "Länsi-Euroopan kesäaika" +msgstr "Itä-Euroopan kesäaika" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" @@ -11153,16 +11095,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "Samoan normaaliaika" +msgstr "Saratovin normaaliaika" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "Samoan kesäaika" +msgstr "Saratovin kesäaika" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" @@ -11205,20 +11143,16 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "Alaskan normaaliaika" +msgstr "Sahalinin normaaliaika" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "Alaskan kesäaika" +msgstr "Sahalinin kesäaika" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) Sahalin" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11258,13 +11192,11 @@ msgstr "" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "UTC-aika" +msgstr "(UTC-02:00) Koordinoitu yleisaika -02" #: dlls/tzres/tzres.rc:384 msgid "US Mountain Standard Time" @@ -11304,13 +11236,11 @@ msgstr "" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "UTC-aika" +msgstr "(UTC-09:00) Koordinoitu yleisaika -09" #: dlls/tzres/tzres.rc:342 msgid "Sri Lanka Standard Time" @@ -11453,16 +11383,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "" #: dlls/tzres/tzres.rc:432 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "Länsi-Aasian normaaliaika" +msgstr "Länsirannikon normaaliaika" #: dlls/tzres/tzres.rc:433 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "Länsi-Aasian kesäaika" +msgstr "Länsirannikon kesäaika" #: dlls/tzres/tzres.rc:434 msgid "(UTC+02:00) Gaza, Hebron" @@ -11517,20 +11443,16 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "Marokon normaaliaika" +msgstr "Norfolkinsaaren normaaliaika" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "Marokon kesäaika" +msgstr "Norfolkinsaaren kesäaika" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) Norfolkinsaari" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11689,32 +11611,24 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "Jordanian normaaliaika" +msgstr "Qızılordan normaaliaika" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "Jordanian kesäaika" +msgstr "Qızılordan kesäaika" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) Qızılorda" #: dlls/tzres/tzres.rc:426 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "Tongan normaaliaika" +msgstr "Länsi-Mongolian normaaliaika" #: dlls/tzres/tzres.rc:427 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "Tongan kesäaika" +msgstr "Länsi-Mongolian kesäaika" #: dlls/tzres/tzres.rc:428 msgid "(UTC+07:00) Hovd" @@ -11745,20 +11659,16 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "Jakutskin normaaliaika" +msgstr "Omskin normaaliaika" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "Jakutskin kesäaika" +msgstr "Omskin kesäaika" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" -- 2.33.0

1 0

[PATCH 4/4] nsiproxy: Build with msvcrt.
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 5 +++-- dlls/nsiproxy.sys/device.c | 30 ++++++++++++++++++++++++++---- dlls/nsiproxy.sys/ip.c | 6 ++++++ dlls/nsiproxy.sys/ndis.c | 9 +++++++-- dlls/nsiproxy.sys/nsi.c | 30 ++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/tcp.c | 4 ++++ dlls/nsiproxy.sys/udp.c | 4 ++++ 7 files changed, 80 insertions(+), 8 deletions(-) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index b33ea0e4c8a..95f2a205816 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,8 +1,9 @@ MODULE = nsiproxy.sys -IMPORTS = ntoskrnl uuid +UNIXLIB = nsiproxy.so +IMPORTS = ntoskrnl EXTRALIBS = $(PROCSTAT_LIBS) -EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ device.c \ diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 80a025acfc9..ee2feec96be 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -32,10 +32,24 @@ #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" -#include "nsiproxy_private.h" +#include "wine/unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static unixlib_handle_t nsiproxy_handle; + +static NTSTATUS nsiproxy_call( unsigned int code, void *args ) +{ + return __wine_unix_call( nsiproxy_handle, code, args ); +} + +enum unix_calls +{ + nsi_enumerate_all_ex, + nsi_get_all_parameters_ex, + nsi_get_parameter_ex, +}; + static void nsiproxy_enumerate_all( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -73,7 +87,7 @@ static void nsiproxy_enumerate_all( IRP *irp ) enum_all.static_size = in->static_size; enum_all.count = in->count; - irp->IoStatus.u.Status = nsi_enumerate_all_ex( &enum_all ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_enumerate_all_ex, &enum_all ); if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_BUFFER_OVERFLOW) { irp->IoStatus.Information = out_len; @@ -119,7 +133,7 @@ static void nsiproxy_get_all_parameters( IRP *irp ) get_all.static_data = out + in->rw_size + in->dynamic_size; get_all.static_size = in->static_size; - irp->IoStatus.u.Status = nsi_get_all_parameters_ex( &get_all ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_get_all_parameters_ex, &get_all ); irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; } @@ -152,7 +166,7 @@ static void nsiproxy_get_parameter( IRP *irp ) get_param.data_size = out_len; get_param.data_offset = in->data_offset; - irp->IoStatus.u.Status = nsi_get_parameter_ex( &get_param ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_get_parameter_ex, &get_param ); irp->IoStatus.Information = irp->IoStatus.u.Status == STATUS_SUCCESS ? out_len : 0; } @@ -215,8 +229,16 @@ static int add_device( DRIVER_OBJECT *driver ) NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { + HMODULE instance; + NTSTATUS status; + TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); + RtlPcToFileHeader( &DriverEntry, (void *)&instance ); + status = NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, + &nsiproxy_handle, sizeof(nsiproxy_handle), NULL ); + if (status) return status; + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = nsi_ioctl; add_device( driver ); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index fe2bf29d7aa..7d734567c5b 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -18,6 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + +#define _NTSYSTEM_ + #include "config.h" #include <stdarg.h> diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 73159a89805..7de343f00fe 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -18,6 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> @@ -85,6 +89,7 @@ #include "wine/nsi.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/unixlib.h" #include "nsiproxy_private.h" @@ -251,9 +256,9 @@ static WCHAR *strdupAtoW( const char *str ) DWORD len; if (!str) return ret; - len = MultiByteToWideChar( CP_UNIXCP, 0, str, -1, NULL, 0 ); + len = strlen( str ) + 1; ret = malloc( len * sizeof(WCHAR) ); - if (ret) MultiByteToWideChar( CP_UNIXCP, 0, str, -1, ret, len ); + if (ret) ntdll_umbstowcs( str, len, ret, len ); return ret; } diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index e29446abb50..ccfc325a085 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> @@ -28,9 +31,11 @@ #include "winioctl.h" #include "ddk/wdm.h" #include "ifdef.h" +#define __WINE_INIT_NPI_MODULEID #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" +#include "wine/unixlib.h" #include "nsiproxy_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); @@ -121,3 +126,28 @@ NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) return entry->get_parameter( params->key, params->key_size, params->param_type, params->data, params->data_size, params->data_offset ); } + +static NTSTATUS unix_nsi_enumerate_all_ex( void *args ) +{ + struct nsi_enumerate_all_ex *params = (struct nsi_enumerate_all_ex *)args; + return nsi_enumerate_all_ex( params ); +} + +static NTSTATUS unix_nsi_get_all_parameters_ex( void *args ) +{ + struct nsi_get_all_parameters_ex *params = (struct nsi_get_all_parameters_ex *)args; + return nsi_get_all_parameters_ex( params ); +} + +static NTSTATUS unix_nsi_get_parameter_ex( void *args ) +{ + struct nsi_get_parameter_ex *params = (struct nsi_get_parameter_ex *)args; + return nsi_get_parameter_ex( params ); +} + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + unix_nsi_enumerate_all_ex, + unix_nsi_get_all_parameters_ex, + unix_nsi_get_parameter_ex +}; diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index fcb57a5e6b2..f98ae3955b8 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -19,6 +19,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 87a4d487e0a..1c42912655e 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -18,6 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> #include <stddef.h> -- 2.25.1

1 0

[PATCH 3/4] nsiproxy: Switch memory allocations to malloc().
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 13 ++++++------- dlls/nsiproxy.sys/ndis.c | 11 +++++------ dlls/nsiproxy.sys/tcp.c | 33 ++++++++++++++++----------------- dlls/nsiproxy.sys/udp.c | 9 ++++----- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index aabf82d4d86..fe2bf29d7aa 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -94,7 +94,6 @@ #include "ifdef.h" #include "ipmib.h" #include "netiodef.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" @@ -933,12 +932,12 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) return STATUS_NO_MEMORY; if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) { - heap_free( buf ); + free( buf ); return STATUS_NOT_SUPPORTED; } @@ -982,7 +981,7 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo } next += rtm->rtm_msglen; } - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -1122,12 +1121,12 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) < 0) return STATUS_NOT_SUPPORTED; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) return STATUS_NO_MEMORY; if (sysctl( mib, 6, buf, &needed, NULL, 0 ) < 0) { - heap_free( buf ); + free( buf ); return STATUS_NOT_SUPPORTED; } @@ -1225,7 +1224,7 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void } num++; } - HeapFree( GetProcessHeap (), 0, buf ); + free( buf ); } #else FIXME( "not implemented\n" ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index d75855dcf67..73159a89805 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -84,7 +84,6 @@ #include "ddk/wdm.h" #include "wine/nsi.h" #include "wine/list.h" -#include "wine/heap.h" #include "wine/debug.h" #include "nsiproxy_private.h" @@ -253,7 +252,7 @@ static WCHAR *strdupAtoW( const char *str ) if (!str) return ret; len = MultiByteToWideChar( CP_UNIXCP, 0, str, -1, NULL, 0 ); - ret = heap_alloc( len * sizeof(WCHAR) ); + ret = malloc( len * sizeof(WCHAR) ); if (ret) MultiByteToWideChar( CP_UNIXCP, 0, str, -1, ret, len ); return ret; } @@ -264,7 +263,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) int name_len = strlen( name ); if (name_len >= IFNAMSIZ - 1) return NULL; - entry = heap_alloc( sizeof(*entry) ); + entry = malloc( sizeof(*entry) ); if (!entry) return NULL; entry->if_index = index; @@ -272,7 +271,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) entry->if_name = strdupAtoW( name ); if (!entry->if_name) { - heap_free( entry ); + free( entry ); return NULL; } @@ -385,7 +384,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ struct if_data ifdata; if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) goto done; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) goto done; if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) goto done; for (end = buf + needed; buf < end; buf += ifm->ifm_msglen) @@ -408,7 +407,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ } } done: - heap_free( buf ); + free( buf ); } #endif } diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 32939251dbe..fcb57a5e6b2 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -97,7 +97,6 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "tcpmib.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "wine/server.h" @@ -269,7 +268,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = heap_realloc( table, table_size * sizeof(table[0]) ))) + if (!(table = realloc( table, table_size * sizeof(table[0]) ))) { fclose( fp ); goto failed; @@ -301,7 +300,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = heap_realloc( table, table_size * sizeof(table[0]) ))) + if (!(table = realloc( table, table_size * sizeof(table[0]) ))) { freeifaddrs( addrs ); goto failed; @@ -325,7 +324,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) return table; failed: - heap_free( table ); + free( table ); return NULL; } @@ -356,7 +355,7 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) NTSTATUS ret; char *buffer = NULL, *new_buffer; - if (!(buffer = heap_alloc( buffer_len ))) return NULL; + if (!(buffer = malloc( buffer_len ))) return NULL; for (;;) { @@ -371,17 +370,17 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) if (ret != STATUS_INFO_LENGTH_MISMATCH) break; - if (!(new_buffer = heap_realloc( buffer, buffer_len ))) + if (!(new_buffer = realloc( buffer, buffer_len ))) { - heap_free( buffer ); + free( buffer ); return NULL; } buffer = new_buffer; } - if (!(map = heap_alloc( process_count * sizeof(*map) ))) + if (!(map = malloc( process_count * sizeof(*map) ))) { - heap_free( buffer ); + free( buffer ); return NULL; } @@ -400,7 +399,7 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) pos += process->thread_count * sizeof(struct thread_info); } - heap_free( buffer ); + free( buffer ); *num_entries = process_count; return map; } @@ -495,7 +494,7 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN int fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); if (fd_len <= 0) continue; - fds = heap_alloc( fd_len ); + fds = malloc( fd_len ); if (!fds) continue; proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, fds, fd_len ); @@ -507,12 +506,12 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN proc_pidfdinfo( map[i].unix_pid, fds[j].proc_fd, PROC_PIDFDSOCKETINFO, &sock, sizeof(sock) ); if (sock.psi.soi_pcb == inode) { - heap_free( fds ); + free( fds ); return map[i].pid; } } - heap_free( fds ); + free( fds ); } return 0; #else @@ -638,7 +637,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * goto err; } - buf = heap_alloc( len ); + buf = malloc( len ); if (!buf) { status = STATUS_NO_MEMORY; @@ -728,7 +727,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * num++; } err: - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -738,8 +737,8 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; - heap_free( pid_map ); - heap_free( addr_scopes ); + free( pid_map ); + free( addr_scopes ); return status; } diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index efd18392a45..87a4d487e0a 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -77,7 +77,6 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "udpmib.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "wine/server.h" @@ -309,7 +308,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void goto err; } - buf = heap_alloc( len ); + buf = malloc( len ); if (!buf) { status = STATUS_NO_MEMORY; @@ -386,7 +385,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void num++; } err: - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -396,8 +395,8 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; - heap_free( pid_map ); - heap_free( addr_scopes ); + free( pid_map ); + free( addr_scopes ); return status; } -- 2.25.1

1 0

[PATCH 1/4] nsiproxy: Use a pthread_mutex to guard the interface list.
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ndis.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index bf237ea16db..1d0e69c593c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -66,6 +66,8 @@ #include <net/if_types.h> #endif +#include <pthread.h> + #define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS @@ -102,15 +104,7 @@ struct if_entry }; static struct list if_list = LIST_INIT( if_list ); - -static CRITICAL_SECTION if_list_cs; -static CRITICAL_SECTION_DEBUG if_list_cs_debug = -{ - 0, 0, &if_list_cs, - { &if_list_cs_debug.ProcessLocksList, &if_list_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": if_list_cs") } -}; -static CRITICAL_SECTION if_list_cs = { &if_list_cs_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t if_list_lock = PTHREAD_MUTEX_INITIALIZER; static struct if_entry *find_entry_from_index( DWORD index ) { @@ -468,7 +462,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -485,7 +479,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d num++; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; @@ -503,7 +497,7 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -514,7 +508,7 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void status = STATUS_SUCCESS; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -565,7 +559,7 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -583,7 +577,7 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par } } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -599,7 +593,7 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD if (param_type != NSI_PARAM_TYPE_STATIC || data_size != sizeof(NET_LUID) || data_offset != 0) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -609,7 +603,7 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD *(NET_LUID *)data = entry->if_luid; status = STATUS_SUCCESS; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -618,7 +612,7 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) struct if_entry *entry; BOOL ret = FALSE; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -629,7 +623,7 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) ret = TRUE; break; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return ret; } @@ -639,7 +633,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) struct if_entry *entry; BOOL ret = FALSE; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -650,7 +644,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) ret = TRUE; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return ret; } -- 2.25.1

1 0

[PATCH v2 3/3] gdi32: Use NtAllocateVirtualMemory to allocate GDI_SHARED_MEMORY.
by Jacek Caban 01 Oct '21

01 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)

2 1

[PATCH v2 2/3] gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR.
by Jacek Caban 01 Oct '21

01 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Initialize the base pointer before NtAllocateVirtualMemory call. dlls/gdi32/dc.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-)

2 1

[PATCH v2 1/3] gdi32: Use native memory allocators in Unix library.
by Jacek Caban 01 Oct '21

01 Oct '21

2 1

[PATCH] hidparse.sys: Preserve the original report_count in parse_new_value_caps.
by Rémi Bernon 01 Oct '21

01 Oct '21

From: Ivo Ivanov <logos128(a)gmail.com> We force state->items.report_count to 1 while building the alternate value array, but the item is global and should be preserved across caps. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51822 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 9 ++++----- dlls/hidparse.sys/main.c | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 71989ef1b3c..0cfcfedc6cf 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1784,8 +1784,8 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle status = HidP_SetUsages( HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, report, caps.InputReportByteLength ); ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status ); - buffer[6] = 2; - buffer[7] = 4; + buffer[13] = 2; + buffer[14] = 4; ok( !memcmp( buffer, report, caps.InputReportByteLength ), "unexpected report data\n" ); status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_LED, 0, 6, 1, preparsed_data, report, @@ -2502,8 +2502,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) REPORT_COUNT(1, 8), REPORT_SIZE(1, 1), INPUT(1, Cnst|Var|Abs), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), + REPORT_SIZE(1, 8), INPUT(1, Cnst|Var|Abs), /* needs to be 8 bit aligned as next has Buff */ @@ -2724,7 +2723,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) { .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = report_id ? 25 : 26, + .InputReportByteLength = report_id ? 32 : 33, .OutputReportByteLength = report_id ? 2 : 3, .FeatureReportByteLength = report_id ? 21 : 22, .NumberLinkCollectionNodes = 10, diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index ca15a91c75a..18ee23974f0 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -360,6 +360,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY { struct hid_value_caps *values; USAGE usage_page = state->items.usage_page; + USHORT report_count = state->items.report_count; DWORD i, usages_size = max( 1, state->usages_size ); USHORT *byte_length = &state->byte_length[type]; ULONG start_bit, *bit_size = &state->bit_size[type][state->items.report_id]; @@ -408,6 +409,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY state->data_count[type] = state->items.data_index_max + 1; state->items.usage_page = usage_page; + state->items.report_count = report_count; reset_local_items( state ); return TRUE; } -- 2.33.0

1 0

[PATCH 01/10] dinput: Stub hid_joystick force feedback methods.
by Rémi Bernon 01 Oct '21

01 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 83 +++++++++++++++++++++++++++++++++++--- dlls/dinput8/tests/hid.c | 11 +---- 2 files changed, 78 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 834a5de0860..a6c6de3a889 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -780,6 +780,77 @@ static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, D return S_OK; } +static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, const GUID *guid, + const DIEFFECT *params, IDirectInputEffect **out, + IUnknown *outer ) +{ + FIXME( "iface %p, guid %s, params %p, out %p, outer %p stub!\n", iface, debugstr_guid( guid ), + params, out, outer ); + + if (!out) return E_POINTER; + + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *context, DWORD type ) +{ + FIXME( "iface %p, callback %p, context %p, type %#x stub!\n", iface, callback, context, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, + const GUID *guid ) +{ + FIXME( "iface %p, info %p, guid %s stub!\n", iface, info, debugstr_guid( guid ) ); + + if (!info) return E_POINTER; + if (info->dwSize != sizeof(DIEFFECTINFOW)) return DIERR_INVALIDPARAM; + + return DIERR_DEVICENOTREG; +} + +static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) +{ + FIXME( "iface %p, out %p stub!\n", iface, out ); + + if (!out) return E_POINTER; + + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_SendForceFeedbackCommand( IDirectInputDevice8W *iface, DWORD command ) +{ + FIXME( "iface %p, command %x stub!\n", iface, command ); + + switch (command) + { + case DISFFC_RESET: + case DISFFC_STOPALL: + case DISFFC_PAUSE: + case DISFFC_CONTINUE: + case DISFFC_SETACTUATORSON: + case DISFFC_SETACTUATORSOFF: + return DIERR_UNSUPPORTED; + } + + return DIERR_INVALIDPARAM; +} + +static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *context, DWORD flags ) +{ + FIXME( "iface %p, callback %p, context %p, flags %#x stub!\n", iface, callback, context, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return DIERR_UNSUPPORTED; +} + static HRESULT WINAPI hid_joystick_Poll( IDirectInputDevice8W *iface ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); @@ -837,12 +908,12 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ - IDirectInputDevice2WImpl_CreateEffect, - IDirectInputDevice2WImpl_EnumEffects, - IDirectInputDevice2WImpl_GetEffectInfo, - IDirectInputDevice2WImpl_GetForceFeedbackState, - IDirectInputDevice2WImpl_SendForceFeedbackCommand, - IDirectInputDevice2WImpl_EnumCreatedEffectObjects, + hid_joystick_CreateEffect, + hid_joystick_EnumEffects, + hid_joystick_GetEffectInfo, + hid_joystick_GetForceFeedbackState, + hid_joystick_SendForceFeedbackCommand, + hid_joystick_EnumCreatedEffectObjects, IDirectInputDevice2WImpl_Escape, hid_joystick_Poll, IDirectInputDevice2WImpl_SendDeviceData, diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 1ab6e645947..e6439ed8fe5 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4038,7 +4038,6 @@ static void test_simple_joystick(void) check_member( objinst, expect_objects[5], "%u", wReportId ); hr = IDirectInputDevice8_EnumEffects( device, NULL, NULL, DIEFT_ALL ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); res = 0; hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, 0xfe ); @@ -4054,18 +4053,14 @@ static void test_simple_joystick(void) check_effects_params.expect_count - check_effects_params.index ); hr = IDirectInputDevice8_GetEffectInfo( device, NULL, &GUID_Sine ); - todo_wine ok( hr == E_POINTER, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); effectinfo.dwSize = sizeof(DIEFFECTINFOW) + 1; hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); effectinfo.dwSize = sizeof(DIEFFECTINFOW); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_NULL ); - todo_wine ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); - todo_wine ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, NULL ); @@ -4645,18 +4640,14 @@ static void test_simple_joystick(void) winetest_pop_context(); hr = IDirectInputDevice8_GetForceFeedbackState( device, NULL ); - todo_wine ok( hr == E_POINTER, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, 0xdeadbeef ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); - todo_wine ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); objdata[0].dwOfs = 0xd; @@ -5713,6 +5704,7 @@ static void test_force_feedback_joystick( void ) effectinfo.dwSize = sizeof(DIEFFECTINFOW); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); + todo_wine ok( hr == DI_OK, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); todo_wine check_member_guid( effectinfo, expect_effects[0], guid ); @@ -5802,7 +5794,6 @@ static void test_force_feedback_joystick( void ) ok( hr == 0x80040301, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, 0xdeadbeef ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); -- 2.33.0

1 9

[PATCH] ole32/tests: Remove unused variable.
by Nikolay Sivov 01 Oct '21

01 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index abd17c9961f..8d3276651bc 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1179,7 +1179,6 @@ static void test_MkParseDisplayName(void) IEnumMoniker *spEM3 = NULL; DWORD pdwReg1=0; - DWORD grflags=0; DWORD pdwReg2=0; IRunningObjectTable * pprot=NULL; @@ -1388,13 +1387,10 @@ todo_wine matchCnt = count_moniker_matches(pbc, spEM1); - grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; - hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk1, &pdwReg1); + hr = IRunningObjectTable_Register(pprot, ROTFLAGS_REGISTRATIONKEEPSALIVE, lpEM1, pmk1, &pdwReg1); ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr); - grflags=0; - grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; - hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk2, &pdwReg2); + hr = IRunningObjectTable_Register(pprot, ROTFLAGS_REGISTRATIONKEEPSALIVE, lpEM1, pmk2, &pdwReg2); ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr); hr = IRunningObjectTable_EnumRunning(pprot, &spEM2); -- 2.33.0

1 0

[PATCH v3] riched20: Fix saving to disk first-indent and left-indent (\fi and \li)
by Philip Hardin 01 Oct '21

01 Oct '21

2 1

[PATCH 5/5] comctl32/button: Do not restore command link font after themed painting.
by Zhiyi Zhang 01 Oct '21

01 Oct '21

Fix button test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1a5d2afa999..b576e6c6db6 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2982,12 +2982,13 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - HFONT old_font = infoPtr->font ? SelectObject(hDC, infoPtr->font) : NULL; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; RECT rc; + if (infoPtr->font) SelectObject(hDC, infoPtr->font); + GetClientRect(infoPtr->hwnd, &rc); init_custom_draw(&nmcd, infoPtr, hDC, &rc); @@ -2996,7 +2997,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send erase notifications */ cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_COMMANDLINK, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); @@ -3011,7 +3012,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (!(cdrf & CDRF_DOERASE)) { @@ -3083,7 +3084,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + if (cdrf & CDRF_SKIPPOSTPAINT) return; if (focused) { @@ -3098,9 +3099,6 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in rc.bottom -= margins.cyBottomHeight; DrawFocusRect(hDC, &rc); } - -cleanup: - if (old_font) SelectObject(hDC, old_font); } void BUTTON_Register(void) -- 2.30.2

1 0

[PATCH 4/5] comctl32/button: Do not restore split button font after themed painting.
by Zhiyi Zhang 01 Oct '21

01 Oct '21

Fix button test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index f0b2c56b5fe..1a5d2afa999 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2876,12 +2876,13 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - HFONT old_font = infoPtr->font ? SelectObject(hDC, infoPtr->font) : NULL; RECT rc, content_rect, push_rect, dropdown_rect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; + if (infoPtr->font) SelectObject(hDC, infoPtr->font); + GetClientRect(infoPtr->hwnd, &rc); init_custom_draw(&nmcd, infoPtr, hDC, &rc); @@ -2890,7 +2891,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send erase notifications */ cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); @@ -2934,7 +2935,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (!(cdrf & CDRF_DOERASE)) { @@ -2963,7 +2964,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + if (cdrf & CDRF_SKIPPOSTPAINT) return; if (focused) { @@ -2977,9 +2978,6 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in push_rect.bottom -= margins.cyBottomHeight; DrawFocusRect(hDC, &push_rect); } - -cleanup: - if (old_font) SelectObject(hDC, old_font); } static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) -- 2.30.2

1 0

[PATCH 3/5] comctl32/button: Do not restore groupbox font after themed painting.
by Zhiyi Zhang 01 Oct '21

01 Oct '21

Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 894cc6a3df9..f0b2c56b5fe 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2835,8 +2835,8 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in created_font = TRUE; } } else { - font = (HFONT)SendMessageW(infoPtr->hwnd, WM_GETFONT, 0, 0); - hPrevFont = SelectObject(hDC, font); + if (infoPtr->font) + SelectObject(hDC, infoPtr->font); } GetClientRect(infoPtr->hwnd, &bgRect); -- 2.30.2

1 0

[PATCH 2/5] comctl32/button: Do not restore checkbox font after themed painting.
by Zhiyi Zhang 01 Oct '21

01 Oct '21

Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7dfc1720508..894cc6a3df9 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2744,8 +2744,7 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in created_font = TRUE; } } else { - font = (HFONT)SendMessageW(infoPtr->hwnd, WM_GETFONT, 0, 0); - hPrevFont = SelectObject(hDC, font); + if (infoPtr->font) SelectObject(hDC, infoPtr->font); } if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz))) -- 2.30.2

1 0

[PATCH 1/5] comctl32/button: Do not restore push button font after themed painting.
by Zhiyi Zhang 01 Oct '21

01 Oct '21

Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index d3dcc67b169..7dfc1720508 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2656,13 +2656,13 @@ cleanup: static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { RECT bgRect, textRect; - HFONT font = infoPtr->font; - HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; WCHAR *text; + if (infoPtr->font) SelectObject(hDC, infoPtr->font); + GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); @@ -2672,7 +2672,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send erase notifications */ cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); @@ -2687,7 +2687,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (!(cdrf & CDRF_DOERASE) && (text = get_button_text(infoPtr))) { @@ -2700,7 +2700,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + if (cdrf & CDRF_SKIPPOSTPAINT) return; if (focused) { @@ -2716,9 +2716,6 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in DrawFocusRect( hDC, &focusRect ); } - -cleanup: - if (hPrevFont) SelectObject(hDC, hPrevFont); } static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) -- 2.30.2

1 0

[PATCH] light.msstyles: Add scrollbar width and height.
by Zhiyi Zhang 01 Oct '21

01 Oct '21

Fix a bug that scrollbar width and height don't change when activating Light theme. For example, when theming is inactive, change scrollbar width from the default 16 pixels to 32 pixels, then activate Light theme. Then scrollbar width should be changed to the theme specified scrollbar width. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 76adf8f8398..cf9271cb612 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -144,7 +144,10 @@ BLUE_INI TEXTFILE "EdgeFillColor = 255 255 255\r\n" "\r\n[SysMetrics]\r\n" -"; System colors\r\n" +"ScrollbarWidth = 16\r\n" +"ScrollbarHeight = 16\r\n" + +"\r\n; System colors\r\n" "Scrollbar = 255 255 255\r\n" "Background = 37 111 149\r\n" "ActiveCaption = 50 150 250\r\n" -- 2.30.2

1 0

[PATCH 1/6] d3d10/effect: Go through both local and shared buffers when looking for shader resources.
by Nikolay Sivov 30 Sep '21

30 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 56 ++++++++++++++++++++++++--------------- dlls/d3d10/tests/effect.c | 53 +++++++++++++++++++++++++----------- 2 files changed, 72 insertions(+), 37 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 668efcda666..71660eb399e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -526,6 +526,35 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } +static struct d3d10_effect_variable * d3d10_effect_get_buffer_by_name(struct d3d10_effect *effect, + const char *name) +{ + ID3D10EffectVariable *v; + unsigned int i; + + for (i = 0; i < effect->local_buffer_count; ++i) + { + struct d3d10_effect_variable *l = &effect->local_buffers[i]; + if (l->name && !strcmp(l->name, name)) + { + TRACE("Found local buffer %s.\n", debugstr_a(name)); + return l; + } + } + + if (effect->pool) + { + if ((v = (ID3D10EffectVariable *)effect->pool->lpVtbl->GetConstantBufferByName(effect->pool, name)) + && v->lpVtbl->IsValid(v)) + { + TRACE("Found shared buffer %s.\n", debugstr_a(name)); + return impl_from_ID3D10EffectVariable(v); + } + } + + return NULL; +} + static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const void *data, size_t data_size) { struct d3d10_effect_shader_variable *sv = &v->u.shader; @@ -557,16 +586,7 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const { case D3D10_SIT_CBUFFER: case D3D10_SIT_TBUFFER: - for (y = 0; y < v->effect->local_buffer_count; ++y) - { - var = &v->effect->local_buffers[y]; - - if (!strcmp(bind_desc.Name, var->name)) - { - sr->variable = var; - break; - } - } + sr->variable = d3d10_effect_get_buffer_by_name(v->effect, bind_desc.Name); break; case D3D10_SIT_SAMPLER: @@ -3316,24 +3336,16 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon const char *name) { struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); - unsigned int i; + struct d3d10_effect_variable *v; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); - for (i = 0; i < effect->local_buffer_count; ++i) + if ((v = d3d10_effect_get_buffer_by_name(effect, name))) { - struct d3d10_effect_variable *l = &effect->local_buffers[i]; - - if (l->name && !strcmp(l->name, name)) - { - TRACE("Returning buffer %p.\n", l); - return (ID3D10EffectConstantBuffer *)&l->ID3D10EffectVariable_iface; - } + TRACE("Returning buffer %p.\n", v); + return (ID3D10EffectConstantBuffer *)&v->ID3D10EffectVariable_iface; } - if (effect->pool) - return effect->pool->lpVtbl->GetConstantBufferByName(effect->pool, name); - WARN("Invalid name specified\n"); return (ID3D10EffectConstantBuffer *)&null_local_buffer.ID3D10EffectVariable_iface; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index e833fc09799..a1ec44a0a16 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6294,22 +6294,27 @@ shared BlendState s_blendstate; shared Texture s_texture; shared PixelShader ps; +float4 VS( float4 pos : POSITION ) : SV_POSITION +{ + return f1.xxxx; +} + technique10 tech_child { pass P0 { SetPixelShader(ps); - SetVertexShader(NULL); + SetVertexShader(CompileShader(vs_4_0, VS())); SetGeometryShader(NULL); } }; #endif static DWORD fx_test_pool_child[] = { - 0x43425844, 0xa11d7cb2, 0x41f20697, 0x14a62983, 0x43b9f39c, 0x00000001, 0x0000029f, 0x00000001, - 0x00000024, 0x30315846, 0x00000273, 0xfeff1001, 0x00000002, 0x00000002, 0x00000000, 0x00000001, - 0x00000002, 0x00000003, 0x00000001, 0x00000103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x62635f6c, + 0x43425844, 0xa46943b7, 0x1a80ed65, 0x3602c2be, 0xfe502f4e, 0x00000001, 0x000004d7, 0x00000001, + 0x00000024, 0x30315846, 0x000004ab, 0xfeff1001, 0x00000002, 0x00000002, 0x00000000, 0x00000001, + 0x00000002, 0x00000003, 0x00000001, 0x0000033b, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x62635f6c, 0x6f6c6600, 0x09007461, 0x01000000, 0x00000000, 0x04000000, 0x10000000, 0x04000000, 0x09000000, 0x66000009, 0x4f430030, 0x30524f4c, 0x635f6c00, 0x66003262, 0x5f730033, 0x66006263, 0x32660031, 0x4c4f4300, 0x0031524f, 0x6e656c42, 0x61745364, 0x50006574, 0x02000000, 0x00000000, 0x00000000, @@ -6317,16 +6322,34 @@ static DWORD fx_test_pool_child[] = 0x00657275, 0x00000084, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000009, 0x65745f73, 0x72757478, 0x69500065, 0x536c6578, 0x65646168, 0x00b20072, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050000, 0x73700000, 0x63657400, 0x68635f68, 0x00646c69, - 0x01003050, 0x02000000, 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x04000000, 0x10000000, - 0x00000000, 0x01000000, 0xff000000, 0x00ffffff, 0x2b000000, 0x0f000000, 0x2e000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x35000000, 0x10000000, 0x00000000, 0x01000000, 0xff000000, - 0x00ffffff, 0x3b000000, 0x0f000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x3e000000, 0x10000000, 0x00000000, 0x02000000, 0xff000000, 0x43ffffff, 0x0f000000, 0x2e000000, - 0x00000000, 0x00000000, 0x00000000, 0x46000000, 0x0f000000, 0x49000000, 0x04000000, 0x00000000, - 0x00000000, 0x77000000, 0x5b000000, 0x00000000, 0xff000000, 0xa8ffffff, 0x8c000000, 0x00000000, - 0xff000000, 0xdaffffff, 0xbe000000, 0x00000000, 0xff000000, 0xddffffff, 0x01000000, 0x00000000, - 0xe8000000, 0x03000000, 0x00000000, 0x07000000, 0x00000000, 0x02000000, 0xda000000, 0x06000000, - 0x00000000, 0x01000000, 0xeb000000, 0x08000000, 0x00000000, 0x01000000, 0xf7000000, 0x00000000, + 0x38003050, 0x44000002, 0x2d434258, 0x4237b3f1, 0x252579b9, 0x2c27ed59, 0x014a8013, 0x38000000, + 0x05000002, 0x34000000, 0x08000000, 0x3c000001, 0x70000001, 0xbc000001, 0x52000001, 0xcc464544, + 0x01000000, 0x44000000, 0x01000000, 0x1c000000, 0x00000000, 0x00fffe04, 0xa3000001, 0x3c000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x73000000, + 0x0062635f, 0x3cababab, 0x02000000, 0x5c000000, 0x10000000, 0x00000000, 0x00000000, 0x8c000000, + 0x00000000, 0x04000000, 0x02000000, 0x90000000, 0x00000000, 0xa0000000, 0x04000000, 0x04000000, + 0x00000000, 0x90000000, 0x00000000, 0x66000000, 0x00ab0031, 0x01000300, 0x00000100, 0x00000000, + 0x66000000, 0x694d0032, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, 0x61685320, 0x20726564, + 0x706d6f43, 0x72656c69, 0x2e303120, 0x49ab0031, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, + 0x00000000, 0x00000000, 0x03000000, 0x00000000, 0x0f000000, 0x50000000, 0x5449534f, 0x004e4f49, + 0x4fababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, + 0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x44524448, 0x40000000, + 0x11000100, 0x59000000, 0x46040000, 0x0000208e, 0x01000000, 0x67000000, 0xf2040000, 0x00001020, + 0x01000000, 0x36000000, 0xf2060000, 0x00001020, 0x06000000, 0x00002080, 0x00000000, 0x3e000000, + 0x53010000, 0x74544154, 0x02000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, + 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xeb000000, + 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x04000000, 0x10000000, 0x00000000, 0x01000000, + 0xff000000, 0x00ffffff, 0x2b000000, 0x0f000000, 0x2e000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x35000000, 0x10000000, 0x00000000, 0x01000000, 0xff000000, 0x00ffffff, 0x3b000000, + 0x0f000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3e000000, 0x10000000, + 0x00000000, 0x02000000, 0xff000000, 0x43ffffff, 0x0f000000, 0x2e000000, 0x00000000, 0x00000000, + 0x00000000, 0x46000000, 0x0f000000, 0x49000000, 0x04000000, 0x00000000, 0x00000000, 0x77000000, + 0x5b000000, 0x00000000, 0xff000000, 0xa8ffffff, 0x8c000000, 0x00000000, 0xff000000, 0xdaffffff, + 0xbe000000, 0x00000000, 0xff000000, 0xddffffff, 0x01000000, 0x00000000, 0xe8000000, 0x03000000, + 0x00000000, 0x07000000, 0x00000000, 0x02000000, 0xda000000, 0x06000000, 0x00000000, 0x07000000, + 0x27000000, 0x08000003, 0x00000000, 0x01000000, 0x2f000000, 0x00000003, }; static void test_effect_pool(void) -- 2.33.0

3 16

[PATCH 1/2] d3dx9: Fix use of D3DXVec2Normalize().
by Matteo Bruni 30 Sep '21

30 Sep '21

From: Eric Pouech <eric.pouech(a)gmail.com> Spotted by GCC 11. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 8f7c926c32a..48abb7ede41 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5508,7 +5508,7 @@ static inline BOOL is_direction_similar(D3DXVECTOR2 *dir1, D3DXVECTOR2 *dir2, fl static inline D3DXVECTOR2 *unit_vec2(D3DXVECTOR2 *dir, const D3DXVECTOR2 *pt1, const D3DXVECTOR2 *pt2) { - return D3DXVec2Normalize(D3DXVec2Subtract(dir, pt2, pt1), dir); + return D3DXVec2Normalize(dir, D3DXVec2Subtract(dir, pt2, pt1)); } struct cos_table -- 2.26.3

1 1

[PATCH 1/2] bcrypt: Remove macOS backend.
by Gijs Vermeulen 30 Sep '21

30 Sep '21

gnutls has been the default since wine-3.13. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- configure.ac | 1 - dlls/bcrypt/Makefile.in | 1 - dlls/bcrypt/macos.c | 312 ---------------------------------------- 3 files changed, 314 deletions(-) delete mode 100644 dlls/bcrypt/macos.c diff --git a/configure.ac b/configure.ac index 94d1b472142..7ed1e73eb6d 100644 --- a/configure.ac +++ b/configure.ac @@ -430,7 +430,6 @@ AC_CHECK_HEADERS(\ ApplicationServices/ApplicationServices.h \ CL/cl.h \ Carbon/Carbon.h \ - CommonCrypto/CommonCryptor.h \ CoreAudio/CoreAudio.h \ DiskArbitration/DiskArbitration.h \ EGL/egl.h \ diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index dd6d4a76640..63a731fa9d9 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -6,7 +6,6 @@ EXTRAINCL = $(GNUTLS_CFLAGS) C_SRCS = \ bcrypt_main.c \ gnutls.c \ - macos.c \ md2.c \ sha256.c \ sha512.c diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c deleted file mode 100644 index 20e1a61e3fb..00000000000 --- a/dlls/bcrypt/macos.c +++ /dev/null @@ -1,312 +0,0 @@ -/* - * Copyright 2009 Henri Verbeet for CodeWeavers - * Copyright 2018 Hans Leidekker for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#if 0 -#pragma makedep unix -#endif - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H -#include <AvailabilityMacros.h> -#include <CommonCrypto/CommonCryptor.h> -#endif - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "ntsecapi.h" -#include "bcrypt.h" - -#include "bcrypt_internal.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 && !defined(HAVE_GNUTLS_CIPHER_INIT) -WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); - -struct key_data -{ - CCCryptorRef ref_encrypt; - CCCryptorRef ref_decrypt; -}; -C_ASSERT( sizeof(struct key_data) <= sizeof(((struct key *)0)->private) ); - -static struct key_data *key_data( struct key *key ) -{ - return (struct key_data *)key->private; -} - -static NTSTATUS CDECL key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -{ - if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) - { - if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) - { - key->u.s.mode = MODE_ID_ECB; - return STATUS_SUCCESS; - } - else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) - { - key->u.s.mode = MODE_ID_CBC; - return STATUS_SUCCESS; - } - else - { - FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); - return STATUS_NOT_IMPLEMENTED; - } - } - - FIXME( "unsupported key property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_symmetric_init( struct key *key ) -{ - switch (key->alg_id) - { - case ALG_ID_AES: - switch (key->u.s.mode) - { - case MODE_ID_ECB: - case MODE_ID_CBC: - break; - default: - FIXME( "mode %u not supported\n", key->u.s.mode ); - return STATUS_NOT_SUPPORTED; - } - return STATUS_SUCCESS; - - default: - FIXME( "algorithm %u not supported\n", key->alg_id ); - return STATUS_NOT_SUPPORTED; - } -} - -static CCMode get_cryptor_mode( struct key *key ) -{ - switch (key->u.s.mode) - { - case MODE_ID_ECB: return kCCModeECB; - case MODE_ID_CBC: return kCCModeCBC; - default: - FIXME( "unsupported mode %u\n", key->u.s.mode ); - return 0; - } -} - -static void CDECL key_symmetric_vector_reset( struct key *key ) -{ - if (!key_data(key)->ref_encrypt) return; - - TRACE( "invalidating cryptor handles\n" ); - CCCryptorRelease( key_data(key)->ref_encrypt ); - key_data(key)->ref_encrypt = NULL; - - CCCryptorRelease( key_data(key)->ref_decrypt ); - key_data(key)->ref_decrypt = NULL; -} - -static NTSTATUS init_cryptor_handles( struct key *key ) -{ - CCCryptorStatus status; - CCMode mode; - - if (key_data(key)->ref_encrypt) return STATUS_SUCCESS; - if (!(mode = get_cryptor_mode( key ))) return STATUS_NOT_SUPPORTED; - - if ((status = CCCryptorCreateWithMode( kCCEncrypt, mode, kCCAlgorithmAES128, ccNoPadding, key->u.s.vector, - key->u.s.secret, key->u.s.secret_len, NULL, 0, 0, 0, - &key_data(key)->ref_encrypt )) != kCCSuccess) - { - WARN( "CCCryptorCreateWithMode failed %d\n", status ); - return STATUS_INTERNAL_ERROR; - } - if ((status = CCCryptorCreateWithMode( kCCDecrypt, mode, kCCAlgorithmAES128, ccNoPadding, key->u.s.vector, - key->u.s.secret, key->u.s.secret_len, NULL, 0, 0, 0, - &key_data(key)->ref_decrypt )) != kCCSuccess) - { - WARN( "CCCryptorCreateWithMode failed %d\n", status ); - CCCryptorRelease( key_data(key)->ref_encrypt ); - key_data(key)->ref_encrypt = NULL; - return STATUS_INTERNAL_ERROR; - } - - return STATUS_SUCCESS; -} - -static NTSTATUS CDECL key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) -{ - CCCryptorStatus status; - NTSTATUS ret; - - if ((ret = init_cryptor_handles( key ))) return ret; - - if ((status = CCCryptorUpdate( key_data(key)->ref_encrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) - { - WARN( "CCCryptorUpdate failed %d\n", status ); - return STATUS_INTERNAL_ERROR; - } - return STATUS_SUCCESS; -} - -static NTSTATUS CDECL key_symmetric_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) -{ - CCCryptorStatus status; - NTSTATUS ret; - - if ((ret = init_cryptor_handles( key ))) return ret; - - if ((status = CCCryptorUpdate( key_data(key)->ref_decrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) - { - WARN( "CCCryptorUpdate failed %d\n", status ); - return STATUS_INTERNAL_ERROR; - } - return STATUS_SUCCESS; -} - -static NTSTATUS CDECL key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static void CDECL key_symmetric_destroy( struct key *key ) -{ - if (key_data(key)->ref_encrypt) CCCryptorRelease( key_data(key)->ref_encrypt ); - if (key_data(key)->ref_decrypt) CCCryptorRelease( key_data(key)->ref_decrypt ); -} - -static NTSTATUS CDECL key_asymmetric_init( struct key *key ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len, ULONG *ret_len, ULONG flags ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, - UCHAR *signature, ULONG signature_len, DWORD flags ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_export_ecc( struct key *key, UCHAR *output, ULONG len, ULONG *ret_len ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_import_ecc( struct key *key, UCHAR *input, ULONG len ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_import_rsa( struct key *key, UCHAR *input, ULONG len ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_asymmetric_generate( struct key *key ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static void CDECL key_asymmetric_destroy( struct key *key ) -{ -} - -static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key *key_copy ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, - UCHAR *output, ULONG output_len, ULONG *ret_len ) -{ - FIXME( "not implemented on Mac\n" ); - return STATUS_NOT_IMPLEMENTED; -} - -static const struct key_funcs key_funcs = -{ - key_set_property, - key_symmetric_init, - key_symmetric_vector_reset, - key_symmetric_set_auth_data, - key_symmetric_encrypt, - key_symmetric_decrypt, - key_symmetric_get_tag, - key_symmetric_destroy, - key_asymmetric_init, - key_asymmetric_generate, - key_asymmetric_decrypt, - key_asymmetric_duplicate, - key_asymmetric_sign, - key_asymmetric_verify, - key_asymmetric_destroy, - key_export_dsa_capi, - key_export_ecc, - key_import_dsa_capi, - key_import_ecc, - key_import_rsa -}; - -NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) -{ - if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; - *(const struct key_funcs **)ptr_out = &key_funcs; - return STATUS_SUCCESS; -} - -#endif -- 2.33.0

3 5

[PATCH 1/2] riched20: Remove New() allocation macro.
by Nikolay Sivov 30 Sep '21

30 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/riched20/reader.c | 8 ++++---- dlls/riched20/rtf.h | 7 ------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index e73b8b87e9d..b17d6835f25 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -813,7 +813,7 @@ static void ReadFontTbl(RTF_Info *info) if (info->rtfClass == rtfEOF) break; } - fp = New (RTFFont); + fp = heap_alloc(sizeof(*fp)); if (fp == NULL) { ERR ("cannot allocate font entry\n"); break; @@ -986,7 +986,7 @@ static void ReadColorTbl(RTF_Info *info) continue; } - cp = New (RTFColor); + cp = heap_alloc(sizeof(*cp)); if (cp == NULL) { ERR ("cannot allocate color entry\n"); break; @@ -1036,7 +1036,7 @@ static void ReadStyleSheet(RTF_Info *info) break; if (RTFCheckCM (info, rtfGroup, rtfEndGroup)) break; - sp = New (RTFStyle); + sp = heap_alloc(sizeof(*sp)); if (sp == NULL) { ERR ("cannot allocate stylesheet entry\n"); break; @@ -1104,7 +1104,7 @@ static void ReadStyleSheet(RTF_Info *info) sp->rtfSNextPar = info->rtfParam; continue; } - sep = New (RTFStyleElt); + sep = heap_alloc(sizeof(*sep)); if (sep == NULL) { ERR ("cannot allocate style element\n"); diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 35a0ee878e9..9f15d5ba8e1 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1078,13 +1078,6 @@ struct RTFTable # define RTFBorderCellBottom 0x32 # define RTFBorderCellRight 0x33 -/* - * Return pointer to new element of type t, or NULL - * if no memory available. - */ - -# define New(t) (heap_alloc (sizeof (t))) - /* Parser stack size */ # define maxStack 32 -- 2.33.0

2 3

[PATCH vkd3d 2/2] tests: Add tests for NULL event handles in SetEventOnCompletion().
by Conor McCarthy 30 Sep '21

30 Sep '21

Testing this before NULL event handling is patched results in a crash. Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 12 ++++++++++-- tests/d3d12_crosstest.h | 26 ++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 2 ++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 89b1f000..514ada7b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4330,11 +4330,14 @@ static void test_fence_values(void) value = ID3D12Fence_GetCompletedValue(fence); ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); - for (i = 0; i < 100; ++i) + for (i = 0; i < 200; ++i) { ++next_value; queue_signal(queue, fence, next_value); - wait_queue_idle(device, queue); + if ((i * 11) & 8) + wait_queue_idle_no_event(device, queue); + else + wait_queue_idle(device, queue); value = ID3D12Fence_GetCompletedValue(fence); ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); } @@ -4371,6 +4374,11 @@ static void test_fence_values(void) wait_queue_idle(device, queue); value = ID3D12Fence_GetCompletedValue(fence); ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + next_value <<= 1; + queue_signal(queue, fence, next_value); + wait_queue_idle_no_event(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); next_value = 0; queue_signal(queue, fence, next_value); wait_queue_idle(device, queue); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 0b77bdee..557d0430 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -226,6 +226,15 @@ static HRESULT wait_for_fence(ID3D12Fence *fence, uint64_t value) return ret == WAIT_OBJECT_0 ? S_OK : E_FAIL; } +static HRESULT wait_for_fence_no_event(ID3D12Fence *fence, uint64_t value) +{ + if (ID3D12Fence_GetCompletedValue(fence) >= value) + return S_OK; + + /* This is defined to block on the value with infinite timeout. */ + return ID3D12Fence_SetEventOnCompletion(fence, value, NULL); +} + static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue) { ID3D12Fence *fence; @@ -243,6 +252,23 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm ID3D12Fence_Release(fence); } +static void wait_queue_idle_no_event_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue) +{ + ID3D12Fence *fence; + HRESULT hr; + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&fence); + assert_that_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + hr = ID3D12CommandQueue_Signal(queue, fence, 1); + assert_that_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + hr = wait_for_fence_no_event(fence, 1); + assert_that_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + + ID3D12Fence_Release(fence); +} + static bool use_warp_device; static unsigned int use_adapter_idx; diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 0374d8d1..89f3ca4c 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -26,6 +26,8 @@ struct vec4 #define wait_queue_idle(a, b) wait_queue_idle_(__LINE__, a, b) static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue); +#define wait_queue_idle_no_event(a, b) wait_queue_idle_no_event_(__LINE__, a, b) +static void wait_queue_idle_no_event_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue); static ID3D12Device *create_device(void); static void set_rect(RECT *rect, int left, int top, int right, int bottom) -- 2.32.0

1 0

[PATCH vkd3d 1/2] vkd3d: Handle NULL event handles in ID3D12Fence::SetEventOnCompletion().
by Conor McCarthy 30 Sep '21

30 Sep '21

The D3D12 documentation states: "If hEvent is a null handle, then this API will not return until the specified fence value(s) have been reached." Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 39 ++++++++++++++++++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 2 ++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9f4a4149..51a44704 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -805,6 +805,7 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF { struct d3d12_device *device = fence->device; struct vkd3d_signaled_semaphore *current; + bool signal_null_event_cond = false; unsigned int i, j; int rc; @@ -822,7 +823,15 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF if (current->value <= value) { - fence->device->signal_event(current->event); + if (current->event) + { + fence->device->signal_event(current->event); + } + else + { + current->latch = true; + signal_null_event_cond = true; + } } else { @@ -833,6 +842,9 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF } fence->event_count = j; + if (signal_null_event_cond) + pthread_cond_broadcast(&fence->null_event_cond); + if (vk_fence) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -915,6 +927,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) ERR("Failed to destroy mutex, error %d.\n", rc); + pthread_cond_destroy(&fence->null_event_cond); vkd3d_free(fence); d3d12_device_release(device); @@ -996,6 +1009,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); unsigned int i; + bool volatile *latch; int rc; TRACE("iface %p, value %#"PRIx64", event %p.\n", iface, value, event); @@ -1008,7 +1022,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i if (value <= fence->value) { - fence->device->signal_event(event); + if (event) + fence->device->signal_event(event); pthread_mutex_unlock(&fence->mutex); return S_OK; } @@ -1035,8 +1050,20 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i fence->events[fence->event_count].value = value; fence->events[fence->event_count].event = event; + fence->events[fence->event_count].latch = false; + latch = &fence->events[fence->event_count].latch; ++fence->event_count; + /* If event is NULL, we need to block until the fence value completes. + * Implement this in a uniform way where we pretend we have a dummy event. + * A NULL fence->events[].event means that we should set latch to true + * and signal a condition variable instead of calling external signal_event callback. */ + if (!event) + { + while (!*latch) + pthread_cond_wait(&fence->null_event_cond, &fence->mutex); + } + pthread_mutex_unlock(&fence->mutex); return S_OK; } @@ -1094,6 +1121,13 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * return hresult_from_errno(rc); } + if ((rc = pthread_cond_init(&fence->null_event_cond, NULL))) + { + ERR("Failed to initialize cond variable, error %d.\n", rc); + pthread_mutex_destroy(&fence->mutex); + return hresult_from_errno(rc); + } + if (flags) FIXME("Ignoring flags %#x.\n", flags); @@ -1111,6 +1145,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { pthread_mutex_destroy(&fence->mutex); + pthread_cond_destroy(&fence->null_event_cond); return hr; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0b326b11..72682b15 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -334,11 +334,13 @@ struct d3d12_fence uint64_t value; pthread_mutex_t mutex; + pthread_cond_t null_event_cond; struct vkd3d_waiting_event { uint64_t value; HANDLE event; + bool volatile latch; } *events; size_t events_size; size_t event_count; -- 2.32.0

1 0

[PATCH v4] wininet: Reset context length for http status 304
by Alistair Leslie-Hughes 30 Sep '21

30 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 7 +- dlls/wininet/tests/http.c | 134 +++++++++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..c9c4a060aac 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,12 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { + if (HTTP_GetCustomHeaderIndex(request, L"Content-Length", 0, FALSE) == -1 || + !wcscmp(request->verb, L"HEAD")) + request->read_size = 0; request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..ae95b4399e0 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2375,12 +2375,41 @@ static DWORD CALLBACK server_thread(LPVOID param) recvfrom(c, buffer, buffer_size, 0, NULL, NULL); send(c, ok_with_length, sizeof(ok_with_length)-1, 0); } - + if (strstr(buffer, "GET /test_no_content_content_length")) + { + static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n" + "Content-Length: 10\r\n\r\n0123456789"; + send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); + } if (strstr(buffer, "GET /test_no_content")) { - static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; + static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n" + "0123456789"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified_content_length")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n" + "Content-Length: 10\r\n\r\n0123456789"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } + else if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n" + "\r\n0123456789"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } + if (strstr(buffer, "HEAD /head_content_length")) + { + static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n" + "Content-Length: 10\r\n\r\n0123456789"; + send(c, headmsg, sizeof(headmsg)-1, 0); + } + else if (strstr(buffer, "HEAD /head")) + { + static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; + send(c, headmsg, sizeof(headmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3516,106 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD avail; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified_content_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail == 10, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_no_content", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 204); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_no_content_content_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 204); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail == 10, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, "HEAD", "/head", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, "HEAD", "/head_content_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6189,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH] dinput: Fix HID joystick DIDFT_POV enumeration.
by Rémi Bernon 30 Sep '21

30 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 7c4b637d018..834a5de0860 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -417,7 +417,7 @@ static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPD TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); if (!callback) return DIERR_INVALIDPARAM; - if (flags & ~(DIDFT_AXIS | DIDFT_AXIS | DIDFT_BUTTON | DIDFT_NODATA | DIDFT_COLLECTION)) + if (flags & ~(DIDFT_AXIS | DIDFT_POV | DIDFT_BUTTON | DIDFT_NODATA | DIDFT_COLLECTION)) return DIERR_INVALIDPARAM; if (flags == DIDFT_ALL || (flags & DIDFT_AXIS)) -- 2.33.0

1 0

[PATCH 3/3] gdi32: Use NtAllocateVirtualMemory to allocate GDI_SHARED_MEMORY.
by Jacek Caban 30 Sep '21

30 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)

2 1

[PATCH 2/3] gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR.
by Jacek Caban 30 Sep '21

30 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-)

2 1

[PATCH 1/3] gdi32: Use native memory allocators in Unix library.
by Jacek Caban 30 Sep '21

30 Sep '21

1 0

[PATCH] include: Add more sapi interfaces
by Alistair Leslie-Hughes 30 Sep '21

30 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapi.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index d2c1aac8afc..ba577d4de04 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -1065,6 +1065,31 @@ interface ISpVoice : ISpEventSource [in] ULONG count); }; +[ + object, + uuid(be7a9cc9-5f9e-11d2-960f-00c04f8ee628), + pointer_default(unique), + local, + restricted +] +interface ISpEventSink : IUnknown +{ + HRESULT AddEvents([in] const SPEVENT *events, [in] ULONG count); + HRESULT GetEventInterest([out] ULONGLONG *interest); +}; + +[ + object, + uuid(5b559f40-e952-11d2-bb91-00c04f8ee6c0), + pointer_default(unique), + restricted +] +interface ISpObjectWithToken : IUnknown +{ + HRESULT SetObjectToken([in] ISpObjectToken *token); + HRESULT GetObjectToken([out] ISpObjectToken **token); +}; + [ object, uuid(bed530be-2606-4f4d-a1c0-54c5cda5566f), @@ -1097,6 +1122,21 @@ interface ISpAudio : ISpStreamFormat HRESULT GetBufferNotifySize([out] ULONG *size); HRESULT SetBufferNotifySize([in] ULONG size); }; +[ + object, + uuid(15806f6e-1d70-4b48-98e6-3b1a007509ab), + pointer_default(unique), + local, + restricted +] +interface ISpMMSysAudio : ISpAudio +{ + HRESULT GetDeviceId([out] UINT *id); + HRESULT SetDeviceId([in] UINT id); + HRESULT GetMMHandle([out] void **handle); + HRESULT GetLineId([out] UINT *id); + HRESULT SetLineId([in] UINT id); +}; [ object, @@ -1254,4 +1294,26 @@ library SpeechLib interface ISpStream; [default] interface ISpeechFileStream; }; + + [ + uuid(cf3d2e50-53f2-11d2-960c-00c04f8ee628) + ] + coclass SpMMAudioIn + { + interface ISpEventSource; + interface ISpEventSink; + interface ISpObjectWithToken; + interface ISpMMSysAudio; + }; + + [ + uuid(a8c680eb-3d32-11d2-9ee7-00c04f797396) + ] + coclass SpMMAudioOut + { + interface ISpEventSource; + interface ISpEventSink; + interface ISpObjectWithToken; + interface ISpMMSysAudio; + }; } -- 2.33.0

1 0

[PATCH 01/11] dinput8/tests: Don't try running more tests after a win_skip.
by Rémi Bernon 30 Sep '21

30 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index ce2a3792593..533c4a8ca42 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4593,7 +4593,7 @@ struct device_desc HIDP_CAPS hid_caps; }; -static void test_device_types( void ) +static BOOL test_device_types(void) { #include "psh_hid_macros.h" static const unsigned char unknown_desc[] = @@ -4837,11 +4837,12 @@ static void test_device_types( void ) DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; IDirectInputDevice8W *device; + BOOL success = TRUE; IDirectInput8W *di; ULONG i, ref; HRESULT hr; - for (i = 0; i < ARRAY_SIZE(device_desc); ++i) + for (i = 0; i < ARRAY_SIZE(device_desc) && success; ++i) { winetest_push_context( "desc[%d]", i ); GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); @@ -4852,7 +4853,7 @@ static void test_device_types( void ) if (!dinput_driver_start( device_desc[i].report_desc_buf, device_desc[i].report_desc_len, &device_desc[i].hid_caps )) { - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4860,7 +4861,7 @@ static void test_device_types( void ) if (FAILED(hr)) { win_skip( "DirectInput8Create returned %#x\n", hr ); - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4870,7 +4871,7 @@ static void test_device_types( void ) { win_skip( "device not found, skipping tests\n" ); IDirectInput8_Release( di ); - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4918,6 +4919,8 @@ static void test_device_types( void ) SetCurrentDirectoryW( cwd ); winetest_pop_context(); } + + return success; } static void test_force_feedback_joystick( void ) @@ -5345,9 +5348,11 @@ START_TEST( hid ) test_hid_driver( 1, TRUE ); CoInitialize( NULL ); - test_device_types(); - test_simple_joystick(); - test_force_feedback_joystick(); + if (test_device_types()) + { + test_simple_joystick(); + test_force_feedback_joystick(); + } CoUninitialize(); UnmapViewOfFile( test_data ); -- 2.33.0

1 10

[PATCH 1/5] ole32/composite: Fix argument handling in component enumerator methods.
by Nikolay Sivov 30 Sep '21

30 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compositemoniker.c | 60 ++++++----- dlls/ole32/tests/moniker.c | 192 +++++++++++++++++++++++++++++++--- 2 files changed, 209 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 80a1a675766..e5437c8880f 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -495,7 +495,7 @@ static HRESULT WINAPI CompositeMonikerImpl_Enum(IMoniker *iface, BOOL forward, I TRACE("%p, %d, %p\n", iface, forward, ppenumMoniker); if (!ppenumMoniker) - return E_POINTER; + return E_INVALIDARG; if (FAILED(hr = composite_get_components_alloc(moniker, &monikers))) return hr; @@ -1346,44 +1346,45 @@ EnumMonikerImpl_Release(IEnumMoniker* iface) return ref; } -/****************************************************************************** - * EnumMonikerImpl_Next - ******************************************************************************/ -static HRESULT WINAPI -EnumMonikerImpl_Next(IEnumMoniker* iface,ULONG celt, IMoniker** rgelt, - ULONG* pceltFethed) +static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker *iface, ULONG count, + IMoniker **m, ULONG *fetched) { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG i; + TRACE("%p, %u, %p, %p.\n", iface, count, m, fetched); + + if (!m) + return E_INVALIDARG; + + *m = NULL; + /* retrieve the requested number of moniker from the current position */ - for(i=0;((This->currentPos < This->tabSize) && (i < celt));i++) + for(i=0;((This->currentPos < This->tabSize) && (i < count));i++) { - rgelt[i]=This->tabMoniker[This->currentPos++]; - IMoniker_AddRef(rgelt[i]); + m[i] = This->tabMoniker[This->currentPos++]; + IMoniker_AddRef(m[i]); } - if (pceltFethed!=NULL) - *pceltFethed= i; + if (fetched) + *fetched = i; - if (i==celt) - return S_OK; - else - return S_FALSE; + return i == count ? S_OK : S_FALSE; } -/****************************************************************************** - * EnumMonikerImpl_Skip - ******************************************************************************/ -static HRESULT WINAPI -EnumMonikerImpl_Skip(IEnumMoniker* iface,ULONG celt) +static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker *iface, ULONG count) { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - if ((This->currentPos+celt) >= This->tabSize) + TRACE("%p, %u.\n", iface, count); + + if (!count) + return S_OK; + + if ((This->currentPos + count) >= This->tabSize) return S_FALSE; - This->currentPos+=celt; + This->currentPos += count; return S_OK; } @@ -1401,15 +1402,16 @@ EnumMonikerImpl_Reset(IEnumMoniker* iface) return S_OK; } -/****************************************************************************** - * EnumMonikerImpl_Clone - ******************************************************************************/ -static HRESULT WINAPI -EnumMonikerImpl_Clone(IEnumMoniker* iface,IEnumMoniker** ppenum) +static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker *iface, IEnumMoniker **ret) { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - return EnumMonikerImpl_CreateEnumMoniker(This->tabMoniker,This->tabSize,This->currentPos,TRUE,ppenum); + TRACE("%p, %p.\n", iface, ret); + + if (!ret) + return E_INVALIDARG; + + return EnumMonikerImpl_CreateEnumMoniker(This->tabMoniker,This->tabSize,This->currentPos,TRUE,ret); } static const IEnumMonikerVtbl VT_EnumMonikerImpl = diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7e4a42a0ee6..ed2accff6a9 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3163,8 +3163,8 @@ static void test_generic_composite_moniker(void) { "CI1I3", "CA1I2", MKSYS_GENERICCOMPOSITE, L"!I1!I2" }, }; IMoniker *moniker, *inverse, *moniker1, *moniker2, *moniker3, *moniker4; + IEnumMoniker *enummoniker, *enummoniker2; struct test_moniker *m, *m2; - IEnumMoniker *enummoniker; IRunningObjectTable *rot; DWORD hash, cookie; HRESULT hr; @@ -3293,19 +3293,6 @@ todo_wine TEST_MONIKER_TYPE(inverse, MKSYS_GENERICCOMPOSITE); IMoniker_Release(inverse); - /* Enum() */ - hr = IMoniker_Enum(moniker, TRUE, &enummoniker); - ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); - IEnumMoniker_Release(enummoniker); - - hr = IMoniker_Enum(moniker, FALSE, &enummoniker); - ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); - IEnumMoniker_Release(enummoniker); - - hr = IMoniker_Enum(moniker, FALSE, NULL); -todo_wine - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - /* BindToObject() */ hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -3646,6 +3633,183 @@ todo_wine { IMoniker_Release(moniker); + /* Enum() */ + hr = create_moniker_from_desc("CI1CI2I3", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Enum(moniker, FALSE, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Forward direction */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Next(enummoniker, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + moniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Next(enummoniker, 0, &moniker2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!moniker2, "Unexpected pointer.\n"); + + len = 1; + moniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Next(enummoniker, 0, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!len, "Unexpected count %u.\n", len); + ok(!moniker2, "Unexpected pointer.\n"); + + hr = IEnumMoniker_Skip(enummoniker, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I1"); + IMoniker_Release(moniker2); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I2"); + IMoniker_Release(moniker2); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I3"); + IMoniker_Release(moniker2); + + len = 1; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(!len, "Unexpected count %u.\n", len); + + hr = IEnumMoniker_Skip(enummoniker, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Skip(enummoniker, 1); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Clone(enummoniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + enummoniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); +todo_wine { + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker2, "Unexpected pointer.\n"); +} + hr = IEnumMoniker_Reset(enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Skip(enummoniker, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I3"); + IMoniker_Release(moniker2); + + enummoniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); +todo_wine { + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker2, "Unexpected pointer.\n"); +} + IEnumMoniker_Release(enummoniker); + + /* Backward direction */ + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + + hr = IEnumMoniker_Next(enummoniker, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + moniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Next(enummoniker, 0, &moniker2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!moniker2, "Unexpected pointer.\n"); + + len = 1; + moniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Next(enummoniker, 0, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!len, "Unexpected count %u.\n", len); + ok(!moniker2, "Unexpected pointer.\n"); + + hr = IEnumMoniker_Skip(enummoniker, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I3"); + IMoniker_Release(moniker2); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I2"); + IMoniker_Release(moniker2); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I1"); + IMoniker_Release(moniker2); + + len = 1; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(!len, "Unexpected count %u.\n", len); + + hr = IEnumMoniker_Skip(enummoniker, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Skip(enummoniker, 1); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Clone(enummoniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + enummoniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); +todo_wine { + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker2, "Unexpected pointer.\n"); +} + hr = IEnumMoniker_Reset(enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Skip(enummoniker, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I1"); + IMoniker_Release(moniker2); + + enummoniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); +todo_wine { + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker2, "Unexpected pointer.\n"); +} + IEnumMoniker_Release(enummoniker); + + IMoniker_Release(moniker); + IBindCtx_Release(bindctx); } -- 2.33.0

1 4

[PATCH v2] riched20: Fix saving to disk first-indent and left-indent (\fi and \li)
by Philip Hardin 30 Sep '21

30 Sep '21

Signed-off-by: Philip Hardin <phoss(a)tutanota.com> --- dlls/riched20/writer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 7c7e648f107..2477dda7407 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -662,10 +662,12 @@ static BOOL stream_out_para_props( ME_TextEditor *editor, ME_OutStream *pStream, if (!(editor->bEmulateVersion10 && /* v1.0 - 3.0 */ fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE)) { - if (fmt->dxOffset) - sprintf(props + strlen(props), "\\li%d", fmt->dxOffset); - if (fmt->dxStartIndent) - sprintf(props + strlen(props), "\\fi%d", fmt->dxStartIndent); + int first_indent = -fmt->dxOffset; + int left_indent = fmt->dxStartIndent + fmt->dxOffset; + if (first_indent) + sprintf(props + strlen(props), "\\fi%d", first_indent); + if (left_indent) + sprintf(props + strlen(props), "\\li%d", left_indent); if (fmt->dxRightIndent) sprintf(props + strlen(props), "\\ri%d", fmt->dxRightIndent); if (fmt->dwMask & PFM_TABSTOPS) { -- 2.25.1

2 1

[PATCH vkd3d v2] vkd3d: Only disable raster based on SO stream if SO is used.
by Conor McCarthy 30 Sep '21

30 Sep '21

Fixes the black screen problem in Diablo 2: Resurrected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51105 From: Robin Kertels <robin.kertels(a)gmail.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Remove spurious FIXME_ONCE change (my bad). --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9e554b44..73c78d06 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2629,7 +2629,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); have_attachment = graphics->rt_count || graphics->dsv_format || is_dsv_format_unknown; if ((!have_attachment && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) - || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) + || (so_desc->NumEntries != 0 && so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM)) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; rs_stream_info_from_d3d12(&graphics->rs_stream_info, &graphics->rs_desc, so_desc, vk_info); -- 2.32.0

1 0

[PATCH vkd3d] vkd3d: Only disable raster based on SO stream if SO is used.
by Conor McCarthy 30 Sep '21

30 Sep '21

Fixes the black screen problem in Diablo 2: Resurrected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51105 From: Robin Kertels <robin.kertels(a)gmail.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- libs/vkd3d/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9f4a4149..186e4370 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6065,7 +6065,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if } else { - FIXME("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64 + FIXME_ONCE("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64 ", completed value %#"PRIx64".\n", fence, value, completed_value); } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9e554b44..73c78d06 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2629,7 +2629,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); have_attachment = graphics->rt_count || graphics->dsv_format || is_dsv_format_unknown; if ((!have_attachment && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) - || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) + || (so_desc->NumEntries != 0 && so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM)) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; rs_stream_info_from_d3d12(&graphics->rs_stream_info, &graphics->rs_desc, so_desc, vk_info); -- 2.32.0

1 0

[PATCH 1/3] krnl386: Call DOSVM_IntProcRelay() via the application stack.
by Zebediah Figura 30 Sep '21

30 Sep '21

Instead of using a dedicated stack. The dedicated stack was introduced by 9d7ff6c85b0827b7f54989050b4c34f1f459e94d, in order to support potentially nested DPMI interrupts. DPMI support was removed by ed6bdb3c51cd4b8c94f9839806321703e7aa9765; hence there is no longer a reason to account for nested interrupts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/krnl386.exe16/dosexe.h | 2 - dlls/krnl386.exe16/dosmem.c | 8 -- dlls/krnl386.exe16/interrupts.c | 9 +-- dlls/krnl386.exe16/relay.c | 132 +------------------------------- 4 files changed, 3 insertions(+), 148 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index c4c8def5dce..42b8e0f4437 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -41,7 +41,6 @@ typedef void (WINAPI *INTPROC)(CONTEXT*); extern WORD DOSVM_psp DECLSPEC_HIDDEN; /* psp of current DOS task */ extern WORD int16_sel DECLSPEC_HIDDEN; extern WORD relay_code_sel DECLSPEC_HIDDEN; -extern WORD relay_data_sel DECLSPEC_HIDDEN; #define ADD_LOWORD(dw,val) ((dw) = ((dw) & 0xffff0000) | LOWORD((DWORD)(dw)+(val))) @@ -247,7 +246,6 @@ extern DWORD DOSVM_inport( int port, int size ) DECLSPEC_HIDDEN; extern void DOSVM_outport( int port, int size, DWORD value ) DECLSPEC_HIDDEN; /* relay.c */ -void DOSVM_RelayHandler( CONTEXT * ) DECLSPEC_HIDDEN; void DOSVM_BuildCallFrame( CONTEXT *, DOSRELAY, LPVOID ) DECLSPEC_HIDDEN; #endif /* __WINE_DOSEXE_H */ diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c index 36b02aec484..2d55eb050de 100644 --- a/dlls/krnl386.exe16/dosmem.c +++ b/dlls/krnl386.exe16/dosmem.c @@ -45,7 +45,6 @@ WORD DOSMEM_BiosSysSeg; /* BIOS ROM segment at 0xf000:0 */ WORD DOSVM_psp = 0; WORD int16_sel = 0; WORD relay_code_sel = 0; -WORD relay_data_sel = 0; /* DOS memory highest address (including HMA) */ #define DOSMEM_SIZE 0x110000 @@ -306,7 +305,6 @@ static void DOSMEM_InitSegments(void) static const char relay[]= { 0xca, 0x04, 0x00, /* 16-bit far return and pop 4 bytes (relay void* arg) */ - 0xcd, 0x31, /* int 31 */ }; /* @@ -330,17 +328,11 @@ static void DOSMEM_InitSegments(void) /* * PM / offset 0: Stub where __wine_call_from_16_regs returns. - * PM / offset 3: Stub which swaps back to 32-bit application code/stack. */ relay_code_sel = GLOBAL_Alloc( GMEM_FIXED, sizeof(relay), 0, LDT_FLAGS_CODE ); ptr = GlobalLock16( relay_code_sel ); memcpy( ptr, relay, sizeof(relay) ); GlobalUnlock16( relay_code_sel ); - - /* - * Space for 16-bit stack used by relay code. - */ - relay_data_sel = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, DOSVM_RELAY_DATA_SIZE ); } /****************************************************************** diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index e2a129e4a20..d397d20072d 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -250,14 +250,7 @@ BOOL DOSVM_EmulateInterruptPM( CONTEXT *context, BYTE intnum ) DOSMEM_InitDosMemory(); - if (context->SegCs == relay_code_sel) - { - /* - * This must not be called using DOSVM_BuildCallFrame. - */ - DOSVM_RelayHandler( context ); - } - else if (context->SegCs == int16_sel) + if (context->SegCs == int16_sel) { /* Restore original flags stored into the stack by the caller. */ WORD *stack = CTX_SEG_OFF_TO_LIN(context, diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index 3559bb460a7..116198e5ddb 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -34,26 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); -/* - * Magic DWORD used to check stack integrity. - */ -#define RELAY_MAGIC 0xabcdef00 - -/* - * Memory block for temporary 16-bit stacks used with relay calls. - */ -typedef struct { - DWORD inuse; /* non-zero if stack block is in use */ - DWORD eip; /* saved ip */ - DWORD seg_cs; /* saved cs */ - DWORD esp; /* saved sp */ - DWORD seg_ss; /* saved ss */ - DWORD stack_bottom; /* guard dword */ - BYTE stack[256-7*4]; /* 16-bit stack */ - DWORD stack_top; /* guard dword */ -} RELAY_Stack16; - - static const char **debug_relay_excludelist; static const char **debug_relay_includelist; static const char **debug_snoop_excludelist; @@ -572,58 +552,6 @@ int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *conte return ret_val; } -/********************************************************************** - * RELAY_GetPointer - * - * Get pointer to stack block when given esp pointing to 16-bit stack - * inside relay data segment. - */ -static RELAY_Stack16 *RELAY_GetPointer( DWORD offset ) -{ - offset = offset / sizeof(RELAY_Stack16) * sizeof(RELAY_Stack16); - return MapSL(MAKESEGPTR(relay_data_sel, offset)); -} - - -/********************************************************************** - * RELAY_MakeShortContext - * - * Allocate separate 16-bit stack, make stack pointer point to this - * stack and make code pointer point to stub that restores everything. - * So, after this routine, SS and CS are guaranteed to be 16-bit. - * - * Note: This might be called from signal handler, so the stack - * allocation algorithm must be signal safe. - */ -static void RELAY_MakeShortContext( CONTEXT *context ) -{ - DWORD offset = offsetof(RELAY_Stack16, stack_top); - RELAY_Stack16 *stack = RELAY_GetPointer( 0 ); - - while (stack->inuse && offset < DOSVM_RELAY_DATA_SIZE) { - stack++; - offset += sizeof(RELAY_Stack16); - } - - if (offset >= DOSVM_RELAY_DATA_SIZE) - ERR( "Too many nested interrupts!\n" ); - - stack->inuse = 1; - stack->eip = context->Eip; - stack->seg_cs = context->SegCs; - stack->esp = context->Esp; - stack->seg_ss = context->SegSs; - - stack->stack_bottom = RELAY_MAGIC; - stack->stack_top = RELAY_MAGIC; - - context->SegSs = relay_data_sel; - context->Esp = offset; - context->SegCs = relay_code_sel; - context->Eip = 3; -} - - /********************************************************************** * RELAY_RelayStub * @@ -632,58 +560,9 @@ static void RELAY_MakeShortContext( CONTEXT *context ) */ static void __stdcall RELAY_RelayStub( DOSRELAY proc, unsigned char *args, CONTEXT *context ) { - if (proc) - { - RELAY_Stack16 *stack = RELAY_GetPointer( context->Esp ); - - DWORD old_seg_cs = context->SegCs; - DWORD old_eip = context->Eip; - DWORD old_seg_ss = context->SegSs; - DWORD old_esp = context->Esp; - - context->SegCs = stack->seg_cs; - context->Eip = stack->eip; - context->SegSs = stack->seg_ss; - context->Esp = stack->esp; - - proc( context, *(LPVOID *)args ); - - stack->seg_cs = context->SegCs; - stack->eip = context->Eip; - stack->seg_ss = context->SegSs; - stack->esp = context->Esp; - - context->SegCs = old_seg_cs; - context->Eip = old_eip; - context->SegSs = old_seg_ss; - context->Esp = old_esp; - } + proc( context, *(LPVOID *)args ); } - -/********************************************************************** - * DOSVM_RelayHandler - * - * Restore saved code and stack pointers and release stack block. - */ -void DOSVM_RelayHandler( CONTEXT *context ) -{ - RELAY_Stack16 *stack = RELAY_GetPointer( context->Esp ); - - context->SegSs = stack->seg_ss; - context->Esp = stack->esp; - context->SegCs = stack->seg_cs; - context->Eip = stack->eip; - - if (!stack->inuse || - stack->stack_bottom != RELAY_MAGIC || - stack->stack_top != RELAY_MAGIC) - ERR( "Stack corrupted!\n" ); - - stack->inuse = 0; -} - - /********************************************************************** * DOSVM_BuildCallFrame * @@ -692,13 +571,6 @@ void DOSVM_RelayHandler( CONTEXT *context ) */ void DOSVM_BuildCallFrame( CONTEXT *context, DOSRELAY relay, LPVOID data ) { - WORD code_sel = relay_code_sel; - - /* - * Allocate separate stack for relay call. - */ - RELAY_MakeShortContext( context ); - /* * Build call frame. */ @@ -713,7 +585,7 @@ void DOSVM_BuildCallFrame( CONTEXT *context, DOSRELAY relay, LPVOID data ) PUSH_WORD16( context, HIWORD(RELAY_RelayStub) ); /* STACK16FRAME.relay.hiword */ PUSH_WORD16( context, LOWORD(RELAY_RelayStub) ); /* STACK16FRAME.relay.loword */ PUSH_WORD16( context, 0 ); /* STACK16FRAME.module_cs.hiword */ - PUSH_WORD16( context, code_sel ); /* STACK16FRAME.module_cs.loword */ + PUSH_WORD16( context, relay_code_sel ); /* STACK16FRAME.module_cs.loword */ PUSH_WORD16( context, 0 ); /* STACK16FRAME.callfrom_ip.hiword */ PUSH_WORD16( context, 0 ); /* STACK16FRAME.callfrom_ip.loword */ -- 2.33.0

4 6

[PATCH v6 1/5] winegstreamer: Factor out more of the init_gst callback into wg_parser_connect().
by Zebediah Figura 29 Sep '21

29 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 78 +++++++++++----------------------- 1 file changed, 24 insertions(+), 54 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 169f223c5a5..68e453e9944 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1494,6 +1494,7 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("quartz_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); unsigned int i; + int ret; parser->file_size = file_size; parser->sink_connected = true; @@ -1516,12 +1517,29 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s parser->start_offset = parser->next_offset = parser->stop_offset = 0; parser->next_pull_offset = 0; + parser->error = false; if (!parser->init_gst(parser)) return E_FAIL; + gst_element_set_state(parser->container, GST_STATE_PAUSED); + ret = gst_element_get_state(parser->container, NULL, NULL, -1); + if (ret == GST_STATE_CHANGE_FAILURE) + { + GST_ERROR("Failed to play stream.\n"); + return E_FAIL; + } + pthread_mutex_lock(&parser->mutex); + while (!parser->no_more_pads && !parser->error) + pthread_cond_wait(&parser->init_cond, &parser->mutex); + if (parser->error) + { + pthread_mutex_unlock(&parser->mutex); + return E_FAIL; + } + for (i = 0; i < parser->stream_count; ++i) { struct wg_parser_stream *stream = parser->streams[i]; @@ -1677,7 +1695,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); pthread_mutex_lock(&parser->mutex); - parser->no_more_pads = parser->error = false; + parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) @@ -1686,24 +1704,6 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) return FALSE; } - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } - - pthread_mutex_lock(&parser->mutex); - while (!parser->no_more_pads && !parser->error) - pthread_cond_wait(&parser->init_cond, &parser->mutex); - if (parser->error) - { - pthread_mutex_unlock(&parser->mutex); - return FALSE; - } - pthread_mutex_unlock(&parser->mutex); - return TRUE; } @@ -1724,7 +1724,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); pthread_mutex_lock(&parser->mutex); - parser->no_more_pads = parser->error = false; + parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) @@ -1733,24 +1733,6 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) return FALSE; } - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } - - pthread_mutex_lock(&parser->mutex); - while (!parser->no_more_pads && !parser->error) - pthread_cond_wait(&parser->init_cond, &parser->mutex); - if (parser->error) - { - pthread_mutex_unlock(&parser->mutex); - return FALSE; - } - pthread_mutex_unlock(&parser->mutex); - return TRUE; } @@ -1781,15 +1763,9 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) GST_ERROR("Failed to link source pads, error %d.\n", ret); return FALSE; } - gst_pad_set_active(stream->my_sink, 1); - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } + + parser->no_more_pads = true; return TRUE; } @@ -1821,15 +1797,9 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) GST_ERROR("Failed to link source pads, error %d.\n", ret); return FALSE; } - gst_pad_set_active(stream->my_sink, 1); - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } + + parser->no_more_pads = true; return TRUE; } -- 2.33.0

4 17

[PATCH] dplayx: Map global memory anywhere if the standard address is unavailable.
by Tim Clem 29 Sep '21

29 Sep '21

Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- There's an existing code path and ERR log that seems to assume MapViewOfFileEx will already do this, but it doesn't. As the comments note, if this memory winds up somewhere else, it will cause problems if more than one process is trying to use dplay. However, the current code breaks in all circumstances if the fixed address is unavailable. dlls/dplayx/dplayx_global.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index a544cd2196e9..957f7cf46f57 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -418,6 +418,15 @@ BOOL DPLAYX_ConstructData(void) FILE_MAP_WRITE, 0, 0, 0, lpDesiredMemoryMapStart ); + if( lpSharedStaticData == NULL && GetLastError() == ERROR_INVALID_ADDRESS ) + { + /* We couldn't map the data where we wanted. Try again, allowing any + * location. */ + lpSharedStaticData = MapViewOfFile( hDplayxSharedMem, + FILE_MAP_WRITE, + 0, 0, 0 ); + } + if( lpSharedStaticData == NULL ) { ERR( ": unable to map static data into process memory space (%d)\n", -- 2.33.0

1 0

[PATCH 1/2] dinput: Factor out HID value retrieval in joystick_osx
by Tim Clem 29 Sep '21

29 Sep '21

Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- Ideally we would use IOHIDDeviceCopyValueMultiple or IOHIDTransactions to fetch all these element values at once, but my own testing and this message from an Apple engineer confirm that those don't work for input elements: https://www.mail-archive.com/usb%40lists.apple.com/msg00438.html dlls/dinput/joystick_osx.c | 57 +++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index e8732bd696c0..2db9e521a1ed 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -110,6 +110,7 @@ struct JoystickImpl /* osx private */ int id; CFArrayRef elements; + int *element_values; ObjProps **propmap; FFDeviceObjectReference ff; struct list effects; @@ -753,6 +754,9 @@ static void get_osx_device_elements(JoystickImpl *device, uint64_t axis_map[8]) CFRelease(povs); CFRelease(buttons); CFRelease(elements); + + device->element_values = HeapAlloc(GetProcessHeap(), 0, + CFArrayGetCount(device->elements) * sizeof(int)); } else { @@ -786,6 +790,29 @@ static void get_osx_device_elements_props(JoystickImpl *device) } } +static IOReturn get_element_values(IOHIDDeviceRef hid_device, JoystickImpl *device) +{ + CFIndex i, element_count = CFArrayGetCount(device->elements); + IOReturn ret = kIOReturnSuccess; + IOHIDElementRef element; + IOHIDValueRef valueRef; + + for (i = 0; i < element_count; i++) + { + element = (IOHIDElementRef)CFArrayGetValueAtIndex(device->elements, i); + ret = IOHIDDeviceGetValue(hid_device, element, &valueRef); + if (ret != kIOReturnSuccess) + { + ERR("error getting value of element %s: %08x\n", debugstr_element(element), ret); + break; + } + + device->element_values[i] = IOHIDValueGetIntegerValue(valueRef); + } + + return ret; +} + static void poll_osx_device_state( IDirectInputDevice8W *iface ) { JoystickImpl *device = impl_from_IDirectInputDevice8W( iface ); @@ -805,6 +832,9 @@ static void poll_osx_device_state( IDirectInputDevice8W *iface ) if (device->elements) { + if (get_element_values(hid_device, device) != kIOReturnSuccess) + return; + int button_idx = 0; int pov_idx = 0; int slider_idx = 0; @@ -813,8 +843,7 @@ static void poll_osx_device_state( IDirectInputDevice8W *iface ) for ( idx = 0; idx < cnt; idx++ ) { - IOHIDValueRef valueRef; - int val, oldVal, newVal; + int oldVal, newVal, val = device->element_values[idx]; IOHIDElementRef element = ( IOHIDElementRef ) CFArrayGetValueAtIndex( device->elements, idx ); int type = IOHIDElementGetType( element ); @@ -826,16 +855,10 @@ static void poll_osx_device_state( IDirectInputDevice8W *iface ) TRACE("kIOHIDElementTypeInput_Button\n"); if(button_idx < 128) { - valueRef = NULL; - if (IOHIDDeviceGetValue(hid_device, element, &valueRef) != kIOReturnSuccess) - return; - if (valueRef == NULL) - return; - val = IOHIDValueGetIntegerValue(valueRef); newVal = val ? 0x80 : 0x0; oldVal = device->generic.js.rgbButtons[button_idx]; device->generic.js.rgbButtons[button_idx] = newVal; - TRACE("valueRef %s val %d oldVal %d newVal %d\n", debugstr_cf(valueRef), val, oldVal, newVal); + TRACE("val %d oldVal %d newVal %d\n", val, oldVal, newVal); if (oldVal != newVal) { inst_id = DIDFT_MAKEINSTANCE(button_idx) | DIDFT_PSHBUTTON; @@ -855,19 +878,13 @@ static void poll_osx_device_state( IDirectInputDevice8W *iface ) case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Hatswitch): { TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Hatswitch\n"); - valueRef = NULL; - if (IOHIDDeviceGetValue(hid_device, element, &valueRef) != kIOReturnSuccess) - return; - if (valueRef == NULL) - return; - val = IOHIDValueGetIntegerValue(valueRef); oldVal = device->generic.js.rgdwPOV[pov_idx]; if ((val > device->generic.props[idx].lDevMax) || (val < device->generic.props[idx].lDevMin)) newVal = -1; else newVal = (val - device->generic.props[idx].lDevMin) * 4500; device->generic.js.rgdwPOV[pov_idx] = newVal; - TRACE("valueRef %s val %d oldVal %d newVal %d\n", debugstr_cf(valueRef), val, oldVal, newVal); + TRACE("val %d oldVal %d newVal %d\n", val, oldVal, newVal); if (oldVal != newVal) { inst_id = DIDFT_MAKEINSTANCE(pov_idx) | DIDFT_POV; @@ -890,12 +907,6 @@ static void poll_osx_device_state( IDirectInputDevice8W *iface ) { int wine_obj = -1; - valueRef = NULL; - if (IOHIDDeviceGetValue(hid_device, element, &valueRef) != kIOReturnSuccess) - return; - if (valueRef == NULL) - return; - val = IOHIDValueGetIntegerValue(valueRef); newVal = joystick_map_axis(&device->generic.props[idx], val); switch (MAKEUINT64(usage_page, usage)) { @@ -945,7 +956,7 @@ static void poll_osx_device_state( IDirectInputDevice8W *iface ) slider_idx ++; break; } - TRACE("valueRef %s val %d oldVal %d newVal %d\n", debugstr_cf(valueRef), val, oldVal, newVal); + TRACE("val %d oldVal %d newVal %d\n", val, oldVal, newVal); if ((wine_obj != -1) && (oldVal != newVal)) { -- 2.33.0

1 1

Re: [PATCH v1] gdi32:Implement EngwideChartomultibyte.
by Alex Henrie 29 Sep '21

29 Sep '21

On Tue, Sep 28, 2021 at 8:43 PM dongpengpeng <dongpengpeng(a)uniontech.com> wrote: > Thanks for the patch. Could you please resend with your name properly written with capitalization and spaces? -Alex

2 1

[PATCH v3 1/4] ws2_32/tests: Use %u and %Iu in test_ipv6_cmsg instead of casting
by Alex Henrie 29 Sep '21

29 Sep '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v3: Use %Iu instead of %zu --- dlls/ws2_32/tests/sock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8cbb393b542..ec8a3b0481b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2032,11 +2032,11 @@ static void test_ipv6_cmsg(void) ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); - ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(count == sizeof(payload), "expected length %Iu, got %u\n", sizeof(payload), count); ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); ok(header->cmsg_type == IPV6_HOPLIMIT, "expected IPV6_HOPLIMIT, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(INT), - "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); + "expected length %Iu, got %Iu\n", sizeof(*header) + sizeof(INT), header->cmsg_len); ok(*int_data >= 32, "expected at least 32, got %i\n", *int_data); setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); @@ -2054,11 +2054,11 @@ static void test_ipv6_cmsg(void) ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); - ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(count == sizeof(payload), "expected length %Iu, got %u\n", sizeof(payload), count); ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); ok(header->cmsg_type == IPV6_PKTINFO, "expected IPV6_PKTINFO, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(IN6_PKTINFO), - "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(IN6_PKTINFO)), (INT)header->cmsg_len); + "expected length %Iu, got %Iu\n", sizeof(*header) + sizeof(IN6_PKTINFO), header->cmsg_len); ok(!memcmp(&pkt_info->ipi6_addr, &localhost.sin6_addr, sizeof(IN6_ADDR)), "expected ::1\n"); rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_PKTINFO, error %u\n", WSAGetLastError()); @@ -2076,11 +2076,11 @@ static void test_ipv6_cmsg(void) ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); - ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(count == sizeof(payload), "expected length %Iu, got %u\n", sizeof(payload), count); ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); ok(header->cmsg_type == IPV6_TCLASS, "expected IPV6_TCLASS, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(INT), - "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); + "expected length %Iu, got %Iu\n", sizeof(*header) + sizeof(INT), header->cmsg_len); ok(*int_data == 0, "expected 0, got %i\n", *int_data); rc = setsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_RECVTCLASS, error %u\n", WSAGetLastError()); -- 2.33.0

3 8

[PATCH 1/3] wined3d: Call prepare_upload_bo in wined3d_device_context_emit_map() only for DISCARD or NOOVERWRITE maps.
by Zebediah Figura 29 Sep '21

29 Sep '21

We can't do an asynchronous upload with just WINED3D_MAP_WRITE, but we can with update_sub_resource, and prepare_upload_bo doesn't know which it was called from. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1cbbc43399a..376ee1a6c7e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2465,7 +2465,8 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); - if ((*map_ptr = context->ops->prepare_upload_bo(context, resource, + if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + && (*map_ptr = context->ops->prepare_upload_bo(context, resource, sub_resource_idx, box, row_pitch, slice_pitch, flags, &addr))) { TRACE("Returning upload bo %s, map pointer %p, row pitch %u, slice pitch %u.\n", -- 2.33.0

4 8

[PATCH 1/3] hidclass.sys: Don't leak report queues on device removal.
by Rémi Bernon 29 Sep '21

29 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 27 ++++++++++++++++++++++++++- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 6 ++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 848f8da906a..21941a1802e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -116,9 +116,10 @@ static struct hid_report_queue *hid_report_queue_create( void ) return queue; } -static void hid_report_queue_destroy( struct hid_report_queue *queue ) +void hid_report_queue_destroy( struct hid_report_queue *queue ) { while (queue->length--) hid_report_decref( queue->reports[queue->length] ); + list_remove( &queue->entry ); free( queue ); } @@ -654,10 +655,22 @@ NTSTATUS WINAPI pdo_create(DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_report_queue *queue; + BOOL removed; KIRQL irql; TRACE("Open handle on device %p\n", device); + KeAcquireSpinLock( &ext->u.pdo.lock, &irql ); + removed = ext->u.pdo.removed; + KeReleaseSpinLock( &ext->u.pdo.lock, irql ); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_DELETE_PENDING; + } + if (!(queue = hid_report_queue_create())) irp->IoStatus.Status = STATUS_NO_MEMORY; else { @@ -677,10 +690,22 @@ NTSTATUS WINAPI pdo_close(DEVICE_OBJECT *device, IRP *irp) { struct hid_report_queue *queue = irp->Tail.Overlay.OriginalFileObject->FsContext; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + BOOL removed; KIRQL irql; TRACE("Close handle on device %p\n", device); + KeAcquireSpinLock( &ext->u.pdo.lock, &irql ); + removed = ext->u.pdo.removed; + KeReleaseSpinLock( &ext->u.pdo.lock, irql ); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_DELETE_PENDING; + } + if (queue) { KeAcquireSpinLock( &ext->u.pdo.report_queues_lock, &irql ); diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index e65fabb2aea..60f3d0fb57e 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -123,7 +123,7 @@ void call_minidriver( ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in /* Internal device functions */ void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; - +void hid_report_queue_destroy( struct hid_report_queue *queue ); IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) DECLSPEC_HIDDEN; NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 8755afbce6c..8c0c8adafe6 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -387,6 +387,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; NTSTATUS status = irp->IoStatus.Status; + struct hid_report_queue *queue, *next; KIRQL irql; TRACE("irp %p, minor function %#x.\n", irp, irpsp->MinorFunction); @@ -498,6 +499,11 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) } CloseHandle(ext->u.pdo.halt_event); + KeAcquireSpinLock( &ext->u.pdo.report_queues_lock, &irql ); + LIST_FOR_EACH_ENTRY_SAFE( queue, next, &ext->u.pdo.report_queues, struct hid_report_queue, entry ) + hid_report_queue_destroy( queue ); + KeReleaseSpinLock( &ext->u.pdo.report_queues_lock, irql ); + HidP_FreeCollectionDescription(&ext->u.pdo.device_desc); RtlFreeUnicodeString(&ext->u.pdo.link_name); -- 2.33.0

2 6

[PATCH] riched20: Fix saving to disk first-indent and left-indent (\fi and \li)
by Philip Hardin 29 Sep '21

29 Sep '21

Signed-off-by: Philip Hardin <phoss(a)tutanota.com> --- dlls/riched20/writer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 7c7e648f107..2477dda7407 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -662,10 +662,12 @@ static BOOL stream_out_para_props( ME_TextEditor *editor, ME_OutStream *pStream, if (!(editor->bEmulateVersion10 && /* v1.0 - 3.0 */ fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE)) { - if (fmt->dxOffset) - sprintf(props + strlen(props), "\\li%d", fmt->dxOffset); - if (fmt->dxStartIndent) - sprintf(props + strlen(props), "\\fi%d", fmt->dxStartIndent); + int first_indent = -fmt->dxOffset; + int left_indent = fmt->dxStartIndent + fmt->dxOffset; + if (first_indent) + sprintf(props + strlen(props), "\\fi%d", first_indent); + if (left_indent) + sprintf(props + strlen(props), "\\li%d", left_indent); if (fmt->dxRightIndent) sprintf(props + strlen(props), "\\ri%d", fmt->dxRightIndent); if (fmt->dwMask & PFM_TABSTOPS) { -- 2.25.1

2 1

[PATCH] wined3d: Do not call list_remove() on a Vulkan query which has not been started.
by Zebediah Figura 29 Sep '21

29 Sep '21

Or call it twice on one which has. This fixes a crash in Mafia: Definitive Edition. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/query.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 24892e42b34..8ee7ae07886 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1661,7 +1661,6 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); - list_remove(&query_vk->entry); if (query_vk->pending_count) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); memset((void *)query->data, 0, query->data_size); @@ -1742,7 +1741,8 @@ static void wined3d_query_vk_destroy(struct wined3d_query *query) struct wined3d_query_vk *query_vk = wined3d_query_vk(query); struct wined3d_context_vk *context_vk; - list_remove(&query_vk->entry); + if (query_vk->flags & WINED3D_QUERY_VK_FLAG_STARTED) + list_remove(&query_vk->entry); if (query_vk->pending_count) { context_vk = wined3d_context_vk(context_acquire(query_vk->q.device, NULL, 0)); @@ -1942,7 +1942,6 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data = query_vk + 1; wined3d_query_init(&query_vk->q, device, type, data, data_size, ops, parent, parent_ops); - list_init(&query_vk->entry); switch (type) { -- 2.33.0

2 1

[PATCH v3] d2d1/tests: Add tests for 2D affine effect.
by Ziqing Hui 29 Sep '21

29 Sep '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Draw image in centre of the render target. dlls/d2d1/tests/d2d1.c | 149 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d38d49cd139..4beba7c963a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9897,6 +9897,154 @@ static void test_effect(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_2d_affine(BOOL d3d11) +{ + D2D1_MATRIX_3X2_F rotate, scale, skew; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + D2D_RECT_F output_bounds = {0}; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + unsigned int i, x, y, w, h; + D2D1_SIZE_U input_size; + ID2D1Factory1 *factory; + D2D1_POINT_2F offset; + ID2D1Bitmap1 *bitmap; + ID2D1Effect *effect; + ID2D1Image *output; + BOOL match; + HRESULT hr; + + static const DWORD image_4x4[] = + { + 0xfdcba987, 0xffff0000, 0x98765432, 0xffffffff, + 0x4b4b4b4b, 0x89abcdef, 0xdeadbeef, 0xabcdef01, + 0x7f000011, 0x40ffffff, 0x12345678, 0xaabbccdd, + 0x44444444, 0xff7f7f7f, 0x1221abba, 0x00000000 + }; + DWORD image_16x16[16 * 16]; + + const struct effect_2d_affine_test + { + const DWORD *img_data; + unsigned int img_width; + unsigned int img_height; + + D2D1_MATRIX_3X2_F *matrix; + + D2D_RECT_F bounds; + const char *figure; + } + effect_2d_affine_tests[] = + { + {image_4x4, 4, 4, &rotate, {-6.0f, -3.0f, 2.0f, 4.0f}, + "ASgBAQkBAQEBBwEBAQEBAQYBAQEBAQEHAQEBASgA"}, + {image_4x4, 4, 4, &scale, {-2.0f, -3.0f, 1.0f, 9.0f}, + "AQ8BAQEEAQEBBAEBAQQBAQEEAQEBBAEBAQQBAQEEAQEBBAEBAQQBAQEEAQEBBAEBARAA/"}, + {image_4x4, 4, 4, &skew, {-7.0f, -3.0f, 3.0f, 7.0f}, + "AS8CCwEBAQEJAQEBAQEBBwEBAQEBAQEBBgEBAQEBAQEBBwEBAQEBAQkCAj0A"}, + {image_16x16, 16, 16, &rotate, {-14.0f, -3.0f, 10.0f, 21.0f}, + "AWACGQECARcBBAEVAQYBEwEIAREBCgEPAQwBDQEOAQsBEAEJARIBBwEUAQUBARQBAQUBARIBAQcB" + "ARABAQkBAQ4BAQsBAQwBAQ0BAQoBAQ8BAQgBAREBAQYBARMBAQQBARUBAQIBARcBAgEZAkUA"}, + {image_16x16, 16, 16, &scale, {-2.0f, -3.0f, 10.0f, 39.0f}, + "ASEMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQM" + "BAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDCIA"}, + {image_16x16, 16, 16, &skew, {-19.0f, -3.0f, 15.0f, 31.0f}, + "AYMBAiMBAgEhAQQBHwEGAR0BCAEbAQoBGQEMARcBDgEVARABEwESAREBFAEPARYBDQEYAQsBGgEJ" + "ARwBBwEeAQYBHgEHARwBCQEaAQsBGAENARYBDwEUAREBEgETARABFQEOARcBDAEZAQoBGwEIAR0B" + "BgEfAQQBIQECASMChAEA"}, + }; + + memset(image_16x16, 0xff, sizeof(image_16x16)); + set_matrix_identity(&rotate); + set_matrix_identity(&scale); + set_matrix_identity(&skew); + translate_matrix(&rotate, -2.0f, -2.0f); + translate_matrix(&scale, -2.0f, -2.0f); + translate_matrix(&skew, -2.0f, -2.0f); + rotate_matrix(&rotate, M_PI_4); + scale_matrix(&scale, 0.75f, 2.5f); + skew_matrix(&skew, -1.0f, 1.0f); + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(effect_2d_affine_tests); ++i) + { + const struct effect_2d_affine_test *test = &effect_2d_affine_tests[i]; + winetest_push_context("Test %u", i); + + set_size_u(&input_size, test->img_width, test->img_height); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(context, input_size, test->img_data, + sizeof(*test->img_data) * test->img_width, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE); + todo_wine + hr = ID2D1Effect_SetValue(effect, D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX, + D2D1_PROPERTY_TYPE_MATRIX_3X2, (const BYTE *)test->matrix, sizeof(*test->matrix)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1Effect_GetOutput(effect, &output); + + ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); + todo_wine + ok(compare_rect(&output_bounds, test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom, 1), + "Got unexpected output bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + output_bounds.left, output_bounds.top, output_bounds.right, output_bounds.bottom, + test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom); + if (output_bounds.left == output_bounds.right || output_bounds.top == output_bounds.bottom) + { + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + continue; + } + + ID2D1DeviceContext_BeginDraw(context); + ID2D1DeviceContext_Clear(context, 0); + offset.x = 320.0f; + offset.y = 240.0f; + ID2D1DeviceContext_DrawImage(context, output, &offset, NULL, 0, 0); + hr = ID2D1DeviceContext_EndDraw(context, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + x = offset.x + output_bounds.left - 2.0f; + y = offset.y + output_bounds.top - 2.0f; + w = (output_bounds.right - output_bounds.left) + 4.0f; + h = (output_bounds.bottom - output_bounds.top) + 4.0f; + match = compare_figure(&ctx, x, y, w, h, 0xff652e89, 0, test->figure); + todo_wine + ok(match, "Figure does not match.\n"); + + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + } + + ID2D1Effect_Release(effect); + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9959,6 +10107,7 @@ START_TEST(d2d1) queue_test(test_geometry_group); queue_test(test_mt_factory); queue_test(test_effect); + queue_test(test_effect_2d_affine); run_queued_tests(); } -- 2.25.1

2 1

[PATCH] server: Fix Error found with Valgrind
by Andreas Pickart 29 Sep '21

29 Sep '21

Hi, currently i am trying to find and fix Errors occuring with (at first) winemine when run through Valgrind. This is my first Patch: Patch against Wine version 6.18-gde7adacedbdd78fd1ed8ee0986a78670e11a60bc server: Fix Error found with Valgrind: ==14116== Conditional jump or move depends on uninitialised value(s) ==14116== at 0x164AF0: req_select (thread.c:1585) ==14116== by 0x15701F: call_req_handler (request.c:312) ==14116== by 0x157257: read_request (request.c:367) ==14116== by 0x1615B3: thread_poll_event (thread.c:393) ==14116== by 0x12BD8A: fd_poll_event (fd.c:548) ==14116== by 0x12C070: main_loop_epoll (fd.c:642) ==14116== by 0x12C63B: main_loop (fd.c:998) ==14116== by 0x13769A: main (main.c:149) ==14116== Uninitialised value was created by a client request ==14116== at 0x13E8A5: mark_block_uninitialized (object.c:110) ==14116== by 0x13E92D: mem_alloc (object.c:120) ==14116== by 0x13EBDD: alloc_object (object.c:199) ==14116== by 0x141100: create_process (process.c:623) ==14116== by 0x157AB9: master_socket_poll_event (request.c:587) ==14116== by 0x12BD8A: fd_poll_event (fd.c:548) ==14116== by 0x12C070: main_loop_epoll (fd.c:642) ==14116== by 0x12C63B: main_loop (fd.c:998) ==14116== by 0x13769A: main (main.c:149) diff --git a/server/process.c b/server/process.c index 8109fbe8de4..e07a5736f02 100644 --- a/server/process.c +++ b/server/process.c @@ -639,6 +639,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->is_system = 0; process->debug_children = 1; process->is_terminating = 0; + process->machine = IMAGE_FILE_MACHINE_UNKNOWN; process->imagelen = 0; process->image = NULL; process->job = NULL;

1 0

[PATCH 11/11] gdi32: Use single get_cptable implementation.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 15 --------------- dlls/gdi32/ntgdi_private.h | 1 + 3 files changed, 2 insertions(+), 16 deletions(-)

2 1

[PATCH 10/11] gdi32: Move ntgdi functions to Unix library.
by Jacek Caban 29 Sep '21

29 Sep '21

3 2

[PATCH 09/11] gdi32: Avoid using CRT wide char functions in ntgdi functions.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/win32u_private.h | 90 +++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)

2 1

[PATCH 08/11] gdi32: Introduce user_callbacks.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 3 +- dlls/gdi32/driver.c | 74 ++++++++----------- dlls/gdi32/freetype.c | 18 +++++ dlls/gdi32/gdiobj.c | 9 +-- dlls/gdi32/ntgdi_private.h | 3 +- dlls/gdi32/palette.c | 27 ++----- dlls/gdi32/region.c | 11 +-- dlls/gdi32/win32u_private.h | 41 +++++++++++ dlls/gdi32/wrappers.c | 141 ++++++++++++++++++++++++++++++++++++ 9 files changed, 246 insertions(+), 81 deletions(-) create mode 100644 dlls/gdi32/win32u_private.h create mode 100644 dlls/gdi32/wrappers.c

2 1

[PATCH 07/11] gdi32: Don't use WideCharToMultiByte in font.c.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 56 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-)

2 1

[PATCH 06/11] gdi32: Use NtGdiOpenDCW for CreateDCW.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 62 +++++------ dlls/gdi32/driver.c | 188 +++----------------------------- dlls/gdi32/emfdrv.c | 2 +- dlls/gdi32/gdidc.c | 215 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 3 +- 5 files changed, 260 insertions(+), 210 deletions(-)

2 1

[PATCH 05/11] gdi32: Remove unused argument from CreateDC driver entry point.
by Jacek Caban 29 Sep '21

29 Sep '21

2 1

[PATCH 04/11] gdi32: Get codepages and OS version directly from PEB.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/font.c | 30 ++++++++++++++++++++---------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + 4 files changed, 23 insertions(+), 12 deletions(-)

2 1

[PATCH 03/11] gdi32: Don't use wide string literals ntgdi functions.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 111 +++++++++++++++++----------- dlls/gdi32/gdiobj.c | 176 +++++++++++++++++++++++++++++--------------- 2 files changed, 186 insertions(+), 101 deletions(-)

2 1

[PATCH 02/11] user32: Always initialize graphics_driver in load_desktop_driver.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 01/11] gdi32: Fix NT prefix handling in update_external_font_keys.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 2/2] secur32: Don't allocate new handles in the wrapper.
by Hans Leidekker 29 Sep '21

29 Sep '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/wrapper.c | 292 ++++++++--------------------------------- 1 file changed, 52 insertions(+), 240 deletions(-) diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 4748de83d4f..e4475069b86 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -30,34 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); -/* Tries to allocate a new SecHandle, into which it stores package (in - * phSec->dwUpper) and a copy of realHandle (stored in phSec->dwLower). - * SecHandle is equivalent to both a CredHandle and a CtxtHandle. - */ -static SECURITY_STATUS make_sec_handle(PSecHandle phSec, SecurePackage *package, PSecHandle realHandle) -{ - SECURITY_STATUS ret; - - TRACE("%p %p %p\n", phSec, package, realHandle); - - if (phSec && package && realHandle) - { - PSecHandle newSec = malloc(sizeof(*newSec)); - if (newSec) - { - *newSec = *realHandle; - phSec->dwUpper = (ULONG_PTR)package; - phSec->dwLower = (ULONG_PTR)newSec; - ret = SEC_E_OK; - } - else - ret = SEC_E_INSUFFICIENT_MEMORY; - } - else - ret = SEC_E_INVALID_HANDLE; - return ret; -} - /*********************************************************************** * AcquireCredentialsHandleA (SECUR32.@) */ @@ -74,24 +46,16 @@ SECURITY_STATUS WINAPI AcquireCredentialsHandleA( if (pszPackage) { SecurePackage *package = SECUR32_findPackageA(pszPackage); - if (package && package->provider) { if (package->provider->fnTableA.AcquireCredentialsHandleA) { - CredHandle myCred; - ret = package->provider->fnTableA.AcquireCredentialsHandleA( pszPrincipal, pszPackage, fCredentialsUse, pvLogonID, - pAuthData, pGetKeyFn, pvGetKeyArgument, &myCred, + pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); if (ret == SEC_E_OK) - { - ret = make_sec_handle(phCredential, package, &myCred); - if (ret != SEC_E_OK) - package->provider->fnTableW.FreeCredentialsHandle( - &myCred); - } + phCredential->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -120,24 +84,16 @@ SECURITY_STATUS WINAPI AcquireCredentialsHandleW( if (pszPackage) { SecurePackage *package = SECUR32_findPackageW(pszPackage); - if (package && package->provider) { if (package->provider->fnTableW.AcquireCredentialsHandleW) { - CredHandle myCred; - ret = package->provider->fnTableW.AcquireCredentialsHandleW( pszPrincipal, pszPackage, fCredentialsUse, pvLogonID, - pAuthData, pGetKeyFn, pvGetKeyArgument, &myCred, + pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); if (ret == SEC_E_OK) - { - ret = make_sec_handle(phCredential, package, &myCred); - if (ret != SEC_E_OK) - package->provider->fnTableW.FreeCredentialsHandle( - &myCred); - } + phCredential->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -162,14 +118,10 @@ SECURITY_STATUS WINAPI FreeCredentialsHandle( if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; - PCredHandle cred = (PCredHandle)phCredential->dwLower; - - if (package && package->provider && - package->provider->fnTableW.FreeCredentialsHandle) - ret = package->provider->fnTableW.FreeCredentialsHandle(cred); + if (package && package->provider && package->provider->fnTableW.FreeCredentialsHandle) + ret = package->provider->fnTableW.FreeCredentialsHandle(phCredential); else ret = SEC_E_INVALID_HANDLE; - free(cred); } else ret = SEC_E_INVALID_HANDLE; @@ -188,13 +140,11 @@ SECURITY_STATUS WINAPI QueryCredentialsAttributesA( if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; - PCredHandle cred = (PCredHandle)phCredential->dwLower; - if (package && package->provider) { if (package->provider->fnTableA.QueryCredentialsAttributesA) ret = package->provider->fnTableA.QueryCredentialsAttributesA( - cred, ulAttribute, pBuffer); + phCredential, ulAttribute, pBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -218,13 +168,10 @@ SECURITY_STATUS WINAPI QueryCredentialsAttributesW( if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; - PCredHandle cred = (PCredHandle)phCredential->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.QueryCredentialsAttributesW) - ret = package->provider->fnTableW.QueryCredentialsAttributesW( - cred, ulAttribute, pBuffer); + ret = package->provider->fnTableW.QueryCredentialsAttributesW(phCredential, ulAttribute, pBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -248,49 +195,24 @@ SECURITY_STATUS WINAPI InitializeSecurityContextA( { SECURITY_STATUS ret; SecurePackage *package = NULL; - PCredHandle cred = NULL; - PCredHandle ctxt = NULL; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - if (phContext) - { - package = (SecurePackage *)phContext->dwUpper; - ctxt = (PCtxtHandle)phContext->dwLower; - } - if (phCredential) - { - package = (SecurePackage *)phCredential->dwUpper; - cred = (PCredHandle)phCredential->dwLower; - } + if (phContext) package = (SecurePackage *)phContext->dwUpper; + else if (phCredential) package = (SecurePackage *)phCredential->dwUpper; if (package && package->provider) { if (package->provider->fnTableA.InitializeSecurityContextA) { - CtxtHandle myCtxt; - - if (phContext) - { - PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; - myCtxt.dwUpper = realCtxt->dwUpper; - myCtxt.dwLower = realCtxt->dwLower; - } - ret = package->provider->fnTableA.InitializeSecurityContextA( - cred, ctxt, pszTargetName, fContextReq, - Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, + phCredential, phContext, pszTargetName, fContextReq, + Reserved1, TargetDataRep, pInput, Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry); - if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && - phNewContext && phNewContext != phContext) - { - SECURITY_STATUS ret2; - ret2 = make_sec_handle(phNewContext, package, &myCtxt); - if (ret2 != SEC_E_OK) - package->provider->fnTableA.DeleteSecurityContext(&myCtxt); - } + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + phNewContext->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -312,49 +234,24 @@ SECURITY_STATUS WINAPI InitializeSecurityContextW( { SECURITY_STATUS ret; SecurePackage *package = NULL; - PCredHandle cred = NULL; - PCredHandle ctxt = NULL; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - if (phContext) - { - package = (SecurePackage *)phContext->dwUpper; - ctxt = (PCtxtHandle)phContext->dwLower; - } - if (phCredential) - { - package = (SecurePackage *)phCredential->dwUpper; - cred = (PCredHandle)phCredential->dwLower; - } + if (phContext) package = (SecurePackage *)phContext->dwUpper; + else if (phCredential) package = (SecurePackage *)phCredential->dwUpper; if (package && package->provider) { if (package->provider->fnTableW.InitializeSecurityContextW) { - CtxtHandle myCtxt; - - if (phContext) - { - PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; - myCtxt.dwUpper = realCtxt->dwUpper; - myCtxt.dwLower = realCtxt->dwLower; - } - ret = package->provider->fnTableW.InitializeSecurityContextW( - cred, ctxt, pszTargetName, fContextReq, - Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, + phCredential, phContext, pszTargetName, fContextReq, + Reserved1, TargetDataRep, pInput, Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry); - if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && - phNewContext && phNewContext != phContext) - { - SECURITY_STATUS ret2; - ret2 = make_sec_handle(phNewContext, package, &myCtxt); - if (ret2 != SEC_E_OK) - package->provider->fnTableW.DeleteSecurityContext(&myCtxt); - } + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + phNewContext->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -380,34 +277,15 @@ SECURITY_STATUS WINAPI AcceptSecurityContext( if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; - PCredHandle cred = (PCredHandle)phCredential->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.AcceptSecurityContext) { - CtxtHandle myCtxt; - - if(phContext) - { - PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; - TRACE("realCtx: %p\n", realCtxt); - myCtxt.dwUpper = realCtxt->dwUpper; - myCtxt.dwLower = realCtxt->dwLower; - } - ret = package->provider->fnTableW.AcceptSecurityContext( - cred, phContext ? &myCtxt : NULL, pInput, fContextReq, - TargetDataRep, &myCtxt, pOutput, pfContextAttr, ptsExpiry); - if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && - phNewContext && phNewContext != phContext) - { - SECURITY_STATUS ret2; - ret2 = make_sec_handle(phNewContext, package, &myCtxt); - if (ret2 != SEC_E_OK) - package->provider->fnTableW.DeleteSecurityContext( - &myCtxt); - } + phCredential, phContext, pInput, fContextReq, + TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + phNewContext->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -432,13 +310,10 @@ SECURITY_STATUS WINAPI CompleteAuthToken(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.CompleteAuthToken) - ret = package->provider->fnTableW.CompleteAuthToken(ctxt, - pToken); + ret = package->provider->fnTableW.CompleteAuthToken(phContext, pToken); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -461,14 +336,10 @@ SECURITY_STATUS WINAPI DeleteSecurityContext(PCtxtHandle phContext) if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - - if (package && package->provider && - package->provider->fnTableW.DeleteSecurityContext) - ret = package->provider->fnTableW.DeleteSecurityContext(ctxt); + if (package && package->provider && package->provider->fnTableW.DeleteSecurityContext) + ret = package->provider->fnTableW.DeleteSecurityContext(phContext); else ret = SEC_E_INVALID_HANDLE; - free(ctxt); } else ret = SEC_E_INVALID_HANDLE; @@ -487,13 +358,10 @@ SECURITY_STATUS WINAPI ApplyControlToken(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.ApplyControlToken) - ret = package->provider->fnTableW.ApplyControlToken( - ctxt, pInput); + ret = package->provider->fnTableW.ApplyControlToken(phContext, pInput); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -517,13 +385,10 @@ SECURITY_STATUS WINAPI QueryContextAttributesA(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableA.QueryContextAttributesA) - ret = package->provider->fnTableA.QueryContextAttributesA( - ctxt, ulAttribute, pBuffer); + ret = package->provider->fnTableA.QueryContextAttributesA(phContext, ulAttribute, pBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -547,13 +412,10 @@ SECURITY_STATUS WINAPI QueryContextAttributesW(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.QueryContextAttributesW) - ret = package->provider->fnTableW.QueryContextAttributesW( - ctxt, ulAttribute, pBuffer); + ret = package->provider->fnTableW.QueryContextAttributesW(phContext, ulAttribute, pBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -576,13 +438,10 @@ SECURITY_STATUS WINAPI ImpersonateSecurityContext(PCtxtHandle phContext) if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.ImpersonateSecurityContext) - ret = package->provider->fnTableW.ImpersonateSecurityContext( - ctxt); + ret = package->provider->fnTableW.ImpersonateSecurityContext(phContext); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -605,13 +464,10 @@ SECURITY_STATUS WINAPI RevertSecurityContext(PCtxtHandle phContext) if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.RevertSecurityContext) - ret = package->provider->fnTableW.RevertSecurityContext( - ctxt); + ret = package->provider->fnTableW.RevertSecurityContext(phContext); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -635,13 +491,10 @@ SECURITY_STATUS WINAPI MakeSignature(PCtxtHandle phContext, ULONG fQOP, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.MakeSignature) - ret = package->provider->fnTableW.MakeSignature( - ctxt, fQOP, pMessage, MessageSeqNo); + ret = package->provider->fnTableW.MakeSignature(phContext, fQOP, pMessage, MessageSeqNo); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -665,13 +518,10 @@ SECURITY_STATUS WINAPI VerifySignature(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.VerifySignature) - ret = package->provider->fnTableW.VerifySignature( - ctxt, pMessage, MessageSeqNo, pfQOP); + ret = package->provider->fnTableW.VerifySignature(phContext, pMessage, MessageSeqNo, pfQOP); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -819,13 +669,10 @@ SECURITY_STATUS WINAPI ExportSecurityContext(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.ExportSecurityContext) - ret = package->provider->fnTableW.ExportSecurityContext( - ctxt, fFlags, pPackedContext, pToken); + ret = package->provider->fnTableW.ExportSecurityContext(phContext, fFlags, pPackedContext, pToken); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -846,22 +693,14 @@ SECURITY_STATUS WINAPI ImportSecurityContextA(SEC_CHAR *pszPackage, SECURITY_STATUS ret; SecurePackage *package = SECUR32_findPackageA(pszPackage); - TRACE("%s %p %p %p\n", debugstr_a(pszPackage), pPackedContext, Token, - phContext); + TRACE("%s %p %p %p\n", debugstr_a(pszPackage), pPackedContext, Token, phContext); if (package && package->provider) { if (package->provider->fnTableA.ImportSecurityContextA) { - CtxtHandle myCtxt; - - ret = package->provider->fnTableA.ImportSecurityContextA( - pszPackage, pPackedContext, Token, &myCtxt); + ret = package->provider->fnTableA.ImportSecurityContextA(pszPackage, pPackedContext, Token, phContext); if (ret == SEC_E_OK) - { - ret = make_sec_handle(phContext, package, &myCtxt); - if (ret != SEC_E_OK) - package->provider->fnTableW.DeleteSecurityContext(&myCtxt); - } + phContext->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -881,22 +720,14 @@ SECURITY_STATUS WINAPI ImportSecurityContextW(SEC_WCHAR *pszPackage, SECURITY_STATUS ret; SecurePackage *package = SECUR32_findPackageW(pszPackage); - TRACE("%s %p %p %p\n", debugstr_w(pszPackage), pPackedContext, Token, - phContext); + TRACE("%s %p %p %p\n", debugstr_w(pszPackage), pPackedContext, Token, phContext); if (package && package->provider) { if (package->provider->fnTableW.ImportSecurityContextW) { - CtxtHandle myCtxt; - - ret = package->provider->fnTableW.ImportSecurityContextW( - pszPackage, pPackedContext, Token, &myCtxt); + ret = package->provider->fnTableW.ImportSecurityContextW(pszPackage, pPackedContext, Token, phContext); if (ret == SEC_E_OK) - { - ret = make_sec_handle(phContext, package, &myCtxt); - if (ret != SEC_E_OK) - package->provider->fnTableW.DeleteSecurityContext(&myCtxt); - } + phContext->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -922,14 +753,12 @@ SECURITY_STATUS WINAPI AddCredentialsA(PCredHandle hCredentials, if (hCredentials) { SecurePackage *package = (SecurePackage *)hCredentials->dwUpper; - PCredHandle cred = (PCtxtHandle)hCredentials->dwLower; - if (package && package->provider) { if (package->provider->fnTableA.AddCredentialsA) - ret = package->provider->fnTableA.AddCredentialsA( - cred, pszPrincipal, pszPackage, fCredentialUse, pAuthData, - pGetKeyFn, pvGetKeyArgument, ptsExpiry); + ret = package->provider->fnTableA.AddCredentialsA(hCredentials, pszPrincipal, pszPackage, + fCredentialUse, pAuthData, pGetKeyFn, + pvGetKeyArgument, ptsExpiry); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -957,14 +786,12 @@ SECURITY_STATUS WINAPI AddCredentialsW(PCredHandle hCredentials, if (hCredentials) { SecurePackage *package = (SecurePackage *)hCredentials->dwUpper; - PCredHandle cred = (PCtxtHandle)hCredentials->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.AddCredentialsW) - ret = package->provider->fnTableW.AddCredentialsW( - cred, pszPrincipal, pszPackage, fCredentialUse, pAuthData, - pGetKeyFn, pvGetKeyArgument, ptsExpiry); + ret = package->provider->fnTableW.AddCredentialsW(hCredentials, pszPrincipal, pszPackage, + fCredentialUse, pAuthData, pGetKeyFn, + pvGetKeyArgument, ptsExpiry); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -988,13 +815,10 @@ SECURITY_STATUS WINAPI QuerySecurityContextToken(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.QuerySecurityContextToken) - ret = package->provider->fnTableW.QuerySecurityContextToken( - ctxt, phToken); + ret = package->provider->fnTableW.QuerySecurityContextToken(phContext, phToken); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -1018,13 +842,10 @@ SECURITY_STATUS WINAPI EncryptMessage(PCtxtHandle phContext, ULONG fQOP, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.EncryptMessage) - ret = package->provider->fnTableW.EncryptMessage( - ctxt, fQOP, pMessage, MessageSeqNo); + ret = package->provider->fnTableW.EncryptMessage(phContext, fQOP, pMessage, MessageSeqNo); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -1048,13 +869,10 @@ SECURITY_STATUS WINAPI DecryptMessage(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.DecryptMessage) - ret = package->provider->fnTableW.DecryptMessage( - ctxt, pMessage, MessageSeqNo, pfQOP); + ret = package->provider->fnTableW.DecryptMessage(phContext, pMessage, MessageSeqNo, pfQOP); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -1078,13 +896,10 @@ SECURITY_STATUS WINAPI SetContextAttributesA(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableA.SetContextAttributesA) - ret = package->provider->fnTableA.SetContextAttributesA( - ctxt, ulAttribute, pBuffer, cbBuffer); + ret = package->provider->fnTableA.SetContextAttributesA(phContext, ulAttribute, pBuffer, cbBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -1108,13 +923,10 @@ SECURITY_STATUS WINAPI SetContextAttributesW(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.SetContextAttributesW) - ret = package->provider->fnTableW.SetContextAttributesW( - ctxt, ulAttribute, pBuffer, cbBuffer); + ret = package->provider->fnTableW.SetContextAttributesW(phContext, ulAttribute, pBuffer, cbBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } -- 2.30.2

1 0

[PATCH 1/2] secur32: Store LSA package and handle in the credential/context handle's dwLower field.
by Hans Leidekker 29 Sep '21

29 Sep '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/lsa.c | 207 ++++++++++++++++++++++----------------------- 1 file changed, 103 insertions(+), 104 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 74eba65e10c..bd3cac4704f 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -39,7 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); -#define LSA_MAGIC ('L' << 24 | 'S' << 16 | 'A' << 8 | ' ') +#define LSA_MAGIC_CONNECTION ('L' << 24 | 'S' << 16 | 'A' << 8 | '0') +#define LSA_MAGIC_CREDENTIALS ('L' << 24 | 'S' << 16 | 'A' << 8 | '1') +#define LSA_MAGIC_CONTEXT ('L' << 24 | 'S' << 16 | 'A' << 8 | '2') struct lsa_package { @@ -54,9 +56,11 @@ struct lsa_package static struct lsa_package *loaded_packages; static ULONG loaded_packages_count; -struct lsa_connection +struct lsa_handle { DWORD magic; + struct lsa_package *package; + LSA_SEC_HANDLE handle; }; static const char *debugstr_as(const LSA_STRING *str) @@ -89,21 +93,21 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id return STATUS_INVALID_PARAMETER; } -static struct lsa_connection *alloc_lsa_connection(void) +static struct lsa_handle *alloc_lsa_handle(ULONG magic) { - struct lsa_connection *ret; - if (!(ret = malloc(sizeof(*ret)))) return NULL; - ret->magic = LSA_MAGIC; + struct lsa_handle *ret; + if (!(ret = calloc(1, sizeof(*ret)))) return NULL; + ret->magic = magic; return ret; } NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) { - struct lsa_connection *lsa_conn; + struct lsa_handle *lsa_conn; TRACE("%p\n", LsaHandle); - if (!(lsa_conn = alloc_lsa_connection())) return STATUS_NO_MEMORY; + if (!(lsa_conn = alloc_lsa_handle(LSA_MAGIC_CONNECTION))) return STATUS_NO_MEMORY; *LsaHandle = lsa_conn; return STATUS_SUCCESS; } @@ -111,22 +115,22 @@ NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LogonProcessName, PHANDLE LsaHandle, PLSA_OPERATIONAL_MODE SecurityMode) { - struct lsa_connection *lsa_conn; + struct lsa_handle *lsa_conn; FIXME("%s %p %p stub\n", debugstr_as(LogonProcessName), LsaHandle, SecurityMode); - if (!(lsa_conn = alloc_lsa_connection())) return STATUS_NO_MEMORY; + if (!(lsa_conn = alloc_lsa_handle(LSA_MAGIC_CONNECTION))) return STATUS_NO_MEMORY; *LsaHandle = lsa_conn; return STATUS_SUCCESS; } NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE LsaHandle) { - struct lsa_connection *lsa_conn = (struct lsa_connection *)LsaHandle; + struct lsa_handle *lsa_conn = (struct lsa_handle *)LsaHandle; TRACE("%p\n", LsaHandle); - if (!lsa_conn || lsa_conn->magic != LSA_MAGIC) return STATUS_INVALID_HANDLE; + if (!lsa_conn || lsa_conn->magic != LSA_MAGIC_CONNECTION) return STATUS_INVALID_HANDLE; lsa_conn->magic = 0; free(lsa_conn); @@ -307,6 +311,7 @@ static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleW( { SECURITY_STATUS status; struct lsa_package *lsa_package; + struct lsa_handle *lsa_handle; UNICODE_STRING principal_us; LSA_SEC_HANDLE lsa_credential; @@ -329,8 +334,11 @@ static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleW( credentials_use, logon_id, auth_data, get_key_fn, get_key_arg, &lsa_credential, ts_expiry); if (status == SEC_E_OK) { - credential->dwLower = (ULONG_PTR)lsa_credential; - credential->dwUpper = (ULONG_PTR)lsa_package; + if (!(lsa_handle = alloc_lsa_handle(LSA_MAGIC_CREDENTIALS))) return STATUS_NO_MEMORY; + lsa_handle->package = lsa_package; + lsa_handle->handle = lsa_credential; + credential->dwLower = (ULONG_PTR)lsa_handle; + credential->dwUpper = 0; } return status; } @@ -411,21 +419,23 @@ done: static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_credential; + struct lsa_handle *lsa_cred; + SECURITY_STATUS status; TRACE("%p\n", credential); if (!credential) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)credential->dwUpper; - lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; + lsa_cred = (struct lsa_handle *)credential->dwLower; + if (!lsa_cred || lsa_cred->magic != LSA_MAGIC_CREDENTIALS) return SEC_E_INVALID_HANDLE; - if (!lsa_package->lsa_api || !lsa_package->lsa_api->FreeCredentialsHandle) + if (!lsa_cred->package->lsa_api || !lsa_cred->package->lsa_api->FreeCredentialsHandle) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); + status = lsa_cred->package->lsa_api->FreeCredentialsHandle(lsa_cred->handle); + + lsa_cred->magic = 0; + free(lsa_cred); + return status; } static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( @@ -434,10 +444,11 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) { SECURITY_STATUS status; - struct lsa_package *lsa_package = NULL; - LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + struct lsa_handle *lsa_cred = NULL, *lsa_ctx = NULL, *new_lsa_ctx; + struct lsa_package *package = NULL; UNICODE_STRING target_name_us; BOOLEAN mapped_context; + LSA_SEC_HANDLE new_handle; TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, debugstr_w(target_name), context_req, reserved1, target_data_rep, input, @@ -445,30 +456,34 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( if (context) { - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; + package = lsa_ctx->package; } else if (credential) { - lsa_package = (struct lsa_package *)credential->dwUpper; - lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + lsa_cred = (struct lsa_handle *)credential->dwLower; + if (lsa_cred->magic != LSA_MAGIC_CREDENTIALS) return SEC_E_INVALID_HANDLE; + package = lsa_cred->package; } + if (!package || !new_context) return SEC_E_INVALID_HANDLE; - if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->lsa_api || !lsa_package->lsa_api->InitLsaModeContext) + if (!package->lsa_api || !package->lsa_api->InitLsaModeContext) return SEC_E_UNSUPPORTED_FUNCTION; if (target_name) RtlInitUnicodeString(&target_name_us, target_name); - status = lsa_package->lsa_api->InitLsaModeContext(lsa_credential, lsa_context, - target_name ? &target_name_us : NULL, context_req, target_data_rep, input, - &new_lsa_context, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); + status = package->lsa_api->InitLsaModeContext(lsa_cred ? lsa_cred->handle : 0, + lsa_ctx ? lsa_ctx->handle : 0, target_name ? &target_name_us : NULL, context_req, target_data_rep, + input, &new_handle, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) { - new_context->dwLower = (ULONG_PTR)new_lsa_context; - new_context->dwUpper = (ULONG_PTR)lsa_package; + if (!(new_lsa_ctx = alloc_lsa_handle(LSA_MAGIC_CONTEXT))) return STATUS_NO_MEMORY; + new_lsa_ctx->package = package; + new_lsa_ctx->handle = new_handle; + new_context->dwLower = (ULONG_PTR)new_lsa_ctx; + new_context->dwUpper = 0; } return status; } @@ -504,78 +519,78 @@ static SECURITY_STATUS WINAPI lsa_AcceptSecurityContext( SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) { SECURITY_STATUS status; - struct lsa_package *lsa_package = NULL; - LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + struct lsa_package *package = NULL; + struct lsa_handle *lsa_cred = NULL, *lsa_ctx = NULL, *new_lsa_ctx; BOOLEAN mapped_context; + LSA_SEC_HANDLE new_handle; TRACE("%p %p %p %#x %#x %p %p %p %p\n", credential, context, input, context_req, target_data_rep, new_context, output, context_attr, ts_expiry); if (context) { - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; + package = lsa_ctx->package; } else if (credential) { - lsa_package = (struct lsa_package *)credential->dwUpper; - lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + lsa_cred = (struct lsa_handle *)credential->dwLower; + if (lsa_cred->magic != LSA_MAGIC_CREDENTIALS) return SEC_E_INVALID_HANDLE; + package = lsa_cred->package; } + if (!package || !new_context) return SEC_E_INVALID_HANDLE; - if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->lsa_api || !lsa_package->lsa_api->AcceptLsaModeContext) + if (!package->lsa_api || !package->lsa_api->AcceptLsaModeContext) return SEC_E_UNSUPPORTED_FUNCTION; - status = lsa_package->lsa_api->AcceptLsaModeContext(lsa_credential, lsa_context, - input, context_req, target_data_rep, &new_lsa_context, output, context_attr, - ts_expiry, &mapped_context, NULL /* FIXME */); + status = package->lsa_api->AcceptLsaModeContext(lsa_cred ? lsa_cred->handle : 0, + lsa_ctx ? lsa_ctx->handle : 0, input, context_req, target_data_rep, &new_handle, output, + context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) { - new_context->dwLower = (ULONG_PTR)new_lsa_context; - new_context->dwUpper = (ULONG_PTR)lsa_package; + if (!(new_lsa_ctx = alloc_lsa_handle(LSA_MAGIC_CONTEXT))) return STATUS_NO_MEMORY; + new_lsa_ctx->package = package; + new_lsa_ctx->handle = new_handle; + new_context->dwLower = (ULONG_PTR)new_lsa_ctx; + new_context->dwUpper = 0; } return status; } static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; + SECURITY_STATUS status; TRACE("%p\n", context); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->lsa_api || !lsa_package->lsa_api->DeleteContext) + if (!lsa_ctx->package->lsa_api || !lsa_ctx->package->lsa_api->DeleteContext) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->lsa_api->DeleteContext(lsa_context); + status = lsa_ctx->package->lsa_api->DeleteContext(lsa_ctx->handle); + free(lsa_ctx); + return status; } static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, ULONG attribute, void *buffer) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; TRACE("%p %d %p\n", context, attribute, buffer); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpQueryContextAttributes) + if (!lsa_ctx->package->lsa_api || !lsa_ctx->package->lsa_api->SpQueryContextAttributes) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); + return lsa_ctx->package->lsa_api->SpQueryContextAttributes(lsa_ctx->handle, attribute, buffer); } static SecPkgInfoA *package_infoWtoA( const SecPkgInfoW *info ) @@ -653,85 +668,69 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quality_of_protection, SecBufferDesc *message, ULONG message_seq_no) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->user_api || !lsa_package->user_api->MakeSignature) + if (!lsa_ctx->package->user_api || !lsa_ctx->package->user_api->MakeSignature) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); + return lsa_ctx->package->user_api->MakeSignature(lsa_ctx->handle, quality_of_protection, message, message_seq_no); } static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->user_api || !lsa_package->user_api->VerifySignature) + if (!lsa_ctx->package->user_api || !lsa_ctx->package->user_api->VerifySignature) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); + return lsa_ctx->package->user_api->VerifySignature(lsa_ctx->handle, message, message_seq_no, quality_of_protection); } static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG quality_of_protection, SecBufferDesc *message, ULONG message_seq_no) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->user_api || !lsa_package->user_api->SealMessage) + if (!lsa_ctx->package->user_api || !lsa_ctx->package->user_api->SealMessage) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); + return lsa_ctx->package->user_api->SealMessage(lsa_ctx->handle, quality_of_protection, message, message_seq_no); } static SECURITY_STATUS WINAPI lsa_DecryptMessage(CtxtHandle *context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->user_api || !lsa_package->user_api->UnsealMessage) + if (!lsa_ctx->package->user_api || !lsa_ctx->package->user_api->UnsealMessage) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->user_api->UnsealMessage(lsa_context, message, message_seq_no, quality_of_protection); + return lsa_ctx->package->user_api->UnsealMessage(lsa_ctx->handle, message, message_seq_no, quality_of_protection); } static const SecurityFunctionTableW lsa_sspi_tableW = -- 2.30.2

1 0

[PATCH v2 8/9] gdi32: Move ntgdi functions to Unix library.
by Jacek Caban 29 Sep '21

29 Sep '21

4 4

[PATCH v3] wininet: Reset context length for http status 304
by Alistair Leslie-Hughes 29 Sep '21

29 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 5 ++++- dlls/wininet/tests/http.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..b2862ead789 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,10 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { + request->read_size = 0; request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..716d2b5cb76 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2381,6 +2381,13 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n" + "\r\n" + "0123456789"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3494,36 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD avail; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + avail = 0; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail == 0, "got %d\n", avail); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6097,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

3 3

[PATCH 1/5] kernelbase: Fix incorrect pseudo console allocation size (GCC 11).
by Rémi Bernon 29 Sep '21

29 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- GCC 11 is much more verbose with its array-bounds and stringop-overread warnings, and they are enabled by default. Some of these lead to some genuine fixes like the first two patches here while some are a bit more dubious but easy to fix, like the last three patches. Then there's a lot more additional array-bounds warnings emitted, caused by flexible array sizes which we define to 1 by default, in most cases. When a variable is allocated with the array size set to 0, GCC emits a warning each time the variable is used, as it assumes any of its members may be accessed (although the first array member may not be accessed at all). A possible fix for this would be to use true C99 flexible array sizes instead, but it then breaks a bunch of type size checks instead. dlls/kernelbase/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index c38e8e91955..a7eeb439232 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1728,7 +1728,7 @@ HRESULT WINAPI CreatePseudoConsole( COORD size, HANDLE input, HANDLE output, DWO if (!size.X || !size.Y || !ret) return E_INVALIDARG; - if (!(pseudo_console = HeapAlloc( GetProcessHeap(), 0, HEAP_ZERO_MEMORY ))) return E_OUTOFMEMORY; + if (!(pseudo_console = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pseudo_console) ))) return E_OUTOFMEMORY; swprintf( pipe_name, ARRAY_SIZE(pipe_name), L"\\\\.\\pipe\\wine_pty_signal_pipe%x", GetCurrentThreadId() ); -- 2.33.0

4 12

[PATCH v2 1/9] include: Add HID Physical Interface Device usage page.
by Rémi Bernon 29 Sep '21

29 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Sorry for the spam, a v2 seems actually worth it, to have IID_IDirectInputPIDDriver addition in a dedicated patch. Also stripped out the outdated comment. include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index 002040bddc0..da7274b5945 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -197,6 +197,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) #define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) +#define HID_USAGE_PAGE_PID ((USAGE) 0x0F) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) -- 2.33.0

2 12

[PATCH 1/8] include: Add HID Physical Interface Device usage page.
by Rémi Bernon 29 Sep '21

29 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index 002040bddc0..da7274b5945 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -197,6 +197,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) #define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) +#define HID_USAGE_PAGE_PID ((USAGE) 0x0F) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) -- 2.33.0

1 8

[PATCH 1/6] ole32/composite: Handle per-component failure in GetDisplayName().
by Nikolay Sivov 29 Sep '21

29 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compositemoniker.c | 14 ++++--- dlls/ole32/tests/moniker.c | 79 ++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 4451f0daae6..77e1e8aff35 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1023,17 +1023,19 @@ static HRESULT WINAPI CompositeMonikerImpl_GetDisplayName(IMoniker *iface, IBind { CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); WCHAR *left_name = NULL, *right_name = NULL; + HRESULT hr; TRACE("%p, %p, %p, %p\n", iface, pbc, pmkToLeft, displayname); - if (!displayname) - return E_POINTER; - - if (!moniker->comp_count) + if (!pbc || !displayname || !moniker->comp_count) return E_INVALIDARG; - IMoniker_GetDisplayName(moniker->left, pbc, NULL, &left_name); - IMoniker_GetDisplayName(moniker->right, pbc, NULL, &right_name); + if (FAILED(hr = IMoniker_GetDisplayName(moniker->left, pbc, NULL, &left_name))) return hr; + if (FAILED(hr = IMoniker_GetDisplayName(moniker->right, pbc, NULL, &right_name))) + { + CoTaskMemFree(left_name); + return hr; + } if (!(*displayname = CoTaskMemAlloc((lstrlenW(left_name) + lstrlenW(right_name) + 1) * sizeof(WCHAR)))) { diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 795d8750d05..fcd8dd8310d 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -145,6 +145,38 @@ static IMoniker *create_antimoniker(DWORD level) return moniker; } +static HRESULT WINAPI pointer_moniker_obj_QueryInterface(IUnknown *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI pointer_moniker_obj_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI pointer_moniker_obj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl pointer_moniker_obj_vtbl = +{ + pointer_moniker_obj_QueryInterface, + pointer_moniker_obj_AddRef, + pointer_moniker_obj_Release, +}; + +static IUnknown pm_obj = { &pointer_moniker_obj_vtbl }; + static HRESULT create_moniker_parse_desc(const char *desc, unsigned int *eaten, IMoniker **moniker) { @@ -163,6 +195,9 @@ static HRESULT create_moniker_parse_desc(const char *desc, unsigned int *eaten, *eaten = 2; *moniker = create_antimoniker(desc[1] - '0'); return S_OK; + case 'P': + *eaten = 1; + return CreatePointerMoniker(&pm_obj, moniker); case 'C': *eaten = 1; desc++; @@ -860,7 +895,7 @@ static void test_ROT(void) '1','9','0','3','-','4','A','A','E','-','B','1','A','F','-', '2','0','4','6','E','5','8','6','C','9','2','5',0}; HRESULT hr; - IMoniker *pMoniker = NULL; + IMoniker *pMoniker = NULL, *moniker; struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; struct test_factory factory; @@ -988,6 +1023,25 @@ static void test_ROT(void) IMoniker_Release(pMoniker); IMoniker_Release(&test_moniker->IMoniker_iface); + /* Pointer moniker does not implement IROTData or display name */ + hr = CreatePointerMoniker(NULL, &pMoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + pMoniker, &dwCookie); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(pMoniker); + + hr = create_moniker_from_desc("I1", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = CreatePointerMoniker((IUnknown *)moniker, &pMoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + pMoniker, &dwCookie); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMoniker_Release(pMoniker); + IMoniker_Release(moniker); + IRunningObjectTable_Release(pROT); } @@ -3537,6 +3591,23 @@ todo_wine IMoniker_Release(&m->IMoniker_iface); IMoniker_Release(&m2->IMoniker_iface); + /* Display name */ + + /* One component does not support it. */ + hr = create_moniker_from_desc("CPI1", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &str); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &str); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker); + IBindCtx_Release(bindctx); } @@ -3616,7 +3687,11 @@ todo_wine ok_ole_success(hr, CreateBindCtx); hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); - ok(hr == E_NOTIMPL, "IMoniker_GetDisplayName should have returned E_NOTIMPL instead of 0x%08x\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &display_name); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IBindCtx_Release(bindctx); -- 2.33.0

1 5

Re: [PATCH 5/6] Workaround GCC11 complaining about sizeof(a)/sizeof(b) constructs when it's
by Eric Pouech 29 Sep '21

29 Sep '21

to be more precise, gcc11 complains with: /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c: In function 'test_effect_parameter_value_GetMatrixPointerArray': /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1478:52: warning: expression does not compute the number of elements in this array; element type is 'FLOAT' {aka 'float'}, not 'D3DXMATRIX' {aka 'struct _D3DMATRIX'} [-Wsizeof-array-div] 1478 | D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; | ^ /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1478:52: note: add parentheses around the second 'sizeof' to silence this warning /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1477:11: note: array 'fvalue' declared here 1477 | FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; | ^~~~~~ so the patch mainly silences GCC11 by following gcc advice of adding parenthesis A+ On Tue, 28 Sept 2021 at 23:03, Marvin <testbot(a)winehq.org> wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch. > -- -- Eric Pouech

1 0

[PATCH] secur32: Restore the done label.
by Huw Davies 29 Sep '21

29 Sep '21

This was incorrectly removed by commit 5c0fe4db7d580784ab6adc361bfed981be25753c. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/secur32/schannel_macosx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 523f8c63562..f7f7db955ef 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1107,6 +1107,7 @@ static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session se CFRelease(data); } +done: CFRelease(cert_array); return ret; } -- 2.23.0

1 0

[PATCH vkd3d 1/6] vkd3d: Introduce vkd3d_get_texture_layer_count() helper for UAVs.
by Conor McCarthy 29 Sep '21

29 Sep '21

UINT_MAX is valid for specifying all remaining layers in all view types, although it's only documented for TEXTURE3D RTVs. If unhandled, UINT_MAX will be passed to vkd3d_compute_workgroup_count() during UAV clears, leading to nasty results in RADV. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1ca23a90..16dd07db 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2477,6 +2477,25 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } +static unsigned int vkd3d_get_texture_layer_count(unsigned int layer_idx, unsigned int layer_count, + const D3D12_RESOURCE_DESC *desc) +{ + if (desc->DepthOrArraySize > layer_idx) + { + unsigned int max_layer_count = desc->DepthOrArraySize - layer_idx; + + if (layer_count <= max_layer_count) + return layer_count; + + if (layer_count != UINT_MAX) + WARN("Layer count %u exceeds maximum %u.\n", layer_count, max_layer_count); + return max_layer_count; + } + + WARN("Layer index %u exceeds maximum available layer %u.\n", layer_idx, desc->DepthOrArraySize - 1); + return 1; +} + bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) { @@ -2758,6 +2777,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } + /* Allow a UINT_MAX layer count through as it equals VK_REMAINING_ARRAY_LAYERS. */ } if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) @@ -2931,6 +2951,9 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } + /* Prevent problems with UAV clears where the layer count is UINT_MAX. */ + vkd3d_desc.layer_count = vkd3d_get_texture_layer_count(vkd3d_desc.layer_idx, + vkd3d_desc.layer_count, &resource->desc); } if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) -- 2.32.0

1 5

[PATCH 1/5] msxml3/tests: Add some processing instruction tests.
by Daniel Lehman 29 Sep '21

29 Sep '21

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9e9789ebd9a..d98a87f6d9c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8594,6 +8594,31 @@ static void test_createProcessingInstruction(void) hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\" dummy=\"value\""), &pi); todo_wine ok(hr == XML_E_UNEXPECTED_ATTRIBUTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, NULL, _bstr_("version=\"1.0\" encoding=\"UTF-8\""), &pi); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), NULL, &pi); +todo_wine + ok(hr == XML_E_XMLDECLSYNTAX, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=UTF-8"), &pi); +todo_wine + ok(hr == XML_E_MISSINGQUOTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8\""), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"UTF-8"), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8'"), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + node_map = NULL; + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_attributes(node, &node_map); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (node_map) IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR)); -- 2.25.1

1 4

Re: [PATCH v1] gdi32:Implement EngwideChartomultibyte.
by Marvin 29 Sep '21

29 Sep '21

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=99014 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/gdi32/gdi32.spec:159 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/gdi32/gdi32.spec:159 Task: Patch failed to apply

1 0

[PATCH v1] gdi32:Implement EngwideChartomultibyte.
by dongpengpeng 29 Sep '21

29 Sep '21

1 0

Re: [PATCH] gdi32:Implement EngwideChartomultibyte.
by Marvin 29 Sep '21

29 Sep '21

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=99013 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/gdi32/gdi32.spec:159 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/gdi32/gdi32.spec:159 Task: Patch failed to apply

1 0

Re: Fw:[PATCH] gdi32:Implement EngwideChartomultibyte.
by Marvin 29 Sep '21

29 Sep '21

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=99012 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/gdi32/gdi32.spec:159 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/gdi32/gdi32.spec:159 Task: Patch failed to apply

1 0

[PATCH] gdi32:Implement EngwideChartomultibyte.
by dongpengpeng＠uniontech.com 29 Sep '21

29 Sep '21

1 0

Fw:[PATCH] gdi32:Implement EngwideChartomultibyte.
by dongpengpeng＠uniontech.com 29 Sep '21

29 Sep '21

1 0

[PATCH 1/4] user32/tests: Fix dump_sequence winevent_hook_todo handling.
by Connor McAdams 29 Sep '21

29 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9602649600f..43253953a9e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2665,7 +2665,8 @@ static void dump_sequence(const struct message *expected, const char *context, c } } /* silently drop winevent messages if there is no support for them */ - else if ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook)) + else if ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook) || + ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine"))) expected++; else { -- 2.25.1

2 4

[PATCH v2 1/3] ntdll/tests: Add test for LdrGetDllFullName().
by Paul Gofman 29 Sep '21

29 Sep '21

Based on a patch by Alex Henrie. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/module.c | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index bfa389ac9ab..eac4f478293 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -42,6 +42,7 @@ static NTSTATUS (WINAPI *pLdrSetDllDirectory)(UNICODE_STRING*); static NTSTATUS (WINAPI *pLdrGetDllHandle)( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ); static NTSTATUS (WINAPI *pLdrGetDllHandleEx)( ULONG flags, LPCWSTR load_path, ULONG *dll_characteristics, const UNICODE_STRING *name, HMODULE *base ); +static NTSTATUS (WINAPI *pLdrGetDllFullName)( HMODULE module, UNICODE_STRING *name ); static BOOL is_unicode_enabled = TRUE; @@ -831,6 +832,7 @@ static void init_pointers(void) MAKEFUNC(LdrSetDllDirectory); MAKEFUNC(LdrGetDllHandle); MAKEFUNC(LdrGetDllHandleEx); + MAKEFUNC(LdrGetDllFullName); #undef MAKEFUNC /* before Windows 7 this was not exported in kernel32 */ @@ -1266,6 +1268,62 @@ static void test_LdrGetDllHandleEx(void) winetest_pop_context(); } +static void test_LdrGetDllFullName(void) +{ + WCHAR expected_path[MAX_PATH], path_buffer[MAX_PATH]; + UNICODE_STRING path = {0, 0, path_buffer}; + WCHAR expected_terminator; + NTSTATUS status; + HMODULE ntdll; + + if (!pLdrGetDllFullName) + { + skip( "LdrGetDllFullName not available.\n" ); + return; + } + + if (0) /* crashes on Windows */ + pLdrGetDllFullName( ntdll, NULL ); + + ntdll = GetModuleHandleW( L"ntdll.dll" ); + + memset( path_buffer, 0x23, sizeof(path_buffer) ); + + status = pLdrGetDllFullName( ntdll, &path ); + ok( status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status ); + ok( path.Length == 0, "Expected length 0, got %d.\n", path.Length ); + ok( path_buffer[0] == 0x2323, "Expected 0x2323, got 0x%x.\n", path_buffer[0] ); + + GetSystemDirectoryW( expected_path, ARRAY_SIZE(expected_path) ); + path.MaximumLength = 5; /* odd numbers produce partially copied characters */ + + status = pLdrGetDllFullName( ntdll, &path ); + ok( status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status ); + ok( path.Length == path.MaximumLength, "Expected length %u, got %u.\n", path.MaximumLength, path.Length ); + expected_terminator = 0x2300 | (expected_path[path.MaximumLength / sizeof(WCHAR)] & 0xFF); + ok( path_buffer[path.MaximumLength / sizeof(WCHAR)] == expected_terminator, + "Expected 0x%x, got 0x%x.\n", expected_terminator, path_buffer[path.MaximumLength / 2] ); + path_buffer[path.MaximumLength / sizeof(WCHAR)] = 0; + expected_path[path.MaximumLength / sizeof(WCHAR)] = 0; + ok( lstrcmpW(path_buffer, expected_path) == 0, "Expected %s, got %s.\n", + wine_dbgstr_w(expected_path), wine_dbgstr_w(path_buffer) ); + + GetSystemDirectoryW( expected_path, ARRAY_SIZE(expected_path) ); + lstrcatW( expected_path, L"\\ntdll.dll" ); + path.MaximumLength = sizeof(path_buffer); + + status = pLdrGetDllFullName( ntdll, &path ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( !lstrcmpiW(path_buffer, expected_path), "Expected %s, got %s\n", + wine_dbgstr_w(expected_path), wine_dbgstr_w(path_buffer) ); + + status = pLdrGetDllFullName( NULL, &path ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + GetModuleFileNameW( NULL, expected_path, ARRAY_SIZE(expected_path) ); + ok( !lstrcmpiW(path_buffer, expected_path), "Expected %s, got %s.\n", + wine_dbgstr_w(expected_path), wine_dbgstr_w(path_buffer) ); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -1299,4 +1357,5 @@ START_TEST(module) test_AddDllDirectory(); test_SetDefaultDllDirectories(); test_LdrGetDllHandleEx(); + test_LdrGetDllFullName(); } -- 2.31.1

1 2

[PATCH] sapi: ISpObjectToken CreateInstance support ISpAudio
by Alistair Leslie-Hughes 28 Sep '21

28 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/sapi/tests/token.c | 22 ++++ dlls/sapi/token.c | 283 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 304 insertions(+), 1 deletion(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 47196d42dc7..fdb30975b1b 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -297,6 +297,27 @@ static void test_object_token(void) ISpObjectToken_Release( token ); } +static void test_token_create_instance(void) +{ + ISpObjectToken *token; + HRESULT hr; + ISpAudio *audio; + + hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectToken, (void **)&token ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AudioOutput\\TokenEnums\\MMAudioOut\\", FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectToken_CreateInstance( token, NULL, CLSCTX_ALL, &IID_ISpAudio, (void**)&audio); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr == S_OK) + ISpAudio_Release(audio); + + ISpObjectToken_Release( token ); +} + START_TEST(token) { CoInitialize( NULL ); @@ -305,5 +326,6 @@ START_TEST(token) test_token_enum(); test_default_token_id(); test_object_token(); + test_token_create_instance(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index ba91a425e9e..c7ab034c94f 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -968,13 +968,294 @@ static HRESULT WINAPI token_GetCategory( ISpObjectToken *iface, return E_NOTIMPL; } +struct speech_audio +{ + ISpAudio ISpAudio_iface; + LONG ref; +}; + +static inline struct speech_audio *impl_from_ISpAudio(ISpAudio *iface) +{ + return CONTAINING_RECORD(iface, struct speech_audio, ISpAudio_iface); +} + +static HRESULT WINAPI spaudio_QueryInterface(ISpAudio *iface, REFIID iid, void **obj) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + + TRACE("(%p, %s %p).\n", audio, debugstr_guid(iid), obj); + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_ISequentialStream) || + IsEqualIID(iid, &IID_IStream) || + IsEqualIID(iid, &IID_ISpStreamFormat) || + IsEqualIID(iid, &IID_ISpAudio)) + *obj = &audio->ISpAudio_iface; + else + { + *obj = NULL; + FIXME("interface %s not implemented.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static ULONG WINAPI spaudio_AddRef(ISpAudio *iface) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + ULONG ref = InterlockedIncrement(&audio->ref); + + TRACE("(%p): ref=%u.\n", audio, ref); + + return ref; +} + +static ULONG WINAPI spaudio_Release(ISpAudio *iface) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + ULONG ref = InterlockedDecrement(&audio->ref); + + TRACE("(%p): ref=%u.\n", audio, ref); + + if (!ref) + { + heap_free(audio); + } + + return ref; +} + +static HRESULT WINAPI spaudio_Read(ISpAudio *iface,void *pv, ULONG cb, ULONG *pcbRead) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + + FIXME("%p, %p, %d %p\n", audio, pv, cb, pcbRead); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_Write(ISpAudio *iface, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + + FIXME("%p, %p, %d %p\n", audio, pv, cb, pcbWritten); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_Seek(ISpAudio *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %s, %d, %p\n", audio, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_SetSize(ISpAudio *iface, ULARGE_INTEGER libNewSize) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("(%p, %s)\n", audio, wine_dbgstr_longlong(libNewSize.QuadPart)); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_CopyTo(ISpAudio *iface,IStream *pstm, ULARGE_INTEGER cb, + ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("(%p, %p, %s, %p, %p)\n", audio, pstm, wine_dbgstr_longlong(cb.QuadPart), pcbRead, pcbWritten); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_Commit(ISpAudio *iface,DWORD grfCommitFlags) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("(%p, %#x)\n", audio, grfCommitFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_Revert(ISpAudio *iface) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("(%p)\n", audio); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_LockRegion(ISpAudio *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("(%p, %s, %s, %d)\n", audio, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(cb.QuadPart), dwLockType); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_UnlockRegion(ISpAudio *iface,ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("(%p, %s, %s, %d)\n", audio, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(cb.QuadPart), dwLockType); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_Stat(ISpAudio *iface, STATSTG *stg, DWORD flag) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %p, %d\n", audio, stg, flag); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_Clone(ISpAudio *iface, IStream **ppstm) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %p\n", audio, ppstm); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_GetFormat(ISpAudio *iface, GUID *format, WAVEFORMATEX **wave) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %p, %p\n", audio, format, wave); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_SetState(ISpAudio *iface, SPAUDIOSTATE state, ULONGLONG reserved) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %d, %s\n", audio, state, wine_dbgstr_longlong(reserved)); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_SetFormat(ISpAudio *iface, REFGUID guid, const WAVEFORMATEX *wave) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %s, %p\n", audio, debugstr_guid(guid), wave); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_GetStatus(ISpAudio *iface, SPAUDIOSTATUS *status) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %p\n", audio, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_SetBufferInfo(ISpAudio *iface,const SPAUDIOBUFFERINFO *buffer) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %p\n", audio, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_GetBufferInfo(ISpAudio *iface, SPAUDIOBUFFERINFO *buffer) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %p\n", audio, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_GetDefaultFormat(ISpAudio *iface, GUID *guid, WAVEFORMATEX **wave) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %p, %p\n", audio, guid, wave); + return E_NOTIMPL; +} + +static HANDLE WINAPI spaudio_EventHandle(ISpAudio *iface) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p\n", audio); + return NULL; +} + +static HRESULT WINAPI spaudio_GetVolumeLevel(ISpAudio *iface, ULONG *level) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %p\n", audio, level); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_SetVolumeLevel(ISpAudio *iface, ULONG level) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %d\n", audio, level); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_GetBufferNotifySize(ISpAudio *iface, ULONG *size) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %p\n", audio, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI spaudio_SetBufferNotifySize(ISpAudio *iface, ULONG size) +{ + struct speech_audio *audio = impl_from_ISpAudio(iface); + FIXME("%p, %d\n", audio, size); + return E_NOTIMPL; +} + +const struct ISpAudioVtbl spaudio_vtbl = +{ + spaudio_QueryInterface, + spaudio_AddRef, + spaudio_Release, + spaudio_Read, + spaudio_Write, + spaudio_Seek, + spaudio_SetSize, + spaudio_CopyTo, + spaudio_Commit, + spaudio_Revert, + spaudio_LockRegion, + spaudio_UnlockRegion, + spaudio_Stat, + spaudio_Clone, + spaudio_GetFormat, + spaudio_SetState, + spaudio_SetFormat, + spaudio_GetStatus, + spaudio_SetBufferInfo, + spaudio_GetBufferInfo, + spaudio_GetDefaultFormat, + spaudio_EventHandle, + spaudio_GetVolumeLevel, + spaudio_SetVolumeLevel, + spaudio_GetBufferNotifySize, + spaudio_SetBufferNotifySize +}; + +static HRESULT speech_audio_create(void **obj) +{ + struct speech_audio *audio; + + audio = heap_alloc(sizeof(*audio)); + if (!audio) + return E_OUTOFMEMORY; + + audio->ISpAudio_iface.lpVtbl = &spaudio_vtbl; + audio->ref = 1; + + *obj = &audio->ISpAudio_iface; + return S_OK; +} + static HRESULT WINAPI token_CreateInstance( ISpObjectToken *iface, IUnknown *outer, DWORD class_context, REFIID riid, void **object ) { - FIXME( "stub\n" ); + struct object_token *This = impl_from_ISpObjectToken( iface ); + + TRACE( "(%p)->(%p 0x%08x %s, %p)\n", This, outer, class_context, debugstr_guid( riid ), object); + + if (IsEqualIID(riid, &IID_ISpAudio)) + { + return speech_audio_create(object); + } + + FIXME( "Unsupported interface %s\n", debugstr_guid( riid )); return E_NOTIMPL; } -- 2.33.0

2 1

[PATCH] d3d9: Pass a valid map box to wined3d_resource_map().
by Zebediah Figura 28 Sep '21

28 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d9/buffer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 7af652e7d1a..07bdfa9320e 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -191,14 +191,14 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; + struct wined3d_box wined3d_box; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); - wined3d_box.left = offset; - wined3d_box.right = offset + size; + wined3d_box_set(&wined3d_box, offset, 0, offset + size, 1, 0, 1); + wined3d_mutex_lock(); wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, @@ -527,14 +527,14 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; + struct wined3d_box wined3d_box; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); - wined3d_box.left = offset; - wined3d_box.right = offset + size; + wined3d_box_set(&wined3d_box, offset, 0, offset + size, 1, 0, 1); + wined3d_mutex_lock(); wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, -- 2.33.0

4 3

[PATCH v2 1/4] ws2_32/tests: Use %u and %zu in test_ipv6_cmsg instead of casting
by Alex Henrie 28 Sep '21

28 Sep '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: New patch --- dlls/ws2_32/tests/sock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8cbb393b542..260b07d1665 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2032,11 +2032,11 @@ static void test_ipv6_cmsg(void) ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); - ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(count == sizeof(payload), "expected length %zu, got %u\n", sizeof(payload), count); ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); ok(header->cmsg_type == IPV6_HOPLIMIT, "expected IPV6_HOPLIMIT, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(INT), - "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); + "expected length %zu, got %zu\n", sizeof(*header) + sizeof(INT), header->cmsg_len); ok(*int_data >= 32, "expected at least 32, got %i\n", *int_data); setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); @@ -2054,11 +2054,11 @@ static void test_ipv6_cmsg(void) ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); - ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(count == sizeof(payload), "expected length %zu, got %u\n", sizeof(payload), count); ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); ok(header->cmsg_type == IPV6_PKTINFO, "expected IPV6_PKTINFO, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(IN6_PKTINFO), - "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(IN6_PKTINFO)), (INT)header->cmsg_len); + "expected length %zu, got %zu\n", sizeof(*header) + sizeof(IN6_PKTINFO), header->cmsg_len); ok(!memcmp(&pkt_info->ipi6_addr, &localhost.sin6_addr, sizeof(IN6_ADDR)), "expected ::1\n"); rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_PKTINFO, error %u\n", WSAGetLastError()); @@ -2076,11 +2076,11 @@ static void test_ipv6_cmsg(void) ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); - ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(count == sizeof(payload), "expected length %zu, got %u\n", sizeof(payload), count); ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); ok(header->cmsg_type == IPV6_TCLASS, "expected IPV6_TCLASS, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(INT), - "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); + "expected length %zu, got %zu\n", sizeof(*header) + sizeof(INT), header->cmsg_len); ok(*int_data == 0, "expected 0, got %i\n", *int_data); rc = setsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_RECVTCLASS, error %u\n", WSAGetLastError()); -- 2.33.0

3 11

[PATCH 1/2] krnl386: Print %bp, %ss, and %sp for register functions in relay_call_from_16().
by Zebediah Figura 28 Sep '21

28 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/krnl386.exe16/relay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index 6eab9970a90..3559bb460a7 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -538,10 +538,10 @@ int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *conte if (!j) /* register function */ { args32[nb_args++] = (int)context; - TRACE( ") ret=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x ds=%04x es=%04x efl=%08x\n", + TRACE( ") ret=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x bp=%04x ss:sp=%04x:%04x ds=%04x es=%04x efl=%08x\n", frame->cs, frame->ip, (WORD)context->Eax, (WORD)context->Ebx, (WORD)context->Ecx, - (WORD)context->Edx, (WORD)context->Esi, (WORD)context->Edi, (WORD)context->SegDs, - (WORD)context->SegEs, context->EFlags ); + (WORD)context->Edx, (WORD)context->Esi, (WORD)context->Edi, (WORD)context->Ebp, + (WORD)context->SegSs, (WORD)context->Esp, (WORD)context->SegDs, (WORD)context->SegEs, context->EFlags ); } else TRACE( ") ret=%04x:%04x ds=%04x\n", frame->cs, frame->ip, frame->ds ); -- 2.33.0

1 1

[PATCH] wined3d: Record a state reset on the first command list.
by Jan Sikorski 28 Sep '21

28 Sep '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 23 +++++++++++++++++++++++ dlls/wined3d/cs.c | 4 ++++ 2 files changed, 27 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0f8e59573ed..d8c10ab054c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -32888,6 +32888,29 @@ static void test_deferred_context_rendering(void) ID3D11CommandList_Release(list1); ID3D11DeviceContext_Release(deferred); + /* Command lists do not inherit state from the immediate context. */ + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, black); + + ID3D11DeviceContext_OMSetRenderTargets(deferred, 1, &test_context.backbuffer_rtv, NULL); + set_viewport(deferred, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + test_context.immediate_context = deferred; + draw_color_quad(&test_context, &white); + test_context.immediate_context = immediate; + hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetBlendState(immediate, green_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, FALSE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + /* The clearing of state done by FinishCommandList is captured by a * subsequent call to FinishCommandList... */ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1f03833e0ed..2d295d4660e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3637,6 +3637,10 @@ HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, str object->c.ops = &wined3d_deferred_context_ops; object->c.device = device; + /* Make sure the first command list gets the state reset when executed. + * Resets for subsequent command lists are encoded in wined3d_deferred_context_record_command_list(). */ + wined3d_device_context_emit_reset_state(&object->c, true); + TRACE("Created deferred context %p.\n", object); *context = &object->c; -- 2.30.2

3 2

[PATCH v2] d3d8/tests: Add a stress test for dynamic buffer maps.
by Zebediah Figura 28 Sep '21

28 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 136 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f25549388d0..df4dd0029a6 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -263,6 +263,34 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) } } +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) +static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color) +{ + D3DCOLOR color = 0xdeadbeef; + struct surface_readback rb; + D3DSURFACE_DESC desc; + unsigned int x, y; + HRESULT hr; + + hr = IDirect3DSurface8_GetDesc(rt, &desc); + ok_(__FILE__, line)(hr == S_OK, "Failed to get surface desc, hr %#x.\n", hr); + + get_rt_readback(rt, &rb); + for (y = 0; y < desc.Height; ++y) + { + for (x = 0; x < desc.Width; ++x) + { + color = get_readback_color(&rb, x, y) & 0x00ffffff; + if (color != expected_color) + break; + } + if (color != expected_color) + break; + } + release_surface_readback(&rb); + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); +} + static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -11157,6 +11185,113 @@ static void test_sample_mask(void) DestroyWindow(window); } +struct dynamic_vb_vertex +{ + struct vec3 position; + DWORD diffuse; +}; + +static void fill_dynamic_vb_quad(struct dynamic_vb_vertex *quad, unsigned int x, unsigned int y) +{ + unsigned int i; + + memset(quad, 0, 4 * sizeof(*quad)); + + quad[0].position.x = quad[1].position.x = -1.0f + 0.01f * x; + quad[2].position.x = quad[3].position.x = -1.0f + 0.01f * (x + 1); + + quad[0].position.y = quad[2].position.y = -1.0f + 0.01f * y; + quad[1].position.y = quad[3].position.y = -1.0f + 0.01f * (y + 1); + + for (i = 0; i < 4; ++i) + quad[i].diffuse = 0xff00ff00; +} + +static void test_dynamic_map_synchronization(void) +{ + IDirect3DVertexBuffer8 *buffer; + IDirect3DDevice8 *device; + IDirect3DSurface8 *rt; + unsigned int x, y; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *data; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, 200 * 4 * sizeof(struct dynamic_vb_vertex), + D3DUSAGE_DYNAMIC, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(struct dynamic_vb_vertex)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (y = 0; y < 200; ++y) + { + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad((struct dynamic_vb_vertex *)data, 0, y); + + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (x = 1; x < 200; ++x) + { + hr = IDirect3DVertexBuffer8_Lock(buffer, 4 * sizeof(struct dynamic_vb_vertex) * x, + 4 * sizeof(struct dynamic_vb_vertex), &data, D3DLOCK_NOOVERWRITE); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad((struct dynamic_vb_vertex *)data, x, y); + + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(hr == D3D_OK, "Failed to map buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 4 * x, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + } + + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + ok(hr == S_OK, "Failed to get render target, hr %#x.\n", hr); + check_rt_color(rt, 0x0000ff00); + IDirect3DSurface8_Release(rt); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -11235,4 +11370,5 @@ START_TEST(visual) test_alphatest(); test_desktop_window(); test_sample_mask(); + test_dynamic_map_synchronization(); } -- 2.33.0

2 1

[PATCH v3 1/3] wined3d: Introduce wined3d_view_load_location() helper.
by Jan Sikorski 28 Sep '21

28 Sep '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/view.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0adb0a115dc..dfca8fc53f8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -332,6 +332,25 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } +static void wined3d_view_load_location(struct wined3d_resource *resource, + const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location) +{ + unsigned int i, sub_resource_idx, layer_count; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + wined3d_buffer_load_location(buffer_from_resource(resource), context, location); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_load_location(texture, sub_resource_idx, context, location); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -461,21 +480,7 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) { - struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx, layer_count; - struct wined3d_texture *texture; - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - wined3d_buffer_load_location(buffer_from_resource(resource), context, location); - return; - } - - texture = texture_from_resource(resource); - sub_resource_idx = view->sub_resource_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) - wined3d_texture_load_location(texture, sub_resource_idx, context, location); + wined3d_view_load_location(view->resource, &view->desc, context, location); } void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) -- 2.30.2

2 6

[PATCH v2 9/9] gdi32: Use single get_cptable implementation.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 15 --------------- dlls/gdi32/ntgdi_private.h | 1 + 3 files changed, 2 insertions(+), 16 deletions(-)

3 2

[PATCH v2 7/9] gdi32: Avoid using CRT wide char functions in ntgdi functions.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/win32u_private.h | 90 +++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)

3 2

[PATCH v2 6/9] gdi32: Introduce user_callbacks.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is one more hack to unblock the transition. Ultimately, both relevant parts of user32 and gdi32 will live in win32u, so those will be just internal calls. The plan is to move ntgdi to win32u first (we're fairly close to that with this series, but we still need to make it compatible with proper Unix lib) and then work at moving user32 bits (hopefully this can be done more incrementally). dlls/gdi32/Makefile.in | 3 +- dlls/gdi32/driver.c | 74 ++++++++----------- dlls/gdi32/freetype.c | 18 +++++ dlls/gdi32/gdiobj.c | 9 +-- dlls/gdi32/ntgdi_private.h | 3 +- dlls/gdi32/palette.c | 27 ++----- dlls/gdi32/region.c | 11 +-- dlls/gdi32/win32u_private.h | 41 +++++++++++ dlls/gdi32/wrappers.c | 141 ++++++++++++++++++++++++++++++++++++ 9 files changed, 246 insertions(+), 81 deletions(-) create mode 100644 dlls/gdi32/win32u_private.h create mode 100644 dlls/gdi32/wrappers.c

3 2

[PATCH v2 5/9] gdi32: Don't use WideCharToMultiByte in font.c.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 56 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-)

3 2

[PATCH v2 4/9] gdi32: Use NtGdiOpenDCW for CreateDCW.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Passing function getter to NtGdiOpenDCW is hackish, but it's meant to unblock the transition for now. This is used for printer drivers. Since DC driver interface is meant to be Unix-side-only, we will need to change it. While making wineps.drv a Unix lib would be possible, I think it would be better to mimic Windows behaviour closer. For that, we'd need to expose printer processor functionality from wineps.drv that would convert EMFs to PostScript. The existing wineps code seems to be a good base for that. We'd need to factor out driver-specific bits and call conversion functions from EMF replay. With that in place: - gdi32 would setup EMF recording for printer DCs (on PE side) - it would submit EMF records to winspool when appropriate - winspool would detect EMFs and use print processor to convert it to PS - winspool would submit PS document to the printer With that in place, hopefully only small bits of wineps.drv will still need to live in DC driver part. I hope that we will be able to move those bits directly to win32u, so no actual library loading would need to be performed by gdi32 nor ntgdi. dlls/gdi32/dc.c | 62 +++++------ dlls/gdi32/driver.c | 188 +++----------------------------- dlls/gdi32/emfdrv.c | 2 +- dlls/gdi32/gdidc.c | 215 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 3 +- 5 files changed, 260 insertions(+), 210 deletions(-)

3 2

[PATCH v2 3/9] gdi32: Remove unused argument from CreateDC driver entry point.
by Jacek Caban 28 Sep '21

28 Sep '21

2 1

[PATCH v2 2/9] gdi32: Get codepages and OS version directly from PEB.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/font.c | 30 ++++++++++++++++++++---------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + 4 files changed, 23 insertions(+), 12 deletions(-)

2 1

[PATCH v2 1/9] gdi32: Don't use wide string literals ntgdi functions.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed build on macOS dlls/gdi32/font.c | 111 +++++++++++++++++----------- dlls/gdi32/gdiobj.c | 176 +++++++++++++++++++++++++++++--------------- 2 files changed, 186 insertions(+), 101 deletions(-)

2 1

[PATCH 1/6] dbghelp/dwarf: downgrade FIXME into WARN for empty range
by Eric Pouech 28 Sep '21

28 Sep '21

it happens to be generated for some inline functions, that we badly support yet Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0397ffe90b2..f05186eb9c0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1236,7 +1236,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in if (high > *phigh) *phigh = high; } if (*plow == UMAX || *phigh == 0) {FIXME("no entry found\n"); return FALSE;} - if (*plow == *phigh) {FIXME("entry found, but low=high\n"); return FALSE;} + if (*plow == *phigh) {WARN("entry found, but low=high %lx %lx\n", low, high); return FALSE;} return TRUE; } @@ -2002,7 +2002,7 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc)) { - FIXME("cannot read range\n"); + WARN("cannot read range\n"); return; }

3 7

[PATCH v2 3/9] gdi32: Directly use ntdll in init_font_options.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed commit message. dlls/gdi32/font.c | 61 +++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 26 deletions(-)

3 3

[PATCH vkd3d 4/4] vkd3d-shader/sm4: Skip second-order extended operands.
by Henri Verbeet 28 Sep '21

28 Sep '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6afb92c5..23814a35 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1213,6 +1213,12 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr } extended = *(*ptr)++; + if (extended & VKD3D_SM4_EXTENDED_OPERAND) + { + FIXME("Skipping second-order extended operand.\n"); + *ptr += *ptr < end; + } + type = extended & VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK; if (type == VKD3D_SM4_EXTENDED_OPERAND_MODIFIER) { @@ -1254,7 +1260,8 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr param->non_uniform = true; extended &= ~(VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK | VKD3D_SM4_REGISTER_MODIFIER_MASK - | VKD3D_SM4_REGISTER_PRECISION_MASK | VKD3D_SM4_REGISTER_NON_UNIFORM_MASK); + | VKD3D_SM4_REGISTER_PRECISION_MASK | VKD3D_SM4_REGISTER_NON_UNIFORM_MASK + | VKD3D_SM4_EXTENDED_OPERAND); if (extended) FIXME("Skipping unhandled extended operand bits 0x%08x.\n", extended); } -- 2.20.1

1 0

[PATCH vkd3d 3/4] vkd3d-shader/sm4: Parse the "non-uniform" modifier.
by Henri Verbeet 28 Sep '21

28 Sep '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 6 +++++- libs/vkd3d-shader/sm4.h | 3 +++ libs/vkd3d-shader/trace.c | 9 +++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index f325d9b7..6afb92c5 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1200,6 +1200,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr param->type = register_type_table[register_type]; } param->precision = VKD3D_SHADER_REGISTER_PRECISION_DEFAULT; + param->non_uniform = false; param->data_type = data_type; *modifier = VKD3DSPSM_NONE; @@ -1249,8 +1250,11 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr param->precision = register_precision_table[precision]; } + if (extended & VKD3D_SM4_REGISTER_NON_UNIFORM_MASK) + param->non_uniform = true; + extended &= ~(VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK | VKD3D_SM4_REGISTER_MODIFIER_MASK - | VKD3D_SM4_REGISTER_PRECISION_MASK); + | VKD3D_SM4_REGISTER_PRECISION_MASK | VKD3D_SM4_REGISTER_NON_UNIFORM_MASK); if (extended) FIXME("Skipping unhandled extended operand bits 0x%08x.\n", extended); } diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index e811f198..3ac41cb0 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -104,6 +104,9 @@ #define VKD3D_SM4_REGISTER_PRECISION_SHIFT 14 #define VKD3D_SM4_REGISTER_PRECISION_MASK (0x7u << VKD3D_SM4_REGISTER_PRECISION_SHIFT) +#define VKD3D_SM4_REGISTER_NON_UNIFORM_SHIFT 17 +#define VKD3D_SM4_REGISTER_NON_UNIFORM_MASK (0x1u << VKD3D_SM4_REGISTER_NON_UNIFORM_SHIFT) + #define VKD3D_SM4_ADDRESSING_SHIFT2 28 #define VKD3D_SM4_ADDRESSING_MASK2 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT2) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index dba50d2a..45f38d13 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1202,6 +1202,13 @@ static void shader_print_precision(struct vkd3d_d3d_asm_compiler *compiler, cons vkd3d_string_buffer_printf(buffer, " {%s%s%s}", compiler->colours.modifier, precision, compiler->colours.reset); } +static void shader_print_non_uniform(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg) +{ + if (reg->non_uniform) + vkd3d_string_buffer_printf(&compiler->buffer, " {%snonuniform%s}", + compiler->colours.modifier, compiler->colours.reset); +} + static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_dst_param *param, bool is_declaration) { @@ -1230,6 +1237,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, } shader_print_precision(compiler, &param->reg); + shader_print_non_uniform(compiler, &param->reg); } static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, @@ -1302,6 +1310,7 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "|"); shader_print_precision(compiler, &param->reg); + shader_print_non_uniform(compiler, &param->reg); } static void shader_dump_ins_modifiers(struct vkd3d_d3d_asm_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b48b901f..8b3e7624 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -633,6 +633,7 @@ struct vkd3d_shader_register { enum vkd3d_shader_register_type type; enum vkd3d_shader_register_precision precision; + bool non_uniform; enum vkd3d_data_type data_type; struct vkd3d_shader_register_index idx[3]; enum vkd3d_immconst_type immconst_type; -- 2.20.1

1 0

[PATCH vkd3d 2/4] vkd3d-shader/sm4: Parse register precision modifiers.
by Henri Verbeet 28 Sep '21

28 Sep '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 27 ++++++++++++++- libs/vkd3d-shader/sm4.h | 12 +++++++ libs/vkd3d-shader/trace.c | 44 ++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 12 +++++++ 4 files changed, 94 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0d77f024..f325d9b7 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -925,6 +925,16 @@ static const enum vkd3d_shader_register_type register_type_table[] = /* VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL */ VKD3DSPR_DEPTHOUTLE, }; +static const enum vkd3d_shader_register_precision register_precision_table[] = +{ + /* VKD3D_SM4_REGISTER_PRECISION_DEFAULT */ VKD3D_SHADER_REGISTER_PRECISION_DEFAULT, + /* VKD3D_SM4_REGISTER_PRECISION_MIN_FLOAT_16 */ VKD3D_SHADER_REGISTER_PRECISION_MIN_FLOAT_16, + /* VKD3D_SM4_REGISTER_PRECISION_MIN_FLOAT_10 */ VKD3D_SHADER_REGISTER_PRECISION_MIN_FLOAT_10, + /* UNKNOWN */ VKD3D_SHADER_REGISTER_PRECISION_INVALID, + /* VKD3D_SM4_REGISTER_PRECISION_MIN_INT_16 */ VKD3D_SHADER_REGISTER_PRECISION_MIN_INT_16, + /* VKD3D_SM4_REGISTER_PRECISION_MIN_UINT_16 */ VKD3D_SHADER_REGISTER_PRECISION_MIN_UINT_16, +}; + static const struct vkd3d_sm4_opcode_info *get_opcode_info(enum vkd3d_sm4_opcode opcode) { unsigned int i; @@ -1165,6 +1175,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, enum vkd3d_shader_src_modifier *modifier) { + enum vkd3d_sm4_register_precision precision; enum vkd3d_sm4_register_type register_type; enum vkd3d_sm4_extended_operand_type type; enum vkd3d_sm4_register_modifier m; @@ -1188,6 +1199,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr { param->type = register_type_table[register_type]; } + param->precision = VKD3D_SHADER_REGISTER_PRECISION_DEFAULT; param->data_type = data_type; *modifier = VKD3DSPSM_NONE; @@ -1225,7 +1237,20 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; } - extended &= ~(VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK | VKD3D_SM4_REGISTER_MODIFIER_MASK); + precision = (extended & VKD3D_SM4_REGISTER_PRECISION_MASK) >> VKD3D_SM4_REGISTER_PRECISION_SHIFT; + if (precision >= ARRAY_SIZE(register_precision_table) + || register_precision_table[precision] == VKD3D_SHADER_REGISTER_PRECISION_INVALID) + { + FIXME("Unhandled register precision %#x.\n", precision); + param->precision = VKD3D_SHADER_REGISTER_PRECISION_INVALID; + } + else + { + param->precision = register_precision_table[precision]; + } + + extended &= ~(VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK | VKD3D_SM4_REGISTER_MODIFIER_MASK + | VKD3D_SM4_REGISTER_PRECISION_MASK); if (extended) FIXME("Skipping unhandled extended operand bits 0x%08x.\n", extended); } diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index d64a9eff..e811f198 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -101,6 +101,9 @@ #define VKD3D_SM4_REGISTER_MODIFIER_SHIFT 6 #define VKD3D_SM4_REGISTER_MODIFIER_MASK (0xffu << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) +#define VKD3D_SM4_REGISTER_PRECISION_SHIFT 14 +#define VKD3D_SM4_REGISTER_PRECISION_MASK (0x7u << VKD3D_SM4_REGISTER_PRECISION_SHIFT) + #define VKD3D_SM4_ADDRESSING_SHIFT2 28 #define VKD3D_SM4_ADDRESSING_MASK2 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT2) @@ -407,6 +410,15 @@ enum vkd3d_sm4_register_modifier VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE = 0x03, }; +enum vkd3d_sm4_register_precision +{ + VKD3D_SM4_REGISTER_PRECISION_DEFAULT = 0x0, + VKD3D_SM4_REGISTER_PRECISION_MIN_FLOAT_16 = 0x1, + VKD3D_SM4_REGISTER_PRECISION_MIN_FLOAT_10 = 0x2, + VKD3D_SM4_REGISTER_PRECISION_MIN_INT_16 = 0x4, + VKD3D_SM4_REGISTER_PRECISION_MIN_UINT_16 = 0x5, +}; + enum vkd3d_sm4_output_primitive_type { VKD3D_SM4_OUTPUT_PT_POINTLIST = 0x1, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 1dca1ae2..dba50d2a 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -323,7 +323,9 @@ shader_input_sysval_semantic_names[] = struct vkd3d_d3d_asm_colours { const char *reset; + const char *error; const char *literal; + const char *modifier; const char *opcode; const char *reg; const char *swizzle; @@ -1166,6 +1168,40 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const } } +static void shader_print_precision(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg) +{ + struct vkd3d_string_buffer *buffer = &compiler->buffer; + const char *precision; + + if (reg->precision == VKD3D_SHADER_REGISTER_PRECISION_DEFAULT) + return; + + switch (reg->precision) + { + case VKD3D_SHADER_REGISTER_PRECISION_MIN_FLOAT_16: + precision = "min16f"; + break; + + case VKD3D_SHADER_REGISTER_PRECISION_MIN_FLOAT_10: + precision = "min2_8f"; + break; + + case VKD3D_SHADER_REGISTER_PRECISION_MIN_INT_16: + precision = "min16i"; + break; + + case VKD3D_SHADER_REGISTER_PRECISION_MIN_UINT_16: + precision = "min16u"; + break; + + default: + vkd3d_string_buffer_printf(buffer, " {%s<unhandled precision %#x>%s}", + compiler->colours.error, reg->precision, compiler->colours.reset); + return; + } + vkd3d_string_buffer_printf(buffer, " {%s%s%s}", compiler->colours.modifier, precision, compiler->colours.reset); +} + static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_dst_param *param, bool is_declaration) { @@ -1192,6 +1228,8 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "%c", write_mask_chars[3]); shader_addline(buffer, "%s", compiler->colours.reset); } + + shader_print_precision(compiler, &param->reg); } static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, @@ -1262,6 +1300,8 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, } if (src_modifier == VKD3DSPSM_ABS || src_modifier == VKD3DSPSM_ABSNEG) shader_addline(buffer, "|"); + + shader_print_precision(compiler, &param->reg); } static void shader_dump_ins_modifiers(struct vkd3d_d3d_asm_compiler *compiler, @@ -1786,7 +1826,9 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, static const struct vkd3d_d3d_asm_colours no_colours = { .reset = "", + .error = "", .literal = "", + .modifier = "", .opcode = "", .reg = "", .swizzle = "", @@ -1796,7 +1838,9 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, static const struct vkd3d_d3d_asm_colours colours = { .reset = "\x1b[m", + .error = "\x1b[97;41m", .literal = "\x1b[95m", + .modifier = "\x1b[36m", .opcode = "\x1b[96;1m", .reg = "\x1b[96m", .swizzle = "\x1b[93m", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b02315ab..b48b901f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -441,6 +441,17 @@ enum vkd3d_shader_register_type VKD3DSPR_INVALID = ~0u, }; +enum vkd3d_shader_register_precision +{ + VKD3D_SHADER_REGISTER_PRECISION_DEFAULT, + VKD3D_SHADER_REGISTER_PRECISION_MIN_FLOAT_16, + VKD3D_SHADER_REGISTER_PRECISION_MIN_FLOAT_10, + VKD3D_SHADER_REGISTER_PRECISION_MIN_INT_16, + VKD3D_SHADER_REGISTER_PRECISION_MIN_UINT_16, + + VKD3D_SHADER_REGISTER_PRECISION_INVALID = ~0u, +}; + enum vkd3d_data_type { VKD3D_DATA_FLOAT, @@ -621,6 +632,7 @@ struct vkd3d_shader_register_index struct vkd3d_shader_register { enum vkd3d_shader_register_type type; + enum vkd3d_shader_register_precision precision; enum vkd3d_data_type data_type; struct vkd3d_shader_register_index idx[3]; enum vkd3d_immconst_type immconst_type; -- 2.20.1

1 0

[PATCH vkd3d 1/4] vkd3d-shader/sm4: Parse register modifiers separately from the extended operand type.
by Henri Verbeet 28 Sep '21

28 Sep '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 59 +++++++++++++++++++++--------------- libs/vkd3d-shader/hlsl_sm4.c | 5 +-- libs/vkd3d-shader/sm4.h | 21 ++++++++++--- 3 files changed, 53 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 86cd0ec0..0d77f024 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1166,7 +1166,9 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr enum vkd3d_shader_src_modifier *modifier) { enum vkd3d_sm4_register_type register_type; - DWORD token, order; + enum vkd3d_sm4_extended_operand_type type; + enum vkd3d_sm4_register_modifier m; + uint32_t token, order, extended; if (*ptr >= end) { @@ -1188,42 +1190,49 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr } param->data_type = data_type; - if (token & VKD3D_SM4_REGISTER_MODIFIER) + *modifier = VKD3DSPSM_NONE; + if (token & VKD3D_SM4_EXTENDED_OPERAND) { - DWORD m; - if (*ptr >= end) { WARN("Invalid ptr %p >= end %p.\n", *ptr, end); return false; } - m = *(*ptr)++; + extended = *(*ptr)++; - switch (m) + type = extended & VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK; + if (type == VKD3D_SM4_EXTENDED_OPERAND_MODIFIER) { - case VKD3D_SM4_REGISTER_MODIFIER_NEGATE: - *modifier = VKD3DSPSM_NEG; - break; + m = (extended & VKD3D_SM4_REGISTER_MODIFIER_MASK) >> VKD3D_SM4_REGISTER_MODIFIER_SHIFT; + switch (m) + { + case VKD3D_SM4_REGISTER_MODIFIER_NEGATE: + *modifier = VKD3DSPSM_NEG; + break; - case VKD3D_SM4_REGISTER_MODIFIER_ABS: - *modifier = VKD3DSPSM_ABS; - break; + case VKD3D_SM4_REGISTER_MODIFIER_ABS: + *modifier = VKD3DSPSM_ABS; + break; - case VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE: - *modifier = VKD3DSPSM_ABSNEG; - break; + case VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE: + *modifier = VKD3DSPSM_ABSNEG; + break; - default: - FIXME("Skipping modifier 0x%08x.\n", m); - /* fall-through */ - case VKD3D_SM4_REGISTER_MODIFIER_NONE: - *modifier = VKD3DSPSM_NONE; - break; + default: + FIXME("Unhandled register modifier %#x.\n", m); + /* fall-through */ + case VKD3D_SM4_REGISTER_MODIFIER_NONE: + break; + } + + extended &= ~(VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK | VKD3D_SM4_REGISTER_MODIFIER_MASK); + if (extended) + FIXME("Skipping unhandled extended operand bits 0x%08x.\n", extended); + } + else if (type) + { + FIXME("Skipping unhandled extended operand token 0x%08x (type %#x).\n", extended, type); } - } - else - { - *modifier = VKD3DSPSM_NONE; } order = (token & VKD3D_SM4_REGISTER_ORDER_MASK) >> VKD3D_SM4_REGISTER_ORDER_SHIFT; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 500c9f43..49579dd5 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -750,11 +750,12 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st token |= sm4_swizzle_type(instr->srcs[i].reg.type) << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; token |= instr->srcs[i].swizzle << VKD3D_SM4_SWIZZLE_SHIFT; if (instr->srcs[i].reg.mod) - token |= VKD3D_SM4_REGISTER_MODIFIER; + token |= VKD3D_SM4_EXTENDED_OPERAND; put_u32(buffer, token); if (instr->srcs[i].reg.mod) - put_u32(buffer, instr->srcs[i].reg.mod); + put_u32(buffer, (instr->srcs[i].reg.mod << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) + | VKD3D_SM4_EXTENDED_OPERAND_MODIFIER); for (j = 0; j < instr->srcs[i].reg.idx_count; ++j) put_u32(buffer, instr->srcs[i].reg.idx[j]); diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index b4dd1632..d64a9eff 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -94,7 +94,12 @@ #define VKD3D_SM4_OPCODE_MASK 0xff -#define VKD3D_SM4_REGISTER_MODIFIER (0x1u << 31) +#define VKD3D_SM4_EXTENDED_OPERAND (0x1u << 31) + +#define VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK 0x3fu + +#define VKD3D_SM4_REGISTER_MODIFIER_SHIFT 6 +#define VKD3D_SM4_REGISTER_MODIFIER_MASK (0xffu << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) #define VKD3D_SM4_ADDRESSING_SHIFT2 28 #define VKD3D_SM4_ADDRESSING_MASK2 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT2) @@ -388,12 +393,18 @@ enum vkd3d_sm4_register_type VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL = 0x27, }; +enum vkd3d_sm4_extended_operand_type +{ + VKD3D_SM4_EXTENDED_OPERAND_NONE = 0x0, + VKD3D_SM4_EXTENDED_OPERAND_MODIFIER = 0x1, +}; + enum vkd3d_sm4_register_modifier { - VKD3D_SM4_REGISTER_MODIFIER_NONE = 0x01, - VKD3D_SM4_REGISTER_MODIFIER_NEGATE = 0x41, - VKD3D_SM4_REGISTER_MODIFIER_ABS = 0x81, - VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE = 0xc1, + VKD3D_SM4_REGISTER_MODIFIER_NONE = 0x00, + VKD3D_SM4_REGISTER_MODIFIER_NEGATE = 0x01, + VKD3D_SM4_REGISTER_MODIFIER_ABS = 0x02, + VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE = 0x03, }; enum vkd3d_sm4_output_primitive_type -- 2.20.1

1 0

[PATCH vkd3d] vkd3d-shader/hlsl: Fix type comparison for column-major matrices.
by Giovanni Mascellani 28 Sep '21

28 Sep '21

Previously hlsl_types_are_equal considered two matrices of different type if one of those had an explicit column-major modifier while the other didn't have any (in which case the matrix is still considered column-major by default). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8a2286c4..30098ea3 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -327,8 +327,8 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) return false; - if ((t1->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) - != (t2->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) + if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) + != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) return false; if (t1->dimx != t2->dimx) return false; -- 2.33.0

3 3

[PATCH vkd3d 1/2] vkd3d-shader/hlsl: Fix a memory leak.
by Giovanni Mascellani 28 Sep '21

28 Sep '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9efc3dad..41ba824d 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1014,6 +1014,7 @@ static void allocate_temp_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functio struct liveness liveness = {0}; allocate_temp_registers_recurse(ctx, entry_func->body, &liveness); ctx->temp_count = liveness.reg_count; + vkd3d_free(liveness.regs); } static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, unsigned int *counter, bool output) -- 2.33.0

3 5

[PATCH 6/9] gdi32: Introduce user_callbacks.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is one more hack to unblock the transition. Ultimately, both relevant parts of user32 and gdi32 will live in win32u, so those will be just internal calls. The plan is to move ntgdi to win32u first (we're fairly close to that with this series, but we still need to make it compatible with proper Unix lib) and then work at moving user32 bits (hopefully this can be done more incrementally). dlls/gdi32/Makefile.in | 3 +- dlls/gdi32/driver.c | 74 ++++++++----------- dlls/gdi32/gdiobj.c | 9 +-- dlls/gdi32/ntgdi_private.h | 3 +- dlls/gdi32/palette.c | 27 ++----- dlls/gdi32/region.c | 11 +-- dlls/gdi32/win32u_private.h | 41 +++++++++++ dlls/gdi32/wrappers.c | 141 ++++++++++++++++++++++++++++++++++++ 8 files changed, 228 insertions(+), 81 deletions(-) create mode 100644 dlls/gdi32/win32u_private.h create mode 100644 dlls/gdi32/wrappers.c

2 2

[PATCH 1/6] ole32/composite: Reimplement Inverse().
by Nikolay Sivov 28 Sep '21

28 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compositemoniker.c | 61 +++++++---------------- dlls/ole32/tests/moniker.c | 92 ++++++++++++++++++++++++++++++----- 2 files changed, 97 insertions(+), 56 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 40889ae42b2..b2ec02e1150 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -740,57 +740,32 @@ static HRESULT WINAPI CompositeMonikerImpl_GetTimeOfLastChange(IMoniker *iface, return hr; } -/****************************************************************************** - * CompositeMoniker_Inverse - ******************************************************************************/ -static HRESULT WINAPI -CompositeMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) +static HRESULT WINAPI CompositeMonikerImpl_Inverse(IMoniker *iface, IMoniker **inverse) { - HRESULT res; - IMoniker *tempMk,*antiMk,*rightMostMk,*tempInvMk,*rightMostInvMk; - IEnumMoniker *enumMoniker; - - TRACE("(%p,%p)\n",iface,ppmk); - - if (ppmk==NULL) - return E_POINTER; - - /* This method returns a composite moniker that consists of the inverses of each of the components */ - /* of the original composite, stored in reverse order */ - - *ppmk = NULL; - - res=CreateAntiMoniker(&antiMk); - if (FAILED(res)) - return res; - - res=IMoniker_ComposeWith(iface,antiMk,FALSE,&tempMk); - IMoniker_Release(antiMk); - if (FAILED(res)) - return res; - - if (tempMk==NULL) + CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); + IMoniker *right_inverted, *left_inverted; + HRESULT hr; - return IMoniker_Inverse(iface,ppmk); + TRACE("%p, %p.\n", iface, inverse); - else{ + if (!inverse) + return E_INVALIDARG; - IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); - IEnumMoniker_Release(enumMoniker); + *inverse = NULL; - IMoniker_Inverse(rightMostMk,&rightMostInvMk); - CompositeMonikerImpl_Inverse(tempMk,&tempInvMk); + if (FAILED(hr = IMoniker_Inverse(moniker->right, &right_inverted))) return hr; + if (FAILED(hr = IMoniker_Inverse(moniker->left, &left_inverted))) + { + IMoniker_Release(right_inverted); + return hr; + } - res=CreateGenericComposite(rightMostInvMk,tempInvMk,ppmk); + hr = CreateGenericComposite(right_inverted, left_inverted, inverse); - IMoniker_Release(tempMk); - IMoniker_Release(rightMostMk); - IMoniker_Release(tempInvMk); - IMoniker_Release(rightMostInvMk); + IMoniker_Release(left_inverted); + IMoniker_Release(right_inverted); - return res; - } + return hr; } static HRESULT WINAPI CompositeMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker *other, diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7d88c132d3d..7f0b9ec5841 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -53,18 +53,21 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) -#define CHECK_EXPECTED_METHOD(method_name) \ -do { \ - ok(*expected_method_list != NULL, "Extra method %s called\n", method_name); \ - if (*expected_method_list) \ - { \ - ok(!strcmp(*expected_method_list, method_name), "Expected %s to be called instead of %s\n", \ - *expected_method_list, method_name); \ - expected_method_list++; \ - } \ -} while(0) - static char const * const *expected_method_list; + +#define CHECK_EXPECTED_METHOD(method_name) check_expected_method_(__LINE__, method_name) +static void check_expected_method_(unsigned int line, const char *method_name) +{ + if (!expected_method_list) return; + ok(*expected_method_list != NULL, "Extra method %s called\n", method_name); + if (*expected_method_list) + { + ok(!strcmp(*expected_method_list, method_name), "Expected %s to be called instead of %s\n", + *expected_method_list, method_name); + expected_method_list++; + } +} + static const WCHAR wszFileName1[] = {'c',':','\\','w','i','n','d','o','w','s','\\','t','e','s','t','1','.','d','o','c',0}; static const WCHAR wszFileName2[] = {'c',':','\\','w','i','n','d','o','w','s','\\','t','e','s','t','2','.','d','o','c',0}; @@ -384,6 +387,7 @@ struct test_moniker IOleItemContainer IOleItemContainer_iface; IParseDisplayName IParseDisplayName_iface; LONG refcount; + const char *inverse; BOOL no_IROTData; }; @@ -665,7 +669,7 @@ Moniker_ComposeWith(IMoniker* iface, IMoniker* pmkRight, BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite) { CHECK_EXPECTED_METHOD("Moniker_ComposeWith"); - return E_NOTIMPL; + return MK_E_NEEDGENERIC; } static HRESULT WINAPI @@ -714,8 +718,9 @@ Moniker_GetTimeOfLastChange(IMoniker* iface, IBindCtx* pbc, static HRESULT WINAPI Moniker_Inverse(IMoniker* iface,IMoniker** ppmk) { + struct test_moniker *moniker = impl_from_IMoniker(iface); CHECK_EXPECTED_METHOD("Moniker_Inverse"); - return E_NOTIMPL; + return create_moniker_from_desc(moniker->inverse, ppmk); } static HRESULT WINAPI @@ -933,6 +938,7 @@ static void test_ROT(void) hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + expected_method_list = NULL; hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); @@ -2545,6 +2551,7 @@ static void test_item_moniker(void) expected_method_list = methods_isrunning; hr = IMoniker_IsRunning(moniker, bindctx, &container_moniker->IMoniker_iface, moniker2); ok(hr == 0x8beef000, "Unexpected hr %#x.\n", hr); + expected_method_list = NULL; IMoniker_Release(moniker2); @@ -3043,6 +3050,7 @@ static void test_generic_composite_moniker(void) { "CI1I3", "CA1I2", MKSYS_GENERICCOMPOSITE, L"!I1!I2" }, }; IMoniker *moniker, *inverse, *moniker1, *moniker2, *moniker3; + struct test_moniker *m, *m2; IEnumMoniker *enummoniker; IRunningObjectTable *rot; DWORD hash, cookie; @@ -3377,6 +3385,64 @@ todo_wine IMoniker_Release(moniker2); IMoniker_Release(moniker1); + /* Inverse() */ + hr = create_moniker_from_desc("CI1I2", &moniker1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Inverse(moniker1, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Inverse(moniker1, &inverse); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(inverse, MKSYS_GENERICCOMPOSITE); + TEST_DISPLAY_NAME(inverse, L"\\..\\.."); + IMoniker_Release(inverse); + IMoniker_Release(moniker1); + + hr = create_moniker_from_desc("CA1A2", &moniker1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + inverse = (void *)0xdeadbeef; + hr = IMoniker_Inverse(moniker1, &inverse); + ok(hr == MK_E_NOINVERSE, "Unexpected hr %#x.\n", hr); + ok(!inverse, "Unexpected pointer.\n"); + IMoniker_Release(moniker1); + + hr = create_moniker_from_desc("CI1A2", &moniker1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + inverse = (void *)0xdeadbeef; + hr = IMoniker_Inverse(moniker1, &inverse); + ok(hr == MK_E_NOINVERSE, "Unexpected hr %#x.\n", hr); + ok(!inverse, "Unexpected pointer.\n"); + IMoniker_Release(moniker1); + + /* Now with custom moniker to observe inverse order */ + m = create_test_moniker(); + m->inverse = "I5"; + hr = create_moniker_from_desc("I1", &moniker1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = CreateGenericComposite(moniker1, &m->IMoniker_iface, &moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker2, MKSYS_GENERICCOMPOSITE); + inverse = (void *)0xdeadbeef; + hr = IMoniker_Inverse(moniker2, &inverse); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!inverse, "Unexpected pointer.\n"); + IMoniker_Release(moniker1); + + /* Use custom monikers for both, so they don't invert to anti monikers. */ + m2 = create_test_moniker(); + m2->inverse = "I4"; + + hr = CreateGenericComposite(&m2->IMoniker_iface, &m->IMoniker_iface, &moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Inverse(moniker2, &inverse); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(inverse, MKSYS_GENERICCOMPOSITE); + TEST_DISPLAY_NAME(inverse, L"!I5!I4"); + IMoniker_Release(inverse); + IMoniker_Release(moniker2); + + IMoniker_Release(&m->IMoniker_iface); + IMoniker_Release(&m2->IMoniker_iface); + IBindCtx_Release(bindctx); } -- 2.33.0

1 5

[PATCH] configure.ac: don't use -Wmisleading-indentation compiler option (GCC11)
by Eric Pouech 28 Sep '21

28 Sep '21

in tests, there's a lot of constructs like: bla1; bla2; todo_wine ok(tst, "..."); bla3; or bla1; bla2; todo_wine ok(tst, "..."); bla3; GCC11 complains about those (and some more complex) about bla3 not being properly indented wrt the todo_wine. I'm not 100% sure about the right fix: - disable the warning altogether (that's what this patch does), but we won't report other *real* indentation errors. To be frank, I haven't looked at the hundred of lines of warnings to check if one pops up. - reformat the code in tests. note that todo_wine { ok(tst, "..."); } or todo_wine ok(tst, "..."); or todo_wine ok(tst, "..."); don't generate warnings. but first one defeats the one liner, and the second and third ones don't preserve the line of the test unchanged when the todo is resolved I'd favor disabling the compiler option (it's the less intrusive in the code and in dev:s habits). A+ Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index a019b4ac2d6..6cd3e915aae 100644 --- a/configure.ac +++ b/configure.ac @@ -1002,6 +1002,7 @@ then CFLAGS="$CFLAGS $llvm_cflags"]) fi WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) + WINE_TRY_CROSSCFLAGS([-Wno-misleading-indentation]) dnl clang needs to be told to fail on unknown options WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) WINE_TRY_CROSSCFLAGS([-Werror=ignored-optimization-argument],[CFLAGS="$CFLAGS -Werror=ignored-optimization-argument"]) @@ -1992,6 +1993,7 @@ then WINE_TRY_CFLAGS([-Wunused-but-set-parameter]) WINE_TRY_CFLAGS([-Wvla]) WINE_TRY_CFLAGS([-Wwrite-strings]) + WINE_TRY_CFLAGS([-Wno-misleading-indentation]) if test -z "$CROSSTARGET" then

4 4

[PATCH v2] wininet: Reset context length for http status 304
by Alistair Leslie-Hughes 28 Sep '21

28 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 4 +++- dlls/wininet/tests/http.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..4bfd93aa3be 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,9 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..1a4b1a15a4e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2381,6 +2381,13 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n" + "Content-Length: 10\r\n" + "\r\n"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3494,36 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD avail; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + avail = 0; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail == 0, "got %d\n", avail); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6097,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

3 2

[PATCH 9/9] gdi32: Use single get_cptable implementation.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 15 --------------- dlls/gdi32/ntgdi_private.h | 1 + 3 files changed, 2 insertions(+), 16 deletions(-)

1 0

[PATCH 8/9] gdi32: Move ntgdi functions to Unix library.
by Jacek Caban 28 Sep '21

28 Sep '21

1 0

[PATCH 7/9] gdi32: Avoid using CRT wide char functions in ntgdi functions.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/win32u_private.h | 90 +++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)

1 0

[PATCH 5/9] gdi32: Don't use WideCharToMultiByte in font.c.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- get_cptable is duplicated from freetype.c. It's de-duplicated later in the series. dlls/gdi32/font.c | 56 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-)

1 0

[PATCH 4/9] gdi32: Use NtGdiOpenDCW for CreateDCW.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Passing function getter to NtGdiOpenDCW is hackish, but it's meant to unblock the transition for now. This is used for printer drivers. Since DC driver interface is meant to be Unix-side-only, we will need to change it. While making wineps.drv a Unix lib would be possible, I think it would be better to mimic Windows behaviour closer. For that, we'd need to expose printer processor functionality from wineps.drv that would convert EMFs to PostScript. The existing wineps code seems to be a good base for that. We'd need to factor out driver-specific bits and call conversion functions from EMF replay. With that in place: - gdi32 would setup EMF recording for printer DCs (on PE side) - it would submit EMF records to winspool when appropriate - winspool would detect EMFs and use print processor to convert it to PS - winspool would submit PS document to the printer With that in place, hopefully only small bits of wineps.drv will still need to live in DC driver part. I hope that we will be able to move those bits directly to win32u, so no actual library loading would need to be performed by gdi32 nor ntgdi. dlls/gdi32/dc.c | 62 +++++------ dlls/gdi32/driver.c | 188 +++----------------------------- dlls/gdi32/emfdrv.c | 2 +- dlls/gdi32/gdidc.c | 215 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 3 +- 5 files changed, 260 insertions(+), 210 deletions(-)

1 0

[PATCH 3/9] gdi32: Remove unused argument from CreateDC driver entry point.
by Jacek Caban 28 Sep '21

28 Sep '21

1 0

[PATCH 2/9] gdi32: Get codepages and OS version directly from PEB.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/font.c | 30 ++++++++++++++++++++---------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + 4 files changed, 23 insertions(+), 12 deletions(-)

1 0

[PATCH 1/9] gdi32: Don't use wide string literals in ntgdi functions.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 111 +++++++++++++++++----------- dlls/gdi32/gdiobj.c | 176 +++++++++++++++++++++++++++++--------------- 2 files changed, 186 insertions(+), 101 deletions(-)

1 0

[PATCH v2] oleacc: Add tests for default edit accessible object.
by Piotr Caban 28 Sep '21

28 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - removed expected_ prefix from acc_expected_vals field names dlls/oleacc/tests/main.c | 315 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 315 insertions(+)

1 0

[PATCH] wininet: Allow up to 4k for response headers
by Alistair Leslie-Hughes 28 Sep '21

28 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..8538699811c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -462,7 +462,7 @@ void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; -#define MAX_REPLY_LEN 0x5B4 +#define MAX_REPLY_LEN 0x1000 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */ typedef struct -- 2.33.0

1 0

[PATCH 1/4] configure.ac: Add -fasynchronous-unwind-tables to CROSSLDFLAGS.
by Rémi Bernon 28 Sep '21

28 Sep '21

When available. Otherwise the output_cfi calls in winebuild, in the syscall thunks for instance, are just no-op. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series makes it possible for Gdb to unwind the stack through the syscall dispatcher. I'm not completely sure it's right, and more precisely I don't know if PATCH 4 is okay, and if the kernel stack must be above the user stack. Sadly, other tools such as perf or valgrind still struggle with what they consider a huge stack frame between the kernel stack and the user stack when NT syscalls are executed. I'm not completely sure how this could be mitigated. configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index c0a126293c4..fb5447addd4 100644 --- a/configure.ac +++ b/configure.ac @@ -2105,6 +2105,7 @@ then DLLFLAGS="$DLLFLAGS -fasynchronous-unwind-tables" LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" UNIXDLLFLAGS="$UNIXDLLFLAGS -fasynchronous-unwind-tables" + CROSSLDFLAGS="$CROSSLDFLAGS -fasynchronous-unwind-tables" else if test "x$enable_win64" = "xyes" then -- 2.33.0

1 3

[PATCH 1/8] dinput: Return DIERR_NOTFOUND when DIPROP_RANGE object isn't found.
by Rémi Bernon 28 Sep '21

28 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 7 ++++--- dlls/dinput8/tests/hid.c | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index dfff379091e..73339564cd1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -515,7 +515,7 @@ static BOOL get_property_prop_range( struct hid_joystick *impl, struct hid_caps DIPROPRANGE *value = data; value->lMin = value_caps->PhysicalMin; value->lMax = value_caps->PhysicalMax; - return DIENUM_CONTINUE; + return DIENUM_STOP; } static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, const GUID *guid, @@ -533,8 +533,9 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con { case (DWORD_PTR)DIPROP_RANGE: if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; - enum_objects( impl, header, DIDFT_AXIS, get_property_prop_range, header ); - return DI_OK; + if (enum_objects( impl, header, DIDFT_AXIS, get_property_prop_range, header ) == DIENUM_STOP) + return DI_OK; + return DIERR_NOTFOUND; case (DWORD_PTR)DIPROP_PRODUCTNAME: { DIPROPSTRING *value = (DIPROPSTRING *)header; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 25e7511353f..affdddd153f 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3908,15 +3908,12 @@ static void test_simple_joystick(void) prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - todo_wine ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwObj = MAKELONG( 0, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - todo_wine ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwObj = MAKELONG( HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - todo_wine ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_range.lMin = 0xdeadbeef; -- 2.33.0

1 7

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Don't dereference a NULL offset_node in hlsl_offset_from_deref().
by Zebediah Figura 28 Sep '21

28 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9efc3dadd..6f8bece9f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1201,7 +1201,7 @@ unsigned int hlsl_offset_from_deref(const struct hlsl_deref *deref) if (offset_node->type != HLSL_IR_CONSTANT) { FIXME("Dereference with non-constant offset of type %s.\n", hlsl_node_type_to_string(offset_node->type)); - offset_node = NULL; + return 0; } return hlsl_ir_constant(offset_node)->value[0].u; -- 2.33.0

6 25

[PATCH 1/4] kernelbase: Don't use loader lock for loading libraries as data files.
by Paul Gofman 28 Sep '21

28 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernelbase/loader.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index da139e91176..53c6750e668 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -48,6 +48,14 @@ struct exclusive_datafile }; static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); +static CRITICAL_SECTION exclusive_datafile_list_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &exclusive_datafile_list_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": exclusive_datafile_list_section") } +}; +static CRITICAL_SECTION exclusive_datafile_list_section = { &critsect_debug, -1, 0, 0, 0, 0 }; /*********************************************************************** * Modules @@ -120,7 +128,9 @@ static BOOL load_library_as_datafile( LPCWSTR load_path, DWORD flags, LPCWSTR na if (!datafile) goto failed; datafile->module = *mod_ret; datafile->file = file; + RtlEnterCriticalSection( &exclusive_datafile_list_section ); list_add_head( &exclusive_datafile_list, &datafile->entry ); + RtlLeaveCriticalSection( &exclusive_datafile_list_section ); TRACE( "delaying close %p for module %p\n", datafile->file, datafile->module ); return TRUE; } @@ -154,14 +164,8 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) if (flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_AS_IMAGE_RESOURCE)) { - ULONG_PTR magic; - - LdrLockLoaderLock( 0, NULL, &magic ); - if (!LdrGetDllHandle( load_path, flags, libname, &module )) - LdrAddRefDll( 0, module ); - else + if (LdrGetDllHandleEx( 0, load_path, NULL, libname, &module )) load_library_as_datafile( load_path, flags, libname->Buffer, &module ); - LdrUnlockLoaderLock( 0, magic ); } else { @@ -242,9 +246,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary( HINSTANCE module ) if ((ULONG_PTR)module & 1) { struct exclusive_datafile *file; - ULONG_PTR magic; - LdrLockLoaderLock( 0, NULL, &magic ); + RtlEnterCriticalSection( &exclusive_datafile_list_section ); LIST_FOR_EACH_ENTRY( file, &exclusive_datafile_list, struct exclusive_datafile, entry ) { if (file->module != module) continue; @@ -254,7 +257,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary( HINSTANCE module ) HeapFree( GetProcessHeap(), 0, file ); break; } - LdrUnlockLoaderLock( 0, magic ); + RtlLeaveCriticalSection( &exclusive_datafile_list_section ); } return UnmapViewOfFile( ptr ); } -- 2.31.1

2 6

[PATCH] oleacc: Add tests for default edit accessible object.
by Connor McAdams 28 Sep '21

28 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 316 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 316 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 46e1f17685f..984ef2b4c2c 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1397,6 +1397,321 @@ static void test_CreateStdAccessibleObject_classes(void) } } +typedef struct +{ + const WCHAR *expected_name; + const WCHAR *expected_value; + HRESULT expected_value_hr; + + const WCHAR *expected_description; + const WCHAR *expected_help; + const WCHAR *expected_kbd_shortcut; + const WCHAR *expected_default_action; + + INT expected_role; + INT expected_state; + LONG expected_child_count; + BOOL expected_valid_child; + BOOL expected_valid_parent; + INT expected_focus_vt; + INT expected_focus_cid; +} acc_expected_vals; + +#define check_acc_vals( acc, vals) \ + check_acc_vals_( (acc), (vals), __LINE__) +static void check_acc_vals_(IAccessible *acc, const acc_expected_vals *vals, + int line) +{ + LONG left, top, width, height; + LONG child_count; + VARIANT vid, var; + IDispatch *disp; + HRESULT hr; + RECT rect; + HWND hwnd; + POINT pt; + BSTR str; + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok_(__FILE__, line) (hr == (vals->expected_name ? S_OK : S_FALSE), "get_accName returned %#x, expected %#x\n", + hr, (vals->expected_name ? S_OK : S_FALSE)); + ok_(__FILE__, line) (!lstrcmpW(str, vals->expected_name), "get_accName returned %s, expected %s\n", + wine_dbgstr_w(str), wine_dbgstr_w(vals->expected_name)); + SysFreeString(str); + + hr = IAccessible_get_accValue(acc, vid, &str); + ok_(__FILE__, line) (hr == vals->expected_value_hr, "get_accValue returned %#x, expected %#x\n", + hr, vals->expected_value_hr); + ok_(__FILE__, line) (!lstrcmpW(str, vals->expected_value), "get_accValue returned %s, expected %s\n", + wine_dbgstr_w(str), wine_dbgstr_w(vals->expected_value)); + SysFreeString(str); + + hr = IAccessible_get_accDescription(acc, vid, &str); + ok_(__FILE__, line) (hr == (vals->expected_description ? S_OK : S_FALSE), "get_accDescription returned %#x, expected %#x\n", + hr, vals->expected_help ? S_OK : S_FALSE); + ok_(__FILE__, line) (!lstrcmpW(str, vals->expected_description), "get_accDescription returned %s, expected %s\n", + wine_dbgstr_w(str), wine_dbgstr_w(vals->expected_description)); + SysFreeString(str); + + hr = IAccessible_get_accHelp(acc, vid, &str); + ok_(__FILE__, line) (hr == (vals->expected_help ? S_OK : S_FALSE), "get_accHelp returned %#x, expected %#x\n", + hr, vals->expected_help ? S_OK : S_FALSE); + ok_(__FILE__, line) (!lstrcmpW(str, vals->expected_help), "get_accHelp returned %s, expected %s\n", + wine_dbgstr_w(str), wine_dbgstr_w(vals->expected_help)); + SysFreeString(str); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok_(__FILE__, line) (hr == (vals->expected_kbd_shortcut ? S_OK : S_FALSE), "get_accKeyboardShortcut returned %#x, expected %#x\n", + hr, vals->expected_help ? S_OK : S_FALSE); + ok_(__FILE__, line) (!lstrcmpW(str, vals->expected_kbd_shortcut), "get_accKeyboardShortcut returned %s, expected %s\n", + wine_dbgstr_w(str), wine_dbgstr_w(vals->expected_kbd_shortcut)); + SysFreeString(str); + + hr = IAccessible_get_accDefaultAction(acc, vid, &str); + ok_(__FILE__, line) (hr == (vals->expected_default_action ? S_OK : S_FALSE), "get_accDefaultAction returned %#x, expected %#x\n", + hr, vals->expected_help ? S_OK : S_FALSE); + ok_(__FILE__, line) (!lstrcmpW(str, vals->expected_default_action), "get_accDefaultAction returned %s, expected %s\n", + wine_dbgstr_w(str), wine_dbgstr_w(vals->expected_default_action)); + SysFreeString(str); + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (void*)0xdeadbeef; + hr = IAccessible_get_accRole(acc, vid, &var); + ok_(__FILE__, line) (hr == S_OK, "get_accRole returned %#x\n", hr); + ok_(__FILE__, line) (V_VT(&var) == VT_I4, "V_VT(&var) returned %d, expected %d\n", V_VT(&var), VT_I4); + ok_(__FILE__, line) (V_I4(&var) == vals->expected_role, "get_accRole returned %d, expected %d\n", + V_I4(&var), vals->expected_role); + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (void*)0xdeadbeef; + hr = IAccessible_get_accState(acc, vid, &var); + ok_(__FILE__, line) (hr == S_OK, "get_accState returned %#x\n", hr); + ok_(__FILE__, line) (V_VT(&var) == VT_I4, "V_VT(&var) returned %d, expected %d\n", V_VT(&var), VT_I4); + ok_(__FILE__, line) (V_I4(&var) == vals->expected_state, "get_accState returned %#x, expected %#x\n", + V_I4(&var), vals->expected_state); + + hr = WindowFromAccessibleObject(acc, &hwnd); + ok_(__FILE__, line) (hr == S_OK, "got %x\n", hr); + ok_(__FILE__, line) (GetClientRect(hwnd, &rect), "GetClientRect failed\n"); + pt.x = rect.left; + pt.y = rect.top; + MapWindowPoints(hwnd, NULL, &pt, 1); + rect.left = pt.x; + rect.top = pt.y; + pt.x = rect.right; + pt.y = rect.bottom; + MapWindowPoints(hwnd, NULL, &pt, 1); + hr = IAccessible_accLocation(acc, &left, &top, &width, &height, vid); + ok_(__FILE__, line) (hr == S_OK, "got %x\n", hr); + ok_(__FILE__, line) (left == rect.left, "left = %d, expected %d\n", left, rect.left); + ok_(__FILE__, line) (top == rect.top, "top = %d, expected %d\n", top, rect.top); + ok_(__FILE__, line) (width == pt.x-rect.left, "width = %d, expected %d\n", width, pt.x-rect.left); + ok_(__FILE__, line) (height == pt.y-rect.top, "height = %d, expected %d\n", height, pt.y-rect.top); + + child_count = -1; + hr = IAccessible_get_accChildCount(acc, &child_count); + ok_(__FILE__, line) (hr == S_OK, "get_accChildCount returned %#x\n", hr); + ok_(__FILE__, line) (child_count == vals->expected_child_count, "get_accChildCount returned %d, expected %#x\n", + child_count, vals->expected_child_count); + + disp = (void *)0xdeadbeef; + V_VT(&var) = VT_I4; + V_I4(&var) = 1; + hr = IAccessible_get_accChild(acc, var, &disp); + ok_(__FILE__, line) (hr == (vals->expected_valid_child ? S_OK : E_INVALIDARG), "get_accChild returned %#x, expected %#x\n", + hr, (vals->expected_valid_child ? S_OK : E_INVALIDARG)); + if (disp) + { + ok_(__FILE__, line) (vals->expected_valid_child, "get_accChild unexpectedly returned a child\n"); + IDispatch_Release(disp); + } + else + ok_(__FILE__, line) (!vals->expected_valid_child, "get_accChild expected a valid child, none was returned\n"); + + disp = (void *)0xdeadbeef; + hr = IAccessible_get_accParent(acc, &disp); + ok_(__FILE__, line) (hr == S_OK, "get_accParent returned %#x\n", hr); + ok_(__FILE__, line) (disp != NULL, "get_accParent returned a NULL pareent\n"); + IDispatch_Release(disp); + + V_VT(&var) = VT_EMPTY; + hr = IAccessible_get_accFocus(acc, &var); + ok_(__FILE__, line) (hr == S_OK, "get_accFocus returned %#x\n", hr); + ok_(__FILE__, line) (V_VT(&var) == vals->expected_focus_vt, "get_accFocus returned V_VT(&var) %d, expected %d\n", + V_VT(&var), vals->expected_focus_vt); + switch(vals->expected_focus_vt) + { + case VT_I4: + ok_(__FILE__, line) (V_I4(&var) == vals->expected_focus_cid, "get_accFocus returned childID %d, expected %d\n", + V_I4(&var), vals->expected_focus_cid); + break; + + case VT_DISPATCH: + ok_(__FILE__, line) (V_DISPATCH(&var) != NULL, "get_accFocus returned NULL IDispatch\n"); + IDispatch_Release(V_DISPATCH(&var)); + break; + + default: + break; + } +} + +static const acc_expected_vals edit_acc_vals[] = { + /* edit0, readonly edit, no label. */ + { .expected_name = NULL, + .expected_value = L"edit0-test", + .expected_value_hr = S_OK, + .expected_description = NULL, + .expected_help = NULL, + .expected_kbd_shortcut = NULL, + .expected_default_action = NULL, + .expected_role = ROLE_SYSTEM_TEXT, + .expected_state = STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_READONLY, + .expected_child_count = 0, + .expected_valid_child = FALSE, + .expected_valid_parent = TRUE, + .expected_focus_vt = VT_EMPTY, + .expected_focus_cid = 0, }, + /* edit1, ES_PASSWORD edit style. */ + { .expected_name = L"label0:", + .expected_value = NULL, + .expected_value_hr = E_ACCESSDENIED, + .expected_description = NULL, + .expected_help = NULL, + .expected_kbd_shortcut = L"Alt+l", + .expected_default_action = NULL, + .expected_role = ROLE_SYSTEM_TEXT, + .expected_state = STATE_SYSTEM_PROTECTED | STATE_SYSTEM_FOCUSABLE, + .expected_child_count = 0, + .expected_valid_child = FALSE, + .expected_valid_parent = TRUE, + .expected_focus_vt = VT_EMPTY, + .expected_focus_cid = 0, }, + /* edit2, multi-line edit. */ + { .expected_name = L"label1:", + .expected_value = L"edit2-test\r\ntest-edit2\n", + .expected_value_hr = S_OK, + .expected_description = NULL, + .expected_help = NULL, + .expected_kbd_shortcut = L"Alt+e", + .expected_default_action = NULL, + .expected_role = ROLE_SYSTEM_TEXT, + .expected_state = STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_FOCUSED, + .expected_child_count = 0, + .expected_valid_child = FALSE, + .expected_valid_parent = TRUE, + .expected_focus_vt = VT_I4, + .expected_focus_cid = CHILDID_SELF, }, + /* edit3, edit with child HWND. */ + { .expected_name = L"label1:", + .expected_value = L"", + .expected_value_hr = S_OK, + .expected_description = NULL, + .expected_help = NULL, + .expected_kbd_shortcut = L"Alt+l", + .expected_default_action = NULL, + .expected_role = ROLE_SYSTEM_TEXT, + .expected_state = STATE_SYSTEM_FOCUSABLE, + /* Embedded button control HWND. */ + .expected_child_count = 1, + .expected_valid_child = FALSE, + .expected_valid_parent = TRUE, + .expected_focus_vt = VT_DISPATCH, + .expected_focus_cid = 0, }, +}; + +static void test_default_edit_accessible_object(void) +{ + HWND hwnd, label0, label1, btn0, btn1; + IAccessible *acc; + HWND edit[4]; + HRESULT hr; + VARIANT v; + BSTR str; + + hwnd = CreateWindowW(L"oleacc_test", L"edit_acc_test_win", WS_OVERLAPPEDWINDOW, + 0, 0, 220, 160, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed\n"); + + edit[0] = CreateWindowW(L"EDIT", L"", WS_VISIBLE | WS_CHILD | ES_READONLY, 5, 5, 190, 20, + hwnd, NULL, NULL, NULL); + ok(!!edit[0], "Failed to create edit[0] hwnd\n"); + + label0 = CreateWindowW(L"STATIC", L"&label0:", WS_VISIBLE | WS_CHILD, 5, 30, 55, 20, + hwnd, NULL, NULL, NULL); + ok(!!label0, "Failed to create label0 hwnd\n"); + + edit[1] = CreateWindowW(L"EDIT", L"", WS_VISIBLE | WS_CHILD | ES_PASSWORD, + 65, 30, 130, 20, hwnd, NULL, NULL, NULL); + ok(!!edit[1], "Failed to create edit[1] hwnd\n"); + + label1 = CreateWindowW(L"STATIC", L"lab&el1:", WS_VISIBLE | WS_CHILD, 5, 55, 45, 20, + hwnd, NULL, NULL, NULL); + ok(!!label1, "Failed to create label1 hwnd\n"); + + btn0 = CreateWindowW(L"BUTTON", L"but&ton0", WS_VISIBLE | WS_CHILD, 55, 55, 45, 20, + hwnd, NULL, NULL, NULL); + ok(!!btn0, "Failed to create btn0 hwnd\n"); + + edit[2] = CreateWindowW(L"EDIT", L"", WS_VISIBLE | WS_CHILD | ES_MULTILINE, + 105, 55, 90, 40, hwnd, NULL, NULL, NULL); + ok(!!edit[2], "Failed to create edit[2] hwnd\n"); + + edit[3] = CreateWindowW(L"EDIT", L"", WS_VISIBLE | WS_CHILD, 5, 100, 190, 20, + hwnd, NULL, NULL, NULL); + ok(!!edit[3], "Failed to create edit[3] hwnd\n"); + + /* Button embedded within an edit control window. */ + btn1 = CreateWindowW(L"BUTTON", L"button1", WS_VISIBLE | WS_CHILD, 100, 5, 85, 10, + edit[3], NULL, NULL, NULL); + ok(!!btn1, "Failed to create btn1 hwnd\n"); + + hr = CreateStdAccessibleObject(edit[0], OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + V_VT(&v) = VT_I4; + V_I4(&v) = CHILDID_SELF; + str = SysAllocString(L"edit0-test"); + hr = IAccessible_put_accValue(acc, v, str); + ok(hr == S_OK, "got %x\n", hr); + SysFreeString(str); + check_acc_vals(acc, &edit_acc_vals[0]); + IAccessible_Release(acc); + + hr = CreateStdAccessibleObject(edit[1], OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + str = SysAllocString(L"password"); + hr = IAccessible_put_accValue(acc, v, str); + ok(hr == S_OK, "got %x\n", hr); + SysFreeString(str); + check_acc_vals(acc, &edit_acc_vals[1]); + IAccessible_Release(acc); + + SetFocus(edit[2]); + hr = CreateStdAccessibleObject(edit[2], OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + str = SysAllocString(L"edit2-test\r\ntest-edit2\n"); + hr = IAccessible_put_accValue(acc, v, str); + ok(hr == S_OK, "got %x\n", hr); + SysFreeString(str); + check_acc_vals(acc, &edit_acc_vals[2]); + IAccessible_Release(acc); + + /* + * Hiding a label with a keyboard shortcut makes get_accKeyboardShortcut + * on the edit no longer return the labels shortcut, however get_accName + * still returns the labels string. + */ + ShowWindow(label1, SW_HIDE); + SetFocus(btn1); + hr = CreateStdAccessibleObject(edit[3], OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + check_acc_vals(acc, &edit_acc_vals[3]); + IAccessible_Release(acc); + + DestroyWindow(hwnd); +} + START_TEST(main) { int argc; @@ -1436,6 +1751,7 @@ START_TEST(main) test_AccessibleChildren(&Accessible); test_AccessibleObjectFromEvent(); test_CreateStdAccessibleObject_classes(); + test_default_edit_accessible_object(); unregister_window_class(); CoUninitialize(); -- 2.25.1

1 0

[PATCH v4 1/8] oleacc: Reorganize class specific behaviour handling.
by Connor McAdams 28 Sep '21

28 Sep '21

From: Piotr Caban <piotr(a)codeweavers.com> --- -v4: Restore previously deleted class check for default window object, and add dialog window class to window object class table. dlls/oleacc/client.c | 36 ++++++++++++++++ dlls/oleacc/main.c | 82 +++++------------------------------- dlls/oleacc/oleacc_private.h | 7 +++ dlls/oleacc/window.c | 10 +++++ 4 files changed, 63 insertions(+), 72 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 93f6b590f78..333a95dc388 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "oleacc_private.h" +#include "commctrl.h" #include "wine/debug.h" #include "wine/heap.h" @@ -650,6 +651,39 @@ static const IEnumVARIANTVtbl ClientEnumVARIANTVtbl = { Client_EnumVARIANT_Clone }; +static const struct win_class_data classes[] = { + {WC_LISTBOXW, 0x10000, TRUE}, + {L"#32768", 0x10001, TRUE}, /* menu */ + {WC_BUTTONW, 0x10002, TRUE}, + {WC_STATICW, 0x10003, TRUE}, + {WC_EDITW, 0x10004, TRUE}, + {WC_COMBOBOXW, 0x10005, TRUE}, + {L"#32770", 0x10006, TRUE}, /* dialog */ + {L"#32771", 0x10007, TRUE}, /* winswitcher */ + {L"MDIClient", 0x10008, TRUE}, + {L"#32769", 0x10009, TRUE}, /* desktop */ + {WC_SCROLLBARW, 0x1000a, TRUE}, + {STATUSCLASSNAMEW, 0x1000b, TRUE}, + {TOOLBARCLASSNAMEW, 0x1000c, TRUE}, + {PROGRESS_CLASSW, 0x1000d, TRUE}, + {ANIMATE_CLASSW, 0x1000e, TRUE}, + {WC_TABCONTROLW, 0x1000f, TRUE}, + {HOTKEY_CLASSW, 0x10010, TRUE}, + {WC_HEADERW, 0x10011, TRUE}, + {TRACKBAR_CLASSW, 0x10012, TRUE}, + {WC_LISTVIEWW, 0x10013, TRUE}, + {UPDOWN_CLASSW, 0x10016, TRUE}, + {TOOLTIPS_CLASSW, 0x10018, TRUE}, + {WC_TREEVIEWW, 0x10019, TRUE}, + {MONTHCAL_CLASSW, 0, TRUE}, + {DATETIMEPICK_CLASSW, 0, TRUE}, + {WC_IPADDRESSW, 0, TRUE}, + {L"RICHEDIT", 0x1001c, TRUE}, + {L"RichEdit20A", 0, TRUE}, + {L"RichEdit20W", 0, TRUE}, + {NULL} +}; + HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { Client *client; @@ -662,6 +696,8 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) if(!client) return E_OUTOFMEMORY; + find_class_data(hwnd, classes); + client->IAccessible_iface.lpVtbl = &ClientVtbl; client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; client->IEnumVARIANT_iface.lpVtbl = &ClientEnumVARIANTVtbl; diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index db9f646988c..3ce616ae0c1 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -20,13 +20,6 @@ #define COBJMACROS -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "commctrl.h" -#include "rpcproxy.h" - #include "initguid.h" #include "oleacc_private.h" #include "resource.h" @@ -37,50 +30,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; -typedef HRESULT (*accessible_create)(HWND, const IID*, void**); - extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEACC_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEACC_DllUnregisterServer(void) DECLSPEC_HIDDEN; -static struct { - const WCHAR *name; - DWORD idx; - accessible_create create_client; - accessible_create create_window; -} builtin_classes[] = { - {WC_LISTBOXW, 0x10000, NULL, NULL}, - {L"#32768", 0x10001, NULL, NULL}, /* menu */ - {WC_BUTTONW, 0x10002, NULL, NULL}, - {WC_STATICW, 0x10003, NULL, NULL}, - {WC_EDITW, 0x10004, NULL, NULL}, - {WC_COMBOBOXW, 0x10005, NULL, NULL}, - {L"#32770", 0x10006, NULL, NULL}, /* dialog */ - {L"#32771", 0x10007, NULL, NULL}, /* winswitcher */ - {L"MDIClient", 0x10008, NULL, NULL}, - {L"#32769", 0x10009, NULL, NULL}, /* desktop */ - {WC_SCROLLBARW, 0x1000a, NULL, NULL}, - {STATUSCLASSNAMEW, 0x1000b, NULL, NULL}, - {TOOLBARCLASSNAMEW, 0x1000c, NULL, NULL}, - {PROGRESS_CLASSW, 0x1000d, NULL, NULL}, - {ANIMATE_CLASSW, 0x1000e, NULL, NULL}, - {WC_TABCONTROLW, 0x1000f, NULL, NULL}, - {HOTKEY_CLASSW, 0x10010, NULL, NULL}, - {WC_HEADERW, 0x10011, NULL, NULL}, - {TRACKBAR_CLASSW, 0x10012, NULL, NULL}, - {WC_LISTVIEWW, 0x10013, NULL, NULL}, - {UPDOWN_CLASSW, 0x10016, NULL, NULL}, - {TOOLTIPS_CLASSW, 0x10018, NULL, NULL}, - {WC_TREEVIEWW, 0x10019, NULL, NULL}, - {MONTHCAL_CLASSW, 0, NULL, NULL}, - {DATETIMEPICK_CLASSW, 0, NULL, NULL}, - {WC_IPADDRESSW, 0, NULL, NULL}, - {L"RICHEDIT", 0x1001c, NULL, NULL}, - {L"RichEdit20A", 0, NULL, NULL}, - {L"RichEdit20W", 0, NULL, NULL}, -}; - static HINSTANCE oleacc_handle = 0; int convert_child_id(VARIANT *v) @@ -94,7 +48,7 @@ int convert_child_id(VARIANT *v) } } -static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) +const struct win_class_data* find_class_data(HWND hwnd, const struct win_class_data *classes) { WCHAR class_name[64]; int i, idx; @@ -103,31 +57,21 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) return NULL; TRACE("got window class: %s\n", debugstr_w(class_name)); - for(i=0; i<ARRAY_SIZE(builtin_classes); i++) { - if(!wcsicmp(class_name, builtin_classes[i].name)) { - accessible_create ret; - - ret = (objid==OBJID_CLIENT ? - builtin_classes[i].create_client : - builtin_classes[i].create_window); - if(!ret) + for(i=0; classes[i].name; i++) { + if(!wcsicmp(class_name, classes[i].name)) { + if(classes[i].stub) FIXME("unhandled window class: %s\n", debugstr_w(class_name)); - return ret; + return &classes[i]; } } idx = SendMessageW(hwnd, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); if(idx) { - for(i=0; i<ARRAY_SIZE(builtin_classes); i++) { - if(idx == builtin_classes[i].idx) { - accessible_create ret; - - ret = (objid==OBJID_CLIENT ? - builtin_classes[i].create_client : - builtin_classes[i].create_window); - if(!ret) - FIXME("unhandled class name idx: %x\n", idx); - return ret; + for(i=0; classes[i].name; i++) { + if(idx == classes[i].idx) { + if(classes[i].stub) + FIXME("unhandled window class: %s\n", debugstr_w(class_name)); + return &classes[i]; } } @@ -140,19 +84,13 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { - accessible_create create; - TRACE("%p %d %s %p\n", hwnd, idObject, debugstr_guid( riidInterface ), ppvObject ); switch(idObject) { case OBJID_CLIENT: - create = get_builtin_accessible_obj(hwnd, idObject); - if(create) return create(hwnd, riidInterface, ppvObject); return create_client_object(hwnd, riidInterface, ppvObject); case OBJID_WINDOW: - create = get_builtin_accessible_obj(hwnd, idObject); - if(create) return create(hwnd, riidInterface, ppvObject); return create_window_object(hwnd, riidInterface, ppvObject); default: FIXME("unhandled object id: %d\n", idObject); diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index 32561ef3d2f..64926b6abb7 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -18,6 +18,13 @@ #include "oleacc_classes.h" +struct win_class_data { + const WCHAR *name; + DWORD idx; + BOOL stub; +}; +const struct win_class_data* find_class_data(HWND, const struct win_class_data*) DECLSPEC_HIDDEN; + HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN; diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 387ed4bc9f7..75e5d592699 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "oleacc_private.h" +#include "commctrl.h" #include "wine/debug.h" #include "wine/heap.h" @@ -416,6 +417,13 @@ static const IEnumVARIANTVtbl WindowEnumVARIANTVtbl = { Window_EnumVARIANT_Clone }; +static const struct win_class_data classes[] = { + {WC_LISTBOXW, 0x10000, TRUE}, + {L"#32768", 0x10001, TRUE}, /* menu */ + {L"#32770", 0x10006, TRUE}, /* dialog */ + {NULL} +}; + HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) { Window *window; @@ -428,6 +436,8 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) if(!window) return E_OUTOFMEMORY; + find_class_data(hwnd, classes); + window->IAccessible_iface.lpVtbl = &WindowVtbl; window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; window->IEnumVARIANT_iface.lpVtbl = &WindowEnumVARIANTVtbl; -- 2.25.1

2 12

[PATCH 1/5] user32/tests: Store thread ID of thread we're watching for winevents.
by Connor McAdams 28 Sep '21

28 Sep '21

Since we're watching a specific thread ID for winevents, check that the thread ID passed in the winevent callback function matches the thread we're watching, instead of the thread currently executing. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 66e6069da54..e47bf83c254 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -110,6 +110,7 @@ static HWINEVENTHOOK hEvent_hook; static HHOOK hKBD_hook; static HHOOK hCBT_hook; static DWORD cbt_hook_thread_id; +static DWORD winevent_hook_thread_id; static const WCHAR testWindowClassW[] = { 'T','e','s','t','W','i','n','d','o','w','C','l','a','s','s','W',0 }; @@ -10378,7 +10379,7 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent, DWORD thread_id, DWORD event_time) { - ok(thread_id == GetCurrentThreadId(), "we didn't ask for events from other threads\n"); + ok(thread_id == winevent_hook_thread_id, "we didn't ask for events from other threads\n"); /* ignore mouse cursor events */ if (object_id == OBJID_CURSOR) return; @@ -18607,7 +18608,7 @@ START_TEST(msg) } if (!hEvent_hook) win_skip( "no win event hook support\n" ); - cbt_hook_thread_id = GetCurrentThreadId(); + cbt_hook_thread_id = winevent_hook_thread_id = GetCurrentThreadId(); hCBT_hook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); if (!hCBT_hook) win_skip( "cannot set global hook, will skip hook tests\n" ); -- 2.25.1

2 7

[PATCH] crypt32: Use the SecItemExport() function.
by Chip Davis 27 Sep '21

27 Sep '21

From: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/crypt32/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index dcfca5b1966b..702cccb56151 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -598,7 +598,7 @@ static void load_root_certs(void) { SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(certs, i); CFDataRef certData; - if ((status = SecKeychainItemExport(cert, kSecFormatX509Cert, 0, NULL, &certData)) == noErr) + if ((status = SecItemExport(cert, kSecFormatX509Cert, 0, NULL, &certData)) == noErr) { BYTE *data = add_cert( CFDataGetLength(certData) ); if (data) memcpy( data, CFDataGetBytePtr(certData), CFDataGetLength(certData) ); -- 2.33.0

1 2

[PATCH v2 1/8] mshtml: Implement IHTMLElement::toString.
by Gabriel Ivăncescu 27 Sep '21

27 Sep '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 10 ++ dlls/mshtml/htmlanchor.c | 3 +- dlls/mshtml/htmlarea.c | 3 +- dlls/mshtml/htmlbody.c | 3 +- dlls/mshtml/htmlcomment.c | 3 +- dlls/mshtml/htmlelem.c | 163 +++++++++++++++++++++++++----- dlls/mshtml/htmlform.c | 3 +- dlls/mshtml/htmlframe.c | 6 +- dlls/mshtml/htmlhead.c | 12 ++- dlls/mshtml/htmlimg.c | 3 +- dlls/mshtml/htmlinput.c | 9 +- dlls/mshtml/htmllink.c | 3 +- dlls/mshtml/htmlobject.c | 6 +- dlls/mshtml/htmlscript.c | 3 +- dlls/mshtml/htmlselect.c | 6 +- dlls/mshtml/htmlstyleelem.c | 3 +- dlls/mshtml/htmltable.c | 9 +- dlls/mshtml/htmltextarea.c | 3 +- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/documentmode.js | 142 ++++++++++++++++++++++++++ 20 files changed, 341 insertions(+), 54 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 64ead8f..797f024 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1482,6 +1482,16 @@ compat_mode_t dispex_compat_mode(DispatchEx *dispex) : dispex->info->desc->vtbl->get_compat_mode(dispex); } +const WCHAR *dispex_tostring(DispatchEx *dispex) +{ + const WCHAR *str = dispex->info->desc->tostring_name; + + /* Empty string is special for all modes */ + if((!str || str[0]) && dispex_compat_mode(dispex) < COMPAT_MODE_IE9) + str = L"[object]"; + return str; +} + static dispex_data_t *ensure_dispex_info(dispex_static_data_t *desc, compat_mode_t compat_mode) { if(!desc->info_cache[compat_mode]) { diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index da48601..5a402ad 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -860,7 +860,8 @@ static dispex_static_data_t HTMLAnchorElement_dispex = { NULL, DispHTMLAnchorElement_tid, HTMLAnchorElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"" }; HRESULT HTMLAnchorElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index a0708c4..4e4eed3 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -452,7 +452,8 @@ static dispex_static_data_t HTMLAreaElement_dispex = { NULL, DispHTMLAreaElement_tid, HTMLAreaElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"" }; HRESULT HTMLAreaElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 32c49fe..63f92a0 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -1011,7 +1011,8 @@ static dispex_static_data_t HTMLBodyElement_dispex = { NULL, DispHTMLBody_tid, HTMLBodyElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLBodyElement]" }; HRESULT HTMLBodyElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 85eceef..b628cf8 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -202,7 +202,8 @@ static dispex_static_data_t HTMLCommentElement_dispex = { NULL, DispHTMLCommentElement_tid, HTMLCommentElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLCommentElement]" }; HRESULT HTMLCommentElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLElement **elem) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d9554f4..8546c19 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -47,31 +47,116 @@ typedef struct { } tag_desc_t; static const tag_desc_t tag_descs[] = { - {L"A", HTMLAnchorElement_Create}, - {L"AREA", HTMLAreaElement_Create}, - {L"BODY", HTMLBodyElement_Create}, - {L"BUTTON", HTMLButtonElement_Create}, - {L"EMBED", HTMLEmbedElement_Create}, - {L"FORM", HTMLFormElement_Create}, - {L"FRAME", HTMLFrameElement_Create}, - {L"HEAD", HTMLHeadElement_Create}, - {L"HTML", HTMLHtmlElement_Create}, - {L"IFRAME", HTMLIFrame_Create}, - {L"IMG", HTMLImgElement_Create}, - {L"INPUT", HTMLInputElement_Create}, - {L"LABEL", HTMLLabelElement_Create}, - {L"LINK", HTMLLinkElement_Create}, - {L"META", HTMLMetaElement_Create}, - {L"OBJECT", HTMLObjectElement_Create}, - {L"OPTION", HTMLOptionElement_Create}, - {L"SCRIPT", HTMLScriptElement_Create}, - {L"SELECT", HTMLSelectElement_Create}, - {L"STYLE", HTMLStyleElement_Create}, - {L"TABLE", HTMLTable_Create}, - {L"TD", HTMLTableCell_Create}, - {L"TEXTAREA", HTMLTextAreaElement_Create}, - {L"TITLE", HTMLTitleElement_Create}, - {L"TR", HTMLTableRow_Create} + {L"A", HTMLAnchorElement_Create}, + {L"ABBR", NULL}, + {L"ACRONYM", NULL}, + {L"ADDRESS", NULL}, + {L"APPLET", NULL}, + {L"AREA", HTMLAreaElement_Create}, + {L"ARTICLE", NULL}, + {L"ASIDE", NULL}, + {L"AUDIO", NULL}, + {L"B", NULL}, + {L"BASE", NULL}, + {L"BASEFONT", NULL}, + {L"BDO", NULL}, + {L"BIG", NULL}, + {L"BLOCKQUOTE", NULL}, + {L"BODY", HTMLBodyElement_Create}, + {L"BR", NULL}, + {L"BUTTON", HTMLButtonElement_Create}, + {L"CANVAS", NULL}, + {L"CAPTION", NULL}, + {L"CENTER", NULL}, + {L"CITE", NULL}, + {L"CODE", NULL}, + {L"COL", NULL}, + {L"COLGROUP", NULL}, + {L"DATALIST", NULL}, + {L"DD", NULL}, + {L"DEL", NULL}, + {L"DFN", NULL}, + {L"DIR", NULL}, + {L"DIV", NULL}, + {L"DL", NULL}, + {L"DT", NULL}, + {L"EM", NULL}, + {L"EMBED", HTMLEmbedElement_Create}, + {L"FIELDSET", NULL}, + {L"FIGCAPTION", NULL}, + {L"FIGURE", NULL}, + {L"FONT", NULL}, + {L"FOOTER", NULL}, + {L"FORM", HTMLFormElement_Create}, + {L"FRAME", HTMLFrameElement_Create}, + {L"FRAMESET", NULL}, + {L"H1", NULL}, + {L"H2", NULL}, + {L"H3", NULL}, + {L"H4", NULL}, + {L"H5", NULL}, + {L"H6", NULL}, + {L"HEAD", HTMLHeadElement_Create}, + {L"HEADER", NULL}, + {L"HR", NULL}, + {L"HTML", HTMLHtmlElement_Create}, + {L"I", NULL}, + {L"IFRAME", HTMLIFrame_Create}, + {L"IMG", HTMLImgElement_Create}, + {L"INPUT", HTMLInputElement_Create}, + {L"INS", NULL}, + {L"KBD", NULL}, + {L"LABEL", HTMLLabelElement_Create}, + {L"LEGEND", NULL}, + {L"LI", NULL}, + {L"LINK", HTMLLinkElement_Create}, + {L"MAP", NULL}, + {L"MARK", NULL}, + {L"META", HTMLMetaElement_Create}, + {L"NAV", NULL}, + {L"NOFRAMES", NULL}, + {L"NOSCRIPT", NULL}, + {L"OBJECT", HTMLObjectElement_Create}, + {L"OL", NULL}, + {L"OPTGROUP", NULL}, + {L"OPTION", HTMLOptionElement_Create}, + {L"P", NULL}, + {L"PARAM", NULL}, + {L"PRE", NULL}, + {L"PROGRESS", NULL}, + {L"Q", NULL}, + {L"RP", NULL}, + {L"RT", NULL}, + {L"RUBY", NULL}, + {L"S", NULL}, + {L"SAMP", NULL}, + {L"SCRIPT", HTMLScriptElement_Create}, + {L"SECTION", NULL}, + {L"SELECT", HTMLSelectElement_Create}, + {L"SMALL", NULL}, + {L"SOURCE", NULL}, + {L"SPAN", NULL}, + {L"STRIKE", NULL}, + {L"STRONG", NULL}, + {L"STYLE", HTMLStyleElement_Create}, + {L"SUB", NULL}, + {L"SUP", NULL}, + {L"TABLE", HTMLTable_Create}, + {L"TBODY", NULL}, + {L"TD", HTMLTableCell_Create}, + {L"TEXTAREA", HTMLTextAreaElement_Create}, + {L"TFOOT", NULL}, + {L"TH", NULL}, + {L"THEAD", NULL}, + {L"TITLE", HTMLTitleElement_Create}, + {L"TR", HTMLTableRow_Create}, + {L"TRACK", NULL}, + {L"TT", NULL}, + {L"U", NULL}, + {L"UL", NULL}, + {L"VAR", NULL}, + {L"VIDEO", NULL}, + {L"WBR", NULL} }; static const tag_desc_t *get_tag_desc(const WCHAR *tag_name) @@ -2112,8 +2197,30 @@ static HRESULT WINAPI HTMLElement_get_ondragstart(IHTMLElement *iface, VARIANT * static HRESULT WINAPI HTMLElement_toString(IHTMLElement *iface, BSTR *String) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, String); - return E_NOTIMPL; + const PRUnichar *str; + nsAString tag_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, String); + + if(!String) + return E_INVALIDARG; + + str = dispex_tostring(&This->node.event_target.dispex); + if(!str) { + nsAString_Init(&tag_str, NULL); + nsres = nsIDOMElement_GetTagName(This->dom_element, &tag_str); + if(NS_FAILED(nsres)) { + nsAString_Finish(&tag_str); + return map_nsresult(nsres); + } + nsAString_GetData(&tag_str, &str); + str = get_tag_desc(str) ? L"[object HTMLElement]" : L"[object HTMLUnknownElement]"; + nsAString_Finish(&tag_str); + } + + *String = SysAllocString(str); + return *String ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLElement_put_onbeforeupdate(IHTMLElement *iface, VARIANT v) @@ -6806,7 +6913,7 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g nsAString_GetData(&tag_name_str, &tag_name); tag = get_tag_desc(tag_name); - if(tag) { + if(tag && tag->constructor) { hres = tag->constructor(doc, nselem, &elem); }else { nsIDOMSVGElement *svg_element; diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 5d0928e..5846f46 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -830,7 +830,8 @@ static dispex_static_data_t HTMLFormElement_dispex = { NULL, DispHTMLFormElement_tid, HTMLFormElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLFormElement]" }; HRESULT HTMLFormElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 7118ea8..5f17b8d 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -1026,7 +1026,8 @@ static dispex_static_data_t HTMLFrameElement_dispex = { NULL, DispHTMLFrameElement_tid, HTMLFrameElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLFrameElement]" }; HRESULT HTMLFrameElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) @@ -1606,7 +1607,8 @@ static dispex_static_data_t HTMLIFrame_dispex = { NULL, DispHTMLIFrame_tid, HTMLIFrame_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLIFrameElement]" }; HRESULT HTMLIFrame_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 5dbf8d6..85958e1 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -172,7 +172,8 @@ static dispex_static_data_t HTMLTitleElement_dispex = { NULL, DispHTMLTitleElement_tid, HTMLTitleElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLTitleElement]" }; HRESULT HTMLTitleElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) @@ -355,7 +356,8 @@ static dispex_static_data_t HTMLHtmlElement_dispex = { NULL, DispHTMLHtmlElement_tid, HTMLHtmlElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLHtmlElement]" }; HRESULT HTMLHtmlElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) @@ -591,7 +593,8 @@ static dispex_static_data_t HTMLMetaElement_dispex = { NULL, DispHTMLMetaElement_tid, HTMLMetaElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLMetaElement]" }; HRESULT HTMLMetaElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) @@ -754,7 +757,8 @@ static dispex_static_data_t HTMLHeadElement_dispex = { NULL, DispHTMLHeadElement_tid, HTMLHeadElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLHeadElement]" }; HRESULT HTMLHeadElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index f89e8e5..6859425 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -733,7 +733,8 @@ static dispex_static_data_t HTMLImgElement_dispex = { NULL, DispHTMLImg_tid, HTMLImgElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLImageElement]" }; HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 1a0a739..d92e299 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1444,7 +1444,8 @@ static dispex_static_data_t HTMLInputElement_dispex = { NULL, DispHTMLInputElement_tid, HTMLInputElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLInputElement]" }; HRESULT HTMLInputElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) @@ -1640,7 +1641,8 @@ static dispex_static_data_t HTMLLabelElement_dispex = { NULL, DispHTMLLabelElement_tid, HTMLLabelElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLLabelElement]" }; HRESULT HTMLLabelElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) @@ -1986,7 +1988,8 @@ static dispex_static_data_t HTMLButtonElement_dispex = { NULL, DispHTMLButtonElement_tid, HTMLButtonElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLButtonElement]" }; HRESULT HTMLButtonElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index ddf67ca..b11a7ca 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -449,7 +449,8 @@ static dispex_static_data_t HTMLLinkElement_dispex = { NULL, DispHTMLLinkElement_tid, HTMLLinkElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLLinkElement]" }; HRESULT HTMLLinkElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6702548..814b70e 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -769,7 +769,8 @@ static dispex_static_data_t HTMLObjectElement_dispex = { NULL, DispHTMLObjectElement_tid, HTMLObjectElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLObjectElement]" }; HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) @@ -1031,7 +1032,8 @@ static dispex_static_data_t HTMLEmbedElement_dispex = { NULL, DispHTMLEmbed_tid, HTMLEmbedElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLEmbedElement]" }; HRESULT HTMLEmbedElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 9b7f95e..47987e5 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -482,7 +482,8 @@ static dispex_static_data_t HTMLScriptElement_dispex = { NULL, DispHTMLScriptElement_tid, HTMLScriptElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLScriptElement]" }; HRESULT HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ad801f8..93a831e 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -419,7 +419,8 @@ static dispex_static_data_t HTMLOptionElement_dispex = { NULL, DispHTMLOptionElement_tid, HTMLOptionElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLOptionElement]" }; HRESULT HTMLOptionElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) @@ -1284,7 +1285,8 @@ static dispex_static_data_t HTMLSelectElement_dispex = { NULL, DispHTMLSelectElement_tid, HTMLSelectElement_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLSelectElement]" }; HRESULT HTMLSelectElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index d2a4a75..1b85231 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -465,7 +465,8 @@ static dispex_static_data_t HTMLStyleElement_dispex = { NULL, DispHTMLStyleElement_tid, HTMLStyleElement_iface_tids, - HTMLStyleElement_init_dispex_info + HTMLStyleElement_init_dispex_info, + L"[object HTMLStyleElement]" }; HRESULT HTMLStyleElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 178e9e5..6367999 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -523,7 +523,8 @@ static dispex_static_data_t HTMLTableCell_dispex = { NULL, DispHTMLTableCell_tid, HTMLTableCell_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLTableDataCellElement]" }; HRESULT HTMLTableCell_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) @@ -967,7 +968,8 @@ static dispex_static_data_t HTMLTableRow_dispex = { NULL, DispHTMLTableRow_tid, HTMLTableRow_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLTableRowElement]" }; HRESULT HTMLTableRow_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) @@ -1999,7 +2001,8 @@ static dispex_static_data_t HTMLTable_dispex = { NULL, DispHTMLTable_tid, HTMLTable_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLTableElement]" }; HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 57f3373..71f0e3e 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -482,7 +482,8 @@ static dispex_static_data_t HTMLTextAreaElement_dispex = { NULL, DispHTMLTextAreaElement_tid, HTMLTextAreaElement_iface_tids, - HTMLElement_init_dispex_info + HTMLElement_init_dispex_info, + L"[object HTMLTextAreaElement]" }; HRESULT HTMLTextAreaElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c1e7e78..67ea0ad 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -331,6 +331,7 @@ typedef struct { const tid_t disp_tid; const tid_t* const iface_tids; void (*init_info)(dispex_data_t*,compat_mode_t); + const WCHAR *tostring_name; dispex_data_t *info_cache[COMPAT_MODE_CNT]; dispex_data_t *delayed_init_info; } dispex_static_data_t; @@ -393,6 +394,7 @@ HRESULT get_class_typeinfo(const CLSID*,ITypeInfo**) DECLSPEC_HIDDEN; const void *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t,const dispex_hook_t*) DECLSPEC_HIDDEN; compat_mode_t dispex_compat_mode(DispatchEx*) DECLSPEC_HIDDEN; +const WCHAR *dispex_tostring(DispatchEx*) DECLSPEC_HIDDEN; typedef enum { DISPEXPROP_CUSTOM, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index c20f6ee..16764a5 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -19,6 +19,148 @@ var compat_version; var tests = []; +sync_test("builtin_toString", function() { + var tags = [ + [ "a", null ], + [ "abbr", "Phrase" ], + [ "acronym", "Phrase" ], + [ "address", "Block" ], + // [ "applet", "Applet" ], // makes Windows pop up a dialog box + [ "area", null ], + [ "article", "" ], + [ "aside", "" ], + [ "audio", "Audio" ], + [ "b", "Phrase" ], + [ "base", "Base" ], + [ "basefont", "BaseFont" ], + [ "bdi", "Unknown" ], + [ "bdo", "Phrase" ], + [ "big", "Phrase" ], + [ "blockquote", "Block" ], + [ "body", "Body" ], + [ "br", "BR" ], + [ "button", "Button" ], + [ "canvas", "Canvas" ], + [ "caption", "TableCaption" ], + [ "center", "Block" ], + [ "cite", "Phrase" ], + [ "code", "Phrase" ], + [ "col", "TableCol" ], + [ "colgroup", "TableCol" ], + [ "data", "Unknown" ], + [ "datalist", "DataList", 10 ], + [ "dd", "DD" ], + [ "del", "Mod" ], + [ "details", "Unknown" ], + [ "dfn", "Phrase" ], + [ "dialog", "Unknown" ], + [ "dir", "Directory" ], + [ "div", "Div" ], + [ "dl", "DList" ], + [ "dt", "DT" ], + [ "em", "Phrase" ], + [ "embed", "Embed" ], + [ "fieldset", "FieldSet" ], + [ "figcaption", "" ], + [ "figure", "" ], + [ "font", "Font" ], + [ "footer", "" ], + [ "form", "Form" ], + [ "frame", "Frame" ], + [ "frameset", "FrameSet" ], + [ "h1", "Heading" ], + [ "h2", "Heading" ], + [ "h3", "Heading" ], + [ "h4", "Heading" ], + [ "h5", "Heading" ], + [ "h6", "Heading" ], + [ "h7", "Unknown" ], + [ "head", "Head" ], + [ "header", "" ], + [ "hr", "HR" ], + [ "html", "Html" ], + [ "i", "Phrase" ], + [ "iframe", "IFrame" ], + [ "img", "Image" ], + [ "input", "Input" ], + [ "ins", "Mod" ], + [ "kbd", "Phrase" ], + [ "label", "Label" ], + [ "legend", "Legend" ], + [ "li", "LI" ], + [ "link", "Link" ], + [ "main", "Unknown" ], + [ "map", "Map" ], + [ "mark", "" ], + [ "meta", "Meta" ], + [ "meter", "Unknown" ], + [ "nav", "" ], + [ "noframes", "" ], + [ "noscript", "" ], + [ "object", "Object" ], + [ "ol", "OList" ], + [ "optgroup", "OptGroup" ], + [ "option", "Option" ], + [ "output", "Unknown" ], + [ "p", "Paragraph" ], + [ "param", "Param" ], + [ "picture", "Unknown" ], + [ "pre", "Pre" ], + [ "progress", "Progress", 10 ], + [ "q", "Quote" ], + [ "rp", "Phrase" ], + [ "rt", "Phrase" ], + [ "ruby", "Phrase" ], + [ "s", "Phrase" ], + [ "samp", "Phrase" ], + [ "script", "Script" ], + [ "section", "" ], + [ "select", "Select" ], + [ "small", "Phrase" ], + [ "source", "Source" ], + [ "span", "Span" ], + [ "strike", "Phrase" ], + [ "strong", "Phrase" ], + [ "style", "Style" ], + [ "sub", "Phrase" ], + [ "summary", "Unknown" ], + [ "sup", "Phrase" ], + [ "svg", "Unknown" ], + [ "table", "Table" ], + [ "tbody", "TableSection" ], + [ "td", "TableDataCell" ], + [ "template", "Unknown" ], + [ "textarea", "TextArea" ], + [ "tfoot", "TableSection" ], + [ "th", "TableHeaderCell" ], + [ "thead", "TableSection" ], + [ "time", "Unknown" ], + [ "title", "Title" ], + [ "tr", "TableRow" ], + [ "track", "Track", 10 ], + [ "tt", "Phrase" ], + [ "u", "Phrase" ], + [ "ul", "UList" ], + [ "var", "Phrase" ], + [ "video", "Video" ], + [ "wbr", "" ], + [ "winetest", "Unknown" ] + ]; + var v = document.documentMode; + + for(var i = 0; i < tags.length; i++) { + var s = document.createElement(tags[i][0]).toString(); + if(tags[i][1] === null) + ok(s === "", "tag '" + tags[i][0] + "' toString returned " + s); + else if(v < 9) + ok(s === "[object]", "tag '" + tags[i][0] + "' toString returned " + s); + else if(tags[i].length < 3 || v >= tags[i][2]) { + todo_wine_if(tags[i][1] !== "" && s === "[object HTMLElement]"). + ok(s === "[object HTML" + tags[i][1] + "Element]", "tag '" + tags[i][0] + "' toString returned " + s); + } + } +}); + sync_test("elem_props", function() { var elem = document.documentElement; -- 2.31.1

3 16

[PATCH v2] include: Fix LDR_DATA_TABLE_ENTRY definition.
by Paul Gofman 27 Sep '21

27 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Based on the data from here: https://www.geoffchappell.com/studies/windows/km/ntoskrnl/inc/api/ntldr/ldr… Spotted while trying to examine the data pointed by DdagNode: the current definition gives incorrect offsets for fields after CheckSum. include/winternl.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 466ade070c4..06a083e645a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3318,8 +3318,15 @@ typedef struct _LDR_DATA_TABLE_ENTRY ULONG Flags; SHORT LoadCount; SHORT TlsIndex; - HANDLE SectionHandle; - ULONG CheckSum; + union + { + LIST_ENTRY HashLinks; + struct + { + void *SectionPointer; + ULONG CheckSum; + }; + }; ULONG TimeDateStamp; HANDLE ActivationContext; void* Lock; -- 2.31.1

1 0

[PATCH 1/4] d3d11/tests: Add a stress test for dynamic buffer maps.
by Zebediah Figura 27 Sep '21

27 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I don't know if this is the best way to test dynamic map patterns, but it ended up being useful enough when touching mapping code. dlls/d3d11/tests/d3d11.c | 95 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 67551ac3ca0..d30918a0ad1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33896,6 +33896,100 @@ static void test_constant_buffer_offset(void) release_test_context(&test_context); } +static void fill_dynamic_vb_quad(const D3D11_MAPPED_SUBRESOURCE *map_desc, unsigned int x, unsigned int y) +{ + struct vec3 *quad = (struct vec3 *)map_desc->pData + 4 * x; + + memset(quad, 0, 4 * sizeof(*quad)); + + quad[0].x = quad[1].x = -1.0f + 0.01f * x; + quad[2].x = quad[3].x = -1.0f + 0.01f * (x + 1); + + quad[0].y = quad[2].y = -1.0f + 0.01f * y; + quad[1].y = quad[3].y = -1.0f + 0.01f * (y + 1); +} + +/* Stress-test dynamic maps, to ensure that we are applying the correct + * synchronization guarantees. */ +static void test_dynamic_map_synchronization(void) +{ + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + ID3D11DeviceContext *immediate, *deferred; + struct d3d11_test_context test_context; + D3D11_BUFFER_DESC buffer_desc = {0}; + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11CommandList *list; + ID3D11Device *device; + unsigned int x, y; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + immediate = test_context.immediate_context; + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + buffer_desc.ByteWidth = 200 * 4 * sizeof(struct vec3); + buffer_desc.Usage = D3D11_USAGE_DYNAMIC; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &test_context.vb); + ok(hr == S_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &red.x); + + for (y = 0; y < 200; ++y) + { + if (y % 2) + { + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(&map_desc, 0, y); + + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)test_context.vb, 0); + draw_color_quad(&test_context, &green); + } + else + { + hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(&map_desc, 0, y); + + ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)test_context.vb, 0); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list); + ok(hr == S_OK, "Failed to record command list, hr %#x.\n", hr); + ID3D11DeviceContext_ExecuteCommandList(immediate, list, TRUE); + ID3D11CommandList_Release(list); + draw_color_quad(&test_context, &green); + } + + for (x = 1; x < 200; ++x) + { + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map_desc); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(&map_desc, x, y); + + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)test_context.vb, 0); + ID3D11DeviceContext_Draw(immediate, 4, x * 4); + } + } + + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + ID3D11DeviceContext_Release(deferred); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -34072,6 +34166,7 @@ START_TEST(d3d11) queue_test(test_unbound_streams); queue_test(test_texture_compressed_3d); queue_test(test_constant_buffer_offset); + queue_test(test_dynamic_map_synchronization); run_queued_tests(); } -- 2.33.0

4 10

[PATCH] include: Fix LDR_DATA_TABLE_ENTRY definition.
by Paul Gofman 27 Sep '21

27 Sep '21

SectionPointer and CheckSum were replaced by HashLinks in the native structure version currently followed in Wine. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Based on the data from here: https://www.geoffchappell.com/studies/windows/km/ntoskrnl/inc/api/ntldr/ldr… Spotted while trying to examine the data pointed by DdagNode. include/winternl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 466ade070c4..63a91c2b069 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3318,8 +3318,7 @@ typedef struct _LDR_DATA_TABLE_ENTRY ULONG Flags; SHORT LoadCount; SHORT TlsIndex; - HANDLE SectionHandle; - ULONG CheckSum; + LIST_ENTRY HashLinks; ULONG TimeDateStamp; HANDLE ActivationContext; void* Lock; -- 2.31.1

2 1

[PATCH] wined3d: Implement Vulkan NULL cube array image shader resource view descriptors.
by Zebediah Figura 27 Sep '21

27 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 ++++ dlls/wined3d/device.c | 15 +++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index aeaeca322ff..bb6c0bfd706 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2678,6 +2678,10 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2dms_array, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_cube_array, NULL); + default: FIXME("Unhandled resource type %#x.\n", type); return false; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 07bd7c65ad7..71b1e3c3f88 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -855,9 +855,23 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st v->vk_info_2dms_array.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; TRACE("Created 2D MSAA array image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2dms_array.imageView)); + view_desc.image = r->image_2d.vk_image; + view_desc.subresourceRange.layerCount = 6; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_cube_array.imageView))) < 0) + { + ERR("Failed to create cube array image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_cube_array.sampler = VK_NULL_HANDLE; + v->vk_info_cube_array.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created cube array image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_cube_array.imageView)); + return true; fail: + if (v->vk_info_cube_array.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_cube_array.imageView, NULL)); if (v->vk_info_2d_array.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d_array.imageView, NULL)); if (v->vk_info_cube.imageView) @@ -883,6 +897,7 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s struct wined3d_null_views_vk *v = &device_vk->null_views_vk; uint64_t id = context_vk->current_command_buffer.id; + wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_cube_array.imageView, id); wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2dms_array.imageView, id); wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2d_array.imageView, id); wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_cube.imageView, id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 97be4bd5e2a..8c49e694fa9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3942,6 +3942,7 @@ struct wined3d_null_views_vk VkDescriptorImageInfo vk_info_1d_array; VkDescriptorImageInfo vk_info_2d_array; VkDescriptorImageInfo vk_info_2dms_array; + VkDescriptorImageInfo vk_info_cube_array; }; #define WINED3D_ALLOCATOR_CHUNK_SIZE (64 * 1024 * 1024) -- 2.33.0

2 1

[PATCH 1/4] ws2_32/tests: Add tests for IPv4 control messages
by Alex Henrie 27 Sep '21

27 Sep '21

IP_PKTINFO already had tests, but it doesn't hurt to add a few more. IP_RECVTTL and IP_RECVTCLASS didn't have any tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 120 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8cbb393b542..4105ce624b2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1984,6 +1984,125 @@ static void test_ip_pktinfo(void) CloseHandle(ov.hEvent); } +static void test_ipv4_cmsg(void) +{ + static const DWORD off = 0; + static const DWORD on = 1; + SOCKADDR_IN localhost = {0}; + SOCKET client, server; + char payload[] = "HELLO"; + char control[100]; + WSABUF payload_buf = {sizeof(payload), payload}; + WSAMSG msg = {NULL, 0, &payload_buf, 1, {sizeof(control), control}, 0}; + WSACMSGHDR *header = (WSACMSGHDR *)control; + LPFN_WSARECVMSG pWSARecvMsg; + INT *int_data = (INT *)WSA_CMSG_DATA(header); + IN_PKTINFO *pkt_info = (IN_PKTINFO *)WSA_CMSG_DATA(header); + DWORD count, state; + int rc; + + localhost.sin_family = AF_INET; + localhost.sin_port = htons(SERVERPORT); + inet_pton(AF_INET, "127.0.0.1", &localhost.sin_addr); + + client = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ok(client != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + server = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + + rc = bind(server, (SOCKADDR *)&localhost, sizeof(localhost)); + ok(rc != SOCKET_ERROR, "bind failed, error %u\n", WSAGetLastError()); + rc = connect(client, (SOCKADDR *)&localhost, sizeof(localhost)); + ok(rc != SOCKET_ERROR, "connect failed, error %u\n", WSAGetLastError()); + + rc = WSAIoctl(server, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSARecvMsg_GUID, sizeof(WSARecvMsg_GUID), + &pWSARecvMsg, sizeof(pWSARecvMsg), &count, NULL, NULL); + ok(!rc, "failed to get WSARecvMsg, error %u\n", WSAGetLastError()); + + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IP, IP_RECVTTL, (const char *)&on, sizeof(on)); +todo_wine + ok(!rc, "failed to set IP_RECVTTL, error %u\n", WSAGetLastError()); + state = 0; + count = sizeof(state); + rc = getsockopt(server, IPPROTO_IP, IP_RECVTTL, (char *)&state, (INT *)&count); +todo_wine + ok(!rc, "failed to get IP_RECVTTL, error %u\n", WSAGetLastError()); +todo_wine + ok(state == 1, "expected 1, got %u\n", state); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(header->cmsg_level == IPPROTO_IP, "expected IPPROTO_IP, got %i\n", header->cmsg_level); +todo_wine + ok(header->cmsg_type == IP_TTL || broken(header->cmsg_type == IP_HOPLIMIT) /* win8 */, + "expected IP_TTL, got %i\n", header->cmsg_type); +todo_wine + ok(header->cmsg_len == sizeof(*header) + sizeof(INT), + "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); +todo_wine + ok(*int_data >= 32, "expected at least 32, got %i\n", *int_data); + setsockopt(server, IPPROTO_IP, IP_RECVTTL, (const char *)&off, sizeof(off)); + ok(!rc, "failed to clear IP_RECVTTL, error %u\n", WSAGetLastError()); + + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IP, IP_PKTINFO, (const char *)&on, sizeof(on)); + ok(!rc, "failed to set IP_PKTINFO, error %u\n", WSAGetLastError()); + state = 0; + count = sizeof(state); + rc = getsockopt(server, IPPROTO_IP, IP_PKTINFO, (char *)&state, (INT *)&count); + ok(!rc, "failed to get IP_PKTINFO, error %u\n", WSAGetLastError()); + ok(state == 1, "expected 1, got %u\n", state); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(header->cmsg_level == IPPROTO_IP, "expected IPPROTO_IP, got %i\n", header->cmsg_level); + ok(header->cmsg_type == IP_PKTINFO, "expected IP_PKTINFO, got %i\n", header->cmsg_type); + ok(header->cmsg_len == sizeof(*header) + sizeof(IN_PKTINFO), + "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(IN_PKTINFO)), (INT)header->cmsg_len); + ok(!memcmp(&pkt_info->ipi_addr, &localhost.sin_addr, sizeof(IN_ADDR)), "expected 127.0.0.1\n"); + rc = setsockopt(server, IPPROTO_IP, IP_PKTINFO, (const char *)&off, sizeof(off)); + ok(!rc, "failed to clear IP_PKTINFO, error %u\n", WSAGetLastError()); + + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IP, IP_RECVTCLASS, (const char *)&on, sizeof(on)); +todo_wine + ok(!rc, "failed to set IP_RECVTCLASS, error %u\n", WSAGetLastError()); + state = 0; + count = sizeof(state); + rc = getsockopt(server, IPPROTO_IP, IP_RECVTCLASS, (char *)&state, (INT *)&count); +todo_wine + ok(!rc, "failed to get IP_RECVTCLASS, error %u\n", WSAGetLastError()); +todo_wine + ok(state == 1, "expected 1, got %u\n", state); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(header->cmsg_level == IPPROTO_IP, "expected IPPROTO_IP, got %i\n", header->cmsg_level); +todo_wine + ok(header->cmsg_type == IP_TOS || broken(header->cmsg_type == IP_TCLASS) /* win8 */, + "expected IP_TOS, got %i\n", header->cmsg_type); +todo_wine + ok(header->cmsg_len == sizeof(*header) + sizeof(INT), + "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); + ok(*int_data == 0, "expected 0, got %i\n", *int_data); + rc = setsockopt(server, IPPROTO_IP, IP_RECVTCLASS, (const char *)&off, sizeof(off)); +todo_wine + ok(!rc, "failed to clear IP_RECVTCLASS, error %u\n", WSAGetLastError()); + + closesocket(server); + closesocket(client); +} + static void test_ipv6_cmsg(void) { static const DWORD off = 0; @@ -11767,6 +11886,7 @@ START_TEST( sock ) test_set_getsockopt(); test_so_reuseaddr(); test_ip_pktinfo(); + test_ipv4_cmsg(); test_ipv6_cmsg(); test_extendedSocketOptions(); test_so_debug(); -- 2.33.0

3 7

[PATCH] kernelbase: always return NULL in case of error in GetModuleHandleA (GCC11)
by Eric Pouech 27 Sep '21

27 Sep '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index ac463528e3c..5d70c9d0aed 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -334,7 +334,7 @@ done: */ HMODULE WINAPI DECLSPEC_HOTPATCH GetModuleHandleA( LPCSTR module ) { - HMODULE ret; + HMODULE ret = NULL; GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret ); return ret;

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