April 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : vbscript: Substitute SystemRoot at registration time.
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: wine Branch: master Commit: dbc5633f302093701d5a428a08891b897e7b41c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbc5633f302093701d5a428a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 20:27:26 2021 +0200 vbscript: Substitute SystemRoot at registration time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.rgs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/vbscript.rgs b/dlls/vbscript/vbscript.rgs index 4513b4d7fb0..01d4225234e 100644 --- a/dlls/vbscript/vbscript.rgs +++ b/dlls/vbscript/vbscript.rgs @@ -63,19 +63,19 @@ HKCR { Edit { - Command = s '"%%SystemRoot%%\system32\notepad.exe" %%1' + Command = s '"%SystemRoot%\system32\notepad.exe" %%1' } Open { - Command = s '"%%SystemRoot%%\system32\wscript.exe" "%%1" %%*' + Command = s '"%SystemRoot%\system32\wscript.exe" "%%1" %%*' } Open2 { - Command = s '"%%SystemRoot%%\system32\cscript.exe" "%%1" %%*' + Command = s '"%SystemRoot%\system32\cscript.exe" "%%1" %%*' } Print { - Command = s '"%%SystemRoot%%\system32\notepad.exe" /p %%1' + Command = s '"%SystemRoot%\system32\notepad.exe" /p %%1' } } }

1 0

