wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Julian Klemann : http.sys: Add support for relative URLs.
by Alexandre Julliard 08 Jul '22

08 Jul '22

Module: wine Branch: master Commit: 296852b2585576dfe523f4217becb4cd6101035d URL: https://source.winehq.org/git/wine.git/?a=commit;h=296852b2585576dfe523f421… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Thu Jul 7 16:25:21 2022 -0500 http.sys: Add support for relative URLs. The queue with the most specific path should be the one to receive the request. --- dlls/http.sys/http.c | 326 ++++++++++++++++++++++++++++++++----------- dlls/httpapi/tests/httpapi.c | 98 +++++++++++++ 2 files changed, 343 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=296852b2585576dfe523…

1 0

Francois Gouget : testbot/web: Add links to the first and last new untracked failures.
by Alexandre Julliard 08 Jul '22

08 Jul '22

Module: tools Branch: master Commit: 8f9b52478dc31b7883447a83e7ca9862439bd4cf URL: https://source.winehq.org/git/tools.git/?a=commit;h=8f9b52478dc31b7883447a8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 8 15:34:42 2022 +0200 testbot/web: Add links to the first and last new untracked failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3fbdb427..321d025e 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -437,8 +437,13 @@ sub GenerateFullLog($$$$$) } } } - $LogBugs{-1} ||= [$LineNo, ""]; - $LogBugs{9999999} = [$LineNo, ""]; + $LogBugs{-2} ||= [$LineNo, "First failure"]; + if ($ErrCategory{$LineNo} eq "fullnew" and !$ErrFailures{$LineNo}) + { + $LogBugs{-1} ||= [$LineNo, "First untracked new failure"]; + $LogBugs{10000000} = [$LineNo, "Last untracked new failure"]; + } + $LogBugs{10000001} = [$LineNo, "Last failure"]; } } if (%LogBugs) @@ -447,7 +452,11 @@ sub GenerateFullLog($$$$$) foreach my $Label (sort { $a <=> $b } keys %LogBugs) { my ($LineNo, $Title) = @{$LogBugs{$Label}}; - $Label = $Label < 0 ? "First" : $Label == 9999999 ? "Last" : $Label; + $Label = $Label == -2 ? "First" : + $Label == -1 ? "new" : + $Label == 10000000 ? "new" : + $Label == 10000001 ? "Last" : + $Label; $Title = " title='". $self->escapeHTML($Title) ."'" if ($Title); print " <a href='#k${LogId}L$LineNo'$Title>$Label</a>" }

1 0

Francois Gouget : testbot/web: Clearly identify unused variables in the reset password page.
by Alexandre Julliard 08 Jul '22

08 Jul '22

Module: tools Branch: master Commit: 88bb46d5991d2c12925d08a861271da2cd41f96d URL: https://source.winehq.org/git/tools.git/?a=commit;h=88bb46d5991d2c12925d08a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 8 15:34:44 2022 +0200 testbot/web: Clearly identify unused variables in the reset password page. This also avoids shadowing the $User variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/ResetPassword.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 65dcdd53..b6c0ae9c 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -118,8 +118,8 @@ sub OnChangePassword($) return !1; } - ($ErrMessage, my $User) = $Users->Authenticate($self->GetParam("Name"), - $self->GetParam("Password1")); + ($ErrMessage, my $_User) = $Users->Authenticate($self->GetParam("Name"), + $self->GetParam("Password1")); if (defined $ErrMessage) { $self->AddError($ErrMessage, "Name"); @@ -127,8 +127,7 @@ sub OnChangePassword($) } my $Sessions = CreateSessions(); - ($ErrMessage, my $Session) = $Sessions->NewSession($User, - defined($self->GetParam("AutoLogin"))); + ($ErrMessage, my $_Session) = $Sessions->NewSession($User, defined $self->GetParam("AutoLogin")); if ($ErrMessage) { $self->AddError($ErrMessage, "Name");

1 0

Alexandre Julliard : Use Gitlab for git URLs.
by Alexandre Julliard 08 Jul '22

08 Jul '22

