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

Matteo Bruni : d3dcompiler: Fix typo in struct d3dcompiler_shader_reflection.
by Alexandre Julliard June 1, 2021

June 1, 2021

Module: wine Branch: master Commit: 749da353c985201797b00c7b8735727968758168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=749da353c985201797b00c7b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 31 21:12:51 2021 +0200 d3dcompiler: Fix typo in struct d3dcompiler_shader_reflection. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 4415399793d..bd064793587 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -140,7 +140,7 @@ struct d3dcompiler_shader_reflection UINT dynamic_flow_control_count; UINT c_control_points; D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; - D3D_TESSELLATOR_PARTITIONING hs_prtitioning; + D3D_TESSELLATOR_PARTITIONING hs_partitioning; D3D_TESSELLATOR_DOMAIN tessellator_domain; struct d3dcompiler_shader_signature *isgn; @@ -428,7 +428,7 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11Sha desc->cGSInstanceCount = 0; desc->cControlPoints = This->c_control_points; desc->HSOutputPrimitive = This->hs_output_primitive; - desc->HSPartitioning = This->hs_prtitioning; + desc->HSPartitioning = This->hs_partitioning; desc->TessellatorDomain = This->tessellator_domain; desc->cBarrierInstructions = 0; desc->cInterlockedInstructions = 0; @@ -1184,8 +1184,8 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c r->hs_output_primitive = read_dword(&ptr); TRACE("HSOutputPrimitive: %x\n", r->hs_output_primitive); - r->hs_prtitioning = read_dword(&ptr); - TRACE("HSPartitioning: %x\n", r->hs_prtitioning); + r->hs_partitioning = read_dword(&ptr); + TRACE("HSPartitioning: %x\n", r->hs_partitioning); r->tessellator_domain = read_dword(&ptr); TRACE("TessellatorDomain: %x\n", r->tessellator_domain);

1 0

Jacek Caban : winepulse: Use syscall interface to call unix lib.
by Alexandre Julliard June 1, 2021

June 1, 2021

Module: wine Branch: master Commit: 2e64d91428757eaa88475b49bf50922cda603b59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e64d91428757eaa88475b49… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 19:05:17 2021 +0200 winepulse: Use syscall interface to call unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/Makefile.in | 2 +- dlls/winepulse.drv/mmdevdrv.c | 56 ++++++++------- dlls/winepulse.drv/pulse.c | 150 +++++++++++++++++++++++++++-------------- dlls/winepulse.drv/unixlib.h | 46 ++++++------- 4 files changed, 156 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e64d91428757eaa8847…

1 0

Jacek Caban : winepulse: Wrap unix call parameters in structs.
by Alexandre Julliard June 1, 2021

June 1, 2021

Module: wine Branch: master Commit: f77af3dd6324fadaf153062d77b51f755f71faea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f77af3dd6324fadaf153062d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 19:05:01 2021 +0200 winepulse: Wrap unix call parameters in structs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 163 +++++++++++++++----- dlls/winepulse.drv/pulse.c | 335 ++++++++++++++++++++++++------------------ dlls/winepulse.drv/unixlib.h | 202 +++++++++++++++++++++---- 3 files changed, 493 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f77af3dd6324fadaf153…

1 0

Jacek Caban : winevulkan: Directly use host vkGetPhysicalDeviceProperties in wine_vkCreateDevice.
by Alexandre Julliard June 1, 2021

June 1, 2021

