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

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

Aug. 31, 2023

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/LogUtils: Canonicalize the log file errors and warnings.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

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 Aug. 31, 2023

Aug. 31, 2023

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/LogUtils: Fix setting BadRef when failing to load a reference log.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: tools Branch: master Commit: 3865d35915d861598df080bb552ef88b03020e1f URL: https://gitlab.winehq.org/winehq/tools/-/commit/3865d35915d861598df080bb552… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 23 18:19:36 2023 +0200 testbot/LogUtils: Fix setting BadRef when failing to load a reference log. The information goes on the log being analyzed, not on the preexisting reference log. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e8f32f34..ae06baf2 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1378,7 +1378,7 @@ sub TagNewMessages($$) if (defined $RefInfo->{BadLog}) { # Only save the first BadLog error - $RefInfo->{BadRef} ||= $RefInfo->{BadLog}; + $LogInfo->{BadRef} ||= $RefInfo->{BadLog}; next; } $HasRef = 1;

1 0

Francois Gouget : winetest: Give some slack to the macOS test results.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: tools Branch: master Commit: d423d6c3bd221b16e2f85875590a4ada1793e713 URL: https://gitlab.winehq.org/winehq/tools/-/commit/d423d6c3bd221b16e2f85875590… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 2 14:33:57 2023 +0200 winetest: Give some slack to the macOS test results. Hopefully this will promote work on the macOS tests to bring them more in line with the other platforms. --- winetest/dissect | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index a7eb27ab..d936762c 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -450,6 +450,8 @@ if ($wine_build) { chomp $merge_base; $merge_base eq $testbuild or mydie "wine build '$wine_build' not a descendant of build $testbuild"; } +# Give a little slack to the macOS results. +$maxfailedtests += 30 if ($version eq "mac"); #

1 0

Francois Gouget : winetest: Remove the slack for Windows 11 test results.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: tools Branch: master Commit: 59e08a5e20de6cf746da9744f4696d38610cbf88 URL: https://gitlab.winehq.org/winehq/tools/-/commit/59e08a5e20de6cf746da9744f46… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 20 15:04:10 2023 +0200 winetest: Remove the slack for Windows 11 test results. The Windows 11 results are good enough for the regular limit now. --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 3d666ef5..a7eb27ab 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -415,8 +415,8 @@ foreach my $entry (@idmatch) last; } } -# Give a little slack to the latest Windows 10. -$maxfailedtests += 20 if ($version =~ /^w11/); +# Give a little slack to the latest Windows 11. +#$maxfailedtests += 20 if ($version =~ /^w11/); if ($prediluvian and not $acceptprediluvianwin) {

1 0

Alexandre Julliard : packaging: Remove Ubuntu 22.10.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

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 Aug. 30, 2023

Aug. 30, 2023

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 Aug. 30, 2023

