August 2023 - Wine-commits - list.winehq.org

Francois Gouget : testbot/LogUtils: Canonicalize the log file errors and warnings.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: tools Branch: master Commit: c8859ce387066703899aea6f0cd305bc4b750c48 URL: https://gitlab.winehq.org/winehq/tools/-/commit/c8859ce387066703899aea6f0cd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 22 02:14:13 2023 +0200 testbot/LogUtils: Canonicalize the log file errors and warnings. The leading process id must be removed when checking for new errors and warnings. --- testbot/lib/WineTestBot/LogUtils.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ae06baf2..f660274e 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1319,7 +1319,10 @@ sub _GetLineKey($) or $Line =~ s/^([_a-z0-9]+\.c:)\d+:[0-9.]*( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-f]{4}/$1$2/ # The exact amount of data printed does not change the error - or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; + or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/ + + # Remove the process id from log warnings and errors + or $Line =~ s/^[0-9a-f]{4}:(err|fixme):/$1:/; # Note: The 'done (258)' lines are modified by ParseWineTestReport() and # no longer contain the pid. So they need no further change here.

1 0

Francois Gouget : testbot/UpdateTaskLogs: Trace the current job in debug mode.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: tools Branch: master Commit: 8d8b8ad4a01fefcad4345fc19d3864519c04f14c URL: https://gitlab.winehq.org/winehq/tools/-/commit/8d8b8ad4a01fefcad4345fc19d3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 22 02:24:06 2023 +0200 testbot/UpdateTaskLogs: Trace the current job in debug mode. --- testbot/bin/UpdateTaskLogs | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 8a74fd7b..b2357250 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -563,6 +563,7 @@ my $Jobs = CreateJobs(); foreach my $Task (sort { ($a->Ended || 0) <=> ($b->Ended || 0) } @AllTasks) { my ($JobId, $StepNo, $TaskNo) = @{$Task->GetMasterKey()}; + Debug("*** $JobId/$StepNo/$TaskNo\n"); my $Steps = $Jobs->GetItem($JobId)->Steps; my $Step = $Steps->GetItem($StepNo); my $IsWineTest = $Step->FileType eq "patch" ||

1 0

Francois Gouget : testbot/web: Tweak the color of warning counts.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: tools Branch: master Commit: 18a831b4b6d4c34aad23a5a72a23f7cdbbfa9ae1 URL: https://gitlab.winehq.org/winehq/tools/-/commit/18a831b4b6d4c34aad23a5a72a2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 20 14:53:54 2023 +0200 testbot/web: Tweak the color of warning counts. This minimizes the risk of confusion with the failures column. --- testbot/web/JobDetails.pl | 2 +- testbot/web/WineTestBot.css | 1 + testbot/web/index.pl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c2b7cf5c..008595f3 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -161,7 +161,7 @@ sub GenerateDataView($$$) my $class = $StepTask->NewWarnings ? "testfail" : "success"; print "", $StepTask->NewWarnings, " / "; } - my $class = $StepTask->Warnings ? "testfail" : "success"; + my $class = $StepTask->Warnings ? "testwarn" : "success"; print "", $StepTask->Warnings, "</a>"; return; } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index cff299a7..0250f68d 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -387,6 +387,7 @@ pre .badpatch { color: red; } .badbuild { color: red; } .testfail { color: red; } +.testwarn { color: #ff9300; } .boterror { color: #e55600; } .canceled { color: black; } diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 087b80fa..a2bd5246 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -130,7 +130,7 @@ sub GenerateDataView($$$) my $class = $JobInfo->{NewWarnings} ? "testfail" : "success"; print "$JobInfo->{NewWarnings} / "; } - my $class = $JobInfo->{Warnings} ? "testfail" : "success"; + my $class = $JobInfo->{Warnings} ? "testwarn" : "success"; print "$JobInfo->{Warnings}</a>"; } }

1 0

