February 2021 - Wine-Commits

Doug Kingston : winealsa: Add card number to duplicate device descriptions.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: a9c8196e97ec255f4f69d005ea1cbf8fcf2537e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c8196e97ec255f4f69d005… Author: Doug Kingston <dpk(a)google.com> Date: Mon Feb 15 10:26:13 2021 -0600 winealsa: Add card number to duplicate device descriptions. Devices with the same device description cannot be distinguished. Add card number to the description of second and subsequent instances of devices with the same description. This mimics Windows behavior. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Doug Kingston <dpk(a)google.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 318350471db..cf2edcc7454 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -22,6 +22,8 @@ #include "config.h" #include <stdarg.h> +#define _GNU_SOURCE +#include <stdio.h> #include <math.h> #include "windef.h" @@ -521,6 +523,36 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***id } } +struct card_type { + struct list entry; + int first_card_number; + char string[1]; +}; + +static struct list card_types = LIST_INIT(card_types); + +static BOOL need_card_number(int card, const char *string) +{ + struct card_type *cptr; + + LIST_FOR_EACH_ENTRY(cptr, &card_types, struct card_type, entry) + { + if(!strcmp(string, cptr->string)) + return card != cptr->first_card_number; + } + + /* this is the first instance of string */ + cptr = HeapAlloc(GetProcessHeap(), 0, sizeof(struct card_type) + strlen(string)); + if(!cptr) + /* Default to displaying card number if we can't track cards */ + return TRUE; + + cptr->first_card_number = card; + strcpy(cptr->string, string); + list_add_head(&card_types, &cptr->entry); + return FALSE; +} + static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { @@ -564,6 +596,17 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, cardpath, err, snd_strerror(err)); alsa_get_card_devices(flow, stream, ids, guids, num, ctl, card, nameW); }else{ + if(need_card_number(card, cardname)){ + char *cardnameN; + /* + * For identical card names, second and subsequent instances get + * card number prefix to distinguish them (like Windows). + */ + if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ + free(cardname); + cardname = cardnameN; + } + } len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));

1 0

