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

Huw Davies : richedit: Use the correct ptr to the cell.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: db6c55490964eb33ae6dc96f8205cb029886c618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db6c55490964eb33ae6dc96f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 19 12:21:20 2020 +0100 richedit: Use the correct ptr to the cell. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 6f5bb4e1f83..bdbf022a405 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -337,7 +337,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (item->member.run.para->fmt.wNumbering) add_font_to_fonttbl( pStream, item->member.run.para->para_num.style ); - if ((pCell = item->member.para.pCell)) + if ((pCell = item->member.run.para->pCell)) { ME_Border* borders[4] = { &pCell->member.cell.border.top, &pCell->member.cell.border.left,

1 0

Huw Davies : riched20: Pass a run ptr to the run drawing function.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 87c4d217edd14969f556949f5709c5fb7e3137e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87c4d217edd14969f556949f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 19 12:21:18 2020 +0100 riched20: Pass a run ptr to the run drawing function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 7ac7d83c9a9..5a0432a9eed 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -440,17 +440,16 @@ static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { SetTextColor(hDC, color); } -static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Paragraph *para) +static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph *para ) { - ME_Run *run = &rundi->member.run; ME_DisplayItem *start; int runofs = run->nCharOfs+para->nCharOfs; int nSelFrom, nSelTo; - + if (run->nFlags & MERF_HIDDEN) return; - start = ME_FindItemBack(rundi, diStartRow); + start = ME_FindItemBack( run_get_di( run ), diStartRow ); ME_GetSelectionOfs(c->editor, &nSelFrom, &nSelTo); /* Draw selected end-of-paragraph mark */ @@ -1003,8 +1002,8 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible) - ME_DrawRun(c, c->pt.x + run->pt.x, - c->pt.y + para->pt.y + run->pt.y + baseline, p, para); + ME_DrawRun( c, c->pt.x + run->pt.x, + c->pt.y + para->pt.y + run->pt.y + baseline, run, para ); if (me_debug) { static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0};

1 0

Huw Davies : riched20: Pass a paragraph ptr to a couple of the drawing helpers.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 7875a77b2322e5fe4da7ac1306360a9419e3b071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7875a77b2322e5fe4da7ac13… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 19 12:21:17 2020 +0100 riched20: Pass a paragraph ptr to a couple of the drawing helpers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 6187fb74f1b..7ac7d83c9a9 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -696,9 +696,8 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT } } -static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) +static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) { - ME_Paragraph *para = &paragraph->member.para; if (!c->editor->bEmulateVersion10) /* v4.1 */ { if (para->pCell) @@ -778,7 +777,7 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) if (atBottom) { int oldLeft = rc.left; width = max(ME_twips2pointsY(c, cell->border.bottom.width), 1); - paraAfterRow = table_row_end( &paragraph->member.para )->next_para; + paraAfterRow = table_row_end( para )->next_para; if (paraAfterRow->member.para.nFlags & MEPF_ROWSTART) { ME_DisplayItem *nextEndCell; nextEndCell = ME_FindItemBack( para_get_di( table_row_end( &paraAfterRow->member.para ) ), diCell ); @@ -845,7 +844,7 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) oldpen = SelectObject(c->hDC, pen); /* Find the start relative to the text */ - firstX = c->pt.x + ME_FindItemFwd(paragraph, diRun)->member.run.pt.x; + firstX = c->pt.x + para_first_run( para )->pt.x; /* Go back by the horizontal gap, which is stored in dxOffset */ firstX -= ME_twips2pointsX(c, para->fmt.dxOffset); /* The left edge, stored in dxStartIndent affected just the first edge */ @@ -853,7 +852,7 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) rowY = c->pt.y + para->pt.y; if (para->fmt.dwMask & PFM_SPACEBEFORE) rowY += ME_twips2pointsY(c, para->fmt.dySpaceBefore); - nHeight = ME_FindItemFwd(paragraph, diStartRow)->member.row.nHeight; + nHeight = ME_FindItemFwd( para_get_di( para ), diStartRow )->member.row.nHeight; rowBottom = rowY + nHeight; /* Draw horizontal lines */ @@ -892,9 +891,8 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) } } -static void draw_para_number( ME_Context *c, ME_DisplayItem *p ) +static void draw_para_number( ME_Context *c, ME_Paragraph *para ) { - ME_Paragraph *para = &p->member.para; int x, y; COLORREF old_text; @@ -1034,8 +1032,8 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) no++; } - ME_DrawTableBorders(c, paragraph); - draw_para_number(c, paragraph); + ME_DrawTableBorders( c, para ); + draw_para_number( c, para ); SetTextAlign(c->hDC, align); }

1 0

Nikolay Sivov : include: Fix typo in IDirectXVideoProcessor argument name.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: c336b96a9b1236a2de29348aee9f0a887353c63e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c336b96a9b1236a2de29348a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 13:39:53 2020 +0300 include: Fix typo in IDirectXVideoProcessor argument name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxva2api.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxva2api.idl b/include/dxva2api.idl index 04e620b7be8..99c93518428 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -777,7 +777,7 @@ interface IDirectXVideoProcessor : IUnknown [in] const DXVA2_VideoProcessBltParams* pBltParams, [in] const DXVA2_VideoSample* pSamples, [in] UINT NumSamples, - [out] HANDLE* pHandleCompleteIDirect3DDeviceManager9); + [out] HANDLE* pHandleComplete); } /*****************************************************************************

1 0

Nikolay Sivov : comsvcs: Create MTA without initialization thread.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: c9cc098ccd7f0cdb82b8e52d00c415042c5ff717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9cc098ccd7f0cdb82b8e52d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 12:43:04 2020 +0300 comsvcs: Create MTA without initialization thread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49679 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 9ab77dfceda..74704077ecb 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -40,7 +40,7 @@ typedef struct dispensermanager { IDispenserManager IDispenserManager_iface; LONG ref; - HANDLE mta_thread, mta_stop_event; + CO_MTA_USAGE_COOKIE mta_cookie; } dispensermanager; typedef struct holder @@ -285,27 +285,14 @@ static ULONG WINAPI dismanager_Release(IDispenserManager *iface) if (!ref) { - if (This->mta_thread) - { - SetEvent(This->mta_stop_event); - WaitForSingleObject(This->mta_thread, INFINITE); - CloseHandle(This->mta_stop_event); - CloseHandle(This->mta_thread); - } + if (This->mta_cookie) + CoDecrementMTAUsage(This->mta_cookie); heap_free(This); } return ref; } -static DWORD WINAPI mta_thread_proc(void *arg) -{ - CoInitializeEx(NULL, COINIT_MULTITHREADED); - WaitForSingleObject(arg, INFINITE); - CoUninitialize(); - return 0; -} - static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDispenserDriver *driver, LPCOLESTR name, IHolder **dispenser) { @@ -319,11 +306,8 @@ static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDi hr = create_holder(driver, dispenser); - if (!This->mta_thread) - { - This->mta_stop_event = CreateEventA(NULL, TRUE, FALSE, NULL); - This->mta_thread = CreateThread(NULL, 0, mta_thread_proc, This->mta_stop_event, 0, NULL); - } + if (!This->mta_cookie) + CoIncrementMTAUsage(&This->mta_cookie); TRACE("<-- 0x%08x, %p\n", hr, *dispenser);

1 0

Nikolay Sivov : dxva2: Add video processor stub.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 6194f506720231c176d3b37bf1b5d054222dc7f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6194f506720231c176d3b37b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 17:10:40 2020 +0300 dxva2: Add video processor stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/dxva2/tests/dxva2.c | 108 ++++++++++++++++++++++++++++++++++-- 2 files changed, 241 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6194f506720231c176d3…

1 0

Huw Davies : riched20: Use helpers in the cursor to start/end functions.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 53959eb7d4fdf652dcbccc00366efccd06abde72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53959eb7d4fdf652dcbccc00… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 19 12:21:19 2020 +0100 riched20: Use helpers in the cursor to start/end functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 8 ++++---- dlls/riched20/editor.c | 6 ++++++ dlls/riched20/editor.h | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 22da616731f..eb7ad7f1899 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -26,15 +26,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) { - cursor->pPara = editor->pBuffer->pFirst->member.para.next_para; - cursor->pRun = ME_FindItemFwd(cursor->pPara, diRun); + cursor->pPara = para_get_di( editor_first_para( editor ) ); + cursor->pRun = run_get_di( para_first_run( &cursor->pPara->member.para ) ); cursor->nOffset = 0; } static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor, BOOL final_eop) { - cursor->pPara = editor->pBuffer->pLast->member.para.prev_para; - cursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); + cursor->pPara = para_get_di( para_prev( editor_end_para( editor ) ) ); + cursor->pRun = run_get_di( para_end_run( &cursor->pPara->member.para ) ); cursor->nOffset = final_eop ? cursor->pRun->member.run.len : 0; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e988eb9a014..51a6e33aef4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -285,6 +285,12 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) return para_next( &editor->pBuffer->pFirst->member.para ); } +/* Note, returns the diTextEnd sentinel paragraph */ +ME_Paragraph *editor_end_para( ME_TextEditor *editor ) +{ + return &editor->pBuffer->pLast->member.para; +} + static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { WCHAR *pText; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 4412a574262..c79fa0e18f0 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -273,6 +273,7 @@ void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int l int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, ME_Cursor *start, int count, IDataObject **data_out ) DECLSPEC_HIDDEN; +ME_Paragraph *editor_end_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */

