March 2014 - Wine-commits - list.winehq.org

Nikolay Sivov : qcap/tests: Check method return values (Coverity).
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: ddbcd24178455f108d510b22016dc0347cf53b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbcd24178455f108d510b220… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 16:07:11 2014 +0400 qcap/tests: Check method return values (Coverity). --- dlls/qcap/tests/qcap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 4ad4d7c..19177bd 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1055,9 +1055,12 @@ static HRESULT WINAPI MemInputPin_Receive(IMemInputPin *iface, IMediaSample *pSa REFERENCE_TIME off, tmp; LARGE_INTEGER li; BYTE *data; + HRESULT hr; - IMediaSample_GetTime(pSample, &off, &tmp); - IMediaSample_GetPointer(pSample, &data); + hr = IMediaSample_GetTime(pSample, &off, &tmp); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMediaSample_GetPointer(pSample, &data); + ok(hr == S_OK, "got 0x%08x\n", hr); li.QuadPart = off; IStream_Seek(avi_stream, li, STREAM_SEEK_SET, NULL); IStream_Write(avi_stream, data, IMediaSample_GetActualDataLength(pSample), NULL); @@ -1826,7 +1829,8 @@ static void test_AviMux(char *arg) ok(memalloc != &MemAllocator, "memalloc == &MemAllocator\n"); IMemAllocator_Release(memalloc); - CreateStreamOnHGlobal(NULL, TRUE, &avi_stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &avi_stream); + ok(hr == S_OK, "got 0x%08x\n", hr); SET_EXPECT(MediaSeeking_GetPositions); SET_EXPECT(MemInputPin_QueryInterface_IStream); hr = IBaseFilter_Run(avimux, 0);

1 0

Nikolay Sivov : msxml3/tests: Check return values (Coverity).
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 93bd41c3f79dc9a5a7dcdbd9217da0317b11ce87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93bd41c3f79dc9a5a7dcdbd92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 16:07:41 2014 +0400 msxml3/tests: Check return values (Coverity). --- dlls/msxml3/tests/domdoc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dd40133..aaa895a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6077,7 +6077,8 @@ static void test_save(void) hr = IXMLDOMDocument_loadXML(doc, _bstr_("<a/>"), &b); EXPECT_HR(hr, S_OK); - CreateStreamOnHGlobal(NULL, TRUE, &stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); V_VT(&dest) = VT_UNKNOWN; V_UNKNOWN(&dest) = (IUnknown*)stream; hr = IXMLDOMDocument_save(doc, dest); @@ -8417,7 +8418,8 @@ todo_wine { hr = IXSLProcessor_put_output(processor, v); ok(hr == S_OK, "got 0x%08x\n", hr); - CreateStreamOnHGlobal(NULL, TRUE, &stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(stream, 1); V_VT(&v) = VT_UNKNOWN; @@ -10316,7 +10318,8 @@ static void test_dispex(void) doc = create_document(&IID_IXMLDOMDocument); - IXMLDOMDocument_QueryInterface(doc, &IID_IUnknown, (void**)&unk); + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); test_domobj_dispex(unk); IUnknown_Release(unk); @@ -10349,7 +10352,8 @@ static void test_dispex(void) /* IXMLDOMNodeList for children list */ hr = IXMLDOMDocument_get_childNodes(doc, &node_list); EXPECT_HR(hr, S_OK); - IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); test_domobj_dispex(unk); IUnknown_Release(unk);

1 0

Francois Gouget : wbemprox/tests: Make test_GetNames() static.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 1eb2e8b3e142a4fe99e20c59aecc33f3d0e3da58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb2e8b3e142a4fe99e20c59a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 31 11:25:54 2014 +0200 wbemprox/tests: Make test_GetNames() static. --- dlls/wbemprox/tests/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e99e4ea..d244dad 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -616,7 +616,7 @@ static void test_query_async( IWbemServices *services ) SysFreeString( query ); } -void test_GetNames( IWbemServices *services ) +static void test_GetNames( IWbemServices *services ) { static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_',

1 0

Francois Gouget : netcfgx/tests: Make create_configuration() static.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 16b94cdd23e90c88fea2621d90bbd88ac5ec33d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b94cdd23e90c88fea2621d9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 31 11:26:04 2014 +0200 netcfgx/tests: Make create_configuration() static. --- dlls/netcfgx/tests/netcfgx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 2a9f0eb..084f8cd 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -23,7 +23,7 @@ #include "netcfgx.h" #include "wine/test.h" -void create_configuration(void) +static void create_configuration(void) { static const WCHAR tcpipW[] = {'M','S','_','T','C','P','I','P',0}; static const WCHAR myclient[] = {'M','Y',' ','C','L','I','E','N','T',0};

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: c810f07f4012bce7ee4dd4d307571ca0be68c994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c810f07f4012bce7ee4dd4d30… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Mar 29 15:04:42 2014 +0100 po: Update German translation. --- po/de.po | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/po/de.po b/po/de.po index 35a2455..7939791 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-02 22:42+0100\n" +"PO-Revision-Date: 2014-03-29 15:03+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -6593,10 +6593,8 @@ msgid "The username could not be found.\n" msgstr "Der Benutzername konnte nicht gefunden werden.\n" #: winerror.mc:3741 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "Die Seite existiert nicht.\n" +msgstr "Diese Netzwerkverbindung existiert nicht.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -11752,6 +11750,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL-Registrierungsserver\n" +"\n" +"Stellt Dienste zur DLL-Registrierung bereit.\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11766,54 +11768,65 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Aufruf:\n" +" regsvr32 [/u] [/s] [/n] [/i[:Befehlszeile]] DllName\n" +"\n" +"Optionen:\n" +" [/u] Registrierung eines Moduls vom Server aufheben.\n" +" [/s] Stiller Modus (es werden keine Meldungen angezeigt).\n" +" [/i] DllInstall mit einer optionalen [Befehlszeile] aufrufen.\n" +"\tBei Angabe von [/u], ruft regsvr32 auch DLL Uninstall auf.\n" +" [/n] DllRegisterServer nicht aufrufen. Muss in Verbindung mit [/i]\n" +"\tbenutzt werden.\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: Ungültiges oder nicht erkanntes Argument [%1]\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "'%1' konnte nicht geöffnet werden\n" +msgstr "regsvr32: DLL '%1' konnte nicht geladen werden\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: %1 nicht in DLL '%2' implementiert\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' konnte nicht registriert werden\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' erfolgreich registriert\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Registrierung von DLL '%1' konnte nicht aufgehoben werden\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Registrierung von DLL '%1' erfolgreich aufgehoben\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' konnte nicht installiert werden\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' erfolgreich installiert\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' konnte nicht deinstalliert werden\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' erfolgreich deinstalliert\n" #: start.rc:55 msgid ""

1 0

Thomas Faber : advapi32: Fix stack corruption in CredIsMarshaledCredentialW.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: f9fae1b3f619a5ff70cdf397dcbba197d64a10d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9fae1b3f619a5ff70cdf397d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Dec 20 00:17:35 2013 +0100 advapi32: Fix stack corruption in CredIsMarshaledCredentialW. In its currrent implementation, cred_decode with input length 6 writes 6 bytes to the output buffer. This overflows the DWORD passed in CredIsMarshaledCredentialW. --- dlls/advapi32/cred.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 3bfc885..f407c0d 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -2049,7 +2049,6 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) buf[i + 0] = (c1 << 6) | c0; buf[i + 1] = (c2 << 4) | (c1 >> 2); - buf[i + 2] = c2 >> 4; } else if (len == 2) { @@ -2057,16 +2056,10 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) if ((c1 = char_decode( p[1] )) > 63) return FALSE; buf[i + 0] = (c1 << 6) | c0; - buf[i + 1] = c1 >> 2; - buf[i + 2] = 0; } else if (len == 1) { - if ((c0 = char_decode( p[0] )) > 63) return FALSE; - - buf[i + 0] = c0; - buf[i + 1] = 0; - buf[i + 2] = 0; + return FALSE; } return TRUE; } @@ -2090,7 +2083,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO { case CertCredential: { - char hash[CERT_HASH_LENGTH + 2]; + char hash[CERT_HASH_LENGTH]; CERT_CREDENTIAL_INFO *cert; if (len != 27 || !cred_decode( cred + 3, len, hash )) @@ -2108,7 +2101,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO case UsernameTargetCredential: { USERNAME_TARGET_CREDENTIAL_INFO *target; - ULONGLONG size = 0; + DWORD size; if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR) || size > INT_MAX) @@ -2157,7 +2150,7 @@ BOOL WINAPI CredIsMarshaledCredentialW(LPCWSTR name) if (name && name[0] == '@' && name[1] == '@' && name[2] > 'A' && name[3]) { - char hash[CERT_HASH_LENGTH + 2]; + char hash[CERT_HASH_LENGTH]; int len = strlenW(name + 3 ); DWORD size;

1 0

Thomas Faber : advapi32: Remove unnecessary buffer copy in CredMarshalCredentialW.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 0868486d179bdce1c4b29e1c596d9d24d00253cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0868486d179bdce1c4b29e1c5… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Mar 29 11:08:34 2014 +0100 advapi32: Remove unnecessary buffer copy in CredMarshalCredentialW. --- dlls/advapi32/cred.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index f407c0d..2d98ecc 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -1952,18 +1952,13 @@ BOOL WINAPI CredMarshalCredentialW( CRED_MARSHAL_TYPE type, PVOID cred, LPWSTR * { case CertCredential: { - char hash[CERT_HASH_LENGTH + 2]; - - memcpy( hash, cert->rgbHashOfCert, sizeof(cert->rgbHashOfCert) ); - memset( hash + sizeof(cert->rgbHashOfCert), 0, sizeof(hash) - sizeof(cert->rgbHashOfCert) ); - - size = sizeof(hash) * 4 / 3; + size = (sizeof(cert->rgbHashOfCert) + 2) * 4 / 3; if (!(p = HeapAlloc( GetProcessHeap(), 0, (size + 4) * sizeof(WCHAR) ))) return FALSE; p[0] = '@'; p[1] = '@'; p[2] = 'A' + type; - len = cred_encode( (const char *)hash, sizeof(hash), p + 3 ); - p[len] = 0; + len = cred_encode( (const char *)cert->rgbHashOfCert, sizeof(cert->rgbHashOfCert), p + 3 ); + p[len + 3] = 0; break; } case UsernameTargetCredential:

1 0

Thomas Faber : advapi32/tests: Use a loop for CredUnmarshalCredential test cases.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 27c8e9013f3148d34401de66c90d64a5dcdf8a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c8e9013f3148d34401de66c… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Dec 19 00:20:27 2013 +0100 advapi32/tests: Use a loop for CredUnmarshalCredential test cases. --- dlls/advapi32/tests/cred.c | 120 +++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 59d4bbb..e65a605 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -563,14 +563,31 @@ static void test_CredMarshalCredentialA(void) static void test_CredUnmarshalCredentialA(void) { + static const UCHAR cert_empty[CERT_HASH_LENGTH] = {0}; + static const UCHAR cert_wine[CERT_HASH_LENGTH] = {'W','i','n','e',0}; static const WCHAR tW[] = {'t',0}; static const WCHAR testW[] = {'t','e','s','t',0}; + void *p; CERT_CREDENTIAL_INFO *cert; + const UCHAR *hash; USERNAME_TARGET_CREDENTIAL_INFO *username; CRED_MARSHAL_TYPE type; - unsigned int i; + unsigned int i, j; DWORD error; BOOL ret; + const struct { + const char *cred; + CRED_MARSHAL_TYPE type; + const void *unmarshaled; + } tests[] = { + { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_empty }, + { "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_wine }, + { "@@CAAAAAA", UsernameTargetCredential, NULL }, + { "@@CAAAAAA0BA", UsernameTargetCredential, NULL }, + { "@@CCAAAAA0BA", UsernameTargetCredential, tW }, + { "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW }, + { "@@CA-----0BQZAMHA0BA", UsernameTargetCredential, NULL }, + }; SetLastError( 0xdeadbeef ); ret = pCredUnmarshalCredentialA( NULL, NULL, NULL ); @@ -615,69 +632,46 @@ static void test_CredUnmarshalCredentialA(void) ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); } - type = 0; - cert = NULL; - ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", &type, (void **)&cert ); - ok( ret, "unexpected failure %u\n", GetLastError() ); - ok( type == CertCredential, "got %u\n", type ); - ok( cert != NULL, "cert is NULL\n" ); - ok( cert->cbSize == sizeof(*cert), "wrong size %u\n", cert->cbSize ); - for (i = 0; i < sizeof(cert->rgbHashOfCert); i++) ok( !cert->rgbHashOfCert[i], "wrong data\n" ); - pCredFree( cert ); - - type = 0; - cert = NULL; - ret = pCredUnmarshalCredentialA( "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", &type, (void **)&cert ); - ok( ret, "unexpected failure %u\n", GetLastError() ); - ok( type == CertCredential, "got %u\n", type ); - ok( cert != NULL, "cert is NULL\n" ); - ok( cert->cbSize == sizeof(*cert), "wrong size %u\n", cert->cbSize ); - ok( cert->rgbHashOfCert[0] == 'W', "wrong data)\n" ); - ok( cert->rgbHashOfCert[1] == 'i', "wrong data\n" ); - ok( cert->rgbHashOfCert[2] == 'n', "wrong data\n" ); - ok( cert->rgbHashOfCert[3] == 'e', "wrong data\n" ); - for (i = 4; i < sizeof(cert->rgbHashOfCert); i++) ok( !cert->rgbHashOfCert[i], "wrong data\n" ); - pCredFree( cert ); - - SetLastError( 0xdeadbeef ); - ret = pCredUnmarshalCredentialA( "@@CAAAAAA", &type, (void **)&username ); - error = GetLastError(); - ok( !ret, "unexpected success\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); - - SetLastError( 0xdeadbeef ); - ret = pCredUnmarshalCredentialA( "@@CAAAAAA0BA", &type, (void **)&username ); - error = GetLastError(); - ok( !ret, "unexpected success\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); - - type = 0; - username = NULL; - ret = pCredUnmarshalCredentialA( "@@CCAAAAA0BA", &type, (void **)&username ); - ok( ret, "unexpected failure %u\n", GetLastError() ); - ok( type == UsernameTargetCredential, "got %u\n", type ); - ok( username != NULL, "username is NULL\n" ); - ok( username->UserName != NULL, "UserName is NULL\n" ); - ok( !lstrcmpW( username->UserName, tW ), "got %s\n", wine_dbgstr_w(username->UserName) ); - pCredFree( username ); - - type = 0; - username = NULL; - ret = pCredUnmarshalCredentialA( "@@CIAAAAA0BQZAMHA0BA", &type, (void **)&username ); - ok( ret, "unexpected failure %u\n", GetLastError() ); - ok( type == UsernameTargetCredential, "got %u\n", type ); - ok( username != NULL, "username is NULL\n" ); - ok( username->UserName != NULL, "UserName is NULL\n" ); - ok( !lstrcmpW( username->UserName, testW ), "got %s\n", wine_dbgstr_w(username->UserName) ); - pCredFree( username ); + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + SetLastError(0xdeadbeef); + type = 0; + p = NULL; + ret = pCredUnmarshalCredentialA(tests[i].cred, &type, &p); + error = GetLastError(); + if (tests[i].unmarshaled) + { + ok(ret, "[%u] unexpected failure %u\n", i, error); + ok(type == tests[i].type, "[%u] got %u\n", i, type); + ok(p != NULL, "[%u] returned pointer is NULL\n", i); + if (tests[i].type == CertCredential) + { + cert = p; + hash = tests[i].unmarshaled; + ok(cert->cbSize == sizeof(*cert), + "[%u] wrong size %u\n", i, cert->cbSize); + for (j = 0; j < sizeof(cert->rgbHashOfCert); j++) + ok(cert->rgbHashOfCert[j] == hash[j], "[%u] wrong data\n", i); + } + else if (tests[i].type == UsernameTargetCredential) + { + username = p; + ok(username->UserName != NULL, "[%u] UserName is NULL\n", i); + ok(!lstrcmpW(username->UserName, tests[i].unmarshaled), + "[%u] got %s\n", i, wine_dbgstr_w(username->UserName)); + } + } + else + { + ok(!ret, "[%u] unexpected success\n", i); + ok(error == ERROR_INVALID_PARAMETER, "[%u] got %u\n", i, error); + todo_wine ok(type == tests[i].type, "[%u] got %u\n", i, type); + ok(p == NULL, "[%u] returned pointer is not NULL\n", i); + } - type = 0; - username = NULL; - SetLastError( 0xdeadbeef ); - ret = pCredUnmarshalCredentialA( "@@CA-----0BQZAMHA0BA", &type, (void **)&username ); - error = GetLastError(); - ok( !ret, "unexpected success\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + if (ret) + pCredFree(p); + } } static void test_CredIsMarshaledCredentialA(void)