Michael Stefaniuc : ntdll/tests: Remove superfluous casts to self.
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: wine Branch: master Commit: 8163dcb6c8f6cf21ed9849da5206de718f251ccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8163dcb6c8f6cf21ed9849da… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 8 22:54:47 2021 +0200 ntdll/tests: Remove superfluous casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index cdf3cdf8201..d6565c12fce 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1624,7 +1624,7 @@ static void test_thread_context(void) x87_control; } expect; NTSTATUS (*func_ptr)( struct expected *res, void *func, void *arg1, void *arg2, - DWORD *new_x87_control ) = (void *)code_mem; + DWORD *new_x87_control ) = code_mem; DWORD new_x87_control; static const BYTE call_func[] = @@ -3563,7 +3563,7 @@ static void test_thread_context(void) WORD SegCs, SegDs, SegEs, SegFs, SegGs, SegSs; } expect; XMM_SAVE_AREA32 broken_fltsave; - NTSTATUS (*func_ptr)( void *arg1, void *arg2, struct expected *res, void *func ) = (void *)code_mem; + NTSTATUS (*func_ptr)( void *arg1, void *arg2, struct expected *res, void *func ) = code_mem; static const BYTE call_func[] = { @@ -4195,7 +4195,7 @@ static void test_thread_context(void) { DWORD R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, Sp, Lr, Pc, Cpsr; } expect; - NTSTATUS (*func_ptr)( void *arg1, void *arg2, struct expected *res, void *func ) = (void *)code_mem; + NTSTATUS (*func_ptr)( void *arg1, void *arg2, struct expected *res, void *func ) = code_mem; static const DWORD call_func[] = { @@ -5381,7 +5381,7 @@ static void test_thread_context(void) X17, X18, X19, X20, X21, X22, X23, X24, X25, X26, X27, X28, Fp, Lr, Sp, Pc; ULONG Cpsr; } expect; - NTSTATUS (*func_ptr)( void *arg1, void *arg2, struct expected *res, void *func ) = (void *)code_mem; + NTSTATUS (*func_ptr)( void *arg1, void *arg2, struct expected *res, void *func ) = code_mem; static const DWORD call_func[] = {

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: wine Branch: master Commit: c3645c1f2272349951e2abfe847239e1b3d3baf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3645c1f2272349951e2abfe… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri Apr 9 10:24:17 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/po/nl.po b/po/nl.po index f5b2554991d..e5ea842cfea 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-03-26 15:45+0100\n" +"PO-Revision-Date: 2021-04-09 10:15+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -3974,7 +3974,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "Kan de eigenschap '|' niet definiëren: object is niet uitbreidbaar" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -14566,10 +14566,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "De bewerking is succesvol voltooid\n" +msgstr "reg: De bewerking is succesvol voltooid\n" #: programs/reg/reg.rc:117 msgid "reg: Invalid registry key\n" @@ -14584,13 +14582,8 @@ msgid "reg: Unable to access remote machine\n" msgstr "reg: Kan de computer op afstand niet benaderen\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "" -"reg: Het systeem kon de gespecificeerde registersleutel of waarde niet " -"vinden\n" +msgstr "reg: Kan de gegeven registerwaarde niet vinden\n" #: programs/reg/reg.rc:121 msgid "reg: Unsupported registry data type [%1]\n" @@ -14613,10 +14606,8 @@ msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgstr "De registerwaarde '%1' bestand bestaat al. Wilt u het vervangen?" #: programs/reg/reg.rc:129 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "De register bewerking is afgebroken\n" +msgstr "reg: De register bewerking is afgebroken\n" #: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -14778,19 +14769,12 @@ msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Het bestand '%1' bestaat al. Wilt u het overschrijven?" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "" -"reg: Het systeem kon de gespecificeerde registersleutel of waarde niet " -"vinden\n" +msgstr "reg: Kan de gegeven registersleutel niet vinden\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: Onmogelijk om de registersleutel '%1' te openen.\n" +msgstr "reg: Importeren van de registersleutel '%1' is niet mogelijk.\n" #: programs/reg/reg.rc:179 msgid "" @@ -14801,6 +14785,13 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" /reg:32\n" +" Open de 32-bits weergave van het register.\n" +"\n" +" /reg:64\n" +" Open de 64-bits weergave van het register.\n" +"\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

Alexandre Julliard : setupapi: Replace SystemRoot when registering dlls.
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: wine Branch: master Commit: 61f9bbd324e6510c977a8685d3d8725ae00f308f URL: https://source.winehq.org/git/wine.git/?a=commit;h=61f9bbd324e6510c977a8685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 20:27:20 2021 +0200 setupapi: Replace SystemRoot when registering dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 552bec27f31..852cef3d54f 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -843,6 +843,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, HRESULT hr = S_OK; HMODULE module = (HMODULE)((ULONG_PTR)data | 1); struct dll_data dll_data = { delay_copy, name, 0 }; + WCHAR buffer[MAX_PATH]; const WCHAR *p; if (!(p = wcsrchr( name, '\\' ))) p = name; @@ -873,6 +874,8 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, TRACE( "registering %s\n", debugstr_w(name) ); IRegistrar_ClearReplacements( registrar ); IRegistrar_AddReplacement( registrar, L"MODULE", name ); + GetEnvironmentVariableW( L"SystemRoot", buffer, ARRAY_SIZE(buffer) ); + IRegistrar_AddReplacement( registrar, L"SystemRoot", buffer ); EnumResourceNamesW( module, L"WINE_REGISTRY", register_resource, (LONG_PTR)&hr ); if (FAILED(hr)) ERR( "failed to register %s: %x\n", debugstr_w(name), hr ); }

1 0

Alexandre Julliard : winecrt0: Replace SystemRoot when registering dlls.
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: wine Branch: master Commit: 14aaa0a373cad5773a6aac939bc62cf229d94838 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14aaa0a373cad5773a6aac93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 20:27:06 2021 +0200 winecrt0: Replace SystemRoot when registering dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/register.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index cb5e7a50f76..2fb0b5f5420 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -32,6 +32,7 @@ static const WCHAR atl100W[] = {'a','t','l','1','0','0','.','d','l','l',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; +static const WCHAR systemrootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; struct reg_info { @@ -62,6 +63,8 @@ static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) GetModuleFileNameW( inst, str, MAX_PATH ); IRegistrar_AddReplacement( info->registrar, moduleW, str ); + GetEnvironmentVariableW( systemrootW, str, MAX_PATH ); + IRegistrar_AddReplacement( info->registrar, systemrootW, str ); } return info->registrar; }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: wine Branch: master Commit: dc540b9dc4a08ed1781a3e97045e4c80f1b5eaf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc540b9dc4a08ed1781a3e97… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Apr 9 07:55:20 2021 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/po/fi.po b/po/fi.po index cffeda4b6e2..9e0dbcb51c6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3953,7 +3953,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "Ominaisuutta '|' ei voi määritellä: objekti ei ole laajennettava" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -14456,10 +14456,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "Toiminnon suorittaminen onnistui\n" +msgstr "reg: Toiminnon suorittaminen onnistui\n" #: programs/reg/reg.rc:117 msgid "reg: Invalid registry key\n" @@ -14474,11 +14472,8 @@ msgid "reg: Unable to access remote machine\n" msgstr "reg: Ei pääsyä etäkoneelle\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" +msgstr "reg: Annettua rekisteriarvoa ei löydy\n" #: programs/reg/reg.rc:121 msgid "reg: Unsupported registry data type [%1]\n" @@ -14501,10 +14496,8 @@ msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgstr "Rekisterin arvo '%1' on jo olemassa. Haluatko korvata sen?" #: programs/reg/reg.rc:129 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "Rekisterin toimenpide peruttiin\n" +msgstr "reg: Rekisterin toimenpide peruttiin\n" #: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -14662,17 +14655,12 @@ msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Tiedosto '%1' on jo olemassa. Haluatko korvata sen?" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" +msgstr "reg: Annettua rekisteriavainta ei löydy\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "reg: Rekisteriavaimen '%1' tuonti ei onnistu\n" #: programs/reg/reg.rc:179 msgid "" @@ -14683,6 +14671,12 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" Käytä rekisterin 32-bittistä näkymää.\n" +"\n" +" /reg:64\n" +" Käytä rekisterin 64-bittistä näkymää.\n" +"\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

Henri Verbeet : wined3d: Use the client area dimensions instead of the backbuffer dimensions for the Vulkan swapchain.
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: wine Branch: master Commit: 3aa566610c7b6b3ef7d4d2668534d340437ad886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa566610c7b6b3ef7d4d266… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 9 12:31:12 2021 +0200 wined3d: Use the client area dimensions instead of the backbuffer dimensions for the Vulkan swapchain. Often these are the same, and even when not, the minimum/maximum image extents will often end up forcing the swapchain dimensions to be the same as the client area. However, some implementations will allow the swapchain to be created with dimensions different from the client area, but then return VK_SUBOPTIMAL_KHR from vkQueuePresentKHR(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 92df08461d9..10e12a11482 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -884,6 +884,7 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc VkSurfaceKHR vk_surface; VkBool32 supported; VkFormat vk_format; + RECT client_rect; VkResult vr; adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); @@ -931,21 +932,23 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc WARN("Image count %u is not supported (%u-%u).\n", desc->backbuffer_count, surface_caps.minImageCount, surface_caps.maxImageCount); - width = desc->backbuffer_width; + GetClientRect(swapchain_vk->s.win_handle, &client_rect); + + width = client_rect.right - client_rect.left; if (width < surface_caps.minImageExtent.width) width = surface_caps.minImageExtent.width; else if (width > surface_caps.maxImageExtent.width) width = surface_caps.maxImageExtent.width; - height = desc->backbuffer_height; + height = client_rect.bottom - client_rect.top; if (height < surface_caps.minImageExtent.height) height = surface_caps.minImageExtent.height; else if (height > surface_caps.maxImageExtent.height) height = surface_caps.maxImageExtent.height; - if (width != desc->backbuffer_width || height != desc->backbuffer_height) + if (width != client_rect.right - client_rect.left || height != client_rect.bottom - client_rect.top) WARN("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", - desc->backbuffer_width, desc->backbuffer_height, + client_rect.right - client_rect.left, client_rect.bottom - client_rect.top, surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_update_sub_resource().
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: wine Branch: master Commit: e4721f0c1e85aacc1770080cfec77d85f75587f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4721f0c1e85aacc1770080c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 8 23:45:10 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_update_sub_resource(). 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 | 8 ++++---- dlls/wined3d/device.c | 13 ++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 6 +++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 1f64a89ec8f..9845f93eebf 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1253,7 +1253,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, UINT row_pitch, UINT depth_pitch) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_resource; struct wined3d_box wined3d_box; @@ -1265,7 +1265,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); - wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, + wined3d_device_context_update_sub_resource(context->wined3d_context, wined3d_resource, subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch, 0); wined3d_mutex_unlock(); } @@ -2704,7 +2704,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11D ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, UINT row_pitch, UINT depth_pitch, UINT flags) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_resource; struct wined3d_box wined3d_box; @@ -2717,7 +2717,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11D wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); - wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, subresource_idx, + wined3d_device_context_update_sub_resource(context->wined3d_context, wined3d_resource, subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch, flags); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bd92632e306..b1f7568842e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5085,16 +5085,15 @@ HRESULT CDECL wined3d_device_context_copy_sub_resource_region(struct wined3d_dev return WINED3D_OK; } -void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, - unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, - unsigned int depth_pitch, unsigned int flags) +void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags) { unsigned int width, height, depth; struct wined3d_box b; - TRACE("device %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u, " - "flags %#x.\n", - device, resource, sub_resource_idx, debug_box(box), data, row_pitch, depth_pitch, flags); + TRACE("context %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", + context, resource, sub_resource_idx, debug_box(box), data, row_pitch, depth_pitch, flags); if (flags) FIXME("Ignoring flags %#x.\n", flags); @@ -5149,7 +5148,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str wined3d_resource_wait_idle(resource); - wined3d_device_context_emit_update_sub_resource(&device->cs->c, resource, + wined3d_device_context_emit_update_sub_resource(context, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1055bbda0ce..cff4fd86b1a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -156,7 +156,6 @@ @ cdecl wined3d_device_set_vs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ cdecl wined3d_device_show_cursor(ptr long) -@ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long long) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) @@ -190,6 +189,7 @@ @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) +@ cdecl wined3d_device_context_update_sub_resource(ptr ptr long ptr ptr long long long) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) @ cdecl wined3d_output_get_adapter(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bb0f24e8226..c6c97da4fbe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2533,9 +2533,6 @@ void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show); -void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, - unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, - unsigned int depth_pitch, unsigned int flags); HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); @@ -2607,6 +2604,9 @@ void __cdecl wined3d_device_context_set_vertex_declaration(struct wined3d_device struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports); +void __cdecl wined3d_device_context_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags); HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_update_sub_resource().
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: wine Branch: master Commit: 9840a1751e985e7d63aa01e8246e17fc844bd8ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=9840a1751e985e7d63aa01e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 8 23:45:09 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_update_sub_resource(). 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/buffer.c | 2 +- dlls/wined3d/cs.c | 12 ++++++------ dlls/wined3d/device.c | 3 ++- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8fca81ec19c..ea21f85bc9e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1047,7 +1047,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, if (buffer->flags & WINED3D_BUFFER_USE_BO) { wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); - wined3d_cs_emit_update_sub_resource(device->cs, resource, + wined3d_device_context_emit_update_sub_resource(&device->cs->c, resource, 0, &box, data->data, data->row_pitch, data->slice_pitch); } else diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3e74f868e58..32ea900e27d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2522,13 +2522,13 @@ done: wined3d_resource_release(resource); } -void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, - unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, - unsigned int slice_pitch) +void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int slice_pitch) { struct wined3d_cs_update_sub_resource *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2539,10 +2539,10 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r wined3d_resource_acquire(resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_MAP); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); /* The data pointer may go away, so we need to wait until it is read. * Copying the data may be faster if it's small. */ - wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); + wined3d_device_context_finish(context, WINED3D_CS_QUEUE_MAP); } static void wined3d_cs_exec_add_dirty_texture_region(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e62f560a0be..bd92632e306 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5149,7 +5149,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str wined3d_resource_wait_idle(resource); - wined3d_cs_emit_update_sub_resource(device->cs, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); + wined3d_device_context_emit_update_sub_resource(&device->cs->c, resource, + sub_resource_idx, box, data, row_pitch, depth_pitch); } void CDECL wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 487f0806ce3..333002ebfd5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4259,7 +4259,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { wined3d_texture_get_level_box(*texture, i % (*texture)->level_count, &box); - wined3d_cs_emit_update_sub_resource(device->cs, &(*texture)->resource, + wined3d_device_context_emit_update_sub_resource(&device->cs->c, &(*texture)->resource, i, &box, data[i].data, data[i].row_pitch, data[i].slice_pitch); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f00ef681215..34ec814685c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4753,9 +4753,6 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; -void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, - unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, - unsigned int slice_pitch) DECLSPEC_HIDDEN; void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, @@ -4827,6 +4824,9 @@ void wined3d_device_context_emit_set_vertex_declaration(struct wined3d_device_co struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) {

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_clear_unordered_access_view_uint().
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: wine Branch: master Commit: 5c36f72f95f6b7b6aba4211b2558492f8f8a21a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c36f72f95f6b7b6aba4211b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 8 23:45:08 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_clear_unordered_access_view_uint(). 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 | 4 ++-- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ab5ad625bdf..1f64a89ec8f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1313,7 +1313,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUint(ID3D11DeviceContext1 *iface, ID3D11UnorderedAccessView *unordered_access_view, const UINT values[4]) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_unordered_access_view *view; TRACE("iface %p, unordered_access_view %p, values {%u, %u, %u, %u}.\n", @@ -1321,7 +1321,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUi view = unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_view); wined3d_mutex_lock(); - wined3d_device_clear_unordered_access_view_uint(device->wined3d_device, + wined3d_device_context_clear_uav_uint(context->wined3d_context, view->wined3d_view, (const struct wined3d_uvec4 *)values); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6df68100356..e62f560a0be 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5242,12 +5242,12 @@ HRESULT CDECL wined3d_device_context_clear_rendertarget_view(struct wined3d_devi return WINED3D_OK; } -void CDECL wined3d_device_clear_unordered_access_view_uint(struct wined3d_device *device, +void CDECL wined3d_device_context_clear_uav_uint(struct wined3d_device_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { - TRACE("device %p, view %p, clear_value %s.\n", device, view, debug_uvec4(clear_value)); + TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); - wined3d_device_context_emit_clear_uav_uint(&device->cs->c, view, clear_value); + wined3d_device_context_emit_clear_uav_uint(context, view, clear_value); } struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3df1f19b837..1055bbda0ce 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -42,7 +42,6 @@ @ cdecl wined3d_device_apply_stateblock(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) -@ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @ cdecl wined3d_device_create(ptr ptr long ptr long long ptr long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_dispatch_compute(ptr long long long) @@ -163,6 +162,7 @@ @ cdecl wined3d_device_context_blt(ptr ptr long ptr ptr long ptr long ptr long) @ cdecl wined3d_device_context_clear_rendertarget_view(ptr ptr ptr long ptr float long) +@ cdecl wined3d_device_context_clear_uav_uint(ptr ptr ptr) @ cdecl wined3d_device_context_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_context_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_context_copy_uav_counter(ptr ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 35bcb45f851..bb0f24e8226 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2352,8 +2352,6 @@ void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, stru HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); -void __cdecl wined3d_device_clear_unordered_access_view_uint(struct wined3d_device *device, - struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, @@ -2549,6 +2547,8 @@ HRESULT __cdecl wined3d_device_context_blt(struct wined3d_device_context *contex HRESULT __cdecl wined3d_device_context_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); +void __cdecl wined3d_device_context_clear_uav_uint(struct wined3d_device_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); void __cdecl wined3d_device_context_copy_resource(struct wined3d_device_context *context, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource); HRESULT __cdecl wined3d_device_context_copy_sub_resource_region(struct wined3d_device_context *context,

1 0