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

Jacek Caban : gdi32: Use NtGdiCreateDIBitmapInternal for CreateDIBitmap.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: b2522bfb90e23ed84d1ec2dc03069a28d937b32f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2522bfb90e23ed84d1ec2dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:18:36 2021 +0100 gdi32: Use NtGdiCreateDIBitmapInternal for CreateDIBitmap. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 29 ++++++++++++----------------- dlls/gdi32/objects.c | 31 ++++++++++++++++++++++++++++++- include/ntgdi.h | 4 ++++ 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 976e6060955..fa736223aae 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1418,35 +1418,30 @@ done: /*********************************************************************** - * CreateDIBitmap (GDI32.@) + * NtGdiCreateDIBitmapInternal (win32u.@) * * Creates a DDB (device dependent bitmap) from a DIB. * The DDB will have the same color depth as the reference DC. */ -HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, - DWORD init, LPCVOID bits, const BITMAPINFO *data, - UINT coloruse ) +HBITMAP WINAPI NtGdiCreateDIBitmapInternal( HDC hdc, INT width, INT height, DWORD init, + const void *bits, const BITMAPINFO *data, + UINT coloruse, UINT max_info, UINT max_bits, + ULONG flags, HANDLE xform ) { - BITMAPINFOHEADER info; HBITMAP handle; - LONG height; - if (!bitmapinfoheader_from_user_bitmapinfo( &info, header )) return 0; - if (info.biCompression == BI_JPEG || info.biCompression == BI_PNG) return 0; - if (coloruse > DIB_PAL_COLORS + 1) return 0; - if (info.biWidth < 0) return 0; + if (coloruse > DIB_PAL_COLORS + 1 || width < 0) return 0; /* Top-down DIBs have a negative height */ - height = abs( info.biHeight ); + height = abs( height ); - TRACE("hdc=%p, header=%p, init=%u, bits=%p, data=%p, coloruse=%u (bitmap: width=%d, height=%d, bpp=%u, compr=%u)\n", - hdc, header, init, bits, data, coloruse, info.biWidth, info.biHeight, - info.biBitCount, info.biCompression); + TRACE( "hdc=%p, init=%u, bits=%p, data=%p, coloruse=%u (bitmap: width=%d, height=%d)\n", + hdc, init, bits, data, coloruse, width, height ); if (hdc == NULL) - handle = CreateBitmap( info.biWidth, height, 1, 1, NULL ); + handle = NtGdiCreateBitmap( width, height, 1, 1, NULL ); else - handle = CreateCompatibleBitmap( hdc, info.biWidth, height ); + handle = NtGdiCreateCompatibleBitmap( hdc, width, height ); if (handle) { @@ -1454,7 +1449,7 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, { if (SetDIBits( hdc, handle, 0, height, bits, data, coloruse ) == 0) { - DeleteObject( handle ); + NtGdiDeleteObjectApp( handle ); handle = 0; } } diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 03985737b51..055994a1680 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -725,7 +725,36 @@ UINT WINAPI GetSystemPaletteEntries( HDC hdc, UINT start, UINT count, PALETTEENT } /*********************************************************************** - * GetDIBits (GDI32.@) + * CreateDIBitmap (GDI32.@) + */ +HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, DWORD init, + const void *bits, const BITMAPINFO *data, UINT coloruse ) +{ + int width, height; + + if (!header) return 0; + + if (header->biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; + width = core->bcWidth; + height = core->bcHeight; + } + else if (header->biSize >= sizeof(BITMAPINFOHEADER)) + { + if (header->biCompression == BI_JPEG || header->biCompression == BI_PNG) return 0; + width = header->biWidth; + height = header->biHeight; + } + else return 0; + + if (!width || !height) return GetStockObject( STOCK_LAST + 1 ); /* default 1x1 bitmap */ + return NtGdiCreateDIBitmapInternal( hdc, width, height, init, bits, data, coloruse, + 0, 0, 0, 0 ); +} + +/*********************************************************************** + * GetDIBits (win32u.@) */ INT WINAPI DECLSPEC_HOTPATCH GetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, void *bits, BITMAPINFO *info, UINT coloruse ) diff --git a/include/ntgdi.h b/include/ntgdi.h index fbe168a73bd..72427a20295 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -218,6 +218,10 @@ BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ); HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, UINT bpp, const void *bits ); HBITMAP WINAPI NtGdiCreateCompatibleBitmap( HDC hdc, INT width, INT height ); +HBITMAP WINAPI NtGdiCreateDIBitmapInternal( HDC hdc, INT width, INT height, DWORD init, + const void *bits, const BITMAPINFO *data, + UINT coloruse, UINT max_info, UINT max_bits, + ULONG flags, HANDLE xform ); HPALETTE WINAPI NtGdiCreateHalftonePalette( HDC hdc ); HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen ); HDC WINAPI NtGdiCreateMetafileDC( HDC hdc );

