wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Alexandre Julliard : ntdll: Set the initial DllPath to null if it's empty.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 9bdfb1f34a4f512488c198555249a49f4e7c1172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bdfb1f34a4f512488c19855… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 12:05:41 2021 +0100 ntdll: Set the initial DllPath to null if it's empty. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 256ea40cc87..2f4d988d709 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2011,7 +2011,7 @@ void init_startup_info(void) params->CurrentDirectory.DosPath.MaximumLength = MAX_PATH * sizeof(WCHAR); dst = params->CurrentDirectory.DosPath.Buffer + MAX_PATH; - copy_unicode_string( &src, &dst, &params->DllPath, info->dllpath_len ); + if (info->dllpath_len) copy_unicode_string( &src, &dst, &params->DllPath, info->dllpath_len ); copy_unicode_string( &src, &dst, &params->ImagePathName, info->imagepath_len ); copy_unicode_string( &src, &dst, &params->CommandLine, info->cmdline_len ); copy_unicode_string( &src, &dst, &params->WindowTitle, info->title_len );

1 0

Alexandre Julliard : ntdll: Use start /exec to support absolute Unix paths.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 50e33a213d7382906594e565b5813a41d87117fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=50e33a213d7382906594e565… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:31:46 2021 +0100 ntdll: Use start /exec to support absolute Unix paths. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50858 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f7ba8ce8ab5..256ea40cc87 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1880,12 +1880,11 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) if (status) /* try launching it through start.exe */ { - static const WCHAR slashwW[] = {'/','w',0}; - static const WCHAR slashbW[] = {'/','b',0}; - const WCHAR *args[] = { NULL, slashwW, slashbW }; + static const WCHAR execW[] = {'/','e','x','e','c',0}; + const WCHAR *args[] = { NULL, execW }; free( image ); - prepend_main_wargv( args, 3 ); + prepend_main_wargv( args, 2 ); load_start_exe( &image, &module, &image_info ); }

1 0

