June 2018 - Wine-commits - list.winehq.org

Michael Müller : crypt32/tests: Add a basic test for ecdsa oid.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 3b168abc1605d49d10b3fb7d7397f6e287a7a8d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b168abc1605d49d10b3fb7d… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 22 16:26:54 2018 +0300 crypt32/tests: Add a basic test for ecdsa oid. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/oid.c | 31 +++++++++++++++++++++++++++++++ include/wincrypt.h | 15 +++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 0e14423..00a6d54 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -22,6 +22,7 @@ #include <windef.h> #include <winbase.h> #include <winerror.h> +#define CRYPT_OID_INFO_HAS_EXTRA_FIELDS #include <wincrypt.h> #include <winreg.h> @@ -543,8 +544,10 @@ static void test_enumOIDInfo(void) static void test_findOIDInfo(void) { + static WCHAR sha256ECDSA[] = { 's','h','a','2','5','6','E','C','D','S','A',0 }; static WCHAR sha1[] = { 's','h','a','1',0 }; static CHAR oid_rsa_md5[] = szOID_RSA_MD5, oid_sha256[] = szOID_NIST_sha256; + static CHAR oid_ecdsa_sha256[] = szOID_ECDSA_SHA256; ALG_ID alg = CALG_SHA1; ALG_ID algs[2] = { CALG_MD5, CALG_RSA_SIGN }; const struct oid_info @@ -581,6 +584,34 @@ static void test_findOIDInfo(void) "Unexpected Algid %d, expected %d\n", U(*info).Algid, test->algid); } } + + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, oid_ecdsa_sha256, 0); + if (info) + { + DWORD *data; + + ok(info->cbSize == sizeof(*info), "Unexpected structure size %d.\n", info->cbSize); + ok(!strcmp(info->pszOID, oid_ecdsa_sha256), "Expected %s, got %s\n", oid_ecdsa_sha256, info->pszOID); + ok(!lstrcmpW(info->pwszName, sha256ECDSA), "Expected %s, got %s\n", + wine_dbgstr_w(sha256ECDSA), wine_dbgstr_w(info->pwszName)); + ok(info->dwGroupId == CRYPT_SIGN_ALG_OID_GROUP_ID, + "Expected CRYPT_SIGN_ALG_OID_GROUP_ID, got %u\n", info->dwGroupId); + ok(U(*info).Algid == CALG_OID_INFO_CNG_ONLY, + "Expected CALG_OID_INFO_CNG_ONLY, got %d\n", U(*info).Algid); + + data = (DWORD *)info->ExtraInfo.pbData; + ok(info->ExtraInfo.cbData == 8, "Expected 8, got %d\n", info->ExtraInfo.cbData); + ok(data[0] == CALG_OID_INFO_PARAMETERS, "Expected CALG_OID_INFO_PARAMETERS, got %x\n", data[0]); + ok(data[1] == CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG, + "Expected CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG, got %x\n", data[1]); + + ok(!lstrcmpW(info->pwszCNGAlgid, BCRYPT_SHA256_ALGORITHM), "Expected %s, got %s\n", + wine_dbgstr_w(BCRYPT_SHA256_ALGORITHM), wine_dbgstr_w(info->pwszCNGAlgid)); + ok(!lstrcmpW(info->pwszCNGExtraAlgid, CRYPT_OID_INFO_ECC_PARAMETERS_ALGORITHM), "Expected %s, got %s\n", + wine_dbgstr_w(CRYPT_OID_INFO_ECC_PARAMETERS_ALGORITHM), wine_dbgstr_w(info->pwszCNGExtraAlgid)); + } + else + todo_wine win_skip("Host does not support ECDSA_SHA256, skipping test\n"); } START_TEST(oid) diff --git a/include/wincrypt.h b/include/wincrypt.h index a7c24e7..373acac 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1244,6 +1244,17 @@ typedef BOOL (WINAPI *PFN_CRYPT_ENUM_OID_FUNC)(DWORD dwEncodingType, #define CRYPT_MATCH_ANY_ENCODING_TYPE 0xffffffff +#define CALG_OID_INFO_CNG_ONLY 0xffffffff +#define CALG_OID_INFO_PARAMETERS 0xfffffffe + +#define CRYPT_OID_INFO_HASH_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','H','a','s','h','P','a','r','a','m','e','t','e','r','s',0} +#define CRYPT_OID_INFO_ECC_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','E','C','C','P','a','r','a','m','e','t','e','r','s',0} +#define CRYPT_OID_INFO_MGF1_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','M','g','f','1','P','a','r','a','m','e','t','e','r','s',0} +#define CRYPT_OID_INFO_NO_SIGN_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','N','o','S','i','g','n',0} +#define CRYPT_OID_INFO_OAEP_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','O','A','E','P','P','a','r','a','m','e','t','e','r','s',0} +#define CRYPT_OID_INFO_ECC_WRAP_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','E','C','C','W','r','a','p','P','a','r','a','m','e','t','e','r','s',0} +#define CRYPT_OID_INFO_NO_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','N','o','P','a','r','a','m','e','t','e','r','s',0} + typedef struct _CRYPT_OID_INFO { DWORD cbSize; LPCSTR pszOID; @@ -1255,6 +1266,10 @@ typedef struct _CRYPT_OID_INFO { DWORD dwLength; } DUMMYUNIONNAME; CRYPT_DATA_BLOB ExtraInfo; +#ifdef CRYPT_OID_INFO_HAS_EXTRA_FIELDS + LPCWSTR pwszCNGAlgid; + LPCWSTR pwszCNGExtraAlgid; +#endif } CRYPT_OID_INFO, *PCRYPT_OID_INFO; typedef const CRYPT_OID_INFO CCRYPT_OID_INFO, *PCCRYPT_OID_INFO;

1 0

Michael Müller : crypt32: Add oids for sha256ECDSA and sha384ECDSA.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 224e3f43e9ac0fd45b2e2f8cfb06a592eb589b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=224e3f43e9ac0fd45b2e2f8c… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 22 16:26:55 2018 +0300 crypt32: Add oids for sha256ECDSA and sha384ECDSA. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/oid.c | 15 +++++++++++++++ dlls/crypt32/tests/oid.c | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 61b2cbc..c9b0b41 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -25,6 +25,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#define CRYPT_OID_INFO_HAS_EXTRA_FIELDS #include "wincrypt.h" #include "winreg.h" #include "winuser.h" @@ -1080,6 +1081,8 @@ static const WCHAR sha384RSA[] = { 's','h','a','3','8','4','R','S','A',0 }; static const WCHAR sha512RSA[] = { 's','h','a','5','1','2','R','S','A',0 }; static const WCHAR mosaicUpdatedSig[] = { 'm','o','s','a','i','c','U','p','d','a','t','e','d','S','i','g',0 }; +static const WCHAR sha256ECDSA[] = { 's','h','a','2','5','6','E','C','D','S','A',0 }; +static const WCHAR sha384ECDSA[] = { 's','h','a','3','8','4','E','C','D','S','A',0 }; static const WCHAR CN[] = { 'C','N',0 }; static const WCHAR L[] = { 'L',0 }; static const WCHAR O[] = { 'O',0 }; @@ -1126,12 +1129,14 @@ static const DWORD dssSign[2] = { CALG_DSS_SIGN, static const DWORD mosaicSign[2] = { CALG_DSS_SIGN, CRYPT_OID_INHIBIT_SIGNATURE_FORMAT_FLAG | CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG }; +static const DWORD ecdsaSign[2] = { CALG_OID_INFO_PARAMETERS, CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG }; static const CRYPT_DATA_BLOB rsaSignBlob = { sizeof(rsaSign), (LPBYTE)&rsaSign }; static const CRYPT_DATA_BLOB dssSignBlob = { sizeof(dssSign), (LPBYTE)dssSign }; static const CRYPT_DATA_BLOB mosaicSignBlob = { sizeof(mosaicSign), (LPBYTE)mosaicSign }; +static const CRYPT_DATA_BLOB ecdsaSignBlob = { sizeof(ecdsaSign), (BYTE *)ecdsaSign }; static const DWORD ia5String[] = { CERT_RDN_IA5_STRING, 0 }; static const DWORD numericString[] = { CERT_RDN_NUMERIC_STRING, 0 }; @@ -1153,6 +1158,8 @@ static const struct OIDInfoConstructor { UINT Algid; LPCWSTR pwszName; const CRYPT_DATA_BLOB *blob; + const WCHAR *pwszCNGAlgid; + const WCHAR *pwszCNGExtraAlgid; } oidInfoConstructors[] = { { 1, szOID_OIWSEC_sha1, CALG_SHA1, sha1, NULL }, { 1, szOID_OIWSEC_sha1, CALG_SHA1, sha, NULL }, @@ -1208,6 +1215,10 @@ static const struct OIDInfoConstructor { { 4, szOID_OIWSEC_dsaSHA1, CALG_SHA1, dsaSHA1, &dssSignBlob }, { 4, szOID_INFOSEC_mosaicUpdatedSig, CALG_SHA1, mosaicUpdatedSig, &mosaicSignBlob }, + { 4, szOID_ECDSA_SHA256, CALG_OID_INFO_CNG_ONLY, sha256ECDSA, &ecdsaSignBlob, + BCRYPT_SHA256_ALGORITHM, CRYPT_OID_INFO_ECC_PARAMETERS_ALGORITHM }, + { 4, szOID_ECDSA_SHA384, CALG_OID_INFO_CNG_ONLY, sha384ECDSA, &ecdsaSignBlob, + BCRYPT_SHA384_ALGORITHM, CRYPT_OID_INFO_ECC_PARAMETERS_ALGORITHM }, { 5, szOID_COMMON_NAME, 0, CN, NULL }, { 5, szOID_LOCALITY_NAME, 0, L, NULL }, @@ -1422,6 +1433,8 @@ static void init_oid_info(void) info->info.ExtraInfo.pbData = oidInfoConstructors[i].blob->pbData; } + info->info.pwszCNGAlgid = oidInfoConstructors[i].pwszCNGAlgid; + info->info.pwszCNGExtraAlgid = oidInfoConstructors[i].pwszCNGExtraAlgid; list_add_tail(&oidInfo, &info->entry); } } @@ -1454,6 +1467,8 @@ static void init_oid_info(void) info->info.ExtraInfo.pbData = oidInfoConstructors[i].blob->pbData; } + info->info.pwszCNGAlgid = oidInfoConstructors[i].pwszCNGAlgid; + info->info.pwszCNGExtraAlgid = oidInfoConstructors[i].pwszCNGExtraAlgid; list_add_tail(&oidInfo, &info->entry); } } diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 00a6d54..0582247 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -611,7 +611,7 @@ static void test_findOIDInfo(void) wine_dbgstr_w(CRYPT_OID_INFO_ECC_PARAMETERS_ALGORITHM), wine_dbgstr_w(info->pwszCNGExtraAlgid)); } else - todo_wine win_skip("Host does not support ECDSA_SHA256, skipping test\n"); + win_skip("Host does not support ECDSA_SHA256, skipping test\n"); } START_TEST(oid)