Aug. 30, 2023

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: Define lit() in HLSL.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: vkd3d Branch: master Commit: a597dc8755af5d2ef4826f1b570927379afc5824 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a597dc8755af5d2ef4826f1b57092… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 7 17:51:35 2023 -0500 vkd3d-shader/hlsl: Define lit() in HLSL. --- libs/vkd3d-shader/hlsl.y | 83 ++++++++-------------------------------------- tests/hlsl/lit.shader_test | 11 ++++++ 2 files changed, 24 insertions(+), 70 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7ce0340c..161d1ab4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3034,14 +3034,17 @@ static struct hlsl_ir_node * add_pow_expr(struct hlsl_ctx *ctx, static bool intrinsic_lit(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_node *n_l_neg, *n_h_neg, *specular_or, *specular_pow, *load; - struct hlsl_ir_node *n_l, *n_h, *m, *diffuse, *zero, *store, *init; - struct hlsl_constant_value init_value; - struct hlsl_ir_load *var_load; - struct hlsl_deref var_deref; - struct hlsl_type *ret_type; - struct hlsl_ir_var *var; - struct hlsl_block block; + struct hlsl_ir_function_decl *func; + + static const char body[] = + "float4 lit(float n_l, float n_h, float m)\n" + "{\n" + " float4 ret;\n" + " ret.xw = 1.0;\n" + " ret.y = max(n_l, 0);\n" + " ret.z = (n_l < 0 || n_h < 0) ? 0 : pow(n_h, m);\n" + " return ret;\n" + "}"; if (params->args[0]->data_type->class != HLSL_CLASS_SCALAR || params->args[1]->data_type->class != HLSL_CLASS_SCALAR @@ -3051,70 +3054,10 @@ static bool intrinsic_lit(struct hlsl_ctx *ctx, return false; } - if (!(n_l = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) - return false; - - if (!(n_h = intrinsic_float_convert_arg(ctx, params, params->args[1], loc))) + if (!(func = hlsl_compile_internal_function(ctx, "lit", body))) return false; - if (!(m = intrinsic_float_convert_arg(ctx, params, params->args[2], loc))) - return false; - - ret_type = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 4); - - if (!(var = hlsl_new_synthetic_var(ctx, "lit", ret_type, loc))) - return false; - hlsl_init_simple_deref_from_var(&var_deref, var); - - init_value.u[0].f = 1.0f; - init_value.u[1].f = 0.0f; - init_value.u[2].f = 0.0f; - init_value.u[3].f = 1.0f; - if (!(init = hlsl_new_constant(ctx, ret_type, &init_value, loc))) - return false; - hlsl_block_add_instr(params->instrs, init); - - if (!(store = hlsl_new_simple_store(ctx, var, init))) - return false; - hlsl_block_add_instr(params->instrs, store); - - if (!(zero = hlsl_new_float_constant(ctx, 0.0f, loc))) - return false; - hlsl_block_add_instr(params->instrs, zero); - - /* Diffuse component. */ - if (!(diffuse = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MAX, n_l, zero, loc))) - return false; - - if (!hlsl_new_store_component(ctx, &block, &var_deref, 1, diffuse)) - return false; - hlsl_block_add_block(params->instrs, &block); - - /* Specular component. */ - if (!(n_h_neg = add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_LESS, n_h, zero, loc))) - return false; - - if (!(n_l_neg = add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_LESS, n_l, zero, loc))) - return false; - - if (!(specular_or = add_binary_logical_expr(ctx, params->instrs, HLSL_OP2_LOGIC_OR, n_l_neg, n_h_neg, loc))) - return false; - - if (!(specular_pow = add_pow_expr(ctx, params->instrs, n_h, m, loc))) - return false; - - if (!(load = hlsl_add_conditional(ctx, params->instrs, specular_or, zero, specular_pow))) - return false; - - if (!hlsl_new_store_component(ctx, &block, &var_deref, 2, load)) - return false; - hlsl_block_add_block(params->instrs, &block); - - if (!(var_load = hlsl_new_var_load(ctx, var, loc))) - return false; - hlsl_block_add_instr(params->instrs, &var_load->node); - - return true; + return add_user_call(ctx, func, params, loc); } static bool intrinsic_log(struct hlsl_ctx *ctx, diff --git a/tests/hlsl/lit.shader_test b/tests/hlsl/lit.shader_test index 729acef5..cbfffb4e 100644 --- a/tests/hlsl/lit.shader_test +++ b/tests/hlsl/lit.shader_test @@ -19,6 +19,17 @@ uniform 0 float4 1.2 2.0 3.0 0.0 draw quad probe all rgba (1.0, 1.2, 8.0, 1.0) +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + return lit(u.x, u.y, u.z) + lit(u.x, u.y, u.z); +} + +[test] +uniform 0 float4 1.2 2.0 3.0 0.0 +draw quad +probe all rgba (2.0, 2.4, 16.0, 2.0) + [pixel shader fail] float4 main(uniform float4 u) : sv_target {

1 0