Alexandre Julliard : ntdll: Add a helper to launch start.exe always as builtin.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: aef821ccbd9f2b7c8980c289316696eb4a3bca3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef821ccbd9f2b7c8980c289… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:29:37 2021 +0100 ntdll: Add a helper to launch start.exe always as builtin. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 12 +++--------- dlls/ntdll/unix/loader.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 07b9f0fc384..f7ba8ce8ab5 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1880,23 +1880,17 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) if (status) /* try launching it through start.exe */ { - static const WCHAR startW[] = {'C',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','t','e','m','3','2','\\','s','t','a','r','t','.','e','x','e',0}; static const WCHAR slashwW[] = {'/','w',0}; static const WCHAR slashbW[] = {'/','b',0}; - const WCHAR *args[] = { startW, slashwW, slashbW }; + const WCHAR *args[] = { NULL, slashwW, slashbW }; free( image ); prepend_main_wargv( args, 3 ); - if ((status = load_main_exe( startW, NULL, curdir, &image, &module, &image_info ))) - { - MESSAGE( "wine: failed to start %s\n", debugstr_w(main_wargv[2]) ); - NtTerminateProcess( GetCurrentProcess(), status ); - } + load_start_exe( &image, &module, &image_info ); } - else main_wargv[0] = get_dos_path( image ); NtCurrentTeb()->Peb->ImageBaseAddress = module; + main_wargv[0] = get_dos_path( image ); cmdline = build_command_line( main_wargv ); TRACE( "image %s cmdline %s dir %s\n", diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 24cc546c300..2467b640a79 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1544,6 +1544,32 @@ failed: } +/*********************************************************************** + * load_start_exe + * + * Load start.exe as main image. + */ +NTSTATUS load_start_exe( WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) +{ + static const WCHAR startW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\','s','t','a','r','t','.','e','x','e',0}; + UNICODE_STRING nt_name; + NTSTATUS status; + SIZE_T size; + + init_unicode_string( &nt_name, startW ); + status = find_builtin_dll( &nt_name, module, &size, image_info, current_machine, FALSE ); + if (status) + { + MESSAGE( "wine: failed to load start.exe: %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + *image = malloc( sizeof(startW) ); + memcpy( *image, startW, sizeof(startW) ); + return status; +} + + #ifdef __FreeBSD__ /* The PT_LOAD segments are sorted in increasing order, and the first * starts at the beginning of the ELF file. By parsing the file, we can diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a486a2ff0f4..3f84fa9c065 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -145,6 +145,7 @@ extern NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *fi void **addr_ptr, SIZE_T *size_ptr ) DECLSPEC_HIDDEN; extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; +extern NTSTATUS load_start_exe( WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern ULONG_PTR get_image_address(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Check the main image for Unix path only the first time around.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 967100258fb1da850668e620c1c5095630576840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=967100258fb1da850668e620… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:24:35 2021 +0100 ntdll: Check the main image for Unix path only the first time around. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50858 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 6 +++--- dlls/ntdll/unix/loader.c | 8 ++++---- dlls/ntdll/unix/unix_private.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e4932473fcc..07b9f0fc384 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1871,7 +1871,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) add_registry_environment( &env, &env_pos, &env_size ); env[env_pos++] = 0; - status = load_main_exe( main_wargv[0], curdir, &image, &module, &image_info ); + status = load_main_exe( main_wargv[0], main_argv[0], curdir, &image, &module, &image_info ); if (!status && image_info.Machine != current_machine) /* need to restart for Wow64 */ { NtUnmapViewOfSection( GetCurrentProcess(), module ); @@ -1888,7 +1888,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) free( image ); prepend_main_wargv( args, 3 ); - if ((status = load_main_exe( startW, curdir, &image, &module, &image_info ))) + if ((status = load_main_exe( startW, NULL, curdir, &image, &module, &image_info ))) { MESSAGE( "wine: failed to start %s\n", debugstr_w(main_wargv[2]) ); NtTerminateProcess( GetCurrentProcess(), status ); @@ -2042,7 +2042,7 @@ void init_startup_info(void) free( info ); NtCurrentTeb()->Peb->ProcessParameters = params; - status = load_main_exe( params->ImagePathName.Buffer, params->CommandLine.Buffer, + status = load_main_exe( params->ImagePathName.Buffer, NULL, params->CommandLine.Buffer, &image, &module, &image_info ); if (status) { diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a8b06d690a6..24cc546c300 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1500,8 +1500,8 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO /*********************************************************************** * load_main_exe */ -NTSTATUS load_main_exe( const WCHAR *name, const WCHAR *curdir, WCHAR **image, void **module, - SECTION_IMAGE_INFORMATION *image_info ) +NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, + WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) { UNICODE_STRING nt_name; NTSTATUS status; @@ -1510,9 +1510,9 @@ NTSTATUS load_main_exe( const WCHAR *name, const WCHAR *curdir, WCHAR **image, v const WCHAR *p; /* special case for Unix file name */ - if (main_argv[0][0] == '/' && !stat( main_argv[0], &st )) + if (unix_name && unix_name[0] == '/' && !stat( unix_name, &st )) { - if ((status = unix_to_nt_file_name( main_argv[0], image ))) goto failed; + if ((status = unix_to_nt_file_name( unix_name, image ))) goto failed; status = open_main_image( *image, module, image_info ); if (status != STATUS_DLL_NOT_FOUND) return status; free( *image ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 8e491a3f2a4..a486a2ff0f4 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -143,8 +143,8 @@ extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN; extern NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, void **addr_ptr, SIZE_T *size_ptr ) DECLSPEC_HIDDEN; -extern NTSTATUS load_main_exe( const WCHAR *name, const WCHAR *curdir, WCHAR **image, void **module, - SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; +extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, + void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern ULONG_PTR get_image_address(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : start: Add a private /exec option to replicate the Wine command-line usage.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 15a6ee944049bc15110b2219721a49b1afc268f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a6ee944049bc15110b2219… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:27:56 2021 +0100 start: Add a private /exec option to replicate the Wine command-line usage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 92 +++++++++++++++++++++++++++++++++++++++++++-- po/ast.po | 38 +++++++++++++++++-- po/bg.po | 38 +++++++++++++++++-- po/ca.po | 98 ++++++++++++++++++++++++++++++++++++++++++++++-- po/cs.po | 38 +++++++++++++++++-- po/da.po | 38 +++++++++++++++++-- po/de.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/el.po | 38 +++++++++++++++++-- po/en.po | 66 +++++++++++++++++++++++++++++++-- po/en_US.po | 66 +++++++++++++++++++++++++++++++-- po/eo.po | 38 +++++++++++++++++-- po/es.po | 38 +++++++++++++++++-- po/fa.po | 38 +++++++++++++++++-- po/fi.po | 95 +++++++++++++++++++++++++++++++++++++++++++++-- po/fr.po | 99 +++++++++++++++++++++++++++++++++++++++++++++++-- po/he.po | 38 +++++++++++++++++-- po/hi.po | 38 +++++++++++++++++-- po/hr.po | 38 +++++++++++++++++-- po/hu.po | 38 +++++++++++++++++-- po/it.po | 38 +++++++++++++++++-- po/ja.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/ko.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/lt.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/ml.po | 38 +++++++++++++++++-- po/nb_NO.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/nl.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/or.po | 38 +++++++++++++++++-- po/pa.po | 38 +++++++++++++++++-- po/pl.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/pt_BR.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/pt_PT.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/rm.po | 38 +++++++++++++++++-- po/ro.po | 38 +++++++++++++++++-- po/ru.po | 95 +++++++++++++++++++++++++++++++++++++++++++++-- po/si.po | 66 +++++++++++++++++++++++++++++++-- po/sk.po | 38 +++++++++++++++++-- po/sl.po | 38 +++++++++++++++++-- po/sr_RS(a)cyrillic.po | 38 +++++++++++++++++-- po/sr_RS(a)latin.po | 38 +++++++++++++++++-- po/sv.po | 97 ++++++++++++++++++++++++++++++++++++++++++++++-- po/ta.po | 38 +++++++++++++++++-- po/te.po | 38 +++++++++++++++++-- po/th.po | 38 +++++++++++++++++-- po/tr.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/uk.po | 38 +++++++++++++++++-- po/wa.po | 38 +++++++++++++++++-- po/wine.pot | 38 +++++++++++++++++-- po/zh_CN.po | 93 ++++++++++++++++++++++++++++++++++++++++++++-- po/zh_TW.po | 91 +++++++++++++++++++++++++++++++++++++++++++-- programs/start/start.c | 25 +++++++------ programs/start/start.rc | 1 + 51 files changed, 2849 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15a6ee944049bc15110b…

1 0

Francois Gouget : winetest: Remove the obsolete revision placeholder.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 12cfe6826773708e3b15f73b9674ccb959000d8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=12cfe6826773708e3b15f73b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 24 14:30:05 2021 +0100 winetest: Remove the obsolete revision placeholder. Back in the CVS days the start line contained the revision of the test file. But it has been replaced by a placeholder since the switch to Git. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 225e9a2548b..eaf83a48f62 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -796,7 +796,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch if (test_filtered_out( test->name, subtest )) { report (R_STEP, "Skipping: %s:%s", test->name, subtest); - xprintf ("%s:%s skipped %s -\n", test->name, subtest, file); + xprintf ("%s:%s skipped %s\n", test->name, subtest, file); nr_of_skips++; } else @@ -805,7 +805,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch DWORD pid, start = GetTickCount(); char *cmd = strmake (NULL, "%s %s", test->exename, subtest); report (R_STEP, "Running: %s:%s", test->name, subtest); - xprintf ("%s:%s start %s -\n", test->name, subtest, file); + xprintf ("%s:%s start %s\n", test->name, subtest, file); status = run_ex (cmd, out_file, tempdir, 120000, FALSE, &pid); heap_free (cmd); xprintf ("%s:%s:%04x done (%d) in %ds\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000);

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_index_buffer().
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 8c6cce75d31b943fbde0990cf1e8a0620ef9b335 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c6cce75d31b943fbde0990c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 10:39:18 2021 -0500 d3d11: Use wined3d_device_context_set_index_buffer(). 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 63172472b0e..9b2652b49ec 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -686,14 +686,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_IASetIndexBuffer(ID3D11DeviceContext1 *iface, ID3D11Buffer *buffer, DXGI_FORMAT format, UINT offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_buffer *buffer_impl = unsafe_impl_from_ID3D11Buffer(buffer); TRACE("iface %p, buffer %p, format %s, offset %u.\n", iface, buffer, debug_dxgi_format(format), offset); wined3d_mutex_lock(); - wined3d_device_set_index_buffer(device->wined3d_device, + wined3d_device_context_set_index_buffer(context->wined3d_context, buffer_impl ? buffer_impl->wined3d_buffer : NULL, wined3dformat_from_dxgi_format(format), offset); wined3d_mutex_unlock(); @@ -2615,7 +2615,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon { wined3d_device_context_set_stream_source(context->wined3d_context, i, NULL, 0, 0); } - wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN, 0); + wined3d_device_context_set_index_buffer(context->wined3d_context, NULL, WINED3DFMT_UNKNOWN, 0); wined3d_device_set_vertex_declaration(device->wined3d_device, NULL); wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_UNDEFINED, 0); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_index_buffer().
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: b21a9e41beecadc2afa9098695856c315aa89bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21a9e41beecadc2afa90986… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 10:39:17 2021 -0500 wined3d: Introduce wined3d_device_context_set_index_buffer(). 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/device.c | 49 ++++++++++++++++++++++++++++------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6bfa90e026..c3ad3dae3fe 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1536,29 +1536,10 @@ static void wined3d_device_set_material(struct wined3d_device *device, const str void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) { - struct wined3d_state *state = device->cs->c.state; - enum wined3d_format_id prev_format; - struct wined3d_buffer *prev_buffer; - unsigned int prev_offset; - TRACE("device %p, buffer %p, format %s, offset %u.\n", device, buffer, debug_d3dformat(format_id), offset); - prev_buffer = state->index_buffer; - prev_format = state->index_format; - prev_offset = state->index_offset; - - if (prev_buffer == buffer && prev_format == format_id && prev_offset == offset) - return; - - if (buffer) - wined3d_buffer_incref(buffer); - state->index_buffer = buffer; - state->index_format = format_id; - state->index_offset = offset; - wined3d_device_context_emit_set_index_buffer(&device->cs->c, buffer, format_id, offset); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); + wined3d_device_context_set_index_buffer(&device->cs->c, buffer, format_id, offset); } struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, @@ -2372,6 +2353,34 @@ HRESULT CDECL wined3d_device_context_set_stream_source(struct wined3d_device_con return WINED3D_OK; } +void CDECL wined3d_device_context_set_index_buffer(struct wined3d_device_context *context, + struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) +{ + struct wined3d_state *state = context->state; + enum wined3d_format_id prev_format; + struct wined3d_buffer *prev_buffer; + unsigned int prev_offset; + + TRACE("context %p, buffer %p, format %s, offset %u.\n", + context, buffer, debug_d3dformat(format_id), offset); + + prev_buffer = state->index_buffer; + prev_format = state->index_format; + prev_offset = state->index_offset; + + if (prev_buffer == buffer && prev_format == format_id && prev_offset == offset) + return; + + if (buffer) + wined3d_buffer_incref(buffer); + state->index_buffer = buffer; + state->index_format = format_id; + state->index_offset = offset; + wined3d_device_context_emit_set_index_buffer(context, buffer, format_id, offset); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cac0c19bab4..54d4ef4c23c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -170,6 +170,7 @@ @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_depth_stencil_view(ptr ptr) +@ cdecl wined3d_device_context_set_index_buffer(ptr ptr long long) @ cdecl wined3d_device_context_set_predication(ptr ptr long) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) @ cdecl wined3d_device_context_set_rendertarget_view(ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3f29b78044e..3937f1f5be2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2563,6 +2563,8 @@ void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_devic struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); HRESULT __cdecl wined3d_device_context_set_depth_stencil_view(struct wined3d_device_context *context, struct wined3d_rendertarget_view *view); +void __cdecl wined3d_device_context_set_index_buffer(struct wined3d_device_context *context, + struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset); void __cdecl wined3d_device_context_set_predication(struct wined3d_device_context *context, struct wined3d_query *predicate, BOOL value); void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_index_buffer().
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 37e17804083105dd1fb4ac2aee11608e674957fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e17804083105dd1fb4ac2a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 10:39:16 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_index_buffer(). 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 | 6 +++--- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f32699c40cd..468819b604b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1395,18 +1395,18 @@ static void wined3d_cs_exec_set_index_buffer(struct wined3d_cs *cs, const void * device_invalidate_state(cs->c.device, STATE_INDEXBUFFER); } -void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, +void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) { struct wined3d_cs_set_index_buffer *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_SET_INDEX_BUFFER; op->buffer = buffer; op->format_id = format_id; op->offset = offset; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12dae835cec..e6bfa90e026 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1556,7 +1556,7 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, state->index_buffer = buffer; state->index_format = format_id; state->index_offset = offset; - wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id, offset); + wined3d_device_context_emit_set_index_buffer(&device->cs->c, buffer, format_id, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); } @@ -1795,7 +1795,8 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 state->streams[i].offset, state->streams[i].stride); } - wined3d_cs_emit_set_index_buffer(device->cs, state->index_buffer, state->index_format, state->index_offset); + wined3d_device_context_emit_set_index_buffer(context, state->index_buffer, + state->index_format, state->index_offset); wined3d_device_context_emit_set_predication(context, state->predicate, state->predicate_value); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3c165716e1..7c43695e5f0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4754,8 +4754,6 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_feature_level(struct wined3d_cs *cs, enum wined3d_feature_level level) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, - enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; @@ -4805,6 +4803,8 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, + enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context, struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_stream_source().
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: baf87afd01e5967cbb645371a24d9e28c6bb2a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf87afd01e5967cbb645371… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 10:39:15 2021 -0500 d3d11: Use wined3d_device_context_set_stream_source(). 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6e0ae6d695b..63172472b0e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -666,7 +666,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11Dev static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *strides, const UINT *offsets) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n", @@ -677,7 +677,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11D { struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - wined3d_device_set_stream_source(device->wined3d_device, start_slot + i, + wined3d_device_context_set_stream_source(context->wined3d_context, start_slot + i, buffer ? buffer->wined3d_buffer : NULL, offsets[i], strides[i]); } wined3d_mutex_unlock(); @@ -2613,7 +2613,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon } for (i = 0; i < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) { - wined3d_device_set_stream_source(device->wined3d_device, i, NULL, 0, 0); + wined3d_device_context_set_stream_source(context->wined3d_context, i, NULL, 0, 0); } wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN, 0); wined3d_device_set_vertex_declaration(device->wined3d_device, NULL);

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 March 2021