Paul Gofman : msvcrt: Ignore inherited FDs with invalid handles in msvcrt_init_io().
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 611742d31fb042d642d5ac30eebf0d73154a3481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=611742d31fb042d642d5ac30… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 15 17:52:16 2021 +0300 msvcrt: Ignore inherited FDs with invalid handles in msvcrt_init_io(). The process std handles should be preserved in this case. Fixes error on startup in "Re:ZERO -Starting Life in Another World- The Prophecy of the Throne" launcher. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 73e1a82476f..89d6e7d721f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -586,7 +586,7 @@ void msvcrt_init_io(void) count = min(count, MSVCRT_MAX_FILES); for (i = 0; i < count; i++) { - if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) + if ((*wxflag_ptr & WX_OPEN) && GetFileType(*handle_ptr) != FILE_TYPE_UNKNOWN) { fdinfo = get_ioinfo_alloc_fd(i); if(fdinfo != &MSVCRT___badioinfo) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 0cf8bad124f..fb242d81282 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1454,13 +1454,27 @@ static void test_file_write_read( void ) free(tempf); } -static void test_file_inherit_child(const char* fd_s) +static void test_file_inherit_child(const char* fd_s, const char *handle_str) { + HANDLE handle_value; int fd = atoi(fd_s); + HANDLE *handle_ptr; + unsigned int count; char buffer[32]; + STARTUPINFOA si; int ret; - ret =write(fd, "Success", 8); + GetStartupInfoA(&si); + count = *(unsigned *)si.lpReserved2; + if (handle_str) + { + ok(count == 3, "Got unexpected count %u.\n", count); + sscanf(handle_str, "%p", &handle_value); + handle_ptr = (HANDLE *)(si.lpReserved2 + sizeof(unsigned) + count); + ok(handle_value == handle_ptr[1], "Got unexpected handle %p.\n", handle_ptr[1]); + } + + ret = write(fd, "Success", 8); ok( ret == 8, "Couldn't write in child process on %d (%s)\n", fd, strerror(errno)); lseek(fd, 0, SEEK_SET); ok(read(fd, buffer, sizeof (buffer)) == 8, "Couldn't read back the data\n"); @@ -1643,6 +1657,22 @@ static void test_file_inherit( const char* selfname ) test_stdout_handle( &startup, cmdline, handles[1], TRUE, "large size block" ); CloseHandle( handles[1] ); DeleteFileA("fdopen.tst"); + + /* test inherit block with invalid handle */ + handles[1] = INVALID_HANDLE_VALUE; + create_io_inherit_block( &startup, 3, handles ); + sprintf(cmdline, "%s file inherit 1 %p", selfname, handles[1]); + test_stdout_handle( &startup, cmdline, NULL, FALSE, "INVALID_HANDLE_VALUE stdout handle" ); + + handles[1] = NULL; + create_io_inherit_block( &startup, 3, handles ); + sprintf(cmdline, "%s file inherit 1 %p", selfname, handles[1]); + test_stdout_handle( &startup, cmdline, NULL, FALSE, "NULL stdout handle" ); + + handles[1] = (void *)0xdeadbeef; + create_io_inherit_block( &startup, 3, handles ); + sprintf(cmdline, "%s file inherit 1 %p", selfname, handles[1]); + test_stdout_handle( &startup, cmdline, NULL, FALSE, "invalid stdout handle" ); } static void test_invalid_stdin_child( void ) @@ -2714,7 +2744,7 @@ START_TEST(file) if (arg_c >= 3) { if (strcmp(arg_v[2], "inherit") == 0) - test_file_inherit_child(arg_v[3]); + test_file_inherit_child(arg_v[3], arg_c > 4 ? arg_v[4] : NULL); else if (strcmp(arg_v[2], "inherit_no") == 0) test_file_inherit_child_no(arg_v[3]); else if (strcmp(arg_v[2], "pipes") == 0)

1 0

Nikolay Sivov : mfplat: Unify trace format for device manager methods.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: fc3deb6cd807b7924ccc656a323c27fbbefc5c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc3deb6cd807b7924ccc656a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 15 14:33:31 2021 +0300 mfplat: Unify trace format for device manager methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index b78cfc33e60..99afbaf8a46 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8599,7 +8599,7 @@ static HRESULT dxgi_device_manager_get_handle_index(struct dxgi_device_manager * static HRESULT WINAPI dxgi_device_manager_QueryInterface(IMFDXGIDeviceManager *iface, REFIID riid, void **obj) { - TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFDXGIDeviceManager) || IsEqualGUID(riid, &IID_IUnknown)) @@ -8619,7 +8619,7 @@ static ULONG WINAPI dxgi_device_manager_AddRef(IMFDXGIDeviceManager *iface) struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); ULONG refcount = InterlockedIncrement(&manager->refcount); - TRACE("(%p) ref=%u.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -8629,7 +8629,7 @@ static ULONG WINAPI dxgi_device_manager_Release(IMFDXGIDeviceManager *iface) struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); ULONG refcount = InterlockedDecrement(&manager->refcount); - TRACE("(%p) ref=%u.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) {

1 0

Nikolay Sivov : mfplat/allocator: Handle bind flags and usage attributes.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 31202993a044ee4e0ca4cd8764a22b98a8d179c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31202993a044ee4e0ca4cd87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 15 14:33:30 2021 +0300 mfplat/allocator: Handle bind flags and usage attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 33 ++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 82 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 82e7c8680dd..cdd3d897169 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -72,6 +72,8 @@ struct sample_allocator unsigned int height; D3DFORMAT d3d9_format; DXGI_FORMAT dxgi_format; + unsigned int usage; + unsigned int bindflags; unsigned int buffer_count; } frame_desc; @@ -1346,8 +1348,12 @@ static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocat desc.Format = allocator->frame_desc.dxgi_format; desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; - desc.Usage = 0; - desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; + desc.Usage = allocator->frame_desc.usage; + desc.BindFlags = allocator->frame_desc.bindflags; + if (desc.Usage == D3D11_USAGE_DYNAMIC) + desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + else if (desc.Usage == D3D11_USAGE_STAGING) + desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ; if (SUCCEEDED(hr = ID3D11Device_CreateTexture2D(service->d3d11_device, &desc, NULL, &texture))) { @@ -1396,15 +1402,32 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u if (sample_count > max_sample_count) return E_INVALIDARG; + allocator->frame_desc.usage = D3D11_USAGE_DEFAULT; + if (attributes) + { + IMFAttributes_GetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, &allocator->frame_desc.buffer_count); + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_USAGE, &allocator->frame_desc.usage); + } + + if (allocator->frame_desc.usage == D3D11_USAGE_IMMUTABLE || allocator->frame_desc.usage > D3D11_USAGE_STAGING) + return E_INVALIDARG; + + if (allocator->frame_desc.usage == D3D11_USAGE_DEFAULT) + allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; + else if (allocator->frame_desc.usage == D3D11_USAGE_DYNAMIC) + allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE; + else + allocator->frame_desc.bindflags = 0; + + if (attributes) + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, &allocator->frame_desc.bindflags); + sample_allocator_set_media_type(allocator, media_type); sample_allocator_set_attributes(allocator, attributes); sample_count = max(1, sample_count); max_sample_count = max(1, max_sample_count); - if (attributes) - IMFAttributes_GetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, &allocator->frame_desc.buffer_count); - allocator->frame_desc.d3d9_format = subtype.Data1; allocator->frame_desc.dxgi_format = MFMapDX9FormatToDXGIFormat(allocator->frame_desc.d3d9_format); allocator->frame_desc.width = frame_size >> 32; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 9e3a3da08ea..fdfcf8a5d4b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6295,7 +6295,7 @@ static void test_sample_allocator(void) IMFVideoSampleAllocatorEx *allocatorex; IDirect3DDeviceManager9 *d3d9_manager; IMFVideoSampleAllocator *allocator; - unsigned int buffer_count, token; + unsigned int i, buffer_count, token; IDirect3DDevice9 *d3d9_device; IMFDXGIDeviceManager *manager; IMFSample *sample, *sample2; @@ -6311,6 +6311,14 @@ static void test_sample_allocator(void) HRESULT hr; BYTE *data; HWND window; + static const unsigned int usage[] = + { + D3D11_USAGE_DEFAULT, + D3D11_USAGE_IMMUTABLE, + D3D11_USAGE_DYNAMIC, + D3D11_USAGE_STAGING, + D3D11_USAGE_STAGING + 1, + }; if (!pMFCreateVideoSampleAllocatorEx) { @@ -6600,6 +6608,78 @@ todo_wine IMFSample_Release(sample); IMFVideoSampleAllocator_Release(allocator); + + /* MF_SA_D3D11_USAGE */ + hr = MFCreateAttributes(&attributes, 1); + ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(usage); ++i) + { + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&allocatorex); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_SetDirectXManager(allocatorex, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_USAGE, usage[i]); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); + if (usage[i] == D3D11_USAGE_IMMUTABLE || usage[i] > D3D11_USAGE_STAGING) + { + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMFVideoSampleAllocatorEx_Release(allocatorex); + continue; + } + ok(hr == S_OK, "%u: Unexpected hr %#x.\n", usage[i], hr); + + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_USAGE, D3D11_USAGE_DEFAULT); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)&texture); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + + ID3D11Texture2D_GetDesc(texture, &desc); + ok(desc.Usage == usage[i], "Unexpected usage %u.\n", desc.Usage); + if (usage[i] == D3D11_USAGE_DEFAULT) + { + ok(desc.BindFlags == (D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET), "Unexpected bind flags %#x.\n", + desc.BindFlags); + ok(desc.CPUAccessFlags == 0, "Unexpected CPU access flags %#x.\n", desc.CPUAccessFlags); + } + else if (usage[i] == D3D11_USAGE_DYNAMIC) + { + ok(desc.BindFlags == D3D11_BIND_SHADER_RESOURCE, "Unexpected bind flags %#x.\n", desc.BindFlags); + ok(desc.CPUAccessFlags == D3D11_CPU_ACCESS_WRITE, "Unexpected CPU access flags %#x.\n", desc.CPUAccessFlags); + } + else if (usage[i] == D3D11_USAGE_STAGING) + { + ok(desc.BindFlags == 0, "Unexpected bind flags %#x.\n", desc.BindFlags); + ok(desc.CPUAccessFlags == (D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ), "Unexpected CPU access flags %#x.\n", + desc.CPUAccessFlags); + } + ok(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); + + ID3D11Texture2D_Release(texture); + IMFDXGIBuffer_Release(dxgi_buffer); + IMFMediaBuffer_Release(buffer); + + IMFSample_Release(sample); + + IMFVideoSampleAllocatorEx_Release(allocatorex); + } + + IMFAttributes_Release(attributes); + IMFDXGIDeviceManager_Release(manager); ID3D11Device_Release(device);

