- Wine-Devel - list.winehq.org

[PATCH vkd3d v2 1/4] vkd3d: Resolve D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND during table parsing.
by Conor McCarthy June 3, 2021

June 3, 2021

Simplifies the code path for handling array bindings and unbounded ranges. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 6 +----- libs/vkd3d/state.c | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 116a8a62..06d7746d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2674,7 +2674,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor_table = root_signature_get_descriptor_table(root_signature, index); - descriptor = base_descriptor; descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2682,10 +2681,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list { range = &descriptor_table->ranges[i]; - if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) - { - descriptor = base_descriptor + range->offset; - } + descriptor = base_descriptor + range->offset; for (j = 0; j < range->descriptor_count; ++j, ++descriptor) { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e459c998..d07212f6 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -591,6 +591,8 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo for (i = 0; i < desc->NumParameters; ++i) { const D3D12_ROOT_PARAMETER *p = &desc->pParameters[i]; + unsigned int offset = 0; + if (p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) continue; @@ -608,6 +610,24 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo { range = &p->u.DescriptorTable.pDescriptorRanges[j]; + if (range->OffsetInDescriptorsFromTableStart != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) + offset = range->OffsetInDescriptorsFromTableStart; + + table->ranges[j].offset = offset; + table->ranges[j].descriptor_count = range->NumDescriptors; + table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); + table->ranges[j].register_space = range->RegisterSpace; + table->ranges[j].base_register_idx = range->BaseShaderRegister; + + TRACE("Descriptor table range %u.%u, offset %u, type %u, count %d.\n", i, j, + offset, range->RangeType, range->NumDescriptors); + + /* Validation during counting ensures this value is never used if range->NumDescriptors == UINT_MAX. */ + offset += range->NumDescriptors; + } + + for (j = 0; j < range_count; ++j) + { vk_binding = d3d12_root_signature_assign_vk_bindings(root_signature, vkd3d_descriptor_type_from_d3d12_range_type(range->RangeType), range->RegisterSpace, range->BaseShaderRegister, range->NumDescriptors, false, true, @@ -638,12 +658,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo ++cur_binding; } - table->ranges[j].offset = range->OffsetInDescriptorsFromTableStart; - table->ranges[j].descriptor_count = range->NumDescriptors; table->ranges[j].binding = vk_binding; - table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); - table->ranges[j].register_space = range->RegisterSpace; - table->ranges[j].base_register_idx = range->BaseShaderRegister; } } -- 2.31.1

1 3

[PATCH 1/5] ws2_32: Fail with WSAEINVAL if a requested extension function is not found.
by Zebediah Figura June 2, 2021

June 2, 2021

Rather than WSAEOPNOTSUPP. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 79085cf0c2a..478ae960541 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3536,7 +3536,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(in_buff)); - SetLastError( WSAEOPNOTSUPP ); + SetLastError( WSAEINVAL ); return -1; } case WS_SIO_KEEPALIVE_VALS: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c0b1abcaaa5..ec138fcf29a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4258,7 +4258,7 @@ static void test_get_extension_func(void) ret = WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &bogus_guid, sizeof(GUID), &func, sizeof(func), &size, &overlapped, NULL); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); ok(size == 0xdeadbeef, "got size %u\n", size); ok(overlapped.Internal == 0xdeadbeef, "got status %#x\n", (NTSTATUS)overlapped.Internal); ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); -- 2.30.2

2 5

Re: [PATCH] mmdevapi: Guard MMDevEnum_Create against concurrent initialization.
by Rémi Bernon June 2, 2021

June 2, 2021

On 6/2/21 11:28 PM, Marvin wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch. > After discussion on IRC I'm going to rewrite it, so please just ignore it. -- Rémi Bernon <rbernon(a)codeweavers.com>

1 0

[PATCH] winebuild: Clear RFLAGS before entering syscall.
by Rémi Bernon June 2, 2021

June 2, 2021

We pushed the flags, but kept them set. Far Cry sets NT flags, which causes later iretd instruction to raise a GP fault exception. This fixes a regression from e341d1f695311725752c287057f6c6ab60fdf2a3. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50793 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/winebuild/import.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b745f16db42..ad773e2a0d9 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1447,6 +1447,8 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tmovl %%esi,-0x04(%%ebp)\n" ); output_cfi( ".cfi_rel_offset %%esi,-0x04\n" ); output( "\tpushfl\n" ); + output( "\tpushl $0x202\n" ); + output( "\tpopfl\n" ); output( "\tmovw %%gs,-0x1a(%%ebp)\n" ); output( "\tmovw %%fs,-0x1c(%%ebp)\n" ); output( "\tmovw %%es,-0x1e(%%ebp)\n" ); -- 2.31.0

