May 2007 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Remove last error checks on success.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: d132d1944c8a1572a21e20b5fb7d62e94b5e39b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d132d1944c8a1572a21e20b5f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon May 14 18:08:03 2007 -0700 crypt32: Remove last error checks on success. --- dlls/crypt32/tests/sip.c | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index e34221f..236b3bb 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -85,8 +85,6 @@ static void test_AddRemoveProvider(void) SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); ok ( ret, "CryptSIPAddProvider should have succeeded\n"); - ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", - GetLastError()); /* Dummy provider will be deleted, but the function still fails because * pwszIsFunctionName and pwszIsFunctionNameFmt2 are not present in the @@ -113,15 +111,11 @@ static void test_AddRemoveProvider(void) SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); ok ( ret, "CryptSIPAddProvider should have succeeded\n"); - ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", - GetLastError()); /* Dummy provider should be deleted */ SetLastError(0xdeadbeef); ret = CryptSIPRemoveProvider(&actionid); ok ( ret, "CryptSIPRemoveProvider should have succeeded\n"); - ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", - GetLastError()); } static void test_SIPRetrieveSubjectGUID(void) @@ -176,8 +170,6 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(regeditPathW, NULL, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); - ok ( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), "Expected (%s), got (%s).\n", show_guid(&unknownGUID), show_guid(&subject)); @@ -187,8 +179,6 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(NULL, file, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); - ok ( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), "Expected (%s), got (%s).\n", show_guid(&unknownGUID), show_guid(&subject)); CloseHandle(file); @@ -199,8 +189,6 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(regeditPathW, file, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); - ok ( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), "Expected (%s), got (%s).\n", show_guid(&unknownGUID), show_guid(&subject)); CloseHandle(file); @@ -315,13 +303,11 @@ static void test_SIPLoad(void) todo_wine { ok ( ret, "Expected CryptSIPLoad to succeed\n"); - /* This error will always be there as native searches for the function DllCanUnloadNow + /* On native the last error will always be ERROR_PROC_NOT_FOUND as native searches for the function DllCanUnloadNow * in WINTRUST.DLL (in this case). This function is not available in WINTRUST.DLL. * For now there's no need to implement this is Wine as I doubt any program will rely on * this last error when the call succeeded. */ - ok ( GetLastError() == ERROR_PROC_NOT_FOUND, - "Expected ERROR_PROC_NOT_FOUND, got 0x%08x\n", GetLastError()); ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); } @@ -356,8 +342,6 @@ static void test_SIPLoad(void) * CryptSIPLoad will not try to search for the already mentioned DllCanUnloadNow. */ } - ok ( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); todo_wine ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); @@ -376,8 +360,6 @@ static void test_SIPLoad(void) */ todo_wine { - ok ( GetLastError() == ERROR_PROC_NOT_FOUND, - "Expected ERROR_PROC_NOT_FOUND, got 0x%08x\n", GetLastError()); ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); /* This is another SIP but this test proves the function addresses are the same as

1 0