Module: wine Branch: master Commit: 272542f4965067b91288ab678ac3987824c94dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=272542f4965067b91288ab67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 31 16:17:31 2021 +0200 winevulkan: Directly use host vkGetPhysicalDeviceProperties in wine_vkCreateDevice. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1c985aaf03c..bdd9f2151c0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -70,9 +70,6 @@ static uint32_t wine_vk_count_struct_(void *s, VkStructureType t) static const struct vulkan_funcs *vk_funcs; static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); -void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device, - VkPhysicalDeviceProperties *properties); - #define WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, object, native_handle) \ wine_vk_add_handle_mapping((instance), (uint64_t) (uintptr_t) (object), (uint64_t) (uintptr_t) (native_handle), &(object)->mapping) #define WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, native_handle) \ @@ -694,9 +691,9 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, if (TRACE_ON(vulkan)) { - VkPhysicalDeviceProperties properties; + VkPhysicalDeviceProperties_host properties; - wine_vkGetPhysicalDeviceProperties(phys_dev, &properties); + phys_dev->instance->funcs.p_vkGetPhysicalDeviceProperties(phys_dev->phys_dev, &properties); TRACE("Device name: %s.\n", debugstr_a(properties.deviceName)); TRACE("Vendor ID: %#x, Device ID: %#x.\n", properties.vendorID, properties.deviceID);

1 0

Jacek Caban : winevulkan: Remove no longer needed #ifdefs from dispatch tables.
by Alexandre Julliard June 1, 2021

June 1, 2021

Module: wine Branch: master Commit: b02e18f393053d849d696ba8bfe7d24736f29f93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b02e18f393053d849d696ba8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 31 16:17:03 2021 +0200 winevulkan: Remove no longer needed #ifdefs from dispatch tables. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 18 +- dlls/winevulkan/vulkan_thunks.h | 440 ---------------------------------------- 2 files changed, 2 insertions(+), 456 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b02e18f393053d849d69…

1 0

Jacek Caban : winevulkan: Make core function thunks static.
by Alexandre Julliard June 1, 2021

June 1, 2021

Module: wine Branch: master Commit: 8285f616030f27877922ff414530d4f909306ace URL: https://source.winehq.org/git/wine.git/?a=commit;h=8285f616030f27877922ff41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 31 18:01:42 2021 +0200 winevulkan: Make core function thunks static. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 338 ++++++++++++++++++++-------------------- 2 files changed, 170 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8285f616030f27877922…

1 0

Ziqing Hui : windowscodecs/tests: Call SetParameters in create_and_init_encoder.
by Alexandre Julliard June 1, 2021

June 1, 2021

