March 2010 - Wine-Commits - list.winehq.org

Dylan Smith : comctl32/listview: Scrolling affects subitem rect.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: a7053ecc4c226dc6afc93ff129237ce9b78380b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7053ecc4c226dc6afc93ff12… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Mar 3 02:38:39 2010 -0500 comctl32/listview: Scrolling affects subitem rect. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2d39675..9afbf10 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6873,7 +6873,7 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR return FALSE; } - OffsetRect(lprc, 0, Position.y); + OffsetRect(lprc, Position.x - REPORT_MARGINX, Position.y); return TRUE; }

1 0

Dylan Smith : comctl32/tests: Added scrolled listview test for LVM_GETSUBITEMRECT.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 7617cc4bcce24cabbad0ad5ae1d76829f492f893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7617cc4bcce24cabbad0ad5ae… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Mar 3 02:39:14 2010 -0500 comctl32/tests: Added scrolled listview test for LVM_GETSUBITEMRECT. --- dlls/comctl32/tests/listview.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8bcd7a4..5441cfc 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2135,6 +2135,18 @@ todo_wine expect(100, rect.left); expect(250, rect.right); + ListView_Scroll(hwnd, 10, 0); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); + ok(r != 0, "Expected not-null LRESULT\n"); + expect(90, rect.left); + expect(240, rect.right); + + ListView_Scroll(hwnd, -10, 0); + DestroyWindow(hwnd); /* try it for non LVS_REPORT style */

1 0

Nikolay Sivov : shlwapi/tests: Some tests for PathGetDriveNumber.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 2d76bf2e69fc4b082030e0238f3aa17e273cf00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d76bf2e69fc4b082030e0238… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 12:38:39 2010 +0300 shlwapi/tests: Some tests for PathGetDriveNumber. --- dlls/shlwapi/tests/path.c | 106 ++++++++++++++++++++++++++++++-------------- 1 files changed, 72 insertions(+), 34 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index e52502f..3e83a45 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -28,12 +28,12 @@ #include "shlwapi.h" #include "wininet.h" -static HMODULE hShlwapi; static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD); static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR); static HRESULT (WINAPI *pPathCreateFromUrlA)(LPCSTR, LPSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pPathCreateFromUrlW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); +static BOOL (WINAPI *pPathAppendA)(LPSTR, LPCSTR); /* ################ */ @@ -300,6 +300,15 @@ static void test_PathIsValidCharA(void) BOOL ret; unsigned int c; + /* For whatever reason, PathIsValidCharA and PathAppendA share the same + * ordinal number in some native versions. Check this to prevent a crash. + */ + if (!pPathIsValidCharA || pPathIsValidCharA == (void*)pPathAppendA) + { + win_skip("PathIsValidCharA isn't available\n"); + return; + } + for (c = 0; c < 0x7f; c++) { ret = pPathIsValidCharA( c, ~0U ); @@ -318,6 +327,12 @@ static void test_PathIsValidCharW(void) BOOL ret; unsigned int c; + if (!pPathIsValidCharW) + { + win_skip("PathIsValidCharW isn't available\n"); + return; + } + for (c = 0; c < 0x7f; c++) { ret = pPathIsValidCharW( c, ~0U ); @@ -392,7 +407,13 @@ static void test_PathCombineW(void) WCHAR wbuf[MAX_PATH+1], wstr1[MAX_PATH] = {'C',':','\\',0}, wstr2[MAX_PATH]; static const WCHAR expout[] = {'C',':','\\','A','A',0}; int i; - + + if (!pPathCombineW) + { + win_skip("PathCombineW isn't available\n"); + return; + } + wszString2 = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); /* NULL test */ @@ -1312,43 +1333,60 @@ static void test_PathUnquoteSpaces(void) } } +static void test_PathGetDriveNumber(void) +{ + static const CHAR test1A[] = "a:\\test.file"; + static const CHAR test2A[] = "file:////b:\\test.file"; + static const CHAR test3A[] = "file:///c:\\test.file"; + static const CHAR test4A[] = "file:\\\\c:\\test.file"; + int ret; + + SetLastError(0xdeadbeef); + ret = PathGetDriveNumberA(NULL); + ok(ret == -1, "got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %d\n", GetLastError()); + + ret = PathGetDriveNumberA(test1A); + ok(ret == 0, "got %d\n", ret); + ret = PathGetDriveNumberA(test2A); + ok(ret == -1, "got %d\n", ret); + ret = PathGetDriveNumberA(test3A); + ok(ret == -1, "got %d\n", ret); + ret = PathGetDriveNumberA(test4A); + ok(ret == -1, "got %d\n", ret); +} + /* ################ */ START_TEST(path) { - hShlwapi = GetModuleHandleA("shlwapi.dll"); - pPathCreateFromUrlA = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlA"); - pPathCreateFromUrlW = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlW"); - - test_PathSearchAndQualify(); - test_PathCreateFromUrl(); - test_PathIsUrl(); - - test_PathAddBackslash(); - test_PathMakePretty(); - test_PathMatchSpec(); - - /* For whatever reason, PathIsValidCharA and PathAppendA share the same - * ordinal number in some native versions. Check this to prevent a crash. - */ - pPathIsValidCharA = (void*)GetProcAddress(hShlwapi, (LPSTR)455); - if (pPathIsValidCharA && pPathIsValidCharA != (void*)GetProcAddress(hShlwapi, "PathAppendA")) - { - test_PathIsValidCharA(); + HMODULE hShlwapi = GetModuleHandleA("shlwapi.dll"); - pPathIsValidCharW = (void*)GetProcAddress(hShlwapi, (LPSTR)456); - if (pPathIsValidCharW) test_PathIsValidCharW(); - } + pPathCreateFromUrlA = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlA"); + pPathCreateFromUrlW = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlW"); + pPathCombineW = (void*)GetProcAddress(hShlwapi, "PathCombineW"); + pPathIsValidCharA = (void*)GetProcAddress(hShlwapi, (LPSTR)455); + pPathIsValidCharW = (void*)GetProcAddress(hShlwapi, (LPSTR)456); + pPathAppendA = (void*)GetProcAddress(hShlwapi, "PathAppendA"); - pPathCombineW = (void*)GetProcAddress(hShlwapi, "PathCombineW"); - if (pPathCombineW) - test_PathCombineW(); + test_PathSearchAndQualify(); + test_PathCreateFromUrl(); + test_PathIsUrl(); + + test_PathAddBackslash(); + test_PathMakePretty(); + test_PathMatchSpec(); - test_PathCombineA(); - test_PathAppendA(); - test_PathCanonicalizeA(); - test_PathFindExtensionA(); - test_PathBuildRootA(); - test_PathCommonPrefixA(); - test_PathUnquoteSpaces(); + test_PathIsValidCharA(); + test_PathIsValidCharW(); + + test_PathCombineW(); + test_PathCombineA(); + test_PathAppendA(); + test_PathCanonicalizeA(); + test_PathFindExtensionA(); + test_PathBuildRootA(); + test_PathCommonPrefixA(); + test_PathUnquoteSpaces(); + test_PathGetDriveNumber(); }