1 0

Michael Stefaniuc : dpnet: Don't assign a COM object to the 3rd param of QueryInterface.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 3a54b3413d60baafd8a0c0ba91209326613393a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a54b3413d60baafd8a0c0ba… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Aug 29 14:00:18 2021 +0200 dpnet: Don't assign a COM object to the 3rd param of QueryInterface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 15 ++++++--------- dlls/dpnet/lobbiedapp.c | 15 ++++++--------- dlls/dpnet/peer.c | 15 ++++++--------- dlls/dpnet/threadpool.c | 15 ++++++--------- 4 files changed, 24 insertions(+), 36 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 4459373a14c..b9f55c35b29 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -56,18 +56,15 @@ static inline IDirectPlay8ClientImpl *impl_from_IDirectPlay8Client(IDirectPlay8C /* IDirectPlay8Client IUnknown parts follow: */ static HRESULT WINAPI IDirectPlay8ClientImpl_QueryInterface(IDirectPlay8Client *iface, REFIID riid, - void **ppobj) + void **ret_iface) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectPlay8Client)) { - IUnknown_AddRef(iface); - *ppobj = This; - return DPN_OK; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlay8Client)) { + IDirectPlay8Client_AddRef(iface); + *ret_iface = iface; + return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p): not found\n", iface, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; } diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index d58571aca87..71beb2de2cf 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -42,18 +42,15 @@ static inline IDirectPlay8LobbiedApplicationImpl *impl_from_IDirectPlay8LobbiedA /* IDirectPlay8LobbiedApplication IUnknown parts follow: */ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_QueryInterface(IDirectPlay8LobbiedApplication *iface, - REFIID riid, void **ppobj) + REFIID riid, void **ret_iface) { - IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectPlay8LobbiedApplication)) { - IUnknown_AddRef(iface); - *ppobj = This; - return DPN_OK; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlay8LobbiedApplication)) { + IDirectPlay8LobbiedApplication_AddRef(iface); + *ret_iface = iface; + return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p): not found\n", iface, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; } diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 329d9b3a828..bd143e83176 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -60,19 +60,16 @@ static inline IDirectPlay8PeerImpl *impl_from_IDirectPlay8Peer(IDirectPlay8Peer /* IUnknown interface follows */ static HRESULT WINAPI IDirectPlay8PeerImpl_QueryInterface(IDirectPlay8Peer *iface, REFIID riid, - void **ppobj) + void **ret_iface) { - IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirectPlay8Peer)) + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlay8Peer)) { - IUnknown_AddRef(iface); - *ppobj = This; - return DPN_OK; + IDirectPlay8Peer_AddRef(iface); + *ret_iface = iface; + return S_OK; } - WARN("(%p)->(%s,%p): not found\n", This, debugstr_guid(riid), ppobj); + WARN("(%p)->(%s,%p): not found\n", iface, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; } diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 22d871b40b4..37dda49e84d 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -46,19 +46,16 @@ static inline IDirectPlay8ThreadPoolImpl *impl_from_IDirectPlay8ThreadPool(IDire /* IUnknown interface follows */ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_QueryInterface(IDirectPlay8ThreadPool *iface, - REFIID riid, void **ppobj) + REFIID riid, void **ret_iface) { - IDirectPlay8ThreadPoolImpl *This = impl_from_IDirectPlay8ThreadPool(iface); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirectPlay8ThreadPool)) + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlay8ThreadPool)) { - IUnknown_AddRef(iface); - *ppobj = This; - return DPN_OK; + IDirectPlay8ThreadPool_AddRef(iface); + *ret_iface = iface; + return S_OK; } - WARN("(%p)->(%s,%p): not found\n", This, debugstr_guid(riid), ppobj); + WARN("(%p)->(%s,%p): not found\n", iface, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; }

