October 2020 - Wine-Commits

Michael Stefaniuc : dhcpcsvc/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 1c2d53faa261e156bd220ff5161af6f5909e4884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2d53faa261e156bd220ff5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:54 2020 +0200 dhcpcsvc/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhcpcsvc/tests/dhcpcsvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dhcpcsvc/tests/dhcpcsvc.c b/dlls/dhcpcsvc/tests/dhcpcsvc.c index 8b47fe57d5..547fb51532 100644 --- a/dlls/dhcpcsvc/tests/dhcpcsvc.c +++ b/dlls/dhcpcsvc/tests/dhcpcsvc.c @@ -43,7 +43,7 @@ static IP_ADAPTER_ADDRESSES *get_adapters(void) static void test_DhcpRequestParams(void) { - static WCHAR nosuchW[] = {'n','o','s','u','c','h','a','d','a','p','t','e','r',0}; + static WCHAR nosuchW[] = L"nosuchadapter"; DHCPCAPI_PARAMS params[6]; DHCPCAPI_PARAMS_ARRAY send_params, recv_params; IP_ADAPTER_ADDRESSES *adapters, *ptr;

1 0

Alexandre Julliard : odbc32: Move the Unix functions interface to a new Unix library.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 797f11612016205f78278f1e39f622e2f98d41b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=797f11612016205f78278f1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 12:14:20 2020 +0200 odbc32: Move the Unix functions interface to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/Makefile.in | 3 +- dlls/odbc32/proxyodbc.c | 1801 +++++++++++++++++++++++++++-------------------- dlls/odbc32/unixlib.c | 1082 ++++++++++++++++++++++++++++ dlls/odbc32/unixlib.h | 155 ++++ 4 files changed, 2283 insertions(+), 758 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=797f11612016205f7827…

1 0

Michael Stefaniuc : comsvcs/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: eadbba41246d26523cef48323deea46f2a45b310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadbba41246d26523cef4832… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:50 2020 +0200 comsvcs/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/comsvcs.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index ca59951c81..4e9471e734 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -176,9 +176,6 @@ static DWORD WINAPI com_thread(void *arg) static void create_dispenser(void) { - static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; - static const WCHAR pool1[] = {'S','C','.','P','o','o','l',' ','1',' ','1',0}; - static const WCHAR data[] = {'d','a','t','a','1',0}; HRESULT hr; IDispenserManager *dispenser = NULL; IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; @@ -203,7 +200,7 @@ static void create_dispenser(void) init_test_driver(&driver); - hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool0, &holder1); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder1); ok(hr == S_OK, "got 0x%08x\n", hr); /* The above call creates an MTA thread, but we need to wait for it to @@ -214,11 +211,11 @@ static void create_dispenser(void) GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret); - hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool0, &holder2); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(holder1 != holder2, "same holder object returned\n"); - hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool1, &holder3); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 1 1", &holder3); ok(hr == S_OK, "got 0x%08x\n", hr); if(holder1) @@ -226,7 +223,7 @@ static void create_dispenser(void) SET_EXPECT(driver_CreateResource); SET_EXPECT(driver_Release); - str = SysAllocString(data); + str = SysAllocString(L"data1"); hr = IHolder_AllocResource(holder1, (RESTYPID)str, &resid); ok(hr == S_OK, "got 0x%08x\n", hr); ok(resid == 10, "got %d\n", (int)resid); @@ -254,7 +251,7 @@ static void create_dispenser(void) SET_EXPECT(driver_CreateResource); SET_EXPECT(driver_Release); - str = SysAllocString(data); + str = SysAllocString(L"data1"); hr = IHolder_AllocResource(holder2, (RESTYPID)str, &resid); ok(hr == S_OK, "got 0x%08x\n", hr); ok(resid == 10, "got %d\n", (int)resid);

1 0

Esme Povirk : dism: Add version resource.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: a56b9733422ea6b276ae0a7e9bd6be0a4e641186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a56b9733422ea6b276ae0a7e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 30 14:19:57 2020 -0500 dism: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49909 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dism/Makefile.in | 2 ++ programs/dism/version.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in index 61d9fa4512..fed7a2d147 100644 --- a/programs/dism/Makefile.in +++ b/programs/dism/Makefile.in @@ -2,4 +2,6 @@ MODULE = dism.exe EXTRADLLFLAGS = -mconsole -municode -mno-cygwin +RC_SRCS = version.rc + C_SRCS = dism.c diff --git a/programs/dism/version.rc b/programs/dism/version.rc new file mode 100644 index 0000000000..d0021b9b40 --- /dev/null +++ b/programs/dism/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2020 Esme Povirk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dism" +#define WINE_FILENAME_STR "dism.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 10,0,18362,900 +#define WINE_FILEVERSION_STR "10.0.18362.900" +#define WINE_PRODUCTVERSION 10,0,18362,900 +#define WINE_PRODUCTVERSION_STR "10.0.18362.900" + +#include "wine/wine_common_ver.rc"

1 0

Paul Gofman : kernelbase: Move FlsAlloc() implementation to ntdll.RtlFlsAlloc().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: c955eee9e8ba92118f2192578128d4756030c7a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c955eee9e8ba92118f219257… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 23:15:29 2020 +0300 kernelbase: Move FlsAlloc() implementation to ntdll.RtlFlsAlloc(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/thread.c | 32 +------------------------------- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 5 files changed, 88 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index db2bd0923b..b058dae749 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -18,6 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <winternl.h> #include "wine/test.h" static LPVOID (WINAPI *pCreateFiber)(SIZE_T,LPFIBER_START_ROUTINE,LPVOID); @@ -32,6 +37,7 @@ static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); static BOOL (WINAPI *pFlsFree)(DWORD); static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); +static NTSTATUS (WINAPI *pRtlFlsAlloc)(PFLS_CALLBACK_FUNCTION,DWORD*); static void *fibers[3]; static BYTE testparam = 185; @@ -44,6 +50,7 @@ static int cbCount = 0; static VOID init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); #define X(f) p##f = (void*)GetProcAddress(hKernel32, #f); X(CreateFiber); @@ -59,6 +66,11 @@ static VOID init_funcs(void) X(FlsGetValue); X(FlsSetValue); #undef X + +#define X(f) p##f = (void*)GetProcAddress(hntdll, #f); + X(RtlFlsAlloc); +#undef X + } static VOID WINAPI FiberLocalStorageProc(PVOID lpFlsData) @@ -171,9 +183,14 @@ static void test_FiberHandling(void) if (pIsThreadAFiber) ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); } +#define FLS_TEST_INDEX_COUNT 4096 + static void test_FiberLocalStorage(void) { + static DWORD fls_indices[FLS_TEST_INDEX_COUNT]; + unsigned int i, count; DWORD fls, fls_2; + NTSTATUS status; BOOL ret; void* val; @@ -183,6 +200,31 @@ static void test_FiberLocalStorage(void) return; } + if (pRtlFlsAlloc) + { + for (i = 0; i < FLS_TEST_INDEX_COUNT; ++i) + { + fls_indices[i] = 0xdeadbeef; + status = pRtlFlsAlloc(NULL, &fls_indices[i]); + ok(!status || status == STATUS_NO_MEMORY, "Got unexpected status %#x.\n", status); + if (status) + { + ok(fls_indices[i] == 0xdeadbeef, "Got unexpected index %#x.\n", fls_indices[i]); + break; + } + } + count = i; + /* FLS limits are increased since Win10 18312. */ + ok(count && (count <= 127 || (count > 4000 && count < 4096)), "Got unexpected count %u.\n", count); + + for (i = 0; i < count; ++i) + pFlsFree(fls_indices[i]); + } + else + { + win_skip("RtlFlsAlloc is not available.\n"); + } + /* Test an unallocated index * FlsFree should fail * FlsGetValue and FlsSetValue should succeed diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index f20d460d07..c302bbd1b8 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1066,38 +1066,8 @@ void WINAPI DECLSPEC_HOTPATCH SwitchToFiber( LPVOID fiber ) DWORD WINAPI DECLSPEC_HOTPATCH FlsAlloc( PFLS_CALLBACK_FUNCTION callback ) { DWORD index; - PEB * const peb = NtCurrentTeb()->Peb; - RtlAcquirePebLock(); - if (!peb->FlsCallback && - !(peb->FlsCallback = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - 8 * sizeof(peb->FlsBitmapBits) * sizeof(void*) ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - index = FLS_OUT_OF_INDEXES; - } - else - { - index = RtlFindClearBitsAndSet( peb->FlsBitmap, 1, 1 ); - if (index != ~0U) - { - if (!NtCurrentTeb()->FlsSlots && - !(NtCurrentTeb()->FlsSlots = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - 8 * sizeof(peb->FlsBitmapBits) * sizeof(void*) ))) - { - RtlClearBits( peb->FlsBitmap, index, 1 ); - index = FLS_OUT_OF_INDEXES; - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - } - else - { - NtCurrentTeb()->FlsSlots[index] = 0; /* clear the value */ - peb->FlsCallback[index] = callback; - } - } - else SetLastError( ERROR_NO_MORE_ITEMS ); - } - RtlReleasePebLock(); + if (!set_ntstatus( RtlFlsAlloc( callback, &index ))) return FLS_OUT_OF_INDEXES; return index; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ec73d3d1d..aac2af26f3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -666,6 +666,7 @@ @ stdcall RtlFindSetRuns(ptr ptr long long) @ stdcall RtlFirstEntrySList(ptr) @ stdcall RtlFirstFreeAce(ptr ptr) +@ stdcall RtlFlsAlloc(ptr ptr) @ stub RtlFlushPropertySet # @ stub RtlFlushSecureMemoryCache @ stdcall RtlFormatCurrentUserKeyPath(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 0f31fe18a7..f277a52dc0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -246,3 +246,46 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) { return NtCurrentTeb()->ActiveFrame; } + + +/*********************************************************************** + * Fibers + ***********************************************************************/ + + +/*********************************************************************** + * RtlFlsAlloc (NTDLL.@) + */ +NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsAlloc( PFLS_CALLBACK_FUNCTION callback, DWORD *ret_index ) +{ + PEB * const peb = NtCurrentTeb()->Peb; + NTSTATUS status = STATUS_NO_MEMORY; + DWORD index; + + RtlAcquirePebLock(); + if (peb->FlsCallback || + (peb->FlsCallback = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + 8 * sizeof(peb->FlsBitmapBits) * sizeof(void*) ))) + { + index = RtlFindClearBitsAndSet( peb->FlsBitmap, 1, 1 ); + if (index != ~0U) + { + if (!NtCurrentTeb()->FlsSlots && + !(NtCurrentTeb()->FlsSlots = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + 8 * sizeof(peb->FlsBitmapBits) * sizeof(void*) ))) + { + RtlClearBits( peb->FlsBitmap, index, 1 ); + } + else + { + NtCurrentTeb()->FlsSlots[index] = 0; /* clear the value */ + peb->FlsCallback[index] = callback; + status = STATUS_SUCCESS; + } + } + } + RtlReleasePebLock(); + if (!status) + *ret_index = index; + return status; +} diff --git a/include/winternl.h b/include/winternl.h index 7be69b2901..ba9d944259 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3371,6 +3371,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetBits(PCRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); +NTSYSAPI NTSTATUS WINAPI RtlFlsAlloc(PFLS_CALLBACK_FUNCTION,ULONG *); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlFormatMessageEx(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*,ULONG);

