February 2011 - Wine-commits

Austin English : msi/tests: Don't check return values inside of if(0) (LLVM /Clang).
by Alexandre Julliard 11 Feb '11

11 Feb '11

Module: wine Branch: master Commit: 5e92277f97aac84354e5f4acd835fc81dbdad677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e92277f97aac84354e5f4acd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:40 2011 -0800 msi/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/msi/tests/automation.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 46178b8..a6f1ddb 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -661,10 +661,10 @@ static void test_dispatch(void) /* Test invoking this function (without parameters passed) */ if (0) /* All of these crash MSI on Windows XP */ { - hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, NULL, NULL, NULL); - hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, NULL, &excepinfo, NULL); + IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, NULL, NULL, NULL); + IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, NULL, &excepinfo, NULL); VariantInit(&varresult); - hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, &varresult, &excepinfo, NULL); + IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, &varresult, &excepinfo, NULL); } /* Try with NULL params */ @@ -2289,7 +2289,7 @@ static void test_Installer_Products(BOOL bProductInstalled) if (0) /* Crashes on Windows XP */ { /* IEnumVARIANT::Clone, NULL pointer */ - hr = IEnumVARIANT_Clone(pEnum, NULL); + IEnumVARIANT_Clone(pEnum, NULL); } /* IEnumVARIANT::Clone */

1 0

Austin English : msi/tests: Make sure to use a return value (LLVM/Clang).
by Alexandre Julliard 11 Feb '11

11 Feb '11

Module: wine Branch: master Commit: 27dd864f6326e642ae36c266e3b093eb2d68c9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27dd864f6326e642ae36c266e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:44 2011 -0800 msi/tests: Make sure to use a return value (LLVM/Clang). --- dlls/msi/tests/db.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 21eb2a1..de2b9f5 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8702,6 +8702,7 @@ static void test_columnorder(void) query = "SELECT * FROM `T`"; r = do_query(hdb, query, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); sz = MAX_PATH; lstrcpyA(buf, "kiwi");

1 0

Austin English : kernel32/tests: Don't check return values inside of if(0) (LLVM/Clang).
by Alexandre Julliard 11 Feb '11

11 Feb '11