1 0

Francois Gouget : kernel32/tests: Ignore exceptions while testing winedbg.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 5007f6fa35db9e6d1f0623bde18d6f56546e31e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5007f6fa35db9e6d1f0623bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:14:52 2021 +0100 kernel32/tests: Ignore exceptions while testing winedbg. test_ExitCode() has one test that makes sure winedbg is non-interactive when ShowCrashDialog is 0. This causes winedbg to output an "unhandled exception" message which should not be counted as a test failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index d8eb61fceab..f035d9165c7 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -754,7 +754,9 @@ static void test_ExitCode(void) reg_save_value crash_dlg_value; save_value(hkeyWinedbg, "ShowCrashDialog", &crash_dlg_value); RegSetValueExA(hkeyWinedbg, "ShowCrashDialog", 0, REG_DWORD, (BYTE *)&zero, sizeof(DWORD)); + ignore_exceptions(TRUE); crash_and_winedbg(hkey, test_exe); + ignore_exceptions(FALSE); restore_value(hkeyWinedbg, &crash_dlg_value); RegCloseKey(hkeyWinedbg); }

1 0

Paul Gofman : vcomp: Change _vcomp_fork_call_wrapper() args parameter type to void **.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 5366f67ef017f41d0936bc5bf2722e27acbe1b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5366f67ef017f41d0936bc5b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 12 20:29:13 2021 +0300 vcomp: Change _vcomp_fork_call_wrapper() args parameter type to void **. That is assumed in the asm implementation. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 7b97dfc72c8..11dfb78030b 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -117,9 +117,14 @@ struct vcomp_task_data unsigned int dynamic_chunksize; }; +static void **ptr_from_va_list(__ms_va_list valist) +{ + return *(void ***)&valist; +} + #if defined(__i386__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -154,7 +159,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__x86_64__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "pushq %rbp\n\t" __ASM_SEH(".seh_pushreg %rbp\n\t") @@ -198,7 +203,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__arm__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "push {r4, r5, LR}\n\t" "mov r4, r0\n\t" @@ -234,7 +239,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__aarch64__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "stp x29, x30, [SP,#-16]!\n\t" "mov x29, SP\n\t" @@ -263,7 +268,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #else -static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args) +static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args) { ERR("Not implemented for this architecture\n"); } @@ -1406,7 +1411,7 @@ static DWORD WINAPI _vcomp_fork_worker(void *param) if (team != NULL) { LeaveCriticalSection(&vcomp_section); - _vcomp_fork_call_wrapper(team->wrapper, team->nargs, team->valist); + _vcomp_fork_call_wrapper(team->wrapper, team->nargs, ptr_from_va_list(team->valist)); EnterCriticalSection(&vcomp_section); thread_data->team = NULL; @@ -1540,7 +1545,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) } vcomp_set_thread_data(&thread_data); - _vcomp_fork_call_wrapper(team_data.wrapper, team_data.nargs, team_data.valist); + _vcomp_fork_call_wrapper(team_data.wrapper, team_data.nargs, ptr_from_va_list(team_data.valist)); vcomp_set_thread_data(prev_thread_data); prev_thread_data->fork_threads = 0;

