wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Francois Gouget : winetest/dissect: Allow linking to the dlls in the version page.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: tools Branch: master Commit: 598257c40138113b26f3672351f2768d48e4f5fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=598257c40138113b26f3672… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 19 16:53:46 2021 +0200 winetest/dissect: Allow linking to the dlls in the version page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index d6ce316..80fd6e2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -859,39 +859,40 @@ mydie "report reached file size limit (runaway test?)" if -s $report >= $maxfile $box->{data} .= "<table class=\"output\">\n"; foreach my $dll (sort keys %dllinfo) { + $box->{data} .= sprintf "<tr id=\"%s\">", escapeHTML($dll); if ($dllinfo{$dll}->{version} =~ /^dll is missing/) { my $reason = $dllinfo{$dll}->{version}; $reason =~ s/dll is //; - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($reason); + $box->{data} .= sprintf "<td>%s</td><td class=\"skipped\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($reason); } elsif ($dllinfo{$dll}->{version} eq "skipped") { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">skipped by user request</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<td>%s</td><td class=\"skipped\">skipped by user request</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} eq "dll is a stub") { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">stub</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<td>%s</td><td class=\"skipped\">stub</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} eq "dll is native") { # There should be no native dll in the Wine tests - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">native</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">native</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} =~ /^load error/) { # Flag unknown errors - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n", + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); } elsif (defined($dllinfo{$dll}->{first})) { - $box->{data} .= sprintf "<tr><td><a href=\"report.html#%s\">%s</a></td><td>%s</td></tr>\n", + $box->{data} .= sprintf "<td><a href=\"report.html#%s\">%s</a></td><td>%s</td></tr>\n", escapeHTML($dllinfo{$dll}->{first}), escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); } else { - $box->{data} .= sprintf "<tr><td>%s</td><td>%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); + $box->{data} .= sprintf "<td>%s</td><td>%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); } } $box->{data} .= "</table>";

1 0

Gijs Vermeulen : ntdll: Return STATUS_INFO_LENGTH_MISMATCH when len is too small in NtQueryObject(ObjectBasicInformation).
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 749f8c25e262cb049289e7c96bb390edcafa1021 URL: https://source.winehq.org/git/wine.git/?a=commit;h=749f8c25e262cb049289e7c9… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Apr 16 20:34:39 2021 +0200 ntdll: Return STATUS_INFO_LENGTH_MISMATCH when len is too small in NtQueryObject(ObjectBasicInformation). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50791 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 15 +++++++++++++++ dlls/ntdll/unix/file.c | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index e93f11e1126..e0988769c9c 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1379,6 +1379,7 @@ static void test_query_object(void) char buffer[1024]; NTSTATUS status; ULONG len, expected_len; + OBJECT_BASIC_INFORMATION info; OBJECT_ATTRIBUTES attr; UNICODE_STRING path, target, *str; char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; @@ -1390,6 +1391,20 @@ static void test_query_object(void) handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); + status = pNtQueryObject( handle, ObjectBasicInformation, NULL, 0, NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + + status = pNtQueryObject( handle, ObjectBasicInformation, &info, 0, NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + + status = pNtQueryObject( handle, ObjectBasicInformation, NULL, 0, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + + len = 0; + status = pNtQueryObject( handle, ObjectBasicInformation, &info, sizeof(OBJECT_BASIC_INFORMATION), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len >= sizeof(OBJECT_BASIC_INFORMATION), "unexpected len %u\n", len ); + len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len ); ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b4d834b7855..488f7485ad8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6734,7 +6734,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas { OBJECT_BASIC_INFORMATION *p = ptr; - if (len < sizeof(*p)) return STATUS_INVALID_BUFFER_SIZE; + if (len < sizeof(*p)) return STATUS_INFO_LENGTH_MISMATCH; SERVER_START_REQ( get_object_info ) {

1 0

Jacek Caban : winevulkan: Move Vulkan calls to Unix lib.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 250072f91e4f73237617c49fc22d99c81e39be0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=250072f91e4f73237617c49f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 16 15:49:18 2021 +0200 winevulkan: Move Vulkan calls to Unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 11 +++++------ dlls/winevulkan/make_vulkan | 5 +++++ dlls/winevulkan/vulkan.c | 13 +++++++++++-- dlls/winevulkan/vulkan_thunks.c | 4 ++++ 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 29c8f5902d3..769724fe20d 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winreg.h" #include "winuser.h" #include "initguid.h" @@ -218,10 +219,8 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) ReleaseDC(0, hdc); if (!driver) ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); - else - unix_funcs = unix_vk_init(driver); - return driver != NULL; + return driver && !__wine_init_unix_lib(hinstance, DLL_PROCESS_ATTACH, driver, &unix_funcs); } static BOOL wine_vk_init_once(void) @@ -239,7 +238,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, if(!wine_vk_init_once()) return VK_ERROR_INITIALIZATION_FAILED; - return unix_vkCreateInstance(create_info, allocator, instance); + return unix_funcs->p_vkCreateInstance(create_info, allocator, instance); } VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, @@ -259,7 +258,7 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na return VK_SUCCESS; } - return unix_vkEnumerateInstanceExtensionProperties(layer_name, count, properties); + return unix_funcs->p_vkEnumerateInstanceExtensionProperties(layer_name, count, properties); } VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) @@ -272,7 +271,7 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) return VK_SUCCESS; } - return unix_vkEnumerateInstanceVersion(version); + return unix_funcs->p_vkEnumerateInstanceVersion(version); } static HANDLE get_display_device_init_mutex(void) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index fad07d8cc8e..ef24cbfd262 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2263,6 +2263,11 @@ class VkGenerator(object): def generate_thunks_c(self, f, prefix): self._generate_copyright(f) + + f.write("#if 0\n") + f.write("#pragma makedep unix\n") + f.write("#endif\n\n") + f.write("#include \"config.h\"\n") f.write("#include \"wine/port.h\"\n\n") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index f5876587b5a..1070ccec115 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -17,11 +17,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <time.h> #include <stdarg.h> #include <stdlib.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -448,11 +454,14 @@ static void wine_vk_device_free(struct VkDevice_T *device) free(device); } -const struct unix_funcs *unix_vk_init(const struct vulkan_funcs *driver) +NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *driver, void *ptr_out) { + if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; + vk_funcs = driver; p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); - return &loader_funcs; + *(const struct unix_funcs **)ptr_out = &loader_funcs; + return STATUS_SUCCESS; } /* Helper function for converting between win32 and host compatible VkInstanceCreateInfo. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index ec20a7a24fe..2880e98d8b1 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -9,6 +9,10 @@ * */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include "wine/port.h"

1 0

Jacek Caban : winevulkan: Don't use heap.h.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 187e4d7e2f50661ae626da3071996fe66a9b2e31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=187e4d7e2f50661ae626da30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 16 15:49:00 2021 +0200 winevulkan: Don't use heap.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 14 ++++++++------ dlls/winevulkan/vulkan_private.h | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 696d61ea8a9..f5876587b5a 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winreg.h" #include "winuser.h" +#include "winternl.h" #include "vulkan_private.h" @@ -140,7 +141,8 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB wine_callback_data = *((VkDebugUtilsMessengerCallbackDataEXT *) callback_data); - object_name_infos = heap_calloc(wine_callback_data.objectCount, sizeof(*object_name_infos)); + object_name_infos = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, + wine_callback_data.objectCount * sizeof(*object_name_infos)); for (i = 0; i < wine_callback_data.objectCount; i++) { @@ -155,7 +157,7 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB if (!object_name_infos[i].objectHandle) { WARN("handle conversion failed 0x%s\n", wine_dbgstr_longlong(callback_data->pObjects[i].objectHandle)); - heap_free(object_name_infos); + RtlFreeHeap(GetProcessHeap(), 0, object_name_infos); return VK_FALSE; } } @@ -170,7 +172,7 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB /* applications should always return VK_FALSE */ result = object->user_callback(severity, message_types, &wine_callback_data, object->user_data); - heap_free(object_name_infos); + RtlFreeHeap(GetProcessHeap(), 0, object_name_infos); return result; } @@ -714,7 +716,7 @@ void WINAPI unix_vkCmdExecuteCommands(VkCommandBuffer buffer, uint32_t count, * alloca as we shouldn't need much memory and it needs to be cleaned up after * the call anyway. */ - if (!(tmp_buffers = heap_alloc(count * sizeof(*tmp_buffers)))) + if (!(tmp_buffers = malloc(count * sizeof(*tmp_buffers)))) { ERR("Failed to allocate memory for temporary command buffers\n"); return; @@ -1397,7 +1399,7 @@ VkResult WINAPI unix_vkGetCalibratedTimestampsEXT(VkDevice device, VkResult res; TRACE("%p, %u, %p, %p, %p\n", device, timestamp_count, timestamp_infos, timestamps, max_deviation); - if (!(host_timestamp_infos = heap_alloc(sizeof(VkCalibratedTimestampInfoEXT) * timestamp_count))) + if (!(host_timestamp_infos = malloc(sizeof(VkCalibratedTimestampInfoEXT) * timestamp_count))) return VK_ERROR_OUT_OF_HOST_MEMORY; for (i = 0; i < timestamp_count; i++) @@ -1438,7 +1440,7 @@ VkResult WINAPI unix_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe if (res != VK_SUCCESS) return res; - if (!(host_time_domains = heap_alloc(sizeof(VkTimeDomainEXT) * host_time_domain_count))) + if (!(host_time_domains = malloc(sizeof(VkTimeDomainEXT) * host_time_domain_count))) return VK_ERROR_OUT_OF_HOST_MEMORY; res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->phys_dev, &host_time_domain_count, host_time_domains); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index f8dc00e38b1..f06e739c423 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -28,7 +28,6 @@ #include <pthread.h> #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" #define VK_NO_PROTOTYPES #include "wine/vulkan.h"

1 0

Jacek Caban : winevulkan: Implement Vulkan entry points as wrappers around unix_funcs.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 9e34b8b0d601f35866abce58387cd111c5f933c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e34b8b0d601f35866abce58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 16 15:48:48 2021 +0200 winevulkan: Implement Vulkan entry points as wrappers around unix_funcs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/loader.c | 4 +- dlls/winevulkan/loader_thunks.c | 2351 ++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/loader_thunks.h | 10 + dlls/winevulkan/make_vulkan | 200 ++-- dlls/winevulkan/vulkan.c | 92 +- dlls/winevulkan/vulkan_private.h | 7 +- dlls/winevulkan/vulkan_thunks.c | 1889 ++++++++++++------------------ dlls/winevulkan/vulkan_thunks.h | 104 +- 9 files changed, 3315 insertions(+), 1343 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e34b8b0d601f35866ab…

1 0

Jacek Caban : winevulkan: Introduce unix_funcs struct.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: c7eeeb0191d25d19a320fb8905b840d7bcdbce15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7eeeb0191d25d19a320fb89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 16 15:48:36 2021 +0200 winevulkan: Introduce unix_funcs struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 4 +- dlls/winevulkan/loader_thunks.h | 404 +++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/make_vulkan | 43 ++++- dlls/winevulkan/vulkan.c | 3 +- dlls/winevulkan/vulkan_private.h | 5 +- dlls/winevulkan/vulkan_thunks.c | 389 +++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 1 + 7 files changed, 843 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7eeeb0191d25d19a320…

1 0

Zebediah Figura : wine.inf: Install the protocol database at etc\protocol.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 03dcb369790f6b9c60806728a26cc71debee3d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03dcb369790f6b9c60806728… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 16 11:08:20 2021 -0500 wine.inf: Install the protocol database at etc\protocol. Unlike Unix, on Windows the file name is not plural. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ad699469ba4..6ae4e96e37f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4052,7 +4052,7 @@ srgb color space profile.icm,"@%11%\mscms.dll,-1" [EtcFiles] hosts,"@%11%\ws2_32.dll,-1" networks,"@%11%\ws2_32.dll,-2" -protocols,"@%11%\ws2_32.dll,-3" +protocol,"@%11%\ws2_32.dll,-3" services,"@%11%\ws2_32.dll,-4" [InfFiles]

1 0

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

16 Apr '21

Module: wine Branch: master Commit: 9a8c5259bb529dc38f52db647fc49ae26dbc9bfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a8c5259bb529dc38f52db64… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 16 10:49:26 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_scissor_rects(). 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 +++--- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/device.c | 2 +- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a85201a66de..9fd144c0fb6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2270,7 +2270,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11Devic static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11DeviceContext1 *iface, UINT *rect_count, D3D11_RECT *rects) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int actual_count; TRACE("iface %p, rect_count %p, rects %p.\n", iface, rect_count, rects); @@ -2281,7 +2281,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De actual_count = *rect_count; wined3d_mutex_lock(); - wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); + wined3d_device_context_get_scissor_rects(context->wined3d_context, &actual_count, rects); wined3d_mutex_unlock(); if (rects && *rect_count > actual_count) @@ -5564,7 +5564,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device1 *ifac actual_count = *rect_count; wined3d_mutex_lock(); - wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); + wined3d_device_context_get_scissor_rects(device->immediate_context.wined3d_context, &actual_count, rects); wined3d_mutex_unlock(); if (!rects) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7e6f407df58..fe36f70c075 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -563,7 +563,7 @@ static void device_reset_viewport_state(struct d3d8_device *device) wined3d_device_context_get_viewports(device->immediate_context, NULL, &vp); wined3d_stateblock_set_viewport(device->state, &vp); - wined3d_device_get_scissor_rects(device->wined3d_device, NULL, &rect); + wined3d_device_context_get_scissor_rects(device->immediate_context, NULL, &rect); wined3d_stateblock_set_scissor_rect(device->state, &rect); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 71826cfe81d..139e4f3f6e4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -589,7 +589,7 @@ static void device_reset_viewport_state(struct d3d9_device *device) wined3d_device_context_get_viewports(device->immediate_context, NULL, &vp); wined3d_stateblock_set_viewport(device->state, &vp); - wined3d_device_get_scissor_rects(device->wined3d_device, NULL, &rect); + wined3d_device_context_get_scissor_rects(device->immediate_context, NULL, &rect); wined3d_stateblock_set_scissor_rect(device->state, &rect); } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index bf7ee1f22a0..0a0d1edd848 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6974,7 +6974,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw) wined3d_device_context_get_viewports(ddraw->immediate_context, NULL, &vp); wined3d_stateblock_set_viewport(ddraw->state, &vp); - wined3d_device_get_scissor_rects(ddraw->wined3d_device, NULL, &rect); + wined3d_device_context_get_scissor_rects(ddraw->immediate_context, NULL, &rect); wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 39b44831e25..f4ba0573c24 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1714,12 +1714,13 @@ void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsig wined3d_device_context_set_scissor_rects(&device->cs->c, rect_count, rects); } -void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, RECT *rects) +void CDECL wined3d_device_context_get_scissor_rects(const struct wined3d_device_context *context, + unsigned int *rect_count, RECT *rects) { - const struct wined3d_state *state = device->cs->c.state; + const struct wined3d_state *state = context->state; unsigned int count; - TRACE("device %p, rect_count %p, rects %p.\n", device, rect_count, rects); + TRACE("context %p, rect_count %p, rects %p.\n", context, rect_count, rects); count = rect_count ? min(*rect_count, state->scissor_rect_count) : 1; if (count && rects) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 44cef466435..012f24e6556 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -86,7 +86,6 @@ @ cdecl wined3d_device_get_raster_status(ptr long ptr) @ cdecl wined3d_device_get_render_state(ptr long) @ cdecl wined3d_device_get_rendertarget_view(ptr long) -@ cdecl wined3d_device_get_scissor_rects(ptr ptr ptr) @ cdecl wined3d_device_get_software_vertex_processing(ptr) @ cdecl wined3d_device_get_state(ptr) @ cdecl wined3d_device_get_stream_output(ptr long ptr) @@ -170,6 +169,7 @@ @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) @ cdecl wined3d_device_context_get_rasterizer_state(ptr) +@ cdecl wined3d_device_context_get_scissor_rects(ptr ptr ptr) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_get_viewports(ptr ptr ptr) @ cdecl wined3d_device_context_issue_query(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cff06bbfc6b..9b7ff4041fc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2420,8 +2420,6 @@ HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *de DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx); -void __cdecl wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, - RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); struct wined3d_state * __cdecl wined3d_device_get_state(struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_stream_output(struct wined3d_device *device, @@ -2566,6 +2564,8 @@ struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_st const struct wined3d_device_context *context, unsigned int *stencil_ref); struct wined3d_rasterizer_state * __cdecl wined3d_device_context_get_rasterizer_state( struct wined3d_device_context *context); +void __cdecl wined3d_device_context_get_scissor_rects(const struct wined3d_device_context *context, + unsigned int *rect_count, RECT *rects); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, enum wined3d_shader_type type); void __cdecl wined3d_device_context_get_viewports(const struct wined3d_device_context *context,

1 0

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

16 Apr '21

Module: wine Branch: master Commit: cdcc2ade6ea78af4a0fdfa842024013b2afb4f9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdcc2ade6ea78af4a0fdfa84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 16 10:49:25 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_viewports(). 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 | 7 ++++--- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/device.c | 2 +- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 29b5b11aebd..a85201a66de 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2233,7 +2233,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext1 *iface, UINT *viewport_count, D3D11_VIEWPORT *viewports) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_viewport wined3d_vp[WINED3D_MAX_VIEWPORTS]; unsigned int actual_count = ARRAY_SIZE(wined3d_vp), i; @@ -2243,7 +2243,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11Devic return; wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, &actual_count, viewports ? wined3d_vp : NULL); + wined3d_device_context_get_viewports(context->wined3d_context, &actual_count, viewports ? wined3d_vp : NULL); wined3d_mutex_unlock(); if (!viewports) @@ -5526,7 +5526,8 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device1 *iface, return; wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, &actual_count, viewports ? wined3d_vp : NULL); + wined3d_device_context_get_viewports(device->immediate_context.wined3d_context, + &actual_count, viewports ? wined3d_vp : NULL); wined3d_mutex_unlock(); if (!viewports) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b07c20f71a0..7e6f407df58 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -561,7 +561,7 @@ static void device_reset_viewport_state(struct d3d8_device *device) struct wined3d_viewport vp; RECT rect; - wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + wined3d_device_context_get_viewports(device->immediate_context, NULL, &vp); wined3d_stateblock_set_viewport(device->state, &vp); wined3d_device_get_scissor_rects(device->wined3d_device, NULL, &rect); wined3d_stateblock_set_scissor_rect(device->state, &rect); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 25d98b4395a..71826cfe81d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -587,7 +587,7 @@ static void device_reset_viewport_state(struct d3d9_device *device) struct wined3d_viewport vp; RECT rect; - wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + wined3d_device_context_get_viewports(device->immediate_context, NULL, &vp); wined3d_stateblock_set_viewport(device->state, &vp); wined3d_device_get_scissor_rects(device->wined3d_device, NULL, &rect); wined3d_stateblock_set_scissor_rect(device->state, &rect); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 52d20fc5a62..bf7ee1f22a0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6972,7 +6972,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw) struct wined3d_viewport vp; RECT rect; - wined3d_device_get_viewports(ddraw->wined3d_device, NULL, &vp); + wined3d_device_context_get_viewports(ddraw->immediate_context, NULL, &vp); wined3d_stateblock_set_viewport(ddraw->state, &vp); wined3d_device_get_scissor_rects(ddraw->wined3d_device, NULL, &rect); wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 452c3b35414..39b44831e25 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1560,13 +1560,13 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned wined3d_device_context_set_viewports(&device->cs->c, viewport_count, viewports); } -void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, - struct wined3d_viewport *viewports) +void CDECL wined3d_device_context_get_viewports(const struct wined3d_device_context *context, + unsigned int *viewport_count, struct wined3d_viewport *viewports) { - const struct wined3d_state *state = device->cs->c.state; + const struct wined3d_state *state = context->state; unsigned int count; - TRACE("device %p, viewport_count %p, viewports %p.\n", device, viewport_count, viewports); + TRACE("context %p, viewport_count %p, viewports %p.\n", context, viewport_count, viewports); count = viewport_count ? min(*viewport_count, state->viewport_count) : 1; if (count && viewports) @@ -3536,7 +3536,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO TRACE("%.8e %.8e %.8e %.8e\n", world_mat._41, world_mat._42, world_mat._43, world_mat._44); /* Get the viewport */ - wined3d_device_get_viewports(device, NULL, &vp); + wined3d_device_context_get_viewports(&device->cs->c, NULL, &vp); TRACE("viewport x %.8e, y %.8e, width %.8e, height %.8e, min_z %.8e, max_z %.8e.\n", vp.x, vp.y, vp.width, vp.height, vp.min_z, vp.max_z); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2af21d5a31c..44cef466435 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -96,7 +96,6 @@ @ cdecl wined3d_device_get_unordered_access_view(ptr long) @ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) -@ cdecl wined3d_device_get_viewports(ptr ptr ptr) @ cdecl wined3d_device_get_vs_resource_view(ptr long) @ cdecl wined3d_device_get_vs_sampler(ptr long) @ cdecl wined3d_device_get_wined3d(ptr) @@ -172,6 +171,7 @@ @ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) @ cdecl wined3d_device_context_get_rasterizer_state(ptr) @ cdecl wined3d_device_context_get_shader(ptr long) +@ cdecl wined3d_device_context_get_viewports(ptr ptr ptr) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6923b8ce9cb..cff06bbfc6b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2435,8 +2435,6 @@ struct wined3d_unordered_access_view * __cdecl wined3d_device_get_unordered_acce const struct wined3d_device *device, unsigned int idx); struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); -void __cdecl wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, - struct wined3d_viewport *viewports); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device, UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx); @@ -2570,6 +2568,8 @@ struct wined3d_rasterizer_state * __cdecl wined3d_device_context_get_rasterizer_ struct wined3d_device_context *context); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, enum wined3d_shader_type type); +void __cdecl wined3d_device_context_get_viewports(const struct wined3d_device_context *context, + unsigned int *viewport_count, struct wined3d_viewport *viewports); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); HRESULT __cdecl wined3d_device_context_map(struct wined3d_device_context *context,

1 0

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

16 Apr '21

Module: wine Branch: master Commit: 850a90e1684e9d61a50b6f2297a180f1d2c22b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=850a90e1684e9d61a50b6f22… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 16 10:49:24 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_rasterizer_state(). 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 +++--- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d56be188cf6..29b5b11aebd 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2211,14 +2211,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceC static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceContext1 *iface, ID3D11RasterizerState **rasterizer_state) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_rasterizer_state *rasterizer_state_impl; struct wined3d_rasterizer_state *wined3d_state; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_rasterizer_state(device->wined3d_device))) + if ((wined3d_state = wined3d_device_context_get_rasterizer_state(context->wined3d_context))) { rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); ID3D11RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D11RasterizerState_iface); @@ -5501,7 +5501,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device1 *iface, ID3D TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_rasterizer_state(device->wined3d_device))) + if ((wined3d_state = wined3d_device_context_get_rasterizer_state(device->immediate_context.wined3d_context))) { rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); ID3D10RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D10RasterizerState_iface); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c370c5dff7c..452c3b35414 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1642,11 +1642,12 @@ void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device, wined3d_device_context_set_rasterizer_state(&device->cs->c, rasterizer_state); } -struct wined3d_rasterizer_state * CDECL wined3d_device_get_rasterizer_state(struct wined3d_device *device) +struct wined3d_rasterizer_state * CDECL wined3d_device_context_get_rasterizer_state( + struct wined3d_device_context *context) { - TRACE("device %p.\n", device); + TRACE("context %p.\n", context); - return device->cs->c.state->rasterizer_state; + return context->state->rasterizer_state; } void CDECL wined3d_device_set_render_state(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e9650c10024..2af21d5a31c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -84,7 +84,6 @@ @ cdecl wined3d_device_get_ps_resource_view(ptr long) @ cdecl wined3d_device_get_ps_sampler(ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) -@ cdecl wined3d_device_get_rasterizer_state(ptr) @ cdecl wined3d_device_get_render_state(ptr long) @ cdecl wined3d_device_get_rendertarget_view(ptr long) @ cdecl wined3d_device_get_scissor_rects(ptr ptr ptr) @@ -171,6 +170,7 @@ @ cdecl wined3d_device_context_get_blend_state(ptr ptr ptr) @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) +@ cdecl wined3d_device_context_get_rasterizer_state(ptr) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 188a73cb694..6923b8ce9cb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2417,7 +2417,6 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_vie struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_raster_status *raster_status); -struct wined3d_rasterizer_state * __cdecl wined3d_device_get_rasterizer_state(struct wined3d_device *device); DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx); @@ -2567,6 +2566,8 @@ struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_stencil_state( const struct wined3d_device_context *context, unsigned int *stencil_ref); +struct wined3d_rasterizer_state * __cdecl wined3d_device_context_get_rasterizer_state( + struct wined3d_device_context *context); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, enum wined3d_shader_type type); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context,

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
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