- Wine-Commits - list.winehq.org

Piotr Caban : msvcr120: Add missing _StructuredTaskCollection destructor spec file entry.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 99bae6d80a66ffad0196a635a69e579f1445d0f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/99bae6d80a66ffad0196a635a69e57… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 19 16:54:46 2022 +0200 msvcr120: Add missing _StructuredTaskCollection destructor spec file entry. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f3576a0590260162cf6a03745f48d69d05ef428c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 68855b90096..381f954d8a6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -290,6 +290,7 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ +@ stub -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ

1 0

Torge Matthies : msvcr110: Add _StructuredTaskCollection::_StructuredTaskCollection_ctor stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: ca1fc887a54e3ba7dbbda39b033e75d213972410 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca1fc887a54e3ba7dbbda39b033e75… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Apr 25 19:35:02 2022 +0200 msvcr110: Add _StructuredTaskCollection::_StructuredTaskCollection_ctor stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 881879c658c6b1bfed41beb5da87b6cf1ee31936) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 19 +++++++++++++++++++ 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 50db9348327..3257d61bb37 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -63,9 +63,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 23840f85eda..64b634b582e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -62,9 +62,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64ddeed42f4..68855b90096 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -59,9 +59,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05f408d6884..eabb304dd6d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -57,9 +57,9 @@ @ stub -arch=arm ??0_SpinLock(a)details@Concurrency@@QAA(a)ACJ@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @ stub -arch=win64 ??0_SpinLock(a)details@Concurrency@@QEAA(a)AECJ@Z -@ stub -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z -@ stub -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z +@ cdecl -arch=arm ??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z +@ thiscall -arch=i386 ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z +@ cdecl -arch=win64 ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z @ stub -arch=arm ??0_TaskCollection(a)details@Concurrency@@QAA(a)PAV_CancellationTokenState@12@@Z @ stub -arch=i386 ??0_TaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z @ stub -arch=win64 ??0_TaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index f66dfa43f36..d9fb031e9cb 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; +} _StructuredTaskCollection; + /* keep in sync with msvcp90/msvcp90.h */ typedef struct cs_queue { @@ -1738,6 +1743,20 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +#if _MSVCR_VER >= 110 + +/* ??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z */ +/* ??0_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)PEAV_CancellationTokenState@12@@Z */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_ctor, 8) +_StructuredTaskCollection* __thiscall _StructuredTaskCollection_ctor( + _StructuredTaskCollection *this, /*_CancellationTokenState*/void *token) +{ + FIXME("(%p): stub\n", this); + return NULL; +} + +#endif /* _MSVCR_VER >= 110 */ + /* ??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 : riched20: Commit and wrap paragraphs after changing text properties.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 3184473af0cdd067c2679692ac463ad014059e3f URL: https://gitlab.winehq.org/wine/wine/-/commit/3184473af0cdd067c2679692ac463a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Jun 20 20:37:01 2022 +0900 riched20: Commit and wrap paragraphs after changing text properties. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53170 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> (cherry picked from commit 0974f047b57357252ec94bea119e5291250a446c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/richole.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 03572511ff7..74a484b0ebd 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -647,6 +647,9 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) cursor_from_char_ofs( services->editor, start, &from ); cursor_from_char_ofs( services->editor, end, &to ); ME_SetCharFormat( services->editor, &from, &to, &fmt ); + ME_CommitUndo( services->editor ); + ME_WrapMarkedParagraphs( services->editor ); + ME_UpdateScrollBar( services->editor ); } } @@ -805,6 +808,9 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop cursor_from_char_ofs( services->editor, start, &from ); cursor_from_char_ofs( services->editor, end, &to ); ME_SetCharFormat( services->editor, &from, &to, &fmt ); + ME_CommitUndo( services->editor ); + ME_WrapMarkedParagraphs( services->editor ); + ME_UpdateScrollBar( services->editor ); return S_OK; }

1 0

Rémi Bernon : winebus.sys: Implement SOCD neutral cleaning for hatswitches.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 069512032c186d08e752d6e1fa26bd129674d4e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/069512032c186d08e752d6e1fa26bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 21:05:36 2022 +0200 winebus.sys: Implement SOCD neutral cleaning for hatswitches. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52841 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> (cherry picked from commit e2936702a47247f806478f16d4631516ca2c3e9f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 27 +++++++++++++++------------ dlls/winebus.sys/hid.c | 11 +++++++++++ dlls/winebus.sys/unix_private.h | 1 + 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 37d75d0bc95..ab2da578928 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -326,6 +326,8 @@ static NTSTATUS build_controller_report_descriptor(struct unix_device *iface) static const USAGE trigger_axis_usages[] = {HID_USAGE_GENERIC_Z, HID_USAGE_GENERIC_RZ}; struct sdl_device *impl = impl_from_unix_device(iface); ULONG i, button_count = SDL_CONTROLLER_BUTTON_MAX - 1; + BOOL state; + C_ASSERT(SDL_CONTROLLER_AXIS_MAX == 6); if (!hid_device_begin_report_descriptor(iface, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD)) @@ -364,14 +366,15 @@ static NTSTATUS build_controller_report_descriptor(struct unix_device *iface) /* Initialize axis in the report */ for (i = SDL_CONTROLLER_AXIS_LEFTX; i < SDL_CONTROLLER_AXIS_MAX; i++) hid_device_set_abs_axis(iface, i, pSDL_GameControllerGetAxis(impl->sdl_controller, i)); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_UP)) - hid_device_set_hatswitch_y(iface, 0, -1); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_DOWN)) - hid_device_set_hatswitch_y(iface, 0, +1); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_LEFT)) - hid_device_set_hatswitch_x(iface, 0, -1); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_RIGHT)) - hid_device_set_hatswitch_x(iface, 0, +1); + + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_UP); + hid_device_move_hatswitch(iface, 0, 0, state ? -1 : +1); + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_DOWN); + hid_device_move_hatswitch(iface, 0, 0, state ? +1 : -1); + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_LEFT); + hid_device_move_hatswitch(iface, 0, state ? -1 : +1, 0); + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_RIGHT); + hid_device_move_hatswitch(iface, 0, state ? +1 : -1, 0); return STATUS_SUCCESS; } @@ -799,16 +802,16 @@ static BOOL set_report_from_controller_event(struct sdl_device *impl, SDL_Event switch ((button = ie->button)) { case SDL_CONTROLLER_BUTTON_DPAD_UP: - hid_device_set_hatswitch_y(iface, 0, ie->state ? -1 : 0); + hid_device_move_hatswitch(iface, 0, 0, ie->state ? -1 : +1); break; case SDL_CONTROLLER_BUTTON_DPAD_DOWN: - hid_device_set_hatswitch_y(iface, 0, ie->state ? +1 : 0); + hid_device_move_hatswitch(iface, 0, 0, ie->state ? +1 : -1); break; case SDL_CONTROLLER_BUTTON_DPAD_LEFT: - hid_device_set_hatswitch_x(iface, 0, ie->state ? -1 : 0); + hid_device_move_hatswitch(iface, 0, ie->state ? -1 : +1, 0); break; case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: - hid_device_set_hatswitch_x(iface, 0, ie->state ? +1 : 0); + hid_device_move_hatswitch(iface, 0, ie->state ? +1 : -1, 0); break; case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: button = 4; break; case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: button = 5; break; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 32628f1f2fd..1f088e35a0c 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -1386,6 +1386,17 @@ BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new return TRUE; } +BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y) +{ + struct hid_device_state *state = &iface->hid_device_state; + ULONG offset = state->hatswitch_start + index; + LONG old_x, old_y; + if (index > state->hatswitch_count) return FALSE; + hatswitch_decompose(state->report_buf[offset], &old_x, &old_y); + hatswitch_compose(old_x + x, old_y + y, &state->report_buf[offset]); + return TRUE; +} + BOOL hid_device_sync_report(struct unix_device *iface) { BOOL dropped; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index efecf6cdbe3..20c4ee5df9d 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -258,6 +258,7 @@ extern BOOL hid_device_set_rel_axis(struct unix_device *iface, ULONG index, LONG extern BOOL hid_device_set_button(struct unix_device *iface, ULONG index, BOOL is_set) DECLSPEC_HIDDEN; extern BOOL hid_device_set_hatswitch_x(struct unix_device *iface, ULONG index, LONG new_x) DECLSPEC_HIDDEN; extern BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new_y) DECLSPEC_HIDDEN; +extern BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y) DECLSPEC_HIDDEN; extern BOOL hid_device_sync_report(struct unix_device *iface) DECLSPEC_HIDDEN; extern void hid_device_drop_report(struct unix_device *iface) DECLSPEC_HIDDEN;