Juan Lang : wintrust: Implement WintrustGetRegPolicyFlags and WintrustSetRegPolicyFlags.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 1af94dbf3b83c68058d432fcc32e7a09d0ea2041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1af94dbf3b83c68058d432fcc… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon May 14 18:15:09 2007 -0700 wintrust: Implement WintrustGetRegPolicyFlags and WintrustSetRegPolicyFlags. --- dlls/wintrust/tests/register.c | 60 ++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_main.c | 55 ++++++++++++++++++++++++++++++++++-- include/wintrust.h | 1 + 3 files changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 95f8dc6..8046a78 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -286,6 +286,65 @@ static void test_LoadFunctionPointers(void) ok(ret, "WintrustLoadFunctionPointers failed: %d\n", GetLastError()); } +typedef void (WINAPI *WintrustGetRegPolicyFlagsFunc)(DWORD *); +typedef BOOL (WINAPI *WintrustSetRegPolicyFlagsFunc)(DWORD); + +static void test_RegPolicyFlags(void) +{ + /* Default state value 0x00023c00, which is + * WTPF_IGNOREREVOCATIONONTS | + * WTPF_OFFLINEOKNBU_COM | + * WTPF_OFFLINEOKNBU_IND | + * WTPF_OFFLINEOK_COM | + * WTPF_OFFLINEOK_IND + */ + static const WCHAR Software_Publishing[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'W','i','n','t','r','u','s','t','\\', + 'T','r','u','s','t',' ','P','r','o','v','i','d','e','r','s','\\', + 'S','o','f','t','w','a','r','e',' ', + 'P','u','b','l','i','s','h','i','n','g',0 }; + static const WCHAR State[] = { 'S','t','a','t','e',0 }; + WintrustGetRegPolicyFlagsFunc pGetFlags; + WintrustSetRegPolicyFlagsFunc pSetFlags; + HKEY key; + LONG r; + DWORD flags1, flags2, flags3, size; + BOOL ret; + + pGetFlags = (WintrustGetRegPolicyFlagsFunc)GetProcAddress(hWintrust, + "WintrustGetRegPolicyFlags"); + pSetFlags = (WintrustSetRegPolicyFlagsFunc)GetProcAddress(hWintrust, + "WintrustSetRegPolicyFlags"); + if (!pGetFlags || !pSetFlags) + skip("Policy flags functions not present\n"); + + r = RegOpenKeyExW(HKEY_CURRENT_USER, Software_Publishing, 0, KEY_ALL_ACCESS, + &key); + ok(!r, "RegOpenKeyEx failed: %d\n", r); + + size = sizeof(flags1); + r = RegQueryValueExW(key, State, NULL, NULL, (LPBYTE)&flags1, &size); + ok(!r, "RegQueryValueEx failed: %d\n", r); + + pGetFlags(&flags2); + ok(flags1 == flags2, "Didn't get expected flags\n"); + + flags3 = flags2 | 1; + ret = pSetFlags(flags3); + ok(ret, "pSetFlags failed: %d\n", GetLastError()); + size = sizeof(flags1); + r = RegQueryValueExW(key, State, NULL, NULL, (LPBYTE)&flags1, &size); + ok(flags1 == flags3, "Didn't get expected flags\n"); + + pSetFlags(flags2); + + RegCloseKey(key); +} + START_TEST(register) { if(!InitFunctionPtrs()) @@ -294,6 +353,7 @@ START_TEST(register) test_AddRem_ActionID(); test_AddDefaultForUsage(); test_LoadFunctionPointers(); + test_RegPolicyFlags(); FreeLibrary(hWintrust); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 073a369..66ad322 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winreg.h" #include "guiddef.h" #include "wintrust.h" #include "softpub.h" @@ -118,13 +119,48 @@ CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData) return NULL; } +static const WCHAR Software_Publishing[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'W','i','n','t','r','u','s','t','\\', + 'T','r','u','s','t',' ','P','r','o','v','i','d','e','r','s','\\', + 'S','o','f','t','w','a','r','e',' ', + 'P','u','b','l','i','s','h','i','n','g',0 }; +static const WCHAR State[] = { 'S','t','a','t','e',0 }; + /*********************************************************************** * WintrustGetRegPolicyFlags (WINTRUST.@) */ void WINAPI WintrustGetRegPolicyFlags( DWORD* pdwPolicyFlags ) { - FIXME("%p\n", pdwPolicyFlags); + HKEY key; + LONG r; + + TRACE("%p\n", pdwPolicyFlags); + *pdwPolicyFlags = 0; + r = RegCreateKeyExW(HKEY_CURRENT_USER, Software_Publishing, 0, NULL, 0, + KEY_READ, NULL, &key, NULL); + if (!r) + { + DWORD size = sizeof(DWORD); + + r = RegQueryValueExW(key, State, NULL, NULL, (LPBYTE)pdwPolicyFlags, + &size); + RegCloseKey(key); + if (r) + { + /* Failed to query, create and return default value */ + *pdwPolicyFlags = WTPF_IGNOREREVOCATIONONTS | + WTPF_OFFLINEOKNBU_COM | + WTPF_OFFLINEOKNBU_IND | + WTPF_OFFLINEOK_COM | + WTPF_OFFLINEOK_IND; + WintrustSetRegPolicyFlags(*pdwPolicyFlags); + } + } } /*********************************************************************** @@ -132,6 +168,19 @@ void WINAPI WintrustGetRegPolicyFlags( DWORD* pdwPolicyFlags ) */ BOOL WINAPI WintrustSetRegPolicyFlags( DWORD dwPolicyFlags) { - FIXME("stub: %x\n", dwPolicyFlags); - return TRUE; + HKEY key; + LONG r; + + TRACE("%x\n", dwPolicyFlags); + + r = RegCreateKeyExW(HKEY_CURRENT_USER, Software_Publishing, 0, + NULL, 0, KEY_WRITE, NULL, &key, NULL); + if (!r) + { + r = RegSetValueExW(key, State, 0, REG_DWORD, (LPBYTE)&dwPolicyFlags, + sizeof(DWORD)); + RegCloseKey(key); + } + if (r) SetLastError(r); + return r == ERROR_SUCCESS; } diff --git a/include/wintrust.h b/include/wintrust.h index a422f9d..f7c0667 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -364,6 +364,7 @@ BOOL WINAPI WintrustRemoveActionID(GUID*); BOOL WINAPI WintrustLoadFunctionPointers(GUID*,CRYPT_PROVIDER_FUNCTIONS*); BOOL WINAPI WintrustAddDefaultForUsage(const char*,CRYPT_PROVIDER_REGDEFUSAGE*); void WINAPI WintrustGetRegPolicyFlags(DWORD*); +BOOL WINAPI WintrustSetRegPolicyFlags(DWORD); LONG WINAPI WinVerifyTrust(HWND,GUID*,LPVOID); HRESULT WINAPI WinVerifyTrustEx(HWND,GUID*,WINTRUST_DATA*);

1 0

Juan Lang : crypt32: Implement CertGetStoreProperty and CertSetStoreProperty.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 4c6988e8f0485adc79045233d762c1756ada4fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6988e8f0485adc79045233d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon May 14 18:05:43 2007 -0700 crypt32: Implement CertGetStoreProperty and CertSetStoreProperty. --- dlls/crypt32/crypt32.spec | 2 + dlls/crypt32/store.c | 106 ++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/store.c | 74 ++++++++++++++++++++++++++++++ 3 files changed, 179 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index a3e3039..aba9065 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -59,6 +59,7 @@ @ stdcall CertGetNameStringA(ptr long long ptr ptr long) @ stdcall CertGetNameStringW(ptr long long ptr ptr long) @ stdcall CertGetPublicKeyLength(long ptr) +@ stdcall CertGetStoreProperty(long long ptr ptr) @ stdcall CertGetSubjectCertificateFromStore(ptr long ptr) @ stdcall CertGetValidUsages(long ptr ptr ptr ptr) @ stub CertIsRDNAttrsInCertificateName @@ -81,6 +82,7 @@ @ stdcall CertSetCTLContextProperty(ptr long long ptr) @ stdcall CertSetCertificateContextProperty(ptr long long ptr) @ stdcall CertSetEnhancedKeyUsage(ptr ptr) +@ stdcall CertSetStoreProperty(ptr long long ptr) @ stdcall CertStrToNameA(long str long ptr ptr ptr ptr) @ stdcall CertStrToNameW(long wstr long ptr ptr ptr ptr) @ stdcall CertVerifyCRLRevocation(long ptr long ptr) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 5f44be4..46556d8 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -138,6 +138,7 @@ typedef struct WINE_CRYPTCERTSTORE CONTEXT_STORE certs; CONTEXT_STORE crls; PFN_CERT_STORE_PROV_CONTROL control; /* optional */ + PCONTEXT_PROPERTY_LIST properties; } WINECRYPT_CERTSTORE, *PWINECRYPT_CERTSTORE; typedef struct _WINE_MEMSTORE @@ -216,6 +217,14 @@ static void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, HCRYPTPROV hCryptProv, } store->cryptProv = hCryptProv; store->dwOpenFlags = dwFlags; + store->properties = NULL; +} + +static void CRYPT_FreeStore(PWINECRYPT_CERTSTORE store) +{ + if (store->properties) + ContextPropertyList_Free(store->properties); + CryptMemFree(store); } static BOOL CRYPT_MemAddCert(PWINECRYPT_CERTSTORE store, void *cert, @@ -316,7 +325,7 @@ static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) ContextList_Free(store->certs); ContextList_Free(store->crls); - CryptMemFree(store); + CRYPT_FreeStore((PWINECRYPT_CERTSTORE)store); } static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, @@ -371,7 +380,7 @@ static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags) } cs->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&cs->cs); - CryptMemFree(cs); + CRYPT_FreeStore((PWINECRYPT_CERTSTORE)store); } static void *CRYPT_CollectionCreateContextFromChild(PWINE_COLLECTIONSTORE store, @@ -692,7 +701,7 @@ static void WINAPI CRYPT_ProvCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) store->provCloseStore(store->hStoreProv, dwFlags); if (!(store->dwStoreProvFlags & CERT_STORE_PROV_EXTERNAL_FLAG)) CertCloseStore(store->memStore, dwFlags); - CryptMemFree(store); + CRYPT_FreeStore((PWINECRYPT_CERTSTORE)store); } static BOOL CRYPT_ProvAddCert(PWINECRYPT_CERTSTORE store, void *cert, @@ -2476,6 +2485,97 @@ BOOL WINAPI CertControlStore(HCERTSTORE hCertStore, DWORD dwFlags, return ret; } +BOOL WINAPI CertGetStoreProperty(HCERTSTORE hCertStore, DWORD dwPropId, + void *pvData, DWORD *pcbData) +{ + PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore; + BOOL ret = FALSE; + + TRACE("(%p, %d, %p, %p)\n", hCertStore, dwPropId, pvData, pcbData); + + switch (dwPropId) + { + case CERT_ACCESS_STATE_PROP_ID: + if (!pvData) + { + *pcbData = sizeof(DWORD); + ret = TRUE; + } + else if (*pcbData < sizeof(DWORD)) + { + SetLastError(ERROR_MORE_DATA); + *pcbData = sizeof(DWORD); + } + else + { + *(DWORD *)pvData = CertStore_GetAccessState(hCertStore); + ret = TRUE; + } + break; + default: + if (store->properties) + { + CRYPT_DATA_BLOB blob; + + ret = ContextPropertyList_FindProperty(store->properties, dwPropId, + &blob); + if (ret) + { + if (!pvData) + *pcbData = blob.cbData; + else if (*pcbData < blob.cbData) + { + SetLastError(ERROR_MORE_DATA); + *pcbData = blob.cbData; + ret = FALSE; + } + else + { + memcpy(pvData, blob.pbData, blob.cbData); + *pcbData = blob.cbData; + } + } + else + SetLastError(CRYPT_E_NOT_FOUND); + } + else + SetLastError(CRYPT_E_NOT_FOUND); + } + return ret; +} + +BOOL WINAPI CertSetStoreProperty(HCERTSTORE hCertStore, DWORD dwPropId, + DWORD dwFlags, const void *pvData) +{ + PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore; + BOOL ret = FALSE; + + TRACE("(%p, %d, %08x, %p)\n", hCertStore, dwPropId, dwFlags, pvData); + + if (!store->properties) + store->properties = ContextPropertyList_Create(); + switch (dwPropId) + { + case CERT_ACCESS_STATE_PROP_ID: + SetLastError(E_INVALIDARG); + break; + default: + if (pvData) + { + const CRYPT_DATA_BLOB *blob = (const CRYPT_DATA_BLOB *)pvData; + + ret = ContextPropertyList_SetProperty(store->properties, dwPropId, + blob->pbData, blob->cbData); + } + else + { + ContextPropertyList_RemoveProperty(store->properties, dwPropId); + ret = TRUE; + } + } + return ret; +} + DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext, DWORD dwPropId) { diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index e464abb..d00adb4 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1426,6 +1426,79 @@ static void testCertEnumSystemStore(void) "Expected at least 3 stores\n"); } +static void testStoreProperty(void) +{ + HCERTSTORE store; + BOOL ret; + DWORD propID, size = 0, state; + CRYPT_DATA_BLOB blob; + + /* Crash + ret = CertGetStoreProperty(NULL, 0, NULL, NULL); + ret = CertGetStoreProperty(NULL, 0, NULL, &size); + ret = CertGetStoreProperty(store, 0, NULL, NULL); + */ + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + /* Check a missing prop ID */ + SetLastError(0xdeadbeef); + ret = CertGetStoreProperty(store, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + /* Contrary to MSDN, CERT_ACCESS_STATE_PROP_ID is supported for stores.. */ + size = sizeof(state); + ret = CertGetStoreProperty(store, CERT_ACCESS_STATE_PROP_ID, &state, &size); + ok(ret, "CertGetStoreProperty failed for CERT_ACCESS_STATE_PROP_ID: %08x\n", + GetLastError()); + ok(!state, "Expected a non-persisted store\n"); + /* and CERT_STORE_LOCALIZED_NAME_PROP_ID isn't supported by default. */ + size = 0; + ret = CertGetStoreProperty(store, CERT_STORE_LOCALIZED_NAME_PROP_ID, NULL, + &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + /* Delete an arbitrary property on a store */ + ret = CertSetStoreProperty(store, CERT_FIRST_USER_PROP_ID, 0, NULL); + ok(ret, "CertSetStoreProperty failed: %08x\n", GetLastError()); + /* Set an arbitrary property on a store */ + blob.pbData = (LPBYTE)&state; + blob.cbData = sizeof(state); + ret = CertSetStoreProperty(store, CERT_FIRST_USER_PROP_ID, 0, &blob); + ok(ret, "CertSetStoreProperty failed: %08x\n", GetLastError()); + /* Get an arbitrary property that's been set */ + ret = CertGetStoreProperty(store, CERT_FIRST_USER_PROP_ID, NULL, &size); + ok(ret, "CertGetStoreProperty failed: %08x\n", GetLastError()); + ok(size == sizeof(state), "Unexpected data size %d\n", size); + ret = CertGetStoreProperty(store, CERT_FIRST_USER_PROP_ID, &propID, &size); + ok(ret, "CertGetStoreProperty failed: %08x\n", GetLastError()); + ok(propID == state, "CertGetStoreProperty got the wrong value\n"); + /* Delete it again */ + ret = CertSetStoreProperty(store, CERT_FIRST_USER_PROP_ID, 0, NULL); + ok(ret, "CertSetStoreProperty failed: %08x\n", GetLastError()); + /* And check that it's missing */ + SetLastError(0xdeadbeef); + ret = CertGetStoreProperty(store, CERT_FIRST_USER_PROP_ID, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + CertCloseStore(store, 0); + + /* Recheck on the My store.. */ + store = CertOpenSystemStoreW(0, MyW); + size = sizeof(state); + ret = CertGetStoreProperty(store, CERT_ACCESS_STATE_PROP_ID, &state, &size); + ok(ret, "CertGetStoreProperty failed for CERT_ACCESS_STATE_PROP_ID: %08x\n", + GetLastError()); + ok(state, "Expected a persisted store\n"); + SetLastError(0xdeadbeef); + size = 0; + ret = CertGetStoreProperty(store, CERT_STORE_LOCALIZED_NAME_PROP_ID, NULL, + &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + CertCloseStore(store, 0); +} + static void testAddSerialized(void) { BOOL ret; @@ -1593,6 +1666,7 @@ START_TEST(store) testCertOpenSystemStore(); testCertEnumSystemStore(); + testStoreProperty(); testAddSerialized(); }

1 0

Juan Lang : crypt32: Use public functions to get store access state.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 79cd672c3dbef774d47af78825eb0c48218cf12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79cd672c3dbef774d47af7882… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon May 14 18:06:48 2007 -0700 crypt32: Use public functions to get store access state. --- dlls/crypt32/cert.c | 7 +++++-- dlls/crypt32/crl.c | 7 +++++-- dlls/crypt32/crypt32_private.h | 2 -- dlls/crypt32/store.c | 22 ++++++---------------- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 8abca01..94859ca 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -296,8 +296,11 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, } else { - *(DWORD *)pvData = - CertStore_GetAccessState(pCertContext->hCertStore); + if (pCertContext->hCertStore) + ret = CertGetStoreProperty(pCertContext->hCertStore, dwPropId, + pvData, pcbData); + else + *(DWORD *)pvData = 0; ret = TRUE; } break; diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index aa94f39..bc7f73e 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -368,8 +368,11 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext, } else { - *(DWORD *)pvData = - CertStore_GetAccessState(pCRLContext->hCertStore); + if (pCRLContext->hCertStore) + ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, + pvData, pcbData); + else + *(DWORD *)pvData = 0; ret = TRUE; } break; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 8aa544b..64900d2 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -120,8 +120,6 @@ BOOL CRYPT_ReadSerializedFile(HANDLE file, HCERTSTORE store); */ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info); -DWORD CertStore_GetAccessState(HCERTSTORE hCertStore); - /** * Context functions */ diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 46556d8..a38d06c 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -2098,21 +2098,6 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, return TRUE; } -DWORD CertStore_GetAccessState(HCERTSTORE hCertStore) -{ - DWORD state = 0; - - if (hCertStore) - { - PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore; - - if (store->type != StoreTypeMem && - !(store->dwOpenFlags & CERT_STORE_READONLY_FLAG)) - state |= CERT_ACCESS_STATE_WRITE_PERSIST_FLAG; - } - return state; -} - #define CertContext_CopyProperties(to, from) \ Context_CopyProperties((to), (from), sizeof(CERT_CONTEXT)) @@ -2508,7 +2493,12 @@ BOOL WINAPI CertGetStoreProperty(HCERTSTORE hCertStore, DWORD dwPropId, } else { - *(DWORD *)pvData = CertStore_GetAccessState(hCertStore); + DWORD state = 0; + + if (store->type != StoreTypeMem && + !(store->dwOpenFlags & CERT_STORE_READONLY_FLAG)) + state |= CERT_ACCESS_STATE_WRITE_PERSIST_FLAG; + *(DWORD *)pvData = state; ret = TRUE; } break;