Module: website Branch: master Commit: ebb1a0246f8098bc88f80e9ccf9609b005daf944 URL: https://source.winehq.org/git/website.git/?a=commit;h=ebb1a0246f8098bc88f80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 14:15:55 2022 +0200 Use Gitlab for git URLs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/plugins/announce.php | 4 ++-- include/winehq.conf.sample | 4 ++-- templates/de/home.template | 4 ++-- templates/en/home.template | 4 ++-- templates/es/home.template | 4 ++-- templates/fr/home.template | 4 ++-- templates/ko/home.template | 4 ++-- templates/nl/home.template | 4 ++-- templates/pl/home.template | 4 ++-- templates/pt/home.template | 4 ++-- templates/tr/home.template | 4 ++-- templates/uk/home.template | 4 ++-- templates/zh-cn/home.template | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=ebb1a0246f8098bc8…

1 0

Alexandre Julliard : Use Gitlab for commit URLs.
by Alexandre Julliard 08 Jul '22

08 Jul '22

Module: bugzilla Branch: master Commit: ea4302dd1afc72b1edb0039222c4bb7c2b7af7e9 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=ea4302dd1afc72b1edb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 12:14:26 2022 +0200 Use Gitlab for commit URLs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- template/en/default/bug/edit.html.tmpl | 4 ++-- template/en/default/list/table.html.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 5685dc3..7cf3932 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -904,12 +904,12 @@ <tr> [% IF field.name == 'cf_regression_sha1sum' && bug.${field.name} %] [% PROCESS bug/field.html.tmpl value = bug.${field.name} - desc_url = "//source.winehq.org/git/wine.git/commit/${bug.cf_regression_sha1sum}" + desc_url = "https://gitlab.winehq.org/wine/wine/-/commit/${bug.cf_regression_sha1sum}" editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] [% ELSIF field.name == 'cf_fixedby_sha1sum' && bug.${field.name} %] [% PROCESS bug/field.html.tmpl value = bug.${field.name} - desc_url = "//source.winehq.org/git/wine.git/commit/${bug.cf_fixedby_sha1sum}" + desc_url = "https://gitlab.winehq.org/wine/wine/-/commit/${bug.cf_fixedby_sha1sum}" editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] [% ELSIF field.name == 'cf_staged_patchset' && bug.${field.name} && is_safe_url("${bug.cf_staged_patchset}") %] diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 21f7713..a68b14c 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -199,10 +199,10 @@ [%- bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] </a> [% ELSIF column == 'cf_regression_sha1sum' && bug.cf_regression_sha1sum %] - <a href="//source.winehq.org/git/wine.git/commit/[% bug.cf_regression_sha1sum FILTER html %]"> + <a href="https://gitlab.winehq.org/wine/wine/-/commit/[% bug.cf_regression_sha1sum FILTER html %]"> [% bug.cf_regression_sha1sum.truncate(16) FILTER html %]</a> [% ELSIF column == 'cf_fixedby_sha1sum' && bug.cf_fixedby_sha1sum %] - <a href="//source.winehq.org/git/wine.git/commit/[% bug.cf_fixedby_sha1sum FILTER html %]"> + <a href="https://gitlab.winehq.org/wine/wine/-/commit/[% bug.cf_fixedby_sha1sum FILTER html %]"> [% bug.cf_fixedby_sha1sum.truncate(16) FILTER html %]</a> [% ELSE %] [%- display_value(column, bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%]

1 0

Stefan Rentsch : wbemprox: Provide more accurate system information.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: fefe108e2043d8a9d993b4e2cb129c851ca5e795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fefe108e2043d8a9d993b4e2… Author: Stefan Rentsch <et14rest(a)gmail.com> Date: Tue Jul 5 14:28:30 2022 +0200 wbemprox: Provide more accurate system information. This re-uses existing functions from Win32_ComputerSystemProduct to provide more accurate values, which are helpful to system overview applications. > wmic.exe computersystem GET Manufacturer --- dlls/wbemprox/builtin.c | 67 +++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4ac52918f6f..820fb61930f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1625,20 +1625,52 @@ static WCHAR *get_username(void) return ret; } +static WCHAR *get_compsysproduct_string( BYTE id, const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_system *system; + UINT offset; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_SYSTEM, buf, len ))) return NULL; + + system = (const struct smbios_system *)hdr; + offset = (const char *)system - buf + system->hdr.length; + return get_smbios_string( id, buf, offset, len ); +} + +static WCHAR *get_compsysproduct_name( const char *buf, UINT len ) +{ + WCHAR *ret = get_compsysproduct_string( 2, buf, len ); + if (!ret) return wcsdup( L"Wine" ); + return ret; +} + +static WCHAR *get_compsysproduct_vendor( const char *buf, UINT len ) +{ + WCHAR *ret = get_compsysproduct_string( 1, buf, len ); + if (!ret) return wcsdup( L"The Wine Project" ); + return ret; +} + static enum fill_status fill_compsys( struct table *table, const struct expr *cond ) { struct record_computersystem *rec; enum fill_status status = FILL_STATUS_UNFILTERED; - UINT row = 0; + UINT row = 0, len; + char *buf; if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 ); + if (!(buf = malloc( len ))) return FILL_STATUS_FAILED; + GetSystemFirmwareTable( RSMB, 0, buf, len ); + rec = (struct record_computersystem *)table->data; rec->description = L"AT/AT COMPATIBLE"; rec->domain = L"WORKGROUP"; rec->domainrole = 0; /* standalone workstation */ - rec->manufacturer = L"The Wine Project"; - rec->model = L"Wine"; + rec->manufacturer = get_compsysproduct_vendor( buf, len ); + rec->model = get_compsysproduct_name( buf, len ); rec->name = get_computername(); rec->num_logical_processors = get_logical_processor_count( NULL, &rec->num_processors ); rec->systemtype = get_systemtype(); @@ -1647,24 +1679,13 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; + free( buf ); + TRACE("created %u rows\n", row); table->num_rows = row; return status; } -static WCHAR *get_compsysproduct_string( BYTE id, const char *buf, UINT len ) -{ - const struct smbios_header *hdr; - const struct smbios_system *system; - UINT offset; - - if (!(hdr = find_smbios_entry( SMBIOS_TYPE_SYSTEM, buf, len ))) return NULL; - - system = (const struct smbios_system *)hdr; - offset = (const char *)system - buf + system->hdr.length; - return get_smbios_string( id, buf, offset, len ); -} - static WCHAR *get_compsysproduct_identifyingnumber( const char *buf, UINT len ) { WCHAR *ret = get_compsysproduct_string( 4, buf, len ); @@ -1672,13 +1693,6 @@ static WCHAR *get_compsysproduct_identifyingnumber( const char *buf, UINT len ) return ret; } -static WCHAR *get_compsysproduct_name( const char *buf, UINT len ) -{ - WCHAR *ret = get_compsysproduct_string( 2, buf, len ); - if (!ret) return wcsdup( L"Wine" ); - return ret; -} - static WCHAR *get_compsysproduct_uuid( const char *buf, UINT len ) { static const BYTE none[] = {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; @@ -1700,13 +1714,6 @@ done: return ret; } -static WCHAR *get_compsysproduct_vendor( const char *buf, UINT len ) -{ - WCHAR *ret = get_compsysproduct_string( 1, buf, len ); - if (!ret) return wcsdup( L"The Wine Project" ); - return ret; -} - static WCHAR *get_compsysproduct_version( const char *buf, UINT len ) { WCHAR *ret = get_compsysproduct_string( 3, buf, len );

1 0

Hugh McMaster : regedit: Replace heap_x*() functions with malloc(), realloc() and free().
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: a6063f836737fd1bb3719a607885b6a0533c7f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6063f836737fd1bb3719a60… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 7 21:55:37 2022 +1000 regedit: Replace heap_x*() functions with malloc(), realloc() and free(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 29 +++++----- programs/regedit/edit.c | 36 ++++++------- programs/regedit/framewnd.c | 46 ++++++++-------- programs/regedit/hexedit.c | 25 +++++---- programs/regedit/listview.c | 30 +++++------ programs/regedit/main.c | 1 - programs/regedit/main.h | 3 +- programs/regedit/regedit.c | 14 ++--- programs/regedit/regproc.c | 128 +++++++++++++++++--------------------------- programs/regedit/treeview.c | 54 +++++++++---------- 10 files changed, 163 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6063f836737fd1bb371…

1 0

Akihiro Sagawa : mciqtz32: Fix thread handle leak if a second play.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: de0794a1ddbfaa5bab9728e5d8f956541079c341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de0794a1ddbfaa5bab9728e5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 5 21:02:49 2022 +0900 mciqtz32: Fix thread handle leak if a second play. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 11 +++++++---- dlls/winmm/tests/mci.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index a7ec0b78f33..5bde3f5dd14 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -449,10 +449,13 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms IVideoWindow_put_Visible(wma->vidwin, OATRUE); - wma->thread = CreateThread(NULL, 0, MCIQTZ_notifyThread, wma, 0, NULL); - if (!wma->thread) { - TRACE("Can't create thread\n"); - return MCIERR_INTERNAL; + if (!wma->thread) + { + wma->thread = CreateThread(NULL, 0, MCIQTZ_notifyThread, wma, 0, NULL); + if (!wma->thread) { + TRACE("Can't create thread\n"); + return MCIERR_INTERNAL; + } } return 0; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index cfad9a77da8..2e31cf51708 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1336,6 +1336,19 @@ static void test_playWaveTypeMpegvideo(void) err = mciSendStringA("close mysound", NULL, 0, NULL); ok(!err,"mci close returned %s\n", dbg_mcierr(err)); + + /* test a second play */ + err = mciSendStringA("open tempfile.wav type MPEGVideo alias mysound", NULL, 0, NULL); + ok(err==ok_saved,"mci open tempfile.wav type MPEGVideo returned %s\n", dbg_mcierr(err)); + + err = mciSendStringA("play mysound", NULL, 0, NULL); + ok(!err,"mci play retuend %s\n", dbg_mcierr(err)); + + err = mciSendStringA("play mysound", NULL, 0, NULL); + ok(!err,"mci play retuend %s\n", dbg_mcierr(err)); + + err = mciSendStringA("close mysound", NULL, 0, NULL); + ok(!err,"mci close returned %s\n", dbg_mcierr(err)); } static void test_asyncWaveTypeMpegvideo(HWND hwnd)

1 0

Zebediah Figura : d3d8/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 43f23d3e63f3943b286400b151a1ff4adc9250b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f23d3e63f3943b286400b1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 7 03:46:05 2022 +0000 d3d8/tests: Build without -DWINE_NO_LONG_TYPES. --- dlls/d3d8/tests/Makefile.in | 1 - dlls/d3d8/tests/device.c | 2538 ++++++++++++++++---------------- dlls/d3d8/tests/stateblock.c | 118 +- dlls/d3d8/tests/visual.c | 3278 +++++++++++++++++++++--------------------- dlls/d3d9/tests/d3d9ex.c | 3 +- 5 files changed, 2942 insertions(+), 2996 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43f23d3e63f3943b2864…

1 0

Zebediah Figura : d3d8/tests: Make getPixelColor() checks into actual ok() calls.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: dae1c93f5cc8c2f071fc22deaf2a95b1c7768195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae1c93f5cc8c2f071fc22de… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 7 03:46:04 2022 +0000 d3d8/tests: Make getPixelColor() checks into actual ok() calls. These should never fail. --- dlls/d3d8/tests/visual.c | 92 +++++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index fa0030b2187..bd600b44c2f 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -114,56 +114,28 @@ static void get_rt_readback(IDirect3DSurface8 *surface, struct surface_readback hr = IDirect3DSurface8_GetDesc(surface, &desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); hr = IDirect3DDevice8_CreateTexture(device, desc.Width, desc.Height, 1, 0, desc.Format, D3DPOOL_SYSTEMMEM, &tex); - if (FAILED(hr) || !tex) - { - trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr); - goto error; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirect3DTexture8_GetSurfaceLevel(tex, 0, &rb->surface); - if (FAILED(hr)) - { - trace("Can't get surface from texture, hr %#x.\n", hr); - goto error; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirect3DDevice8_CopyRects(device, surface, NULL, 0, rb->surface, NULL); - if (FAILED(hr)) - { - trace("Can't read the render target, hr %#x.\n", hr); - goto error; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirect3DSurface8_LockRect(rb->surface, &rb->locked_rect, NULL, D3DLOCK_READONLY); - if (FAILED(hr)) - { - trace("Can't lock the offscreen surface, hr %#x.\n", hr); - goto error; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); IDirect3DTexture8_Release(tex); IDirect3DDevice8_Release(device); - return; - -error: - if (rb->surface) - IDirect3DSurface8_Release(rb->surface); - rb->surface = NULL; - if (tex) - IDirect3DTexture8_Release(tex); - IDirect3DDevice8_Release(device); } static DWORD get_readback_color(struct surface_readback *rb, unsigned int x, unsigned int y) { - return rb->locked_rect.pBits - ? ((DWORD *)rb->locked_rect.pBits)[y * rb->locked_rect.Pitch / sizeof(DWORD) + x] : 0xdeadbeef; + return ((DWORD *)rb->locked_rect.pBits)[y * rb->locked_rect.Pitch / sizeof(DWORD) + x]; } static void release_surface_readback(struct surface_readback *rb) { HRESULT hr; - if (!rb->surface) - return; - if (rb->locked_rect.pBits && FAILED(hr = IDirect3DSurface8_UnlockRect(rb->surface))) - trace("Can't unlock the offscreen surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_UnlockRect(rb->surface); + ok(hr == S_OK, "Got hr %#x.\n", hr); IDirect3DSurface8_Release(rb->surface); } @@ -175,11 +147,7 @@ static DWORD getPixelColor(IDirect3DDevice8 *device, UINT x, UINT y) HRESULT hr; hr = IDirect3DDevice8_GetRenderTarget(device, &rt); - if (FAILED(hr)) - { - trace("Can't get the render target, hr %#x.\n", hr); - return 0xdeadbeef; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); get_rt_readback(rt, &rb); /* Remove the X channel for now. DirectX and OpenGL have different ideas how to treat it apparently, and it isn't @@ -6812,6 +6780,7 @@ done: static void test_updatetexture(void) { + D3DADAPTER_IDENTIFIER8 identifier; IDirect3DDevice8 *device; IDirect3D8 *d3d; HWND window; @@ -6922,6 +6891,8 @@ static void test_updatetexture(void) return; } + hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); @@ -7110,6 +7081,11 @@ static void test_updatetexture(void) if (do_visual_test) { + IDirect3DTexture8 *rb_texture; + struct surface_readback rb; + IDirect3DSurface8 *rt; + D3DSURFACE_DESC desc; + hr = IDirect3DDevice8_SetTexture(device, 0, dst); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); @@ -7124,10 +7100,38 @@ static void test_updatetexture(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken_result) - || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ - "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); + /* Read back manually. WARP often completely breaks down with + * these draws and fails to copy to the staging texture. */ + + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirect3DSurface8_GetDesc(rt, &desc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, desc.Width, desc.Height, + 1, 0, desc.Format, D3DPOOL_SYSTEMMEM, &rb_texture); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(rb_texture, 0, &rb.surface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, rt, NULL, 0, rb.surface, NULL); + ok(hr == S_OK || broken(adapter_is_warp(&identifier)), "Got hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface8_LockRect(rb.surface, &rb.locked_rect, NULL, D3DLOCK_READONLY); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + color = get_readback_color(&rb, 320, 240) & 0x00ffffff; + ok(color_match(color, 0x007f7f00, 3) || broken(tests[i].broken_result), + "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); + + hr = IDirect3DSurface8_UnlockRect(rb.surface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + + IDirect3DSurface8_Release(rb.surface); + IDirect3DTexture8_Release(rb_texture); + IDirect3DSurface8_Release(rt); } IDirect3DBaseTexture8_Release(src);

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
64
Older →

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