1 0

Nikolay Sivov : server: Handle duplicate handles when inheriting them for the new process.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 2a7a1bbee2116d1ec242920c68fa12dfdf747347 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a7a1bbee2116d1ec242920c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 12:39:35 2020 +0300 server: Handle duplicate handles when inheriting them for the new process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50004 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/handle.c b/server/handle.c index 15382256f10..2556a03901e 100644 --- a/server/handle.c +++ b/server/handle.c @@ -363,8 +363,9 @@ static void inherit_handle( struct process *parent, const obj_handle_t handle, s src = get_handle( parent, handle ); if (!src || !(src->access & RESERVED_INHERIT)) return; - grab_object_for_handle( src->ptr ); index = handle_to_index( handle ); + if (dst[index].ptr) return; + grab_object_for_handle( src->ptr ); dst[index] = *src; table->last = max( table->last, index ); }

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.158.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 02458faa43b0c4b63ac248b7714135255e9518b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02458faa43b0c4b63ac248b7… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Oct 19 10:10:16 2020 -0700 winevulkan: Update to VK spec version 1.2.158. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 50 + dlls/winevulkan/vulkan_thunks.h | 4 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 2570 ++++++++++++++++++++------------------- 5 files changed, 1391 insertions(+), 1240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02458faa43b0c4b63ac2…

1 0

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

Oct. 19, 2020

Module: wine Branch: master Commit: 5fcc3771681c0c8747f59d3ffe1a278b01f2a1df URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fcc3771681c0c8747f59d3f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 19 19:35:50 2020 +0200 ucrtbase: Support UTF8 codepage in wctomb. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ed843d6e58d..858ecbd7ed0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1996,15 +1996,18 @@ INT CDECL MSVCRT_wctomb( char *dst, MSVCRT_wchar_t ch ) INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) { char out; - BOOL error; + BOOL error = FALSE; + BOOL *perror; UINT codepage = get_locinfo()->lc_codepage; + perror = (codepage != CP_UTF8 ? &error : NULL); + if(!codepage) { if (wchar < 0xff) return (signed char)wchar; else return MSVCRT_EOF; - } else if(WideCharToMultiByte( codepage, 0, &wchar, 1, &out, 1, NULL, &error ) && !error) + } else if(WideCharToMultiByte( codepage, 0, &wchar, 1, &out, 1, NULL, perror ) && !error) return (INT)out; return MSVCRT_EOF; }

1 0

Nikolay Sivov : dxva2: Fix new handle flags initialization.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 0a3a2e7dcb0bbe94c851ef3f412b2d004d15468c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a3a2e7dcb0bbe94c851ef3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 17:10:39 2020 +0300 dxva2: Fix new handle flags initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 6ebc4f00186..53e266d028f 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -392,7 +392,7 @@ static HRESULT WINAPI device_manager_OpenDeviceHandle(IDirect3DDeviceManager9 *i sizeof(*manager->handles))) { *hdevice = ULongToHandle(manager->count + 1); - manager->handles[manager->count].flags |= HANDLE_FLAG_OPEN; + manager->handles[manager->count].flags = HANDLE_FLAG_OPEN; manager->handles[manager->count].state_block = NULL; manager->count++; }

1 0

Huw Davies : riched20: Pass a paragraph ptr to the paragraph destruction function.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 00824a032f1e2393793798a26482962787fb9ea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00824a032f1e2393793798a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 19 12:21:16 2020 +0100 riched20: Pass a paragraph ptr to the paragraph destruction function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 5 +++-- dlls/riched20/editor.h | 2 +- dlls/riched20/para.c | 20 +++++++++----------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e512f2f9ed6..e988eb9a014 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3213,10 +3213,11 @@ void ME_DestroyEditor(ME_TextEditor *editor) ME_ClearTempStyle(editor); ME_EmptyUndoStack(editor); editor->pBuffer->pFirst = NULL; - while(p) { + while(p) + { pNext = p->next; if (p->type == diParagraph) - destroy_para(editor, p); + para_destroy( editor, &p->member.para ); else ME_DestroyDisplayItem(p); p = pNext; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ad7978c1f9d..4412a574262 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -75,7 +75,6 @@ ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; -void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; @@ -205,6 +204,7 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPE void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; +void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ) DECLSPEC_HIDDEN; ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 41debcac1bd..0e1ceae9bbb 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -39,20 +39,18 @@ static ME_Paragraph *para_create( ME_TextEditor *editor ) return &item->member.para; } -void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) +void para_destroy( ME_TextEditor *editor, ME_Paragraph *para ) { - assert(item->type == diParagraph); - - if (item->member.para.nWidth == editor->nTotalWidth) + if (para->nWidth == editor->nTotalWidth) { - item->member.para.nWidth = 0; + para->nWidth = 0; editor->nTotalWidth = get_total_width(editor); } - editor->total_rows -= item->member.para.nRows; - ME_DestroyString(item->member.para.text); - para_num_clear( &item->member.para.para_num ); - para_mark_remove( editor, &item->member.para ); - ME_DestroyDisplayItem(item); + editor->total_rows -= para->nRows; + ME_DestroyString( para->text ); + para_num_clear( &para->para_num ); + para_mark_remove( editor, para ); + ME_DestroyDisplayItem( para_get_di( para ) ); } /* Note para_next/prev will return the start and end doc nodes */ @@ -762,7 +760,7 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir para->next_para = next->next_para; next->next_para->member.para.prev_para = para_get_di( para ); ME_Remove( para_get_di(next) ); - destroy_para( editor, para_get_di( next ) ); + para_destroy( editor, next ); ME_PropagateCharOffset( para->next_para, -end_len );