1 0

Juan Lang : crypt32: Don't set ret to TRUE when it already is.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 0170a41e69fca2f6599f4f2a228b8d739119bcaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0170a41e69fca2f6599f4f2a2… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon May 14 18:04:51 2007 -0700 crypt32: Don't set ret to TRUE when it already is. Set it to FALSE when it needs to be. --- dlls/crypt32/cert.c | 11 +---------- dlls/crypt32/crl.c | 5 +---- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 100abaa..8abca01 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -185,20 +185,17 @@ static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, if (ret) { if (!pvData) - { *pcbData = blob.cbData; - ret = TRUE; - } else if (*pcbData < blob.cbData) { SetLastError(ERROR_MORE_DATA); *pcbData = blob.cbData; + ret = FALSE; } else { memcpy(pvData, blob.pbData, blob.cbData); *pcbData = blob.cbData; - ret = TRUE; } } else @@ -320,10 +317,7 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, if (ret) { if (!pvData) - { *pcbData = sizeof(HCRYPTPROV); - ret = TRUE; - } else if (*pcbData < sizeof(HCRYPTPROV)) { SetLastError(ERROR_MORE_DATA); @@ -331,10 +325,7 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, ret = FALSE; } else - { *(HCRYPTPROV *)pvData = keyContext.hCryptProv; - ret = TRUE; - } } break; } diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 32c4f3a..aa94f39 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -302,20 +302,17 @@ static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId, if (ret) { if (!pvData) - { *pcbData = blob.cbData; - ret = TRUE; - } else if (*pcbData < blob.cbData) { SetLastError(ERROR_MORE_DATA); *pcbData = blob.cbData; + ret = FALSE; } else { memcpy(pvData, blob.pbData, blob.cbData); *pcbData = blob.cbData; - ret = TRUE; } } else