1 0

Reece Dunn : crypt32: Fix CryptFreeTls when calling with a freed index.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: a15dbfac22b4d75af2d54941a549b358ac14780c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15dbfac22b4d75af2d54941a… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Tue Mar 2 21:31:46 2010 +0000 crypt32: Fix CryptFreeTls when calling with a freed index. --- dlls/crypt32/main.c | 7 ++++++- dlls/crypt32/tests/main.c | 6 ++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 1a5972f..5844b18 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -161,8 +161,13 @@ BOOL WINAPI I_CryptSetTls(DWORD dwTlsIndex, LPVOID lpTlsValue) BOOL WINAPI I_CryptFreeTls(DWORD dwTlsIndex, DWORD unknown) { + BOOL ret; + TRACE("(%d, %d)\n", dwTlsIndex, unknown); - return TlsFree(dwTlsIndex); + + ret = TlsFree(dwTlsIndex); + if (!ret) SetLastError( E_INVALIDARG ); + return ret; } BOOL WINAPI I_CryptGetOssGlobal(DWORD x) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 9b622bb..7c11e8e 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -254,10 +254,8 @@ static void test_cryptTls(void) ret = pI_CryptFreeTls(index, 0); ok(ret, "I_CryptFreeTls failed: %08x\n", GetLastError()); ret = pI_CryptFreeTls(index, 0); - /* Not sure if this fails because TlsFree should fail, so leave as - * todo for now. - */ - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, + ok(!ret, "I_CryptFreeTls succeeded\n"); + ok(GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); } /* Similar pass, check I_CryptDetachTls */

1 0

Andrew Nguyen : msi: Correctly set the process working directory in custom action type 34.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 0270f18e110128b2646ac050c8bfb316a0515e43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0270f18e110128b2646ac050c… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Mar 3 02:53:23 2010 -0600 msi: Correctly set the process working directory in custom action type 34. --- dlls/msi/custom.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 2b2a3e1..584c050 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1120,38 +1120,44 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - LPWSTR filename, deformated; + LPWSTR workingdir, filename; STARTUPINFOW si; PROCESS_INFORMATION info; BOOL rc; - memset(&si,0,sizeof(STARTUPINFOW)); + memset(&si, 0, sizeof(STARTUPINFOW)); - filename = resolve_folder(package, source, FALSE, FALSE, TRUE, NULL); + workingdir = resolve_folder(package, source, FALSE, FALSE, TRUE, NULL); - if (!filename) + if (!workingdir) return ERROR_FUNCTION_FAILED; - SetCurrentDirectoryW(filename); - msi_free(filename); + deformat_string(package, target, &filename); - deformat_string(package,target,&deformated); - - if (!deformated) + if (!filename) + { + msi_free(workingdir); return ERROR_FUNCTION_FAILED; + } - TRACE("executing exe %s\n", debugstr_w(deformated)); + TRACE("executing exe %s with working directory %s\n", + debugstr_w(filename), debugstr_w(workingdir)); - rc = CreateProcessW(NULL, deformated, NULL, NULL, FALSE, 0, NULL, - c_collen, &si, &info); + rc = CreateProcessW(NULL, filename, NULL, NULL, FALSE, 0, NULL, + workingdir, &si, &info); if ( !rc ) { - ERR("Unable to execute command %s\n", debugstr_w(deformated)); - msi_free(deformated); + ERR("Unable to execute command %s with working directory %s\n", + debugstr_w(filename), debugstr_w(workingdir)); + msi_free(filename); + msi_free(workingdir); return ERROR_SUCCESS; } - msi_free(deformated); + + msi_free(filename); + msi_free(workingdir); + CloseHandle( info.hThread ); return wait_process_handle(package, type, info.hProcess, action);

1 0

Reece Dunn : kernel32/tests: Add a test case for calling TlsFree on a freed index.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 1b46c0660d4baad9f4afe0086fb4e44240b18131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b46c0660d4baad9f4afe0086… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Tue Mar 2 21:29:48 2010 +0000 kernel32/tests: Add a test case for calling TlsFree on a freed index. --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/thread.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1ef3e46..d9d4520 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2496,7 +2496,7 @@ BOOL WINAPI TlsFree( DWORD index ) if (ret) NtSetInformationThread( GetCurrentThread(), ThreadZeroTlsCell, &index, sizeof(index) ); else SetLastError( ERROR_INVALID_PARAMETER ); RtlReleasePebLock(); - return TRUE; + return ret; } diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 83d13c5..afa6759 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -421,7 +421,17 @@ static VOID test_CreateThread_basic(void) "Thread did not execute successfully\n"); ok(CloseHandle(thread[i])!=0,"CloseHandle failed\n"); } - ok(TlsFree(tlsIndex)!=0,"TlsFree failed\n"); + + SetLastError(0xCAFEF00D); + ok(TlsFree(tlsIndex)!=0,"TlsFree failed: %08x\n", GetLastError()); + ok(GetLastError()==0xCAFEF00D, + "GetLastError: expected 0xCAFEF00D, got %08x\n", GetLastError()); + + /* Test freeing an already freed TLS index */ + SetLastError(0xCAFEF00D); + ok(TlsFree(tlsIndex)==0,"TlsFree succeeded\n"); + ok(GetLastError()==ERROR_INVALID_PARAMETER, + "GetLastError: expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); /* Test how passing NULL as a pointer to threadid works */ SetLastError(0xFACEaBAD);

1 0

Dylan Smith : comctl32/tests: Add NULL terminator to unicode string constant.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 3952da836af47e809d1404cc5a32238b46a97b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3952da836af47e809d1404cc5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Mar 3 02:31:29 2010 -0500 comctl32/tests: Add NULL terminator to unicode string constant. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b224192..8bcd7a4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -424,7 +424,7 @@ static BOOL register_parent_wnd_class(BOOL Unicode) static HWND create_parent_window(BOOL Unicode) { - static const WCHAR nameW[] = {'t','e','s','t','p','a','r','e','n','t','n','a','m','e','W'}; + static const WCHAR nameW[] = {'t','e','s','t','p','a','r','e','n','t','n','a','m','e','W',0}; HWND hwnd; if (!register_parent_wnd_class(Unicode))

1 0

Christian Costa : d3dxof: Turn some TRACEs into WARNs in case of parsing error.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: cafb20bb5c1440ec373353fd718ec4fdb127d48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafb20bb5c1440ec373353fd7… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Mar 3 08:52:43 2010 +0100 d3dxof: Turn some TRACEs into WARNs in case of parsing error. --- dlls/d3dxof/d3dxof.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 88a9e52..b8c85e0 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -303,7 +303,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV { if (!parse_template(&object->buf)) { - TRACE("Template is not correct\n"); + WARN("Template is not correct\n"); hr = DXFILEERR_BADVALUE; goto error; } @@ -418,7 +418,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP { if (!parse_template(&buf)) { - TRACE("Template is not correct\n"); + WARN("Template is not correct\n"); return DXFILEERR_BADVALUE; } else @@ -1051,7 +1051,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE { if (!parse_template(&This->buf)) { - TRACE("Template is not correct\n"); + WARN("Template is not correct\n"); hr = DXFILEERR_BADVALUE; goto error; } @@ -1099,7 +1099,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE if (!parse_object(&This->buf)) { - TRACE("Object is not correct\n"); + WARN("Object is not correct\n"); hr = DXFILEERR_PARSEERROR; goto error; }

1 0

Juan Lang : wintrust: Correct GenericChainCertificateTrust' s handling of WINTRUST_CreateChainForSigner's return value.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 2f836649816764cd8f4af5779baec6561d430e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f836649816764cd8f4af5779… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 1 08:51:47 2010 -0800 wintrust: Correct GenericChainCertificateTrust's handling of WINTRUST_CreateChainForSigner's return value. --- dlls/wintrust/softpub.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index f753c93..9fa0d05 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -845,7 +845,7 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err; WTD_GENERIC_CHAIN_POLICY_DATA *policyData = data->pWintrustData->pPolicyCallbackData; @@ -854,15 +854,11 @@ HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data) if (policyData && policyData->u.cbSize != sizeof(WTD_GENERIC_CHAIN_POLICY_CREATE_INFO)) { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; + err = ERROR_INVALID_PARAMETER; goto end; } if (!data->csSigners) - { - ret = FALSE; - SetLastError(TRUST_E_NOSIGNATURE); - } + err = TRUST_E_NOSIGNATURE; else { DWORD i; @@ -880,19 +876,18 @@ HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data) pChainPara = &chainPara; pCreateInfo = &createInfo; } - ret = TRUE; - for (i = 0; i < data->csSigners; i++) - ret = WINTRUST_CreateChainForSigner(data, i, pCreateInfo, + err = ERROR_SUCCESS; + for (i = 0; !err && i < data->csSigners; i++) + err = WINTRUST_CreateChainForSigner(data, i, pCreateInfo, pChainPara); } end: - if (!ret) - data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = - GetLastError(); - TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + if (err) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = err; + TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); - return ret ? S_OK : S_FALSE; + return !err ? S_OK : S_FALSE; } HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *data)