1 0

Robert Wilhelm : vbscript: Fix return value of lookup_identifier().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 26ad403cbd0b7faf4bec27f4c305594416e84fe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ad403cbd0b7faf4bec27f4… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Sep 29 18:44:57 2020 +0200 vbscript: Fix return value of lookup_identifier(). Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 342b7820ec..f050b23c1c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -146,7 +146,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ if(!wcsicmp(ctx->func->vars[i].name, name)) { ref->type = REF_VAR; ref->u.v = ctx->vars+i; - return TRUE; + return S_OK; } }

1 0

Paul Gofman : kernelbase: Move FlsFree() implementation to ntdll.RtlFlsFree().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 0627fa9d9217c18278c8ea9c96740815b70d850f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0627fa9d9217c18278c8ea9c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 23:15:30 2020 +0300 kernelbase: Move FlsFree() implementation to ntdll.RtlFlsFree(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 8 ++++++-- dlls/kernelbase/thread.c | 15 +-------------- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 24 +++++++++++++++++++++++- include/winternl.h | 1 + 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index b058dae749..0304dcfcde 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -38,7 +38,7 @@ static BOOL (WINAPI *pFlsFree)(DWORD); static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); static NTSTATUS (WINAPI *pRtlFlsAlloc)(PFLS_CALLBACK_FUNCTION,DWORD*); - +static NTSTATUS (WINAPI *pRtlFlsFree)(ULONG); static void *fibers[3]; static BYTE testparam = 185; static DWORD fls_index_to_set = FLS_OUT_OF_INDEXES; @@ -69,6 +69,7 @@ static VOID init_funcs(void) #define X(f) p##f = (void*)GetProcAddress(hntdll, #f); X(RtlFlsAlloc); + X(RtlFlsFree); #undef X } @@ -218,7 +219,10 @@ static void test_FiberLocalStorage(void) ok(count && (count <= 127 || (count > 4000 && count < 4096)), "Got unexpected count %u.\n", count); for (i = 0; i < count; ++i) - pFlsFree(fls_indices[i]); + { + status = pRtlFlsFree(fls_indices[i]); + ok(!status, "Got unexpected status %#x.\n", status); + } } else { diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index c302bbd1b8..bce77787ef 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1077,20 +1077,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FlsAlloc( PFLS_CALLBACK_FUNCTION callback ) */ BOOL WINAPI DECLSPEC_HOTPATCH FlsFree( DWORD index ) { - BOOL ret; - - RtlAcquirePebLock(); - ret = RtlAreBitsSet( NtCurrentTeb()->Peb->FlsBitmap, index, 1 ); - if (ret) RtlClearBits( NtCurrentTeb()->Peb->FlsBitmap, index, 1 ); - if (ret) - { - /* FIXME: call Fls callback */ - /* FIXME: add equivalent of ThreadZeroTlsCell here */ - if (NtCurrentTeb()->FlsSlots) NtCurrentTeb()->FlsSlots[index] = 0; - } - else SetLastError( ERROR_INVALID_PARAMETER ); - RtlReleasePebLock(); - return ret; + return set_ntstatus( RtlFlsFree( index )); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index aac2af26f3..5cf7e31b01 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -667,6 +667,7 @@ @ stdcall RtlFirstEntrySList(ptr) @ stdcall RtlFirstFreeAce(ptr ptr) @ stdcall RtlFlsAlloc(ptr ptr) +@ stdcall RtlFlsFree(long) @ stub RtlFlushPropertySet # @ stub RtlFlushSecureMemoryCache @ stdcall RtlFormatCurrentUserKeyPath(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index f277a52dc0..bbec1f9872 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -256,7 +256,7 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) /*********************************************************************** * RtlFlsAlloc (NTDLL.@) */ -NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsAlloc( PFLS_CALLBACK_FUNCTION callback, DWORD *ret_index ) +NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsAlloc( PFLS_CALLBACK_FUNCTION callback, ULONG *ret_index ) { PEB * const peb = NtCurrentTeb()->Peb; NTSTATUS status = STATUS_NO_MEMORY; @@ -289,3 +289,25 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsAlloc( PFLS_CALLBACK_FUNCTION callback, *ret_index = index; return status; } + + +/*********************************************************************** + * RtlFlsFree (NTDLL.@) + */ +NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsFree( ULONG index ) +{ + NTSTATUS status; + + RtlAcquirePebLock(); + if (RtlAreBitsSet( NtCurrentTeb()->Peb->FlsBitmap, index, 1 )) + { + RtlClearBits( NtCurrentTeb()->Peb->FlsBitmap, index, 1 ); + /* FIXME: call Fls callback */ + /* FIXME: add equivalent of ThreadZeroTlsCell here */ + if (NtCurrentTeb()->FlsSlots) NtCurrentTeb()->FlsSlots[index] = 0; + status = STATUS_SUCCESS; + } + else status = STATUS_INVALID_PARAMETER; + RtlReleasePebLock(); + return status; +} diff --git a/include/winternl.h b/include/winternl.h index ba9d944259..117d34bbfd 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3372,6 +3372,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); NTSYSAPI NTSTATUS WINAPI RtlFlsAlloc(PFLS_CALLBACK_FUNCTION,ULONG *); +NTSYSAPI NTSTATUS WINAPI RtlFlsFree(ULONG); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlFormatMessageEx(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*,ULONG);

