- Wine-devel - list.winehq.org

Re: winegstream reintroduce parser flushing
by Bernhard Kölbl 20 May '22

20 May '22

This still doesn't meet the requirements for how a patch needs to look like. Please check the link I sent, again and rework the patch and mail accordingly: i.e. Correct commit message, correct patch format, etc. Thanks, Bernhard Am Fr., 20. Mai 2022 um 14:34 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: > > Removed commented blocks, added more verbose comments. > > On Fri, May 20, 2022 at 3:46 AM Bernhard Kölbl <besentv(a)gmail.com> wrote: >> >> Hi Zlice, >> >> thanks for your patch. Unfortunately you're missing out on quite a few requirements for this to get accepted. I'd recommend to refactor your submission using this guide as reference: https://wiki.winehq.org/Submitting_Patches and to resend it afterwards. >> >> E.g. you left in C++ comments, which aren't allowed. >> >> Thanks, >> Bernhard >> >> >> Zlice Z <zlice555(a)gmail.com> schrieb am Fr., 20. Mai 2022, 09:22: >>> >>> Sent a patch yesterday that was mediocre and barely helps. >>> >>> commit https://github.com/wine-mirror/wine/commit/5144b27661fcd6705353d832e0383085… >>> >>> removed flushing from parser, which after commit bisecting turns out to be the cause of Fallout 3 radio chugging every new song. >>> >>> - re-introduced parser flushing (self explanatory, commit said it's not worth it but it helps here) >>> >>> - moved some variable initialization in wm_reader.c to after initial conditional returns. these were in a switch-case before in the middle of the function and it seems to be part of the stuttering, wasn't moved in the mentioned commit though >>> >>> - commented out and left my name by some EOS sets. they used to be checked for EOS 'events' but those references have been changed to 'buffer' and idk what the right action is. wine seemed to randomly seg fault on exit with leaving them on though. suspect they incorrectly guess and set 'end of stream' ?

1 0

[PATCH v2] vbscript: Implement CDate().
by Robert Wilhelm 20 May '22

20 May '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- v2: if VT_DATE conversion fails, doing arg -> R8 -> DATE. --- dlls/vbscript/global.c | 29 +++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5280730f19f..d5d3ec585c0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -742,8 +742,33 @@ static HRESULT Global_CByte(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_CDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_DATE); + if(FAILED(hres)) { + hres = VariantChangeType(&v, arg, 0, VT_R8); + if(FAILED(hres)) + return hres; + hres = VariantChangeType(&v, &v, 0, VT_DATE); + if(FAILED(hres)) + return hres; + } + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CDbl(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0e5b0ee6d37..a23bb043090 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1183,6 +1183,38 @@ MyObject.myval = 0 Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +Sub testCDateError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDate(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDate(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDate(Empty) = 0, "CDate(Empty) = " & CDate(Empty)) +Call ok(getVT(CDate(Empty)) = "VT_DATE", "getVT(CDate(Empty)) = " & getVT(CDate(Empty))) +Call ok(CDate(0) = 0, "CDate(0) = " & CDate(0)) +Call ok(getVT(CDate(0)) = "VT_DATE", "getVT(CDate(0)) = " & getVT(CDate(0))) +Call ok(CDate(1) = #1899-12-31#, "CDate(1) = " & CDate(1)) +Call ok(getVT(CDate(1)) = "VT_DATE", "getVT(CDate(1)) = " & getVT(CDate(1))) +Call ok(CDate("1") = #1899-12-31#, "CDate(""1"") = " & CDate("1")) +Call ok(getVT(CDate("1")) = "VT_DATE", "getVT(CDate(""1"")) = " & getVT(CDate("1"))) +If isEnglishLang Then + Call ok(CDate("1/1/2000") = #2000-1-1#, "CDate(""1/1/2000"") = " & CDate("1/1/2000")) + Call ok(getVT(CDate("1/1/2000")) = "VT_DATE", "getVT(CDate(""1/1/2000"")) = " & getVT(CDate("1/1/2000"))) +End If +Call ok(CDate(-1) = #1899-12-29#, "CDate(-1) = " & CDate(-1)) +Call ok(getVT(CDate(-1)) = "VT_DATE", "getVT(CDate(-1)) = " & getVT(CDate(-1))) +Call ok(CDate(100000) = #2173-10-14#, "CDate(100000) = " & CDate(100000)) +Call ok(getVT(CDate(100000)) = "VT_DATE", "getVT(CDate(100000)) = " & getVT(CDate(100000))) +Call testCDateError("", 13, 13) +Call testCDateError(null, 94, 94) + Sub testCDblError(strings, error_num1, error_num2) on error resume next Dim x -- 2.36.1

