July 2020 - Wine-commits - list.winehq.org

Paul Gofman : ntdll: Always align stack pointer in __wine_syscall_dispatcher on x64.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: e9b3660e729929f4e09f403d526759d532df03e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9b3660e729929f4e09f403d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jul 14 19:06:36 2020 +0300 ntdll: Always align stack pointer in __wine_syscall_dispatcher on x64. Syscall thunks break stack alignment for dispatcher. Regardless of that, it is probably better not to assume aligned stack in syscall thunk entry. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 97191ca89e..278de20522 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1497,23 +1497,25 @@ void output_syscalls( DLLSPEC *spec ) * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tcmpq $%u,%%rax\n", count ); - output( "\tjae 3f\n" ); + output( "\tjae 4f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); - output( "\tjbe 1f\n" ); - output( "\tsubq %%rcx,%%rsp\n" ); + output( "\tja 1f\n" ); + output( "\tandq $~15,%%rsp\n\t" ); + output( "\tjmp 2f\n" ); + output( "1:\tsubq %%rcx,%%rsp\n" ); output( "\tshrq $3,%%rcx\n" ); output( "\tleaq 0x38(%%rbp),%%rsi\n" ); output( "\tandq $~15,%%rsp\n\t" ); output( "\tmovq %%rsp,%%rdi\n" ); output( "\tcld\n" ); output( "\trep; movsq\n" ); - output( "1:\tmovq %%r10,%%rcx\n" ); + output( "2:\tmovq %%r10,%%rcx\n" ); output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); output( "\tcallq *(%%r10,%%rax,8)\n" ); - output( "2:\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "3:\tleaq -0x10(%%rbp),%%rsp\n" ); output( "\tpopq %%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); output( "\tpopq %%rsi\n" ); @@ -1523,8 +1525,8 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -8" ); output_cfi( ".cfi_same_value %%rbp" ); output( "\tret\n" ); - output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); - output( "\tjmp 2b\n" ); + output( "4:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tjmp 3b\n" ); break; case CPU_ARM: output( "\tldr r1, 4f\n" );

1 0

Piotr Caban : ucrtbase: Add parameters validation to _timespec32_get function.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 2a12ccd8e8a0e72d544205e22c91e749ddb74129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a12ccd8e8a0e72d544205e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:22:40 2020 +0200 ucrtbase: Add parameters validation to _timespec32_get function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 7f565e350d..f7bb452a43 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1998,6 +1998,9 @@ int CDECL _timespec32_get(struct _timespec32 *ts, int base) { struct _timespec64 ts64; + if(!MSVCRT_CHECK_PMT(ts != NULL)) return 0; + if(base != TIME_UTC) return 0; + if(_timespec64_get(&ts64, base) != base) return 0; if(ts64.tv_sec != (MSVCRT___time32_t)ts64.tv_sec)

1 0

Piotr Caban : msvcrt: Don't use strcmpW in wcscmp.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 841fbd5b141db7bed7445e95f7accd6cb393c3de URL: https://source.winehq.org/git/wine.git/?a=commit;h=841fbd5b141db7bed7445e95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:22:45 2020 +0200 msvcrt: Don't use strcmpW in wcscmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/msvcrt/wcs.c | 28 +++++++++++++++++++--------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 46eb0cc080..b5b877e7ec 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4210,6 +4210,20 @@ static void test_iswdigit(void) } } +static void test_wcscmp(void) +{ + int r; + + r = wcscmp(L"a", L"z"); + ok(r == -1, "wcscmp returned %d\n", r); + + r = wcscmp(L"z", L"a"); + ok(r == 1, "wcscmp returned %d\n", r); + + r = wcscmp(L"f", L"f"); + ok(!r, "wcscmp returned %d\n", r); +} + START_TEST(string) { char mem[100]; @@ -4359,4 +4373,5 @@ START_TEST(string) test_C_locale(); test_strstr(); test_iswdigit(); + test_wcscmp(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 73ade3be73..70a8d6201f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1583,6 +1583,24 @@ int WINAPIV MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, return r; } +/********************************************************************* + * wcscmp (MSVCRT.@) + */ +int CDECL MSVCRT_wcscmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2) +{ + while (*str1 && (*str1 == *str2)) + { + str1++; + str2++; + } + + if (*str1 < *str2) + return -1; + if (*str1 > *str2) + return 1; + return 0; +} + /********************************************************************* * _wcscoll_l (MSVCRT.@) */ @@ -1596,7 +1614,7 @@ int CDECL MSVCRT__wcscoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* st locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strcmpW(str1, str2); + return MSVCRT_wcscmp(str1, str2); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -2668,11 +2686,3 @@ MSVCRT_size_t CDECL MSVCRT_wcsxfrm(MSVCRT_wchar_t *dest, { return MSVCRT__wcsxfrm_l(dest, src, len, NULL); } - -/********************************************************************* - * wcscmp (MSVCRT.@) - */ -int CDECL MSVCRT_wcscmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2) -{ - return strcmpW(str1, str2); -}