1 0

Jan Sikorski : dbghelp: Avoid forwarded exports.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: fd4b700ad559b512b150acacd3fae3016180c8bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd4b700ad559b512b150acac… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Oct 19 13:03:14 2020 +0200 dbghelp: Avoid forwarded exports. Fallout 76 does not handle forwarded exports of these functions. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 6ffa82da926..b17c7b18655 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -19,9 +19,9 @@ @ stdcall GetTimestampForLoadedLibrary(long) @ stdcall ImageDirectoryEntryToData(ptr long long ptr) @ stdcall ImageDirectoryEntryToDataEx(ptr long long ptr ptr) -@ stdcall ImageNtHeader(ptr) ntdll.RtlImageNtHeader -@ stdcall ImageRvaToSection(ptr ptr long) ntdll.RtlImageRvaToSection -@ stdcall ImageRvaToVa(ptr ptr long ptr) ntdll.RtlImageRvaToVa +@ stdcall -import ImageNtHeader(ptr) RtlImageNtHeader +@ stdcall -import ImageRvaToSection(ptr ptr long) RtlImageRvaToSection +@ stdcall -import ImageRvaToVa(ptr ptr long ptr) RtlImageRvaToVa @ stdcall ImagehlpApiVersion() @ stdcall ImagehlpApiVersionEx(ptr) @ stdcall MakeSureDirectoryPathExists(str)

1 0

Hans Leidekker : dssenh: Add support for exporting private keys.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: b4ca2d001c31c4a7805135549eddc5844b60e319 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4ca2d001c31c4a780513554… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:16 2020 +0200 dssenh: Add support for exporting private keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 1da56493170..e3771dc6f06 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -578,6 +578,7 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW BYTE *data, DWORD *len ) { struct key *key = (struct key *)hkey; + const WCHAR *type; TRACE( "%p, %p, %p, %08x, %08x, %p, %p\n", (void *)hprov, (void *)hkey, (void *)hexpkey, blobtype, flags, data, len ); @@ -588,18 +589,28 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW FIXME( "export key not supported\n" ); return FALSE; } - if (blobtype != PUBLICKEYBLOB) + if (flags) { - FIXME( "blob type %u not supported\n", blobtype ); + FIXME( "flags %08x not supported\n", flags ); return FALSE; } - if (flags) + + switch (blobtype) { - FIXME( "flags %08x not supported\n", flags ); + case PUBLICKEYBLOB: + type = LEGACY_DSA_V2_PUBLIC_BLOB; + break; + + case PRIVATEKEYBLOB: + type = LEGACY_DSA_V2_PRIVATE_BLOB; + break; + + default: + FIXME( "blob type %u not supported\n", blobtype ); return FALSE; } - return !BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PUBLIC_BLOB, data, *len, len, 0 ); + return !BCryptExportKey( key->handle, NULL, type, data, *len, len, 0 ); } BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, DWORD flags, HCRYPTKEY *ret_key )

1 0