1 0

Misha Koshelev : msi: automation: Simplify counting products/ related products.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 23cfbe2ec8bd33a027d80e64a6d87b4aa85dd563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23cfbe2ec8bd33a027d80e64a… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 14 12:16:07 2007 -0500 msi: automation: Simplify counting products/related products. --- dlls/msi/automation.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index c6088de..1030f96 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1367,12 +1367,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( WCHAR szProductBuf[GUID_SIZE]; /* Find number of products */ - do { - ret = MsiEnumProductsW(idx, szProductBuf); - if (ret == ERROR_SUCCESS) idx++; - } while (ret == ERROR_SUCCESS && ret != ERROR_NO_MORE_ITEMS); - - if (ret != ERROR_SUCCESS && ret != ERROR_NO_MORE_ITEMS) + while ((ret = MsiEnumProductsW(idx, szProductBuf)) == ERROR_SUCCESS) idx++; + if (ret != ERROR_NO_MORE_ITEMS) { ERR("MsiEnumProducts returned %d\n", ret); return DISP_E_EXCEPTION; @@ -1415,12 +1411,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( if (FAILED(hr)) return hr; /* Find number of related products */ - do { - ret = MsiEnumRelatedProductsW(V_BSTR(&varg0), 0, idx, szProductBuf); - if (ret == ERROR_SUCCESS) idx++; - } while (ret == ERROR_SUCCESS); - - if (ret != ERROR_SUCCESS && ret != ERROR_NO_MORE_ITEMS) + while ((ret = MsiEnumRelatedProductsW(V_BSTR(&varg0), 0, idx, szProductBuf)) == ERROR_SUCCESS) idx++; + if (ret != ERROR_NO_MORE_ITEMS) { VariantClear(&varg0); ERR("MsiEnumRelatedProducts returned %d\n", ret);

1 0

Misha Koshelev : msi: automation: Installer::Products, verify HeapAlloc return value.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 5f2e81e2a51674f1e5cc42c4743c81c366685188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2e81e2a51674f1e5cc42c47… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 14 12:15:58 2007 -0500 msi: automation: Installer::Products, verify HeapAlloc return value. --- dlls/msi/automation.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 4cd7ba9..c6088de 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1386,12 +1386,16 @@ static HRESULT WINAPI InstallerImpl_Invoke( /* Save product strings */ sldata = (StringListData *)private_data((AutomationObject *)pDispatch); - sldata->iCount = idx; - sldata->pszStrings = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LPWSTR)*sldata->iCount); - for (idx = 0; idx < sldata->iCount; idx++) + if (!(sldata->pszStrings = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LPWSTR)*sldata->iCount))) + ERR("Out of memory\n"); + else { - ret = MsiEnumProductsW(idx, szProductBuf); - sldata->pszStrings[idx] = SysAllocString(szProductBuf); + sldata->iCount = idx; + for (idx = 0; idx < sldata->iCount; idx++) + { + ret = MsiEnumProductsW(idx, szProductBuf); + sldata->pszStrings[idx] = SysAllocString(szProductBuf); + } } } else