1 0

Alex Henrie : ntdll: Don't hard-code the battery and AC adapter names on Linux.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 116269201986cdb010827e6a7d18be4eda7d8c47 URL: https://gitlab.winehq.org/wine/wine/-/commit/116269201986cdb010827e6a7d18be… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 15 20:33:54 2022 -0600 ntdll: Don't hard-code the battery and AC adapter names on Linux. Look through all of the devices in /sys/class/power_supply and take the statistics from the first battery and the first AC adapter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52831 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> (cherry picked from commit 89ec37871f6093d8336f636dc967d79579607dd3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/unix/system.c | 79 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 9f49b9e6f58..a06739388b8 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -35,6 +35,7 @@ #include <errno.h> #include <sys/time.h> #include <time.h> +#include <dirent.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -3421,12 +3422,14 @@ static ULONG mhz_from_cpuinfo(void) return cmz; } -static const char * get_sys_str(const char *path, char *s) +static const char * get_sys_str(const char *dirname, const char *basename, char *s) { - FILE *f = fopen(path, "r"); + char path[64]; + FILE *f; const char *ret = NULL; - if (f) + if (snprintf(path, sizeof(path), "%s/%s", dirname, basename) >= sizeof(path)) return NULL; + if ((f = fopen(path, "r"))) { if (fgets(s, 16, f)) ret = s; fclose(f); @@ -3434,42 +3437,68 @@ static const char * get_sys_str(const char *path, char *s) return ret; } -static int get_sys_int(const char *path, int def) +static int get_sys_int(const char *dirname, const char *basename) { char s[16]; - return get_sys_str(path, s) ? atoi(s) : def; + return get_sys_str(dirname, basename, s) ? atoi(s) : 0; } static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) { + DIR *d = opendir("/sys/class/power_supply"); + struct dirent *de; char s[16], path[64]; - unsigned int i = 0; + BOOL found_ac = FALSE; LONG64 voltage; /* microvolts */ - bs->AcOnLine = get_sys_int("/sys/class/power_supply/AC/online", 1); + bs->AcOnLine = TRUE; + if (!d) return STATUS_SUCCESS; - for (;;) + while ((de = readdir(d))) { - sprintf(path, "/sys/class/power_supply/BAT%u/status", i); - if (!get_sys_str(path, s)) break; - bs->Charging |= (strcmp(s, "Charging\n") == 0); - bs->Discharging |= (strcmp(s, "Discharging\n") == 0); - bs->BatteryPresent = TRUE; - i++; - } + if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue; + if (snprintf(path, sizeof(path), "/sys/class/power_supply/%s", de->d_name) >= sizeof(path)) continue; + if (get_sys_str(path, "scope", s) && strcmp(s, "Device\n") == 0) continue; + if (!get_sys_str(path, "type", s)) continue; - if (bs->BatteryPresent) - { - voltage = get_sys_int("/sys/class/power_supply/BAT0/voltage_now", 0); - bs->MaxCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_full", 0) * voltage / 1e9; - bs->RemainingCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_now", 0) * voltage / 1e9; - bs->Rate = -get_sys_int("/sys/class/power_supply/BAT0/current_now", 0) * voltage / 1e9; - if (!bs->Charging && (LONG)bs->Rate < 0) - bs->EstimatedTime = 3600 * bs->RemainingCapacity / -(LONG)bs->Rate; - else - bs->EstimatedTime = ~0u; + if (strcmp(s, "Mains\n") == 0) + { + if (!get_sys_str(path, "online", s)) continue; + if (found_ac) + { + FIXME("Multiple mains found, only reporting on the first\n"); + } + else + { + bs->AcOnLine = atoi(s); + found_ac = TRUE; + } + } + else if (strcmp(s, "Battery\n") == 0) + { + if (!get_sys_str(path, "status", s)) continue; + if (bs->BatteryPresent) + { + FIXME("Multiple batteries found, only reporting on the first\n"); + } + else + { + bs->Charging = (strcmp(s, "Charging\n") == 0); + bs->Discharging = (strcmp(s, "Discharging\n") == 0); + bs->BatteryPresent = TRUE; + voltage = get_sys_int(path, "voltage_now"); + bs->MaxCapacity = get_sys_int(path, "charge_full") * voltage / 1e9; + bs->RemainingCapacity = get_sys_int(path, "charge_now") * voltage / 1e9; + bs->Rate = -get_sys_int(path, "current_now") * voltage / 1e9; + if (!bs->Charging && (LONG)bs->Rate < 0) + bs->EstimatedTime = 3600 * bs->RemainingCapacity / -(LONG)bs->Rate; + else + bs->EstimatedTime = ~0u; + } + } } + closedir(d); return STATUS_SUCCESS; }

1 0

Limstash Wong : taskmgr: Fix the unit in memory usage graph on performance tab.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 35da30e3552fa5481a97941f7b167cdb7e0f444b URL: https://gitlab.winehq.org/wine/wine/-/commit/35da30e3552fa5481a97941f7b167c… Author: Limstash Wong <limstash.w(a)gmail.com> Date: Fri May 20 01:31:35 2022 +0800 taskmgr: Fix the unit in memory usage graph on performance tab. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50948 Signed-off-by: Limstash Wong <limstash.w(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3e9af4478dcacd08d0e6de2a8631a90b2d01f37e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskmgr/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 12f22145664..4d04017e331 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -253,8 +253,8 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* * Get the memory usage */ - CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); - CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); + CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK() << 10; + CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK() << 10; if (CommitChargeTotal < 1024) StrFormatKBSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text));

1 0

Alex Henrie : ntoskrnl: Add ExNotifyCallback stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 1d70026d36d7d6435a8da93c7c99044b14a44062 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d70026d36d7d6435a8da93c7c9904… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 29 15:39:29 2022 -0600 ntoskrnl: Add ExNotifyCallback stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53051 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> (cherry picked from commit 942eb6008d81673990ede01a1dd64e1f1958dc84) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 38a25bc5092..a373a3da99e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2250,6 +2250,14 @@ void WINAPI ExUnregisterCallback(void *callback_registration) FIXME("callback_registration %p stub.\n", callback_registration); } +/*********************************************************************** + * ExNotifyCallback (NTOSKRNL.EXE.@) + */ +void WINAPI ExNotifyCallback(void *obj, void *arg1, void *arg2) +{ + FIXME("(%p, %p, %p): stub\n", obj, arg1, arg2); +} + /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d445c5a5557..4df6b1ae472 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -175,7 +175,7 @@ @ stdcall ExIsResourceAcquiredExclusiveLite(ptr) @ stdcall ExIsResourceAcquiredSharedLite(ptr) @ stdcall ExLocalTimeToSystemTime(ptr ptr) RtlLocalTimeToSystemTime -@ stub ExNotifyCallback +@ stdcall ExNotifyCallback(ptr ptr ptr) @ stub ExQueryPoolBlockSize @ stub ExQueueWorkItem @ stub ExRaiseAccessViolation

