July 2022 - Wine-Commits - list.winehq.org

Yoshiji Emoto : ntdll: Add SJIS charset.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: b19b3701e8e94bcdac0d4189fec362acd318d483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b19b3701e8e94bcdac0d4189… Author: Yoshiji Emoto <alumina.from.ceramix(a)gmail.com> Date: Sat Jun 25 06:50:14 2022 +0900 ntdll: Add SJIS charset. Signed-off-by: Yoshiji Emoto <alumina.from.ceramix(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 161367e354f..17450b5ab4c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -270,6 +270,7 @@ static const struct { const char *name; UINT cp; } charset_names[] = { "ISO88599", 28599 }, { "KOI8R", 20866 }, { "KOI8U", 21866 }, + { "SJIS", 932 }, { "TIS620", 28601 }, { "UTF8", CP_UTF8 } };

1 0

Torge Matthies : msvcr120/tests: Add test for canceling running chores.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: cf2eaf3e4a8c385f69a71630fb9508151524de2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf2eaf3e4a8c385f69a71630… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:28:48 2022 +0200 msvcr120/tests: Add test for canceling running chores. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 26b363de6c5..88a32b382ef 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -250,6 +250,8 @@ static _StructuredTaskCollection* (__thiscall *p__StructuredTaskCollection_ctor) static void (__thiscall *p__StructuredTaskCollection_dtor)(_StructuredTaskCollection*); static void (__thiscall *p__StructuredTaskCollection__Schedule)(_StructuredTaskCollection*, _UnrealizedChore*); static int (__stdcall *p__StructuredTaskCollection__RunAndWait)(_StructuredTaskCollection*, _UnrealizedChore*); +static void (__thiscall *p__StructuredTaskCollection__Cancel)(_StructuredTaskCollection*); +static MSVCRT_bool (__thiscall *p__StructuredTaskCollection__IsCanceling)(_StructuredTaskCollection*); #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) @@ -313,6 +315,10 @@ static BOOL init(void) "?_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__StructuredTaskCollection__Cancel, + "?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ"); + SET(p__StructuredTaskCollection__IsCanceling, + "?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); SET(p_critical_section_dtor, @@ -355,6 +361,10 @@ static BOOL init(void) "?_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__StructuredTaskCollection__Cancel, + "?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ"); + SET(p__StructuredTaskCollection__IsCanceling, + "?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QAA(a)XZ"); SET(p_critical_section_dtor, @@ -394,6 +404,10 @@ static BOOL init(void) "?_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__StructuredTaskCollection__Cancel, + "?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ"); + SET(p__StructuredTaskCollection__IsCanceling, + "?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ"); SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QAE(a)XZ"); SET(p_critical_section_dtor, @@ -1334,6 +1348,7 @@ struct chore HANDLE set_event; HANDLE wait_event; DWORD main_tid; + BOOL check_canceling; }; static void __cdecl chore_proc(_UnrealizedChore *_this) @@ -1355,6 +1370,14 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) GetCurrentThreadId(), chore->main_tid); } + if (chore->check_canceling) + { + MSVCRT_bool canceling = call_func1( + p__StructuredTaskCollection__IsCanceling, + chore->chore.task_collection); + ok(!canceling, "Task is already canceling"); + } + if (!chore->wait_event) chore->executed = TRUE; @@ -1370,6 +1393,14 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); chore->executed = TRUE; } + + if (chore->check_canceling) + { + MSVCRT_bool canceling = call_func1( + p__StructuredTaskCollection__IsCanceling, + chore->chore.task_collection); + ok(canceling, "Task is not canceling"); + } } static void chore_ctor(struct chore *chore) @@ -1533,6 +1564,28 @@ static void test_StructuredTaskCollection(void) ok(chore1.executed, "Chore was not executed\n"); call_func1(p__StructuredTaskCollection_dtor, &task_coll); + /* test that running chores can be canceled */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore_ctor(&chore1); + chore1.check_canceling = TRUE; + chore1.wait_event = chore_evt2; + chore1.set_event = chore_evt1; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + + ret = WaitForSingleObject(chore_evt1, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + + call_func1(p__StructuredTaskCollection__Cancel, &task_coll); + + b = SetEvent(chore_evt2); + ok(b, "SetEvent failed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); + ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + CloseHandle(chore_start_evt); CloseHandle(chore_evt1); CloseHandle(chore_evt2);

1 0