1 0

Misha Koshelev : msi: Make MsiEnumRelatedProducts enumerate registry value names, not subkeys.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 536b49905b935e2afa015df7333bb1ae8091ef87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536b49905b935e2afa015df73… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 14 12:15:46 2007 -0500 msi: Make MsiEnumRelatedProducts enumerate registry value names, not subkeys. --- dlls/msi/registry.c | 3 ++- dlls/msi/tests/automation.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 088f46a..3781088 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -993,6 +993,7 @@ UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved, { UINT r; HKEY hkey; + DWORD dwSize = SQUISH_GUID_SIZE; WCHAR szKeyName[SQUISH_GUID_SIZE]; TRACE("%s %u %u %p\n", debugstr_w(szUpgradeCode), dwReserved, @@ -1007,7 +1008,7 @@ UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved, if (r != ERROR_SUCCESS) return ERROR_NO_MORE_ITEMS; - r = RegEnumKeyW(hkey, iProductIndex, szKeyName, SQUISH_GUID_SIZE); + r = RegEnumValueW(hkey, iProductIndex, szKeyName, &dwSize, NULL, NULL, NULL, NULL); if( r == ERROR_SUCCESS ) unsquash_guid(szKeyName, lpProductBuf); RegCloseKey(hkey); diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 267d756..98014fd 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1676,13 +1676,13 @@ static void test_Installer_InstallProduct(LPCWSTR szPath) /* StringList::Count */ hr = StringList_Count(pStringList, &iCount); ok(SUCCEEDED(hr), "StringList_Count failed, hresult 0x%08x\n", hr); - todo_wine ok(iCount == 1, "Expected one related product but found %d\n", iCount); + ok(iCount == 1, "Expected one related product but found %d\n", iCount); /* StringList::Item */ memset(szString, 0, sizeof(szString)); hr = StringList_Item(pStringList, 0, szString); - todo_wine ok(SUCCEEDED(hr), "StringList_Item failed (idx 0, count %d), hresult 0x%08x\n", iCount, hr); - todo_wine ok_w2("StringList_Item returned %s but expected %s\n", szString, szProductCode); + ok(SUCCEEDED(hr), "StringList_Item failed (idx 0, count %d), hresult 0x%08x\n", iCount, hr); + ok_w2("StringList_Item returned %s but expected %s\n", szString, szProductCode); IDispatch_Release(pStringList); }

1 0

Misha Koshelev : msi/tests: automation: Add tests for Installer:: RelatedProducts.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 7a9b2182358f8d6bfce75a5aa49c21e5fc7c6c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9b2182358f8d6bfce75a5aa… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 14 12:15:02 2007 -0500 msi/tests: automation: Add tests for Installer::RelatedProducts. --- dlls/msi/tests/automation.c | 61 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 7151c17..a9da690 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -34,6 +34,7 @@ static const char *msifile = "winetest.msi"; static const WCHAR szMsifile[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; static const WCHAR szProductCode[] = { '{','F','1','C','3','A','F','5','0','-','8','B','5','6','-','4','A','6','9','-','A','0','0','C','-','0','0','7','7','3','F','E','4','2','F','3','0','}',0 }; +static const WCHAR szUpgradeCode[] = { '{','C','E','0','6','7','E','8','D','-','2','E','1','A','-','4','3','6','7','-','B','7','3','4','-','4','E','B','2','B','D','A','D','6','5','6','5','}',0 }; CHAR CURR_DIR[MAX_PATH]; EXCEPINFO excepinfo; @@ -763,6 +764,22 @@ static HRESULT Installer_Products(IDispatch **pStringList) return hr; } +static HRESULT Installer_RelatedProducts(LPCWSTR szProduct, IDispatch **pStringList) +{ + VARIANT varresult; + VARIANTARG vararg[1]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szProduct); + + hr = invoke(pInstaller, "RelatedProducts", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_DISPATCH); + *pStringList = V_DISPATCH(&varresult); + return hr; +} + static HRESULT Installer_VersionGet(LPCWSTR szVersion) { VARIANT varresult; @@ -1631,10 +1648,12 @@ static void test_Installer_InstallProduct(LPCWSTR szPath) { HRESULT hr; CHAR path[MAX_PATH]; + WCHAR szString[MAX_PATH]; LONG res; HKEY hkey; DWORD num, size, type; - int iValue; + int iValue, iCount; + IDispatch *pStringList = NULL; create_test_files(); @@ -1647,6 +1666,27 @@ static void test_Installer_InstallProduct(LPCWSTR szPath) ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); ok(iValue == INSTALLSTATE_DEFAULT, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_DEFAULT); + /* Installer::RelatedProducts for our upgrade code */ + todo_wine { + hr = Installer_RelatedProducts(szUpgradeCode, &pStringList); + ok(SUCCEEDED(hr), "Installer_RelatedProducts failed, hresult 0x%08x\n", hr); + if (SUCCEEDED(hr)) + { + /* StringList::Count */ + hr = StringList_Count(pStringList, &iCount); + ok(SUCCEEDED(hr), "StringList_Count failed, hresult 0x%08x\n", hr); + ok(iCount == 1, "Expected one related product but found %d\n", iCount); + + /* StringList::Item */ + memset(szString, 0, sizeof(szString)); + hr = StringList_Item(pStringList, 0, szString); + ok(SUCCEEDED(hr), "StringList_Item failed (idx 0, count %d), hresult 0x%08x\n", iCount, hr); + ok_w2("StringList_Item returned %s but expected %s\n", szString, szProductCode); + + IDispatch_Release(pStringList); + } + } + /* Check & clean up installed files & registry keys */ ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); @@ -1735,7 +1775,7 @@ static void test_Installer(void) HRESULT hr; UINT len; IDispatch *pSession = NULL, *pRecord = NULL, *pStringList = NULL; - int iValue; + int iValue, iCount; if (!pInstaller) return; @@ -1811,7 +1851,7 @@ static void test_Installer(void) ok(SUCCEEDED(hr), "Installer_Products failed, hresult 0x%08x\n", hr); if (SUCCEEDED(hr)) { - int iCount = 0, idx; + int idx; /* StringList::Count */ hr = StringList_Count(pStringList, &iCount); @@ -1848,6 +1888,21 @@ static void test_Installer(void) if (SUCCEEDED(hr)) ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN); + /* Installer::RelatedProducts for our upgrade code, should not find anything */ + todo_wine { + hr = Installer_RelatedProducts(szUpgradeCode, &pStringList); + ok(SUCCEEDED(hr), "Installer_RelatedProducts failed, hresult 0x%08x\n", hr); + if (SUCCEEDED(hr)) + { + /* StringList::Count */ + hr = StringList_Count(pStringList, &iCount); + ok(SUCCEEDED(hr), "StringList_Count failed, hresult 0x%08x\n", hr); + ok(!iCount, "Expected no related products but found %d\n", iCount); + + IDispatch_Release(pStringList); + } + } + /* Installer::Version */ todo_wine { memset(szPath, 0, sizeof(szPath));

1 0

Misha Koshelev : msi: automation: Implement Installer::RelatedProducts.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: a6dfcf90f7c8df97e46a5b486ddc7df5d4d9818b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dfcf90f7c8df97e46a5b486… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 14 12:15:13 2007 -0500 msi: automation: Implement Installer::RelatedProducts. --- dlls/msi/automation.c | 49 +++++++++++++++++++++++++++++++++++++++ dlls/msi/msiserver.idl | 3 ++ dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 52 ++++++++++++++++++++--------------------- 4 files changed, 78 insertions(+), 27 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 1c717ba..4cd7ba9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1400,6 +1400,55 @@ static HRESULT WINAPI InstallerImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_RELATEDPRODUCTS: + if (wFlags & DISPATCH_PROPERTYGET) + { + StringListData *sldata = NULL; + int idx = 0; + WCHAR szProductBuf[GUID_SIZE]; + + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + + /* Find number of related products */ + do { + ret = MsiEnumRelatedProductsW(V_BSTR(&varg0), 0, idx, szProductBuf); + if (ret == ERROR_SUCCESS) idx++; + } while (ret == ERROR_SUCCESS); + + if (ret != ERROR_SUCCESS && ret != ERROR_NO_MORE_ITEMS) + { + VariantClear(&varg0); + ERR("MsiEnumRelatedProducts returned %d\n", ret); + return DISP_E_EXCEPTION; + } + + V_VT(pVarResult) = VT_DISPATCH; + if (SUCCEEDED(hr = create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, StringListImpl_Invoke, StringListImpl_Free, sizeof(StringListData)))) + { + IDispatch_AddRef(pDispatch); + V_DISPATCH(pVarResult) = pDispatch; + + /* Save product strings */ + sldata = (StringListData *)private_data((AutomationObject *)pDispatch); + if (!(sldata->pszStrings = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LPWSTR)*sldata->iCount))) + ERR("Out of memory\n"); + else + { + sldata->iCount = idx; + for (idx = 0; idx < sldata->iCount; idx++) + { + ret = MsiEnumRelatedProductsW(V_BSTR(&varg0), 0, idx, szProductBuf); + sldata->pszStrings[idx] = SysAllocString(szProductBuf); + } + } + } + else + ERR("Failed to create StringList object, hresult 0x%08x\n", hr); + } + else return DISP_E_MEMBERNOTFOUND; + break; + default: return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index d453d7b..5721319 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -79,6 +79,9 @@ library WindowsInstaller [in] BSTR Product); [id(DISPID_INSTALLER_PRODUCTS), propget] StringList *Products(); + [id(DISPID_INSTALLER_RELATEDPRODUCTS), propget] + StringList *RelatedProducts( + [in] BSTR UpgradeCode); } [ uuid(000C1093-0000-0000-C000-000000000046) ] diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index ee18a44..92c3429 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -22,6 +22,7 @@ #define DISPID_INSTALLER_REGISTRYVALUE 11 #define DISPID_INSTALLER_PRODUCTSTATE 17 #define DISPID_INSTALLER_PRODUCTS 35 +#define DISPID_INSTALLER_RELATEDPRODUCTS 40 #define DISPID_RECORD_FIELDCOUNT 0 #define DISPID_RECORD_STRINGDATA 1 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index a9da690..267d756 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -466,7 +466,9 @@ static void test_dispid(void) ok( get_dispid( pInstaller, "Components" ) == 37, "dispid wrong\n"); ok( get_dispid( pInstaller, "ComponentClients" ) == 38, "dispid wrong\n"); ok( get_dispid( pInstaller, "Patches" ) == 39, "dispid wrong\n"); + } ok( get_dispid( pInstaller, "RelatedProducts" ) == 40, "dispid wrong\n"); + todo_wine { ok( get_dispid( pInstaller, "PatchInfo" ) == 41, "dispid wrong\n"); ok( get_dispid( pInstaller, "PatchTransforms" ) == 42, "dispid wrong\n"); ok( get_dispid( pInstaller, "AddSource" ) == 43, "dispid wrong\n"); @@ -1667,24 +1669,22 @@ static void test_Installer_InstallProduct(LPCWSTR szPath) ok(iValue == INSTALLSTATE_DEFAULT, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_DEFAULT); /* Installer::RelatedProducts for our upgrade code */ - todo_wine { - hr = Installer_RelatedProducts(szUpgradeCode, &pStringList); - ok(SUCCEEDED(hr), "Installer_RelatedProducts failed, hresult 0x%08x\n", hr); - if (SUCCEEDED(hr)) - { - /* StringList::Count */ - hr = StringList_Count(pStringList, &iCount); - ok(SUCCEEDED(hr), "StringList_Count failed, hresult 0x%08x\n", hr); - ok(iCount == 1, "Expected one related product but found %d\n", iCount); + hr = Installer_RelatedProducts(szUpgradeCode, &pStringList); + ok(SUCCEEDED(hr), "Installer_RelatedProducts failed, hresult 0x%08x\n", hr); + if (SUCCEEDED(hr)) + { + /* StringList::Count */ + hr = StringList_Count(pStringList, &iCount); + ok(SUCCEEDED(hr), "StringList_Count failed, hresult 0x%08x\n", hr); + todo_wine ok(iCount == 1, "Expected one related product but found %d\n", iCount); - /* StringList::Item */ - memset(szString, 0, sizeof(szString)); - hr = StringList_Item(pStringList, 0, szString); - ok(SUCCEEDED(hr), "StringList_Item failed (idx 0, count %d), hresult 0x%08x\n", iCount, hr); - ok_w2("StringList_Item returned %s but expected %s\n", szString, szProductCode); + /* StringList::Item */ + memset(szString, 0, sizeof(szString)); + hr = StringList_Item(pStringList, 0, szString); + todo_wine ok(SUCCEEDED(hr), "StringList_Item failed (idx 0, count %d), hresult 0x%08x\n", iCount, hr); + todo_wine ok_w2("StringList_Item returned %s but expected %s\n", szString, szProductCode); - IDispatch_Release(pStringList); - } + IDispatch_Release(pStringList); } /* Check & clean up installed files & registry keys */ @@ -1889,18 +1889,16 @@ static void test_Installer(void) ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN); /* Installer::RelatedProducts for our upgrade code, should not find anything */ - todo_wine { - hr = Installer_RelatedProducts(szUpgradeCode, &pStringList); - ok(SUCCEEDED(hr), "Installer_RelatedProducts failed, hresult 0x%08x\n", hr); - if (SUCCEEDED(hr)) - { - /* StringList::Count */ - hr = StringList_Count(pStringList, &iCount); - ok(SUCCEEDED(hr), "StringList_Count failed, hresult 0x%08x\n", hr); - ok(!iCount, "Expected no related products but found %d\n", iCount); + hr = Installer_RelatedProducts(szUpgradeCode, &pStringList); + ok(SUCCEEDED(hr), "Installer_RelatedProducts failed, hresult 0x%08x\n", hr); + if (SUCCEEDED(hr)) + { + /* StringList::Count */ + hr = StringList_Count(pStringList, &iCount); + ok(SUCCEEDED(hr), "StringList_Count failed, hresult 0x%08x\n", hr); + ok(!iCount, "Expected no related products but found %d\n", iCount); - IDispatch_Release(pStringList); - } + IDispatch_Release(pStringList); } /* Installer::Version */

1 0