January 2022 - Wine-commits

Alexandre Julliard : compstui: Fix printf format warnings on 64-bit.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: e7d0bf366864cb2b0a2a05c75207577d02ab6cf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7d0bf366864cb2b0a2a05c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:54:57 2022 +0100 compstui: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compstui/compstui_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/compstui/compstui_main.c b/dlls/compstui/compstui_main.c index 8dc715666c4..96ca3343963 100644 --- a/dlls/compstui/compstui_main.c +++ b/dlls/compstui/compstui_main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(compstui); */ LONG WINAPI CommonPropertySheetUIA(HWND hWnd, PFNPROPSHEETUI pfnPropSheetUI, LPARAM lparam, LPDWORD pResult) { - FIXME("(%p, %p, 0x%lx, %p)\n", hWnd, pfnPropSheetUI, lparam, pResult); + FIXME("(%p, %p, 0x%Ix, %p)\n", hWnd, pfnPropSheetUI, lparam, pResult); return CPSUI_CANCEL; } @@ -47,7 +47,7 @@ LONG WINAPI CommonPropertySheetUIA(HWND hWnd, PFNPROPSHEETUI pfnPropSheetUI, LPA */ LONG WINAPI CommonPropertySheetUIW(HWND hWnd, PFNPROPSHEETUI pfnPropSheetUI, LPARAM lparam, LPDWORD pResult) { - FIXME("(%p, %p, 0x%lx, %p)\n", hWnd, pfnPropSheetUI, lparam, pResult); + FIXME("(%p, %p, 0x%Ix, %p)\n", hWnd, pfnPropSheetUI, lparam, pResult); return CPSUI_CANCEL; } @@ -67,6 +67,6 @@ ULONG_PTR WINAPI GetCPSUIUserData(HWND hDlg) */ BOOL WINAPI SetCPSUIUserData(HWND hDlg, ULONG_PTR UserData ) { - FIXME("(%p, %08lx): stub\n", hDlg, UserData); + FIXME("(%p, %08Ix): stub\n", hDlg, UserData); return TRUE; }

1 0

Alexandre Julliard : d3dx11: Fix printf format warnings on 64-bit.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 0e50a00ecb55d31f359bd7387826710660a2549a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e50a00ecb55d31f359bd738… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:55:15 2022 +0100 d3dx11: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/async.c | 4 ++-- dlls/d3dx11_43/main.c | 2 +- dlls/d3dx11_43/texture.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index ee20602310a..8d947742b9d 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -219,7 +219,7 @@ HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) { - TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " + TRACE("data %s, data_size %Iu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, @@ -277,7 +277,7 @@ HRESULT WINAPI D3DX11CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, { struct asyncdataloader *object; - TRACE("data %p, data_size %lu, loader %p.\n", data, data_size, loader); + TRACE("data %p, data_size %Iu, loader %p.\n", data, data_size, loader); if (!data || !loader) return E_FAIL; diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c index 950f6d76f5c..5dad027864f 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -70,7 +70,7 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult) { - FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p stub!\n", + FIXME("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p stub!\n", src_data, src_data_size, pump, img_info, hresult); return E_NOTIMPL; diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index ee6808d76d6..81ac8ee6db7 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -27,7 +27,7 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult) { - FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, view %p, hresult %p stub!\n", + FIXME("device %p, data %p, data_size %Iu, load_info %p, pump %p, view %p, hresult %p stub!\n", device, data, data_size, load_info, pump, view, hresult); return E_NOTIMPL; @@ -57,7 +57,7 @@ HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *d SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) { - FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n", + FIXME("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p stub.\n", device, data, data_size, load_info, pump, texture, hresult); return E_NOTIMPL;

1 0

Alexandre Julliard : gamingtcui: Fix printf format warnings on 64-bit.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 08ebfed582c5c9696aa3fa48616799912ca573a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08ebfed582c5c9696aa3fa48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:55:23 2022 +0100 gamingtcui: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gamingtcui/gamingtcui_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gamingtcui/gamingtcui_main.c b/dlls/gamingtcui/gamingtcui_main.c index 555b6d781d3..7c51c28e338 100644 --- a/dlls/gamingtcui/gamingtcui_main.c +++ b/dlls/gamingtcui/gamingtcui_main.c @@ -38,10 +38,10 @@ HRESULT WINAPI ShowPlayerPickerUI(HSTRING prompt_display_text, const HSTRING *xu const HSTRING *preselected_xuids, size_t preselected_xuid_count, size_t min_selection_count, size_t max_selection_count, PlayerPickerUICompletionRoutine completion_routine, void *context) { - FIXME("prompt_display_text %p, xuids %p, xuid_count %lu, preselected_xuids %p, preselected_xuid_count %lu," - " min_selection_count %lu, max_selection_count %lu, completion_routine %p, context %p semi-stub.\n", - prompt_display_text, xuids, (SIZE_T)xuid_count, preselected_xuids, (SIZE_T)preselected_xuid_count, - (SIZE_T)min_selection_count, (SIZE_T)max_selection_count, completion_routine, context); + FIXME("prompt_display_text %p, xuids %p, xuid_count %Iu, preselected_xuids %p, preselected_xuid_count %Iu," + " min_selection_count %Iu, max_selection_count %Iu, completion_routine %p, context %p semi-stub.\n", + prompt_display_text, xuids, xuid_count, preselected_xuids, preselected_xuid_count, + min_selection_count, max_selection_count, completion_routine, context); if (completion_routine) completion_routine(S_OK, context, preselected_xuids, preselected_xuid_count);

1 0

Alexandre Julliard : loadperf: Fix printf format warnings on 64-bit.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 49482c95e991118c9646765de5ef9754e6e73a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=49482c95e991118c9646765d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:55:31 2022 +0100 loadperf: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/loadperf/loadperf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index c58f46f4204..a8ed70bfe7a 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -71,7 +71,7 @@ DWORD WINAPI InstallPerfDllA(LPCSTR computer, LPCSTR ini, ULONG_PTR flags) */ DWORD WINAPI InstallPerfDllW(LPCWSTR computer, LPCWSTR ini, ULONG_PTR flags) { - FIXME("(%s, %s, %lx)\n", debugstr_w(computer), debugstr_w(ini), flags); + FIXME("(%s, %s, %Ix)\n", debugstr_w(computer), debugstr_w(ini), flags); return ERROR_SUCCESS; }

1 0

Alexandre Julliard : msvcp60/tests: Fix printf format warnings on 64-bit.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 88ba91de857322676fd59e79803ebf57c00c8c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=88ba91de857322676fd59e79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:55:42 2022 +0100 msvcp60/tests: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index b4753f3ee51..e6b79edcd11 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1424,7 +1424,7 @@ static void test_istream_tellg(void) call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos); rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); - ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); + ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %Id found = %Id\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); @@ -1453,7 +1453,7 @@ static void test_istream_tellg(void) call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos); rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); - ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); + ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %Id found = %Id\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); @@ -1488,7 +1488,7 @@ static void test_istream_tellg(void) ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); + ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %Id found %Id\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_fstream_char_vbase_dtor, &fs); @@ -1511,7 +1511,7 @@ static void test_istream_tellg(void) ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); + ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %Id found %Id\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_fstream_wchar_vbase_dtor, &wfs);

