ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autosyncing with Wine HEAD

Browse Source 
svn path=/trunk/; revision=33559
This commit is contained in:
The Wine Synchronizer
2008-05-17 19:46:54 +00:00
parent 0617a6d452
commit a5d311777a
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rostests/winetests/msi/msi.rbuild
+2 -1
View File
@@ -16,15 +16,16 @@
<file>suminfo.c</file>
<file>testlist.c</file>
<library>wine</library>
<library>uuid</library>
<library>cabinet</library>
<library>msi</library>
<library>shell32</library>
<library>ole32</library>
<library>oleaut32</library>
<library>user32</library>
<library>advapi32</library>
<library>kernel32</library>
<library>version</library>
<library>uuid</library>
<library>ntdll</library>
</module>
</group>
rostests/winetests/msi/package.c
+51
View File
@@ -1631,6 +1631,46 @@ static void test_condition(void)
r = MsiEvaluateCondition(hpkg, "&nofeature");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
MsiSetProperty(hpkg, "A", "2");
MsiSetProperty(hpkg, "X", "50");
r = MsiEvaluateCondition(hpkg, "2 <= X");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "A <= X");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "A <= 50");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
MsiSetProperty(hpkg, "X", "50val");
r = MsiEvaluateCondition(hpkg, "2 <= X");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "A <= X");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
MsiSetProperty(hpkg, "A", "7");
MsiSetProperty(hpkg, "X", "50");
r = MsiEvaluateCondition(hpkg, "7 <= X");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "A <= X");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "A <= 50");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
MsiSetProperty(hpkg, "X", "50val");
r = MsiEvaluateCondition(hpkg, "2 <= X");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "A <= X");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
MsiCloseHandle( hpkg );
DeleteFile(msifile);
}
@@ -4708,6 +4748,7 @@ static void test_installprops(void)
DWORD size, type;
LANGID langid;
HKEY hkey1, hkey2;
int res;
UINT r;
GetCurrentDirectory(MAX_PATH, path);
@@ -4801,6 +4842,16 @@ static void test_installprops(void)
ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
ok( !lstrcmpA(buf, path), "Expected \"%s\", got \"%s\"\n", path, buf);
res = GetSystemMetrics(SM_CXSCREEN);
size = MAX_PATH;
r = MsiGetProperty(hpkg, "ScreenX", buf, &size);
ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf));
res = GetSystemMetrics(SM_CYSCREEN);
size = MAX_PATH;
r = MsiGetProperty(hpkg, "ScreenY", buf, &size);
ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf));
CloseHandle(hkey1);
CloseHandle(hkey2);
MsiCloseHandle(hpkg);