wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Francois Gouget : winetest/gather: Use the report platform as the column header.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: tools Branch: master Commit: 4686519e3fa83b3eaa7c62b06316b73b481d4408 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4686519e3fa83b3eaa7c62b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 9 11:40:46 2021 +0200 winetest/gather: Use the report platform as the column header. A group index page may contain reports from different but related platforms, for instance Windows 8 and 8.1, or Windows 10 1507 and 1607. This allows immediately identifying a report's exact Windows version. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index 302def4..51d4838 100755 --- a/winetest/gather +++ b/winetest/gather @@ -295,9 +295,12 @@ foreach my $file (glob "$builddir/*/summary.txt") { next; } - my $report = { group => $group}; - $report->{tag} = @tag?"@tag":""; - $report->{dir} = $dir; + my $report = { + id => $id, + group => $group, + tag => @tag ? "@tag" : "", + dir => $dir, + }; if (!open TEST, "<$file") { error("could not open '$file' for reading: $!\n"); next; @@ -523,7 +526,7 @@ sub build_header_footer($) if (!defined $msg) { $msg = <<"EOF"; - $group->{name} + $report->{id} <a href=\"$report->{dir}/version.html\">$report->{tag}</a> EOF chop $msg;

1 0

Francois Gouget : winetest/build-index: Delete obsolete test unit HTML files.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: tools Branch: master Commit: ac55e068a5e73c18eb0ae8806436d3e017172e0b URL: https://source.winehq.org/git/tools.git/?a=commit;h=ac55e068a5e73c18eb0ae88… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 9 11:38:27 2021 +0200 winetest/build-index: Delete obsolete test unit HTML files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/winetest/build-index b/winetest/build-index index f2e3dcf..91c7c92 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -341,6 +341,22 @@ EOF } } +# And delete obsolete test files +opendir(DIR, "data/tests") or die "could not open the 'data/tests' directory: $!"; +foreach my $entry (readdir(DIR)) +{ + next if ($entry eq "." or $entry eq ".."); + my $test = $entry; + $test =~ s/\.html$//; + next if ($alltests{$test}); + if (!unlink "data/tests/$entry") + { + error("could not delete 'data/tests/$entry': $!\n"); + } + +} +closedir(DIR); + # # Read each build's total.txt file

1 0