1 0

Zebediah Figura : quartz/systemclock: Use timeGetTime() to retrieve the current time.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 0d24c0f5ab65a26affbb91345a0f4089878356b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d24c0f5ab65a26affbb91345a0f40… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat May 14 15:20:16 2022 -0500 quartz/systemclock: Use timeGetTime() to retrieve the current time. There is no evidence that the extra overhead should matter, and this allows us to be consistent, and potentially change timeGetTime() without having to worry about quartz. On Windows, timeGetTime() has identical resolution to the interrupt time [i.e. the "InterruptTime" member of the shared user data, or QueryInterruptTime()]. Like those sources, it approximately measures the boot time. However, the values are not identical; timeGetTime() lags behind QueryInterruptTime() anywhere from 1 to 12 ms (regardless of timer period) on my Windows 10 virtual machine. The actual lag is consistent within a process but varies between runs. I have not been able to account for this lag—it's not the suspend bias, nor is it an attempt to match the tick count more closely. In short, timeGetTime() seems to be idiosyncratic to winmm. Since quartz has been shown to follow winmm exactly on Windows, let's follow it on Wine as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53005 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2a44723d4dbea74892d6eee1c8ba463a1f38d014) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/Makefile.in | 2 +- dlls/quartz/systemclock.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index e7e1b43da79..7854a87e846 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,6 +1,6 @@ MODULE = quartz.dll IMPORTLIB = quartz -IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 +IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index f579ae754ea..20859659402 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -44,7 +44,6 @@ struct system_clock BOOL thread_created, thread_stopped; HANDLE thread; - LARGE_INTEGER frequency; REFERENCE_TIME last_time; CRITICAL_SECTION cs; CONDITION_VARIABLE cv; @@ -52,12 +51,9 @@ struct system_clock struct list sinks; }; -static REFERENCE_TIME get_current_time(const struct system_clock *clock) +static REFERENCE_TIME get_current_time(void) { - LARGE_INTEGER time; - - QueryPerformanceCounter(&time); - return (time.QuadPart * 1000) / clock->frequency.QuadPart * 10000; + return (REFERENCE_TIME)timeGetTime() * 10000; } static inline struct system_clock *impl_from_IUnknown(IUnknown *iface) @@ -154,7 +150,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) EnterCriticalSection(&clock->cs); - current_time = get_current_time(clock); + current_time = get_current_time(); LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry) { @@ -249,7 +245,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ return E_POINTER; } - ret = get_current_time(clock); + ret = get_current_time(); EnterCriticalSection(&clock->cs); @@ -345,7 +341,6 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) list_init(&object->sinks); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); - QueryPerformanceFrequency(&object->frequency); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner;

