wine-commits

wine-commits@winehq.org

1 participants
185910 discussions

Fabian Maurer : win32u: Only set scroll timer if it's not running.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 171e0adde5f9fc675b9f7d3ec10dae20cb4b0156 URL: https://gitlab.winehq.org/wine/wine/-/commit/171e0adde5f9fc675b9f7d3ec10dae… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 15 21:32:12 2024 +0200 win32u: Only set scroll timer if it's not running. This fixes a regression from bb496ea8 where we got a WM_MOUSEMOVE and this leads to skipping the initial scroll delay. Also closer mimics windows behavior, moving the mouse should not reset the scrolling timer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56582 --- dlls/win32u/scroll.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index 5ea35f1d908..f34fe80c7e6 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -62,6 +62,9 @@ static struct SCROLL_TRACKING_INFO g_tracking_info; /* Is the moving thumb being displayed? */ static BOOL scroll_moving_thumb = FALSE; +/* is there currently a running timer for scrolling delay ?*/ +static BOOL scroll_timer_running = FALSE; + /* data for window that has (one or two) scroll bars */ struct win_scroll_bar_info { @@ -516,15 +519,19 @@ void update_scroll_timer(HWND hwnd, HWND owner_hwnd, HWND ctl_hwnd, enum SCROLL_ { if (hittest == g_tracking_info.hit_test) { - if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) + if (!scroll_timer_running || msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) { send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, msg_send, (LPARAM)ctl_hwnd ); + scroll_timer_running = TRUE; + NtUserSetSystemTimer( hwnd, SCROLL_TIMER, + msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); } - - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + else + { + scroll_timer_running = FALSE; + NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + } } /*********************************************************************** @@ -789,6 +796,7 @@ void handle_scroll_event( HWND hwnd, int bar, UINT msg, POINT pt ) /* Terminate tracking */ g_tracking_info.win = 0; scroll_moving_thumb = FALSE; + scroll_timer_running = FALSE; hittest = SCROLL_NOWHERE; draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, TRUE, TRUE ); }

1 0

Fabian Maurer : win32u: Factor out scroll timer handling.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: ea078cf4790afc18e2006a7f71ec55d47f318b4a URL: https://gitlab.winehq.org/wine/wine/-/commit/ea078cf4790afc18e2006a7f71ec55… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon May 13 18:17:35 2024 +0200 win32u: Factor out scroll timer handling. --- dlls/win32u/scroll.c | 65 +++++++++++++++------------------------------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index f72ef0c2929..5ea35f1d908 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -512,6 +512,21 @@ static POINT clip_scroll_pos( RECT *rect, POINT pt ) return pt; } +void update_scroll_timer(HWND hwnd, HWND owner_hwnd, HWND ctl_hwnd, enum SCROLL_HITTEST hittest, UINT msg, UINT msg_send, BOOL vertical ) +{ + if (hittest == g_tracking_info.hit_test) + { + if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) + { + send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, msg_send, (LPARAM)ctl_hwnd ); + } + + NtUserSetSystemTimer( hwnd, SCROLL_TIMER, + msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); + } + else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); +} + /*********************************************************************** * handle_scroll_event * @@ -681,33 +696,12 @@ void handle_scroll_event( HWND hwnd, int bar, UINT msg, POINT pt ) case SCROLL_TOP_ARROW: draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, TRUE, FALSE ); - if (hittest == g_tracking_info.hit_test) - { - if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) - { - send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, - SB_LINEUP, (LPARAM)ctl_hwnd ); - } - - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); - } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + update_scroll_timer( hwnd, owner_hwnd, ctl_hwnd, hittest, msg, SB_LINEUP, vertical ); break; case SCROLL_TOP_RECT: draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, FALSE, TRUE ); - if (hittest == g_tracking_info.hit_test) - { - if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) - { - send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, - SB_PAGEUP, (LPARAM)ctl_hwnd ); - } - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); - } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + update_scroll_timer( hwnd, owner_hwnd, ctl_hwnd, hittest, msg, SB_PAGEUP, vertical ); break; case SCROLL_THUMB: @@ -755,33 +749,12 @@ void handle_scroll_event( HWND hwnd, int bar, UINT msg, POINT pt ) case SCROLL_BOTTOM_RECT: draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, FALSE, TRUE ); - if (hittest == g_tracking_info.hit_test) - { - if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) - { - send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, - SB_PAGEDOWN, (LPARAM)ctl_hwnd ); - } - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); - } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + update_scroll_timer( hwnd, owner_hwnd, ctl_hwnd, hittest, msg, SB_PAGEDOWN, vertical ); break; case SCROLL_BOTTOM_ARROW: draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, TRUE, FALSE ); - if (hittest == g_tracking_info.hit_test) - { - if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) - { - send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, - SB_LINEDOWN, (LPARAM)ctl_hwnd ); - } - - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); - } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + update_scroll_timer( hwnd, owner_hwnd, ctl_hwnd, hittest, msg, SB_LINEDOWN, vertical ); break; }

