fix all but about 8 out of 91 tests. Correct resource usage in xml, fix win32gui vs win32cui mode on most test xml

svn path=/trunk/; revision=19235
2025-08-02 06:15:52 +00:00 · 2005-11-14 23:44:15 +00:00 · 2005-11-14 23:44:15 +00:00 · 5b3baf7c14
commit 5b3baf7c14
parent 5fe4aeec65
40 changed files with 66 additions and 50 deletions
--- a/rosapps/tests/alive/alive.xml
+++ b/rosapps/tests/alive/alive.xml
@ -1,4 +1,4 @@
-<module name="alive" type="win32gui" installbase="bin" installname="alive.exe">
+<module name="alive" type="win32cui" installbase="bin" installname="alive.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/apc/apc.xml
+++ b/rosapps/tests/apc/apc.xml
@ -1,4 +1,4 @@
-<module name="apc" type="win32gui" installbase="bin" installname="apc.exe">
+<module name="apc" type="win32cui" installbase="bin" installname="apc.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/apc2/apc2.xml
+++ b/rosapps/tests/apc2/apc2.xml
@ -1,4 +1,4 @@
-<module name="apc2" type="win32gui" installbase="bin" installname="apc2.exe">
+<module name="apc2" type="win32cui" installbase="bin" installname="apc2.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/args/args.xml
+++ b/rosapps/tests/args/args.xml
@ -1,4 +1,4 @@
-<module name="args" type="win32gui" installbase="bin" installname="args.exe">
+<module name="args" type="win32cui" installbase="bin" installname="args.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/atomtest/atomtest.xml
+++ b/rosapps/tests/atomtest/atomtest.xml
@ -1,4 +1,4 @@
-<module name="atomtest" type="win32gui" installbase="bin" installname="atomtest.exe">
+<module name="atomtest" type="win32cui" installbase="bin" installname="atomtest.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/bench/bench.xml
+++ b/rosapps/tests/bench/bench.xml
@ -1,4 +1,4 @@
-<module name="bench-thread" type="win32gui" installbase="bin" installname="bench-thread.exe">
+<module name="bench-thread" type="win32cui" installbase="bin" installname="bench-thread.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/capclock/capclock.rc
+++ b/rosapps/tests/capclock/capclock.rc
@ -1,4 +1,4 @@
-/* $Id: capclock.rc,v 1.1 2004/10/21 05:11:59 sedwards Exp $ */
+/* $Id$ */

 #include <windows.h>

--- a/rosapps/tests/capclock/capclock.xml
+++ b/rosapps/tests/capclock/capclock.xml
@ -2,6 +2,7 @@
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
+	<include base="capclock">.</include>
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>capclock.c</file>
--- a/rosapps/tests/carets/carets.xml
+++ b/rosapps/tests/carets/carets.xml
@ -2,9 +2,10 @@
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
+	<include base="carets">.</include>
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>ntdll</library>
 	<file>carets.c</file>
-	<efile>carets.rc</efile>
+	<file>carets.rc</file>
 </module>
--- a/rosapps/tests/consume/consume.xml
+++ b/rosapps/tests/consume/consume.xml
@ -1,4 +1,4 @@
-<module name="consume" type="win32gui" installbase="bin" installname="consume.exe">
+<module name="consume" type="win32cui" installbase="bin" installname="consume.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/copymove/copymove.xml
+++ b/rosapps/tests/copymove/copymove.xml
@ -1,4 +1,4 @@
-<module name="copymove" type="win32gui" installbase="bin" installname="copymove.exe">
+<module name="copymove" type="win32cui" installbase="bin" installname="copymove.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/count/count.xml
+++ b/rosapps/tests/count/count.xml
@ -1,4 +1,4 @@
-<module name="count" type="win32gui" installbase="bin" installname="count.exe">
+<module name="count" type="win32cui" installbase="bin" installname="count.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/create-links/create-links.xml
+++ b/rosapps/tests/create-links/create-links.xml
@ -1,4 +1,4 @@
-<module name="create-links" type="win32gui" installbase="bin" installname="create-links.exe">
+<module name="create-links" type="win32cui" installbase="bin" installname="create-links.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/dirdlg/dirdlg.xml
+++ b/rosapps/tests/dirdlg/dirdlg.xml
@ -2,8 +2,9 @@
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
+	<include base="dirdlg">.</include>
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>dirdlg.c</file>
-	<efile>dirdlg.rc</efile>
+	<file>dirdlg.rc</file>
 </module>
--- a/rosapps/tests/directory.xml
+++ b/rosapps/tests/directory.xml
@ -195,7 +195,6 @@

 <!-- fixme: regtest -->

-<!--
 <directory name="sectest">
 	<xi:include href="sectest/sectest.xml" />
 </directory>
@ -206,7 +205,7 @@
 	<xi:include href="shaptest/shaptest.xml" />
 </directory>

-fixme: shm
+<!-- fixme: shm -->

 <directory name="statst">
 	<xi:include href="statst/statst.xml" />