Dmitry Timoshkov : combase: Execute local server for correct architecture in a WoW64 setup.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 3c9720f4a6b2ffd873c886da53f045709fe98b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9720f4a6b2ffd873c886da… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 27 12:49:11 2022 +0300 combase: Execute local server for correct architecture in a WoW64 setup. Based on implementation of create_surrogate_server(). This patch makes 64-bit application work with its own shipped 32-bit COM server. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/rpc.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 3a171dbb324..c51b59de4bf 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -477,6 +477,9 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) { static const WCHAR embeddingW[] = L" -Embedding"; HKEY key; + int arch = (sizeof(void *) > sizeof(int)) ? 64 : 32; + REGSAM opposite = (arch == 64) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64 = FALSE, is_opposite = FALSE; HRESULT hr; WCHAR command[MAX_PATH + ARRAY_SIZE(embeddingW)]; DWORD size = (MAX_PATH+1) * sizeof(WCHAR); @@ -484,7 +487,14 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) PROCESS_INFORMATION pinfo; LONG ret; + TRACE("Attempting to start server for %s\n", debugstr_guid(rclsid)); + hr = open_key_for_clsid(rclsid, L"LocalServer32", KEY_READ, &key); + if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + { + hr = open_key_for_clsid(rclsid, L"LocalServer32", opposite | KEY_READ, &key); + is_opposite = TRUE; + } if (FAILED(hr)) { ERR("class %s not registered\n", debugstr_guid(rclsid)); @@ -510,7 +520,19 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) /* FIXME: Win2003 supports a ServerExecutable value that is passed into * CreateProcess */ - if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + if (is_opposite) + { + void *cookie; + Wow64DisableWow64FsRedirection(&cookie); + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + { + WARN("failed to run local server %s\n", debugstr_w(command)); + hr = HRESULT_FROM_WIN32(GetLastError()); + } + Wow64RevertWow64FsRedirection(cookie); + if (FAILED(hr)) return hr; + } + else if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) { WARN("failed to run local server %s\n", debugstr_w(command)); return HRESULT_FROM_WIN32(GetLastError());

1 0

Torge Matthies : msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: d31e54d61c16afc8af28b6fd960507f7fd2ac283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d31e54d61c16afc8af28b6fd… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:28:56 2022 +0200 msvcr100: Add _StructuredTaskCollection::_Schedule stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47375 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 15 +++++++++++++++ 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index ad6e90d725c..8474bde4b54 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -594,9 +594,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 19b4cbe96d7..32c1658ebe9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -363,8 +363,8 @@ @ stub -arch=win64 ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=win32 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=win32 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win32 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ stub -arch=win32 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z @ thiscall -arch=win32 ?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QAEXI(a)Z(ptr long) SpinWait__SetSpinCount diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7bdae76cf68..b1e6ba548a4 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -614,9 +614,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8afab0cecae..9a35919a85b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -597,9 +597,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c45965d8acd..3419ca3cbe7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -594,9 +594,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 05ed0ef876f..b12362294db 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -164,6 +164,11 @@ typedef struct yield_func yield_func; } SpinWait; +typedef struct +{ + char dummy; +} _UnrealizedChore; + typedef struct { char dummy; @@ -1773,6 +1778,16 @@ void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) #endif /* _MSVCR_VER >= 120 */ +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z */ +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z */ +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__Schedule, 8) +void __thiscall _StructuredTaskCollection__Schedule( + _StructuredTaskCollection *this, _UnrealizedChore *chore) +{ + FIXME("(%p %p): stub!\n", this, chore); +} + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0