Hans Leidekker : dssenh: Implement CPSetHashParam.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 1b1637fc1fe648511bc9043b4927f24bb3143537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b1637fc1fe648511bc9043b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:15 2020 +0200 dssenh: Implement CPSetHashParam. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index 473bd08205f..9060614ce49 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -18,7 +18,7 @@ @ stub CPHashSessionKey @ stdcall CPImportKey(ptr ptr long ptr long ptr) @ stdcall CPReleaseContext(ptr long) -@ stub CPSetHashParam +@ stdcall CPSetHashParam(ptr ptr long ptr long) @ stub CPSetKeyParam @ stub CPSetProvParam @ stdcall CPSignHash(ptr ptr long wstr long ptr ptr) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index a2e5a72148d..1da56493170 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -837,6 +837,27 @@ BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYT } } +BOOL WINAPI CPSetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, const BYTE *data, DWORD flags ) +{ + struct hash *hash = (struct hash *)hhash; + + TRACE( "%p, %p, %08x, %p, %08x\n", (void *)hprov, (void *)hhash, param, data, flags ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + switch (param) + { + case HP_HASHVAL: + memcpy( hash->value, data, hash->len ); + return TRUE; + + default: + FIXME( "param %u not supported\n", param ); + SetLastError( NTE_BAD_TYPE ); + return FALSE; + } +} + BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD flags, HCRYPTKEY *ret_key ) { return FALSE;

1 0

Hans Leidekker : dssenh: Access the hash value directly in CPSignHash and CPVerifySignature.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 554e315bcfd7aa58ffc38ce69bfe4cba04c26de4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=554e315bcfd7aa58ffc38ce6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:14 2020 +0200 dssenh: Access the hash value directly in CPSignHash and CPVerifySignature. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 2d9569672a5..a2e5a72148d 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -860,8 +860,7 @@ BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const { struct container *container = (struct container *)hprov; struct hash *hash = (struct hash *)hhash; - UCHAR hashval[MAX_HASH_LEN]; - ULONG len, hashlen = sizeof(hashval); + ULONG len; TRACE( "%p, %p, %u, %s, %08x, %p, %p\n", (void *)hprov, (void *)hhash, keyspec, debugstr_w(desc), flags, sig, siglen ); @@ -870,14 +869,13 @@ BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const if (hash->magic != MAGIC_HASH) return FALSE; if (!(len = get_signature_length( container->sign_key->algid ))) return FALSE; - if (!CPGetHashParam( hprov, hhash, HP_HASHVAL, hashval, &hashlen, 0 )) return FALSE; if (*siglen < len) { *siglen = len; return TRUE; } - return !BCryptSignHash( container->sign_key->handle, NULL, hashval, hashlen, sig, *siglen, siglen, 0 ); + return !BCryptSignHash( container->sign_key->handle, NULL, hash->value, hash->len, sig, *siglen, siglen, 0 ); } BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, @@ -885,8 +883,6 @@ BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *s { struct hash *hash = (struct hash *)hhash; struct key *key = (struct key *)hpubkey; - UCHAR hashval[MAX_HASH_LEN]; - ULONG hashlen = sizeof(hashval); TRACE( "%p, %p, %p, %u %p, %s, %08x\n", (void *)hprov, (void *)hhash, sig, siglen, (void *)hpubkey, debugstr_w(desc), flags ); @@ -898,9 +894,7 @@ BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *s return FALSE; } - if (!CPGetHashParam( hprov, hhash, HP_HASHVAL, hashval, &hashlen, 0 )) return FALSE; - - return !BCryptVerifySignature( key->handle, NULL, hashval, hashlen, (UCHAR *)sig, siglen, 0 ); + return !BCryptVerifySignature( key->handle, NULL, hash->value, hash->len, (UCHAR *)sig, siglen, 0 ); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Hans Leidekker : dssenh: Implement CPGetUserKey.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 248d27ea2d47d26f9c328adaa8d94fec026d2476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=248d27ea2d47d26f9c328ada… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:13 2020 +0200 dssenh: Implement CPGetUserKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 29 +++++++++++++++++++++++++++++ dlls/dssenh/tests/dssenh.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index eb9ef06337a..473bd08205f 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -13,7 +13,7 @@ @ stdcall CPGetHashParam(ptr ptr long ptr ptr long) @ stub CPGetKeyParam @ stdcall CPGetProvParam(ptr long ptr ptr long) -@ stub CPGetUserKey +@ stdcall CPGetUserKey(ptr long ptr) @ stdcall CPHashData(ptr ptr ptr long long) @ stub CPHashSessionKey @ stdcall CPImportKey(ptr ptr long ptr long ptr) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 4867fef2f59..2d9569672a5 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -615,6 +615,35 @@ BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, D return TRUE; } +BOOL WINAPI CPGetUserKey( HCRYPTPROV hprov, DWORD keyspec, HCRYPTKEY *ret_key ) +{ + struct container *container = (struct container *)hprov; + BOOL ret = FALSE; + + TRACE( "%p, %08x, %p\n", (void *)hprov, keyspec, ret_key ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + + switch (keyspec) + { + case AT_KEYEXCHANGE: + if (!container->exch_key) SetLastError( NTE_NO_KEY ); + else if ((*ret_key = (HCRYPTKEY)duplicate_key( container->exch_key ))) ret = TRUE; + break; + + case AT_SIGNATURE: + if (!container->sign_key) SetLastError( NTE_NO_KEY ); + else if ((*ret_key = (HCRYPTKEY)duplicate_key( container->sign_key ))) ret = TRUE; + break; + + default: + SetLastError( NTE_NO_KEY ); + return FALSE; + } + + return ret; +} + BOOL WINAPI CPGenRandom( HCRYPTPROV hprov, DWORD len, BYTE *buffer ) { struct container *container = (struct container *)hprov; diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 4f401254f52..d3f3172230e 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1470,6 +1470,50 @@ static void test_duplicate_hash(void) ok(result, "got %08x\n", GetLastError()); } +static void test_userkey(void) +{ + HCRYPTPROV hprov; + HCRYPTKEY hkey; + BOOL result; + + CryptAcquireContextA(&hprov, "winetest", MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_DELETEKEYSET); + result = CryptAcquireContextA(&hprov, "winetest", MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_NEWKEYSET); + ok(result, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptGetUserKey(hprov, AT_KEYEXCHANGE, &hkey); + ok(!result, "success\n"); + ok(GetLastError() == NTE_NO_KEY, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptGetUserKey(hprov, AT_SIGNATURE, &hkey); + ok(!result, "success\n"); + ok(GetLastError() == NTE_NO_KEY, "got %08x\n", GetLastError()); + + result = CryptGenKey(hprov, AT_SIGNATURE, 1024 << 16, &hkey); + ok(result, "got %08x\n", GetLastError()); + result = CryptDestroyKey(hkey); + ok(result, "got %08x\n", GetLastError()); + + result = CryptGetUserKey(hprov, AT_SIGNATURE, &hkey); + ok(result, "got %08x\n", GetLastError()); + result = CryptDestroyKey(hkey); + ok(result, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptGetUserKey(hprov, AT_KEYEXCHANGE, &hkey); + ok(!result, "success\n"); + ok(GetLastError() == NTE_NO_KEY, "got %08x\n", GetLastError()); + + result = CryptReleaseContext(hprov, 0); + ok(result, "got %08x\n", GetLastError()); + + hprov = 0xdeadbeef; + result = CryptAcquireContextA(&hprov, "winetest", MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_DELETEKEYSET); + ok(result, "got %08x\n", GetLastError()); + ok(!hprov, "got %08x\n", (DWORD)hprov); +} + START_TEST(dssenh) { test_acquire_context(); @@ -1480,4 +1524,5 @@ START_TEST(dssenh) test_verify_signature(); test_key_exchange(); test_duplicate_hash(); + test_userkey(); }

1 0

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

Oct. 19, 2020

Module: wine Branch: master Commit: d1be006f16d490e7c92112e66363a3ec1367605a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1be006f16d490e7c92112e6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:30 2020 +0200 rpcss: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/rpcss_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index e3859e4c3c9..7df859155e2 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static WCHAR rpcssW[] = {'R','p','c','S','s',0}; +static WCHAR rpcssW[] = L"RpcSs"; static HANDLE exit_event; static SERVICE_STATUS_HANDLE service_handle; @@ -149,10 +149,10 @@ static RPC_STATUS RPCSS_Initialize(void) { static unsigned short irot_protseq[] = IROT_PROTSEQ; static unsigned short irot_endpoint[] = IROT_ENDPOINT; - static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; - static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; - static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; - static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq[] = L"ncacn_np"; + static unsigned short epm_endpoint[] = L"\\pipe\\epmapper"; + static unsigned short epm_protseq_lrpc[] = L"ncalrpc"; + static unsigned short epm_endpoint_lrpc[] = L"epmapper"; static unsigned short irpcss_protseq[] = IRPCSS_PROTSEQ; static unsigned short irpcss_endpoint[] = IRPCSS_ENDPOINT; static const struct protseq_map

1 0

Michael Stefaniuc : taskmgr: Shell32 is imported, no need to load it again.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 9764b6fe37d04177f9c5cb9da2601ba97ba9b5e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9764b6fe37d04177f9c5cb9d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:29 2020 +0200 taskmgr: Shell32 is imported, no need to load it again. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/run.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c index 6d24f1c745c..177c737bb07 100644 --- a/programs/taskmgr/run.c +++ b/programs/taskmgr/run.c @@ -48,13 +48,10 @@ UINT uFlags); void TaskManager_OnFileNew(void) { - HMODULE hShell32; RUNFILEDLG RunFileDlg; OSVERSIONINFOW versionInfo; - static const WCHAR wszShell32[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; - hShell32 = LoadLibraryW(wszShell32); - RunFileDlg = (void *)GetProcAddress(hShell32, (LPCSTR)61); + RunFileDlg = (void *)GetProcAddress(GetModuleHandleW(L"shell32.dll"), (LPCSTR)61); /* Show "Run..." dialog */ if (RunFileDlg) @@ -76,6 +73,4 @@ void TaskManager_OnFileNew(void) RunFileDlg(hMainWnd, hIcon, NULL, szTitle, NULL, RFF_CALCDIRECTORY); } } - - FreeLibrary(hShell32); }

1 0

Michael Stefaniuc : explorer: Use the WCHAR string version of LoadLibrary.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 27431b0f3a0383559d5dd2cc6de4f1a3770ca714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27431b0f3a0383559d5dd2cc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:28 2020 +0200 explorer: Use the WCHAR string version of LoadLibrary. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 2 +- programs/explorer/startmenu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 6f1ff54c143..f525c23d819 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1041,7 +1041,7 @@ void manage_desktop( WCHAR *arg ) initialize_systray( graphics_driver, using_root, enable_shell ); if (!using_root) initialize_launchers( hwnd ); - if ((shell32 = LoadLibraryA( "shell32.dll" )) && + if ((shell32 = LoadLibraryW( L"shell32.dll" )) && (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) { pShellDDEInit( TRUE ); diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index f5f50bb3e72..3173ae21fc6 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -375,7 +375,7 @@ static void run_dialog(void) LPCSTR lpszTitle, LPCSTR lpszDesc, DWORD dwFlags); HMODULE hShell32; - hShell32 = LoadLibraryA("shell32"); + hShell32 = LoadLibraryW(L"shell32"); pRunFileDlg = (void*)GetProcAddress(hShell32, (LPCSTR)61); pRunFileDlg(NULL, NULL, NULL, NULL, NULL, 0);

1 0

Zebediah Figura : wintrust: Stub CryptCATPutAttrInfo().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 8161d2924fdff58e4897f7deb4c46f502fff7889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8161d2924fdff58e4897f7de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:13 2020 -0500 wintrust: Stub CryptCATPutAttrInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 13 +++++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 10 ++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index de2e95b4593..96a2ab1965b 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -848,6 +848,19 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info return TRUE; } +/*********************************************************************** + * CryptCATPutAttrInfo (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *member, + WCHAR *name, DWORD flags, DWORD size, BYTE *data) +{ + FIXME("catalog %p, member %p, name %s, flags %#x, size %u, data %p, stub!\n", + catalog, member, debugstr_w(name), flags, size, data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * CryptCATPutMemberInfo (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 2f369c169ce..025241a808c 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -35,7 +35,7 @@ @ stub CryptCATHandleFromStore @ stdcall CryptCATOpen(wstr long long long long) @ stdcall CryptCATPersistStore(ptr) -@ stub CryptCATPutAttrInfo +@ stdcall CryptCATPutAttrInfo(ptr ptr wstr long long ptr) @ stub CryptCATPutCatAttrInfo @ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) @ stub CryptCATStoreFromHandle diff --git a/include/mscat.h b/include/mscat.h index d3e9a7e560d..79b92b213ab 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -28,6 +28,15 @@ typedef HANDLE HCATINFO; extern "C" { #endif +#define CRYPTCAT_ATTR_NAMEASCII 0x00000001 +#define CRYPTCAT_ATTR_NAMEOBJID 0x00000002 +#define CRYPTCAT_ATTR_DATAASCII 0x00010000 +#define CRYPTCAT_ATTR_DATAOBJID 0x00020000 +#define CRYPTCAT_ATTR_DATAREPLACE 0x00040000 +#define CRYPTCAT_ATTR_NO_AUTO_COMPAT_ENTRY 0x01000000 +#define CRYPTCAT_ATTR_AUTHENTICATED 0x10000000 +#define CRYPTCAT_ATTR_UNAUTHENTICATED 0x20000000 + #define CRYPTCAT_OPEN_CREATENEW 0x00000001 #define CRYPTCAT_OPEN_ALWAYS 0x00000002 #define CRYPTCAT_OPEN_EXISTING 0x00000004 @@ -132,6 +141,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR); CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); BOOL WINAPI CryptCATPersistStore(HANDLE catalog); +CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *member, WCHAR *name, DWORD flags, DWORD size, BYTE *data); CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus

1 0

Zebediah Figura : wintrust: Stub CryptCATPutCatAttrInfo().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 3ea7b3d3b96b29a86a3ce70e9bc763a1318ec79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ea7b3d3b96b29a86a3ce70e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:14 2020 -0500 wintrust: Stub CryptCATPutCatAttrInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 13 +++++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 96a2ab1965b..be869ad8277 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -861,6 +861,19 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *m return NULL; } +/*********************************************************************** + * CryptCATPutCatAttrInfo (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATPutCatAttrInfo(HANDLE catalog, + WCHAR *name, DWORD flags, DWORD size, BYTE *data) +{ + FIXME("catalog %p, name %s, flags %#x, size %u, data %p, stub!\n", + catalog, debugstr_w(name), flags, size, data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * CryptCATPutMemberInfo (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 025241a808c..8226c80c05f 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -36,7 +36,7 @@ @ stdcall CryptCATOpen(wstr long long long long) @ stdcall CryptCATPersistStore(ptr) @ stdcall CryptCATPutAttrInfo(ptr ptr wstr long long ptr) -@ stub CryptCATPutCatAttrInfo +@ stdcall CryptCATPutCatAttrInfo(ptr wstr long long ptr) @ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) @ stub CryptCATStoreFromHandle @ stub CryptCATVerifyMember diff --git a/include/mscat.h b/include/mscat.h index 79b92b213ab..366dbbb0d1e 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -142,6 +142,7 @@ CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); BOOL WINAPI CryptCATPersistStore(HANDLE catalog); CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *member, WCHAR *name, DWORD flags, DWORD size, BYTE *data); +CRYPTCATATTRIBUTE * WINAPI CryptCATPutCatAttrInfo(HANDLE catalog, WCHAR *name, DWORD flags, DWORD size, BYTE *data); CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus

1 0

Zebediah Figura : wintrust: Stub CryptCATPersistStore().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: de22b7b334057d59b68468c8ffde382bc200eb87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de22b7b334057d59b68468c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:12 2020 -0500 wintrust: Stub CryptCATPersistStore(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 11 +++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 15b21a299f3..de2e95b4593 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -861,6 +861,17 @@ CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, return NULL; } +/*********************************************************************** + * CryptCATPersistStore (WINTRUST.@) + */ +BOOL WINAPI CryptCATPersistStore(HANDLE catalog) +{ + FIXME("catalog %p, stub!\n", catalog); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /*********************************************************************** * CryptCATOpen (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index a01d1dd93c9..2f369c169ce 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -34,7 +34,7 @@ @ stdcall CryptCATGetMemberInfo(ptr wstr) @ stub CryptCATHandleFromStore @ stdcall CryptCATOpen(wstr long long long long) -@ stub CryptCATPersistStore +@ stdcall CryptCATPersistStore(ptr) @ stub CryptCATPutAttrInfo @ stub CryptCATPutCatAttrInfo @ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) diff --git a/include/mscat.h b/include/mscat.h index 3931b71596c..d3e9a7e560d 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -131,6 +131,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATGetAttrInfo(HANDLE, CRYPTCATMEMBER *, LPWSTR) CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR); CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); +BOOL WINAPI CryptCATPersistStore(HANDLE catalog); CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus

1 0

Zebediah Figura : mssign32: Stub SignerSign().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 5e9df0bb15a897bb2404f5e78a31d29c17517a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e9df0bb15a897bb2404f5e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:15 2020 -0500 mssign32: Stub SignerSign(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssign32/mssign32.spec | 2 +- dlls/mssign32/mssign32_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mssign32/mssign32.spec b/dlls/mssign32/mssign32.spec index f25e23e9169..d4ea5a25caf 100644 --- a/dlls/mssign32/mssign32.spec +++ b/dlls/mssign32/mssign32.spec @@ -23,7 +23,7 @@ @ stub SignerAddTimeStampResponseEx @ stub SignerCreateTimeStampRequest @ stdcall SignerFreeSignerContext(ptr) -@ stub SignerSign +@ stdcall SignerSign(ptr ptr ptr ptr wstr ptr ptr) @ stdcall SignerSignEx(long ptr ptr ptr ptr wstr ptr ptr ptr) @ stub SignerTimeStamp @ stub SignerTimeStampEx diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index da7551e6d1b..416f836fc40 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -74,6 +74,13 @@ void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD d debugstr_w(pwszTmpContainer)); } +HRESULT WINAPI SignerSign(SIGNER_SUBJECT_INFO *subject, SIGNER_CERT *cert, SIGNER_SIGNATURE_INFO *signature, + SIGNER_PROVIDER_INFO *provider, const WCHAR *timestamp, CRYPT_ATTRIBUTES *attrs, void *sip_data) +{ + FIXME("%p %p %p %p %s %p %p stub\n", subject, cert, signature, provider, debugstr_w(timestamp), attrs, sip_data); + return E_NOTIMPL; +} + HRESULT WINAPI SignerSignEx(DWORD flags, SIGNER_SUBJECT_INFO *subject_info, SIGNER_CERT *signer_cert, SIGNER_SIGNATURE_INFO *signature_info, SIGNER_PROVIDER_INFO *provider_info, const WCHAR *http_time_stamp, CRYPT_ATTRIBUTES *request, void *sip_data,

1 0

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

Oct. 19, 2020

Module: wine Branch: master Commit: 716cfcb163a5fe670023155a751fcfd83cc3b28f URL: https://source.winehq.org/git/wine.git/?a=commit;h=716cfcb163a5fe670023155a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:26 2020 +0200 dsound: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_main.c | 10 +++------- dlls/dsound/propset.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 3acee554ad9..ca33ba48046 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -88,7 +88,7 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -const WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; +const WCHAR wine_vxd_drv[] = L"winemm.vxd"; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_hel_buflen = 32768 * 2; @@ -454,10 +454,6 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, BOOL keep_going; HRESULT hr, init_hr; - static const WCHAR primary_desc[] = {'P','r','i','m','a','r','y',' ', - 'S','o','u','n','d',' ','D','r','i','v','e','r',0}; - static const WCHAR empty_drv[] = {0}; - init_hr = get_mmdevenum(&devenum); if(!devenum) return init_hr; @@ -484,8 +480,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, return DS_OK; } - TRACE("Calling back with NULL (%s)\n", wine_dbgstr_w(primary_desc)); - keep_going = cb(NULL, primary_desc, empty_drv, user); + TRACE("Calling back with NULL (Primary Sound Driver)\n"); + keep_going = cb(NULL, L"Primary Sound Driver", L"", user); /* always send the default device first */ if(keep_going){ diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index dcb2b871783..f1f71bef135 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); -static WCHAR wInterface[] = { 'I','n','t','e','r','f','a','c','e',0 }; +static WCHAR wInterface[] = L"Interface"; typedef struct IKsPrivatePropertySetImpl {

1 0

Louis Lenders : dwmapi: Quiet noisy fixme.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 0c361793c3347caa06561eb3a3c6e2519e87bcec URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c361793c3347caa06561eb3… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Oct 19 10:31:29 2020 +0200 dwmapi: Quiet noisy fixme. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index eb11ecb6b7f..45c33c2169a 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -103,7 +103,9 @@ HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) */ HRESULT WINAPI DwmFlush(void) { - FIXME("() stub\n"); + static BOOL once; + + if (!once++) FIXME("() stub\n"); return E_NOTIMPL; }

1 0

Esme Povirk : windowscodecs: Start loading PNG in unix lib.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 6aa8e179759ddba104b5682984048a61922f85f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa8e179759ddba104b56829… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:17 2020 -0500 windowscodecs: Start loading PNG in unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 159 ++++++++++++++++++++++++++++++++- dlls/windowscodecs/main.c | 19 ++++ dlls/windowscodecs/pngformat.c | 21 ++++- dlls/windowscodecs/unix_iface.c | 14 ++- dlls/windowscodecs/unix_lib.c | 15 ++++ dlls/windowscodecs/wincodecs_common.h | 5 ++ dlls/windowscodecs/wincodecs_private.h | 20 +++++ 7 files changed, 247 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6aa8e179759ddba104b5…

1 0

Esme Povirk : windowscodecs: Get PNG frame information from unix lib.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 8b849e814bcf28368324620c8742bad888ac55d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b849e814bcf28368324620c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:18 2020 -0500 windowscodecs: Get PNG frame information from unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 201 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 96 ++-------------- dlls/windowscodecs/unix_iface.c | 7 ++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 5 + dlls/windowscodecs/wincodecs_private.h | 13 +++ 6 files changed, 238 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b849e814bcf28368324…

1 0

Esme Povirk : windowscodecs: Move PNG CopyPixels to unix lib.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 53ce545e69e1cf88bd0949fb8981ff70a2f264b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ce545e69e1cf88bd0949fb… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:19 2020 -0500 windowscodecs: Move PNG CopyPixels to unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 54 ++++++++++++++++++++++++++ dlls/windowscodecs/main.c | 65 ------------------------------- dlls/windowscodecs/pngformat.c | 3 +- dlls/windowscodecs/unix_iface.c | 8 ++++ dlls/windowscodecs/unix_lib.c | 3 ++ dlls/windowscodecs/wincodecs_common.h | 71 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 6 +++ 7 files changed, 143 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53ce545e69e1cf88bd09…

1 0

Esme Povirk : windowscodecs: Use the unix library to find PNG metadata.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 70ea6485e8b4d46c59e9675807055d1e641f0b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=70ea6485e8b4d46c59e96758… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:20 2020 -0500 windowscodecs: Use the unix library to find PNG metadata. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 77 ++++++++++++++++++ dlls/windowscodecs/main.c | 1 + dlls/windowscodecs/pngformat.c | 143 +++++---------------------------- dlls/windowscodecs/unix_iface.c | 8 ++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 51 ++++++++++++ dlls/windowscodecs/wincodecs_private.h | 15 ++++ 7 files changed, 174 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70ea6485e8b4d46c59e9…

1 0

Hans Leidekker : bcrypt: Copy all fields in key_duplicate.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 437d93280926dc85bd9c04f1e634bb56cd755913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=437d93280926dc85bd9c04f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:11 2020 +0200 bcrypt: Copy all fields in key_duplicate. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b0ea7fce191..4eb1fc29e94 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1476,8 +1476,11 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) if (!(buffer = heap_alloc( key_orig->u.a.pubkey_len ))) return STATUS_NO_MEMORY; memcpy( buffer, key_orig->u.a.pubkey, key_orig->u.a.pubkey_len ); + key_copy->u.a.bitlen = key_orig->u.a.bitlen; + key_copy->u.a.flags = key_orig->u.a.flags; key_copy->u.a.pubkey = buffer; key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len; + key_copy->u.a.dss_seed = key_orig->u.a.dss_seed; if ((status = key_funcs->key_asymmetric_duplicate( key_orig, key_copy ))) return status; }

1 0

Esme Povirk : windowscodecs: Do not call png_read_end.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: cd778e0b7f54cbbb9b7faae0dd6d25f826f54d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd778e0b7f54cbbb9b7faae0… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:22 2020 -0500 windowscodecs: Do not call png_read_end. This isn't necessary because we do not use libpng to read metadata or verify checksums. If this happens to be the last thing we do, it will fail the pngformat tests which do not expect us to return with the stream seeked to the end of the file. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index f7042c86a64..201f5c700d3 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -61,7 +61,6 @@ MAKE_FUNCPTR(png_get_io_ptr); MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); -MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); MAKE_FUNCPTR(png_set_bgr); @@ -111,7 +110,6 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); - LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); LOAD_FUNCPTR(png_set_bgr); @@ -183,7 +181,6 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str struct png_decoder *This = impl_from_decoder(iface); png_structp png_ptr; png_infop info_ptr; - png_infop end_info; jmp_buf jmpbuf; HRESULT hr = E_FAIL; int color_type, bit_depth; @@ -216,13 +213,6 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str return E_FAIL; } - end_info = ppng_create_info_struct(png_ptr); - if (!end_info) - { - ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return E_FAIL; - } - /* set up setjmp/longjmp error handling */ if (setjmp(jmpbuf)) { @@ -443,7 +433,7 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str free(row_pointers); row_pointers = NULL; - ppng_read_end(png_ptr, end_info); + /* png_read_end intentionally not called to not seek to the end of the file */ st->flags = WICBitmapDecoderCapabilityCanDecodeAllImages | WICBitmapDecoderCapabilityCanDecodeSomeImages | @@ -455,7 +445,7 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str hr = S_OK; end: - ppng_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); free(row_pointers); if (FAILED(hr)) {

1 0

Hans Leidekker : bcrypt/tests: Fix a key handle leak.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: f1e11804a02a2bf8c490484400e5d9251c18c4cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e11804a02a2bf8c4904844… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:10 2020 +0200 bcrypt/tests: Fix a key handle leak. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d499ce65a65..0ae4b5dad53 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2603,6 +2603,9 @@ static void test_DSA(void) ok(!memcmp(dssKey, buf, size), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(!ret, "got %08x\n", ret); }

1 0

Zebediah Figura : ws2_32/tests: Fix an intermittent test failure on w10pro64.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: a0d386a310f78385cf7a74abf3172219bdbd2db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0d386a310f78385cf7a74ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 23:22:04 2020 -0500 ws2_32/tests: Fix an intermittent test failure on w10pro64. Much like 2aebe0b628. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5fb85bfaa60..fb580b6c8d6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3610,28 +3610,31 @@ static void test_select(void) ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); - - /* When a connection is attempted to a non-listening socket it will get to the except descriptor */ ret = closesocket(fdWrite); ok(ret == 0, "expected 0, got %d\n", ret); ret = closesocket(fdListen); ok(ret == 0, "expected 0, got %d\n", ret); - len = sizeof(address); - fdWrite = setup_connector_socket(&address, len, TRUE); - FD_ZERO_ALL(); - FD_SET(fdWrite, &writefds); - FD_SET(fdWrite, &exceptfds); - select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */ - ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - ok(ret == 1, "expected 1, got %d\n", ret); - len = sizeof(id); - id = 0xdeadbeef; - ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); - ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); - ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); - ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); - closesocket(fdWrite); + + /* w10pro64 sometimes takes over 2 seconds for an error to be reported. */ + if (winetest_interactive) + { + len = sizeof(address); + fdWrite = setup_connector_socket(&address, len, TRUE); + FD_ZERO_ALL(); + FD_SET(fdWrite, &writefds); + FD_SET(fdWrite, &exceptfds); + select_timeout.tv_sec = 10; + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + len = sizeof(id); + id = 0xdeadbeef; + ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); + ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); + closesocket(fdWrite); + } /* Try select() on a closed socket after connection */ tcp_socketpair(&fdRead, &fdWrite);