1 0

Alexandre Julliard : ntdll: Allocate the initial process parameters on the Unix side.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 0d3972ce8ab4a5f7db4ba97161cc6c4c3fdd19f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d3972ce8ab4a5f7db4ba971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:30:28 2021 +0100 ntdll: Allocate the initial process parameters on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 89 +++++++----------------- dlls/ntdll/unix/env.c | 150 ++++++++++++++++++++++++++++++++++------- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 3 +- 5 files changed, 151 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d3972ce8ab4a5f7db4b…

1 0

Liam Middlebrook : winevulkan: Handle bitmask types backed by VkFlags64.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 746b27f97d0776a90b049ed38dfc2e42f92f0ae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=746b27f97d0776a90b049ed3… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Feb 15 02:18:47 2021 -0800 winevulkan: Handle bitmask types backed by VkFlags64. Previously bitmask types were always treated as 32-bit values, now the basetype of each bitmask must be checked. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 76eba97180b..f341c3c5ad0 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1375,7 +1375,14 @@ class VkParam(object): if self.is_static_array() or self.is_pointer(): self.format_str = "%p" else: - if self.type_info["category"] in ["bitmask", "enum"]: + if self.type_info["category"] in ["bitmask"]: + # Since 1.2.170 bitmasks can be 32 or 64-bit, check the basetype. + if self.type_info["data"].type == "VkFlags64": + self.format_str = "0x%s" + self.format_conv = "wine_dbgstr_longlong({0})" + else: + self.format_str = "%#x" + elif self.type_info["category"] in ["enum"]: self.format_str = "%#x" elif self.is_handle(): # We use uint64_t for non-dispatchable handles as opposed to pointers @@ -1577,7 +1584,13 @@ class VkParam(object): return "str" if self.is_dispatchable() or self.is_pointer() or self.is_static_array(): return "ptr" - if self.type_info["category"] in ["bitmask", "enum"]: + if self.type_info["category"] in ["bitmask"]: + # Since 1.2.170 bitmasks can be 32 or 64-bit, check the basetype. + if self.type_info["data"].type == "VkFlags64": + return "int64" + else: + return "long" + if self.type_info["category"] in ["enum"]: return "long" if self.is_handle() and not self.is_dispatchable(): return "int64"