1 0

[PATCH] kernelbase: Add SetThreadInformation().
by Nikolay Sivov 20 May '22

20 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52956 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 19 +++++++++++++++++++ include/processthreadsapi.h | 15 +++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ca339181e32..cbba3abdba0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1470,6 +1470,7 @@ @ stdcall -import SetThreadGroupAffinity(long ptr ptr) @ stdcall -import SetThreadIdealProcessor(long long) @ stdcall -import SetThreadIdealProcessorEx(long ptr ptr) +@ stdcall -import SetThreadInformation(long long ptr long) @ stdcall -import SetThreadLocale(long) @ stdcall -import SetThreadPreferredUILanguages(long ptr ptr) @ stdcall -import SetThreadPriority(long long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 791c3603918..fd9701dd20b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1520,7 +1520,7 @@ @ stdcall SetThreadGroupAffinity(long ptr ptr) @ stdcall SetThreadIdealProcessor(long long) @ stdcall SetThreadIdealProcessorEx(long ptr ptr) -# @ stub SetThreadInformation +@ stdcall SetThreadInformation(long long ptr long) @ stdcall SetThreadLocale(long) @ stdcall SetThreadPreferredUILanguages(long ptr ptr) @ stdcall SetThreadPriority(long long) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 6ba58cf0a67..f11d17748fe 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -606,6 +606,25 @@ LANGID WINAPI DECLSPEC_HOTPATCH SetThreadUILanguage( LANGID langid ) } +/********************************************************************** + * SetThreadInformation (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetThreadInformation( HANDLE thread, THREAD_INFORMATION_CLASS info_class, + VOID *info, DWORD size ) +{ + switch (info_class) + { + case ThreadMemoryPriority: + return set_ntstatus( NtSetInformationThread( thread, ThreadPagePriority, info, size )); + case ThreadPowerThrottling: + return set_ntstatus( NtSetInformationThread( thread, ThreadPowerThrottlingState, info, size )); + default: + FIXME("Unsupported class %u.\n", info_class); + return FALSE; + } +} + + /********************************************************************** * SuspendThread (kernelbase.@) */ diff --git a/include/processthreadsapi.h b/include/processthreadsapi.h index 8cdaff4796a..d266b7a727b 100644 --- a/include/processthreadsapi.h +++ b/include/processthreadsapi.h @@ -23,8 +23,23 @@ extern "C" { #endif +typedef enum _THREAD_INFORMATION_CLASS +{ + ThreadMemoryPriority, + ThreadAbsoluteCpuPriority, + ThreadDynamicCodePolicy, + ThreadPowerThrottling, + ThreadInformationClassMax +} THREAD_INFORMATION_CLASS; + +typedef struct _MEMORY_PRIORITY_INFORMATION +{ + ULONG MemoryPriority; +} MEMORY_PRIORITY_INFORMATION, *PMEMORY_PRIORITY_INFORMATION; + WINBASEAPI HRESULT WINAPI GetThreadDescription(HANDLE,PWSTR *); WINBASEAPI HRESULT WINAPI SetThreadDescription(HANDLE,PCWSTR); +WINBASEAPI BOOL WINAPI SetThreadInformation(HANDLE,THREAD_INFORMATION_CLASS,LPVOID,DWORD); #ifdef __cplusplus } -- 2.35.1

1 0

[PATCH] vbscript: Implement CDate().
by Robert Wilhelm 20 May '22

20 May '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 23 +++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 26 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5280730f19f..a6bab83f3e6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -742,8 +742,27 @@ static HRESULT Global_CByte(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_CDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_DATE); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CDbl(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0e5b0ee6d37..b84a1fa060b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1183,6 +1183,32 @@ MyObject.myval = 0 Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +Sub testCDateError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDate(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDate(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDate(Empty) = 0, "CDate(Empty) = " & CDate(Empty)) +Call ok(getVT(CDate(Empty)) = "VT_DATE", "getVT(CDate(Empty)) = " & getVT(CDate(Empty))) +Call ok(CDate(0) = 0, "CDate(0) = " & CDate(0)) +Call ok(getVT(CDate(0)) = "VT_DATE", "getVT(CDate(0)) = " & getVT(CDate(0))) +Call ok(CDate(1) = #1899-12-31#, "CDate(1) = " & CDate(1)) +Call ok(getVT(CDate(1)) = "VT_DATE", "getVT(CDate(1)) = " & getVT(CDate(1))) +Call ok(CDate(-1) = #1899-12-29#, "CDate(-1) = " & CDate(-1)) +Call ok(getVT(CDate(-1)) = "VT_DATE", "getVT(CDate(-1)) = " & getVT(CDate(-1))) +Call ok(CDate(100000) = #2173-10-14#, "CDate(100000) = " & CDate(100000)) +Call ok(getVT(CDate(100000)) = "VT_DATE", "getVT(CDate(100000)) = " & getVT(CDate(100000))) +Call testCDateError("", 13, 13) +Call testCDateError(null, 94, 94) + Sub testCDblError(strings, error_num1, error_num2) on error resume next Dim x -- 2.36.1

2 3

Re: [PATCH v2 0/2] MR76: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+.
by Alexandre Julliard (＠julliard) 20 May '22

20 May '22

Alexandre Julliard (@julliard) commented about dlls/ntdll/unix/signal_x86_64.c: > } > > static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ > +#ifdef __APPLE__ > +static USHORT ds32_sel; /* selector for %ds in 32-bit mode */ > +#endif This doesn't seem to be used for anything, do we need it? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/76#note_1056