@ -241,9 +240,9 @@ fixme: shm
 <directory name="tmrqueue">
 	<xi:include href="tmrqueue/tmrqueue.xml" />
 </directory>
-<directory name="tokentest">
-	<xi:include href="tokentest/tokentest.xml" />
-</directory>
+
+<!-- fixme: tokentest -->
+
 <directory name="txtscale">
 	<xi:include href="txtscale/txtscale.xml" />
 </directory>
@ -262,10 +261,8 @@ fixme: shm
 <directory name="wm_paint">
 	<xi:include href="wm_paint/wm_paint.xml" />
 </directory>
-<directory name="wpickclick">
-	<xi:include href="wpickclick/wpickclick.xml" />
-</directory>
-<directory name="zwcontinue">
-	<xi:include href="zwcontinue/zwcontinue.xml" />
-</directory>
-->
+
+<!-- fixme: wpickclick.xml -->
+
+<!-- fixme: zwcontinue -->
+
--- a/rosapps/tests/diskspeed/diskspeed.xml
+++ b/rosapps/tests/diskspeed/diskspeed.xml
@ -1,4 +1,4 @@
-<module name="diskspeed" type="win32gui" installbase="bin" installname="diskspeed.exe">
+<module name="diskspeed" type="win32cui" installbase="bin" installname="diskspeed.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/dnsapi/dnsapi.xml
+++ b/rosapps/tests/dnsapi/dnsapi.xml
@ -1,4 +1,4 @@
-<module name="dnsapitst" type="win32gui" installbase="bin" installname="dnsapitst.exe">
+<module name="dnsapitst" type="win32cui" installbase="bin" installname="dnsapitst.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/fiber/fiber.xml
+++ b/rosapps/tests/fiber/fiber.xml
@ -1,4 +1,4 @@
-<module name="fiber" type="win32gui" installbase="bin" installname="fiber.exe">
+<module name="fiber" type="win32cui" installbase="bin" installname="fiber.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/icontest/icontest.xml
+++ b/rosapps/tests/icontest/icontest.xml
@ -2,9 +2,10 @@
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
+	<include base="icontest">.</include>
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>ntdll</library>
 	<file>icontest.c</file>
-	<efile>icontest.rc</efile>
+	<file>icontest.rc</file>
 </module>
--- a/rosapps/tests/isotest/isotest.xml
+++ b/rosapps/tests/isotest/isotest.xml
@ -1,4 +1,4 @@
-<module name="isotest" type="win32gui" installbase="bin" installname="isotest.exe">
+<module name="isotest" type="win32cui" installbase="bin" installname="isotest.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/mdi/mdi.xml
+++ b/rosapps/tests/mdi/mdi.xml
@ -2,10 +2,11 @@
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
+	<include base="mdi">.</include>
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
 	<library>comdlg32</library>
 	<file>mdi.c</file>
-	<efile>mdi.rc</efile>
+	<file>mdi.rc</file>
 </module>
--- a/rosapps/tests/miditest/miditest.rc
+++ b/rosapps/tests/miditest/miditest.rc
@ -1,5 +1,5 @@
 #include <windows.h>
-#include <reactos/resource.h>
+//#include <reactos/resource.h>
 #include "resource.h"

 IDR_MAINMENU MENU DISCARDABLE 
--- a/rosapps/tests/miditest/miditest.xml
+++ b/rosapps/tests/miditest/miditest.xml
@ -2,8 +2,8 @@
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
+	<include base="miditest">.</include>
 	<library>kernel32</library>
 	<library>winmm</library>
 	<file>miditest.c</file>
-	<efile>miditest.rc</efile>
 </module>
--- a/rosapps/tests/moztest/moztest.xml
+++ b/rosapps/tests/moztest/moztest.xml
@ -1,4 +1,4 @@
-<module name="moztest" type="win32gui" installbase="bin" installname="moztest.exe">
+<module name="moztest" type="win32cui" installbase="bin" installname="moztest.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/nameserverlist/nameserverlist.xml
+++ b/rosapps/tests/nameserverlist/nameserverlist.xml
@ -1,4 +1,4 @@
-<module name="nameserverlist" type="win32gui" installbase="bin" installname="nameserverlist.exe">
+<module name="nameserverlist" type="win32cui" installbase="bin" installname="nameserverlist.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/noexecute/noexecute.xml
+++ b/rosapps/tests/noexecute/noexecute.xml
@ -1,4 +1,4 @@
-<module name="noexecute" type="win32gui" installbase="bin" installname="noexecute.exe">
+<module name="noexecute" type="win32cui" installbase="bin" installname="noexecute.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/popupmenu/popupmenu.xml
+++ b/rosapps/tests/popupmenu/popupmenu.xml
@ -2,8 +2,9 @@
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
+	<include base="popupmenu">.</include>
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>popupmenu.c</file>
-	<efile>popupmenu.rc</efile>
+	<file>popupmenu.rc</file>
 </module>