1 0

Hans Leidekker : dssenh: Implement CRYPT_DELETEKEYSET.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 320b9eb47451eb8c167b211282f2ea49fcfbbab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=320b9eb47451eb8c167b2112… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:12 2020 +0200 dssenh: Implement CRYPT_DELETEKEYSET. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 5ad0ef1505d..4867fef2f59 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -247,6 +247,23 @@ static struct container *read_key_container( const char *name, DWORD flags ) return ret; } +static void delete_key_container( const char *name, DWORD flags ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, name ); + + if (flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + RegDeleteKeyExA( rootkey, path, 0, 0 ); +} + BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) { struct container *ret; @@ -285,6 +302,11 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags ret = create_key_container( "", flags ); break; + case CRYPT_DELETEKEYSET: + delete_key_container( name, flags ); + *ret_prov = 0; + return TRUE; + default: FIXME( "unsupported flags %08x\n", flags ); return FALSE;

1 0

Esme Povirk : windowscodecs: Add a general wrapper around the decoder interface.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 1b37ac14a3e4a014c8440e691e9a2bbad9ba6575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b37ac14a3e4a014c8440e69… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:23 2020 -0500 windowscodecs: Add a general wrapper around the decoder interface. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/decoder.c | 745 ++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 809 +-------------------------------- dlls/windowscodecs/wincodecs_private.h | 3 + 4 files changed, 763 insertions(+), 795 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b37ac14a3e4a014c844…

1 0

Esme Povirk : windowscodecs: Add a unix library and start to use it for PNG.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 0f61ed18ef0c3676139ba927e0d53751ec0e4491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f61ed18ef0c3676139ba927… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:16 2020 -0500 windowscodecs: Add a unix library and start to use it for PNG. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 3 + dlls/windowscodecs/libpng.c | 97 +++++++++++++++++++++++++++++++ dlls/windowscodecs/main.c | 5 ++ dlls/windowscodecs/pngformat.c | 20 ++++++- dlls/windowscodecs/unix_iface.c | 101 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/unix_lib.c | 65 +++++++++++++++++++++ dlls/windowscodecs/wincodecs_common.h | 22 +++++++ dlls/windowscodecs/wincodecs_private.h | 35 ++++++++++++ 8 files changed, 345 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f61ed18ef0c3676139b…

1 0

Esme Povirk : windowscodecs: Use unix lib to get PNG color contexts.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 980e6650db59a9afb3c300ff7a8c05e692863330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=980e6650db59a9afb3c300ff… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:21 2020 -0500 windowscodecs: Use unix lib to get PNG color contexts. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 45 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 35 ++++++++++++-------------- dlls/windowscodecs/unix_iface.c | 8 ++++++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 6 +++++ dlls/windowscodecs/wincodecs_private.h | 7 ++++++ 6 files changed, 83 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 2a4fbca7d61..f7042c86a64 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -54,6 +54,7 @@ MAKE_FUNCPTR(png_error); MAKE_FUNCPTR(png_get_bit_depth); MAKE_FUNCPTR(png_get_color_type); MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_iCCP); MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); @@ -105,6 +106,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_error_ptr); LOAD_FUNCPTR(png_get_image_height); LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_iCCP); LOAD_FUNCPTR(png_get_io_ptr); LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); @@ -137,6 +139,8 @@ struct png_decoder struct decoder_frame decoder_frame; UINT stride; BYTE *image_bits; + BYTE *color_profile; + DWORD color_profile_len; }; static inline struct png_decoder *impl_from_decoder(struct decoder* iface) @@ -194,6 +198,10 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str int i; UINT image_size; png_bytep *row_pointers=NULL; + png_charp cp_name; + png_bytep cp_profile; + png_uint_32 cp_len; + int cp_compression; png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!png_ptr) @@ -351,6 +359,22 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str This->decoder_frame.dpix = This->decoder_frame.dpiy = 96.0; } + ret = ppng_get_iCCP(png_ptr, info_ptr, &cp_name, &cp_compression, &cp_profile, &cp_len); + if (ret) + { + This->decoder_frame.num_color_contexts = 1; + This->color_profile_len = cp_len; + This->color_profile = malloc(cp_len); + if (!This->color_profile) + { + hr = E_OUTOFMEMORY; + goto end; + } + memcpy(This->color_profile, cp_profile, cp_len); + } + else + This->decoder_frame.num_color_contexts = 0; + if (color_type == PNG_COLOR_TYPE_PALETTE) { ret = ppng_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); @@ -437,6 +461,8 @@ end: { free(This->image_bits); This->image_bits = NULL; + free(This->color_profile); + This->color_profile = NULL; } return hr; } @@ -531,11 +557,28 @@ end: return hr; } +HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, + BYTE **data, DWORD *datasize) +{ + struct png_decoder *This = impl_from_decoder(iface); + + *data = RtlAllocateHeap(GetProcessHeap(), 0, This->color_profile_len); + *datasize = This->color_profile_len; + + if (!*data) + return E_OUTOFMEMORY; + + memcpy(*data, This->color_profile, This->color_profile_len); + + return S_OK; +} + void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); free(This->image_bits); + free(This->color_profile); RtlFreeHeap(GetProcessHeap(), 0, This); } @@ -544,6 +587,7 @@ static const struct decoder_funcs png_decoder_vtable = { png_decoder_get_frame_info, png_decoder_copy_pixels, png_decoder_get_metadata_blocks, + png_decoder_get_color_context, png_decoder_destroy }; @@ -566,6 +610,7 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res This->decoder.vtable = &png_decoder_vtable; This->image_bits = NULL; + This->color_profile = NULL; *result = &This->decoder; info->container_format = GUID_ContainerFormatPng; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 1d696a4fe01..efd5f6ab2c1 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -976,37 +976,34 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - png_charp name; + HRESULT hr=S_OK; BYTE *profile; - png_uint_32 len; - int compression_type; - HRESULT hr; + DWORD profile_len; TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); if (!pcActualCount) return E_INVALIDARG; - EnterCriticalSection(&This->lock); + *pcActualCount = This->decoder_frame.num_color_contexts; - if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, (void *)&profile, &len)) + if (This->decoder_frame.num_color_contexts && cCount && ppIColorContexts) { - if (cCount && ppIColorContexts) + EnterCriticalSection(&This->lock); + + hr = decoder_get_color_context(This->png_decoder, 0, 0, + &profile, &profile_len); + + LeaveCriticalSection(&This->lock); + + if (SUCCEEDED(hr)) { - hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len); - if (FAILED(hr)) - { - LeaveCriticalSection(&This->lock); - return hr; - } + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, profile_len); + + HeapFree(GetProcessHeap(), 0, profile); } - *pcActualCount = 1; } - else - *pcActualCount = 0; - LeaveCriticalSection(&This->lock); - - return S_OK; + return hr; } static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c index ee2e38c5770..e376ea45841 100644 --- a/dlls/windowscodecs/unix_iface.c +++ b/dlls/windowscodecs/unix_iface.c @@ -92,6 +92,13 @@ HRESULT CDECL decoder_wrapper_get_metadata_blocks(struct decoder* iface, return unix_funcs->decoder_get_metadata_blocks(This->unix_decoder, frame, count, blocks); } +HRESULT CDECL decoder_wrapper_get_color_context(struct decoder* iface, + UINT frame, UINT num, BYTE **data, DWORD *datasize) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + return unix_funcs->decoder_get_color_context(This->unix_decoder, frame, num, data, datasize); +} + void CDECL decoder_wrapper_destroy(struct decoder* iface) { struct decoder_wrapper* This = impl_from_decoder(iface); @@ -104,6 +111,7 @@ static const struct decoder_funcs decoder_wrapper_vtable = { decoder_wrapper_get_frame_info, decoder_wrapper_copy_pixels, decoder_wrapper_get_metadata_blocks, + decoder_wrapper_get_color_context, decoder_wrapper_destroy }; diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 102cc505ca1..04cbe053a0e 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -71,6 +71,7 @@ static const struct unix_funcs unix_funcs = { decoder_get_frame_info, decoder_copy_pixels, decoder_get_metadata_blocks, + decoder_get_color_context, decoder_destroy }; diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index f041de7c3f2..07e6dcaf44a 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -37,6 +37,12 @@ HRESULT CDECL decoder_get_metadata_blocks(struct decoder *decoder, UINT frame, U return decoder->vtable->get_metadata_blocks(decoder, frame, count, blocks); } +HRESULT CDECL decoder_get_color_context(struct decoder *decoder, UINT frame, + UINT num, BYTE **data, DWORD *datasize) +{ + return decoder->vtable->get_color_context(decoder, frame, num, data, datasize); +} + void CDECL decoder_destroy(struct decoder *decoder) { decoder->vtable->destroy(decoder); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index c52bead5914..0f6980f6aa6 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -275,6 +275,7 @@ struct decoder_frame UINT width, height; UINT bpp; double dpix, dpiy; + DWORD num_color_contexts; DWORD num_colors; WICColor palette[256]; }; @@ -299,6 +300,8 @@ struct decoder_funcs UINT stride, UINT buffersize, BYTE *buffer); HRESULT (CDECL *get_metadata_blocks)(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); + HRESULT (CDECL *get_color_context)(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void (CDECL *destroy)(struct decoder* This); }; @@ -318,6 +321,8 @@ HRESULT CDECL decoder_copy_pixels(struct decoder* This, UINT frame, const WICRec UINT stride, UINT buffersize, BYTE *buffer); HRESULT CDECL decoder_get_metadata_blocks(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); +HRESULT CDECL decoder_get_color_context(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void CDECL decoder_destroy(struct decoder *This); HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); @@ -331,6 +336,8 @@ struct unix_funcs UINT stride, UINT buffersize, BYTE *buffer); HRESULT (CDECL *decoder_get_metadata_blocks)(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); + HRESULT (CDECL *decoder_get_color_context)(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void (CDECL *decoder_destroy)(struct decoder* This); };

