Corrected makefiles for all tests and added new application GetSysMetrics.

svn path=/trunk/; revision=3209

diff --git a/reactos/apps/tests/tests/GetSysMetrics/GetSysMetrics.c b/reactos/apps/tests/tests/GetSysMetrics/GetSysMetrics.c
new file mode 100644 (file)
index 0000000..918dc7c
--- /dev/null
+++ b/reactos/apps/tests/tests/GetSysMetrics/GetSysMetrics.c
@@ -0,0 +1,102 @@
+/*
+ * Simple program to display the Windows System Metrics.
+ *
+ * This source code is in the PUBLIC DOMAIN and has NO WARRANTY.
+ *
+ * Robert Dickenson <robd@reactos.org>, July 11, 2002.
+ */
+#include <stdio.h>
+#include <windows.h>
+
+
+int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
+{
+       fprintf(stderr,"Windows System Metric:\t  Value\n");
+
+       fprintf(stderr,"    SM_ARRANGE:\t\t  %d\n", GetSystemMetrics(SM_ARRANGE));
+       fprintf(stderr,"    SM_CLEANBOOT:\t  %d\n", GetSystemMetrics(SM_CLEANBOOT));
+//     fprintf(stderr,"    SM_CMONITORS:\t  %d\n", GetSystemMetrics(SM_CMONITORS));
+       fprintf(stderr,"    SM_CMOUSEBUTTONS:\t  %d\n", GetSystemMetrics(SM_CMOUSEBUTTONS));
+       fprintf(stderr,"    SM_CXBORDER:\t  %d\n", GetSystemMetrics(SM_CXBORDER));
+       fprintf(stderr,"    SM_CYBORDER:\t  %d\n", GetSystemMetrics(SM_CYBORDER));
+       fprintf(stderr,"    SM_CXCURSOR:\t  %d\n", GetSystemMetrics(SM_CXCURSOR));
+       fprintf(stderr,"    SM_CYCURSOR:\t  %d\n", GetSystemMetrics(SM_CYCURSOR));
+       fprintf(stderr,"    SM_CXDLGFRAME:\t  %d\n", GetSystemMetrics(SM_CXDLGFRAME));
+       fprintf(stderr,"    SM_CYDLGFRAME:\t  %d\n", GetSystemMetrics(SM_CYDLGFRAME));
+       fprintf(stderr,"    SM_CXDOUBLECLK:\t  %d\n", GetSystemMetrics(SM_CXDOUBLECLK));
+       fprintf(stderr,"    SM_CYDOUBLECLK:\t  %d\n", GetSystemMetrics(SM_CYDOUBLECLK));
+       fprintf(stderr,"    SM_CXDRAG:\t\t  %d\n", GetSystemMetrics(SM_CXDRAG));
+       fprintf(stderr,"    SM_CYDRAG:\t\t  %d\n", GetSystemMetrics(SM_CYDRAG));
+       fprintf(stderr,"    SM_CXEDGE:\t\t  %d\n", GetSystemMetrics(SM_CXEDGE));
+       fprintf(stderr,"    SM_CYEDGE:\t\t  %d\n", GetSystemMetrics(SM_CYEDGE));
+       fprintf(stderr,"    SM_CXFIXEDFRAME:\t  %d\n", GetSystemMetrics(SM_CXFIXEDFRAME));
+       fprintf(stderr,"    SM_CYFIXEDFRAME:\t  %d\n", GetSystemMetrics(SM_CYFIXEDFRAME));
+       fprintf(stderr,"    SM_CXFRAME:\t\t  %d\n", GetSystemMetrics(SM_CXFRAME));
+       fprintf(stderr,"    SM_CYFRAME:\t\t  %d\n", GetSystemMetrics(SM_CYFRAME));
+       fprintf(stderr,"    SM_CXFULLSCREEN:\t  %d\n", GetSystemMetrics(SM_CXFULLSCREEN));
+       fprintf(stderr,"    SM_CYFULLSCREEN:\t  %d\n", GetSystemMetrics(SM_CYFULLSCREEN));
+       fprintf(stderr,"    SM_CXHSCROLL:\t  %d\n", GetSystemMetrics(SM_CXHSCROLL));
+       fprintf(stderr,"    SM_CYHSCROLL:\t  %d\n", GetSystemMetrics(SM_CYHSCROLL));
+       fprintf(stderr,"    SM_CXHTHUMB:\t  %d\n", GetSystemMetrics(SM_CXHTHUMB));
+       fprintf(stderr,"    SM_CXICON:\t\t  %d\n", GetSystemMetrics(SM_CXICON));
+       fprintf(stderr,"    SM_CYICON:\t\t  %d\n", GetSystemMetrics(SM_CYICON));
+       fprintf(stderr,"    SM_CXICONSPACING:\t  %d\n", GetSystemMetrics(SM_CXICONSPACING));
+       fprintf(stderr,"    SM_CYICONSPACING:\t  %d\n", GetSystemMetrics(SM_CYICONSPACING));
+       fprintf(stderr,"    SM_CXMAXIMIZED:\t  %d\n", GetSystemMetrics(SM_CXMAXIMIZED));
+       fprintf(stderr,"    SM_CYMAXIMIZED:\t  %d\n", GetSystemMetrics(SM_CYMAXIMIZED));
+       fprintf(stderr,"    SM_CXMAXTRACK:\t  %d\n", GetSystemMetrics(SM_CXMAXTRACK));
+       fprintf(stderr,"    SM_CYMAXTRACK:\t  %d\n", GetSystemMetrics(SM_CYMAXTRACK));
+       fprintf(stderr,"    SM_CXMENUCHECK:\t  %d\n", GetSystemMetrics(SM_CXMENUCHECK));
+       fprintf(stderr,"    SM_CYMENUCHECK:\t  %d\n", GetSystemMetrics(SM_CYMENUCHECK));
+       fprintf(stderr,"    SM_CXMENUSIZE:\t  %d\n", GetSystemMetrics(SM_CXMENUSIZE));
+       fprintf(stderr,"    SM_CYMENUSIZE:\t  %d\n", GetSystemMetrics(SM_CYMENUSIZE));
+       fprintf(stderr,"    SM_CXMIN:\t\t  %d\n", GetSystemMetrics(SM_CXMIN));
+       fprintf(stderr,"    SM_CYMIN:\t\t  %d\n", GetSystemMetrics(SM_CYMIN));
+       fprintf(stderr,"    SM_CXMINIMIZED:\t  %d\n", GetSystemMetrics(SM_CXMINIMIZED));
+       fprintf(stderr,"    SM_CYMINIMIZED:\t  %d\n", GetSystemMetrics(SM_CYMINIMIZED));
+       fprintf(stderr,"    SM_CXMINSPACING:\t  %d\n", GetSystemMetrics(SM_CXMINSPACING));
+       fprintf(stderr,"    SM_CYMINSPACING:\t  %d\n", GetSystemMetrics(SM_CYMINSPACING));
+       fprintf(stderr,"    SM_CXMINTRACK:\t  %d\n", GetSystemMetrics(SM_CXMINTRACK));
+       fprintf(stderr,"    SM_CYMINTRACK:\t  %d\n", GetSystemMetrics(SM_CYMINTRACK));
+       fprintf(stderr,"    SM_CXSCREEN:\t  %d\n", GetSystemMetrics(SM_CXSCREEN));
+       fprintf(stderr,"    SM_CYSCREEN:\t  %d\n", GetSystemMetrics(SM_CYSCREEN));
+       fprintf(stderr,"    SM_CXSIZE:\t\t  %d\n", GetSystemMetrics(SM_CXSIZE));
+       fprintf(stderr,"    SM_CYSIZE:\t\t  %d\n", GetSystemMetrics(SM_CYSIZE));
+       fprintf(stderr,"    SM_CXSIZEFRAME:\t  %d\n", GetSystemMetrics(SM_CXSIZEFRAME));
+       fprintf(stderr,"    SM_CYSIZEFRAME:\t  %d\n", GetSystemMetrics(SM_CYSIZEFRAME));
+
+       fprintf(stderr,"    SM_CXSMICON:\t  %d\n", GetSystemMetrics(SM_CXSMICON));
+       fprintf(stderr,"    SM_CYSMICON:\t  %d\n", GetSystemMetrics(SM_CYSMICON));
+       fprintf(stderr,"    SM_CXSMSIZE:\t  %d\n", GetSystemMetrics(SM_CXSMSIZE));
+       fprintf(stderr,"    SM_CYSMSIZE:\t  %d\n", GetSystemMetrics(SM_CYSMSIZE));
+//     fprintf(stderr,"    SM_CXVIRTUALSCREEN:\t  %d\n", GetSystemMetrics(SM_CXVIRTUALSCREEN));
+//     fprintf(stderr,"    SM_CYVIRTUALSCREEN:\t  %d\n", GetSystemMetrics(SM_CYVIRTUALSCREEN));
+       fprintf(stderr,"    SM_CXVSCROLL:\t  %d\n", GetSystemMetrics(SM_CXVSCROLL));
+       fprintf(stderr,"    SM_CYVSCROLL:\t  %d\n", GetSystemMetrics(SM_CYVSCROLL));
+       fprintf(stderr,"    SM_CYCAPTION:\t  %d\n", GetSystemMetrics(SM_CYCAPTION));
+       fprintf(stderr,"    SM_CYKANJIWINDOW:\t  %d\n", GetSystemMetrics(SM_CYKANJIWINDOW));
+       fprintf(stderr,"    SM_CYMENU:\t\t  %d\n", GetSystemMetrics(SM_CYMENU));
+       fprintf(stderr,"    SM_CYSMCAPTION:\t  %d\n", GetSystemMetrics(SM_CYSMCAPTION));
+       fprintf(stderr,"    SM_CYVTHUMB:\t  %d\n", GetSystemMetrics(SM_CYVTHUMB));
+       fprintf(stderr,"    SM_DBCSENABLED:\t  %d\n", GetSystemMetrics(SM_DBCSENABLED));
+       fprintf(stderr,"    SM_DEBUG:\t\t  %d\n", GetSystemMetrics(SM_DEBUG));
+//     fprintf(stderr,"    SM_IMMENABLED:\t  %d\n", GetSystemMetrics(SM_IMMENABLED));
+
+    fprintf(stderr,"    SM_MENUDROPALIGNMENT: %d\n", GetSystemMetrics(SM_MENUDROPALIGNMENT));
+       fprintf(stderr,"    SM_MIDEASTENABLED:\t  %d\n", GetSystemMetrics(SM_MIDEASTENABLED));
+       fprintf(stderr,"    SM_MOUSEPRESENT:\t  %d\n", GetSystemMetrics(SM_MOUSEPRESENT));
+#ifndef _MSC_VER
+    fprintf(stderr,"    SM_MOUSEWHEELPRESENT: %d\n", GetSystemMetrics(SM_MOUSEWHEELPRESENT));
+#endif
+    fprintf(stderr,"    SM_NETWORK:\t\t  %d\n", GetSystemMetrics(SM_NETWORK));
+       fprintf(stderr,"    SM_PENWINDOWS:\t  %d\n", GetSystemMetrics(SM_PENWINDOWS));
+//     fprintf(stderr,"    SM_REMOTESESSION:\t  %d\n", GetSystemMetrics(SM_REMOTESESSION));
+    fprintf(stderr,"    SM_SECURE:\t\t  %d\n", GetSystemMetrics(SM_SECURE));
+//     fprintf(stderr,"    SM_SAMEDISPLAYFORMAT:  %d\n", GetSystemMetrics(SM_SAMEDISPLAYFORMAT));
+       fprintf(stderr,"    SM_SHOWSOUNDS:\t  %d\n", GetSystemMetrics(SM_SHOWSOUNDS));
+       fprintf(stderr,"    SM_SLOWMACHINE:\t  %d\n", GetSystemMetrics(SM_SLOWMACHINE));
+       fprintf(stderr,"    SM_SWAPBUTTON:\t  %d\n", GetSystemMetrics(SM_SWAPBUTTON));
+//     fprintf(stderr,"    SM_XVIRTUALSCREEN:  %d\n", GetSystemMetrics(SM_XVIRTUALSCREEN));
+//     fprintf(stderr,"    SM_YVIRTUALSCREEN:  %d\n", GetSystemMetrics(SM_YVIRTUALSCREEN));
+       return 0;
+}