Jinoh Kang : loader: Fix return type of get_auxiliary().
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 38dfa2f4551626d05d5c23824a8e0277374e63ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=38dfa2f4551626d05d5c2382… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jan 1 05:34:54 2022 +0900 loader: Fix return type of get_auxiliary(). This is required for fetching pointer-valued vectors (e.g. AT_SYSINFO_EHDR). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- loader/preloader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader.c b/loader/preloader.c index 585be50624f..d88964e9c4b 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -868,7 +868,7 @@ static void set_auxiliary_values( struct wld_auxv *av, const struct wld_auxv *ne * * Get a field of the auxiliary structure */ -static int get_auxiliary( struct wld_auxv *av, int type, int def_val ) +static ElfW(Addr) get_auxiliary( struct wld_auxv *av, int type, ElfW(Addr) def_val ) { for ( ; av->a_type != AT_NULL; av++) if( av->a_type == type ) return av->a_un.a_val;

1 0

Jacek Caban : win32u: Move scroll tracking implementation from user32.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 419893519c0660a765ebb9898b5ccf64c273b0cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=419893519c0660a765ebb989… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 30 17:12:46 2022 +0200 win32u: Move scroll tracking implementation from user32. --- dlls/user32/controls.h | 3 - dlls/user32/defwnd.c | 24 +- dlls/user32/edit.c | 4 +- dlls/user32/listbox.c | 14 +- dlls/user32/mdi.c | 4 +- dlls/user32/nonclient.c | 69 --- dlls/user32/scroll.c | 1304 +----------------------------------------- dlls/user32/user32.spec | 6 +- dlls/user32/user_main.c | 12 +- dlls/user32/win.c | 14 - dlls/user32/win.h | 1 - dlls/win32u/defwnd.c | 77 ++- dlls/win32u/gdiobj.c | 3 + dlls/win32u/ntuser_private.h | 1 - dlls/win32u/scroll.c | 1032 ++++++++++++++++++++++++++++++++- dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 8 + dlls/win32u/window.c | 11 +- dlls/win32u/wrappers.c | 18 + include/ntuser.h | 36 +- 20 files changed, 1219 insertions(+), 1428 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=419893519c0660a765eb…

1 0

Jacek Caban : win32u: Move scroll bar WM_CREATE implementation from user32.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 6452e67ebabf553944e16544364658a6c23c6110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6452e67ebabf553944e16544… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 28 21:10:50 2022 +0200 win32u: Move scroll bar WM_CREATE implementation from user32. --- dlls/user32/scroll.c | 81 ++------------------------------------------ dlls/win32u/ntuser_private.h | 6 ++++ dlls/win32u/scroll.c | 62 +++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 79 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 9cb07af0706..cc847b48ec6 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); typedef struct scroll_info SCROLLBAR_INFO, *LPSCROLLBAR_INFO; +typedef struct scroll_bar_win_data SCROLLBAR_WNDDATA; /* data for window that has (one or two) scroll bars */ typedef struct @@ -40,12 +41,6 @@ typedef struct SCROLLBAR_INFO vert; } WINSCROLLBAR_INFO, *LPWINSCROLLBAR_INFO; -typedef struct -{ - DWORD magic; - SCROLLBAR_INFO info; -} SCROLLBAR_WNDDATA; - #define SCROLLBAR_MAGIC 0x5c6011ba /* Minimum size of the rectangle between the arrows */ @@ -1127,75 +1122,6 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) } -/*********************************************************************** - * SCROLL_CreateScrollBar - * - * Create a scroll bar - * - * PARAMS - * hwnd [I] Handle of window with scrollbar(s) - * lpCreate [I] The style and place of the scroll bar - */ -static void SCROLL_CreateScrollBar(HWND hwnd, LPCREATESTRUCTW lpCreate) -{ - LPSCROLLBAR_INFO info = NULL; - WND *win; - - TRACE("hwnd=%p lpCreate=%p\n", hwnd, lpCreate); - - win = WIN_GetPtr(hwnd); - if (win->cbWndExtra >= sizeof(SCROLLBAR_WNDDATA)) - { - SCROLLBAR_WNDDATA *data = (SCROLLBAR_WNDDATA*)win->wExtra; - data->magic = SCROLLBAR_MAGIC; - info = &data->info; - } - else WARN("Not enough extra data\n"); - WIN_ReleasePtr(win); - if (!info) return; - - if (lpCreate->style & WS_DISABLED) - { - info->flags = ESB_DISABLE_BOTH; - TRACE("Created WS_DISABLED scrollbar\n"); - } - - if (lpCreate->style & (SBS_SIZEGRIP | SBS_SIZEBOX)) - { - if (lpCreate->style & SBS_SIZEBOXTOPLEFTALIGN) - NtUserMoveWindow( hwnd, lpCreate->x, lpCreate->y, GetSystemMetrics(SM_CXVSCROLL)+1, - GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); - else if(lpCreate->style & SBS_SIZEBOXBOTTOMRIGHTALIGN) - NtUserMoveWindow( hwnd, lpCreate->x+lpCreate->cx-GetSystemMetrics(SM_CXVSCROLL)-1, - lpCreate->y+lpCreate->cy-GetSystemMetrics(SM_CYHSCROLL)-1, - GetSystemMetrics(SM_CXVSCROLL)+1, - GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); - } - else if (lpCreate->style & SBS_VERT) - { - if (lpCreate->style & SBS_LEFTALIGN) - NtUserMoveWindow( hwnd, lpCreate->x, lpCreate->y, - GetSystemMetrics(SM_CXVSCROLL)+1, lpCreate->cy, FALSE ); - else if (lpCreate->style & SBS_RIGHTALIGN) - NtUserMoveWindow( hwnd, - lpCreate->x+lpCreate->cx-GetSystemMetrics(SM_CXVSCROLL)-1, - lpCreate->y, - GetSystemMetrics(SM_CXVSCROLL)+1, lpCreate->cy, FALSE ); - } - else /* SBS_HORZ */ - { - if (lpCreate->style & SBS_TOPALIGN) - NtUserMoveWindow( hwnd, lpCreate->x, lpCreate->y, - lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); - else if (lpCreate->style & SBS_BOTTOMALIGN) - NtUserMoveWindow( hwnd, - lpCreate->x, - lpCreate->y+lpCreate->cy-GetSystemMetrics(SM_CYHSCROLL)-1, - lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); - } -} - - /************************************************************************* * SCROLL_GetScrollInfo * @@ -1409,10 +1335,6 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA switch(message) { - case WM_CREATE: - SCROLL_CreateScrollBar(hwnd, (LPCREATESTRUCTW)lParam); - break; - case WM_ENABLE: { SCROLLBAR_INFO *infoPtr; @@ -1503,6 +1425,7 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA } break; + case WM_CREATE: case WM_ERASEBKGND: case WM_GETDLGCODE: return NtUserMessageCall( hwnd, message, wParam, lParam, 0, NtUserScrollBarWndProc, !unicode ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 609f7018b07..36c11a49c4e 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -216,6 +216,12 @@ struct scroll_info BOOL painted; /* Whether the scroll bar is painted by DefWinProc() */ }; +struct scroll_bar_win_data +{ + DWORD magic; + struct scroll_info info; +}; + /* FIXME: make it private to class.c */ typedef struct tagWINDOWPROC { diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index d6c21fc6992..a15c8bfd36d 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); +#define SCROLLBAR_MAGIC 0x5c6011ba + static struct scroll_info *get_scroll_info_ptr( HWND hwnd, int bar, BOOL alloc ) { struct scroll_info *ret = NULL; @@ -82,10 +84,70 @@ static BOOL show_scroll_bar( HWND hwnd, int bar, BOOL show_horz, BOOL show_vert return FALSE; /* no frame changes */ } +static void create_scroll_bar( HWND hwnd, CREATESTRUCTW *create ) +{ + struct scroll_info *info = NULL; + WND *win; + + TRACE( "hwnd=%p create=%p\n", hwnd, create ); + + win = get_win_ptr( hwnd ); + if (win->cbWndExtra >= sizeof(struct scroll_bar_win_data)) + { + struct scroll_bar_win_data *data = (struct scroll_bar_win_data *)win->wExtra; + data->magic = SCROLLBAR_MAGIC; + info = &data->info; + } + else WARN( "Not enough extra data\n" ); + release_win_ptr( win ); + if (!info) return; + + if (create->style & WS_DISABLED) + { + info->flags = ESB_DISABLE_BOTH; + TRACE( "Created WS_DISABLED scrollbar\n" ); + } + + if (create->style & (SBS_SIZEGRIP | SBS_SIZEBOX)) + { + if (create->style & SBS_SIZEBOXTOPLEFTALIGN) + NtUserMoveWindow( hwnd, create->x, create->y, get_system_metrics( SM_CXVSCROLL ) + 1, + get_system_metrics( SM_CYHSCROLL ) + 1, FALSE ); + else if(create->style & SBS_SIZEBOXBOTTOMRIGHTALIGN) + NtUserMoveWindow( hwnd, create->x + create->cx - get_system_metrics( SM_CXVSCROLL ) - 1, + create->y + create->cy-get_system_metrics( SM_CYHSCROLL ) - 1, + get_system_metrics( SM_CXVSCROLL ) + 1, + get_system_metrics( SM_CYHSCROLL ) + 1, FALSE ); + } + else if (create->style & SBS_VERT) + { + if (create->style & SBS_LEFTALIGN) + NtUserMoveWindow( hwnd, create->x, create->y, get_system_metrics( SM_CXVSCROLL ) + 1, + create->cy, FALSE ); + else if (create->style & SBS_RIGHTALIGN) + NtUserMoveWindow( hwnd, create->x + create->cx - get_system_metrics( SM_CXVSCROLL ) - 1, + create->y, get_system_metrics( SM_CXVSCROLL ) + 1, create->cy, FALSE ); + } + else /* SBS_HORZ */ + { + if (create->style & SBS_TOPALIGN) + NtUserMoveWindow( hwnd, create->x, create->y, create->cx, + get_system_metrics( SM_CYHSCROLL ) + 1, FALSE ); + else if (create->style & SBS_BOTTOMALIGN) + NtUserMoveWindow( hwnd, create->x, + create->y + create->cy - get_system_metrics( SM_CYHSCROLL ) - 1, + create->cx, get_system_metrics( SM_CYHSCROLL ) + 1, FALSE ); + } +} + LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { switch (msg) { + case WM_CREATE: + create_scroll_bar( hwnd, (CREATESTRUCTW *)lparam ); + return 0; + case WM_ERASEBKGND: return 1;