1 0

Michael Stefaniuc : taskmgr: Use GetGuiResources() directly.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: d98cd9e82ae701e560befc44881476361ef5070a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d98cd9e82ae701e560befc44… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:27 2020 +0200 taskmgr: Use GetGuiResources() directly. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/perfdata.c | 9 ++------- programs/taskmgr/perfdata.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index d81ab102482..67f0d934412 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -31,7 +31,6 @@ #include "perfdata.h" static PROCNTQSI pNtQuerySystemInformation = NULL; -static PROCGGR pGetGuiResources = NULL; static PROCGPIC pGetProcessIoCounters = NULL; static PROCISW64 pIsWow64Process = NULL; static CRITICAL_SECTION PerfDataCriticalSection; @@ -60,11 +59,9 @@ BOOL PerfDataInitialize(void) { LONG status; static const WCHAR wszNtdll[] = {'n','t','d','l','l','.','d','l','l',0}; - static const WCHAR wszUser32[] = {'u','s','e','r','3','2','.','d','l','l',0}; static const WCHAR wszKernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; pNtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandleW(wszNtdll), "NtQuerySystemInformation"); - pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandleW(wszUser32), "GetGuiResources"); pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters"); pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process"); @@ -297,10 +294,8 @@ void PerfDataRefresh(void) RevertToSelf(); CloseHandle(hProcessToken); } - if (pGetGuiResources) { - pPerfData[Idx].USERObjectCount = pGetGuiResources(hProcess, GR_USEROBJECTS); - pPerfData[Idx].GDIObjectCount = pGetGuiResources(hProcess, GR_GDIOBJECTS); - } + pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); + pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); if (pGetProcessIoCounters) pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); if (pIsWow64Process) diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index d6a16028c4b..8b9fabbd910 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -67,7 +67,6 @@ struct _SYSTEM_PAGEFILE_INFORMATION #define GR_USEROBJECTS 1 /* Count of USER objects */ typedef LONG (WINAPI *PROCNTQSI)(UINT,PVOID,ULONG,PULONG); -typedef DWORD (WINAPI *PROCGGR)(HANDLE,DWORD); typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS); typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL);