Module: wine Branch: master Commit: 738c594bf623c1106cf32f24c39bcd78a258ac55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=738c594bf623c1106cf32f24… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat May 29 08:26:43 2021 +0800 windowscodecs/tests: Call SetParameters in create_and_init_encoder. Also make dds_encoder optional. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index d530e65eb2d..d5e2be03389 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -553,9 +553,10 @@ static void release_encoder(IWICBitmapEncoder *encoder, IWICDdsEncoder *dds_enco if (encoder) IWICBitmapEncoder_Release(encoder); } -static HRESULT create_and_init_encoder(BYTE *image_buffer, UINT buffer_size, +static HRESULT create_and_init_encoder(BYTE *image_buffer, UINT buffer_size, WICDdsParameters *params, IWICBitmapEncoder **encoder, IWICDdsEncoder **dds_encoder, IWICStream **stream) { + IWICDdsEncoder *dds = NULL; HRESULT hr; *encoder = create_encoder(); @@ -568,14 +569,31 @@ static HRESULT create_and_init_encoder(BYTE *image_buffer, UINT buffer_size, ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); if (hr != S_OK) goto fail; - hr = IWICBitmapEncoder_QueryInterface(*encoder, &IID_IWICDdsEncoder, (void **)dds_encoder); + hr = IWICBitmapEncoder_QueryInterface(*encoder, &IID_IWICDdsEncoder, (void **)&dds); ok(hr == S_OK, "QueryInterface failed, hr %#x\n", hr); if (hr != S_OK) goto fail; + if (params) + { + hr = IWICDdsEncoder_SetParameters(dds, params); + ok(hr == S_OK, "SetParameters failed, hr %#x\n", hr); + if (hr != S_OK) goto fail; + } + + if (dds_encoder) + { + *dds_encoder = dds; + } + else + { + IWICDdsEncoder_Release(dds); + dds = NULL; + } + return S_OK; fail: - release_encoder(*encoder, *dds_encoder, *stream); + release_encoder(*encoder, dds, *stream); return E_FAIL; } @@ -1354,7 +1372,7 @@ static void test_dds_encoder_params(void) HRESULT hr; UINT i; - hr = create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + hr = create_and_init_encoder(buffer, sizeof(buffer), NULL, &encoder, &dds_encoder, &stream); if (hr != S_OK) goto end; hr = IWICDdsEncoder_GetParameters(dds_encoder, NULL); @@ -1424,9 +1442,8 @@ static void test_dds_encoder_create_frame(void) BYTE buffer[1024]; HRESULT hr; - hr = create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + hr = create_and_init_encoder(buffer, sizeof(buffer), &params, &encoder, &dds_encoder, &stream); if (hr != S_OK) goto end; - IWICDdsEncoder_SetParameters(dds_encoder, &params); hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame0, NULL); ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); @@ -1439,15 +1456,13 @@ static void test_dds_encoder_create_frame(void) release_encoder(encoder, dds_encoder, stream); - create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); - IWICDdsEncoder_SetParameters(dds_encoder, &params); + create_and_init_encoder(buffer, sizeof(buffer), &params, &encoder, &dds_encoder, &stream); hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, &array_index, &mip_level, &slice_index); ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); IWICBitmapFrameEncode_Release(frame0); release_encoder(encoder, dds_encoder, stream); - create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); - IWICDdsEncoder_SetParameters(dds_encoder, &params); + create_and_init_encoder(buffer, sizeof(buffer), &params, &encoder, &dds_encoder, &stream); hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, NULL, NULL, NULL); ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); IWICBitmapFrameEncode_Release(frame0);

1 0

Jacek Caban : ntdll: Introduce wine_unix_call.
by Alexandre Julliard June 1, 2021

June 1, 2021

Module: wine Branch: master Commit: 1b5ea62e8ecf99adb97d23ce8a7d142d6b381cbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b5ea62e8ecf99adb97d23ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 19:03:09 2021 +0200 ntdll: Introduce wine_unix_call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/unix/loader.c | 9 +++++++++ include/winternl.h | 3 +++ 3 files changed, 13 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 529bf6f269a..e2296f7cf27 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1612,6 +1612,7 @@ @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) # Unix interface +@ cdecl -syscall __wine_unix_call(int64 long ptr) @ cdecl __wine_set_unix_funcs(long ptr) @ cdecl __wine_init_unix_lib(long long ptr ptr) @ extern __wine_syscall_dispatcher diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ee66807997b..fb863bf17ad 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1123,6 +1123,15 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr } +/*********************************************************************** + * __wine_unix_call + */ +NTSTATUS CDECL __wine_unix_call( UINT64 handle, unsigned int code, void *args ) +{ + return ((unixlib_entry_t*)(UINT_PTR)handle)[code]( args ); +} + + /*********************************************************************** * load_so_dll */ diff --git a/include/winternl.h b/include/winternl.h index c688cdd5bb7..4f2fcc26682 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4561,6 +4561,9 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) /* Wine internal functions */ extern NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ); +extern NTSTATUS CDECL __wine_unix_call( UINT64 handle, unsigned int code, void *args ); + +typedef NTSTATUS (*unixlib_entry_t)( void *args ); /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */

1 0

Jacek Caban : winegcc: Use -soname for unix libs.
by Alexandre Julliard June 1, 2021

June 1, 2021