1 0

Thomas Faber : advapi32: Set output type earlier in CredUnmarshalCredential.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 309b5366e88a5451a7e4c583ecd445ece760f7c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=309b5366e88a5451a7e4c583e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Mar 29 10:18:22 2014 +0100 advapi32: Set output type earlier in CredUnmarshalCredential. --- dlls/advapi32/cred.c | 11 ++++++----- dlls/advapi32/tests/cred.c | 26 +++++++++++++++++--------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 2d98ecc..9ecfaee 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -2068,13 +2068,15 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO TRACE("%s, %p, %p\n", debugstr_w(cred), type, out); - if (!cred || cred[0] != '@' || cred[1] != '@' || !cred[2] || !cred[3]) + if (!cred || cred[0] != '@' || cred[1] != '@' || + char_decode( cred[2] ) > 63) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } len = strlenW( cred + 3 ); - switch (cred[2] - 'A') + *type = char_decode( cred[2] ); + switch (*type) { case CertCredential: { @@ -2089,7 +2091,6 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO if (!(cert = HeapAlloc( GetProcessHeap(), 0, sizeof(*cert) ))) return FALSE; memcpy( cert->rgbHashOfCert, hash, sizeof(cert->rgbHashOfCert) ); cert->cbSize = sizeof(*cert); - *type = CertCredential; *out = cert; break; } @@ -2113,7 +2114,6 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO } target->UserName = (WCHAR *)(target + 1); target->UserName[size / sizeof(WCHAR)] = 0; - *type = UsernameTargetCredential; *out = target; break; } @@ -2121,7 +2121,8 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO FIXME("BinaryBlobCredential not implemented\n"); return FALSE; default: - WARN("unhandled type %u\n", cred[2] - 'A'); + WARN("unhandled type %u\n", *type); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } return TRUE; diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index e65a605..de05e30 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -580,9 +580,25 @@ static void test_CredUnmarshalCredentialA(void) CRED_MARSHAL_TYPE type; const void *unmarshaled; } tests[] = { + { "", 0, NULL }, + { "@", 0, NULL }, + { "@@", 0, NULL }, + { "@@@", 0, NULL }, + { "@@A", 0, NULL }, + { "@@E", 4, NULL }, + { "@@Z", 25, NULL }, + { "@@a", 26, NULL }, + { "@@0", 52, NULL }, + { "@@#", 62, NULL }, + { "@@-", 63, NULL }, + { "@@B", CertCredential, NULL }, + { "@@BA", CertCredential, NULL }, { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_empty }, { "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_wine }, + { "@@C", UsernameTargetCredential, NULL }, + { "@@CA", UsernameTargetCredential, NULL }, { "@@CAAAAAA", UsernameTargetCredential, NULL }, + { "@@CAAAAAA0B", UsernameTargetCredential, NULL }, { "@@CAAAAAA0BA", UsernameTargetCredential, NULL }, { "@@CCAAAAA0BA", UsernameTargetCredential, tW }, { "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW }, @@ -610,14 +626,6 @@ static void test_CredUnmarshalCredentialA(void) ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); - type = 0; - cert = NULL; - SetLastError( 0xdeadbeef ); - ret = pCredUnmarshalCredentialA( "", &type, (void **)&cert ); - error = GetLastError(); - ok( !ret, "unexpected success\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); - if (0) { /* crash */ SetLastError( 0xdeadbeef ); ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", &type, NULL ); @@ -665,7 +673,7 @@ static void test_CredUnmarshalCredentialA(void) { ok(!ret, "[%u] unexpected success\n", i); ok(error == ERROR_INVALID_PARAMETER, "[%u] got %u\n", i, error); - todo_wine ok(type == tests[i].type, "[%u] got %u\n", i, type); + ok(type == tests[i].type, "[%u] got %u\n", i, type); ok(p == NULL, "[%u] returned pointer is not NULL\n", i); }