1 0

Zebediah Figura : wined3d: Correctly handle 3D textures in wined3d_view_{load, invalidate}_location().
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: cdd2d5716eb158ef129d00ea020ba3ce7aaac20f URL: https://gitlab.winehq.org/wine/wine/-/commit/cdd2d5716eb158ef129d00ea020ba3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 23 17:37:43 2022 -0500 wined3d: Correctly handle 3D textures in wined3d_view_{load, invalidate}_location(). The sub-resource index should not be offset by the layer index, which represents a depth offset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53027 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c529506af6c8ad1b8a2d869eb78930469ded85f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/view.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index efa98ea13eb..75f97bb0306 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -317,7 +317,7 @@ static void create_buffer_view(struct wined3d_gl_view *view, struct wined3d_cont static void wined3d_view_invalidate_location(struct wined3d_resource *resource, const struct wined3d_view_desc *desc, DWORD location) { - unsigned int i, sub_resource_idx, layer_count; + unsigned int i, sub_resource_idx; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -327,17 +327,21 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, } texture = texture_from_resource(resource); + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + wined3d_texture_invalidate_location(texture, desc->u.texture.level_idx, location); + return; + } sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } static void wined3d_view_load_location(struct wined3d_resource *resource, const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location) { - unsigned int i, sub_resource_idx, layer_count; + unsigned int i, sub_resource_idx; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -347,9 +351,14 @@ static void wined3d_view_load_location(struct wined3d_resource *resource, } texture = texture_from_resource(resource); + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + wined3d_texture_load_location(texture, desc->u.texture.level_idx, context, location); + return; + } + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_load_location(texture, sub_resource_idx, context, location); }

1 0

Akihiro Sagawa : midimap: Handle MIDI running status.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: bdddc8ac70e8e48f12def2dd8d66fb229d1ab37b URL: https://gitlab.winehq.org/wine/wine/-/commit/bdddc8ac70e8e48f12def2dd8d66fb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 26 23:38:43 2022 +0900 midimap: Handle MIDI running status. Wine's midiOutShortMsg() can't handle the MIDI message if the status byte is omitted. Omitting status byte is valid and called "running status". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53003 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4c535a7f7546f2dfe504c47dfc416d3cdd0a5ab0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/midimap/midimap.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 53eeadee915..a78da7aea42 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -101,6 +101,7 @@ typedef struct tagMIDIMAPDATA struct tagMIDIMAPDATA* self; MIDIOUTPORT* ChannelMap[16]; MIDIOPENDESC midiDesc; + BYTE runningStatus; WORD wCbFlags; } MIDIMAPDATA; @@ -301,6 +302,7 @@ static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) mom->self = mom; mom->wCbFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); mom->midiDesc = *lpDesc; + mom->runningStatus = 0; for (chn = 0; chn < 16; chn++) { @@ -380,6 +382,7 @@ static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwPara if (ret != MMSYSERR_NOERROR) break; } } + mom->runningStatus = 0; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; MIDIMAP_NotifyClient(mom, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); @@ -388,16 +391,31 @@ static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwPara static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) { - BYTE lb = LOBYTE(LOWORD(dwParam)); - WORD chn = lb & 0x0F; + BYTE status = LOBYTE(LOWORD(dwParam)); + WORD chn; DWORD ret = MMSYSERR_NOERROR; if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; + if (status < 0x80) + { + if (mom->runningStatus) + { + status = mom->runningStatus; + dwParam = ((LOWORD(dwParam) << 8) | status); + } + else + { + FIXME("ooch %Ix\n", dwParam); + return MMSYSERR_NOERROR; + } + } + chn = status & 0x0F; + if (!mom->ChannelMap[chn]) return MMSYSERR_NOERROR; - switch (lb & 0xF0) + switch (status & 0xF0) { case 0x80: case 0x90: @@ -423,6 +441,7 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) } ret = midiOutShortMsg(mom->ChannelMap[chn]->hMidi, dwParam); } + mom->runningStatus = status; break; case 0xF0: for (chn = 0; chn < 16; chn++) @@ -430,6 +449,9 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) if (mom->ChannelMap[chn]->loaded > 0) ret = midiOutShortMsg(mom->ChannelMap[chn]->hMidi, dwParam); } + /* system common message */ + if (status <= 0xF7) + mom->runningStatus = 0; break; default: FIXME("ooch %lx\n", dwParam); @@ -511,6 +533,8 @@ static DWORD modReset(MIDIMAPDATA* mom) if (ret != MMSYSERR_NOERROR) break; } } + mom->runningStatus = 0; + return ret; }

1 0