1 0

Zebediah Figura : psapi/tests: Add todo_wine to a failing test.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: a47332ae17863390f745287c285a092e1659a37c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a47332ae17863390f745287c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 22 09:46:26 2018 -0500 psapi/tests: Add todo_wine to a failing test. This test was based on an implementation of K32EnumProcessModules() which was later rewritten. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 0ff212c..ec74716 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -229,6 +229,7 @@ todo_wine SetLastError(0xdeadbeef); ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); ok(!ret, "got %d\n", ret); +todo_wine ok(GetLastError() == ERROR_PARTIAL_COPY, "got error %u\n", GetLastError()); TerminateProcess(pi.hProcess, 0);

1 0

Józef Kucia : shell32: Accept more flags in SHGetKnownFolderPath().
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: ff7c2c51718e8f64c9b708847f3a322bd136eb75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff7c2c51718e8f64c9b70884… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 22 13:34:00 2018 +0200 shell32: Accept more flags in SHGetKnownFolderPath(). KF_FLAG_SIMPLE_IDLIST | KF_FLAG_DONT_UNEXPAND doesn't seem to influence results returned by SHGetKnownFolderPath(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index a551e93..de4bf7d 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4885,8 +4885,8 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t if (folder < 0) return HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); - if (flags & ~(KF_FLAG_CREATE|KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS| - KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH)) + if (flags & ~(KF_FLAG_CREATE|KF_FLAG_SIMPLE_IDLIST|KF_FLAG_DONT_UNEXPAND| + KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH)) { FIXME("flags 0x%08x not supported\n", flags); return E_INVALIDARG;

1 0

