October 2020 - Wine-Commits

Michael Stefaniuc : schtasks/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 20, 2020

Oct. 20, 2020

Module: wine Branch: master Commit: eda1baa8eeb2be8cc619ec0f4487e2fd68f3fde8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eda1baa8eeb2be8cc619ec0f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 20 00:31:42 2020 +0200 schtasks/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/tests/schtasks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 8f7176ac1d9..c0f4ce78365 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -169,8 +169,8 @@ static BOOL initialize_task_service(void) START_TEST(schtasks) { - static WCHAR wineW[] = {'\\','w','i','n','e',0}; - static WCHAR wine_testW[] = {'\\','w','i','n','e','\\','t','e','s','t',0}; + static WCHAR wineW[] = L"\\wine"; + static WCHAR wine_testW[] = L"\\wine\\test"; DWORD r; CoInitialize(NULL);

1 0

Michael Stefaniuc : uxtheme/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 20, 2020

Oct. 20, 2020

Module: wine Branch: master Commit: 43572cbd7d71931595c1275706394274c051b0fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=43572cbd7d71931595c12757… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 20 00:31:44 2020 +0200 uxtheme/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b3a861eaa6b..5b6c91dc481 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -127,10 +127,10 @@ static void test_OpenThemeData(void) HRESULT hRes; BOOL bTPDefined; - WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; - WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; - WCHAR szButtonClassList2[] = {'b','U','t','T','o','N', 0 }; - WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 }; + const WCHAR szInvalidClassList[] = L"DEADBEEF"; + const WCHAR szButtonClassList[] = L"Button"; + const WCHAR szButtonClassList2[] = L"bUtToN"; + const WCHAR szClassList[] = L"Button;ListBox"; bThemeActive = IsThemeActive(); @@ -274,10 +274,10 @@ static void test_OpenThemeDataEx(void) HWND hWnd; BOOL bThemeActive; - WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; - WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; - WCHAR szButtonClassList2[] = {'b','U','t','T','o','N', 0 }; - WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 }; + const WCHAR szInvalidClassList[] = L"DEADBEEF"; + const WCHAR szButtonClassList[] = L"Button"; + const WCHAR szButtonClassList2[] = L"bUtToN"; + const WCHAR szClassList[] = L"Button;ListBox"; if (!pOpenThemeDataEx) {

1 0

Michael Stefaniuc : find: Use wide-char string literals.
by Alexandre Julliard Oct. 20, 2020

Oct. 20, 2020

Module: wine Branch: master Commit: 66119ad2284f275d667f5351a8b0d11a2f6cc999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66119ad2284f275d667f5351… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 20 00:31:43 2020 +0200 find: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/find.c | 3 +-- programs/find/tests/find.c | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/find/find.c b/programs/find/find.c index 2eeb1ce2120..7d178874b4d 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -117,7 +117,6 @@ static void write_to_stdout(const WCHAR *str) static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) { void *found; - WCHAR lineending[] = {'\r', '\n', 0}; if (lstrlenW(line) == 0 || lstrlenW(tofind) == 0) return FALSE; @@ -127,7 +126,7 @@ static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) if (found) { write_to_stdout(line); - write_to_stdout(lineending); + write_to_stdout(L"\r\n"); return TRUE; } diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index d50dcdd36ae..b7c2d7b77c4 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -128,7 +128,6 @@ static void mangle_text(const BYTE *input, int input_len, BYTE *output, int outp static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) { - static const WCHAR find_exe[] = { 'f','i','n','d','.','e','x','e',' ','%','s',0 }; HANDLE child_stdin_read; HANDLE child_stdout_write; HANDLE parent_stdin_write; @@ -157,7 +156,7 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp startup_info.hStdError = NULL; startup_info.dwFlags |= STARTF_USESTDHANDLES; - wsprintfW(cmd, find_exe, commandline); + wsprintfW(cmd, L"find.exe %s", commandline); CreateProcessW(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info); CloseHandle(child_stdin_read); @@ -243,7 +242,7 @@ static void run_find_str_(const char *commandline, const char *input, const char static void run_find_unicode_(const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, BOOL is_file, const char *file, int line) { /* Need "test" as char and quoted wchar */ - static const WCHAR wstr_quoted_test[] = { '"','t', 'e', 's', 't','"',0 }; + static const WCHAR wstr_quoted_test[] = L"\"test\""; static const char str_test[] = "test"; BYTE out_expected_mangled[200] = {0};

1 0

Michael Stefaniuc : uxtheme: Use wide-char string literals in struct initialization.
by Alexandre Julliard Oct. 20, 2020

Oct. 20, 2020

Module: wine Branch: master Commit: e947b081498baac1854526a84baffe106b73685b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e947b081498baac1854526a8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 20 00:31:45 2020 +0200 uxtheme: Use wide-char string literals in struct initialization. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/stylemap.c | 1776 +++++++++++++++++++++++------------------------ 1 file changed, 888 insertions(+), 888 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e947b081498baac18545…

1 0

Michael Stefaniuc : uxtheme: Use wide-char string literals.
by Alexandre Julliard Oct. 20, 2020

Oct. 20, 2020

Module: wine Branch: master Commit: 1f040d666b30039b46019dcdde4aa68343cb4109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f040d666b30039b46019dcd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 20 00:31:46 2020 +0200 uxtheme: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 3 +- dlls/uxtheme/msstyles.c | 46 ++++++--------------- dlls/uxtheme/system.c | 107 ++++++++++++++++-------------------------------- dlls/uxtheme/uxini.c | 6 +-- 4 files changed, 49 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f040d666b30039b4601…

1 0

Piotr Caban : ucrtbase: Support UTF8 codepage in _wctomb_s_l.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 69b701a4a0f901be5b01148bd05dff58f01bbf6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=69b701a4a0f901be5b01148b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 19 19:35:41 2020 +0200 ucrtbase: Support UTF8 codepage in _wctomb_s_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 179a5b6a340..ed843d6e58d 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1905,7 +1905,8 @@ int CDECL MSVCRT__wctomb_s_l(int *len, char *mbchar, MSVCRT_size_t size, MSVCRT_wchar_t wch, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; - BOOL error; + BOOL error = FALSE; + BOOL *perror; int mblen; if(!mbchar && size>0) { @@ -1942,7 +1943,8 @@ int CDECL MSVCRT__wctomb_s_l(int *len, char *mbchar, MSVCRT_size_t size, return 0; } - mblen = WideCharToMultiByte(locinfo->lc_codepage, 0, &wch, 1, mbchar, size, NULL, &error); + perror = (locinfo->lc_codepage != CP_UTF8 ? &error : NULL); + mblen = WideCharToMultiByte(locinfo->lc_codepage, 0, &wch, 1, mbchar, size, NULL, perror); if(!mblen || error) { if(!mblen && GetLastError()==ERROR_INSUFFICIENT_BUFFER) { if(mbchar && size>0)

1 0

Piotr Caban : ucrtbase: Support UTF8 codepage in _wcstombs_l.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 6180c2fc83bf85254607d977ea085f2fb9c85f02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6180c2fc83bf85254607d977… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 19 19:35:31 2020 +0200 ucrtbase: Support UTF8 codepage in _wcstombs_l. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50025 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 797c18e00a6..179a5b6a340 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -545,7 +545,8 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst { MSVCRT_pthreadlocinfo locinfo; MSVCRT_size_t tmp = 0; - BOOL used_default; + BOOL used_default = FALSE; + BOOL *pused_default; if(!locale) locinfo = get_locinfo(); @@ -570,9 +571,11 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst return i; } + pused_default = (locinfo->lc_codepage != CP_UTF8 ? &used_default : NULL); + if(!mbstr) { tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, - *wcstr, -1, NULL, 0, NULL, &used_default); + *wcstr, -1, NULL, 0, NULL, pused_default); if(!tmp || used_default) { *MSVCRT__errno() = MSVCRT_EILSEQ; return -1; @@ -585,7 +588,7 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst MSVCRT_size_t i, size; size = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, - *wcstr, 1, buf, 3, NULL, &used_default); + *wcstr, 1, buf, 3, NULL, pused_default); if(!size || used_default) { *MSVCRT__errno() = MSVCRT_EILSEQ; return -1;

1 0

Nikolay Sivov : evr/mixer: Map render target type to video processor guid that supports it.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: ab2a0d7f63135869e97958f03480a547f64059a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab2a0d7f63135869e97958f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 17:10:43 2020 +0300 evr/mixer: Map render target type to video processor guid that supports it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 51 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index b93510c991e..fd7596eeadf 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -46,11 +46,18 @@ struct input_stream IMFSample *sample; }; +struct rt_format +{ + GUID device; + D3DFORMAT format; + IMFMediaType *media_type; +}; + struct output_stream { IMFMediaType *media_type; - IMFMediaType **media_types; - unsigned int type_count; + struct rt_format *rt_formats; + unsigned int rt_formats_count; }; struct video_mixer @@ -177,11 +184,11 @@ static void video_mixer_clear_types(struct video_mixer *mixer) IMFSample_Release(mixer->inputs[i].sample); mixer->inputs[i].sample = NULL; } - for (i = 0; i < mixer->output.type_count; ++i) + for (i = 0; i < mixer->output.rt_formats_count; ++i) { - IMFMediaType_Release(mixer->output.media_types[i]); + IMFMediaType_Release(mixer->output.rt_formats[i].media_type); } - heap_free(mixer->output.media_types); + heap_free(mixer->output.rt_formats); if (mixer->output.media_type) IMFMediaType_Release(mixer->output.media_type); mixer->output.media_type = NULL; @@ -564,11 +571,11 @@ static HRESULT WINAPI video_mixer_transform_GetOutputAvailableType(IMFTransform if (!mixer->inputs[0].media_type) hr = MF_E_TRANSFORM_TYPE_NOT_SET; - else if (index >= mixer->output.type_count) + else if (index >= mixer->output.rt_formats_count) hr = MF_E_NO_MORE_TYPES; else { - *type = (IMFMediaType *)mixer->output.media_types[index]; + *type = mixer->output.rt_formats[index].media_type; IMFMediaType_AddRef(*type); } @@ -609,10 +616,10 @@ done: static int rt_formats_sort_compare(const void *left, const void *right) { - D3DFORMAT format1 = *(D3DFORMAT *)left, format2 = *(D3DFORMAT *)right; + const struct rt_format *format1 = left, *format2 = right; - if (format1 < format2) return -1; - if (format1 > format2) return 1; + if (format1->format < format2->format) return -1; + if (format1->format > format2->format) return 1; return 0; } @@ -620,8 +627,9 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) { unsigned int i, j, format_count, count; - D3DFORMAT *rt_formats = NULL, *formats, *ptr; + struct rt_format *rt_formats = NULL, *ptr; HRESULT hr = MF_E_INVALIDMEDIATYPE; + D3DFORMAT *formats; GUID subtype; count = 0; @@ -639,7 +647,11 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const } rt_formats = ptr; - memcpy(&rt_formats[count], formats, format_count * sizeof(*formats)); + for (j = 0; j < format_count; ++j) + { + rt_formats[count + j].format = formats[j]; + rt_formats[count + j].device = devices[i]; + } count += format_count; CoTaskMemFree(formats); @@ -653,7 +665,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const j = 0; for (i = j + 1; i < count; ++i) { - if (rt_formats[i] != rt_formats[j]) + if (rt_formats[i].format != rt_formats[j].format) { rt_formats[++j] = rt_formats[i]; } @@ -661,14 +673,15 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const count = j + 1; memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); - if ((mixer->output.media_types = heap_calloc(count, sizeof(*mixer->output.media_types)))) + if ((mixer->output.rt_formats = heap_calloc(count, sizeof(*mixer->output.rt_formats)))) { for (i = 0; i < count; ++i) { - subtype.Data1 = rt_formats[i]; - MFCreateVideoMediaTypeFromSubtype(&subtype, (IMFVideoMediaType **)&mixer->output.media_types[i]); + subtype.Data1 = rt_formats[i].format; + mixer->output.rt_formats[i] = rt_formats[i]; + MFCreateVideoMediaTypeFromSubtype(&subtype, (IMFVideoMediaType **)&mixer->output.rt_formats[i].media_type); } - mixer->output.type_count = count; + mixer->output.rt_formats_count = count; } else { @@ -757,10 +770,10 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D EnterCriticalSection(&mixer->cs); - for (i = 0; i < mixer->output.type_count; ++i) + for (i = 0; i < mixer->output.rt_formats_count; ++i) { compare_flags = 0; - if (FAILED(IMFMediaType_IsEqual(type, mixer->output.media_types[i], &compare_flags))) + if (FAILED(IMFMediaType_IsEqual(type, mixer->output.rt_formats[i].media_type, &compare_flags))) continue; if ((compare_flags & equality_flags) == equality_flags)

1 0

Nikolay Sivov : evr/mixer: Keep one input sample per stream.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 60bf1b2548c37537022625220633a848966a1e9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=60bf1b2548c3753702262522… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 17:10:42 2020 +0300 evr/mixer: Keep one input sample per stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 32 ++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 17 +++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 9969c8187db..b93510c991e 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -43,6 +43,7 @@ struct input_stream IMFMediaType *media_type; MFVideoNormalizedRect rect; unsigned int zorder; + IMFSample *sample; }; struct output_stream @@ -172,6 +173,9 @@ static void video_mixer_clear_types(struct video_mixer *mixer) if (mixer->inputs[i].media_type) IMFMediaType_Release(mixer->inputs[i].media_type); mixer->inputs[i].media_type = NULL; + if (mixer->inputs[i].sample) + IMFSample_Release(mixer->inputs[i].sample); + mixer->inputs[i].sample = NULL; } for (i = 0; i < mixer->output.type_count; ++i) { @@ -899,9 +903,33 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, static HRESULT WINAPI video_mixer_transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct input_stream *input; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p, %#x.\n", iface, id, sample, flags); + + if (!sample) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + + if (SUCCEEDED(hr = video_mixer_get_input(mixer, id, &input))) + { + if (!input->media_type || !mixer->output.media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else if (input->sample) + hr = MF_E_NOTACCEPTING; + else + { + input->sample = sample; + IMFSample_AddRef(input->sample); + } + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 9124109c07f..182280d0a39 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2154,6 +2154,23 @@ todo_wine todo_wine ok(!color, "Unexpected color %#x.\n", color); + IMFDesiredSample_Clear(desired); + + hr = IMFTransform_ProcessInput(mixer, 0, NULL, 0); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessInput(mixer, 5, NULL, 0); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); + ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessInput(mixer, 5, sample, 0); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + IMFSample_Release(sample); IDirect3DSurface9_Release(surface);

1 0

Nikolay Sivov : dxva2: Add GetCreationParameters().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 16430c45cdbdc8fd20b10bd1e8d277cd4d154598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16430c45cdbdc8fd20b10bd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 17:10:41 2020 +0300 dxva2: Add GetCreationParameters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 31 +++++++++++++++++++++++++------ dlls/dxva2/tests/dxva2.c | 6 ++---- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index af6ad25697b..6262531c7d1 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -71,6 +71,10 @@ struct video_processor LONG refcount; IDirectXVideoProcessorService *service; + GUID device; + DXVA2_VideoDesc video_desc; + D3DFORMAT rt_format; + unsigned int max_substreams; }; static BOOL dxva_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) @@ -170,14 +174,25 @@ static HRESULT WINAPI video_processor_GetVideoProcessorService(IDirectXVideoProc } static HRESULT WINAPI video_processor_GetCreationParameters(IDirectXVideoProcessor *iface, - GUID *device, DXVA2_VideoDesc *video_desc, D3DFORMAT *rt_format, UINT *maxstreams) + GUID *device, DXVA2_VideoDesc *video_desc, D3DFORMAT *rt_format, UINT *max_substreams) { - FIXME("%p, %p, %p, %p, %p.\n", iface, device, video_desc, rt_format, maxstreams); + struct video_processor *processor = impl_from_IDirectXVideoProcessor(iface); + + TRACE("%p, %p, %p, %p, %p.\n", iface, device, video_desc, rt_format, max_substreams); - if (!device && !video_desc && !rt_format && !maxstreams) + if (!device && !video_desc && !rt_format && !max_substreams) return E_INVALIDARG; - return E_NOTIMPL; + if (device) + *device = processor->device; + if (video_desc) + *video_desc = processor->video_desc; + if (rt_format) + *rt_format = processor->rt_format; + if (max_substreams) + *max_substreams = processor->max_substreams; + + return S_OK; } static HRESULT WINAPI video_processor_GetVideoProcessorCaps(IDirectXVideoProcessor *iface, @@ -376,12 +391,12 @@ static HRESULT WINAPI device_manager_processor_service_GetFilterPropertyRange( } static HRESULT WINAPI device_manager_processor_service_CreateVideoProcessor(IDirectXVideoProcessorService *iface, - REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, D3DFORMAT rt_format, UINT max_substreams, + REFGUID device, const DXVA2_VideoDesc *video_desc, D3DFORMAT rt_format, UINT max_substreams, IDirectXVideoProcessor **processor) { struct video_processor *object; - FIXME("%p, %s, %p, %d, %u, %p.\n", iface, debugstr_guid(deviceguid), video_desc, rt_format, max_substreams, + FIXME("%p, %s, %p, %d, %u, %p.\n", iface, debugstr_guid(device), video_desc, rt_format, max_substreams, processor); /* FIXME: validate render target format */ @@ -393,6 +408,10 @@ static HRESULT WINAPI device_manager_processor_service_CreateVideoProcessor(IDir object->refcount = 1; object->service = iface; IDirectXVideoProcessorService_AddRef(object->service); + object->device = *device; + object->video_desc = *video_desc; + object->rt_format = rt_format; + object->max_substreams = max_substreams; *processor = &object->IDirectXVideoProcessor_iface; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 84ccd3b0190..f617bf74079 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -420,15 +420,13 @@ static void test_video_processor(void) ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IDirectXVideoProcessor_GetCreationParameters(processor, &guid, NULL, NULL, NULL); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(IsEqualGUID(&guid, &DXVA2_VideoProcSoftwareDevice), "Unexpected device guid.\n"); -} + hr = IDirectXVideoProcessor_GetCreationParameters(processor, NULL, NULL, &format, NULL); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(format == D3DFMT_A8R8G8B8, "Unexpected format %u.\n", format); -} + IDirectXVideoProcessor_Release(processor); IDirectXVideoProcessor_Release(processor2);

1 0