wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Francois Gouget : testbot/cgi: Sessions does not need CGI::Cookie.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: 5377631158b5723dfe18893c56cd84af82063fbb URL: https://source.winehq.org/git/tools.git/?a=commit;h=5377631158b5723dfe18893… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:41 2022 +0200 testbot/cgi: Sessions does not need CGI::Cookie. Getting and setting cookies is done through the PageBase class. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/Sessions.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 4ca62ba..39634e3 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -55,7 +55,6 @@ our @ISA = qw(WineTestBot::WineTestBotCollection); our @EXPORT = qw(CreateSessions DeleteSessions NewSession); use Bytes::Random::Secure; -use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor;

1 0

Francois Gouget : testbot/cgi: PageBase does not need Apache2::ServerRec.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: f7d0771f1a9ab5efb2444a2c70ecdbe31095f1a2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f7d0771f1a9ab5efb2444a2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:36 2022 +0200 testbot/cgi: PageBase does not need Apache2::ServerRec. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index f76a15f..06dba89 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -39,7 +39,6 @@ use Exporter 'import'; our @EXPORT = qw(CreatePageBase); use Apache2::Const -compile => qw(REDIRECT); -use Apache2::ServerRec; use CGI::Cookie; use URI::Escape; use WineTestBot::CGI::Sessions;

1 0

Francois Gouget : testbot: The last GetTaskURL() parameter is in fact a log name.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: a332ac13efd3a29bf305dc2048992a95b1233567 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a332ac13efd3a29bf305dc2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:25 2022 +0200 testbot: The last GetTaskURL() parameter is in fact a log name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index d93a938..13529c3 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -34,6 +34,7 @@ our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString BatchQuote ShQuote ShArgv2Cmd); use Fcntl qw(O_CREAT O_EXCL O_WRONLY); +use URI::Escape; use WineTestBot::Config; @@ -84,11 +85,11 @@ sub MakeSecureURL($) sub GetTaskURL($$$;$$) { - my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $ShowLog) = @_; + my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $LogName) = @_; my $StepTask = 100 * $StepNo + $TaskNo; my $URL = "/JobDetails.pl?Key=$JobId"; $URL .= "&s$StepTask=1" if ($ShowScreenshot); - $URL .= "&f$StepTask=$ShowLog" if ($ShowLog); + $URL .= "&f$StepTask=". uri_escape($LogName) if ($LogName); return "$URL#k$StepTask"; }

1 0

Francois Gouget : testbot/cgi: Remove an incorrect cross-reference in the Perl POD documentation.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: 1bb3b3ddf3df797a2ab37c35ea8742dd3b2655eb URL: https://source.winehq.org/git/tools.git/?a=commit;h=1bb3b3ddf3df797a2ab37c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:09:26 2022 +0200 testbot/cgi: Remove an incorrect cross-reference in the Perl POD documentation. PageBase is in fact in WineTestBot::CGI. However referencing WineTestBot from ObjectModel would be an abstraction level violation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 0879557..d7463b5 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -110,8 +110,6 @@ sub _initialize($$$) Sets the function to be used to instantiate a new PageBase object for this website. The resulting object can be accessed through GetPageBase(). -See also ObjectModel::CGI::PageBase. - =back =cut

1 0

Francois Gouget : testbot/web: Better document the job details page reloads.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: d4eb21b18ef5ae4538b6c7b8b6c51352ae032fc6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d4eb21b18ef5ae4538b6c7b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:09:00 2022 +0200 testbot/web: Better document the job details page reloads. Also use $SCRIPT_NAME instead of hardcoding the script name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7e1df1f..ccd4044 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -256,7 +256,11 @@ sub OnCancel($) return !1; } - exit($self->{EnclosingPage}->Redirect("/JobDetails.pl?Key=$JobId")); + # Ideally this would use something like GetMoreInfoLink() to rebuild a Get + # URL to preserve which logs and screenshots have been expanded. But the + # anchor would likely be lost anyway. + # So just do a basic reload to refresh the tasks' status. + exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); } sub OnRestart($) @@ -278,7 +282,10 @@ sub OnRestart($) return !1; } - exit($self->{EnclosingPage}->Redirect("/JobDetails.pl?Key=$JobId")); + # Reload to refresh the tasks' status. Note that all logs and screenshots + # have been cleared so there is no point specifying which one to open or + # adding an anchor. + exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); } sub OnAction($$)

1 0

Eric Pouech : winmm: Properly handle mmioRead/mmioWrite in case of errors.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 0de8d01b09b1cc7ca34f7ae3890b4a416ff801fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0de8d01b09b1cc7ca34f7ae3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 30 14:57:44 2022 +0200 winmm: Properly handle mmioRead/mmioWrite in case of errors. In C, an inequality comparison between a signed and an unsigned integer ends up with an unsigned comparison. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52628 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 4 ++-- dlls/winmm/playsound.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 352da62a215..d61b3c90c49 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1234,7 +1234,7 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, LONG ix; ix = mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)); - if (ix < 2*sizeof(DWORD)) + if (ix < 0 || ix < 2*sizeof(DWORD)) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return ChunkNotFound\n"); @@ -1336,7 +1336,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) ix = mmioWrite(hmmio, (LPSTR)lpck, size); TRACE("after mmioWrite ix = %ld req = %ld, errno = %d\n", ix, size, errno); - if (ix < size) { + if (ix != size) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return CannotWrite\n"); return MMIOERR_CANNOTWRITE; diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 0858f958583..d844bf9b0ab 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -262,6 +262,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) INT count, bufsize, left, index; struct playsound_data s; void* data; + LONG r; s.hEvent = 0; @@ -361,7 +362,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!lpWaveFormat) goto errCleanUp; - if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) + r = mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize); + if (r < 0 || r < sizeof(PCMWAVEFORMAT)) goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag);