Module: wine Branch: master Commit: 388c91042ce5e16ada34b0ce56ad195aa446615f URL: https://source.winehq.org/git/wine.git/?a=commit;h=388c91042ce5e16ada34b0ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 19:01:10 2021 +0200 winegcc: Use -soname for unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 404c7b773ae..e43ad298e60 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -594,6 +594,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) } if (!try_link( opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) strarray_add( flags, "-Wl,-z,max-page-size=0x1000"); + if (opts->unix_lib) strarray_add( flags, strmake( "-Wl,-soname,%s.so", output_name )); break; }

1 0

Zebediah Figura : ws2_32/tests: Fix yet another test failure with Vista or older.
by Alexandre Julliard June 1, 2021

June 1, 2021

Module: wine Branch: master Commit: faf66ae94453dc98f8d2c8636570ed66c83f57ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf66ae94453dc98f8d2c863… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 31 22:16:32 2021 -0500 ws2_32/tests: Fix yet another test failure with Vista or older. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cf3878eba40..e76d9ac27a6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -200,6 +200,23 @@ static void tcp_socketpair(SOCKET *src, SOCKET *dst) tcp_socketpair_flags(src, dst, WSA_FLAG_OVERLAPPED); } +#define check_poll(a, b) check_poll_(__LINE__, a, POLLRDNORM | POLLRDBAND | POLLWRNORM, b, FALSE) +#define check_poll_todo(a, b) check_poll_(__LINE__, a, POLLRDNORM | POLLRDBAND | POLLWRNORM, b, TRUE) +#define check_poll_mask(a, b, c) check_poll_(__LINE__, a, b, c, FALSE) +#define check_poll_mask_todo(a, b, c) check_poll_(__LINE__, a, b, c, TRUE) +static void check_poll_(int line, SOCKET s, short mask, short expect, BOOL todo) +{ + WSAPOLLFD pollfd; + int ret; + + pollfd.fd = s; + pollfd.events = mask; + pollfd.revents = 0xdead; + ret = pWSAPoll(&pollfd, 1, 1000); + ok_(__FILE__, line)(ret == (pollfd.revents ? 1 : 0), "WSAPoll() returned %d\n", ret); + todo_wine_if (todo) ok_(__FILE__, line)(pollfd.revents == expect, "got wrong events %#x\n", pollfd.revents); +} + static void set_so_opentype ( BOOL overlapped ) { int optval = !overlapped, newval, len = sizeof (int); @@ -3763,11 +3780,17 @@ static void test_fionread_siocatmark(void) ret = send(server, "data", 5, 0); ok(ret == 5, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDNORM, POLLRDNORM); + check_fionread_siocatmark(client, 5, TRUE); ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDBAND, POLLRDBAND); + check_fionread_siocatmark_todo_oob(client, 5, FALSE); ret = send(server, "a", 1, MSG_OOB); @@ -5871,23 +5894,6 @@ static void test_write_watch(void) VirtualFree( base, 0, MEM_FREE ); } -#define check_poll(a, b) check_poll_(__LINE__, a, POLLRDNORM | POLLRDBAND | POLLWRNORM, b, FALSE) -#define check_poll_todo(a, b) check_poll_(__LINE__, a, POLLRDNORM | POLLRDBAND | POLLWRNORM, b, TRUE) -#define check_poll_mask(a, b, c) check_poll_(__LINE__, a, b, c, FALSE) -#define check_poll_mask_todo(a, b, c) check_poll_(__LINE__, a, b, c, TRUE) -static void check_poll_(int line, SOCKET s, short mask, short expect, BOOL todo) -{ - WSAPOLLFD pollfd; - int ret; - - pollfd.fd = s; - pollfd.events = mask; - pollfd.revents = 0xdead; - ret = pWSAPoll(&pollfd, 1, 1000); - ok_(__FILE__, line)(ret == (pollfd.revents ? 1 : 0), "WSAPoll() returned %d\n", ret); - todo_wine_if (todo) ok_(__FILE__, line)(pollfd.revents == expect, "got wrong events %#x\n", pollfd.revents); -} - static void test_WSAPoll(void) { const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)};

1 0