From 05e9c14dff4ce47416f24afa4fdeb0555dbe6978 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Fri, 11 Nov 2005 22:25:19 +0000
Subject: [PATCH] add all of the new xml makefiles to the directory.xml thereby
 breaking rosapps for a bit. Move some stuff around to avoid naming conflicts.

svn path=/trunk/; revision=19153
---
 .../button2/{accelerator.xml => button2.xml}  |   0
 rosapps/tests/{combo => combotst}/combotst.c  |   0
 .../tests/{combo => combotst}/combotst.xml    |   0
 rosapps/tests/{combo => combotst}/utils.c     |   0
 rosapps/tests/{combo => combotst}/utils.h     |   0
 rosapps/tests/directory.xml                   | 266 ++++++++++++++++++
 rosapps/tests/fiber/fiber.xml                 |   4 +-
 rosapps/tests/{lan => lantst}/lantest.cpp     |   0
 rosapps/tests/{lan => lantst}/lantest.xml     |   0
 rosapps/tests/{lpc => lpctst}/conport.c       |   0
 rosapps/tests/{lpc => lpctst}/creport.c       |   0
 rosapps/tests/{lpc => lpctst}/dumpinfo.c      |   0
 rosapps/tests/{lpc => lpctst}/dumpinfo.h      |   0
 rosapps/tests/{lpc => lpctst}/lpcclt.c        |   0
 rosapps/tests/{lpc => lpctst}/lpcsrv.c        |   0
 rosapps/tests/{lpc => lpctst}/lpctest.h       |   0
 rosapps/tests/{lpc => lpctst}/lpctst.xml      |   0
 rosapps/tests/wclickat/wclickat.xml           |  10 +
 rosapps/tests/wpickclick/wpickclick.xml       |  10 +
 19 files changed, 288 insertions(+), 2 deletions(-)
 rename rosapps/tests/button2/{accelerator.xml => button2.xml} (100%)
 rename rosapps/tests/{combo => combotst}/combotst.c (100%)
 rename rosapps/tests/{combo => combotst}/combotst.xml (100%)
 rename rosapps/tests/{combo => combotst}/utils.c (100%)
 rename rosapps/tests/{combo => combotst}/utils.h (100%)
 rename rosapps/tests/{lan => lantst}/lantest.cpp (100%)
 rename rosapps/tests/{lan => lantst}/lantest.xml (100%)
 rename rosapps/tests/{lpc => lpctst}/conport.c (100%)
 rename rosapps/tests/{lpc => lpctst}/creport.c (100%)
 rename rosapps/tests/{lpc => lpctst}/dumpinfo.c (100%)
 rename rosapps/tests/{lpc => lpctst}/dumpinfo.h (100%)
 rename rosapps/tests/{lpc => lpctst}/lpcclt.c (100%)
 rename rosapps/tests/{lpc => lpctst}/lpcsrv.c (100%)
 rename rosapps/tests/{lpc => lpctst}/lpctest.h (100%)
 rename rosapps/tests/{lpc => lpctst}/lpctst.xml (100%)
 create mode 100644 rosapps/tests/wclickat/wclickat.xml
 create mode 100644 rosapps/tests/wpickclick/wpickclick.xml

diff --git a/rosapps/tests/button2/accelerator.xml b/rosapps/tests/button2/button2.xml
similarity index 100%
rename from rosapps/tests/button2/accelerator.xml
rename to rosapps/tests/button2/button2.xml
diff --git a/rosapps/tests/combo/combotst.c b/rosapps/tests/combotst/combotst.c
similarity index 100%
rename from rosapps/tests/combo/combotst.c
rename to rosapps/tests/combotst/combotst.c
diff --git a/rosapps/tests/combo/combotst.xml b/rosapps/tests/combotst/combotst.xml
similarity index 100%
rename from rosapps/tests/combo/combotst.xml
rename to rosapps/tests/combotst/combotst.xml
diff --git a/rosapps/tests/combo/utils.c b/rosapps/tests/combotst/utils.c
similarity index 100%
rename from rosapps/tests/combo/utils.c
rename to rosapps/tests/combotst/utils.c
diff --git a/rosapps/tests/combo/utils.h b/rosapps/tests/combotst/utils.h
similarity index 100%
rename from rosapps/tests/combo/utils.h
rename to rosapps/tests/combotst/utils.h
diff --git a/rosapps/tests/directory.xml b/rosapps/tests/directory.xml
index 38e2606a3f3..4fe353f0f67 100644
--- a/rosapps/tests/directory.xml
+++ b/rosapps/tests/directory.xml
@@ -10,3 +10,269 @@
 <directory name="apc">
 	<xi:include href="apc/apc.xml" />
 </directory>