Alistair Leslie-Hughes : ntdll: Stub NtQuerySystemInformation(SystemCodeIntegrityInformation).
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 3269da9b46eaec8e3ea263fc8ecfcd24d3d8b6e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3269da9b46eaec8e3ea263fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 7 23:44:38 2021 -0500 ntdll: Stub NtQuerySystemInformation(SystemCodeIntegrityInformation). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49192 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 15 +++++++++++++++ include/winternl.h | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 2b316095f4a..d3e380b8c32 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2827,6 +2827,21 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCodeIntegrityInformation: + { + SYSTEM_CODEINTEGRITY_INFORMATION *integrity_info = info; + + FIXME("SystemCodeIntegrityInformation, size %u, info %p, stub!\n", size, info); + + len = sizeof(SYSTEM_CODEINTEGRITY_INFORMATION); + + if (size < len) + integrity_info->CodeIntegrityOptions = CODEINTEGRITY_OPTION_ENABLED; + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + default: FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size ); diff --git a/include/winternl.h b/include/winternl.h index 298ebbc2d36..7632cfcb999 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1698,6 +1698,27 @@ typedef enum _SYSTEM_INFORMATION_CLASS { #endif } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; +typedef struct _SYSTEM_CODEINTEGRITY_INFORMATION +{ + ULONG Length; + ULONG CodeIntegrityOptions; +} SYSTEM_CODEINTEGRITY_INFORMATION, *PSYSTEM_CODEINTEGRITY_INFORMATION; + +#define CODEINTEGRITY_OPTION_ENABLED 0x0001 +#define CODEINTEGRITY_OPTION_TESTSIGN 0x0002 +#define CODEINTEGRITY_OPTION_UMCI_ENABLED 0x0004 +#define CODEINTEGRITY_OPTION_UMCI_AUDITMODE_ENABLED 0x0008 +#define CODEINTEGRITY_OPTION_UMCI_EXCLUSIONPATHS_ENABLED 0x0010 +#define CODEINTEGRITY_OPTION_TEST_BUILD 0x0020 +#define CODEINTEGRITY_OPTION_PREPRODUCTION_BUILD 0x0040 +#define CODEINTEGRITY_OPTION_DEBUGMODE_ENABLED 0x0080 +#define CODEINTEGRITY_OPTION_FLIGHT_BUILD 0x0100 +#define CODEINTEGRITY_OPTION_FLIGHTING_ENABLED 0x0200 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_ENABLED 0x0400 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_AUDITMODE_ENABLED 0x0800 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_STRICTMODE_ENABLED 0x1000 +#define CODEINTEGRITY_OPTION_HVCI_IUM_ENABLED 0x2000 + typedef enum _THREADINFOCLASS { ThreadBasicInformation = 0, ThreadTimes,

1 0

Hugh McMaster : reg: Allow /reg:32 and /reg:64 switches to be passed via the command line.
by Alexandre Julliard 08 Apr '21

08 Apr '21

1 0

Hugh McMaster : reg: Print additional help messages when syntax is invalid.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 010cb1b4057550b2eb6c371db5ba5a8d11ef337e URL: https://source.winehq.org/git/wine.git/?a=commit;h=010cb1b4057550b2eb6c371d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 8 22:10:53 2021 +1000 reg: Print additional help messages when syntax is invalid. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 3 ++- programs/reg/delete.c | 3 ++- programs/reg/query.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index d94789ad484..4b50a13b975 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -273,6 +273,7 @@ int reg_add(int argc, WCHAR *argvW[]) return run_add(root, path, value_name, value_empty, type, separator, data, force); invalid: - output_message(STRING_INVALID_CMDLINE); + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); return 1; } diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 239bbbc672b..f1b29e6f3a2 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -163,6 +163,7 @@ int reg_delete(int argc, WCHAR *argvW[]) return run_delete(root, path, key_name, value_name, value_empty, value_all, force); invalid: - output_message(STRING_INVALID_CMDLINE); + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); return 1; } diff --git a/programs/reg/query.c b/programs/reg/query.c index 76f12b4a2d3..d2a7968fa0b 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -373,6 +373,7 @@ int reg_query(int argc, WCHAR *argvW[]) return run_query(root, path, key_name, value_name, value_empty, recurse); invalid: - output_message(STRING_INVALID_CMDLINE); + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); return 1; }

1 0

Hugh McMaster : reg/tests: Add tests for trailing backslashes after the system key.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: a47829e13d639831ab9f36ba4592b840259e6f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a47829e13d639831ab9f36ba… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 8 22:06:51 2021 +1000 reg/tests: Add tests for trailing backslashes after the system key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index e1e7a478502..2c5a8f34ce2 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -268,6 +268,14 @@ static void test_add(void) verify_key(hkey, "keytest4"); delete_key(hkey, "keytest4"); + run_reg_exe("reg add HKCU\\ /v Value1 /t REG_SZ /d foo /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(HKEY_CURRENT_USER, "Value1"); + + run_reg_exe("reg add HKEY_CURRENT_USER\\ /v Value2 /t REG_SZ /d bar /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(HKEY_CURRENT_USER, "Value2"); + /* REG_NONE */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_clear_rendertarget_view().
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: fbd1e2eb6ba49e2f6b240664b70a702b3721cb26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbd1e2eb6ba49e2f6b240664… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 7 21:20:03 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_clear_rendertarget_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 16 ++++++++-------- dlls/d3d9/device.c | 2 +- dlls/ddraw/surface.c | 13 +++++++------ dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 6 +++--- 6 files changed, 26 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fbd1e2eb6ba49e2f6b24…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_clear_rendertarget_view().
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 4880afdc8e20bd3a8fdf31e139e6703601aa8c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4880afdc8e20bd3a8fdf31e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 7 21:20:02 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_clear_rendertarget_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 11 ++++++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 16a8385c0b4..a0b462b714a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -728,14 +728,15 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); } -void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, - const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) +void wined3d_device_context_emit_clear_rendertarget_view(struct wined3d_device_context *context, + struct wined3d_rendertarget_view *view, const RECT *rect, unsigned int flags, + const struct wined3d_color *color, float depth, unsigned int stencil) { struct wined3d_cs_clear *op; size_t size; size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(struct wined3d_fb_state); - op = wined3d_device_context_require_space(&cs->c, size, WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, size, WINED3D_CS_QUEUE_DEFAULT); op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; @@ -761,9 +762,9 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined wined3d_resource_acquire(view->resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3DCLEAR_SYNCHRONOUS) - wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_finish(context, WINED3D_CS_QUEUE_DEFAULT); } static void acquire_shader_resources(const struct wined3d_state *state, unsigned int shader_mask) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e21e22a46f7..e0eb5968df6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5237,7 +5237,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return hr; } - wined3d_cs_emit_clear_rendertarget_view(device->cs, view, rect, flags, color, depth, stencil); + wined3d_device_context_emit_clear_rendertarget_view(&device->cs->c, view, rect, flags, color, depth, stencil); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5fee3bf14aa..bc541a654e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4725,8 +4725,6 @@ void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, struct wined3d_texture *texture, unsigned int layer) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; -void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, - const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; @@ -4780,6 +4778,9 @@ void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_clear_rendertarget_view(struct wined3d_device_context *context, + struct wined3d_rendertarget_view *view, const RECT *rect, unsigned int flags, + const struct wined3d_color *color, float depth, unsigned int stencil) DECLSPEC_HIDDEN; void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context *context, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : d3d9: Store the texture's parent device as a d3d9_device pointer.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: d4be20ac0d62722519cdc691205915b247146abb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4be20ac0d62722519cdc691… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 7 21:20:00 2021 -0500 d3d9: Store the texture's parent device as a d3d9_device pointer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 7bb277c2a75..50c3b38d795 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -225,7 +225,7 @@ struct d3d9_texture IDirect3DBaseTexture9 IDirect3DBaseTexture9_iface; struct d3d9_resource resource; struct wined3d_texture *wined3d_texture; - IDirect3DDevice9Ex *parent_device; + struct d3d9_device *parent_device; struct list rtv_list; DWORD usage; BOOL flags; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 3d1fbf12f99..d4738d2ca9f 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -401,7 +401,7 @@ static const struct wined3d_parent_ops d3d9_view_wined3d_parent_ops = struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface) { IDirect3DDevice9Ex *device; - device = surface->texture ? surface->texture->parent_device : surface->parent_device; + device = surface->texture ? &surface->texture->parent_device->IDirect3DDevice9Ex_iface : surface->parent_device; return impl_from_IDirect3DDevice9Ex(device); } diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index a8c2985c4ea..989e6fd81c1 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -79,7 +79,7 @@ static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource static void d3d9_texture_cleanup(struct d3d9_texture *texture) { - IDirect3DDevice9Ex *parent_device = texture->parent_device; + IDirect3DDevice9Ex *parent_device = &texture->parent_device->IDirect3DDevice9Ex_iface; struct d3d9_surface *surface; wined3d_mutex_lock(); @@ -141,7 +141,7 @@ static ULONG WINAPI d3d9_texture_2d_AddRef(IDirect3DTexture9 *iface) { struct d3d9_surface *surface; - IDirect3DDevice9Ex_AddRef(texture->parent_device); + IDirect3DDevice9Ex_AddRef(&texture->parent_device->IDirect3DDevice9Ex_iface); wined3d_mutex_lock(); LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) { @@ -172,7 +172,7 @@ static HRESULT WINAPI d3d9_texture_2d_GetDevice(IDirect3DTexture9 *iface, IDirec TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)texture->parent_device; + *device = (IDirect3DDevice9 *)&texture->parent_device->IDirect3DDevice9Ex_iface; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -539,7 +539,7 @@ static ULONG WINAPI d3d9_texture_cube_AddRef(IDirect3DCubeTexture9 *iface) { struct d3d9_surface *surface; - IDirect3DDevice9Ex_AddRef(texture->parent_device); + IDirect3DDevice9Ex_AddRef(&texture->parent_device->IDirect3DDevice9Ex_iface); wined3d_mutex_lock(); LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) { @@ -570,7 +570,7 @@ static HRESULT WINAPI d3d9_texture_cube_GetDevice(IDirect3DCubeTexture9 *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)texture->parent_device; + *device = (IDirect3DDevice9 *)&texture->parent_device->IDirect3DDevice9Ex_iface; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -961,7 +961,7 @@ static ULONG WINAPI d3d9_texture_3d_AddRef(IDirect3DVolumeTexture9 *iface) if (ref == 1) { - IDirect3DDevice9Ex_AddRef(texture->parent_device); + IDirect3DDevice9Ex_AddRef(&texture->parent_device->IDirect3DDevice9Ex_iface); wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); wined3d_mutex_unlock(); @@ -988,7 +988,7 @@ static HRESULT WINAPI d3d9_texture_3d_GetDevice(IDirect3DVolumeTexture9 *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)texture->parent_device; + *device = (IDirect3DDevice9 *)&texture->parent_device->IDirect3DDevice9Ex_iface; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -1386,8 +1386,8 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, return hr; } - texture->parent_device = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(texture->parent_device); + texture->parent_device = device; + IDirect3DDevice9Ex_AddRef(&texture->parent_device->IDirect3DDevice9Ex_iface); return D3D_OK; } @@ -1468,8 +1468,8 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic return hr; } - texture->parent_device = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(texture->parent_device); + texture->parent_device = device; + IDirect3DDevice9Ex_AddRef(&texture->parent_device->IDirect3DDevice9Ex_iface); return D3D_OK; } @@ -1535,8 +1535,8 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev return hr; } - texture->parent_device = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(texture->parent_device); + texture->parent_device = device; + IDirect3DDevice9Ex_AddRef(&texture->parent_device->IDirect3DDevice9Ex_iface); return D3D_OK; }

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_generate_mipmaps().
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 88456957fb05ef2e67012a6f30f66565c0ba2bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88456957fb05ef2e67012a6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 7 21:19:59 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_generate_mipmaps(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index fb8411b3048..16a8385c0b4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2650,17 +2650,18 @@ static void wined3d_cs_exec_generate_mipmaps(struct wined3d_cs *cs, const void * wined3d_resource_release(view->resource); } -void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shader_resource_view *view) +void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, + struct wined3d_shader_resource_view *view) { struct wined3d_cs_generate_mipmaps *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_GENERATE_MIPMAPS; op->view = view; wined3d_resource_acquire(view->resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_emit_stop(struct wined3d_cs *cs) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f0833ff9e49..d386ebe1866 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1423,7 +1423,7 @@ void CDECL wined3d_shader_resource_view_generate_mipmaps(struct wined3d_shader_r return; } - wined3d_cs_emit_generate_mipmaps(view->resource->device->cs, view); + wined3d_device_context_emit_generate_mipmaps(&view->resource->device->cs->c, view); } ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access_view *view) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 38f19b21fbf..5fee3bf14aa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4730,7 +4730,6 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; -void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; @@ -4788,6 +4787,8 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, + struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
87
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 April 2021