2 4

[PATCH] mmdevapi: Guard MMDevEnum_Create against concurrent initialization.
by Rémi Bernon June 2, 2021

June 2, 2021

When the MMDeviceEnumerator class is created by two different threads at the same time, there may be a race condition where one of the thread starts using it while the other is still enumerating audio devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mmdevapi/devenum.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index fc33cac17ec..6528cfc0288 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -858,16 +858,29 @@ static const IMMDeviceCollectionVtbl MMDevColVtbl = MMDevCol_Item }; +static CRITICAL_SECTION devenum_init_cs; +static CRITICAL_SECTION_DEBUG devenum_init_cs_debug = +{ + 0, 0, &devenum_init_cs, + { &devenum_init_cs_debug.ProcessLocksList, &devenum_init_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": devenum_init_cs") } +}; +static CRITICAL_SECTION devenum_init_cs = { &devenum_init_cs_debug, -1, 0, 0, 0, 0 }; + HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { - MMDevEnumImpl *This = MMDevEnumerator; + MMDevEnumImpl *This; - if (!This) + EnterCriticalSection(&devenum_init_cs); + if (!(This = MMDevEnumerator)) { This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); *ppv = NULL; if (!This) + { + LeaveCriticalSection(&devenum_init_cs); return E_OUTOFMEMORY; + } This->ref = 1; This->IMMDeviceEnumerator_iface.lpVtbl = &MMDevEnumVtbl; MMDevEnumerator = This; @@ -876,6 +889,8 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) load_driver_devices(eRender); load_driver_devices(eCapture); } + LeaveCriticalSection(&devenum_init_cs); + return IMMDeviceEnumerator_QueryInterface(&This->IMMDeviceEnumerator_iface, riid, ppv); } @@ -886,8 +901,11 @@ void MMDevEnum_Free(void) RegCloseKey(key_render); RegCloseKey(key_capture); key_render = key_capture = NULL; + + EnterCriticalSection(&devenum_init_cs); HeapFree(GetProcessHeap(), 0, MMDevEnumerator); MMDevEnumerator = NULL; + LeaveCriticalSection(&devenum_init_cs); } static HRESULT WINAPI MMDevEnum_QueryInterface(IMMDeviceEnumerator *iface, REFIID riid, void **ppv) -- 2.31.0

1 0

[PATCH 1/2] sppc: Add stub dll.
by Esme Povirk June 2, 2021