Józef Kucia : shell32/tests: Reorder known_folders table definition.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: bd459ad0155295e86280b2ef3f597695cbe6cd29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd459ad0155295e86280b2ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 22 13:34:01 2018 +0200 shell32/tests: Reorder known_folders table definition. To use it in other tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 1234 ++++++++++++++++++++-------------------- 1 file changed, 617 insertions(+), 617 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd459ad0155295e86280…

1 0

Józef Kucia : shell32/tests: Add tests for SHGetKnownFolderPath() flags.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 0304a312ede6690481fd9327bd95c2e8785ef327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0304a312ede6690481fd9327… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 22 13:34:02 2018 +0200 shell32/tests: Add tests for SHGetKnownFolderPath() flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 736cd3b..a578423 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1842,8 +1842,9 @@ static void test_NonExistentPath(void) static void test_SHGetFolderPathEx(void) { + WCHAR buffer[MAX_PATH], *path, *path2; + unsigned int i; HRESULT hr; - WCHAR buffer[MAX_PATH], *path; DWORD len; if (!pSHGetKnownFolderPath || !pSHGetFolderPathEx) @@ -1868,6 +1869,44 @@ if (0) { /* crashes */ ok(path != NULL, "expected path != NULL\n"); CoTaskMemFree(path); + for (i = 0; i < ARRAY_SIZE(known_folders); ++i) + { + const KNOWNFOLDERID *folder_id = known_folders[i].folderId; + + if (!folder_id) + continue; + + path = NULL; + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT, NULL, &path); + if (FAILED(hr)) + continue; + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path != NULL, "expected path != NULL\n"); + + path2 = NULL; + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_SIMPLE_IDLIST, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path != NULL, "expected path != NULL\n"); + ok(!lstrcmpiW(path, path2), "expected equal paths: %s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(path2)); + CoTaskMemFree(path2); + + path2 = NULL; + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DONT_UNEXPAND, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path2 != NULL, "expected path != NULL\n"); + ok(!lstrcmpiW(path, path2), "expected equal paths: %s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(path2)); + CoTaskMemFree(path2); + + path2 = NULL; + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_SIMPLE_IDLIST | KF_FLAG_DONT_UNEXPAND, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path2 != NULL, "expected path != NULL\n"); + ok(!lstrcmpiW(path, path2), "expected equal paths: %s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(path2)); + CoTaskMemFree(path2); + + CoTaskMemFree(path); + } + path = NULL; hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &path); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr);

1 0

Józef Kucia : shell32/tests: Remove empty element from known_folders[].
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: a8b0a822fff265a90659eef14059377a4c48f323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8b0a822fff265a90659eef1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 22 13:34:03 2018 +0200 shell32/tests: Remove empty element from known_folders[]. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index a578423..bac64e5 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1306,10 +1306,9 @@ static const struct knownFolderDef known_folders[] = { NULL, 0, 0), - { 0 } }; #undef KNOWN_FOLDER -BOOL known_folder_found[ARRAY_SIZE(known_folders)-1]; +BOOL known_folder_found[ARRAY_SIZE(known_folders)]; static void test_parameters(void) { @@ -1873,9 +1872,6 @@ if (0) { /* crashes */ { const KNOWNFOLDERID *folder_id = known_folders[i].folderId; - if (!folder_id) - continue; - path = NULL; hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT, NULL, &path); if (FAILED(hr)) @@ -1968,19 +1964,20 @@ static BOOL is_in_strarray(const WCHAR *needle, const char *hay) static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId) { HRESULT hr; - const struct knownFolderDef *known_folder = &known_folders[0]; int csidl, expectedCsidl, ret; KNOWNFOLDER_DEFINITION kfd; IKnownFolder *folder; WCHAR sName[1024]; - BOOL *current_known_folder_found = &known_folder_found[0]; BOOL found = FALSE; + unsigned int i; - while(known_folder->folderId != NULL) + for (i = 0; i < ARRAY_SIZE(known_folders); ++i) { + const struct knownFolderDef *known_folder = &known_folders[i]; + if(IsEqualGUID(known_folder->folderId, folderId)) { - *current_known_folder_found = TRUE; + known_folder_found[i] = TRUE; found = TRUE; /* verify CSIDL */ if(!(known_folder->csidl & NO_CSIDL)) @@ -2032,8 +2029,6 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId break; } - known_folder++; - current_known_folder_found++; } if(!found)

1 0