1 0

Nikolay Sivov : mfplat: Handle tracked sample release condition separately from refcount update.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 715c91cf78a5566faf6a88ad3d1d337a1b48a260 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715c91cf78a5566faf6a88ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 15 14:33:29 2021 +0300 mfplat: Handle tracked sample release condition separately from refcount update. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 10d2b7bc2a8..82e7c8680dd 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -184,18 +184,21 @@ static ULONG WINAPI sample_tracked_Release(IMFSample *iface) HRESULT hr; EnterCriticalSection(&sample->attributes.cs); - refcount = InterlockedDecrement(&sample->attributes.ref); - if (sample->tracked_result && sample->tracked_refcount == refcount) + if (sample->tracked_result && sample->tracked_refcount == (sample->attributes.ref - 1)) { - /* Call could fail if queue system is not initialized, it's not critical. */ - if (FAILED(hr = RtwqInvokeCallback(sample->tracked_result))) - WARN("Failed to invoke tracking callback, hr %#x.\n", hr); - IRtwqAsyncResult_Release(sample->tracked_result); + IRtwqAsyncResult *tracked_result = sample->tracked_result; sample->tracked_result = NULL; sample->tracked_refcount = 0; + + /* Call could fail if queue system is not initialized, it's not critical. */ + if (FAILED(hr = RtwqInvokeCallback(tracked_result))) + WARN("Failed to invoke tracking callback, hr %#x.\n", hr); + IRtwqAsyncResult_Release(tracked_result); } LeaveCriticalSection(&sample->attributes.cs); + refcount = InterlockedDecrement(&sample->attributes.ref); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount)

1 0

