December 2021 - Wine-Commits

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: b3bea80d61cc314401282891cd55235cd6770d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3bea80d61cc314401282891… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Thu Dec 2 20:40:31 2021 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 118 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 62 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3bea80d61cc31440128…

1 0

Tag wine-6.23 : Alexandre Julliard : Release 6.23
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: refs/tags/wine-6.23 Tag: c7086213cbb4c55c082a699e12054873974af70d URL: https://source.winehq.org/git/wine.git/?a=tag;h=c7086213cbb4c55c082a699e120… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 22:17:11 2021 +0100 Release 6.23

1 0

Hans Leidekker : bcrypt: Add support for exporting RSA private keys.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 2795c7f99509a740dffa88b50acd689592a8da7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2795c7f99509a740dffa88b5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 3 15:49:29 2021 +0100 bcrypt: Add support for exporting RSA private keys. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52060 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 + dlls/bcrypt/bcrypt_main.c | 15 +++- dlls/bcrypt/gnutls.c | 88 +++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 157 +++++++++++++++++++++++++++++++++++++++++- include/bcrypt.h | 2 + 5 files changed, 258 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2795c7f99509a740dffa…

1 0

Alexandre Julliard : Release 6.23.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 3f6102080e632b9f4d8a97c0f0b1231fbd8e759b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f6102080e632b9f4d8a97c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 22:17:11 2021 +0100 Release 6.23. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1076 +++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 550 insertions(+), 547 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f6102080e632b9f4d8a…

1 0