1 0

Eric Pouech : mciwave: Correctly handle error return status from mmioRead.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 90ecf27d096c8165d3409513ae1cd3f55ab2d8b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ecf27d096c8165d3409513… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 30 14:57:38 2022 +0200 mciwave: Correctly handle error return status from mmioRead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 1d9abce84a3..3ca884ed6e0 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -291,7 +291,7 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) if (!pwfx) return MCIERR_OUT_OF_MEMORY; r = mmioRead(wmw->hFile, (HPSTR)pwfx, mmckInfo.cksize); - if (r < sizeof(PCMWAVEFORMAT)) { + if (r < 0 || r < sizeof(PCMWAVEFORMAT)) { HeapFree(GetProcessHeap(), 0, pwfx); return MCIERR_INVALID_FILE; }

1 0

Zebediah Figura : include: Add more URL_* flags.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 684944f0619aebbee92dbe49f453baed7495e4fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=684944f0619aebbee92dbe49… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Mar 30 18:58:07 2022 -0500 include: Add more URL_* flags. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlwapi.h | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index a282ae6d993..6149c7081a3 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -648,28 +648,34 @@ typedef enum { /* The following are used by UrlEscape..., UrlUnEscape..., * UrlCanonicalize..., and UrlCombine... routines */ -#define URL_WININET_COMPATIBILITY 0x80000000 -#define URL_PLUGGABLE_PROTOCOL 0x40000000 -#define URL_ESCAPE_UNSAFE 0x20000000 -#define URL_UNESCAPE 0x10000000 - -#define URL_DONT_SIMPLIFY 0x08000000 -#define URL_NO_META URL_DONT_SIMPLIFY -#define URL_ESCAPE_SPACES_ONLY 0x04000000 -#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 -#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO -#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO - -#define URL_INTERNAL_PATH 0x00800000 /* Will escape #'s in paths */ -#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 -#define URL_CONVERT_IF_DOSPATH 0x00200000 -#define URL_UNESCAPE_INPLACE 0x00100000 - -#define URL_FILE_USE_PATHURL 0x00010000 -#define URL_ESCAPE_AS_UTF8 0x00040000 - -#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 -#define URL_ESCAPE_PERCENT 0x00001000 +#define URL_WININET_COMPATIBILITY 0x80000000 +#define URL_PLUGGABLE_PROTOCOL 0x40000000 +#define URL_ESCAPE_UNSAFE 0x20000000 +#define URL_UNESCAPE 0x10000000 + +#define URL_DONT_SIMPLIFY 0x08000000 +#define URL_ESCAPE_SPACES_ONLY 0x04000000 +#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 + +#define URL_INTERNAL_PATH 0x00800000 +#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 +#define URL_CONVERT_IF_DOSPATH 0x00200000 +#define URL_UNESCAPE_INPLACE 0x00100000 + +#define URL_ESCAPE_ASCII_URI_COMPONENT 0x00080000 +#define URL_ESCAPE_AS_UTF8 0x00040000 +#define URL_DONT_UNESCAPE 0x00020000 +#define URL_FILE_USE_PATHURL 0x00010000 + +#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 +#define URL_ESCAPE_PERCENT 0x00001000 + +#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO +#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO +#define URL_ESCAPE_URI_COMPONENT (URL_ESCAPE_ASCII_URI_COMPONENT | URL_ESCAPE_AS_UTF8) +#define URL_NO_META URL_DONT_SIMPLIFY +#define URL_UNESCAPE_AS_UTF8 URL_ESCAPE_AS_UTF8 +#define URL_UNESCAPE_URI_COMPONENT URL_UNESCAPE_AS_UTF8 HRESULT WINAPI UrlApplySchemeA(LPCSTR,LPSTR,LPDWORD,DWORD); HRESULT WINAPI UrlApplySchemeW(LPCWSTR,LPWSTR,LPDWORD,DWORD);

1 0

Ziqing Hui : include: Add defines for ID2D1Factory3.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: fa073ecd1518dbb2b31809124a555bc0eca082cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa073ecd1518dbb2b3180912… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Mar 31 10:59:33 2022 +0800 include: Add defines for ID2D1Factory3. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index c96821ae276..b51adfdffdb 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -342,3 +342,16 @@ interface ID2D1Device2 : ID2D1Device1 [out] IDXGIDevice **dxgi_device ); } + +[ + object, + uuid(0869759f-4f00-413f-b03e-2bda45404d0f), + local, +] +interface ID2D1Factory3 : ID2D1Factory2 +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device2 **d2d_device + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1Device2.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: db98900ccba711fd80e614baf4b7a4be60ea526a URL: https://source.winehq.org/git/wine.git/?a=commit;h=db98900ccba711fd80e614ba… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Mar 31 10:59:32 2022 +0800 include: Add defines for ID2D1Device2. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 2eeda0dd616..c96821ae276 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -323,3 +323,22 @@ interface ID2D1DeviceContext2 : ID2D1DeviceContext1 [out] ID2D1TransformedImageSource **transformed ); } + +[ + object, + uuid(a44472e1-8dfb-4e60-8492-6e2861c9ca8b), + local, +] +interface ID2D1Device2 : ID2D1Device1 +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext2 **context + ); + void FlushDeviceContexts( + [in] ID2D1Bitmap *bitmap + ); + HRESULT GetDxgiDevice( + [out] IDXGIDevice **dxgi_device + ); +}

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 April 2022