Francois Gouget : testbot/web: Don't put a link on the known failure messages.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: tools Branch: master Commit: 4798152ccf2b25ea77bc9bcb9dc218fadfec8b6e URL: https://gitlab.winehq.org/winehq/tools/-/commit/4798152ccf2b25ea77bc9bcb9dc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 20 14:56:03 2023 +0200 testbot/web: Don't put a link on the known failure messages. The link gets in the way of copy/pasting the failure message and having it on the bug id is sufficient. --- testbot/web/JobDetails.pl | 3 --- 1 file changed, 3 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 008595f3..72d4cd3f 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -538,7 +538,6 @@ sub GenerateFullLog($$$$$) if ($ErrFailures{$LineNo}) { print "[", $self->GetFailureLinks($ErrFailures{$LineNo}), "] "; - $Html = $self->GetFailureLink($ErrFailures{$LineNo}->[0], $Html); } print "$Html\n"; } @@ -575,7 +574,6 @@ sub GenerateFullLog($$$$$) if ($Group->{Failures}->{$MsgIndex}) { print "[", $self->GetFailureLinks($Group->{Failures}->{$MsgIndex}), "] "; - $Html = $self->GetFailureLink($Group->{Failures}->{$MsgIndex}->[0], $Html); } print "$Html\n"; } @@ -752,7 +750,6 @@ EOF if ($FailureIds) { print "[", $self->GetFailureLinks($FailureIds), "] "; - $Html = $self->GetFailureLink($FailureIds->[0], $Html); } print "$Html\n"; $MsgIndex++;

1 0

Francois Gouget : winetest/build-patterns: Show a count of failure modes and test-related bugs.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: tools Branch: master Commit: 8ef2ef2a23be218b6f9ddd18bb201e5c4012c71a URL: https://gitlab.winehq.org/winehq/tools/-/commit/8ef2ef2a23be218b6f9ddd18bb2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 1 12:36:41 2023 +0200 winetest/build-patterns: Show a count of failure modes and test-related bugs. --- winetest/build-patterns | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index d541d5a2..78425ecd 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1502,6 +1502,18 @@ EOF $tests{0}->{desc} .= "</ul>"; if (!$nolist) { + my (%failure_bugs, %all_bugs); + foreach my $test (values %tests) + { + foreach my $bug (@{$test->{bugs}}) + { + $all_bugs{$bug->{id}} = 1; + next if ($bug->{desc} =~ /(?:invalid (?:read|write)|leak|uninitialized|use after free|valgrind)/); + $failure_bugs{$bug->{id}} = 1; + } + } + $tests{0}->{desc} .= "For a total of <a title='This does not count bugs for failures in the \"old\" list and potential memory issues (Valgrind)'>roughly ". scalar(%failure_bugs) ." failure modes</a> (out of ". scalar(%all_bugs) ." test related bugs).\n"; + my @table = ("<details><summary>Page customization</summary> <div class='detailsbox'>This section lets you select the reports to show on this page. <label><input id='reruns' type='checkbox' checked> Hide WineTest reruns</label> ");

1 0

Francois Gouget : testbot/cgi: Align the textarea width with the text field size.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: tools Branch: master Commit: 61478328774b2cb053fd168d2c117159f314d029 URL: https://gitlab.winehq.org/winehq/tools/-/commit/61478328774b2cb053fd168d2c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 4 12:21:50 2023 +0200 testbot/cgi: Align the textarea width with the text field size. The TestBot uses a 50 character width for the regular text fields so use the same width for textarea fields. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index d6ded1b0..d35304ac 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -409,7 +409,7 @@ sub GenerateValueInput($$$$) else { my $Size=$PropertyDescriptor->GetMaxLength(); - $Size=45 if ($Size > 45); + $Size = 50 if ($Size > 50); print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'";

1 0

Alexandre Julliard : packaging: Remove Ubuntu 22.10.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: tools Branch: master Commit: 4a5f8e141613f1d4b610a38fb06ccef4abcc756e URL: https://gitlab.winehq.org/winehq/tools/-/commit/4a5f8e141613f1d4b610a38fb06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 8 13:49:32 2023 +0200 packaging: Remove Ubuntu 22.10. --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 078fdf87..df366d4d 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -34,10 +34,6 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 0cc35ac8..0d0d7539 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -198,7 +198,7 @@ publish_files () cd $basedir -distros="37 38 bullseye bookworm trixie focal jammy kinetic lunar" +distros="37 38 bullseye bookworm trixie focal jammy lunar" dry_run= build=1 @@ -257,7 +257,6 @@ do trixie) add_deb debian $i Debian_Testing_standard testing ;; focal) add_deb ubuntu $i xUbuntu_20.04 ;; jammy) add_deb ubuntu $i xUbuntu_22.04 ;; - kinetic) add_deb ubuntu $i xUbuntu_22.10 ;; lunar) add_deb ubuntu $i xUbuntu_23.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 50de3c51..d3eb46c9 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -18,7 +18,6 @@ + /ubuntu/dists + /ubuntu/dists/focal + /ubuntu/dists/jammy -+ /ubuntu/dists/kinetic + /ubuntu/dists/lunar - /ubuntu/dists/* - /ubuntu/*