--- a/rosapps/tests/sertest/sertest.c
+++ b/rosapps/tests/sertest/sertest.c
@ -1,6 +1,8 @@
 #include <windows.h>
 #include <stdio.h>

+#include <tchar.h>
+
 #define BUFSIZE 128
 #define MAX_PORTNAME_LEN 20
 #define APP_VERSION_STR "0.01"
--- a/rosapps/tests/sertest/sertest.xml
+++ b/rosapps/tests/sertest/sertest.xml
@ -1,4 +1,4 @@
-<module name="sertest" type="win32gui" installbase="bin" installname="sertest.exe">
+<module name="sertest" type="win32gui" installbase="bin" installname="sertest.exe" allowwarnings="true">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/subclass/subclass.xml
+++ b/rosapps/tests/subclass/subclass.xml
@ -1,4 +1,4 @@
-<module name="subclass" type="win32gui" installbase="bin" installname="subclass.exe">
+<module name="subclass" type="win32gui" installbase="bin" installname="subclass.exe" allowwarnings="true">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/suspend/suspend.c
+++ b/rosapps/tests/suspend/suspend.c
@ -1,11 +1,10 @@
 #define UNICODE

-#define NTOS_MODE_USER
-#include <ntos.h>
 #include <windows.h>
 #include <stdio.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>

-#define DBG
 #define NDEBUG
 #include <debug.h>

--- a/rosapps/tests/tcpsvr/tcpsvr.xml
+++ b/rosapps/tests/tcpsvr/tcpsvr.xml
@ -1,8 +1,8 @@
-<module name="tcpsvr" type="win32gui" installbase="bin" installname="tcpsvr.exe">
+<module name="tcpsvr" type="win32cui" installbase="bin" installname="tcpsvr.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
-	<library>gdi32</library>
+	<library>ws2_32</library>
 	<file>tcpsvr.c</file>
 </module>
--- a/rosapps/tests/terminate/terminate.c
+++ b/rosapps/tests/terminate/terminate.c
@ -1,11 +1,10 @@
 #define UNICODE

-#define NTOS_MODE_USER
-#include <ntos.h>
 #include <windows.h>
 #include <stdio.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>

-#define DBG
 #define NDEBUG
 #include <debug.h>

--- a/rosapps/tests/terminate/terminate.xml
+++ b/rosapps/tests/terminate/terminate.xml
@ -1,4 +1,4 @@
-<module name="terminate" type="win32gui" installbase="bin" installname="terminate.exe">
+<module name="terminate" type="win32cui" installbase="bin" installname="terminate.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/threadwait/threadwait.c
+++ b/rosapps/tests/threadwait/threadwait.c
@ -7,6 +7,9 @@
 #include <windows.h>
 #include <stdio.h>

+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
 DWORD __stdcall threadfunc(void* UNREFERENCED)
 {
 	printf("Thread: Initialized\n");
--- a/rosapps/tests/threadwait/threadwait.xml
+++ b/rosapps/tests/threadwait/threadwait.xml
@ -3,6 +3,6 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
-	<library>gdi32</library>
+	<library>ntdll</library>
 	<file>threadwait.c</file>
 </module>
--- a/rosapps/tests/tokentest/tokentest.c
+++ b/rosapps/tests/tokentest/tokentest.c
@ -5,6 +5,10 @@
 #include <windows.h>
 #include <stdlib.h>

+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
+
 #define INCLUDE_THE_DDK_HEADERS
 #ifdef INCLUDE_THE_DDK_HEADERS
 #include <ddk/ntddk.h>
@ -107,6 +111,7 @@ ZwCreateToken(
 	);
 #define NT_SUCCESS(StatCode)  ((NTSTATUS)(StatCode) >= 0)
 #endif
+
 #include <stdio.h>

 #define INITIAL_PRIV_ENABLED SE_PRIVILEGE_ENABLED_BY_DEFAULT|SE_PRIVILEGE_ENABLED
--- a/rosapps/tests/txtscale/txtscale.xml
+++ b/rosapps/tests/txtscale/txtscale.xml
@ -4,6 +4,7 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
+	<library>comctl32</library>
 	<file>txtscale.cpp</file>
 	<file>mk_font.cpp</file>
 </module>
--- a/rosapps/tests/vmtest/vmtest.xml
+++ b/rosapps/tests/vmtest/vmtest.xml
@ -1,4 +1,4 @@
-<module name="vmtest" type="win32gui" installbase="bin" installname="vmtest.exe">
+<module name="vmtest" type="win32cui" installbase="bin" installname="vmtest.exe" allowwarnings="true">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
--- a/rosapps/tests/winhello/winhello.c
+++ b/rosapps/tests/winhello/winhello.c
@ -26,6 +26,10 @@
 * ????????
 */

+#ifndef VK_C
+#define VK_C 'C'
+#endif
+
 #include <windows.h>
 #include <stdio.h>
 #include <tchar.h>