1 0

Thomas Faber : advapi32: Fix uneven length handling in CredUnmarshalCredential.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 6754c35589709c033d30ca593de90fa55f25b4e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6754c35589709c033d30ca593… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Mar 28 10:21:06 2014 +0100 advapi32: Fix uneven length handling in CredUnmarshalCredential. --- dlls/advapi32/cred.c | 2 +- dlls/advapi32/tests/cred.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 9ecfaee..fdd5645 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -2100,7 +2100,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO DWORD size; if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || - !size || size % sizeof(WCHAR) || size > INT_MAX) + size % sizeof(WCHAR) || len - 6 != (size * 4 + 2) / 3) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index de05e30..0ee08ef 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -566,6 +566,8 @@ static void test_CredUnmarshalCredentialA(void) static const UCHAR cert_empty[CERT_HASH_LENGTH] = {0}; static const UCHAR cert_wine[CERT_HASH_LENGTH] = {'W','i','n','e',0}; static const WCHAR tW[] = {'t',0}; + static const WCHAR teW[] = {'t','e',0}; + static const WCHAR tesW[] = {'t','e','s',0}; static const WCHAR testW[] = {'t','e','s','t',0}; void *p; CERT_CREDENTIAL_INFO *cert; @@ -593,6 +595,8 @@ static void test_CredUnmarshalCredentialA(void) { "@@-", 63, NULL }, { "@@B", CertCredential, NULL }, { "@@BA", CertCredential, NULL }, + { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, NULL }, + { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, NULL }, { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_empty }, { "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_wine }, { "@@C", UsernameTargetCredential, NULL }, @@ -601,6 +605,20 @@ static void test_CredUnmarshalCredentialA(void) { "@@CAAAAAA0B", UsernameTargetCredential, NULL }, { "@@CAAAAAA0BA", UsernameTargetCredential, NULL }, { "@@CCAAAAA0BA", UsernameTargetCredential, tW }, + { "@@CEAAAAA0BA", UsernameTargetCredential, NULL }, + { "@@CEAAAAA0BAd", UsernameTargetCredential, NULL }, + { "@@CEAAAAA0BAdA", UsernameTargetCredential, NULL }, + { "@@CEAAAAA0BQZAA", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAQ", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAg", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAw", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAAA", UsernameTargetCredential, NULL }, + { "@@CGAAAAA0BQZAMH", UsernameTargetCredential, NULL }, + { "@@CGAAAAA0BQZAMHA", UsernameTargetCredential, tesW }, + { "@@CGAAAAA0BQZAMHAA", UsernameTargetCredential, NULL }, + { "@@CCAAAAA0BAA", UsernameTargetCredential, NULL }, + { "@@CBAAAAA0BAA", UsernameTargetCredential, NULL }, + { "@@CAgAAAA0BAA", UsernameTargetCredential, NULL }, { "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW }, { "@@CA-----0BQZAMHA0BA", UsernameTargetCredential, NULL }, };

1 0