1 0

Jacek Caban : win32u: Move scroll bar WM_SETFOCUS and WM_KILLFOCUS implementation from user32.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 13727e42e965a7a105c0081fbfc775aad22ffbab URL: https://source.winehq.org/git/wine.git/?a=commit;h=13727e42e965a7a105c0081f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 28 21:26:37 2022 +0200 win32u: Move scroll bar WM_SETFOCUS and WM_KILLFOCUS implementation from user32. --- dlls/user32/scroll.c | 39 ----------- dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/scroll.c | 158 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + 4 files changed, 159 insertions(+), 40 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index cc847b48ec6..01f7f3b88ae 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1385,46 +1385,7 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA break; case WM_SETFOCUS: - { - /* Create a caret when a ScrollBar get focus */ - RECT rect; - int arrowSize, thumbSize, thumbPos, vertical; - vertical = SCROLL_GetScrollBarRect( hwnd, SB_CTL, &rect, - &arrowSize, &thumbSize, &thumbPos ); - if (!vertical) - { - NtUserCreateCaret( hwnd, (HBITMAP)1, thumbSize - 2, rect.bottom - rect.top - 2 ); - SetCaretPos(thumbPos+1, rect.top+1); - } - else - { - NtUserCreateCaret( hwnd, (HBITMAP)1, rect.right - rect.left - 2, thumbSize - 2); - SetCaretPos(rect.top+1, thumbPos+1); - } - NtUserShowCaret( hwnd ); - } - break; - case WM_KILLFOCUS: - { - RECT rect; - int arrowSize, thumbSize, thumbPos, vertical; - vertical = SCROLL_GetScrollBarRect( hwnd, SB_CTL, &rect,&arrowSize, &thumbSize, &thumbPos ); - if (!vertical){ - rect.left=thumbPos+1; - rect.right=rect.left+thumbSize; - } - else - { - rect.top=thumbPos+1; - rect.bottom=rect.top+thumbSize; - } - NtUserHideCaret( hwnd ); - NtUserInvalidateRect( hwnd, &rect, 0 ); - DestroyCaret(); - } - break; - case WM_CREATE: case WM_ERASEBKGND: case WM_GETDLGCODE: diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index ac552897769..0397138b109 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -391,7 +391,6 @@ extern void lp_to_dp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL set_map_mode( DC *dc, int mode ) DECLSPEC_HIDDEN; extern void combine_transform( XFORM *result, const XFORM *xform1, const XFORM *xform2 ) DECLSPEC_HIDDEN; -extern int muldiv( int a, int b, int c ) DECLSPEC_HIDDEN; /* driver.c */ extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index a15c8bfd36d..14bec1e3b83 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -32,6 +32,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); #define SCROLLBAR_MAGIC 0x5c6011ba +/* Minimum size of the rectangle between the arrows */ +#define SCROLL_MIN_RECT 4 + +/* Minimum size of the thumb in pixels */ +#define SCROLL_MIN_THUMB 8 + +/* Overlap between arrows and thumb */ +#define SCROLL_ARROW_THUMB_OVERLAP 0 + static struct scroll_info *get_scroll_info_ptr( HWND hwnd, int bar, BOOL alloc ) { struct scroll_info *ret = NULL; @@ -84,6 +93,113 @@ static BOOL show_scroll_bar( HWND hwnd, int bar, BOOL show_horz, BOOL show_vert return FALSE; /* no frame changes */ } +/*********************************************************************** + * get_scroll_bar_rect + * + * Compute the scroll bar rectangle, in drawing coordinates (i.e. client + * coords for SB_CTL, window coords for SB_VERT and SB_HORZ). + * 'arrow_size' returns the width or height of an arrow (depending on + * the orientation of the scrollbar), 'thumb_size' returns the size of + * the thumb, and 'thumb_pos' returns the position of the thumb + * relative to the left or to the top. + * Return TRUE if the scrollbar is vertical, FALSE if horizontal. + */ +static BOOL get_scroll_bar_rect( HWND hwnd, int bar, RECT *rect, int *arrow_size, + int *thumb_size, int *thumb_pos ) +{ + int pixels, min_thumb_size; + BOOL vertical; + WND *win = get_win_ptr( hwnd ); + + if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE; + + switch(bar) + { + case SB_HORZ: + get_window_rects( hwnd, COORDS_WINDOW, NULL, rect, get_thread_dpi() ); + rect->top = rect->bottom; + rect->bottom += get_system_metrics( SM_CYHSCROLL ); + if (win->dwStyle & WS_VSCROLL) rect->right++; + vertical = FALSE; + break; + + case SB_VERT: + get_window_rects( hwnd, COORDS_WINDOW, NULL, rect, get_thread_dpi() ); + if (win->dwExStyle & WS_EX_LEFTSCROLLBAR) + { + rect->right = rect->left; + rect->left -= get_system_metrics( SM_CXVSCROLL ); + } + else + { + rect->left = rect->right; + rect->right += get_system_metrics( SM_CXVSCROLL ); + } + if (win->dwStyle & WS_HSCROLL) rect->bottom++; + vertical = TRUE; + break; + + case SB_CTL: + get_client_rect( hwnd, rect ); + vertical = (win->dwStyle & SBS_VERT) != 0; + break; + + default: + release_win_ptr( win ); + return FALSE; + } + + if (vertical) pixels = rect->bottom - rect->top; + else pixels = rect->right - rect->left; + + if (pixels <= 2 * get_system_metrics( SM_CXVSCROLL ) + SCROLL_MIN_RECT) + { + if (pixels > SCROLL_MIN_RECT) + *arrow_size = (pixels - SCROLL_MIN_RECT) / 2; + else + *arrow_size = 0; + *thumb_pos = *thumb_size = 0; + } + else + { + struct scroll_info *info = get_scroll_info_ptr( hwnd, bar, TRUE ); + if (!info) + { + WARN( "called for missing scroll bar\n" ); + release_win_ptr( win ); + return FALSE; + } + *arrow_size = get_system_metrics( SM_CXVSCROLL ); + pixels -= 2 * (get_system_metrics( SM_CXVSCROLL ) - SCROLL_ARROW_THUMB_OVERLAP); + + if (info->page) + { + *thumb_size = muldiv( pixels,info->page, info->maxVal - info->minVal + 1 ); + min_thumb_size = muldiv( SCROLL_MIN_THUMB, get_dpi_for_window( hwnd ), 96 ); + if (*thumb_size < min_thumb_size) *thumb_size = min_thumb_size; + } + else *thumb_size = get_system_metrics( SM_CXVSCROLL ); + + if ((pixels -= *thumb_size ) < 0 || (info->flags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH) + { + /* Rectangle too small or scrollbar disabled -> no thumb */ + *thumb_pos = *thumb_size = 0; + } + else + { + int max = info->maxVal - max( info->page-1, 0 ); + if (info->minVal >= max) + *thumb_pos = *arrow_size - SCROLL_ARROW_THUMB_OVERLAP; + else + *thumb_pos = *arrow_size - SCROLL_ARROW_THUMB_OVERLAP + + muldiv( pixels, info->curVal - info->minVal, max - info->minVal ); + } + release_scroll_info_ptr( info ); + } + release_win_ptr( win ); + return vertical; +} + static void create_scroll_bar( HWND hwnd, CREATESTRUCTW *create ) { struct scroll_info *info = NULL; @@ -148,6 +264,48 @@ LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara create_scroll_bar( hwnd, (CREATESTRUCTW *)lparam ); return 0; + case WM_SETFOCUS: + { + /* Create a caret when a ScrollBar get focus */ + RECT rect; + int arrow_size, thumb_size, thumb_pos, vertical; + vertical = get_scroll_bar_rect( hwnd, SB_CTL, &rect, &arrow_size, + &thumb_size, &thumb_pos ); + if (!vertical) + { + NtUserCreateCaret( hwnd, (HBITMAP)1, thumb_size - 2, rect.bottom - rect.top - 2 ); + set_caret_pos( thumb_pos + 1, rect.top + 1 ); + } + else + { + NtUserCreateCaret( hwnd, (HBITMAP)1, rect.right - rect.left - 2, thumb_size - 2 ); + set_caret_pos( rect.top + 1, thumb_pos + 1 ); + } + NtUserShowCaret( hwnd ); + } + return 0; + + case WM_KILLFOCUS: + { + int arrow_size, thumb_size, thumb_pos, vertical; + RECT rect; + vertical = get_scroll_bar_rect( hwnd, SB_CTL, &rect,&arrow_size, &thumb_size, &thumb_pos ); + if (!vertical) + { + rect.left = thumb_pos + 1; + rect.right = rect.left + thumb_size; + } + else + { + rect.top = thumb_pos + 1; + rect.bottom = rect.top + thumb_size; + } + NtUserHideCaret( hwnd ); + NtUserInvalidateRect( hwnd, &rect, 0 ); + destroy_caret(); + } + return 0; + case WM_ERASEBKGND: return 1; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 684a5e59c5b..49c81ea3bef 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -535,6 +535,7 @@ extern NTSTATUS gdi_init(void) DECLSPEC_HIDDEN; extern NTSTATUS callbacks_init( void *args ) DECLSPEC_HIDDEN; extern void winstation_init(void) DECLSPEC_HIDDEN; extern void sysparams_init(void) DECLSPEC_HIDDEN; +extern int muldiv( int a, int b, int c ) DECLSPEC_HIDDEN; extern HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : user32: Pass scroll enable flags to ScrollBarDraw.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: 79910bcf83e2b42688e8c85d6d3d730eac7f34ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=79910bcf83e2b42688e8c85d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 3 22:14:54 2022 +0200 user32: Pass scroll enable flags to ScrollBarDraw. --- dlls/user32/scroll.c | 30 +++++++++++------------------- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 4 ++-- dlls/uxtheme/scrollbar.c | 6 +++--- dlls/uxtheme/uxthemedll.h | 4 ++-- include/winuser.h | 4 ++-- 6 files changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index bf0a7d3350a..e368a2feb70 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -125,7 +125,7 @@ SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ) * * Draw the scroll bar arrows. */ -static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr, +static void SCROLL_DrawArrows( HDC hdc, UINT flags, RECT *rect, INT arrowSize, BOOL vertical, BOOL top_pressed, BOOL bottom_pressed ) { @@ -140,7 +140,7 @@ static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr, DrawFrameControl( hdc, &r, DFC_SCROLL, (vertical ? DFCS_SCROLLUP : DFCS_SCROLLLEFT) | (top_pressed ? (DFCS_PUSHED | DFCS_FLAT) : 0 ) - | (infoPtr->flags&ESB_DISABLE_LTUP ? DFCS_INACTIVE : 0 ) ); + | (flags & ESB_DISABLE_LTUP ? DFCS_INACTIVE : 0 ) ); r = *rect; if( vertical ) @@ -151,7 +151,7 @@ static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr, DrawFrameControl( hdc, &r, DFC_SCROLL, (vertical ? DFCS_SCROLLDOWN : DFCS_SCROLLRIGHT) | (bottom_pressed ? (DFCS_PUSHED | DFCS_FLAT) : 0 ) - | (infoPtr->flags&ESB_DISABLE_RTDN ? DFCS_INACTIVE : 0) ); + | (flags & ESB_DISABLE_RTDN ? DFCS_INACTIVE : 0) ); } /*********************************************************************** @@ -161,8 +161,7 @@ static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr, */ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT *rect, INT arrowSize, - INT thumbSize, INT thumbPos, - UINT flags, BOOL vertical, + INT thumbSize, INT thumbPos, BOOL vertical, BOOL top_selected, BOOL bottom_selected ) { RECT r; @@ -247,11 +246,9 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, - BOOL interior, RECT *rect, INT arrowSize, INT thumbPos, - INT thumbSize, BOOL vertical ) + BOOL interior, RECT *rect, UINT enable_flags, INT arrowSize, + INT thumbPos, INT thumbSize, BOOL vertical ) { - SCROLLBAR_INFO *infoPtr; - if (nBar == SB_CTL) { DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); @@ -274,34 +271,29 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES } } - if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ))) - return; - - /* Draw the arrows */ - + /* Draw the arrows */ if (arrows && arrowSize) { if (vertical == tracking_info->vertical && GetCapture() == hwnd) - SCROLL_DrawArrows( hdc, infoPtr, rect, arrowSize, vertical, + SCROLL_DrawArrows( hdc, enable_flags, rect, arrowSize, vertical, hit_test == tracking_info->hit_test && hit_test == SCROLL_TOP_ARROW, hit_test == tracking_info->hit_test && hit_test == SCROLL_BOTTOM_ARROW ); else - SCROLL_DrawArrows( hdc, infoPtr, rect, arrowSize, vertical, FALSE, FALSE ); + SCROLL_DrawArrows( hdc, enable_flags, rect, arrowSize, vertical, FALSE, FALSE ); } if (interior) { if (vertical == tracking_info->vertical && GetCapture() == hwnd) { - SCROLL_DrawInterior( hwnd, hdc, nBar, rect, arrowSize, thumbSize, thumbPos, - infoPtr->flags, vertical, + SCROLL_DrawInterior( hwnd, hdc, nBar, rect, arrowSize, thumbSize, thumbPos, vertical, hit_test == tracking_info->hit_test && hit_test == SCROLL_TOP_RECT, hit_test == tracking_info->hit_test && hit_test == SCROLL_BOTTOM_RECT ); } else { SCROLL_DrawInterior( hwnd, hdc, nBar, rect, arrowSize, thumbSize, thumbPos, - infoPtr->flags, vertical, FALSE, FALSE ); + vertical, FALSE, FALSE ); } } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index b6c8f26cec6..fb9ce74736d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -178,7 +178,7 @@ static NTSTATUS WINAPI User32DrawScrollBar( const struct draw_scroll_bar_params RECT rect = params->rect; user_api->pScrollBarDraw( params->hwnd, params->hdc, params->bar, params->hit_test, &params->tracking_info, params->arrows, params->interior, - &rect, params->arrow_size, params->thumb_pos, + &rect, params->enable_flags, params->arrow_size, params->thumb_pos, params->thumb_size, params->vertical ); return 0; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f34818ea258..3be5b84b41b 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -177,8 +177,8 @@ extern struct user_api_hook *user_api DECLSPEC_HIDDEN; LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, - const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, - INT, BOOL) DECLSPEC_HIDDEN; + const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, UINT, + INT, INT, INT, BOOL) DECLSPEC_HIDDEN; struct scroll_info *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ); #endif /* __WINE_USER_PRIVATE_H */ diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 719081ad5b8..4ae1b2a8724 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -34,8 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, - BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, - INT thumbpos, INT thumbsize, BOOL vertical) + BOOL draw_arrows, BOOL draw_interior, RECT *rect, UINT enable_flags, + INT arrowsize, INT thumbpos, INT thumbsize, BOOL vertical) { BOOL disabled = !IsWindowEnabled(hwnd); HTHEME theme; @@ -49,7 +49,7 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES if (!theme) { user_api.pScrollBarDraw(hwnd, dc, bar, hit_test, tracking_info, draw_arrows, draw_interior, - rect, arrowsize, thumbpos, thumbsize, vertical); + rect, enable_flags, arrowsize, thumbpos, thumbsize, vertical); return; } diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 67130774392..85b834e20e8 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -109,8 +109,8 @@ extern struct user_api_hook user_api DECLSPEC_HIDDEN; LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, - BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, - INT thumbpos, INT thumbsize, BOOL vertical) DECLSPEC_HIDDEN; + BOOL draw_arrows, BOOL draw_interior, RECT *rect, UINT enable_flags, + INT arrowsize, INT thumbpos, INT thumbsize, BOOL vertical) DECLSPEC_HIDDEN; LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) DECLSPEC_HIDDEN; diff --git a/include/winuser.h b/include/winuser.h index 4e43d6c1170..d2262b6d70a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4789,8 +4789,8 @@ struct user_api_hook { LRESULT (WINAPI *pDefDlgProc)(HWND, UINT, WPARAM, LPARAM, BOOL); void (WINAPI *pScrollBarDraw)(HWND, HDC, INT, enum SCROLL_HITTEST, - const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, - INT, BOOL); + const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, UINT, + INT, INT, INT, BOOL); LRESULT (WINAPI *pScrollBarWndProc)(HWND, UINT, WPARAM, LPARAM, BOOL); };

