- 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

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