1 0

Paul Gofman : kernel32/tests: Fix fiber test errors on newer Win10.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: d25854ad3167e98f703b60d32acf0e7d94d51be6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25854ad3167e98f703b60d3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 23:15:28 2020 +0300 kernel32/tests: Fix fiber test errors on newer Win10. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 7501165dc8..db2bd0923b 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -217,13 +217,12 @@ static void test_FiberLocalStorage(void) SetLastError( 0xdeadbeef ); ret = pFlsSetValue( 128, (void*) 0x217 ); - ok( !ret, "setting fls index 128 (out of bounds) succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, + ok( ret || GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index 128 (out of bounds) wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); val = pFlsGetValue( 128 ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_PARAMETER || val == (void *)0x217, "getting fls index 128 (out of bounds) wrong error %u\n", GetLastError() ); /* Test index 0 */ @@ -276,7 +275,7 @@ static void test_FiberLocalStorage(void) SetLastError( 0xdeadbeef ); val = pFlsGetValue( fls_2 ); - ok( val == NULL, "fls index %u wrong value %p\n", fls, val ); + ok( val == NULL || val == (void *)0xdeadbabe, "fls index %u wrong value %p\n", fls, val ); ok( GetLastError() == ERROR_SUCCESS, "getting fls index %u failed with error %u\n", fls_2, GetLastError() ); pFlsFree( fls_2 );

1 0

Paul Gofman : kernelbase: Move FlsSetValue() implementation to ntdll.RtlFlsSetValue().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: e596f4047ba5cc08a8324756f04851e09e8f629b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e596f4047ba5cc08a8324756… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 23:15:31 2020 +0300 kernelbase: Move FlsSetValue() implementation to ntdll.RtlFlsSetValue(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 14 ++++++++++++++ dlls/kernelbase/thread.c | 15 +-------------- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 18 ++++++++++++++++++ include/winternl.h | 1 + 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 0304dcfcde..4ffbe8916d 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -39,6 +39,7 @@ static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); static NTSTATUS (WINAPI *pRtlFlsAlloc)(PFLS_CALLBACK_FUNCTION,DWORD*); static NTSTATUS (WINAPI *pRtlFlsFree)(ULONG); +static NTSTATUS (WINAPI *pRtlFlsSetValue)(ULONG,void *); static void *fibers[3]; static BYTE testparam = 185; static DWORD fls_index_to_set = FLS_OUT_OF_INDEXES; @@ -70,6 +71,7 @@ static VOID init_funcs(void) #define X(f) p##f = (void*)GetProcAddress(hntdll, #f); X(RtlFlsAlloc); X(RtlFlsFree); + X(RtlFlsSetValue); #undef X } @@ -213,6 +215,11 @@ static void test_FiberLocalStorage(void) ok(fls_indices[i] == 0xdeadbeef, "Got unexpected index %#x.\n", fls_indices[i]); break; } + if (pRtlFlsSetValue) + { + status = pRtlFlsSetValue(fls_indices[i], (void *)(ULONG_PTR)(i + 1)); + ok(!status, "Got unexpected status %#x.\n", status); + } } count = i; /* FLS limits are increased since Win10 18312. */ @@ -280,6 +287,11 @@ static void test_FiberLocalStorage(void) ret = pFlsSetValue( 0, (void *)0xdeadbeef ); ok( !ret, "setting fls index 0 succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index wrong error %u\n", GetLastError() ); + if (pRtlFlsSetValue) + { + status = pRtlFlsSetValue( 0, (void *)0xdeadbeef ); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + } SetLastError( 0xdeadbeef ); val = pFlsGetValue( 0 ); ok( !val, "fls index 0 wrong value %p\n", val ); @@ -291,8 +303,10 @@ static void test_FiberLocalStorage(void) ok( fls != 0, "fls index 0 allocated\n" ); val = pFlsGetValue( fls ); ok( !val, "fls index %u wrong value %p\n", fls, val ); + SetLastError( 0xdeadbeef ); ret = pFlsSetValue( fls, (void *)0xdeadbeef ); ok( ret, "setting fls index %u failed\n", fls ); + ok( GetLastError() == 0xdeadbeef, "setting fls index wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); val = pFlsGetValue( fls ); ok( val == (void *)0xdeadbeef, "fls index %u wrong value %p\n", fls, val ); diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index bce77787ef..0aacff4008 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1101,20 +1101,7 @@ PVOID WINAPI DECLSPEC_HOTPATCH FlsGetValue( DWORD index ) */ BOOL WINAPI DECLSPEC_HOTPATCH FlsSetValue( DWORD index, PVOID data ) { - if (!index || index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits)) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - if (!NtCurrentTeb()->FlsSlots && - !(NtCurrentTeb()->FlsSlots = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) * sizeof(void*) ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - NtCurrentTeb()->FlsSlots[index] = data; - return TRUE; + return set_ntstatus( RtlFlsSetValue( index, data )); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5cf7e31b01..87ac9c6cb2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -668,6 +668,7 @@ @ stdcall RtlFirstFreeAce(ptr ptr) @ stdcall RtlFlsAlloc(ptr ptr) @ stdcall RtlFlsFree(long) +@ stdcall RtlFlsSetValue(long ptr) @ stub RtlFlushPropertySet # @ stub RtlFlushSecureMemoryCache @ stdcall RtlFormatCurrentUserKeyPath(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index bbec1f9872..15bfe4c304 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -311,3 +311,21 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsFree( ULONG index ) RtlReleasePebLock(); return status; } + + +/*********************************************************************** + * RtlFlsSetValue (NTDLL.@) + */ +NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsSetValue( ULONG index, void *data ) +{ + if (!index || index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits)) + return STATUS_INVALID_PARAMETER; + + if (!NtCurrentTeb()->FlsSlots && + !(NtCurrentTeb()->FlsSlots = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) * sizeof(void*) ))) + return STATUS_NO_MEMORY; + + NtCurrentTeb()->FlsSlots[index] = data; + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index 117d34bbfd..2e490dcfef 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3373,6 +3373,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOL NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); NTSYSAPI NTSTATUS WINAPI RtlFlsAlloc(PFLS_CALLBACK_FUNCTION,ULONG *); NTSYSAPI NTSTATUS WINAPI RtlFlsFree(ULONG); +NTSYSAPI NTSTATUS WINAPI RtlFlsSetValue(ULONG,void *); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlFormatMessageEx(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*,ULONG);

1 0

Paul Gofman : kernelbase: Move FlsGetValue() implementation to ntdll.RtlFlsGetValue().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: defcbc8b97e45d879deb366dc32a1c1c5f5fac8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=defcbc8b97e45d879deb366d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 23:15:32 2020 +0300 kernelbase: Move FlsGetValue() implementation to ntdll.RtlFlsGetValue(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/thread.c | 10 ++++----- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 14 +++++++++++++ include/winternl.h | 1 + 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 4ffbe8916d..b15bf468ea 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -40,6 +40,7 @@ static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); static NTSTATUS (WINAPI *pRtlFlsAlloc)(PFLS_CALLBACK_FUNCTION,DWORD*); static NTSTATUS (WINAPI *pRtlFlsFree)(ULONG); static NTSTATUS (WINAPI *pRtlFlsSetValue)(ULONG,void *); +static NTSTATUS (WINAPI *pRtlFlsGetValue)(ULONG,void **); static void *fibers[3]; static BYTE testparam = 185; static DWORD fls_index_to_set = FLS_OUT_OF_INDEXES; @@ -72,6 +73,7 @@ static VOID init_funcs(void) X(RtlFlsAlloc); X(RtlFlsFree); X(RtlFlsSetValue); + X(RtlFlsGetValue); #undef X } @@ -205,6 +207,16 @@ static void test_FiberLocalStorage(void) if (pRtlFlsAlloc) { + if (pRtlFlsGetValue) + { + status = pRtlFlsGetValue(0, NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + } + else + { + win_skip("RtlFlsGetValue is not available.\n"); + } + for (i = 0; i < FLS_TEST_INDEX_COUNT; ++i) { fls_indices[i] = 0xdeadbeef; @@ -225,8 +237,21 @@ static void test_FiberLocalStorage(void) /* FLS limits are increased since Win10 18312. */ ok(count && (count <= 127 || (count > 4000 && count < 4096)), "Got unexpected count %u.\n", count); + if (0) + { + /* crashes on Windows. */ + pRtlFlsGetValue(fls_indices[0], NULL); + } + for (i = 0; i < count; ++i) { + if (pRtlFlsGetValue) + { + status = pRtlFlsGetValue(fls_indices[i], &val); + ok(!status, "Got unexpected status %#x.\n", status); + ok(val == (void *)(ULONG_PTR)(i + 1), "Got unexpected val %p.\n", val); + } + status = pRtlFlsFree(fls_indices[i]); ok(!status, "Got unexpected status %#x.\n", status); } @@ -250,6 +275,14 @@ static void test_FiberLocalStorage(void) ok( val == NULL, "getting fls index 127 (unallocated) failed with error %u\n", GetLastError() ); + if (pRtlFlsGetValue) + { + val = (void *)0xdeadbeef; + status = pRtlFlsGetValue(127, &val); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( !val, "Got unexpected val %p.\n", val ); + } + ret = pFlsSetValue( 127, (void*) 0x217 ); ok( ret, "setting fls index 127 (unallocated) failed with error %u\n", GetLastError() ); @@ -259,6 +292,14 @@ static void test_FiberLocalStorage(void) ok( GetLastError() == ERROR_SUCCESS, "getting fls index 127 (unallocated) failed with error %u\n", GetLastError() ); + if (pRtlFlsGetValue) + { + val = (void *)0xdeadbeef; + status = pRtlFlsGetValue(127, &val); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( val == (void*)0x217, "Got unexpected val %p.\n", val ); + } + /* FlsFree, FlsGetValue, and FlsSetValue out of bounds should return * ERROR_INVALID_PARAMETER */ @@ -283,6 +324,14 @@ static void test_FiberLocalStorage(void) val = pFlsGetValue( 0 ); ok( !val, "fls index 0 set to %p\n", val ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index wrong error %u\n", GetLastError() ); + if (pRtlFlsGetValue) + { + val = (void *)0xdeadbeef; + status = pRtlFlsGetValue(0, &val); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + ok( val == (void*)0xdeadbeef, "Got unexpected val %p.\n", val ); + } + SetLastError( 0xdeadbeef ); ret = pFlsSetValue( 0, (void *)0xdeadbeef ); ok( !ret, "setting fls index 0 succeeded\n" ); diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0aacff4008..0bfef62a7d 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1086,13 +1086,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH FlsFree( DWORD index ) */ PVOID WINAPI DECLSPEC_HOTPATCH FlsGetValue( DWORD index ) { - if (!index || index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) || !NtCurrentTeb()->FlsSlots) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } + void *data; + + if (!set_ntstatus( RtlFlsGetValue( index, &data ))) return NULL; SetLastError( ERROR_SUCCESS ); - return NtCurrentTeb()->FlsSlots[index]; + return data; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 87ac9c6cb2..ce9f6281d5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -668,6 +668,7 @@ @ stdcall RtlFirstFreeAce(ptr ptr) @ stdcall RtlFlsAlloc(ptr ptr) @ stdcall RtlFlsFree(long) +@ stdcall RtlFlsGetValue(long ptr) @ stdcall RtlFlsSetValue(long ptr) @ stub RtlFlushPropertySet # @ stub RtlFlushSecureMemoryCache diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 15bfe4c304..716ef3b61d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -329,3 +329,17 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsSetValue( ULONG index, void *data ) NtCurrentTeb()->FlsSlots[index] = data; return STATUS_SUCCESS; } + + +/*********************************************************************** + * RtlFlsGetValue (NTDLL.@) + */ +NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsGetValue( ULONG index, void **data ) +{ + if (!index || index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) || !NtCurrentTeb()->FlsSlots) + return STATUS_INVALID_PARAMETER; + + *data = NtCurrentTeb()->FlsSlots[index]; + + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index 2e490dcfef..82328167c9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3373,6 +3373,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOL NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); NTSYSAPI NTSTATUS WINAPI RtlFlsAlloc(PFLS_CALLBACK_FUNCTION,ULONG *); NTSYSAPI NTSTATUS WINAPI RtlFlsFree(ULONG); +NTSYSAPI NTSTATUS WINAPI RtlFlsGetValue(ULONG,void **); NTSYSAPI NTSTATUS WINAPI RtlFlsSetValue(ULONG,void *); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*);

1 0