1 0

Jacek Caban : win32u: Move set_standard_scroll_painted implementation from user32.
by Alexandre Julliard July 4, 2022

July 4, 2022

Module: wine Branch: master Commit: a7ff88c9a28d097b3479c1d6c554af5d83171435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7ff88c9a28d097b3479c1d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 28 21:03:24 2022 +0200 win32u: Move set_standard_scroll_painted implementation from user32. --- dlls/user32/scroll.c | 13 ++----------- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 2 +- dlls/win32u/dce.c | 6 +++--- dlls/win32u/ntuser_private.h | 15 ++++++++++++++- dlls/win32u/scroll.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + 7 files changed, 50 insertions(+), 17 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d9bc69895aa..9cb07af0706 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -31,16 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); -/* data for a single scroll bar */ -typedef struct -{ - INT curVal; /* Current scroll-bar value */ - INT minVal; /* Minimum scroll-bar value */ - INT maxVal; /* Maximum scroll-bar value */ - INT page; /* Page size of scroll bar (Win32) */ - UINT flags; /* EnableScrollBar flags */ - BOOL painted; /* Whether the scroll bar is painted by DefWinProc() */ -} SCROLLBAR_INFO, *LPSCROLLBAR_INFO; +typedef struct scroll_info SCROLLBAR_INFO, *LPSCROLLBAR_INFO; /* data for window that has (one or two) scroll bars */ typedef struct @@ -127,7 +118,7 @@ static inline BOOL SCROLL_ScrollInfoValid( LPCSCROLLINFO info ) * or NULL if failed (f.i. scroll bar does not exist yet) * If alloc is TRUE and the struct does not exist yet, create it. */ -static SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ) +SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ) { SCROLLBAR_INFO *infoPtr = NULL; WND *wndPtr = WIN_GetPtr( hwnd ); diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 2391131e4a5..7a85a86d786 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -159,9 +159,9 @@ static const struct user_callbacks user_funcs = NtWaitForMultipleObjects, SCROLL_DrawNCScrollBar, free_win_ptr, + SCROLL_GetInternalInfo, notify_ime, post_dde_message, - SCROLL_SetStandardScrollPainted, unpack_dde_message, register_imm, unregister_imm, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a646f9a234d..f34818ea258 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -179,6 +179,6 @@ LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HID void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL) DECLSPEC_HIDDEN; -void WINAPI SCROLL_SetStandardScrollPainted(HWND hwnd, INT bar, BOOL visible); +struct scroll_info *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ); #endif /* __WINE_USER_PRIVATE_H */ diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 67590e80fa3..9041b5bbaaf 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1188,14 +1188,14 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (whole_rgn) /* NOTE: WM_NCPAINT allows wParam to be 1 */ { - if ((*flags & UPDATE_NONCLIENT) && user_callbacks) + if (*flags & UPDATE_NONCLIENT) { /* Mark standard scroll bars as not painted before sending WM_NCPAINT */ style = get_window_long( hwnd, GWL_STYLE ); if (style & WS_HSCROLL) - user_callbacks->set_standard_scroll_painted( hwnd, SB_HORZ, FALSE ); + set_standard_scroll_painted( hwnd, SB_HORZ, FALSE ); if (style & WS_VSCROLL) - user_callbacks->set_standard_scroll_painted( hwnd, SB_VERT, FALSE ); + set_standard_scroll_painted( hwnd, SB_VERT, FALSE ); send_message( hwnd, WM_NCPAINT, (WPARAM)whole_rgn, 0 ); } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 82d70ec93bb..609f7018b07 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -37,10 +37,10 @@ struct user_callbacks NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); void (CDECL *draw_nc_scrollbar)( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ); void (CDECL *free_win_ptr)( struct tagWND *win ); + struct scroll_info *(CDECL *get_scroll_info)( HWND hwnd, INT nBar, BOOL alloc ); void (CDECL *notify_ime)( HWND hwnd, UINT param ); BOOL (CDECL *post_dde_message)( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ); - void (WINAPI *set_standard_scroll_painted)( HWND hwnd, INT bar, BOOL visible ); BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void **buffer, size_t size ); BOOL (WINAPI *register_imm)( HWND hwnd ); @@ -203,6 +203,19 @@ enum builtin_winprocs NB_BUILTIN_AW_WINPROCS = WINPROC_DESKTOP }; +/* FIXME: make it private to scroll.c */ + +/* data for a single scroll bar */ +struct scroll_info +{ + INT curVal; /* Current scroll-bar value */ + INT minVal; /* Minimum scroll-bar value */ + INT maxVal; /* Maximum scroll-bar value */ + INT page; /* Page size of scroll bar (Win32) */ + UINT flags; /* EnableScrollBar flags */ + BOOL painted; /* Whether the scroll bar is painted by DefWinProc() */ +}; + /* FIXME: make it private to class.c */ typedef struct tagWINDOWPROC { diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index ff60ec5c4ce..d6c21fc6992 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -30,6 +30,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); +static struct scroll_info *get_scroll_info_ptr( HWND hwnd, int bar, BOOL alloc ) +{ + struct scroll_info *ret = NULL; + user_lock(); + if (user_callbacks) ret = user_callbacks->get_scroll_info( hwnd, bar, alloc ); + if (!ret) user_unlock(); + return ret; +} + +static void release_scroll_info_ptr( struct scroll_info *info ) +{ + user_unlock(); +} + static BOOL show_scroll_bar( HWND hwnd, int bar, BOOL show_horz, BOOL show_vert ) { ULONG old_style, set_bits = 0, clear_bits = 0; @@ -83,6 +97,20 @@ LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara } } +void set_standard_scroll_painted( HWND hwnd, int bar, BOOL painted ) +{ + struct scroll_info *info; + + if (bar != SB_HORZ && bar != SB_VERT) + return; + + if ((info = get_scroll_info_ptr( hwnd, bar, FALSE ))) + { + info->painted = painted; + release_scroll_info_ptr( info ); + } +} + /************************************************************************* * NtUserShowScrollBar (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 90ca0e9b143..684a5e59c5b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -443,6 +443,7 @@ extern BOOL rawinput_device_get_usages( HANDLE handle, USHORT *usage_page, USHOR /* scroll.c */ extern LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; +extern void set_standard_scroll_painted( HWND hwnd, int bar, BOOL painted ) DECLSPEC_HIDDEN; /* sysparams.c */ extern BOOL enable_thunk_lock DECLSPEC_HIDDEN;

1 0