1 0

Piotr Caban : msvcrt: Don't use strcmpiW in _wcsicoll_l.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 8fd5ef68cc1b9f55a1d25312a93b700f3aff500e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fd5ef68cc1b9f55a1d25312… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:22:49 2020 +0200 msvcrt: Don't use strcmpiW in _wcsicoll_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 70a8d6201f..b6da06ce74 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -131,7 +131,22 @@ int CDECL MSVCRT__wcsicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strcmpiW(str1, str2); + { + MSVCRT_wchar_t c1, c2; + + do + { + c1 = *str1++; + if (c1 >= 'A' && c1 <= 'Z') + c1 += 'a' - 'A'; + + c2 = *str2++; + if (c2 >= 'A' && c2 <= 'Z') + c2 += 'a' - 'A'; + } while(c1 && (c1 == c2)); + return c1 - c2; + } + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; }

1 0

Zebediah Figura : quartz: Get rid of the IFilterGraphImpl typedef.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: d93137e2e07e0fea56e0c5148c27b1c7e9cb5a65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d93137e2e07e0fea56e0c514… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 17:37:16 2020 -0500 quartz: Get rid of the IFilterGraphImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 559 +++++++++++++++++++++++----------------------- 1 file changed, 280 insertions(+), 279 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d93137e2e07e0fea56e0…

1 0

Zebediah Figura : quartz/vmr9: Show the window only if auto-show is enabled.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 4d580796bc64106e8105df458cbc938fbac3988a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d580796bc64106e8105df45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 17:37:17 2020 -0500 quartz/vmr9: Show the window only if auto-show is enabled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b6b55c70c5..a540feb237 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -482,7 +482,7 @@ static void vmr_start_stream(struct strmbase_renderer *iface) struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); - if (filter->window.hwnd) + if (filter->window.hwnd && filter->window.AutoShow) ShowWindow(filter->window.hwnd, SW_SHOW); SetEvent(filter->run_event); }

1 0

Zebediah Figura : quartz/vmr9: Auto-show the window when pausing, not when running.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 44c0e691379afeba50e39c81624702af89a10e00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c0e691379afeba50e39c81… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 17:37:18 2020 -0500 quartz/vmr9: Auto-show the window when pausing, not when running. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/vmr9.c | 11 +++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index adf677535b..cf4675ce06 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2130,14 +2130,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IVideoWindow_put_AutoShow(window, OAFALSE); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 005b10974f..e953c05dd1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2376,14 +2376,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IVideoWindow_put_AutoShow(window, OAFALSE); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a540feb237..aeaefd52c6 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -477,13 +477,19 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE return VFW_E_TYPE_NOT_ACCEPTED; } -static void vmr_start_stream(struct strmbase_renderer *iface) +static void vmr_init_stream(struct strmbase_renderer *iface) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); if (filter->window.hwnd && filter->window.AutoShow) ShowWindow(filter->window.hwnd, SW_SHOW); +} + +static void vmr_start_stream(struct strmbase_renderer *iface) +{ + struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); + + IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); SetEvent(filter->run_event); } @@ -659,6 +665,7 @@ static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = VMR9_CheckMediaType, .pfnDoRenderSample = VMR9_DoRenderSample, + .renderer_init_stream = vmr_init_stream, .renderer_start_stream = vmr_start_stream, .renderer_stop_stream = vmr_stop_stream, .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow,

1 0

Zebediah Figura : qcap/smartteefilter: Return VFW_S_CANT_CUE from GetState() if paused.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 44cd11ef4ab3675dd8a7598d2ee66eb658092eb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44cd11ef4ab3675dd8a7598d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 17:37:19 2020 -0500 qcap/smartteefilter: Return VFW_S_CANT_CUE from GetState() if paused. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 6 ++++++ dlls/qcap/tests/smartteefilter.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 5b4add0b5d..2f6f3ab2b7 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -62,10 +62,16 @@ static void smart_tee_destroy(struct strmbase_filter *iface) CoTaskMemFree(filter); } +static HRESULT smart_tee_wait_state(struct strmbase_filter *iface, DWORD timeout) +{ + return iface->state == State_Paused ? VFW_S_CANT_CUE : S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = smart_tee_get_pin, .filter_destroy = smart_tee_destroy, + .filter_wait_state = smart_tee_wait_state, }; static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *pmt) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 2f8fa6c4b5..f3a44c67c1 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2232,7 +2232,7 @@ static void test_unconnected_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); - todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); @@ -2246,7 +2246,7 @@ static void test_unconnected_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); - todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter);