1 0

Alexandre Julliard : opencl: Fix printf format warnings on 64-bit.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 6d078f6852655a4833508a6618ba3dc844c9db06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d078f6852655a4833508a66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:55:55 2022 +0100 opencl: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/pe_wrappers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opencl/pe_wrappers.c b/dlls/opencl/pe_wrappers.c index 5fde6a8b852..158f255d4e6 100644 --- a/dlls/opencl/pe_wrappers.c +++ b/dlls/opencl/pe_wrappers.c @@ -85,7 +85,7 @@ cl_int WINAPI clGetPlatformInfo( cl_platform_id platform, cl_platform_info name, { cl_int ret; - TRACE( "(%p, %#x, %ld, %p, %p)\n", platform, name, size, value, ret_size ); + TRACE( "(%p, %#x, %Id, %p, %p)\n", platform, name, size, value, ret_size ); if (name == CL_PLATFORM_EXTENSIONS) { @@ -128,7 +128,7 @@ cl_int WINAPI clGetDeviceInfo( cl_device_id device, cl_device_info name, { cl_int ret; - TRACE( "(%p, %#x, %ld, %p, %p)\n", device, name, size, value, ret_size ); + TRACE( "(%p, %#x, %Id, %p, %p)\n", device, name, size, value, ret_size ); if (name == CL_DEVICE_EXTENSIONS) {

1 0

Huw Davies : winepulse: Remove unnecessary alloc_size.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: bbd26ea8e5aee2aa4c3e4b4f6beaf53acdfba68d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd26ea8e5aee2aa4c3e4b4f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 26 13:26:12 2022 +0000 winepulse: Remove unnecessary alloc_size. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index f32f2a3d26c..3e65936a18f 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -59,7 +59,7 @@ struct pulse_stream INT32 locked; BOOL started; - SIZE_T bufsize_frames, alloc_size, real_bufsize_bytes, period_bytes; + SIZE_T bufsize_frames, real_bufsize_bytes, period_bytes; SIZE_T peek_ofs, read_offs_bytes, lcl_offs_bytes, pa_offs_bytes; SIZE_T tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len, pa_held_bytes; BYTE *local_buffer, *tmp_buffer, *peek_buffer; @@ -868,14 +868,16 @@ static NTSTATUS pulse_create_stream(void *args) if (SUCCEEDED(hr)) { UINT32 unalign; const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); + SIZE_T size; + stream->attr = *attr; /* Update frames according to new size */ dump_attr(attr); if (stream->dataflow == eRender) { - stream->alloc_size = stream->real_bufsize_bytes = + size = stream->real_bufsize_bytes = stream->bufsize_frames * 2 * pa_frame_size(&stream->ss); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) + 0, &size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; } else { UINT32 i, capture_packets; @@ -887,9 +889,9 @@ static NTSTATUS pulse_create_stream(void *args) capture_packets = stream->real_bufsize_bytes / stream->period_bytes; - stream->alloc_size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); + size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) + 0, &size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; else { ACPacket *cur_packet = (ACPacket*)((char*)stream->local_buffer + stream->real_bufsize_bytes);

1 0

Huw Davies : winecoreaudio: Remove unnecessary buffer sizes.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: aa3df3f75ef7b27c64168f34df068412f2b849ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa3df3f75ef7b27c64168f34… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 26 13:26:13 2022 +0000 winecoreaudio: Remove unnecessary buffer sizes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index a2bbc3e45c9..f242ebe54a8 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -92,7 +92,6 @@ struct coreaudio_stream INT32 getbuf_last; WAVEFORMATEX *fmt; BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; - SIZE_T local_buffer_size, tmp_buffer_size; }; static HRESULT osstatus_to_hresult(OSStatus sc) @@ -617,6 +616,7 @@ static NTSTATUS create_stream(void *args) struct coreaudio_stream *stream = calloc(1, sizeof(*stream)); AURenderCallbackStruct input; OSStatus sc; + SIZE_T size; if(!stream){ params->result = E_OUTOFMEMORY; @@ -679,8 +679,8 @@ static NTSTATUS create_stream(void *args) goto end; } - stream->local_buffer_size = stream->bufsize_frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &stream->local_buffer_size, + size = stream->bufsize_frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto end; @@ -1337,6 +1337,7 @@ static NTSTATUS get_render_buffer(void *args) { struct get_render_buffer_params *params = args; struct coreaudio_stream *stream = params->stream; + SIZE_T size; UINT32 pad; OSSpinLockLock(&stream->lock); @@ -1359,14 +1360,14 @@ static NTSTATUS get_render_buffer(void *args) if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < params->frames){ if(stream->tmp_buffer){ - SIZE_T size = 0; + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); stream->tmp_buffer = NULL; } - stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; + size = params->frames * stream->fmt->nBlockAlign; if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, - &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ + &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; params->result = E_OUTOFMEMORY; goto end; @@ -1439,6 +1440,7 @@ static NTSTATUS get_capture_buffer(void *args) struct coreaudio_stream *stream = params->stream; UINT32 chunk_bytes, chunk_frames; LARGE_INTEGER stamp, freq; + SIZE_T size; OSSpinLockLock(&stream->lock); @@ -1461,9 +1463,9 @@ static NTSTATUS get_capture_buffer(void *args) if(chunk_frames < stream->period_frames){ chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; if(!stream->tmp_buffer){ - stream->tmp_buffer_size = stream->period_frames * stream->fmt->nBlockAlign; + size = stream->period_frames * stream->fmt->nBlockAlign; NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, - &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); + &size, MEM_COMMIT, PAGE_READWRITE); } *params->data = stream->tmp_buffer; memcpy(*params->data, stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign,

1 0

Rémi Bernon : mf/tests: Add some WMA decoder GetInputStreamInfo tests.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 5012bae4adfb1cf119962d04c11fc289715905ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=5012bae4adfb1cf119962d04… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 26 13:51:57 2022 +0100 mf/tests: Add some WMA decoder GetInputStreamInfo tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f628a1116e4..a3041e64612 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5727,6 +5727,7 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; + MFT_INPUT_STREAM_INFO input_info; IMFMediaType *media_type; IMFTransform *transform; GUID class_id; @@ -5746,6 +5747,9 @@ static void test_wma_decoder(void) /* check default media types */ + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#x\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#x\n", hr); @@ -5803,6 +5807,10 @@ static void test_wma_decoder(void) ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %u\n", ret); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#x\n", hr); + /* check new output media types */ i = -1; @@ -5845,6 +5853,21 @@ static void test_wma_decoder(void) ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %u\n", ret); + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); + todo_wine + ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); + todo_wine + ok(input_info.dwFlags == 0, "got dwFlags %#x\n", input_info.dwFlags); + todo_wine + ok(input_info.cbSize == wma_block_size, "got cbSize %u\n", input_info.cbSize); + todo_wine + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); + todo_wine + ok(input_info.cbAlignment == 1, "got cbAlignment %#x\n", input_info.cbAlignment); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Rémi Bernon : mf/tests: Add some WMA decoder GetOutputStreamInfo tests.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: a805782f23e20d80157385e3a2b27867c0186942 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a805782f23e20d80157385e3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 26 13:51:58 2022 +0100 mf/tests: Add some WMA decoder GetOutputStreamInfo tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a3041e64612..ede047aa187 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5727,6 +5727,7 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; + MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; IMFMediaType *media_type; IMFTransform *transform; @@ -5750,6 +5751,9 @@ static void test_wma_decoder(void) hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#x\n", hr); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#x\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#x\n", hr); @@ -5810,6 +5814,9 @@ static void test_wma_decoder(void) hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#x\n", hr); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#x\n", hr); /* check new output media types */ @@ -5868,6 +5875,50 @@ static void test_wma_decoder(void) todo_wine ok(input_info.cbAlignment == 1, "got cbAlignment %#x\n", input_info.cbAlignment); + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + todo_wine + ok(output_info.dwFlags == 0, "got dwFlags %#x\n", output_info.dwFlags); + todo_wine + ok(output_info.cbSize == 0, "got cbSize %#x\n", output_info.cbSize); + todo_wine + ok(output_info.cbAlignment == 1, "got cbAlignment %#x\n", output_info.cbAlignment); + + /* MF_MT_AUDIO_AVG_BYTES_PER_SECOND isn't required by SetInputType, but is needed for the transform to work */ + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); + init_media_type(media_type, input_type_desc, -1); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 4003); + ok(hr == S_OK, "SetUINT32 returned %#x\n", hr); + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + todo_wine + ok(hr == S_OK, "SetInputType returned %#x.\n", hr); + + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#x\n", hr); + + init_media_type(media_type, output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + todo_wine + ok(hr == S_OK, "SetInputType returned %#x.\n", hr); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + todo_wine + ok(output_info.dwFlags == 0, "got dwFlags %#x\n", output_info.dwFlags); + todo_wine + ok(output_info.cbSize == sizeof(wma_decoded_data), "got cbSize %#x\n", output_info.cbSize); + todo_wine + ok(output_info.cbAlignment == 1, "got cbAlignment %#x\n", output_info.cbAlignment); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0