James Hawkins : msi: Test the ScreenX/Y properties.

Alexandre Julliard julliard at winehq.org
Tue May 13 04:39:49 CDT 2008


Module: wine
Branch: master
Commit: ca8e867da7eeb34d144358f3d56e3b7b207725aa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ca8e867da7eeb34d144358f3d56e3b7b207725aa

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Mon May 12 23:47:13 2008 -0500

msi: Test the ScreenX/Y properties.

---

 dlls/msi/tests/Makefile.in |    2 +-
 dlls/msi/tests/package.c   |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in
index 27aba87..7ceba4d 100644
--- a/dlls/msi/tests/Makefile.in
+++ b/dlls/msi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msi.dll
-IMPORTS   = uuid cabinet msi shell32 ole32 oleaut32 advapi32 kernel32 version
+IMPORTS   = uuid cabinet msi shell32 ole32 oleaut32 user32 advapi32 kernel32 version
 
 CTESTS = \
 	automation.c \
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 5178384..511e3d4 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -4708,6 +4708,7 @@ static void test_installprops(void)
     DWORD size, type;
     LANGID langid;
     HKEY hkey1, hkey2;
+    int res;
     UINT r;
 
     GetCurrentDirectory(MAX_PATH, path);
@@ -4801,6 +4802,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);




More information about the wine-cvs mailing list