1 0

Anton Baskanov : sfnt2fon: Avoid out-of-bounds read (AddressSanitizer).
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 2e2609083851ba2c70aee89bb9e23a2c7d82d867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2609083851ba2c70aee89b… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Aug 29 21:06:23 2021 +0700 sfnt2fon: Avoid out-of-bounds read (AddressSanitizer). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45422 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/sfnt2fon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 0d59bfc1db2..6427eb9f840 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -743,7 +743,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, for(x = 0; x < ((info->dfCharTable[i].width + 7) / 8); x++) { for(y = 0; y < ppem; y++) { if(y < ascent - face->glyph->bitmap_top || - y >= face->glyph->bitmap.rows + ascent - face->glyph->bitmap_top) { + y >= (int)face->glyph->bitmap.rows + ascent - face->glyph->bitmap_top) { info->data[data_pos++] = 0; continue; }

1 0

Francois Gouget : winetest/build-patterns: Take the distance between key colors into account.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: tools Branch: master Commit: e527645adc6e2b145428087afb1b68215f9e1840 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e527645adc6e2b145428087… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 31 15:39:59 2021 +0200 winetest/build-patterns: Take the distance between key colors into account. To get a uniform color gradient, fewer colors should be squeezed between close key colors than between distant ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 2ee5d5b..ff72516 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -872,6 +872,13 @@ sub blend($$$) return $r; } +sub distance($$) +{ + my ($a, $b) = @_; + return sqrt(($b->[0] - $a->[0])**2 + + ($b->[1] - $a->[1])**2 + + ($b->[2] - $a->[2])**2); +} # Use colors to differentiate the set values. Each unique value is assigned # a color (in HTML format) picked along a series of gradients passing by the @@ -897,19 +904,33 @@ sub compute_set_colors($) # when many colors are needed. $keycolors[0] = [0, 179, 179] if ($count > 10); + # Compute the total length of the path traced by the key colors through + # the colorspace. This is necessary so the gradient remains uniform + # even if two key colors are close to each other. This does assume that + # the path does not zigzag too much: (0,0,0)->(255,0,0)->(1,0,0) cannot + # produce a meaningful gradient. + my @keypos = (0); + for (my $i = 1; $i < @keycolors; $i++) + { + my $d = distance($keycolors[$i - 1], $keycolors[$i]); + $keypos[$i] = $keypos[$i - 1] + $d; + } + my $k = 0; - my ($start, $end) = (-1, 0); for (0..$count-1) { - while (!$end or $_ > $end) + # Compute the position of the current item on the path + my $pos = $_ / ($count - 1) * $keypos[-1]; + + # Figure out which segment of the path this corresponds to + while ($pos > $keypos[$k+1] and $k+1 < @keycolors-1) { $k++; - $start = $end; - $end = ($count-1) * $k / (@keycolors-1); } - $set->{$values[$_]} = color2html(blend(($_-$start)/($end-$start), - $keycolors[$k-1], - $keycolors[$k])); + + # And blend + my $Rgb = blend(($pos - $keypos[$k]) / ($keypos[$k+1] - $keypos[$k]), $keycolors[$k], $keycolors[$k+1]); + $set->{$values[$_]} = color2html($Rgb); } } }

1 0

Francois Gouget : winetest/build-patterns: Use the Luv colorspace for interpolating colors.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: tools Branch: master Commit: d6b3ff7f6fa99544dae245155ef3a0d9bac2c365 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d6b3ff7f6fa99544dae2451… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 31 15:40:02 2021 +0200 winetest/build-patterns: Use the Luv colorspace for interpolating colors. Interpolation works best in a colorspace where the distance between colors is representative of their perceptual difference. That's roughly the case in the Luv colorspace and much less so in the RGB one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index ff72516..7229140 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -22,6 +22,7 @@ use open ':utf8'; use CGI qw(:standard); use POSIX; # ceil() +use Graphics::ColorObject; use Text::CSV::Encoded; use Time::Piece; @@ -860,15 +861,15 @@ if (open(my $fh, "-|", $cmd)) sub color2html($) { my ($c) = @_; - return sprintf "#%02x%02x%02x", $c->[0], $c->[1], $c->[2]; + return "#". $c->as_RGBhex(); } -sub blend($$$) +sub interpolate($$$) { my ($p, $start, $end) = @_; - my $r = [int($start->[0] * (1 - $p) + $end->[0] * $p + 0.5), - int($start->[1] * (1 - $p) + $end->[1] * $p + 0.5), - int($start->[2] * (1 - $p) + $end->[2] * $p + 0.5)]; + my $r = [$start->[0] * (1 - $p) + $end->[0] * $p, + $start->[1] * (1 - $p) + $end->[1] * $p, + $start->[2] * (1 - $p) + $end->[2] * $p]; return $r; } @@ -896,7 +897,7 @@ sub compute_set_colors($) my $count = @values; if ($count == 1) { - $set->{$values[0]} = color2html($keycolors[0]); + $set->{$values[0]} = color2html(Graphics::ColorObject->new_RGB255($keycolors[0])); } else { @@ -904,6 +905,12 @@ sub compute_set_colors($) # when many colors are needed. $keycolors[0] = [0, 179, 179] if ($count > 10); + # Convert the key colors to the Luv colorspace where the distance + # between colors is roughly representative of the perceptual difference + # between them. This allows linear interpolation to produce relatively + # uniform gradients (which is not the case in the RGB colorspace). + map { $_ = Graphics::ColorObject->new_RGB255($_)->as_Luv() } @keycolors; + # Compute the total length of the path traced by the key colors through # the colorspace. This is necessary so the gradient remains uniform # even if two key colors are close to each other. This does assume that @@ -929,8 +936,8 @@ sub compute_set_colors($) } # And blend - my $Rgb = blend(($pos - $keypos[$k]) / ($keypos[$k+1] - $keypos[$k]), $keycolors[$k], $keycolors[$k+1]); - $set->{$values[$_]} = color2html($Rgb); + my $Luv = interpolate(($pos - $keypos[$k]) / ($keypos[$k+1] - $keypos[$k]), $keycolors[$k], $keycolors[$k+1]); + $set->{$values[$_]} = color2html(Graphics::ColorObject->new_Luv($Luv)); } } }

1 0

Francois Gouget : winetest/build-patterns: Add dark cyan instead of substituting it for cyan.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: tools Branch: master Commit: 2975ecf4276fd0a10bd613500109d588045c68fb URL: https://source.winehq.org/git/tools.git/?a=commit;h=2975ecf4276fd0a10bd6135… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 31 15:40:04 2021 +0200 winetest/build-patterns: Add dark cyan instead of substituting it for cyan. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 7229140..386bf97 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -903,7 +903,7 @@ sub compute_set_colors($) { # Start from a 'darker cyan' for increased contrast # when many colors are needed. - $keycolors[0] = [0, 179, 179] if ($count > 10); + unshift @keycolors, [0, 179, 179] if ($count > 10); # Convert the key colors to the Luv colorspace where the distance # between colors is roughly representative of the perceptual difference

1 0

Francois Gouget : testbot: Pids can have more than 5 digits.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: tools Branch: master Commit: f97f0e180a3f0fb2b9c7b1944eb4295603dc218e URL: https://source.winehq.org/git/tools.git/?a=commit;h=f97f0e180a3f0fb2b9c7b19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 31 15:53:57 2021 +0200 testbot: Pids can have more than 5 digits. Pids used to be a 16-bit value but that's no longer the case. Assume they are an unsigned 32-bit value now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/ddl/update46.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/VMs.pm | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/ddl/update46.sql b/testbot/ddl/update46.sql new file mode 100644 index 0000000..f24130b --- /dev/null +++ b/testbot/ddl/update46.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE VMs + MODIFY ChildPid INT UNSIGNED NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 3b5cda7..2d08524 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -52,7 +52,7 @@ CREATE TABLE VMs MissionCaps VARCHAR(512) NOT NULL, Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, Errors INT(2) NULL, - ChildPid INT(5) NULL, + ChildPid INT UNSIGNED NULL, ChildDeadline DATETIME NULL, VirtURI VARCHAR(64) NOT NULL, VirtDomain VARCHAR(32) NOT NULL, diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2cc6c67..0b11d81 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -760,7 +760,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("MissionCaps", "Mission Capabilities", !1, !1, "A", 512), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), CreateBasicPropertyDescriptor("Errors", "Errors", !1, !1, "N", 2), - CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 10), CreateBasicPropertyDescriptor("ChildDeadline", "Child Deadline", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), CreateBasicPropertyDescriptor("VirtDomain", "LibVirt Domain for the VM", !1, 1, "A", 32),

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Do not swallow compilation errors.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: vkd3d Branch: master Commit: 910aa4df01abfb2460d93e04cf398a946cc9f8e4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=910aa4df01abfb2460d93e0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Aug 30 08:49:25 2021 +0200 vkd3d-shader/hlsl: Do not swallow compilation errors. There are cases where compilation fails, but no error message is recorded. They usually correspond to unimplemented features, but still failure should be forwarded to the caller, otherwise it will manifest itself later in more confusing ways (like not being able to find a function even though it was apparently correctly compiled). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0d9186a..fc9b425 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1803,7 +1803,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d if (!hlsl_ctx_init(&ctx, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - if (hlsl_lexer_compile(&ctx, hlsl) == 2) + if ((ret = hlsl_lexer_compile(&ctx, hlsl)) == 2) { hlsl_ctx_cleanup(&ctx); return VKD3D_ERROR_OUT_OF_MEMORY; @@ -1815,6 +1815,14 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return ctx.result; } + /* If parsing failed without an error condition being recorded, we + * plausibly hit some unimplemented feature. */ + if (ret) + { + hlsl_ctx_cleanup(&ctx); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + if (!(entry_func = hlsl_get_func_decl(&ctx, entry_point))) { const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name};

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Cleanup HLSL context during error path.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: vkd3d Branch: master Commit: 8b6db3d366b7110667ac03d0ce8a3b178253f33e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b6db3d366b7110667ac03d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Aug 30 08:53:35 2021 +0200 vkd3d-shader/hlsl: Cleanup HLSL context during error path. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index fc9b425..7b246bf 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1829,6 +1829,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d hlsl_error(&ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entry_point); + hlsl_ctx_cleanup(&ctx); return VKD3D_ERROR_INVALID_SHADER; }

1 0

Henri Verbeet : vkd3d-shader: Use vkd3d_swizzle_get_component() in shader_dump_src_param().
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: vkd3d Branch: master Commit: 5f4fc9cb06e386aabb83eb65fedba903e4c28d1d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5f4fc9cb06e386aabb83eb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 31 01:16:23 2021 +0200 vkd3d-shader: Use vkd3d_swizzle_get_component() in shader_dump_src_param(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index df0ebf0..26bc788 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1239,11 +1239,12 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_IMMCONST64 && param->reg.type != VKD3DSPR_SAMPLER) { + unsigned int swizzle_x = vkd3d_swizzle_get_component(swizzle, 0); + unsigned int swizzle_y = vkd3d_swizzle_get_component(swizzle, 1); + unsigned int swizzle_z = vkd3d_swizzle_get_component(swizzle, 2); + unsigned int swizzle_w = vkd3d_swizzle_get_component(swizzle, 3); + static const char swizzle_chars[] = "xyzw"; - DWORD swizzle_x = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(0)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_y = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(1)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_z = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(2)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_w = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(3)) & VKD3D_SHADER_SWIZZLE_MASK; if (swizzle_x == swizzle_y && swizzle_x == swizzle_z

1 0