+<directory name="apc2">
+	<xi:include href="apc2/apc2.xml" />
+</directory>
+<directory name="args">
+	<xi:include href="args/args.xml" />
+</directory>
+<directory name="atomtest">
+	<xi:include href="atomtest/atomtest.xml" />
+</directory>
+<directory name="bench">
+	<xi:include href="bench/bench.xml" />
+</directory>
+<directory name="bitblt">
+	<xi:include href="bitblt/bitblt.xml" />
+</directory>
+<directory name="button">
+	<xi:include href="button/button.xml" />
+</directory>
+<directory name="button2">
+	<xi:include href="button2/button2.xml" />
+</directory>
+<directory name="capclock">
+	<xi:include href="capclock/capclock.xml" />
+</directory>
+<directory name="carets">
+	<xi:include href="carets/carets.xml" />
+</directory>
+<directory name="combotst">
+	<xi:include href="combotst/combotst.xml" />
+</directory>
+<directory name="consume">
+	<xi:include href="consume/consume.xml" />
+</directory>
+<directory name="copymove">
+	<xi:include href="copymove/copymove.xml" />
+</directory>
+<directory name="count">
+	<xi:include href="count/count.xml" />
+</directory>
+<directory name="create-links">
+	<xi:include href="create-links/create-links.xml" />
+</directory>
+<directory name="dibtest">
+	<xi:include href="dibtest/dibtest.xml" />
+</directory>
+<directory name="dirdlg">
+	<xi:include href="dirdlg/dirdlg.xml" />
+</directory>
+<directory name="diskspeed">
+	<xi:include href="diskspeed/diskspeed.xml" />
+</directory>
+<directory name="dnsapi">
+	<xi:include href="dnsapi/dnsapi.xml" />
+</directory>
+<directory name="dnsquery">
+	<xi:include href="dnsquery/dnsquery.xml" />
+</directory>
+<directory name="dump_shared_data">
+	<xi:include href="dump_shared_data/dump_shared_data.xml" />
+</directory>
+<directory name="edit">
+	<xi:include href="edit/edit.xml" />
+</directory>
+<directory name="enhmetafile">
+	<xi:include href="enhmetafile/enhmetafile.xml" />
+</directory>
+<directory name="enumfonts">
+	<xi:include href="enumfonts/enumfonts.xml" />
+</directory>
+<directory name="enumwnd">
+	<xi:include href="enumwnd/enumwnd.xml" />
+</directory>
+<directory name="enumws">
+	<xi:include href="enumws/enumws.xml" />
+</directory>
+<directory name="event">
+	<xi:include href="event/event.xml" />
+</directory>
+<directory name="eventpair">
+	<xi:include href="eventpair/eventpair.xml" />
+</directory>
+<directory name="fiber">
+	<xi:include href="fiber/fiber.xml" />
+</directory>
+<directory name="gethostbyname">
+	<xi:include href="gethostbyname/gethostbyname.xml" />
+</directory>
+<directory name="global_mem">
+	<xi:include href="global_mem/global_mem.xml" />
+</directory>
+<directory name="gradient">
+	<xi:include href="gradient/gradient.xml" />
+</directory>
+<directory name="guithreadinfo">
+	<xi:include href="guithreadinfo/guithreadinfo.xml" />
+</directory>
+<directory name="hello">
+	<xi:include href="hello/hello.xml" />
+</directory>
+<directory name="hivetest">
+	<xi:include href="hivetest/hivetest.xml" />
+</directory>
+<directory name="icontest">
+	<xi:include href="icontest/icontest.xml" />
+</directory>
+<directory name="iptest">
+	<xi:include href="iptest/iptest.xml" />
+</directory>
+<directory name="isotest">
+	<xi:include href="isotest/isotest.xml" />
+</directory>
+<directory name="lantst">
+	<xi:include href="lantst/lantest.xml" />
+</directory>
+<directory name="lineclip">
+	<xi:include href="lineclip/lineclip.xml" />
+</directory>
+<directory name="linetest">
+	<xi:include href="linetest/linetest.xml" />
+</directory>
+<directory name="lpctst">
+	<xi:include href="lpctst/lpctst.xml" />
+</directory>
+<directory name="map_dup_inherit">
+	<xi:include href="map_dup_inherit/map_dup_inherit.xml" />
+</directory>
+<directory name="mdi">
+	<xi:include href="mdi/mdi.xml" />
+</directory>
+<directory name="miditest">
+	<xi:include href="miditest/miditest.xml" />
+</directory>
+<directory name="mktime">
+	<xi:include href="mktime/mktime.xml" />
+</directory>
+<directory name="moztest">
+	<xi:include href="moztest/moztest.xml" />
+</directory>
+<directory name="mstest">
+	<xi:include href="mstest/mstest.xml" />
+</directory>
+<directory name="multithrdwin">
+	<xi:include href="multithrdwin/multithrdwin.xml" />
+</directory>
+<directory name="multiwin">
+	<xi:include href="multiwin/multiwin.xml" />
+</directory>
+<directory name="mutex">
+	<xi:include href="mutex/mutex.xml" />
+</directory>
+<directory name="nameserverlist">
+	<xi:include href="nameserverlist/nameserverlist.xml" />
+</directory>
+<directory name="noexecute">
+	<xi:include href="noexecute/noexecute.xml" />
+</directory>
+<directory name="nptest">
+	<xi:include href="nptest/nptest.xml" />
+</directory>
+<directory name="oskittcp">
+	<xi:include href="oskittcp/oskittcp.xml" />
+</directory>
+<directory name="palbitblt">
+	<xi:include href="palbitblt/palbitblt.xml" />
+</directory>
+<directory name="patblt">
+	<xi:include href="patblt/patblt.xml" />
+</directory>
+<directory name="polytest">
+	<xi:include href="polytest/polytest.xml" />
+</directory>
+<directory name="popupmenu">
+	<xi:include href="popupmenu/popupmenu.xml" />
+</directory>
+<directory name="primitives">
+	<xi:include href="primitives/primitives.xml" />
+</directory>
+<directory name="pteb">
+	<xi:include href="pteb/pteb.xml" />
+</directory>
+<directory name="p_dup_handle">
+	<xi:include href="p_dup_handle/p_dup_handle.xml" />
+</directory>
+<directory name="regdump">
+	<xi:include href="regdump/regdump.xml" />
+</directory>
+<directory name="regqueryvalue">
+	<xi:include href="regqueryvalue/regqueryvalue.xml" />
+</directory>
+<directory name="regtest">
+	<xi:include href="regtest/regtest.xml" />
+</directory>
+<directory name="sectest">
+	<xi:include href="sectest/sectest.xml" />
+</directory>
+<directory name="sertest">
+	<xi:include href="sertest/sertest.xml" />
+</directory>
+<directory name="shaptest">
+	<xi:include href="shaptest/shaptest.xml" />
+</directory>
+<directory name="shm">
+	<xi:include href="shm/shm.xml" />
+</directory>
+<directory name="statst">
+	<xi:include href="statst/statst.xml" />
+</directory>
+<directory name="statst2">
+	<xi:include href="statst2/statst2.xml" />
+</directory>
+<directory name="stretchblt">
+	<xi:include href="stretchblt/stretchblt.xml" />
+</directory>
+<directory name="subclass">
+	<xi:include href="subclass/subclass.xml" />
+</directory>
+<directory name="suspend">
+	<xi:include href="suspend/suspend.xml" />
+</directory>
+<directory name="tcpsvr">
+	<xi:include href="tcpsvr/tcpsvr.xml" />
+</directory>
+<directory name="terminate">
+	<xi:include href="terminate/terminate.xml" />
+</directory>
+<directory name="thread">
+	<xi:include href="thread/thread.xml" />
+</directory>
+<directory name="threadwait">
+	<xi:include href="threadwait/threadwait.xml" />
+</directory>
+<directory name="thread_msg">
+	<xi:include href="thread_msg/thread_msg.xml" />
+</directory>
+<directory name="tmrqueue">
+	<xi:include href="tmrqueue/tmrqueue.xml" />
+</directory>
+<directory name="tokentest">
+	<xi:include href="tokentest/tokentest.xml" />
+</directory>
+<directory name="txtscale">
+	<xi:include href="txtscale/txtscale.xml" />
+</directory>
+
+<directory name="vmtest/vmtest">
+	<xi:include href="vmtest/vmtest.xml" />
+</directory>
+<directory name="wclickat">
+	<xi:include href="wclickat/wclickat.xml" />
+</directory>
+<directory name="winhello">
+	<xi:include href="winhello/winhello.xml" />
+</directory>
+<directory name="wm_erasebkgnd">
+	<xi:include href="wm_erasebkgnd/wm_erasebkgnd.xml" />
+</directory>
+<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>
+
diff --git a/rosapps/tests/fiber/fiber.xml b/rosapps/tests/fiber/fiber.xml
index 17b0e78a5ce..a9daa8206ea 100644
--- a/rosapps/tests/fiber/fiber.xml
+++ b/rosapps/tests/fiber/fiber.xml
@@ -1,4 +1,4 @@
-<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe">
+<module name="fiber" type="win32gui" installbase="system32" installname="alphablend.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
@@ -6,5 +6,5 @@
 	<library>kernel32</library>
 	<library>gdi32</library>
 