Hans Leidekker : wbemprox: Add a stub MSSMBios_RawSMBiosTables implementation.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 5effe62af4ec27b37f65d8911bac09d85d21f211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5effe62af4ec27b37f65d891… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 3 14:20:25 2021 +0100 wbemprox: Add a stub MSSMBios_RawSMBiosTables implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51946 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 22 +++++++++++++++++++++- dlls/wbemprox/tests/query.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3fccd3fb600..6b63c744b69 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -358,6 +358,10 @@ static const struct column col_quickfixengineering[] = { L"Caption", CIM_STRING }, { L"HotFixID", CIM_STRING|COL_FLAG_KEY }, }; +static const struct column col_rawsmbiostables[] = +{ + { L"SMBiosData", CIM_UINT8|CIM_FLAG_ARRAY }, +}; static const struct column col_service[] = { { L"AcceptPause", CIM_BOOLEAN }, @@ -776,6 +780,10 @@ struct record_quickfixengineering const WCHAR *caption; const WCHAR *hotfixid; }; +struct record_rawsmbiostables +{ + const struct array *smbiosdata; +}; struct record_service { int accept_pause; @@ -953,11 +961,18 @@ static const struct record_physicalmedia data_physicalmedia[] = { { L"WINEHDISK", L"\\\\.\\PHYSICALDRIVE0" } }; + +static const struct record_rawsmbiostables data_rawsmbiostables[] = +{ + { 0 }, +}; + static const struct record_qualifier data_qualifier[] = { { L"__WIN32_PROCESS_GETOWNER_OUT", L"User", CIM_SINT32, FLAVOR_ID, L"ID", 0 }, { L"__WIN32_PROCESS_GETOWNER_OUT", L"Domain", CIM_SINT32, FLAVOR_ID, L"ID", 1 } }; + static const struct record_quickfixengineering data_quickfixengineering[] = { { L"http://winehq.org", L"KB1234567" }, @@ -4128,6 +4143,11 @@ static struct table cimv2_builtin_classes[] = { L"Win32_VideoController", C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, { L"Win32_WinSAT", C(col_winsat), D(data_winsat) }, }; + +static struct table wmi_builtin_classes[] = +{ + { L"MSSMBios_RawSMBiosTables", C(col_rawsmbiostables), D(data_rawsmbiostables) }, +}; #undef C #undef D @@ -4141,7 +4161,7 @@ builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { {L"cimv2", cimv2_builtin_classes, ARRAY_SIZE(cimv2_builtin_classes)}, {L"Microsoft\\Windows\\Storage", NULL, 0}, - {L"wmi", NULL, 0}, + {L"wmi", wmi_builtin_classes, ARRAY_SIZE(wmi_builtin_classes)}, }; void init_table_list( void ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 577a352c26f..912671f4ad2 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2102,6 +2102,41 @@ static void test_empty_namespace( IWbemLocator *locator ) IWbemServices_Release( services ); } +static void test_MSSMBios_RawSMBiosTables( IWbemLocator *locator ) +{ + BSTR path = SysAllocString( L"ROOT\\WMI" ); + BSTR bios = SysAllocString( L"MSSMBios_RawSMBiosTables" ); + IWbemServices *services; + IEnumWbemClassObject *iter; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + ULONG count; + HRESULT hr; + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + hr = IWbemServices_CreateInstanceEnum( services, bios, 0, NULL, &iter ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &obj, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"SMBiosData", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( V_VT( &val ) == (VT_UI1 | VT_ARRAY), "got %08x\n", V_VT(&val) ); + ok( type == (CIM_UINT8 | CIM_FLAG_ARRAY), "got %08x\n", type ); + + IWbemClassObject_Release( obj ); + IEnumWbemClassObject_Release( iter ); + IWbemServices_Release( services ); + SysFreeString( path ); + SysFreeString( bios ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -2180,6 +2215,7 @@ START_TEST(query) test_Win32_WinSAT( services ); test_SystemRestore( services ); test_empty_namespace( locator ); + test_MSSMBios_RawSMBiosTables( locator ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Nikolay Sivov : mfplat: Trace types passed to MFTEnum*.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 1162fe57004bb281ca89835cb7ce39e4e5868eeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1162fe57004bb281ca89835c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 3 17:04:17 2021 +0300 mfplat: Trace types passed to MFTEnum*. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a70d7d401a1..978340a7ece 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -90,6 +90,12 @@ struct mft_registration BOOL local; }; +static const char *debugstr_reg_typeinfo(const MFT_REGISTER_TYPE_INFO *info) +{ + return info ? wine_dbg_sprintf("%p{%s,%s}", info, debugstr_mf_guid(&info->guidMajorType), + debugstr_mf_guid(&info->guidSubtype)) : wine_dbg_sprintf("%p", info); +} + static CRITICAL_SECTION local_mfts_section = { NULL, -1, 0, 0, 0, 0 }; static struct list local_mfts = LIST_INIT(local_mfts); @@ -1331,8 +1337,8 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu struct list mfts; HRESULT hr; - TRACE("%s, %#x, %p, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, attributes, - clsids, count); + TRACE("%s, %#x, %s, %s, %p, %p, %p.\n", debugstr_mf_guid(&category), flags, debugstr_reg_typeinfo(input_type), + debugstr_reg_typeinfo(output_type), attributes, clsids, count); if (!clsids || !count) return E_INVALIDARG; @@ -1377,7 +1383,8 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count) { - TRACE("%s, %#x, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, activate, count); + TRACE("%s, %#x, %s, %s, %p, %p.\n", debugstr_mf_guid(&category), flags, debugstr_reg_typeinfo(input_type), + debugstr_reg_typeinfo(output_type), activate, count); return mft_enum(category, flags, input_type, output_type, NULL, activate, count); } @@ -1388,8 +1395,8 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, IMFActivate ***activate, UINT32 *count) { - TRACE("%s, %#x, %p, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, attributes, - activate, count); + TRACE("%s, %#x, %s, %s, %p, %p, %p.\n", debugstr_mf_guid(&category), flags, debugstr_reg_typeinfo(input_type), + debugstr_reg_typeinfo(output_type), attributes, activate, count); if (attributes) FIXME("Ignoring attributes.\n"); @@ -1903,7 +1910,9 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_RGB565), X(MFVideoFormat_RGB555), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID), + X(MFT_CATEGORY_MULTIPLEXER), X(MFVideoFormat_A2R10G10B10), + X(MFT_CATEGORY_VIDEO_EFFECT), X(MFMediaType_Script), X(MFMediaType_Image), X(MFMediaType_HTML), @@ -1923,8 +1932,10 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_H265), X(MFVideoFormat_HEVC), X(MFVideoFormat_HEVC_ES), + X(MFT_CATEGORY_AUDIO_EFFECT), X(MFVideoFormat_I420), X(MFVideoFormat_IYUV), + X(MFT_CATEGORY_VIDEO_DECODER), X(MFVideoFormat_M4S2), X(MFVideoFormat_MJPG), X(MFVideoFormat_MP43), @@ -1937,8 +1948,8 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_NV12), X(MFVideoFormat_ORAW), X(MFAudioFormat_Opus), - X(MFVideoFormat_D16), X(MFAudioFormat_MPEG), + X(MFVideoFormat_D16), X(MFVideoFormat_P010), X(MFVideoFormat_P016), X(MFVideoFormat_P210), @@ -1953,6 +1964,7 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_WMV2), X(MFVideoFormat_WMV3), X(MFVideoFormat_WVC1), + X(MFT_CATEGORY_OTHER), X(MFVideoFormat_Y210), X(MFVideoFormat_Y216), X(MFVideoFormat_Y410), @@ -1986,7 +1998,9 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_v410), X(MFMediaType_Video), X(MFAudioFormat_AAC_HDCP), + X(MFT_CATEGORY_DEMULTIPLEXER), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID), + X(MFT_CATEGORY_VIDEO_ENCODER), X(MFAudioFormat_Dolby_AC3_HDCP), X(MFMediaType_Subtitle), X(MFMediaType_Stream), @@ -1997,7 +2011,9 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFAudioFormat_FLAC), X(MFAudioFormat_Dolby_DDPlus), X(MFMediaType_MultiplexedFrames), + X(MFT_CATEGORY_AUDIO_DECODER), X(MFAudioFormat_Base_HDCP), + X(MFT_CATEGORY_AUDIO_ENCODER), X(MFVideoFormat_Base_HDCP), X(MFVideoFormat_H264_HDCP), X(MFVideoFormat_HEVC_HDCP), @@ -2005,6 +2021,7 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFMediaType_Protected), X(MFVideoFormat_H264_ES), X(MFMediaType_Perception), + X(MFT_CATEGORY_VIDEO_PROCESSOR), #undef X }; struct guid_def *ret = NULL;

1 0

Nikolay Sivov : include: Add print document package interfaces.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: f3977dc886e723487d2d35908663b31d3fc54139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3977dc886e723487d2d3590… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 3 17:13:15 2021 +0300 include: Add print document package interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/documenttarget.idl | 113 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index a869ae4bc73..c99b0e1e1c1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -245,6 +245,7 @@ SOURCES = \ dmusics.h \ docobj.idl \ docobjectservice.idl \ + documenttarget.idl \ downloadmgr.idl \ dpaddr.h \ dpfilter.h \ diff --git a/include/documenttarget.idl b/include/documenttarget.idl new file mode 100644 index 00000000000..17c7cefe5b5 --- /dev/null +++ b/include/documenttarget.idl @@ -0,0 +1,113 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; + +[ + object, + uuid(1b8efec4-3019-4c27-964e-367202156906), +] +interface IPrintDocumentPackageTarget : IUnknown +{ + HRESULT GetPackageTargetTypes( + [out] UINT32 *targetCount, + [out, size_is(, *targetCount)] GUID **targetTypes + ); + + HRESULT GetPackageTarget( + [in] REFGUID guidTargetType, + [in] REFIID riid, + [out, iid_is(riid)] void **ppvTarget + ); + + HRESULT Cancel(); +} + +typedef [v1_enum] enum PrintDocumentPackageCompletion +{ + PrintDocumentPackageCompletion_InProgress, + PrintDocumentPackageCompletion_Completed, + PrintDocumentPackageCompletion_Canceled, + PrintDocumentPackageCompletion_Failed +} PrintDocumentPackageCompletion; + +typedef struct +{ + UINT32 JobId; + INT32 CurrentDocument; + INT32 CurrentPage; + INT32 CurrentPageTotal; + PrintDocumentPackageCompletion Completion; + HRESULT PackageStatus; +} PrintDocumentPackageStatus; + +[ + object, + dual, + nonextensible, + uuid(ed90c8ad-5c34-4d05-a1ec-0e8a9b3ad7af), +] +interface IPrintDocumentPackageStatusEvent : IDispatch +{ + [id(1)] + HRESULT PackageStatusUpdated( + [in] PrintDocumentPackageStatus *packageStatus + ); +} + +[ + object, + uuid(d2959bf7-b31b-4a3d-9600-712eb1335ba4), +] +interface IPrintDocumentPackageTargetFactory : IUnknown +{ + HRESULT CreateDocumentPackageTargetForPrintJob( + [in, string] LPCWSTR printerName, + [in, string] LPCWSTR jobName, + [in] IStream *jobOutputStream, + [in] IStream *jobPrintTicketStream, + [out] IPrintDocumentPackageTarget **docPackageTarget + ); +} + +[ + version(1.0), + uuid(410d76f7-8bb5-4a7d-9d37-9c71b1b14d14), +] +library PrintDocumentTargetLib +{ + +[ + noncreatable, + uuid(4842669e-9947-46ea-8ba2-d8cce432c2ca), +] +coclass PrintDocumentPackageTarget +{ + [default] interface IPrintDocumentPackageTarget; + [source] dispinterface IPrintDocumentPackageStatusEvent; +} + +[ + uuid(348ef17d-6c81-4982-92b4-ee188a43867a) +] +coclass PrintDocumentPackageTargetFactory +{ + [default] interface IPrintDocumentPackageTargetFactory; +} + +} /* library */

1 0

Hans Leidekker : bcrypt: Return export size from export_gnutls_datum().
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: a226331851f1b9e1df503e6dbaccfd004e2a4182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a226331851f1b9e1df503e6d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 3 15:49:28 2021 +0100 bcrypt: Return export size from export_gnutls_datum(). And make zero padding explicit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 77 ++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index c94577f8acd..3a1eff1e7bd 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -585,32 +585,31 @@ static NTSTATUS key_symmetric_destroy( void *args ) return STATUS_SUCCESS; } -static void export_gnutls_datum( UCHAR *buffer, ULONG length, gnutls_datum_t *d, ULONG *actual_length ) +static ULONG export_gnutls_datum( UCHAR *buffer, ULONG buflen, gnutls_datum_t *d, BOOL zero_pad ) { ULONG size = d->size; UCHAR *src = d->data; - ULONG offset; + ULONG offset = 0; - assert( size <= length + 1 ); - if (size == length + 1) + assert( size <= buflen + 1 ); + if (size == buflen + 1) { - assert(!src[0]); - ++src; - --size; + assert( !src[0] ); + src++; + size--; } - if (actual_length) + if (zero_pad) { - offset = 0; - *actual_length = size; + offset = buflen - size; + if (buffer) memset( buffer, 0, offset ); + size = buflen; } - else - { - offset = length - size; - memset( buffer, 0, offset ); - } - memcpy( buffer + offset, src, size ); + + if (buffer) memcpy( buffer + offset, src, size ); + return size; } +#define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, bitlen / f, &d, p ) static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, ULONG *pubkey_len ) { BCRYPT_RSAKEY_BLOB *rsa_blob = pubkey; @@ -624,19 +623,19 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_INTERNAL_ERROR; } - if (*pubkey_len < sizeof(*rsa_blob) + e.size + m.size) + if (*pubkey_len < sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1)) { - FIXME( "wrong pubkey len %u / %u\n", *pubkey_len, (ULONG)sizeof(*rsa_blob) + e.size + m.size ); + FIXME( "wrong pubkey len %u\n", *pubkey_len ); pgnutls_perror( ret ); free( e.data ); free( m.data ); return STATUS_BUFFER_TOO_SMALL; } dst = (UCHAR *)(rsa_blob + 1); - export_gnutls_datum( dst, bitlen / 8, &e, &rsa_blob->cbPublicExp ); + rsa_blob->cbPublicExp = export_gnutls_datum( dst, bitlen / 8, &e, 0 ); dst += rsa_blob->cbPublicExp; - export_gnutls_datum( dst, bitlen / 8, &m, &rsa_blob->cbModulus ); + rsa_blob->cbModulus = export_gnutls_datum( dst, bitlen / 8, &m, 1 ); rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC; rsa_blob->BitLength = bitlen; @@ -699,10 +698,10 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ ecc_blob->cbKey = size; dst = (UCHAR *)(ecc_blob + 1); - export_gnutls_datum( dst, size, &x, NULL ); + export_gnutls_datum( dst, size, &x, 1 ); dst += size; - export_gnutls_datum( dst, size, &y, NULL ); + export_gnutls_datum( dst, size, &y, 1 ); *pubkey_len = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; @@ -738,16 +737,16 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit } dst = (UCHAR *)(dsa_blob + 1); - export_gnutls_datum( dst, bitlen / 8, &p, NULL ); + export_gnutls_datum( dst, bitlen / 8, &p, 1 ); dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &g, NULL ); + export_gnutls_datum( dst, bitlen / 8, &g, 1 ); dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &y, NULL ); + export_gnutls_datum( dst, bitlen / 8, &y, 1 ); dst = dsa_blob->q; - export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, NULL ); + export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, 1 ); dsa_blob->dwMagic = BCRYPT_DSA_PUBLIC_MAGIC; dsa_blob->cbKey = bitlen / 8; @@ -813,19 +812,19 @@ static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, cons dsskey->bitlen = bitlen; dst = (UCHAR *)(dsskey + 1); - export_gnutls_datum( dst, bitlen / 8, &p, NULL ); + export_gnutls_datum( dst, bitlen / 8, &p, 1 ); reverse_bytes( dst, bitlen / 8 ); dst += bitlen / 8; - export_gnutls_datum( dst, Q_SIZE, &q, NULL ); + export_gnutls_datum( dst, Q_SIZE, &q, 1 ); reverse_bytes( dst, Q_SIZE ); dst += Q_SIZE; - export_gnutls_datum( dst, bitlen / 8, &g, NULL ); + export_gnutls_datum( dst, bitlen / 8, &g, 1 ); reverse_bytes( dst, bitlen / 8 ); dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &y, NULL ); + export_gnutls_datum( dst, bitlen / 8, &y, 1 ); reverse_bytes( dst, bitlen / 8 ); dst += bitlen / 8; @@ -962,13 +961,13 @@ static NTSTATUS key_export_ecc( void *args ) ecc_blob->cbKey = size; dst = (UCHAR *)(ecc_blob + 1); - export_gnutls_datum( dst, size, &x, NULL ); + export_gnutls_datum( dst, size, &x, 1 ); dst += size; - export_gnutls_datum( dst, size, &y, NULL ); + export_gnutls_datum( dst, size, &y, 1 ); dst += size; - export_gnutls_datum( dst, size, &d, NULL ); + export_gnutls_datum( dst, size, &d, 1 ); } free( x.data ); free( y.data ); free( d.data ); @@ -1101,19 +1100,19 @@ static NTSTATUS key_export_dsa_capi( void *args ) pubkey->bitlen = key->u.a.bitlen; dst = (UCHAR *)(pubkey + 1); - export_gnutls_datum( dst, size, &p, NULL ); + export_gnutls_datum( dst, size, &p, 1 ); reverse_bytes( dst, size ); dst += size; - export_gnutls_datum( dst, 20, &q, NULL ); + export_gnutls_datum( dst, 20, &q, 1 ); reverse_bytes( dst, 20 ); dst += 20; - export_gnutls_datum( dst, size, &g, NULL ); + export_gnutls_datum( dst, size, &g, 1 ); reverse_bytes( dst, size ); dst += size; - export_gnutls_datum( dst, 20, &x, NULL ); + export_gnutls_datum( dst, 20, &x, 1 ); reverse_bytes( dst, 20 ); dst += 20; @@ -1571,8 +1570,8 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat if (output) { - export_gnutls_datum( output, sig_len / 2, &r, NULL ); - export_gnutls_datum( output + sig_len / 2, sig_len / 2, &s, NULL ); + export_gnutls_datum( output, sig_len / 2, &r, 1 ); + export_gnutls_datum( output + sig_len / 2, sig_len / 2, &s, 1 ); } free( r.data ); free( s.data );

1 0

Hans Leidekker : bcrypt/tests: Link directly to functions available since Windows 7.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: e6da4eed7e14cc6f8ade7f179b32d9d668827385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6da4eed7e14cc6f8ade7f17… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 3 15:49:30 2021 +0100 bcrypt/tests: Link directly to functions available since Windows 7. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 886 +++++++++++++++++++++------------------------ 1 file changed, 405 insertions(+), 481 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6da4eed7e14cc6f8ade…

1 0

Rémi Bernon : dinput: Factor all type specific parameter handling together.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: d0fc7c96f34247c5ac301d152e675168e963a419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0fc7c96f34247c5ac301d15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 14:08:49 2021 +0100 dinput: Factor all type specific parameter handling together. The internal params cbTypeSpecificParams is assigned in SetParameters after validation, and contains the expected buffer size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 92 ++++++++++++---------------------------------- dlls/dinput8/tests/hid.c | 23 +++++++++++- 2 files changed, 46 insertions(+), 69 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 56ef9ef6ce2..682af063ff1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2412,46 +2412,14 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa if (flags & DIEP_TYPESPECIFICPARAMS) { - switch (impl->type) + capacity = params->cbTypeSpecificParams; + params->cbTypeSpecificParams = impl->params.cbTypeSpecificParams; + if (capacity < impl->params.cbTypeSpecificParams) return DIERR_MOREDATA; + if (impl->params.lpvTypeSpecificParams) { - case PID_USAGE_ET_SQUARE: - case PID_USAGE_ET_SINE: - case PID_USAGE_ET_TRIANGLE: - case PID_USAGE_ET_SAWTOOTH_UP: - case PID_USAGE_ET_SAWTOOTH_DOWN: - capacity = params->cbTypeSpecificParams; - params->cbTypeSpecificParams = sizeof(DIPERIODIC); - if (capacity < sizeof(DIPERIODIC)) return DIERR_MOREDATA; - if (!params->lpvTypeSpecificParams) return E_POINTER; - memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DIPERIODIC) ); - break; - case PID_USAGE_ET_SPRING: - case PID_USAGE_ET_DAMPER: - case PID_USAGE_ET_INERTIA: - case PID_USAGE_ET_FRICTION: - capacity = params->cbTypeSpecificParams; - params->cbTypeSpecificParams = impl->params.cbTypeSpecificParams; - if (capacity < impl->params.cbTypeSpecificParams) return DIERR_MOREDATA; if (!params->lpvTypeSpecificParams) return E_POINTER; - memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, params->cbTypeSpecificParams ); - break; - case PID_USAGE_ET_CONSTANT_FORCE: - capacity = params->cbTypeSpecificParams; - params->cbTypeSpecificParams = sizeof(DICONSTANTFORCE); - if (capacity < sizeof(DICONSTANTFORCE)) return DIERR_MOREDATA; - if (!params->lpvTypeSpecificParams) return E_POINTER; - memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) ); - break; - case PID_USAGE_ET_RAMP: - capacity = params->cbTypeSpecificParams; - params->cbTypeSpecificParams = sizeof(DIRAMPFORCE); - if (capacity < sizeof(DIRAMPFORCE)) return DIERR_MOREDATA; - if (!params->lpvTypeSpecificParams) return E_POINTER; - memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); - break; - case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME( "DIEP_TYPESPECIFICPARAMS not implemented!\n" ); - return DIERR_UNSUPPORTED; + memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, + impl->params.cbTypeSpecificParams ); } } @@ -2561,6 +2529,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa if (flags & DIEP_TYPESPECIFICPARAMS) { + if (!params->lpvTypeSpecificParams) return E_POINTER; switch (impl->type) { case PID_USAGE_ET_SQUARE: @@ -2568,49 +2537,36 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa case PID_USAGE_ET_TRIANGLE: case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: - if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DIPERIODIC)) return DIERR_INVALIDPARAM; - if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIPERIODIC) )) - impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIPERIODIC) ); - impl->params.cbTypeSpecificParams = sizeof(DIPERIODIC); + if (params->cbTypeSpecificParams != sizeof(DIPERIODIC)) + return DIERR_INVALIDPARAM; break; case PID_USAGE_ET_SPRING: case PID_USAGE_ET_DAMPER: case PID_USAGE_ET_INERTIA: case PID_USAGE_ET_FRICTION: - if ((count = impl->params.cAxes)) - { - if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != count * sizeof(DICONDITION) && - params->cbTypeSpecificParams != sizeof(DICONDITION)) - return DIERR_INVALIDPARAM; - if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, params->cbTypeSpecificParams )) - impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, params->cbTypeSpecificParams ); - impl->params.cbTypeSpecificParams = params->cbTypeSpecificParams; - } + if (params->cbTypeSpecificParams != sizeof(DICONDITION) && impl->params.cAxes && + params->cbTypeSpecificParams != impl->params.cAxes * sizeof(DICONDITION)) + return DIERR_INVALIDPARAM; break; case PID_USAGE_ET_CONSTANT_FORCE: - if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) return DIERR_INVALIDPARAM; - if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) )) - impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) ); - impl->params.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); + if (params->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) + return DIERR_INVALIDPARAM; break; case PID_USAGE_ET_RAMP: - if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; - if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) )) - impl->modified |= DIEP_TYPESPECIFICPARAMS; - memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); - impl->params.cbTypeSpecificParams = sizeof(DIRAMPFORCE); + if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) + return DIERR_INVALIDPARAM; break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME( "DIEP_TYPESPECIFICPARAMS not implemented!\n" ); + FIXME( "custom force data not implemented!\n" ); return DIERR_UNSUPPORTED; } + + if (memcmp( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, + params->cbTypeSpecificParams )) + impl->modified |= DIEP_TYPESPECIFICPARAMS; + memcpy( impl->params.lpvTypeSpecificParams, params->lpvTypeSpecificParams, + params->cbTypeSpecificParams ); + impl->params.cbTypeSpecificParams = params->cbTypeSpecificParams; } if ((flags & DIEP_ENVELOPE) && params->lpEnvelope) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 2411053390f..7759a8d05f1 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5981,7 +5981,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO check_member( desc, expect_desc_init, "%u", rgdwAxes[1] ); check_member( desc, expect_desc_init, "%p", rglDirection ); check_member( desc, expect_desc_init, "%p", lpEnvelope ); - todo_wine check_member( desc, expect_desc_init, "%u", cbTypeSpecificParams ); if (version >= 0x700) check_member( desc, expect_desc_init, "%u", dwStartDelay ); else ok( desc.dwStartDelay == 0xcdcdcdcd, "got dwStartDelay %#x\n", desc.dwStartDelay ); @@ -6900,6 +6899,28 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file, DW ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); set_hid_expect( file, NULL, 0 ); + + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Spring, NULL, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + desc = expect_desc; + desc.cAxes = 0; + desc.cbTypeSpecificParams = 1 * sizeof(DICONDITION); + desc.lpvTypeSpecificParams = (void *)&expect_condition[0]; + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_TYPESPECIFICPARAMS | DIEP_NODOWNLOAD ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + desc.cbTypeSpecificParams = 0 * sizeof(DICONDITION); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TYPESPECIFICPARAMS ); + ok( hr == DIERR_MOREDATA, "SetParameters returned %#x\n", hr ); + ok( desc.cbTypeSpecificParams == 1 * sizeof(DICONDITION), "got %u\n", desc.cbTypeSpecificParams ); + desc.cbTypeSpecificParams = 0 * sizeof(DICONDITION); + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_TYPESPECIFICPARAMS | DIEP_NODOWNLOAD ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + desc.cbTypeSpecificParams = 0 * sizeof(DICONDITION); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TYPESPECIFICPARAMS ); + ok( hr == DI_OK, "SetParameters returned %#x\n", hr ); + ok( desc.cbTypeSpecificParams == 0 * sizeof(DICONDITION), "got %u\n", desc.cbTypeSpecificParams ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); } static void test_force_feedback_joystick( DWORD version )

1 0