1 0

[PATCH 0/2] MR102: d3dx9: Build without -DWINE_NO_LONG_TYPES.
by Matteo Bruni (＠Mystral) 20 May '22

20 May '22

Final two patches of the d3dx9 long types conversion. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/102

2 2

[PATCH] msvcr120: Add tests for _StructuredTaskCollection.
by Torge Matthies 20 May '22

20 May '22

Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 269 +++++++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index a3161266db41..26b363de6c59 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -162,6 +162,27 @@ typedef struct { Context *ctx; } _Context; +typedef struct _StructuredTaskCollection +{ + void *unk1; + unsigned int unk2; + void *unk3; + Context *context; + volatile LONG count; + volatile LONG finished; + void *unk4; + void *event; +} _StructuredTaskCollection; + +typedef struct _UnrealizedChore +{ + const vtable_ptr *vtable; + void (__cdecl *proc)(struct _UnrealizedChore*); + struct _StructuredTaskCollection *task_collection; + void (__cdecl *proc_wrapper)(struct _UnrealizedChore*); + void *unk[6]; +} _UnrealizedChore; + static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); @@ -225,6 +246,11 @@ static void (__thiscall *p__Condition_variable_notify_all)(_Condition_variable*) static Context* (__cdecl *p_Context_CurrentContext)(void); static _Context* (__cdecl *p__Context__CurrentContext)(_Context*); +static _StructuredTaskCollection* (__thiscall *p__StructuredTaskCollection_ctor)(_StructuredTaskCollection*, void*); +static void (__thiscall *p__StructuredTaskCollection_dtor)(_StructuredTaskCollection*); +static void (__thiscall *p__StructuredTaskCollection__Schedule)(_StructuredTaskCollection*, _UnrealizedChore*); +static int (__stdcall *p__StructuredTaskCollection__RunAndWait)(_StructuredTaskCollection*, _UnrealizedChore*); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -279,6 +305,14 @@ static BOOL init(void) SET(p_towctrans, "towctrans"); SET(p__Context__CurrentContext, "?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ"); if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p__StructuredTaskCollection_ctor, + "??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z"); + SET(p__StructuredTaskCollection_dtor, + "??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ"); + SET(p__StructuredTaskCollection__Schedule, + "?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z"); + SET(p__StructuredTaskCollection__RunAndWait, + "?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); SET(p_critical_section_dtor, @@ -313,6 +347,14 @@ static BOOL init(void) "?CurrentContext(a)Context@Concurrency@@SAPEAV12(a)XZ"); } else { #ifdef __arm__ + SET(p__StructuredTaskCollection_ctor, + "??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z"); + SET(p__StructuredTaskCollection_dtor, + "??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ"); + SET(p__StructuredTaskCollection__Schedule, + "?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z"); + SET(p__StructuredTaskCollection__RunAndWait, + "?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QAA(a)XZ"); SET(p_critical_section_dtor, @@ -344,6 +386,14 @@ static BOOL init(void) SET(p__Condition_variable_notify_all, "?notify_all(a)_Condition_variable@details(a)Concurrency@@QAAXXZ"); #else + SET(p__StructuredTaskCollection_ctor, + "??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z"); + SET(p__StructuredTaskCollection_dtor, + "??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ"); + SET(p__StructuredTaskCollection__Schedule, + "?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z"); + SET(p__StructuredTaskCollection__RunAndWait, + "?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QAE(a)XZ"); SET(p_critical_section_dtor, @@ -1270,6 +1320,224 @@ static void test_CurrentContext(void) ok(ret == &_ctx, "expected %p, got %p\n", &_ctx, ret); } +static void _UnrealizedChore_ctor(_UnrealizedChore *chore, void (__cdecl *proc)(_UnrealizedChore*)) +{ + memset(chore, 0, sizeof(*chore)); + chore->proc = proc; +} + +struct chore +{ + _UnrealizedChore chore; + BOOL executed; + HANDLE start_event; + HANDLE set_event; + HANDLE wait_event; + DWORD main_tid; +}; + +static void __cdecl chore_proc(_UnrealizedChore *_this) +{ + struct chore *chore = CONTAINING_RECORD(_this, struct chore, chore); + + if (chore->start_event) + { + DWORD ret = WaitForSingleObject(chore->start_event, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + } + + ok(!chore->executed, "Chore was already executed\n"); + + if (chore->main_tid) + { + ok(GetCurrentThreadId() == chore->main_tid, + "Main chore is not running on the main thread: 0x%lx != 0x%lx\n", + GetCurrentThreadId(), chore->main_tid); + } + + if (!chore->wait_event) + chore->executed = TRUE; + + if (chore->set_event) + { + BOOL b = SetEvent(chore->set_event); + ok(b, "SetEvent failed\n"); + } + + if (chore->wait_event) + { + DWORD ret = WaitForSingleObject(chore->wait_event, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + chore->executed = TRUE; + } +} + +static void chore_ctor(struct chore *chore) +{ + memset(chore, 0, sizeof(*chore)); + _UnrealizedChore_ctor(&chore->chore, chore_proc); +} + +static void test_StructuredTaskCollection(void) +{ + HANDLE chore_start_evt, chore_evt1, chore_evt2; + _StructuredTaskCollection task_coll; + struct chore chore1, chore2; + DWORD main_thread_id; + Context *context; + int status; + DWORD ret; + BOOL b; + + main_thread_id = GetCurrentThreadId(); + context = p_Context_CurrentContext(); + + memset(&task_coll, 0x55, sizeof(task_coll)); + if (!call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL)) + { + skip("_StructuredTaskCollection constructor not implemented\n"); + return; + } + ok(task_coll.unk2 == 0x1fffffff, + "_StructuredTaskCollection ctor set wrong unk2: 0x%x != 0x1fffffff\n", task_coll.unk2); + ok(task_coll.unk3 == NULL, + "_StructuredTaskCollection ctor set wrong unk3: %p != NULL\n", task_coll.unk3); + ok(task_coll.context == NULL, + "_StructuredTaskCollection ctor set wrong context: %p != NULL\n", task_coll.context); + ok(task_coll.count == 0, + "_StructuredTaskCollection ctor set wrong count: %ld != 0\n", task_coll.count); + ok(task_coll.finished == LONG_MIN, + "_StructuredTaskCollection ctor set wrong finished: %ld != %ld\n", task_coll.finished, LONG_MIN); + ok(task_coll.unk4 == NULL, + "_StructuredTaskCollection ctor set wrong unk4: %p != NULL\n", task_coll.unk4); + + chore_start_evt = CreateEventW(NULL, TRUE, FALSE, NULL); + ok(chore_start_evt != NULL, "CreateEvent failed: 0x%lx\n", GetLastError()); + chore_evt1 = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(chore_evt1 != NULL, "CreateEvent failed: 0x%lx\n", GetLastError()); + chore_evt2 = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(chore_evt2 != NULL, "CreateEvent failed: 0x%lx\n", GetLastError()); + + /* test running chores (only main) */ + chore_ctor(&chore1); + chore1.main_tid = main_thread_id; + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, &chore1.chore); + ok(status == 1, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(chore1.executed, "Scheduled chore was not executed\n"); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + /* test running chores (main + scheduled) */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore_ctor(&chore1); + chore1.start_event = chore_start_evt; + chore_ctor(&chore2); + chore2.main_tid = main_thread_id; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + ok(chore1.chore.task_collection == &task_coll, "Wrong chore #1 task_collection: expected %p, actual %p\n", + &task_coll, chore1.chore.task_collection); + ok(chore1.chore.proc_wrapper != NULL, "Chore #1 proc_wrapper was not set\n"); + ok(task_coll.count == 1, "Wrong chore count: %ld != 1\n", task_coll.count); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + + b = SetEvent(chore_start_evt); + ok(b, "SetEvent failed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, &chore2.chore); + ok(status == 1, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(chore1.executed, "Scheduled chore was not executed\n"); + ok(chore2.executed, "Main chore was not executed\n"); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + /* test that scheduled chores may run in parallel */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore_ctor(&chore1); + chore1.start_event = chore_start_evt; + chore1.set_event = chore_evt2; + chore1.wait_event = chore_evt1; + chore_ctor(&chore2); + chore2.start_event = chore_start_evt; + chore2.set_event = chore_evt1; + chore2.wait_event = chore_evt2; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + ok(chore1.chore.task_collection == &task_coll, "Wrong chore #1 task_collection: expected %p, actual %p\n", + &task_coll, chore1.chore.task_collection); + ok(chore1.chore.proc_wrapper != NULL, "Chore #1 proc_wrapper was not set\n"); + ok(task_coll.count == 1, "Wrong chore count: %ld != 1\n", task_coll.count); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore2.chore); + ok(chore2.chore.task_collection == &task_coll, "Wrong chore #2 task_collection: expected %p, actual %p\n", + &task_coll, chore2.chore.task_collection); + ok(chore2.chore.proc_wrapper != NULL, "Chore #2 proc_wrapper was not set\n"); + ok(task_coll.count == 2, "Wrong chore count: %ld != 2\n", task_coll.count); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + + b = SetEvent(chore_start_evt); + ok(b, "SetEvent failed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); + ok(status == 1, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(chore1.executed, "Chore #1 was not executed\n"); + ok(chore2.executed, "Chore #2 was not executed\n"); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + /* test that scheduled chores are executed even if _RunAndWait is not called */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore_ctor(&chore1); + chore1.start_event = chore_start_evt; + chore1.set_event = chore_evt1; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + ok(chore1.chore.task_collection == &task_coll, "Wrong chore #1 task_collection: expected %p, actual %p\n", + &task_coll, chore1.chore.task_collection); + ok(chore1.chore.proc_wrapper != NULL, "Chore #1 proc_wrapper was not set\n"); + ok(task_coll.count == 1, "Wrong chore count: %ld != 1\n", task_coll.count); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + + b = SetEvent(chore_start_evt); + ok(b, "SetEvent failed\n"); + + ret = WaitForSingleObject(chore_evt1, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + ok(chore1.executed, "Chore was not executed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); + ok(status == 1, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(chore1.chore.task_collection == NULL, "Chore's task collection was not reset after execution\n"); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + /* test that finished chores can be scheduled again */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore1.set_event = NULL; + chore1.executed = FALSE; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + ok(chore1.chore.task_collection == &task_coll, "Wrong chore #1 task_collection: expected %p, actual %p\n", + &task_coll, chore1.chore.task_collection); + ok(chore1.chore.proc_wrapper != NULL, "Chore #1 proc_wrapper was not set\n"); + ok(task_coll.count == 1, "Wrong chore count: %ld != 1\n", task_coll.count); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + + b = SetEvent(chore_start_evt); + ok(b, "SetEvent failed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); + ok(status == 1, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(chore1.executed, "Chore was not executed\n"); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + CloseHandle(chore_start_evt); + CloseHandle(chore_evt1); + CloseHandle(chore_evt2); +} + START_TEST(msvcr120) { if (!init()) return; @@ -1292,4 +1560,5 @@ START_TEST(msvcr120) test_nexttoward(); test_towctrans(); test_CurrentContext(); + test_StructuredTaskCollection(); } -- 2.36.1

2 1

[PATCH 1/4] wined3d: Add a memory_colour_fill path for clearing the entire level to zero.
by Stefan Dösinger 20 May '22

20 May '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/resource.c | 11 ++++++++++- dlls/wined3d/surface.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 7fefd516908..fe77923f778 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -616,13 +616,22 @@ void *resource_offset_map_pointer(struct wined3d_resource *resource, unsigned in void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, const struct wined3d_map_desc *map, const struct wined3d_color *colour, - const struct wined3d_box *box) + const struct wined3d_box *box, bool full_subresource) { const struct wined3d_format *format = resource->format; unsigned int w, h, d, x, y, z, bpp; uint8_t *dst, *dst2; uint32_t c[4]; + /* Fast and simple path for setting everything to zero. The C library's memset is + * more sophisticated than our code below. Also this works for block formats, which + * we still need to zero-initialize for newly created resources. */ + if (full_subresource && !colour->r && !colour->g && !colour->b && !colour->a) + { + memset(map->data, 0, map->slice_pitch * box->back); + return; + } + w = box->right - box->left; h = box->bottom - box->top; d = box->back - box->front; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 29bdef9844f..96aacb78e77 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1181,8 +1181,10 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, struct wined3d_context *context; struct wined3d_texture *texture; struct wined3d_bo_address data; + struct wined3d_box level_box; struct wined3d_map_desc map; struct wined3d_range range; + bool full_subresource; unsigned int level; DWORD map_binding; @@ -1208,6 +1210,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, texture = texture_from_resource(view->resource); level = view->sub_resource_idx % texture->level_count; + wined3d_texture_get_level_box(texture_from_resource(view->resource), level, &level_box); + full_subresource = !memcmp(box, &level_box, sizeof(*box)); map_binding = texture->resource.map_binding; if (!wined3d_texture_load_location(texture, view->sub_resource_idx, context, map_binding)) @@ -1220,7 +1224,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, range.offset = 0; range.size = texture->sub_resources[view->sub_resource_idx].size; - wined3d_resource_memory_colour_fill(view->resource, &map, colour, box); + wined3d_resource_memory_colour_fill(view->resource, &map, colour, box, full_subresource); wined3d_context_unmap_bo_address(context, &data, 1, &range); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d8bb40cec4..aef0e9341b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4428,7 +4428,7 @@ BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) DECLSPEC void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, const struct wined3d_map_desc *map, const struct wined3d_color *colour, - const struct wined3d_box *box) DECLSPEC_HIDDEN; + const struct wined3d_box *box, bool full_subresource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 -- 2.35.1