diff --git a/reactos/apps/tests/tests/GetSysMetrics/Makefile b/reactos/apps/tests/tests/GetSysMetrics/Makefile
new file mode 100644 (file)
index 0000000..942eb80
--- /dev/null
+++ b/reactos/apps/tests/tests/GetSysMetrics/Makefile
@@ -0,0 +1,20 @@
+
+PATH_TO_TOP = ../../../..
+
+TARGET_NORC = yes
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = GetSysMetrics
+
+TARGET_SDKLIBS = user32.a
+
+TARGET_OBJECTS = $(TARGET_NAME).o
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF

diff --git a/reactos/apps/tests/tests/GetSystemInfo/Makefile b/reactos/apps/tests/tests/GetSystemInfo/Makefile
index cb0c26b..5c0d019 100644 (file)
--- a/reactos/apps/tests/tests/GetSystemInfo/Makefile
+++ b/reactos/apps/tests/tests/GetSystemInfo/Makefile
@@ -1,7 +1,7 @@
 #
 #
 #
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../../../..
 
 PROGS = GetSystemInfo
 
@@ -23,4 +23,4 @@ GetSystemInfo.exe: $(OBJECTS)
        $(CC) $(CFLAGS) $(OBJECTS) $(LIBS) -o GetSystemInfo.exe
        $(NM) --numeric-sort GetSystemInfo.exe > GetSystemInfo.sym
 
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak

diff --git a/reactos/apps/tests/tests/Mutex/Makefile b/reactos/apps/tests/tests/Mutex/Makefile
index 02574fb..be53e57 100644 (file)
--- a/reactos/apps/tests/tests/Mutex/Makefile
+++ b/reactos/apps/tests/tests/Mutex/Makefile
@@ -2,7 +2,7 @@
 # Mutex Benchmarks from the Wineserver Linux Kernel Module
 #
 
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../../../..
 
 PROGS =  fivemutex rapidmutex 
 
@@ -23,4 +23,4 @@ rapidmutex.exe: rapidmutex.c
        $(CC) rapidmutex.c -lkernel32 -o rapidmutex.exe
        $(NM) --numeric-sort rapidmutex.exe > rapidmutex.sym
 
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak

diff --git a/reactos/apps/tests/tests/Parent_Child/Makefile b/reactos/apps/tests/tests/Parent_Child/Makefile
index 6200273..a84da11 100644 (file)
--- a/reactos/apps/tests/tests/Parent_Child/Makefile
+++ b/reactos/apps/tests/tests/Parent_Child/Makefile
@@ -1,13 +1,13 @@
 #
 #
 #
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../../../..
 
 PROGS = Parent_Child
 
 OBJECTS = Parent_Child.o
 