1 0

Hans Leidekker : msi: Skip the FindRelatedProducts action when product is already installed.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 1fe30e0015eccc3753e884d8f663066a6f855823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe30e0015eccc3753e884d8f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:58:27 2010 +0100 msi: Skip the FindRelatedProducts action when product is already installed. --- dlls/msi/tests/install.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/upgrade.c | 6 +++ 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a3d3936..db1b154 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1552,6 +1552,55 @@ static const CHAR rrv_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR frp_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "product.txt\tproduct\tproduct.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR frp_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "product\t\t\tproduct feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR frp_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "product\tproduct\n"; + +static const CHAR frp_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "product\t{44725EE0-EEA8-40BD-8162-A48224A2FEA1}\tMSITESTDIR\t0\t\tproduct.txt\n"; + +static const CHAR frp_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestProp\t19\t\t\tPROP set\n"; + +static const CHAR frp_upgrade_dat[] = "UpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\tRemove\tActionProperty\n" + "s38\tS20\tS20\tS255\ti4\tS255\ts72\n" + "Upgrade\tUpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\n" + "{4C0EAA15-0264-4E5A-8758-609EF142B92D}\t1.1.1\t2.2.2\t\t768\t\tPROP\n"; + +static const CHAR frp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "FindRelatedProducts\t\t50\n" + "TestProp\tPROP AND NOT REMOVE\t51\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2429,6 +2478,20 @@ static const msi_table rrv_tables[] = ADD_TABLE(property) }; +static const msi_table frp_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(frp_component), + ADD_TABLE(frp_feature), + ADD_TABLE(frp_feature_comp), + ADD_TABLE(frp_file), + ADD_TABLE(frp_upgrade), + ADD_TABLE(frp_custom_action), + ADD_TABLE(frp_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8503,6 +8566,31 @@ static void test_remove_registry_values(void) delete_test_files(); } +static void test_find_related_products(void) +{ + UINT r; + + create_test_files(); + create_file("msitest\\product.txt", 1000); + create_database(msifile, frp_tables, sizeof(frp_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + /* install again, so it finds the upgrade code */ + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\product.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8607,6 +8695,7 @@ START_TEST(install) test_publish_components(); test_remove_duplicate_files(); test_remove_registry_values(); + test_find_related_products(); DeleteFileA(log_file); diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 6d5f4cf..21b677d 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -202,6 +202,12 @@ UINT ACTION_FindRelatedProducts(MSIPACKAGE *package) UINT rc = ERROR_SUCCESS; MSIQUERY *view; + if (msi_get_property_int(package, szInstalled, 0)) + { + TRACE("Skipping FindRelatedProducts action: product already installed\n"); + return ERROR_SUCCESS; + } + if (check_unique_action(package,szFindRelatedProducts)) { TRACE("Skipping FindRelatedProducts action: already done on client side\n");

1 0