Erich E. Hoover : mountmgr.sys: Add support for volume information queries.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: d896c2201f5c03fae738d74e6ad617aa772f86e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d896c2201f5c03fae738d74e… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Jun 12 14:48:25 2020 -0600 mountmgr.sys: Add support for volume information queries. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 123 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c9cee002bc0..dd2c7d70759 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -91,6 +91,7 @@ struct disk_device char *unix_device; /* unix device path */ char *unix_mount; /* unix mount point path */ char *serial; /* disk serial number */ + struct volume *volume; /* associated volume */ }; struct volume @@ -746,7 +747,7 @@ static DWORD VOLUME_GetAudioCDSerial( const CDROM_TOC *toc ) /* create the disk device for a given volume */ -static NTSTATUS create_disk_device( enum device_type type, struct disk_device **device_ret ) +static NTSTATUS create_disk_device( enum device_type type, struct disk_device **device_ret, struct volume *volume ) { static const WCHAR harddiskvolW[] = {'\\','D','e','v','i','c','e', '\\','H','a','r','d','d','i','s','k','V','o','l','u','m','e','%','u',0}; @@ -808,6 +809,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** device->unix_device = NULL; device->unix_mount = NULL; device->symlink.Buffer = NULL; + device->volume = volume; if (link_format) { @@ -930,7 +932,7 @@ static NTSTATUS create_volume( const char *udi, enum device_type type, struct vo if (!(volume = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*volume) ))) return STATUS_NO_MEMORY; - if (!(status = create_disk_device( type, &volume->device ))) + if (!(status = create_disk_device( type, &volume->device, volume ))) { if (udi) set_volume_udi( volume, udi ); list_add_tail( &volumes_list, &volume->entry ); @@ -1125,7 +1127,7 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, if (type != disk_device->type) { - if ((status = create_disk_device( type, &disk_device ))) return status; + if ((status = create_disk_device( type, &disk_device, volume ))) return status; if (volume->mount) { delete_mount_point( volume->mount ); @@ -1826,6 +1828,118 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp ) return status; } +static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + int info_class = irpsp->Parameters.QueryVolume.FsInformationClass; + ULONG length = irpsp->Parameters.QueryVolume.Length; + struct disk_device *dev = device->DeviceExtension; + PIO_STATUS_BLOCK io = &irp->IoStatus; + struct volume *volume; + NTSTATUS status; + + TRACE( "volume query %x length %u\n", info_class, length ); + + EnterCriticalSection( &device_section ); + volume = dev->volume; + if (!volume) + { + status = STATUS_BAD_DEVICE_TYPE; + goto done; + } + + switch(info_class) + { + case FileFsVolumeInformation: + { + + FILE_FS_VOLUME_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; + + if (length < sizeof(FILE_FS_VOLUME_INFORMATION)) + { + status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + info->VolumeCreationTime.QuadPart = 0; /* FIXME */ + info->VolumeSerialNumber = volume->serial; + info->VolumeLabelLength = min( strlenW(volume->label) * sizeof(WCHAR), + length - offsetof( FILE_FS_VOLUME_INFORMATION, VolumeLabel ) ); + info->SupportsObjects = (get_mountmgr_fs_type(volume->fs_type) == MOUNTMGR_FS_TYPE_NTFS); + memcpy( info->VolumeLabel, volume->label, info->VolumeLabelLength ); + + io->Information = offsetof( FILE_FS_VOLUME_INFORMATION, VolumeLabel ) + info->VolumeLabelLength; + status = STATUS_SUCCESS; + break; + } + case FileFsAttributeInformation: + { + static const WCHAR fatW[] = {'F','A','T'}; + static const WCHAR fat32W[] = {'F','A','T','3','2'}; + static const WCHAR ntfsW[] = {'N','T','F','S'}; + static const WCHAR cdfsW[] = {'C','D','F','S'}; + static const WCHAR udfW[] = {'U','D','F'}; + + FILE_FS_ATTRIBUTE_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; + enum mountmgr_fs_type fs_type = get_mountmgr_fs_type(volume->fs_type); + + if (length < sizeof(FILE_FS_ATTRIBUTE_INFORMATION)) + { + status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + switch (fs_type) + { + case MOUNTMGR_FS_TYPE_ISO9660: + info->FileSystemAttributes = FILE_READ_ONLY_VOLUME; + info->MaximumComponentNameLength = 221; + info->FileSystemNameLength = min( sizeof(cdfsW), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) ); + memcpy(info->FileSystemName, cdfsW, info->FileSystemNameLength); + break; + case MOUNTMGR_FS_TYPE_UDF: + info->FileSystemAttributes = FILE_READ_ONLY_VOLUME | FILE_UNICODE_ON_DISK | FILE_CASE_SENSITIVE_SEARCH; + info->MaximumComponentNameLength = 255; + info->FileSystemNameLength = min( sizeof(udfW), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) ); + memcpy(info->FileSystemName, udfW, info->FileSystemNameLength); + break; + case MOUNTMGR_FS_TYPE_FAT: + info->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES; /* FIXME */ + info->MaximumComponentNameLength = 255; + info->FileSystemNameLength = min( sizeof(fatW), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) ); + memcpy(info->FileSystemName, fatW, info->FileSystemNameLength); + break; + case MOUNTMGR_FS_TYPE_FAT32: + info->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES; /* FIXME */ + info->MaximumComponentNameLength = 255; + info->FileSystemNameLength = min( sizeof(fat32W), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) ); + memcpy(info->FileSystemName, fat32W, info->FileSystemNameLength); + break; + default: + info->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES | FILE_PERSISTENT_ACLS; + info->MaximumComponentNameLength = 255; + info->FileSystemNameLength = min( sizeof(ntfsW), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) ); + memcpy(info->FileSystemName, ntfsW, info->FileSystemNameLength); + break; + } + + io->Information = offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) + info->FileSystemNameLength; + status = STATUS_SUCCESS; + break; + } + default: + FIXME("Unsupported volume query %x\n", irpsp->Parameters.QueryVolume.FsInformationClass); + status = STATUS_NOT_SUPPORTED; + break; + } + +done: + io->u.Status = status; + LeaveCriticalSection( &device_section ); + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return status; +} + /* handler for ioctls on the harddisk device */ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) { @@ -1925,9 +2039,10 @@ NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *pa harddisk_driver = driver; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = harddisk_ioctl; + driver->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = harddisk_query_volume; /* create a harddisk0 device that isn't assigned to any drive */ - create_disk_device( DEVICE_HARDDISK, &device ); + create_disk_device( DEVICE_HARDDISK, &device, NULL ); create_drive_devices();

1 0