-LIBS = ../../../dk/w32/lib/gdi32.a 
+LIBS = $(PATH_TO_TOP)/dk/w32/lib/gdi32.a 
 CFLAGS =
 
 all: $(PROGS:%=%.exe)
@@ -23,4 +23,4 @@ Parent_Child.exe: $(OBJECTS)
        $(CC) $(CFLAGS) -Wl,--subsystem,windows $(OBJECTS) $(LIBS) -o Parent_Child.exe
        $(NM) --numeric-sort Parent_Child.exe > Parent_Child.sym
 
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak

diff --git a/reactos/apps/tests/tests/guitest/Makefile b/reactos/apps/tests/tests/guitest/Makefile
index 875f710..9461982 100644 (file)
--- a/reactos/apps/tests/tests/guitest/Makefile
+++ b/reactos/apps/tests/tests/guitest/Makefile
@@ -1,13 +1,13 @@
 #
 #
 #
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../../../..
 
 PROGS = guitest
 
 OBJECTS = guitest.o 
 
-LIBS = ../../../dk/w32/lib/gdi32.a 
+LIBS = $(PATH_TO_TOP)/dk/w32/lib/gdi32.a 
 CFLAGS =
 
 all: $(PROGS:%=%.exe)
@@ -33,4 +33,4 @@ guitest.exe: $(OBJECTS)
        $(CC) $(CFLAGS) -Wl,--subsystem,windows $(OBJECTS) $(LIBS) -o guitest.exe
        $(NM) --numeric-sort guitest.exe > guitest.sym
 
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak

diff --git a/reactos/apps/tests/tests/hello/Makefile b/reactos/apps/tests/tests/hello/Makefile
index fd2ed90..8052c7f 100644 (file)
--- a/reactos/apps/tests/tests/hello/Makefile
+++ b/reactos/apps/tests/tests/hello/Makefile
@@ -1,13 +1,13 @@
 #
 #
 #
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../../../..
 
 PROGS = hello
 
 OBJECTS = hello.o
 
-LIBS = ../../../dk/w32/lib/gdi32.a 
+LIBS = $(PATH_TO_TOP)/dk/w32/lib/gdi32.a 
 CFLAGS =
 
 all: $(PROGS:%=%.exe)
@@ -23,4 +23,4 @@ hello.exe: $(OBJECTS)
        $(CC) $(CFLAGS) -Wl,--subsystem,windows $(OBJECTS) $(LIBS) -o hello.exe
        $(NM) --numeric-sort hello.exe > hello.sym
 
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak

diff --git a/reactos/apps/tests/tests/hello2/Makefile b/reactos/apps/tests/tests/hello2/Makefile
index 3566f89..6929eaa 100644 (file)
--- a/reactos/apps/tests/tests/hello2/Makefile
+++ b/reactos/apps/tests/tests/hello2/Makefile
@@ -1,7 +1,7 @@
 #
 #
 #
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../../../..
 
 PROGS = hello2
 
@@ -23,4 +23,4 @@ hello2.exe: $(OBJECTS)
        $(CC) $(CFLAGS) -Wl,--subsystem,windows $(OBJECTS) $(LIBS) -o hello2.exe
        $(NM) --numeric-sort hello2.exe > hello2.sym
 
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak

diff --git a/reactos/apps/tests/tests/make_install.bat b/reactos/apps/tests/tests/make_install.bat
index c24b63b..057e6c0 100644 (file)
--- a/reactos/apps/tests/tests/make_install.bat
+++ b/reactos/apps/tests/tests/make_install.bat
@@ -5,6 +5,9 @@ REM
 
 REM - Make System
 
+cd GetSysMetrics
+make
+cd ..
 cd GetSystemInfo
 make
 cd ..
@@ -35,14 +38,14 @@ cd ..
 
 REM - installs
 