3 6

[v2 PATCH 5/5] ntdll/tests: Add a basic test for MEM_RESERVE_PLACEHOLDER.
by Nikolay Sivov 20 May '22

20 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fix test failure on some systems dlls/ntdll/tests/virtual.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 74e3facca13..f8bb3e97c86 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -264,6 +264,12 @@ static void test_NtAllocateVirtualMemory(void) ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed %lx\n", status); ok( size == 0x10000, "wrong size %Ix\n", size ); ok( addr2 == addr1, "wrong addr %p\n", addr2 ); + + /* Placeholder functionality */ + size = 0x10000; + addr1 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr1, 0, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS); + ok(!!status, "Unexpected status %08lx.\n", status); } static void test_NtAllocateVirtualMemoryEx(void) @@ -298,6 +304,24 @@ static void test_NtAllocateVirtualMemoryEx(void) addr1 = NULL; status = pNtAllocateVirtualMemoryEx(NULL, &addr1, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE, NULL, 0); ok(status == STATUS_INVALID_HANDLE, "Unexpected status %08lx.\n", status); + + /* Placeholder functionality */ + size = 0x10000; + addr1 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr1, 0, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, + PAGE_NOACCESS, NULL, 0); + todo_wine + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + if (addr1) + { + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + } } struct test_stack_size_thread_args -- 2.35.1

1 0

[PATCH 1/5] ntdll/tests: Add a bit more tests for VM functions.
by Nikolay Sivov 20 May '22

20 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 43 +++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index aeef2ed8fb9..74e3facca13 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -264,6 +264,13 @@ static void test_NtAllocateVirtualMemory(void) ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed %lx\n", status); ok( size == 0x10000, "wrong size %Ix\n", size ); ok( addr2 == addr1, "wrong addr %p\n", addr2 ); +} + +static void test_NtAllocateVirtualMemoryEx(void) +{ + void *addr1, *addr2; + NTSTATUS status; + SIZE_T size; if (!pNtAllocateVirtualMemoryEx) { @@ -271,17 +278,26 @@ static void test_NtAllocateVirtualMemory(void) return; } - /* simple allocation should succeed */ size = 0x1000; addr1 = NULL; status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE, NULL, 0); - ok(status == STATUS_SUCCESS, "NtAllocateVirtualMemoryEx returned %08lx\n", status); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); /* specifying a count of >0 with NULL parameters should fail */ status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE, NULL, 1); - ok(status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemoryEx returned %08lx\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + /* NULL process handle */ + size = 0x1000; + addr1 = NULL; + status = pNtAllocateVirtualMemoryEx(NULL, &addr1, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE, NULL, 0); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %08lx.\n", status); } struct test_stack_size_thread_args @@ -1279,6 +1295,25 @@ static void test_syscalls(void) UnmapViewOfFile( ptr ); } +static void test_NtFreeVirtualMemory(void) +{ + NTSTATUS status; + void *addr1; + SIZE_T size; + + size = 0x10000; + addr1 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr1, 0, &size, MEM_RESERVE, PAGE_READWRITE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + size = 0; + status = NtFreeVirtualMemory(NULL, &addr1, &size, MEM_RELEASE); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %08lx.\n", status); + + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); +} + START_TEST(virtual) { HMODULE mod; @@ -1315,6 +1350,8 @@ START_TEST(virtual) if (!pIsWow64Process || !pIsWow64Process(NtCurrentProcess(), &is_wow64)) is_wow64 = FALSE; test_NtAllocateVirtualMemory(); + test_NtAllocateVirtualMemoryEx(); + test_NtFreeVirtualMemory(); test_RtlCreateUserStack(); test_NtMapViewOfSection(); test_NtMapViewOfSectionEx(); -- 2.35.1

2 5