Module: wine Branch: master Commit: 8b7904d78d52e8c3367de2eeba985c7ca13ca24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7904d78d52e8c3367de2eeb… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:56 2011 -0800 kernel32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/kernel32/tests/heap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 98c99d7..f7ac478 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -469,11 +469,11 @@ static void test_HeapQueryInformation(void) if (0) /* crashes under XP */ { size = 0; - ret = pHeapQueryInformation(0, + pHeapQueryInformation(0, HeapCompatibilityInformation, &info, sizeof(info), &size); size = 0; - ret = pHeapQueryInformation(GetProcessHeap(), + pHeapQueryInformation(GetProcessHeap(), HeapCompatibilityInformation, NULL, sizeof(info), &size); }

1 0

Austin English : kernel32/tests: Don't check return values inside of if(0) (LLVM/Clang).
by Alexandre Julliard 11 Feb '11

11 Feb '11

Module: wine Branch: master Commit: e330380a6b5bb1c9829a1a17b1affb560a3e0c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e330380a6b5bb1c9829a1a17b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:59 2011 -0800 kernel32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/kernel32/tests/path.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 1ccafb7..741f47f 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -486,10 +486,7 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) */ if (0) { - SetLastError( 0xdeadbeef ); - len = GetCurrentDirectoryA( 42, (LPSTR)(MAX_PATH + 42) ); - ok( len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, - "GetCurrentDirectoryA failed to fail %u err %u\n", len, GetLastError() ); + GetCurrentDirectoryA( 42, (LPSTR)(MAX_PATH + 42) ); } /* SetCurrentDirectoryA shouldn't care whether the string has a @@ -1241,7 +1238,7 @@ static void test_GetLongPathNameW(void) /* NULL buffer with length crashes on Windows */ if (0) - length = pGetLongPathNameW(shortpath, NULL, 20); + pGetLongPathNameW(shortpath, NULL, 20); ok(DeleteFileW(shortpath), "Could not delete temporary file\n"); ok(RemoveDirectoryW(dirpath), "Could not delete temporary directory\n"); @@ -1302,7 +1299,8 @@ static void test_GetSystemDirectory(void) total = res; /* this crashes on XP */ - if (0) res = GetSystemDirectory(NULL, total); + if (0) + GetSystemDirectory(NULL, total); SetLastError(0xdeadbeef); res = GetSystemDirectory(NULL, total-1); @@ -1360,7 +1358,8 @@ static void test_GetWindowsDirectory(void) total = res; /* this crashes on XP */ - if (0) res = GetWindowsDirectory(NULL, total); + if (0) + GetWindowsDirectory(NULL, total); SetLastError(0xdeadbeef); res = GetWindowsDirectory(NULL, total-1); @@ -1415,7 +1414,7 @@ static void test_NeedCurrentDirectoryForExePathA(void) /* Crashes in Windows */ if (0) - ok(pNeedCurrentDirectoryForExePathA(NULL), "returned FALSE for NULL\n"); + pNeedCurrentDirectoryForExePathA(NULL); SetEnvironmentVariableA("NoDefaultCurrentDirectoryInExePath", NULL); ok(pNeedCurrentDirectoryForExePathA("."), "returned FALSE for \".\"\n"); @@ -1442,7 +1441,7 @@ static void test_NeedCurrentDirectoryForExePathW(void) /* Crashes in Windows */ if (0) - ok(pNeedCurrentDirectoryForExePathW(NULL), "returned FALSE for NULL\n"); + pNeedCurrentDirectoryForExePathW(NULL); SetEnvironmentVariableA("NoDefaultCurrentDirectoryInExePath", NULL); ok(pNeedCurrentDirectoryForExePathW(thispath), "returned FALSE for \".\"\n"); @@ -1595,11 +1594,7 @@ static void test_SearchPathW(void) if (0) { /* NULL filename, crashes on nt4 */ - SetLastError(0xdeadbeef); - ret = pSearchPathW(pathW, NULL, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, &ptrW); - ok(ret == 0, "Expected failure, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); + pSearchPathW(pathW, NULL, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, &ptrW); } /* empty filename */

1 0

Austin English : kernel32/tests: Make sure to use return values (LLVM/Clang ).
by Alexandre Julliard 11 Feb '11

11 Feb '11

Module: wine Branch: master Commit: 39d5a9080679ac20baad113288d221248089a789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d5a9080679ac20baad11328… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:28:07 2011 -0800 kernel32/tests: Make sure to use return values (LLVM/Clang). --- dlls/kernel32/tests/version.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 5151170..9f9b72e 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -52,7 +52,7 @@ static void test_GetVersionEx(void) if (0) { /* Silently crashes on XP */ - ret = GetVersionExA(NULL); + GetVersionExA(NULL); } SetLastError(0xdeadbeef); @@ -166,6 +166,7 @@ static void test_VerifyVersionInfo(void) ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); + ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); GetVersionEx((OSVERSIONINFO *)&info);

1 0

Austin English : secur32/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard 11 Feb '11

11 Feb '11

Module: wine Branch: master Commit: 1c659a5509585c162e69b084a8bd072c58711033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c659a5509585c162e69b084a… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:28:45 2011 -0800 secur32/tests: Make sure return values are used (LLVM/Clang). --- dlls/secur32/tests/schannel.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 7eac489..1b6fdf8 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -253,7 +253,7 @@ static void testAcquireSecurityContext(void) ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", st); /* Crashes */ - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, NULL, NULL); } st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, @@ -299,7 +299,7 @@ static void testAcquireSecurityContext(void) { /* Crashes with bad paCred pointer */ schanCred.cCreds = 1; - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); } @@ -343,6 +343,7 @@ static void testAcquireSecurityContext(void) ret = pCertSetCertificateContextProperty(certs[1], CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); schanCred.dwVersion = SCH_CRED_V3; + ok(ret, "CertSetCertificateContextProperty failed: %08x\n", GetLastError()); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, @@ -369,7 +370,7 @@ static void testAcquireSecurityContext(void) if (0) { /* Crashes */ - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, + pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); /* Crashes on WinNT */

1 0

Juan Lang : crypt32/tests: Update a CryptMsgUpdate call to succeed on more Windows versions, and check its return value (Clang).
by Alexandre Julliard 11 Feb '11

11 Feb '11

Module: wine Branch: master Commit: 14626a7804053b7972cde8b8b6a4fb74ac1ebe7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=14626a7804053b7972cde8b8b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 10 12:00:40 2011 -0800 crypt32/tests: Update a CryptMsgUpdate call to succeed on more Windows versions, and check its return value (Clang). --- dlls/crypt32/tests/msg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index fc54041..3834760 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -3205,7 +3205,8 @@ static void test_msg_control(void) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); } - ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); /* or after an update. */ for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) {

1 0

Juan Lang : crypt32/tests: In more recent Windows versions, updating a data message with no content succeeds.
by Alexandre Julliard 11 Feb '11

11 Feb '11

Module: wine Branch: master Commit: 07297ea9d014468381b691624a843696e8315f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07297ea9d014468381b691624… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 10 12:02:52 2011 -0800 crypt32/tests: In more recent Windows versions, updating a data message with no content succeeds. --- dlls/crypt32/tests/msg.c | 45 +++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 3834760..95a0a29 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -365,6 +365,8 @@ static BOOL WINAPI nop_stream_output(const void *pvArg, BYTE *pb, DWORD cb, return TRUE; } +static const BYTE dataEmptyBareContent[] = { 0x04,0x00 }; + static void test_data_msg_update(void) { HCRYPTMSG msg; @@ -390,20 +392,36 @@ static void test_data_msg_update(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); - /* Can't update a message with no data */ - SetLastError(0xdeadbeef); + /* Starting with Vista, can update a message with no data. */ ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - /* This test returns FALSE on XP and earlier but TRUE on Vista, so can't be tested. - * GetLastError is either E_INVALIDARG (NT) or unset (9x/Vista), so it doesn't - * make sense to test this. - */ + todo_wine + ok(ret || broken(!ret), "CryptMsgUpdate failed: %08x\n", GetLastError()); + if (ret) + { + DWORD size; - /* Curiously, a valid update will now fail as well, presumably because of - * the last (invalid, but final) update. - */ - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, - "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); + ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, buf, + &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(dataEmptyBareContent), + "unexpected size %d\n", size); + ok(!memcmp(buf, dataEmptyBareContent, size), + "unexpected value\n"); + } + CryptMemFree(buf); + } + } + } CryptMsgClose(msg); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, @@ -510,7 +528,6 @@ static void test_data_msg_get_param(void) CryptMsgClose(msg); } -static const BYTE dataEmptyBareContent[] = { 0x04,0x00 }; static const BYTE dataEmptyContent[] = { 0x30,0x0f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x02, 0x04,0x00 };

1 0

Juan Lang : crypt32: Allow updating data messages with no content.
by Alexandre Julliard 11 Feb '11

11 Feb '11

Module: wine Branch: master Commit: 2910cf9660d4e6a3791289286d364ea1a22d343c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2910cf9660d4e6a3791289286… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 10 11:58:17 2011 -0800 crypt32: Allow updating data messages with no content. --- dlls/crypt32/msg.c | 21 ++++++++------------- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ee80f1a..97860e5 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -277,20 +277,15 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } else { - msg->base.state = MsgStateFinalized; - if (!cbData) - SetLastError(E_INVALIDARG); - else - { - CRYPT_DATA_BLOB blob = { cbData, (LPBYTE)pbData }; + CRYPT_DATA_BLOB blob = { cbData, (LPBYTE)pbData }; - /* non-streamed data messages don't allow non-final updates, - * don't bother checking whether data already exist, they can't. - */ - ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, - &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &msg->bare_content, - &msg->bare_content_len); - } + msg->base.state = MsgStateFinalized; + /* non-streamed data messages don't allow non-final updates, + * don't bother checking whether data already exist, they can't. + */ + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, + &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &msg->bare_content, + &msg->bare_content_len); } } return ret; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 95a0a29..de55d6b 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -394,7 +394,6 @@ static void test_data_msg_update(void) NULL); /* Starting with Vista, can update a message with no data. */ ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - todo_wine ok(ret || broken(!ret), "CryptMsgUpdate failed: %08x\n", GetLastError()); if (ret) {

1 0

Hans Leidekker : msi: Preserve existing advertise strings in the PublishComponents action.
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: 92b5b3fd8cb796ea41a888ce1e5bf600cdf457c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b5b3fd8cb796ea41a888ce1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 10 15:56:41 2011 +0100 msi: Preserve existing advertise strings in the PublishComponents action. --- dlls/msi/action.c | 61 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 716a77f..86aa33f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5305,13 +5305,14 @@ static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; LPCWSTR compgroupid, component, feature, qualifier, text; - LPWSTR advertise = NULL, output = NULL; + LPWSTR advertise = NULL, output = NULL, existing = NULL, p, q; HKEY hkey = NULL; UINT rc; MSICOMPONENT *comp; MSIFEATURE *feat; DWORD sz; MSIRECORD *uirow; + int len; feature = MSI_RecordGetString(rec, 5); feat = get_loaded_feature(package, feature); @@ -5338,30 +5339,56 @@ static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) rc = MSIREG_OpenUserComponentsKey(compgroupid, &hkey, TRUE); if (rc != ERROR_SUCCESS) goto end; - - text = MSI_RecordGetString(rec,4); - advertise = create_component_advertise_string(package, comp, feature); - - sz = strlenW(advertise); + advertise = create_component_advertise_string( package, comp, feature ); + text = MSI_RecordGetString( rec, 4 ); if (text) - sz += lstrlenW(text); - - sz+=3; - sz *= sizeof(WCHAR); - - output = msi_alloc_zero(sz); - strcpyW(output,advertise); - msi_free(advertise); + { + p = msi_alloc( (strlenW( advertise ) + strlenW( text ) + 1) * sizeof(WCHAR) ); + strcpyW( p, advertise ); + strcatW( p, text ); + msi_free( advertise ); + advertise = p; + } + existing = msi_reg_get_val_str( hkey, qualifier ); - if (text) - strcatW(output,text); + sz = strlenW( advertise ) + 1; + if (existing) + { + for (p = existing; *p; p += len) + { + len = strlenW( p ) + 1; + if (strcmpW( advertise, p )) sz += len; + } + } + if (!(output = msi_alloc( (sz + 1) * sizeof(WCHAR) ))) + { + rc = ERROR_OUTOFMEMORY; + goto end; + } + q = output; + if (existing) + { + for (p = existing; *p; p += len) + { + len = strlenW( p ) + 1; + if (strcmpW( advertise, p )) + { + memcpy( q, p, len * sizeof(WCHAR) ); + q += len; + } + } + } + strcpyW( q, advertise ); + q[strlenW( q ) + 1] = 0; msi_reg_set_val_multi_str( hkey, qualifier, output ); end: RegCloseKey(hkey); - msi_free(output); + msi_free( output ); + msi_free( advertise ); + msi_free( existing ); /* the UI chunk */ uirow = MSI_CreateRecord( 2 );

1 0