-mkdir C:\tests
-copy GetSystemInfo\GetSystemInfo.exe  C:\tests
-copy guitest\guitest.exe C:\tests
-copy hello\hello.exe C:\tests
-copy hello2\hello2.exe C:\tests
-copy Mutex\fivemutex.exe C:\tests
-copy Mutex\rapidmutex.exe C:\tests
-copy Parent_Child\Parent_Child.exe C:\tests
-copy rolex\rolex.exe C:\tests
-copy volinfo\volinfo.exe C:\tests
+mkdir C:\reactos\bin\tests
+copy GetSystemInfo\GetSystemInfo.exe  C:\reactos\bin\tests
+copy guitest\guitest.exe C:\reactos\bin\tests
+copy hello\hello.exe C:\reactos\bin\tests
+copy hello2\hello2.exe C:\reactos\bin\tests
+copy Mutex\fivemutex.exe C:\reactos\bin\tests
+copy Mutex\rapidmutex.exe C:\reactos\bin\tests
+copy Parent_Child\Parent_Child.exe C:\reactos\bin\tests
+copy rolex\rolex.exe C:\reactos\bin\tests
+copy volinfo\volinfo.exe C:\reactos\bin\tests
 

diff --git a/reactos/apps/tests/tests/new/Makefile b/reactos/apps/tests/tests/new/Makefile
index cc6db5b..f1efe38 100644 (file)
--- a/reactos/apps/tests/tests/new/Makefile
+++ b/reactos/apps/tests/tests/new/Makefile
@@ -1,13 +1,13 @@
 #
 #
 #
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../../../..
 
 PROGS = new
 
 OBJECTS = new.o
 
-LIBS = ../../../dk/w32/lib/gdi32.a 
+LIBS = $(PATH_TO_TOP)/dk/w32/lib/gdi32.a 
 CFLAGS =
 
 all: $(PROGS:%=%.exe)
@@ -23,4 +23,4 @@ new.exe: $(OBJECTS)
        $(CC) $(CFLAGS) -Wl,--subsystem,windows $(OBJECTS) $(LIBS) -o new.exe
        $(NM) --numeric-sort new.exe > new.sym
 
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak

diff --git a/reactos/apps/tests/tests/readme.txt b/reactos/apps/tests/tests/readme.txt
index a77a49a..2da5f58 100644 (file)
--- a/reactos/apps/tests/tests/readme.txt
+++ b/reactos/apps/tests/tests/readme.txt
@@ -4,7 +4,7 @@ work great under Win9x,NT,2k and XP. I've fixed and renamed a few
 of these because the old names didn't really describe them.
 
 If you feel like messing with this just type make_install and 
-everything will be installed to C:\tests
+everything will be installed to C:\reactos\bin\tests
 
 TESTS -
 GetSystemInfo: Reads from kernel32.dll

diff --git a/reactos/apps/tests/tests/rolex/Makefile b/reactos/apps/tests/tests/rolex/Makefile
index 385c985..7cbb5a0 100644 (file)
--- a/reactos/apps/tests/tests/rolex/Makefile
+++ b/reactos/apps/tests/tests/rolex/Makefile
@@ -1,13 +1,13 @@
 #
 #
 #
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../../../..
 
 PROGS = rolex
 
 OBJECTS = rolex.o
 
-LIBS = ../../../dk/w32/lib/gdi32.a 
+LIBS = $(PATH_TO_TOP)/dk/w32/lib/gdi32.a 
 CFLAGS =
 
 all: $(PROGS:%=%.exe)
@@ -36,4 +36,4 @@ rolex.exe: $(OBJECTS)
 #%.coff: %.rc
 #      $(RC) $(RCINC) $< -o $@
 
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak

diff --git a/reactos/apps/tests/tests/volinfo/Makefile b/reactos/apps/tests/tests/volinfo/Makefile
index f9e93f1..3a37271 100644 (file)
--- a/reactos/apps/tests/tests/volinfo/Makefile
+++ b/reactos/apps/tests/tests/volinfo/Makefile
@@ -1,7 +1,7 @@
 #
 #
 #
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../../../..
 
 PROGS = volinfo
 
@@ -33,4 +33,4 @@ volinfo.exe: $(OBJECTS)
        $(CC) $(CFLAGS) -Wl,--subsystem,windows $(OBJECTS) $(LIBS) -o volinfo.exe
        $(NM) --numeric-sort volinfo.exe > volinfo.sym
 
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak