advpack: add two missing stubs

Robert Reif reif at earthlink.net
Mon Jan 10 22:37:50 CST 2005


Rob Shearman wrote:

>
> I think you forgot to include the tests.
>
> Rob
>
Past my bed time.
-------------- next part --------------
diff -u -N wine.cvs/dlls/advpack/tests/advpack.c wine/dlls/advpack/tests/advpack.c
--- wine.cvs/dlls/advpack/tests/advpack.c	1969-12-31 19:00:00.000000000 -0500
+++ wine/dlls/advpack/tests/advpack.c	2005-01-10 22:54:50.000000000 -0500
@@ -0,0 +1,66 @@
+/*
+ * Unit tests for advpack.dll
+ *
+ * Copyright (c) 2005 Robert Reif
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define NONAMELESSSTRUCT
+#define NONAMELESSUNION
+#include <windows.h>
+
+#include "wine/test.h"
+#include "advpub.h"
+
+static void version_test()
+{
+    HRESULT hr;
+    DWORD major, minor;
+
+    major = minor = 0;
+    hr = GetVersionFromFile("kernel32.dll", &major, &minor, FALSE);
+    ok (hr == S_OK, "GetVersionFromFileEx(kernel32.dll) failed, returned "
+        "0x%08lx\n", hr);
+
+    trace("kernel32.dll Language ID: 0x%08lx, Codepage ID: 0x%08lx\n",
+           major, minor);
+
+    major = minor = 0;
+    hr = GetVersionFromFile("kernel32.dll", &major, &minor, TRUE);
+    ok (hr == S_OK, "GetVersionFromFileEx(kernel32.dll) failed, returned "
+        "0x%08lx\n", hr);
+
+    trace("kernel32.dll version: %d.%d.%d.%d\n", HIWORD(major), LOWORD(major),
+          HIWORD(minor), LOWORD(minor));
+}
+
+static void admin_test()
+{
+    BOOL res;
+    DWORD reserved;
+
+    res = IsNTAdmin(0, &reserved);
+    ok (res == TRUE || res == FALSE, "IsNTAdmin returned: 0x%08x\n", res);
+
+    trace("IsNTAdmin = %s\n", res == TRUE ? "TRUE" : res == FALSE ? "FALSE" :
+          "???");
+}
+
+START_TEST(advpack)
+{
+    version_test();
+    admin_test();
+}
diff -u -N wine.cvs/dlls/advpack/tests/.cvsignore wine/dlls/advpack/tests/.cvsignore
--- wine.cvs/dlls/advpack/tests/.cvsignore	1969-12-31 19:00:00.000000000 -0500
+++ wine/dlls/advpack/tests/.cvsignore	2005-01-10 21:17:35.000000000 -0500
@@ -0,0 +1,3 @@
+Makefile
+advpack.ok
+testlist.c
diff -u -N wine.cvs/dlls/advpack/tests/Makefile.in wine/dlls/advpack/tests/Makefile.in
--- wine.cvs/dlls/advpack/tests/Makefile.in	1969-12-31 19:00:00.000000000 -0500
+++ wine/dlls/advpack/tests/Makefile.in	2005-01-10 21:07:22.000000000 -0500
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+TESTDLL   = advpack.dll
+IMPORTS   = advpack user32 kernel32 version
+
+CTESTS = \
+	advpack.c
+
+ at MAKE_TEST_RULES@
+
+### Dependencies:


More information about the wine-devel mailing list