1 0

Esme Povirk : user32/tests: Mark an occasional Windows behavior as broken.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: wine Branch: master Commit: 7dadc7d4c98207fb1daed65e9f142671794cddda URL: https://gitlab.winehq.org/wine/wine/-/commit/7dadc7d4c98207fb1daed65e9f1426… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Aug 30 11:59:05 2023 -0500 user32/tests: Mark an occasional Windows behavior as broken. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54655 --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c8ea036d8e6..b4a5410622c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19488,7 +19488,8 @@ static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, ret = ReplyMessage( msg ); ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); flags = InSendMessageEx( NULL ); - ok( flags == (ISMEX_SEND | ISMEX_REPLIED), "wrong flags %lx\n", flags ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED) || broken( flags == (ISMEX_NOTIFY | ISMEX_REPLIED) ), + "wrong flags %lx\n", flags ); ok( InSendMessage(), "InSendMessage returned false\n" ); break; case WM_USER + 1:

1 0

Alistair Leslie-Hughes : comctl32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: wine Branch: master Commit: 4c2c896af92c5fccd6313e292dcda548927cddf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c2c896af92c5fccd6313e292dcda5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 11 16:19:23 2023 +1000 comctl32: Remove DECLSPEC_HIDDEN usage. --- dlls/comctl32/comctl32.h | 142 +++++++++++++++++++++++------------------------ dlls/comctl32/toolbar.c | 2 +- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index faff3f30717..51f4337add2 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -35,8 +35,8 @@ #include "winnls.h" #include "commctrl.h" -extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; -extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; +extern HMODULE COMCTL32_hModule; +extern HBRUSH COMCTL32_hPattern55AABrush; /* Property sheet / Wizard */ #define IDD_PROPSHEET 1006 @@ -155,7 +155,7 @@ typedef struct INT visibleItems; } HEADCOMBO, *LPHEADCOMBO; -extern BOOL COMBO_FlipListbox(HEADCOMBO *lphc, BOOL ok, BOOL bRedrawButton) DECLSPEC_HIDDEN; +extern BOOL COMBO_FlipListbox(HEADCOMBO *lphc, BOOL ok, BOOL bRedrawButton); typedef struct { @@ -178,21 +178,21 @@ typedef struct COLORREF clrInfoText; /* COLOR_INFOTEXT */ } COMCTL32_SysColor; -extern COMCTL32_SysColor comctl32_color DECLSPEC_HIDDEN; +extern COMCTL32_SysColor comctl32_color; /* Internal function */ -HWND COMCTL32_CreateToolTip (HWND) DECLSPEC_HIDDEN; -void COMCTL32_DrawStatusText(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style, BOOL draw_background) DECLSPEC_HIDDEN; -VOID COMCTL32_RefreshSysColors(void) DECLSPEC_HIDDEN; -void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark, BOOL bHorizontal) DECLSPEC_HIDDEN; -void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight, COLORREF crBackground) DECLSPEC_HIDDEN; -void COMCTL32_GetFontMetrics(HFONT hFont, TEXTMETRICW *ptm) DECLSPEC_HIDDEN; -BOOL COMCTL32_IsReflectedMessage(UINT uMsg) DECLSPEC_HIDDEN; -INT Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN; -INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN; -BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; -BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN; -BOOL imagelist_has_alpha(HIMAGELIST, UINT) DECLSPEC_HIDDEN; +HWND COMCTL32_CreateToolTip(HWND); +void COMCTL32_DrawStatusText(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style, BOOL draw_background); +VOID COMCTL32_RefreshSysColors(void); +void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark, BOOL bHorizontal); +void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight, COLORREF crBackground); +void COMCTL32_GetFontMetrics(HFONT hFont, TEXTMETRICW *ptm); +BOOL COMCTL32_IsReflectedMessage(UINT uMsg); +INT Str_GetPtrWtoA(LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen); +INT Str_GetPtrAtoW(LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen); +BOOL Str_SetPtrAtoW(LPWSTR *lppDest, LPCSTR lpSrc); +BOOL Str_SetPtrWtoA(LPSTR *lppDest, LPCWSTR lpSrc); +BOOL imagelist_has_alpha(HIMAGELIST, UINT); #define COMCTL32_VERSION_MINOR 81 @@ -226,60 +226,60 @@ INT WINAPI Str_GetPtrW (LPCWSTR, LPWSTR, INT); LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet); BOOL WINAPI MirrorIcon(HICON *phicon1, HICON *phicon2); -HRGN set_control_clipping(HDC hdc, const RECT *rect) DECLSPEC_HIDDEN; - -extern void ANIMATE_Register(void) DECLSPEC_HIDDEN; -extern void ANIMATE_Unregister(void) DECLSPEC_HIDDEN; -extern void BUTTON_Register(void) DECLSPEC_HIDDEN; -extern void COMBO_Register(void) DECLSPEC_HIDDEN; -extern void COMBOEX_Register(void) DECLSPEC_HIDDEN; -extern void COMBOEX_Unregister(void) DECLSPEC_HIDDEN; -extern void COMBOLBOX_Register(void) DECLSPEC_HIDDEN; -extern void DATETIME_Register(void) DECLSPEC_HIDDEN; -extern void DATETIME_Unregister(void) DECLSPEC_HIDDEN; -extern void EDIT_Register(void) DECLSPEC_HIDDEN; -extern void FLATSB_Register(void) DECLSPEC_HIDDEN; -extern void FLATSB_Unregister(void) DECLSPEC_HIDDEN; -extern void HEADER_Register(void) DECLSPEC_HIDDEN; -extern void HEADER_Unregister(void) DECLSPEC_HIDDEN; -extern void HOTKEY_Register(void) DECLSPEC_HIDDEN; -extern void HOTKEY_Unregister(void) DECLSPEC_HIDDEN; -extern void IPADDRESS_Register(void) DECLSPEC_HIDDEN; -extern void IPADDRESS_Unregister(void) DECLSPEC_HIDDEN; -extern void LISTBOX_Register(void) DECLSPEC_HIDDEN; -extern void LISTVIEW_Register(void) DECLSPEC_HIDDEN; -extern void LISTVIEW_Unregister(void) DECLSPEC_HIDDEN; -extern void MONTHCAL_Register(void) DECLSPEC_HIDDEN; -extern void MONTHCAL_Unregister(void) DECLSPEC_HIDDEN; -extern void NATIVEFONT_Register(void) DECLSPEC_HIDDEN; -extern void NATIVEFONT_Unregister(void) DECLSPEC_HIDDEN; -extern void PAGER_Register(void) DECLSPEC_HIDDEN; -extern void PAGER_Unregister(void) DECLSPEC_HIDDEN; -extern void PROGRESS_Register(void) DECLSPEC_HIDDEN; -extern void PROGRESS_Unregister(void) DECLSPEC_HIDDEN; -extern void REBAR_Register(void) DECLSPEC_HIDDEN; -extern void REBAR_Unregister(void) DECLSPEC_HIDDEN; -extern void STATIC_Register(void) DECLSPEC_HIDDEN; -extern void STATUS_Register(void) DECLSPEC_HIDDEN; -extern void STATUS_Unregister(void) DECLSPEC_HIDDEN; -extern void SYSLINK_Register(void) DECLSPEC_HIDDEN; -extern void SYSLINK_Unregister(void) DECLSPEC_HIDDEN; -extern void TAB_Register(void) DECLSPEC_HIDDEN; -extern void TAB_Unregister(void) DECLSPEC_HIDDEN; -extern void TOOLBAR_Register(void) DECLSPEC_HIDDEN; -extern void TOOLBAR_Unregister(void) DECLSPEC_HIDDEN; -extern void TOOLTIPS_Register(void) DECLSPEC_HIDDEN; -extern void TOOLTIPS_Unregister(void) DECLSPEC_HIDDEN; -extern void TRACKBAR_Register(void) DECLSPEC_HIDDEN; -extern void TRACKBAR_Unregister(void) DECLSPEC_HIDDEN; -extern void TREEVIEW_Register(void) DECLSPEC_HIDDEN; -extern void TREEVIEW_Unregister(void) DECLSPEC_HIDDEN; -extern void UPDOWN_Register(void) DECLSPEC_HIDDEN; -extern void UPDOWN_Unregister(void) DECLSPEC_HIDDEN; - - -int MONTHCAL_MonthLength(int month, int year) DECLSPEC_HIDDEN; -int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) DECLSPEC_HIDDEN; -LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second) DECLSPEC_HIDDEN; +HRGN set_control_clipping(HDC hdc, const RECT *rect); + +extern void ANIMATE_Register(void); +extern void ANIMATE_Unregister(void); +extern void BUTTON_Register(void); +extern void COMBO_Register(void); +extern void COMBOEX_Register(void); +extern void COMBOEX_Unregister(void); +extern void COMBOLBOX_Register(void); +extern void DATETIME_Register(void); +extern void DATETIME_Unregister(void); +extern void EDIT_Register(void); +extern void FLATSB_Register(void); +extern void FLATSB_Unregister(void); +extern void HEADER_Register(void); +extern void HEADER_Unregister(void); +extern void HOTKEY_Register(void); +extern void HOTKEY_Unregister(void); +extern void IPADDRESS_Register(void); +extern void IPADDRESS_Unregister(void); +extern void LISTBOX_Register(void); +extern void LISTVIEW_Register(void); +extern void LISTVIEW_Unregister(void); +extern void MONTHCAL_Register(void); +extern void MONTHCAL_Unregister(void); +extern void NATIVEFONT_Register(void); +extern void NATIVEFONT_Unregister(void); +extern void PAGER_Register(void); +extern void PAGER_Unregister(void); +extern void PROGRESS_Register(void); +extern void PROGRESS_Unregister(void); +extern void REBAR_Register(void); +extern void REBAR_Unregister(void); +extern void STATIC_Register(void); +extern void STATUS_Register(void); +extern void STATUS_Unregister(void); +extern void SYSLINK_Register(void); +extern void SYSLINK_Unregister(void); +extern void TAB_Register(void); +extern void TAB_Unregister(void); +extern void TOOLBAR_Register(void); +extern void TOOLBAR_Unregister(void); +extern void TOOLTIPS_Register(void); +extern void TOOLTIPS_Unregister(void); +extern void TRACKBAR_Register(void); +extern void TRACKBAR_Unregister(void); +extern void TREEVIEW_Register(void); +extern void TREEVIEW_Unregister(void); +extern void UPDOWN_Register(void); +extern void UPDOWN_Unregister(void); + + +int MONTHCAL_MonthLength(int month, int year); +int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace); +LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second); #endif /* __WINE_COMCTL32_H */ diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 02538eeb649..690a02db6ee 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2346,7 +2346,7 @@ static LRESULT TOOLBAR_Cust_AvailDragListNotification(const CUSTDLG_INFO *custIn return 0; } -extern UINT uDragListMessage DECLSPEC_HIDDEN; +extern UINT uDragListMessage; /*********************************************************************** * TOOLBAR_CustomizeDialogProc

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce an hlsl_sprintf_alloc() helper.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: vkd3d Branch: master Commit: 63e056512d7a425384a7c22620e9fbec1df987d6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/63e056512d7a425384a7c22620e9f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 7 16:45:31 2023 -0500 vkd3d-shader/hlsl: Introduce an hlsl_sprintf_alloc() helper. --- libs/vkd3d-shader/d3dbc.c | 11 +++-------- libs/vkd3d-shader/hlsl.c | 21 +++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl_codegen.c | 25 ++++++++++--------------- 4 files changed, 36 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 99a5bd7a..2b02d51f 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1638,17 +1638,12 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe if (var->is_param && var->is_uniform) { - struct vkd3d_string_buffer *name; + char *new_name; - if (!(name = hlsl_get_string_buffer(ctx))) - { - buffer->status = VKD3D_ERROR_OUT_OF_MEMORY; + if (!(new_name = hlsl_sprintf_alloc(ctx, "$%s", var->name))) return; - } - vkd3d_string_buffer_printf(name, "$%s", var->name); vkd3d_free((char *)var->name); - var->name = hlsl_strdup(ctx, name->buffer); - hlsl_release_string_buffer(ctx, name); + var->name = new_name; } } } diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8b706e1e..a6747cd1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -72,6 +72,27 @@ void hlsl_fixme(struct hlsl_ctx *ctx, const struct vkd3d_shader_location *loc, c ctx->result = VKD3D_ERROR_NOT_IMPLEMENTED; } +char *hlsl_sprintf_alloc(struct hlsl_ctx *ctx, const char *fmt, ...) +{ + struct vkd3d_string_buffer *string; + va_list args; + char *ret; + + if (!(string = hlsl_get_string_buffer(ctx))) + return NULL; + va_start(args, fmt); + if (vkd3d_string_buffer_vprintf(string, fmt, args) < 0) + { + va_end(args); + hlsl_release_string_buffer(ctx, string); + return NULL; + } + va_end(args); + ret = hlsl_strdup(ctx, string->buffer); + hlsl_release_string_buffer(ctx, string); + return ret; +} + bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var) { struct hlsl_scope *scope = ctx->cur_scope; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 8bc72a8a..2f2f1f29 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1069,6 +1069,8 @@ static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) } } +char *hlsl_sprintf_alloc(struct hlsl_ctx *ctx, const char *fmt, ...) VKD3D_PRINTF_FUNC(2, 3); + const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index bae8e5f9..710d2908 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -163,10 +163,10 @@ static bool replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_der * work. */ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_var *temp) { - struct vkd3d_string_buffer *name; struct hlsl_ir_var *uniform; struct hlsl_ir_node *store; struct hlsl_ir_load *load; + char *new_name; /* Use the synthetic name for the temp, rather than the uniform, so that we * can write the uniform name into the shader reflection data. */ @@ -180,11 +180,9 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct hlsl_block *block, uniform->is_param = temp->is_param; uniform->buffer = temp->buffer; - if (!(name = hlsl_get_string_buffer(ctx))) + if (!(new_name = hlsl_sprintf_alloc(ctx, "<temp-%s>", temp->name))) return; - vkd3d_string_buffer_printf(name, "<temp-%s>", temp->name); - temp->name = hlsl_strdup(ctx, name->buffer); - hlsl_release_string_buffer(ctx, name); + temp->name = new_name; if (!(load = hlsl_new_var_load(ctx, uniform, &temp->loc))) return; @@ -235,16 +233,15 @@ static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir uint32_t index, bool output, const struct vkd3d_shader_location *loc) { struct hlsl_semantic new_semantic; - struct vkd3d_string_buffer *name; struct hlsl_ir_var *ext_var; + char *new_name; - if (!(name = hlsl_get_string_buffer(ctx))) + if (!(new_name = hlsl_sprintf_alloc(ctx, "<%s-%s%u>", output ? "output" : "input", semantic->name, index))) return NULL; - vkd3d_string_buffer_printf(name, "<%s-%s%u>", output ? "output" : "input", semantic->name, index); LIST_FOR_EACH_ENTRY(ext_var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (!ascii_strcasecmp(ext_var->name, name->buffer)) + if (!ascii_strcasecmp(ext_var->name, new_name)) { if (output) { @@ -271,25 +268,23 @@ static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir } } - hlsl_release_string_buffer(ctx, name); + vkd3d_free(new_name); return ext_var; } } if (!(new_semantic.name = hlsl_strdup(ctx, semantic->name))) { - hlsl_release_string_buffer(ctx, name); + vkd3d_free(new_name); return NULL; } new_semantic.index = index; - if (!(ext_var = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), type, loc, &new_semantic, - modifiers, NULL))) + if (!(ext_var = hlsl_new_var(ctx, new_name, type, loc, &new_semantic, modifiers, NULL))) { - hlsl_release_string_buffer(ctx, name); + vkd3d_free(new_name); hlsl_cleanup_semantic(&new_semantic); return NULL; } - hlsl_release_string_buffer(ctx, name); if (output) ext_var->is_output_semantic = 1; else

1 0