1 0

Huw Davies : maintainers: Remove Andrew Eikum.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 7a4a9983abe3452ba94d13379c255fdb49ea6229 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a4a9983abe3452ba94d13379c255f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 17 16:57:00 2024 +0100 maintainers: Remove Andrew Eikum. As discussed with Andrew privately. --- MAINTAINERS | 6 ------ 1 file changed, 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 22979d93ea1..d6631b1d69c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -37,7 +37,6 @@ F: dlls/ntdll/signal_arm* F: programs/winedbg/be_arm* Audio I/O -P: Andrew Eikum <coldpie(a)fastmail.com> P: Huw Davies <huw(a)codeweavers.com> F: dlls/dsound/ F: dlls/mmdevapi/ @@ -206,11 +205,6 @@ F: dlls/winexinput.sys/ F: dlls/winmm/joystick.c F: dlls/xinput*/ -Media format conversion -P: Andrew Eikum <coldpie(a)fastmail.com> -F: dlls/*.acm/ -F: dlls/msacm32/ - Media Foundation GStreamer backend M: Rémi Bernon <rbernon(a)codeweavers.com> P: Nikolay Sivov <nsivov(a)codeweavers.com>

1 0

Huw Davies : mmdevapi: Remove unused ACImpl typedef.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: f612029d4e6a7198c88ad4f3ef94677db85c93d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f612029d4e6a7198c88ad4f3ef9467… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 17 08:32:09 2024 +0100 mmdevapi: Remove unused ACImpl typedef. --- dlls/mmdevapi/mmdevdrv.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h index df21859cbad..1f4d65e4436 100644 --- a/dlls/mmdevapi/mmdevdrv.h +++ b/dlls/mmdevapi/mmdevdrv.h @@ -19,8 +19,6 @@ #include <wine/list.h> -typedef struct audio_client ACImpl; - typedef struct audio_session { GUID guid; struct list clients;

1 0

Eric Pouech : winedump: Correctly unmangle qualified pointer to function/method.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: d45cbca3780a0f69d16f22fd9811b10fdebddf39 URL: https://gitlab.winehq.org/wine/wine/-/commit/d45cbca3780a0f69d16f22fd9811b1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 17 11:27:51 2024 +0200 winedump: Correctly unmangle qualified pointer to function/method. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/msmangle.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 2ac96a3fe5a..17954740cff 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -887,14 +887,22 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'B': /* volatile reference */ if (!get_qualified_type(ct, sym, dt, flags)) goto done; break; + case 'P': /* Pointer */ case 'Q': /* const pointer */ case 'R': /* volatile pointer */ case 'S': /* const volatile pointer */ - if (!get_qualified_type(ct, sym, (flags & IN_ARGS) ? dt : 'P', flags)) goto done; - break; - case 'P': /* Pointer */ + if (!(flags & IN_ARGS)) dt = 'P'; if (isdigit(*sym->current)) - { + { + const char *ptr_qualif; + switch (dt) + { + default: + case 'P': ptr_qualif = NULL; break; + case 'Q': ptr_qualif = "const"; break; + case 'R': ptr_qualif = "volatile"; break; + case 'S': ptr_qualif = "const volatile"; break; + } /* FIXME: * P6 = Function pointer * P8 = Member function pointer @@ -912,10 +920,10 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_function_qualifier(sym, &function_qualifier)) goto done; if (!get_function_signature(sym, &fs)) - goto done; + goto done; - ct->left = str_printf(sym, "%s%s (%s %s::*", - fs.return_ct.left, fs.return_ct.right, fs.call_conv, class); + ct->left = str_printf(sym, "%s%s (%s %s::*%s", + fs.return_ct.left, fs.return_ct.right, fs.call_conv, class, ptr_qualif); ct->right = str_printf(sym, ")%s%s", fs.arguments, function_qualifier); } else if (*sym->current == '6') @@ -927,14 +935,14 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_function_signature(sym, &fs)) goto done; - ct->left = str_printf(sym, "%s%s (%s*", - fs.return_ct.left, fs.return_ct.right, fs.call_conv); + ct->left = str_printf(sym, "%s%s (%s*%s", + fs.return_ct.left, fs.return_ct.right, fs.call_conv, ptr_qualif); ct->flags = DT_NO_LEADING_WS; ct->right = str_printf(sym, ")%s", fs.arguments); } else goto done; } - else if (!get_qualified_type(ct, sym, 'P', flags)) goto done; + else if (!get_qualified_type(ct, sym, dt, flags)) goto done; break; case 'W': if (*sym->current == '4')

1 0

Eric Pouech : msvcrt: Correctly unmangle qualified pointer to function/method.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: ecfe99af150e636d50cf47316a320996601f84b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecfe99af150e636d50cf47316a3209… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 17 09:30:44 2024 +0200 msvcrt: Correctly unmangle qualified pointer to function/method. Signesd-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/cpp.c | 4 ++-- dlls/msvcrt/undname.c | 28 ++++++++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index bed1a5d4530..29bb126bcda 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1177,7 +1177,7 @@ static void test_demangle(void) /* 23 */ {"??0streambuf@@QAE@ABV0@@Z", "public: __thiscall streambuf::streambuf(class streambuf const &)"}, /* 24 */ {"??0strstreambuf@@QAE@ABV0@@Z", "public: __thiscall strstreambuf::strstreambuf(class strstreambuf const &)"}, /* 25 */ {"??0strstreambuf@@QAE@H@Z", "public: __thiscall strstreambuf::strstreambuf(int)"}, -/* 26 */ {"??0strstreambuf@@QAE@P6APAXJ@ZP6AXPAX@Z@Z", "public: __thiscall strstreambuf::strstreambuf(void * (__cdecl*)(long),void (__cdecl*)(void *))"}, +/* 26 */ {"??0strstreambuf@@QAE@Q6APAXJ@ZS6AXPAX@Z@Z", "public: __thiscall strstreambuf::strstreambuf(void * (__cdecl*const)(long),void (__cdecl*const volatile)(void *))"}, /* 27 */ {"??0strstreambuf@@QAE@PADH0@Z", "public: __thiscall strstreambuf::strstreambuf(char *,int,char *)"}, /* 28 */ {"??0strstreambuf@@QAE@PAEH0@Z", "public: __thiscall strstreambuf::strstreambuf(unsigned char *,int,unsigned char *)"}, /* 29 */ {"??0strstreambuf@@QAE@XZ", "public: __thiscall strstreambuf::strstreambuf(void)"}, @@ -1212,7 +1212,7 @@ static void test_demangle(void) /* 58 */ {"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAJ@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,long &)const "}, /* 59 */ {"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAK@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,unsigned long &)const "}, /* 60 */ {"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAM@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,float &)const "}, -/* 61 */ {"?_query_new_handler@@YAP6AHI@ZXZ", "int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)"}, +/* 61 */ {"?_query_new_handler@@YAR6AHI@ZXZ", "int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)"}, /* 62 */ {"?register_callback@ios_base@std@@QAEXP6AXW4event@12@AAV12@H@ZH@Z", "public: void __thiscall std::ios_base::register_callback(void (__cdecl*)(enum std::ios_base::event,class std::ios_base &,int),int)"}, /* 63 */ {"?seekg@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@JW4seekdir@ios_base@2@@Z", "public: class std::basic_istream<char,struct std::char_traits<char> > & __thiscall std::basic_istream<char,struct std::char_traits<char> >::seekg(long,enum std::ios_base::seekdir)"}, /* 64 */ {"?seekg@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@V?$fpos@H@2@@Z", "public: class std::basic_istream<char,struct std::char_traits<char> > & __thiscall std::basic_istream<char,struct std::char_traits<char> >::seekg(class std::fpos<int>)"}, diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 74856504685..923ec67d363 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -997,14 +997,22 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'B': /* volatile reference */ if (!get_qualified_type(ct, sym, dt, flags)) goto done; break; + case 'P': /* Pointer */ case 'Q': /* const pointer */ case 'R': /* volatile pointer */ case 'S': /* const volatile pointer */ - if (!get_qualified_type(ct, sym, (flags & IN_ARGS) ? dt : 'P', flags)) goto done; - break; - case 'P': /* Pointer */ + if (!(flags & IN_ARGS)) dt = 'P'; if (isdigit(*sym->current)) - { + { + const char *ptr_qualif; + switch (dt) + { + default: + case 'P': ptr_qualif = NULL; break; + case 'Q': ptr_qualif = "const"; break; + case 'R': ptr_qualif = "volatile"; break; + case 'S': ptr_qualif = "const volatile"; break; + } /* FIXME: * P6 = Function pointer * P8 = Member function pointer @@ -1022,10 +1030,10 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_function_qualifier(sym, &function_qualifier)) goto done; if (!get_function_signature(sym, &fs)) - goto done; + goto done; - ct->left = str_printf(sym, "%s%s (%s %s::*", - fs.return_ct.left, fs.return_ct.right, fs.call_conv, class); + ct->left = str_printf(sym, "%s%s (%s %s::*%s", + fs.return_ct.left, fs.return_ct.right, fs.call_conv, class, ptr_qualif); ct->right = str_printf(sym, ")%s%s", fs.arguments, function_qualifier); } else if (*sym->current == '6') @@ -1037,14 +1045,14 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_function_signature(sym, &fs)) goto done; - ct->left = str_printf(sym, "%s%s (%s*", - fs.return_ct.left, fs.return_ct.right, fs.call_conv); + ct->left = str_printf(sym, "%s%s (%s*%s", + fs.return_ct.left, fs.return_ct.right, fs.call_conv, ptr_qualif); ct->flags = DT_NO_LEADING_WS; ct->right = str_printf(sym, ")%s", fs.arguments); } else goto done; } - else if (!get_qualified_type(ct, sym, 'P', flags)) goto done; + else if (!get_qualified_type(ct, sym, dt, flags)) goto done; break; case 'W': if (*sym->current == '4')

1 0

Eric Pouech : winedump: Don't consider end of list encoding as real data types.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: d42b1d56b54b298a9eac4c050cbdafac21909e80 URL: https://gitlab.winehq.org/wine/wine/-/commit/d42b1d56b54b298a9eac4c050cbdaf… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 17 11:22:38 2024 +0200 winedump: Don't consider end of list encoding as real data types. This allows while unmangling: - to avoid considering them as "real" datatypes in other contexts - to handle better void (which is only supported as single argument in function args list, while is a fully acceptable datatype in template args list) Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/msmangle.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 94e91706585..2ac96a3fe5a 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -260,6 +260,12 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term, unsigned int i; const char *p; + if (z_term && sym->current[0] == 'X' && sym->current[1] == 'Z') + { + sym->current += 2; + return str_printf(sym, "%cvoid%c", open_char, close_char); + } + str_array_init(&arg_collect); /* Now come the function arguments */ @@ -273,6 +279,13 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term, sym->current++; break; } + if (z_term && sym->current[0] == 'Z') + { + sym->current++; + if (!str_array_push(sym, "...", -1, &arg_collect)) + return NULL; + break; + } /* Handle empty list in variadic template */ if (!z_term && sym->current[0] == '$' && sym->current[1] == '$' && sym->current[2] == 'V') { @@ -281,12 +294,9 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term, } if (!demangle_datatype(sym, &ct, IN_ARGS)) return NULL; - /* 'void' terminates an argument list in a function */ - if (z_term && !strcmp(ct.left, "void")) break; if (!str_array_push(sym, str_printf(sym, "%s%s", ct.left, ct.right), -1, &arg_collect)) return NULL; - if (!strcmp(ct.left, "...")) break; if (z_term && sym->current - p > 1 && sym->args.num < 20) { if (!str_array_push(sym, ct.left ? ct.left : "", -1, &sym->args) || @@ -299,9 +309,7 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term, */ if (z_term && *sym->current++ != 'Z') return NULL; - if (arg_collect.num == 0 || - (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) - return str_printf(sym, "%cvoid%c", open_char, close_char); + if (!arg_collect.num) return str_printf(sym, "%c%c", open_char, close_char); for (i = 1; i < arg_collect.num; i++) { args_str = str_printf(sym, "%s,%s", args_str, arg_collect.elts[i]); @@ -749,7 +757,7 @@ static const char* get_simple_type(char c) case 'N': type_string = "double"; break; case 'O': type_string = "long double"; break; case 'X': type_string = "void"; break; - case 'Z': type_string = "..."; break; +/* case 'Z': (...) variadic function arguments. Handled in get_args() */ default: type_string = NULL; break; } return type_string; @@ -800,7 +808,7 @@ static BOOL get_function_signature(struct parsed_symbol* sym, struct function_si if (!get_calling_convention(*sym->current++, &fs->call_conv, &fs->exported, sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE) || - !demangle_datatype(sym, &fs->return_ct, FALSE)) + !demangle_datatype(sym, &fs->return_ct, 0)) return FALSE; if (!(fs->arguments = get_args(sym, TRUE, '(', ')')))

1 0

Eric Pouech : msvcrt: Don't consider end of list encoding as real data types.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: f24a96cc5d0c47edf7ca2c43c9fb82158fa4ac41 URL: https://gitlab.winehq.org/wine/wine/-/commit/f24a96cc5d0c47edf7ca2c43c9fb82… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed May 15 10:44:02 2024 +0200 msvcrt: Don't consider end of list encoding as real data types. This allows while unmangling: - to avoid considering them as "real" datatypes in other contexts - to handle better void (which is only supported as single argument in function args list, while is a fully acceptable datatype in template args list) Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/cpp.c | 6 ++++-- dlls/msvcrt/undname.c | 24 ++++++++++++++++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 028af05b2e0..bed1a5d4530 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1330,11 +1330,13 @@ static void test_demangle(void) "__ptr64 __cdecl std::forward<struct `private: static int __cdecl FFIFunctionBinder::call(struct lua_State " "* __ptr64)'::`2'::FFIValue & __ptr64>(struct `private: static int __cdecl FFIFunctionBinder::call(struct " "xlua_State * __ptr64)'::`2'::FFIValue & __ptr64)"}, +/* 153 */ {"?$AAA@XX", "AAA<void,void>"}, +/* 154 */ {"?$AAA@", "AAA<>"}, }; - int i, num_test = ARRAY_SIZE(test); + int i; char* name; - for (i = 0; i < num_test; i++) + for (i = 0; i < ARRAY_SIZE(test); i++) { name = p__unDName(0, test[i].in, 0, malloc, free, test[i].flags); ok(name != NULL, "%u: unDName failed\n", i); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 55661f21e2b..74856504685 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -365,6 +365,12 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term, unsigned int i; const char *p; + if (z_term && sym->current[0] == 'X' && sym->current[1] == 'Z') + { + sym->current += 2; + return str_printf(sym, "%cvoid%c", open_char, close_char); + } + str_array_init(&arg_collect); /* Now come the function arguments */ @@ -378,6 +384,13 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term, sym->current++; break; } + if (z_term && sym->current[0] == 'Z') + { + sym->current++; + if (!str_array_push(sym, "...", -1, &arg_collect)) + return NULL; + break; + } /* Handle empty list in variadic template */ if (!z_term && sym->current[0] == '$' && sym->current[1] == '$' && sym->current[2] == 'V') { @@ -386,12 +399,9 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term, } if (!demangle_datatype(sym, &ct, IN_ARGS)) return NULL; - /* 'void' terminates an argument list in a function */ - if (z_term && !strcmp(ct.left, "void")) break; if (!str_array_push(sym, str_printf(sym, "%s%s", ct.left, ct.right), -1, &arg_collect)) return NULL; - if (!strcmp(ct.left, "...")) break; if (z_term && sym->current - p > 1 && sym->args.num < 20) { if (!str_array_push(sym, ct.left ? ct.left : "", -1, &sym->args) || @@ -404,9 +414,7 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term, */ if (z_term && *sym->current++ != 'Z') return NULL; - if (arg_collect.num == 0 || - (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) - return str_printf(sym, "%cvoid%c", open_char, close_char); + if (!arg_collect.num) return str_printf(sym, "%c%c", open_char, close_char); for (i = 1; i < arg_collect.num; i++) { args_str = str_printf(sym, "%s,%s", args_str, arg_collect.elts[i]); @@ -859,7 +867,7 @@ static const char* get_simple_type(char c) case 'N': type_string = "double"; break; case 'O': type_string = "long double"; break; case 'X': type_string = "void"; break; - case 'Z': type_string = "..."; break; +/* case 'Z': (...) variadic function arguments. Handled in get_args() */ default: type_string = NULL; break; } return type_string; @@ -910,7 +918,7 @@ static BOOL get_function_signature(struct parsed_symbol* sym, struct function_si if (!get_calling_convention(*sym->current++, &fs->call_conv, &fs->exported, sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE) || - !demangle_datatype(sym, &fs->return_ct, FALSE)) + !demangle_datatype(sym, &fs->return_ct, 0)) return FALSE; if (!(fs->arguments = get_args(sym, TRUE, '(', ')')))

1 0

Esme Povirk : gdiplus: Bracket HDC use in GDI32_GdipFillRegion.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: ef371697e028335d59861c16e86f33a7d17a58ec URL: https://gitlab.winehq.org/wine/wine/-/commit/ef371697e028335d59861c16e86f33… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 19:45:52 2024 +0000 gdiplus: Bracket HDC use in GDI32_GdipFillRegion. --- dlls/gdiplus/graphics.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1cf5da6f1f8..4c12cc18f11 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4734,47 +4734,47 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, { INT save_state; GpStatus status; + HDC hdc; HRGN hrgn; RECT rc; - if(!graphics->hdc || !brush_can_fill_path(brush, TRUE)) + if(!brush_can_fill_path(brush, TRUE)) return NotImplemented; - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); + status = gdi_dc_acquire(graphics, &hdc); + if (status != Ok) + return status; + + save_state = SaveDC(hdc); + EndPath(hdc); hrgn = NULL; status = get_clip_hrgn(graphics, &hrgn); if (status != Ok) - { - RestoreDC(graphics->hdc, save_state); - return status; - } + goto end; - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); + ExtSelectClipRgn(hdc, hrgn, RGN_COPY); DeleteObject(hrgn); status = GdipGetRegionHRgn(region, graphics, &hrgn); if (status != Ok) - { - RestoreDC(graphics->hdc, save_state); - return status; - } + goto end; - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + ExtSelectClipRgn(hdc, hrgn, RGN_AND); DeleteObject(hrgn); - if (GetClipBox(graphics->hdc, &rc) != NULLREGION) + if (GetClipBox(hdc, &rc) != NULLREGION) { - BeginPath(graphics->hdc); - Rectangle(graphics->hdc, rc.left, rc.top, rc.right, rc.bottom); - EndPath(graphics->hdc); + BeginPath(hdc); + Rectangle(hdc, rc.left, rc.top, rc.right, rc.bottom); + EndPath(hdc); status = brush_fill_path(graphics, brush); } - RestoreDC(graphics->hdc, save_state); - +end: + RestoreDC(hdc, save_state); + gdi_dc_release(graphics, hdc); return status; }

1 0

Esme Povirk : gdiplus: Bracket HDC use in GDI32_GdipFillPath.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 1c360a01c9cd92563d03ab1c3d4cd262ea810461 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c360a01c9cd92563d03ab1c3d4cd2… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 19:35:52 2024 +0000 gdiplus: Bracket HDC use in GDI32_GdipFillPath. --- dlls/gdiplus/graphics.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f04d4941310..1cf5da6f1f8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4433,42 +4433,47 @@ GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics *graphics, GpBrush *brush, INT x static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) { + HDC hdc; INT save_state; GpStatus retval; HRGN hrgn=NULL; - if(!graphics->hdc || !brush_can_fill_path(brush, TRUE)) + if(!brush_can_fill_path(brush, TRUE)) return NotImplemented; - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE - : WINDING)); + retval = gdi_dc_acquire(graphics, &hdc); + if (retval != Ok) + return retval; + + save_state = SaveDC(hdc); + EndPath(hdc); + SetPolyFillMode(hdc, (path->fill == FillModeAlternate ? ALTERNATE : WINDING)); retval = get_clip_hrgn(graphics, &hrgn); if (retval != Ok) goto end; - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); + ExtSelectClipRgn(hdc, hrgn, RGN_COPY); gdi_transform_acquire(graphics); - BeginPath(graphics->hdc); + BeginPath(hdc); retval = draw_poly(graphics, NULL, path->pathdata.Points, path->pathdata.Types, path->pathdata.Count, FALSE); if(retval == Ok) { - EndPath(graphics->hdc); + EndPath(hdc); retval = brush_fill_path(graphics, brush); } gdi_transform_release(graphics); end: - RestoreDC(graphics->hdc, save_state); + RestoreDC(hdc, save_state); DeleteObject(hrgn); + gdi_dc_release(graphics, hdc); return retval; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits