[ros-diffs] [winesync] 33559: Autosyncing with Wine HEAD

[winesync at svn.reactos.org]

Author: winesync
Date: Sat May 17 14:46:54 2008
New Revision: 33559

URL: http://svn.reactos.org/svn/reactos?rev=33559&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/rostests/winetests/msi/msi.rbuild
    trunk/rostests/winetests/msi/package.c

Modified: trunk/rostests/winetests/msi/msi.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.rbuild?rev=33559&r1=33558&r2=33559&view=diff
==============================================================================
--- trunk/rostests/winetests/msi/msi.rbuild [iso-8859-1] (original)
+++ trunk/rostests/winetests/msi/msi.rbuild [iso-8859-1] Sat May 17 14:46:54 2008
@@ -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>

Modified: trunk/rostests/winetests/msi/package.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?rev=33559&r1=33558&r2=33559&view=diff
==============================================================================
--- trunk/rostests/winetests/msi/package.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/msi/package.c [iso-8859-1] Sat May 17 14:46:54 2008
@@ -1631,6 +1631,46 @@
     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 @@
     DWORD size, type;
     LANGID langid;
     HKEY hkey1, hkey2;
+    int res;
     UINT r;
 
     GetCurrentDirectory(MAX_PATH, path);
@@ -4800,6 +4841,16 @@
     r = MsiGetProperty(hpkg, "UserLanguageID", buf, &size);
     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);