1 0

Alistair Leslie-Hughes : ws2_32: Trace SIO_IDEAL_SEND_BACKLOG_* calls.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: da6386df8b759672e051304711bb6a5dc6ce9bd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da6386df8b759672e0513047… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 14 09:03:47 2020 +1000 ws2_32: Trace SIO_IDEAL_SEND_BACKLOG_* calls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++-- include/ws2ipdef.h | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 69fbb37af2..d7eddde44d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4554,8 +4554,8 @@ static const char *debugstr_wsaioctl(DWORD code) IOCTL_NAME(WS_SIO_GET_INTERFACE_LIST); /* IOCTL_NAME(WS_SIO_GET_INTERFACE_LIST_EX); */ IOCTL_NAME(WS_SIO_GET_QOS); - /* IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_CHANGE); - IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_QUERY); */ + IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_CHANGE); + IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_QUERY); IOCTL_NAME(WS_SIO_KEEPALIVE_VALS); IOCTL_NAME(WS_SIO_MULTIPOINT_LOOPBACK); IOCTL_NAME(WS_SIO_MULTICAST_SCOPE); diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 4cae361e5f..fc46580496 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -282,6 +282,14 @@ typedef struct WS(in_pktinfo) { #define SS_PORT(ssp) (((PSOCKADDR_IN)(ssp))->sin_port) +#ifndef USE_WS_PREFIX +#define SIO_IDEAL_SEND_BACKLOG_CHANGE _IO ('t', 122) +#define SIO_IDEAL_SEND_BACKLOG_QUERY _IOR('t', 123, ULONG) +#else +#define WS_SIO_IDEAL_SEND_BACKLOG_CHANGE WS__IO ('t', 122) +#define WS_SIO_IDEAL_SEND_BACKLOG_QUERY WS__IOR('t', 123, ULONG) +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Brendan Shanks : winevulkan: Export VK_KHR_get_surface_capabilities2 functions from vulkan-1.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 314cd9cdd542db658ce7a01ef0a7621fc2d9d335 URL: https://source.winehq.org/git/wine.git/?a=commit;h=314cd9cdd542db658ce7a01e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 13 11:45:30 2020 -0700 winevulkan: Export VK_KHR_get_surface_capabilities2 functions from vulkan-1. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 2 ++ dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winevulkan/winevulkan.spec | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index e8fb64d82b..026bd99dec 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -179,7 +179,9 @@ @ stdcall vkGetPhysicalDeviceQueueFamilyProperties2(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceQueueFamilyProperties2 @ stdcall vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties @ stdcall vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties2 +@ stdcall vkGetPhysicalDeviceSurfaceCapabilities2KHR(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR @ stdcall vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR +@ stdcall vkGetPhysicalDeviceSurfaceFormats2KHR(ptr ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormats2KHR @ stdcall vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormatsKHR @ stdcall vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfacePresentModesKHR @ stdcall vkGetPhysicalDeviceSurfaceSupportKHR(ptr long int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceSupportKHR diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b84eb39587..04b263e3e4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -130,6 +130,7 @@ UNSUPPORTED_EXTENSIONS = [ CORE_EXTENSIONS = [ "VK_KHR_display", "VK_KHR_display_swapchain", + "VK_KHR_get_surface_capabilities2", "VK_KHR_surface", "VK_KHR_swapchain", "VK_KHR_win32_surface", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 94aa1e3fb7..06d79b8fae 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4939,7 +4939,7 @@ static VkResult WINAPI wine_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesC return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(physicalDevice->phys_dev, pCombinationCount, pCombinations); } -static VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) { #if defined(USE_STRUCT_CONVERSION) VkResult result; @@ -4962,7 +4962,7 @@ VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice->phys_dev, surface, pSurfaceCapabilities); } -static VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, uint32_t *pSurfaceFormatCount, VkSurfaceFormat2KHR *pSurfaceFormats) +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, uint32_t *pSurfaceFormatCount, VkSurfaceFormat2KHR *pSurfaceFormats) { #if defined(USE_STRUCT_CONVERSION) VkResult result; diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 44ac8c6d2f..383e6b9b8f 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -182,7 +182,9 @@ @ stdcall -private wine_vkGetPhysicalDeviceQueueFamilyProperties2(ptr ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr) +@ stdcall -private wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(ptr ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) +@ stdcall -private wine_vkGetPhysicalDeviceSurfaceFormats2KHR(ptr ptr ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceSupportKHR(ptr long int64 ptr)

1 0