-	<file>alphablend.c</file>
+	<file>fiber.c</file>
 </module>
\ No newline at end of file
diff --git a/rosapps/tests/lan/lantest.cpp b/rosapps/tests/lantst/lantest.cpp
similarity index 100%
rename from rosapps/tests/lan/lantest.cpp
rename to rosapps/tests/lantst/lantest.cpp
diff --git a/rosapps/tests/lan/lantest.xml b/rosapps/tests/lantst/lantest.xml
similarity index 100%
rename from rosapps/tests/lan/lantest.xml
rename to rosapps/tests/lantst/lantest.xml
diff --git a/rosapps/tests/lpc/conport.c b/rosapps/tests/lpctst/conport.c
similarity index 100%
rename from rosapps/tests/lpc/conport.c
rename to rosapps/tests/lpctst/conport.c
diff --git a/rosapps/tests/lpc/creport.c b/rosapps/tests/lpctst/creport.c
similarity index 100%
rename from rosapps/tests/lpc/creport.c
rename to rosapps/tests/lpctst/creport.c
diff --git a/rosapps/tests/lpc/dumpinfo.c b/rosapps/tests/lpctst/dumpinfo.c
similarity index 100%
rename from rosapps/tests/lpc/dumpinfo.c
rename to rosapps/tests/lpctst/dumpinfo.c
diff --git a/rosapps/tests/lpc/dumpinfo.h b/rosapps/tests/lpctst/dumpinfo.h
similarity index 100%
rename from rosapps/tests/lpc/dumpinfo.h
rename to rosapps/tests/lpctst/dumpinfo.h
diff --git a/rosapps/tests/lpc/lpcclt.c b/rosapps/tests/lpctst/lpcclt.c
similarity index 100%
rename from rosapps/tests/lpc/lpcclt.c
rename to rosapps/tests/lpctst/lpcclt.c
diff --git a/rosapps/tests/lpc/lpcsrv.c b/rosapps/tests/lpctst/lpcsrv.c
similarity index 100%
rename from rosapps/tests/lpc/lpcsrv.c
rename to rosapps/tests/lpctst/lpcsrv.c
diff --git a/rosapps/tests/lpc/lpctest.h b/rosapps/tests/lpctst/lpctest.h
similarity index 100%
rename from rosapps/tests/lpc/lpctest.h
rename to rosapps/tests/lpctst/lpctest.h
diff --git a/rosapps/tests/lpc/lpctst.xml b/rosapps/tests/lpctst/lpctst.xml
similarity index 100%
rename from rosapps/tests/lpc/lpctst.xml
rename to rosapps/tests/lpctst/lpctst.xml
diff --git a/rosapps/tests/wclickat/wclickat.xml b/rosapps/tests/wclickat/wclickat.xml
new file mode 100644
index 00000000000..17b0e78a5ce
--- /dev/null
+++ b/rosapps/tests/wclickat/wclickat.xml
@@ -0,0 +1,10 @@
+<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe">
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<define name="__USE_W32API" />
+
+	<library>kernel32</library>
+	<library>gdi32</library>
+
+	<file>alphablend.c</file>
+</module>
\ No newline at end of file
diff --git a/rosapps/tests/wpickclick/wpickclick.xml b/rosapps/tests/wpickclick/wpickclick.xml
new file mode 100644
index 00000000000..17b0e78a5ce
--- /dev/null
+++ b/rosapps/tests/wpickclick/wpickclick.xml
@@ -0,0 +1,10 @@
+<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe">
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<define name="__USE_W32API" />
+
+	<library>kernel32</library>
+	<library>gdi32</library>
+
+	<file>alphablend.c</file>
+</module>
\ No newline at end of file