October 2020 - Wine-commits

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

19 Oct '20

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 : evr/mixer: Map render target type to video processor guid that supports it.
by Alexandre Julliard 19 Oct '20

19 Oct '20

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

Piotr Caban : ucrtbase: Support UTF8 codepage in _wcstombs_l.
by Alexandre Julliard 19 Oct '20

19 Oct '20

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

Piotr Caban : ucrtbase: Support UTF8 codepage in _wctomb_s_l.
by Alexandre Julliard 19 Oct '20

19 Oct '20

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 wctomb.
by Alexandre Julliard 19 Oct '20

19 Oct '20

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

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

19 Oct '20

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

Zebediah Figura : wintrust: Stub CryptCATPersistStore().
by Alexandre Julliard 19 Oct '20

19 Oct '20

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 : wintrust: Stub CryptCATPutAttrInfo().
by Alexandre Julliard 19 Oct '20

19 Oct '20

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 19 Oct '20

19 Oct '20

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 : mssign32: Stub SignerSign().
by Alexandre Julliard 19 Oct '20

19 Oct '20

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