June 2, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/sppc/Makefile.in | 3 ++ dlls/sppc/sppc.spec | 67 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 dlls/sppc/Makefile.in create mode 100644 dlls/sppc/sppc.spec diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in new file mode 100644 index 00000000000..19c9e0a9b64 --- /dev/null +++ b/dlls/sppc/Makefile.in @@ -0,0 +1,3 @@ +MODULE = sppc.dll + +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec new file mode 100644 index 00000000000..5bc9fee19d1 --- /dev/null +++ b/dlls/sppc/sppc.spec @@ -0,0 +1,67 @@ +@ stub SLCallServer +@ stub SLpAuthenticateGenuineTicketResponse +@ stub SLpBeginGenuineTicketTransaction +@ stub SLpClearActivationInProgress +@ stub SLpDepositDownlevelGenuineTicket +@ stub SLpDepositTokenActivationResponse +@ stub SLpGenerateTokenActivationChallenge +@ stub SLpGetGenuineBlob +@ stub SLpGetGenuineLocal +@ stub SLpGetLicenseAcquisitionInfo +@ stub SLpGetMSPidInformation +@ stub SLpGetMachineUGUID +@ stub SLpGetTokenActivationGrantInfo +@ stub SLpIAActivateProduct +@ stub SLpIsCurrentInstalledProductKeyDefaultKey +@ stub SLpProcessVMPipeMessage +@ stub SLpSetActivationInProgress +@ stub SLpTriggerServiceWorker +@ stub SLpVLActivateProduct +@ stub SLClose +@ stub SLConsumeRight +@ stub SLDepositMigrationBlob +@ stub SLDepositOfflineConfirmationId +@ stub SLDepositOfflineConfirmationIdEx +@ stub SLDepositStoreToken +@ stub SLFireEvent +@ stub SLGatherMigrationBlob +@ stub SLGatherMigrationBlobEx +@ stub SLGenerateOfflineInstallationId +@ stub SLGenerateOfflineInstallationIdEx +@ stub SLGetActiveLicenseInfo +@ stub SLGetApplicationInformation +@ stub SLGetApplicationPolicy +@ stub SLGetAuthenticationResult +@ stub SLGetEncryptedPIDEx +@ stub SLGetGenuineInformation +@ stub SLGetInstalledProductKeyIds +@ stub SLGetLicense +@ stub SLGetLicenseFileId +@ stub SLGetLicenseInformation +@ stub SLGetLicensingStatusInformation +@ stub SLGetPKeyId +@ stub SLGetPKeyInformation +@ stub SLGetPolicyInformation +@ stub SLGetPolicyInformationDWORD +@ stub SLGetProductSkuInformation +@ stub SLGetSLIDList +@ stub SLGetServiceInformation +@ stub SLInstallLicense +@ stub SLInstallProofOfPurchase +@ stub SLInstallProofOfPurchaseEx +@ stub SLIsGenuineLocalEx +@ stub SLLoadApplicationPolicies +@ stub SLOpen +@ stub SLPersistApplicationPolicies +@ stub SLPersistRTSPayloadOverride +@ stub SLReArm +@ stub SLRegisterEvent +@ stub SLRegisterPlugin +@ stub SLSetAuthenticationData +@ stub SLSetCurrentProductKey +@ stub SLSetGenuineInformation +@ stub SLUninstallLicense +@ stub SLUninstallProofOfPurchase +@ stub SLUnloadApplicationPolicies +@ stub SLUnregisterEvent +@ stub SLUnregisterPlugin -- 2.25.1

1 1

Official Wine IRC channels moved to Libera Chat
by Henri Verbeet June 2, 2021

June 2, 2021

Hi all, After recent events at freenode[1], the Wine project has decided to move our official IRC channels to Libera Chat[2]. We would like to encourage everyone to please join us in #winehq and #winehackers on irc.libera.chat/6697 (TLS enabled). More information on how to connect and set up your client can be found at [3]. Henri [1] https://lwn.net/Articles/856543/ [2] https://libera.chat/ [3] https://libera.chat/guides

1 1

[PATCH] mscoree: Update Wine Mono to 6.2.0.
by Esme Povirk June 2, 2021

June 2, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index e3004c972f1..28c30197ebb 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.1.1" +#define MONO_VERSION "6.2.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "ac3b14beafde34b8482287e597000113dc06a915f32c9fd06c77eb819079e38b" +#define MONO_SHA "cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index e396d855e71..910cc40ccb0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.1.1" +#define WINE_MONO_VERSION "6.2.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.25.1

2 1

[PATCH 1/5] server: Introduce IOCTL_AFD_WINE_FIONBIO.
by Zebediah Figura June 2, 2021

June 2, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/afd.h | 4 ++-- server/sock.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index 8199e0e2dbe..5074c1f20dd 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -95,8 +95,8 @@ struct afd_poll_params #define IOCTL_AFD_WINE_RECVMSG CTL_CODE(FILE_DEVICE_NETWORK, 205, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SENDMSG CTL_CODE(FILE_DEVICE_NETWORK, 206, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_TRANSMIT CTL_CODE(FILE_DEVICE_NETWORK, 207, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 208, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_FIONBIO CTL_CODE(FILE_DEVICE_NETWORK, 209, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index e521818dc4b..45390127acc 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1892,6 +1892,27 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) set_error( STATUS_PENDING ); return 1; + case IOCTL_AFD_WINE_FIONBIO: + if (get_req_data_size() < sizeof(int)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + if (*(int *)get_req_data()) + { + sock->state |= FD_WINE_NONBLOCKING; + } + else + { + if (sock->mask) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + sock->state &= ~FD_WINE_NONBLOCKING; + } + return 1; + default: set_error( STATUS_NOT_SUPPORTED ); return 0; -- 2.30.2

2 5

[PATCH 2/2] msvcrt: Import fma implementation from musl.
by Piotr Caban June 2, 2021

June 2, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 210 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 --- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 205 insertions(+), 20 deletions(-)

1 0