Michael Stefaniuc : kernel32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: cd1019fee815779dbc084e843b974cee09649c8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1019fee815779dbc084e84… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 22 19:50:38 2018 +0200 kernel32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 598 +++++++++++++++++++++---------------------- 1 file changed, 287 insertions(+), 311 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd1019fee815779dbc08…

1 0

Michael Stefaniuc : crypt32: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: f7c2fe87f5ca322809052fd8b2bbdf53b02884ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c2fe87f5ca322809052fd8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 22 19:50:39 2018 +0200 crypt32: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index dd3fc33..6e8076c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -738,8 +738,7 @@ static BOOL url_matches(LPCWSTR constraint, LPCWSTR name, /* Ignore any path or query portion of the URL. */ if (*authority_end) { - if (authority_end - name < sizeof(hostname_buf) / - sizeof(hostname_buf[0])) + if (authority_end - name < ARRAY_SIZE(hostname_buf)) { memcpy(hostname_buf, name, (authority_end - name) * sizeof(WCHAR));

1 0

Piotr Caban : msi: Report error when cached installer has different version.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 0657d966ffb9afdcd7cf8bd0c2ac7289a8bfbe5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0657d966ffb9afdcd7cf8bd0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 21:48:50 2018 +0200 msi: Report error when cached installer has different version. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 114 +++++++++++++++++++++++++---------------------- dlls/msi/tests/package.c | 6 +-- 2 files changed, 63 insertions(+), 57 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c423bbf..46fbeba 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1310,17 +1310,19 @@ static UINT validate_package( MSIPACKAGE *package ) return ERROR_INSTALL_LANGUAGE_UNSUPPORTED; } -static WCHAR *get_product_code( MSIDATABASE *db ) +static WCHAR *get_property( MSIDATABASE *db, const WCHAR *prop ) { - static const WCHAR query[] = { + static const WCHAR select_query[] = { 'S','E','L','E','C','T',' ','`','V','a','l','u','e','`',' ', 'F','R','O','M',' ','`','P','r','o','p','e','r','t','y','`',' ', 'W','H','E','R','E',' ','`','P','r','o','p','e','r','t','y','`','=', - '\'','P','r','o','d','u','c','t','C','o','d','e','\'',0}; + '\'','%','s','\'',0}; + WCHAR query[MAX_PATH]; MSIQUERY *view; MSIRECORD *rec; WCHAR *ret = NULL; + sprintfW(query, select_query, prop); if (MSI_DatabaseOpenViewW( db, query, &view ) != ERROR_SUCCESS) { return NULL; @@ -1341,48 +1343,39 @@ static WCHAR *get_product_code( MSIDATABASE *db ) return ret; } -static UINT get_registered_local_package( const WCHAR *product, const WCHAR *package, WCHAR *localfile ) +static WCHAR *get_product_code( MSIDATABASE *db ) +{ + return get_property( db, szProductCode ); +} + +static WCHAR *get_product_version( MSIDATABASE *db ) +{ + return get_property( db, szProductVersion ); +} + +static UINT get_registered_local_package( const WCHAR *product, WCHAR *localfile ) { MSIINSTALLCONTEXT context; - HKEY product_key, props_key; - WCHAR *registered_package = NULL, unsquashed[GUID_SIZE]; + WCHAR *filename; + HKEY props_key; UINT r; r = msi_locate_product( product, &context ); if (r != ERROR_SUCCESS) return r; - r = MSIREG_OpenProductKey( product, NULL, context, &product_key, FALSE ); - if (r != ERROR_SUCCESS) - return r; - r = MSIREG_OpenInstallProps( product, context, NULL, &props_key, FALSE ); if (r != ERROR_SUCCESS) - { - RegCloseKey( product_key ); return r; - } - r = ERROR_FUNCTION_FAILED; - registered_package = msi_reg_get_val_str( product_key, INSTALLPROPERTY_PACKAGECODEW ); - if (!registered_package) - goto done; - - unsquash_guid( registered_package, unsquashed ); - if (!strcmpiW( package, unsquashed )) - { - WCHAR *filename = msi_reg_get_val_str( props_key, INSTALLPROPERTY_LOCALPACKAGEW ); - if (!filename) - goto done; - strcpyW( localfile, filename ); - msi_free( filename ); - r = ERROR_SUCCESS; - } -done: - msi_free( registered_package ); + filename = msi_reg_get_val_str( props_key, INSTALLPROPERTY_LOCALPACKAGEW ); RegCloseKey( props_key ); - RegCloseKey( product_key ); - return r; + if (!filename) + return ERROR_FUNCTION_FAILED; + + strcpyW( localfile, filename ); + msi_free( filename ); + return ERROR_SUCCESS; } WCHAR *msi_get_package_code( MSIDATABASE *db ) @@ -1406,33 +1399,15 @@ WCHAR *msi_get_package_code( MSIDATABASE *db ) return ret; } -static UINT get_local_package( const WCHAR *filename, WCHAR *localfile ) +static UINT get_local_package( MSIDATABASE *db, WCHAR *localfile ) { - WCHAR *product_code, *package_code; - MSIDATABASE *db; + WCHAR *product_code; UINT r; - if ((r = MSI_OpenDatabaseW( filename, MSIDBOPEN_READONLY, &db )) != ERROR_SUCCESS) - { - if (GetFileAttributesW( filename ) == INVALID_FILE_ATTRIBUTES) - return ERROR_FILE_NOT_FOUND; - return r; - } if (!(product_code = get_product_code( db ))) - { - msiobj_release( &db->hdr ); - return ERROR_INSTALL_PACKAGE_INVALID; - } - if (!(package_code = msi_get_package_code( db ))) - { - msi_free( product_code ); - msiobj_release( &db->hdr ); return ERROR_INSTALL_PACKAGE_INVALID; - } - r = get_registered_local_package( product_code, package_code, localfile ); - msi_free( package_code ); + r = get_registered_local_package( product_code, localfile ); msi_free( product_code ); - msiobj_release( &db->hdr ); return r; } @@ -1497,6 +1472,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) } else { + WCHAR *product_version = NULL; + if ( UrlIsW( szPackage, URLIS_URL ) ) { r = msi_download_file( szPackage, cachefile ); @@ -1505,26 +1482,55 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) file = cachefile; } - r = get_local_package( file, localfile ); + r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &db ); + if (r != ERROR_SUCCESS) + { + if (GetFileAttributesW( file ) == INVALID_FILE_ATTRIBUTES) + return ERROR_FILE_NOT_FOUND; + return r; + } + r = get_local_package( db, localfile ); if (r != ERROR_SUCCESS || GetFileAttributesW( localfile ) == INVALID_FILE_ATTRIBUTES) { r = msi_create_empty_local_file( localfile, dotmsi ); if (r != ERROR_SUCCESS) + { + msiobj_release( &db->hdr ); return r; + } if (!CopyFileW( file, localfile, FALSE )) { r = GetLastError(); WARN("unable to copy package %s to %s (%u)\n", debugstr_w(file), debugstr_w(localfile), r); DeleteFileW( localfile ); + msiobj_release( &db->hdr ); return r; } delete_on_close = TRUE; } + else + product_version = get_product_version( db ); + msiobj_release( &db->hdr ); TRACE("opening package %s\n", debugstr_w( localfile )); r = MSI_OpenDatabaseW( localfile, MSIDBOPEN_TRANSACT, &db ); if (r != ERROR_SUCCESS) return r; + + if (product_version) + { + WCHAR *cache_version = get_product_version( db ); + if (!product_version != !cache_version || + (product_version && strcmpW(product_version, cache_version))) + { + msiobj_release( &db->hdr ); + msi_free(product_version); + msi_free(cache_version); + return ERROR_PRODUCT_VERSION; + } + msi_free(product_version); + msi_free(cache_version); + } } package = MSI_CreatePackage( db ); msiobj_release( &db->hdr ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 52a4bfd..b1c7a76 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3838,17 +3838,17 @@ static void test_states(void) MsiCloseHandle(hdb); r = MsiInstallProductA(msifile2, ""); - todo_wine ok(r == ERROR_PRODUCT_VERSION, "Expected ERROR_PRODUCT_VERSION, got %d\n", r); + ok(r == ERROR_PRODUCT_VERSION, "Expected ERROR_PRODUCT_VERSION, got %d\n", r); r = MsiInstallProductA(msifile2, "REINSTALLMODE=v"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiOpenProductA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", &hprod); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); size = MAX_PATH; r = MsiGetProductPropertyA(hprod, "ProductVersion", value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!strcmp(value, "1.1.2"), "ProductVersion = %s\n", value); + todo_wine ok(!strcmp(value, "1.1.2"), "ProductVersion = %s\n", value); MsiCloseHandle(hprod); /* major upgrade test */

1 0