1 0

Zebediah Figura : wintrust: Stub CryptCATPutMemberInfo().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 63523b55be712466023bdc1464724b9fcf4adfb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63523b55be712466023bdc14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:11 2020 -0500 wintrust: Stub CryptCATPutMemberInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 13 +++++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 975d51f14fd..15b21a299f3 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -848,6 +848,19 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info return TRUE; } +/*********************************************************************** + * CryptCATPutMemberInfo (WINTRUST.@) + */ +CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, + WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data) +{ + FIXME("catalog %p, filename %s, member %s, subject %s, version %u, size %u, data %p, stub!\n", + catalog, debugstr_w(filename), debugstr_w(member), debugstr_guid(subject), version, size, data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * CryptCATOpen (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 7ebd53f0396..a01d1dd93c9 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -37,7 +37,7 @@ @ stub CryptCATPersistStore @ stub CryptCATPutAttrInfo @ stub CryptCATPutCatAttrInfo -@ stub CryptCATPutMemberInfo +@ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) @ stub CryptCATStoreFromHandle @ stub CryptCATVerifyMember @ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) diff --git a/include/mscat.h b/include/mscat.h index 4571a0b2647..3931b71596c 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -131,6 +131,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATGetAttrInfo(HANDLE, CRYPTCATMEMBER *, LPWSTR) CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR); CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); +CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus }

1 0