diff --git a/rosapps/tests/accelerator/accelerator.xml b/rosapps/tests/accelerator/accelerator.xml
index 0f7f75ae118..f29bc657155 100644
--- a/rosapps/tests/accelerator/accelerator.xml
+++ b/rosapps/tests/accelerator/accelerator.xml
@@ -2,9 +2,7 @@
0x0501
0x0501
-
kernel32
gdi32
-
accelerator.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/alive/alive.xml b/rosapps/tests/alive/alive.xml
index 5fcfa280bb5..aa32716edfd 100644
--- a/rosapps/tests/alive/alive.xml
+++ b/rosapps/tests/alive/alive.xml
@@ -2,9 +2,7 @@
0x0501
0x0501
-
kernel32
gdi32
-
alive.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/alphablend/alphablend.xml b/rosapps/tests/alphablend/alphablend.xml
index 2b73c9bf11f..fcdd5706835 100644
--- a/rosapps/tests/alphablend/alphablend.xml
+++ b/rosapps/tests/alphablend/alphablend.xml
@@ -2,9 +2,7 @@
0x0501
0x0501
-
kernel32
gdi32
-
alphablend.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/apc/apc.xml b/rosapps/tests/apc/apc.xml
index abaee982880..11c41b4a1d8 100644
--- a/rosapps/tests/apc/apc.xml
+++ b/rosapps/tests/apc/apc.xml
@@ -4,4 +4,4 @@
kernel32
apc.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/apc2/apc2.xml b/rosapps/tests/apc2/apc2.xml
index 180af1d597e..3965b159d0e 100644
--- a/rosapps/tests/apc2/apc2.xml
+++ b/rosapps/tests/apc2/apc2.xml
@@ -4,4 +4,4 @@
kernel32
apc2.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/args/args.xml b/rosapps/tests/args/args.xml
index 30cab3e47f9..2ed4efb5d06 100644
--- a/rosapps/tests/args/args.xml
+++ b/rosapps/tests/args/args.xml
@@ -4,4 +4,4 @@
kernel32
args.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/atomtest/atomtest.xml b/rosapps/tests/atomtest/atomtest.xml
index 1e6dcd6a39b..d107f6eeaf0 100644
--- a/rosapps/tests/atomtest/atomtest.xml
+++ b/rosapps/tests/atomtest/atomtest.xml
@@ -5,4 +5,4 @@
kernel32
gdi32
atomtest.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/bench/bench.xml b/rosapps/tests/bench/bench.xml
index 79256b35f2f..3343a3666e9 100644
--- a/rosapps/tests/bench/bench.xml
+++ b/rosapps/tests/bench/bench.xml
@@ -5,4 +5,4 @@
kernel32
gdi32
bench.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/bitblt/bitblt.xml b/rosapps/tests/bitblt/bitblt.xml
index 2cf66c200b5..dc6362fa20f 100644
--- a/rosapps/tests/bitblt/bitblt.xml
+++ b/rosapps/tests/bitblt/bitblt.xml
@@ -5,4 +5,4 @@
kernel32
gdi32
bitblt.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/button/button.xml b/rosapps/tests/button/button.xml
index de7f4c14c9f..e695ae0fd50 100644
--- a/rosapps/tests/button/button.xml
+++ b/rosapps/tests/button/button.xml
@@ -5,4 +5,4 @@
kernel32
gdi32
button.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/button2/button2.xml b/rosapps/tests/button2/button2.xml
index 5c8b9abb22c..6724db5c437 100644
--- a/rosapps/tests/button2/button2.xml
+++ b/rosapps/tests/button2/button2.xml
@@ -5,4 +5,4 @@
kernel32
gdi32
button2.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/capclock/capclock.xml b/rosapps/tests/capclock/capclock.xml
index c25c2f49634..c8f94ba8499 100644
--- a/rosapps/tests/capclock/capclock.xml
+++ b/rosapps/tests/capclock/capclock.xml
@@ -5,4 +5,4 @@
kernel32
gdi32
capclock.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/carets/carets.xml b/rosapps/tests/carets/carets.xml
index ee8115c0f49..e2c9ab74739 100644
--- a/rosapps/tests/carets/carets.xml
+++ b/rosapps/tests/carets/carets.xml
@@ -5,4 +5,4 @@
kernel32
gdi32
carets.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/consume/consume.xml b/rosapps/tests/consume/consume.xml
index 3e0f131ead3..0f516e3acbc 100644
--- a/rosapps/tests/consume/consume.xml
+++ b/rosapps/tests/consume/consume.xml
@@ -6,3 +6,4 @@
gdi32
consume.c
+
diff --git a/rosapps/tests/dibtest/dibtest.xml b/rosapps/tests/dibtest/dibtest.xml
index e0f2b68f043..102c1ac2dc7 100644
--- a/rosapps/tests/dibtest/dibtest.xml
+++ b/rosapps/tests/dibtest/dibtest.xml
@@ -2,9 +2,7 @@
0x0501
0x0501
-
kernel32
gdi32
-
dibtest.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/dirdlg/dirdlg.xml b/rosapps/tests/dirdlg/dirdlg.xml
index cd95d5054af..d113839cc86 100644
--- a/rosapps/tests/dirdlg/dirdlg.xml
+++ b/rosapps/tests/dirdlg/dirdlg.xml
@@ -5,4 +5,4 @@
kernel32
gdi32
dirdlg.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/diskspeed/diskspeed.xml b/rosapps/tests/diskspeed/diskspeed.xml
index 9a8c11253da..384dcb216c1 100644
--- a/rosapps/tests/diskspeed/diskspeed.xml
+++ b/rosapps/tests/diskspeed/diskspeed.xml
@@ -5,4 +5,4 @@
kernel32
gdi32
diskspeed.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/dnsapi/dnsapi.xml b/rosapps/tests/dnsapi/dnsapi.xml
index ac045e2ef67..d016ff74a78 100644
--- a/rosapps/tests/dnsapi/dnsapi.xml
+++ b/rosapps/tests/dnsapi/dnsapi.xml
@@ -1,8 +1,8 @@
-
+
0x0501
0x0501
kernel32
gdi32
- dnsapi.c
+ dnsapitst.c
diff --git a/rosapps/tests/enhmetafile/enhmetafile.xml b/rosapps/tests/enhmetafile/enhmetafile.xml
index fcdd5706835..48559825b20 100644
--- a/rosapps/tests/enhmetafile/enhmetafile.xml
+++ b/rosapps/tests/enhmetafile/enhmetafile.xml
@@ -1,8 +1,8 @@
-
+
0x0501
0x0501
kernel32
gdi32
- alphablend.c
+ enhmetafile.c
diff --git a/rosapps/tests/enumfonts/enumfonts.xml b/rosapps/tests/enumfonts/enumfonts.xml
index 2b73c9bf11f..78a1e8f2e04 100644
--- a/rosapps/tests/enumfonts/enumfonts.xml
+++ b/rosapps/tests/enumfonts/enumfonts.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ enumfonts.c
+
diff --git a/rosapps/tests/enumwnd/enumwnd.xml b/rosapps/tests/enumwnd/enumwnd.xml
index 2b73c9bf11f..92c255ae2c3 100644
--- a/rosapps/tests/enumwnd/enumwnd.xml
+++ b/rosapps/tests/enumwnd/enumwnd.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ enumwnd.c
+
diff --git a/rosapps/tests/enumws/enumws.xml b/rosapps/tests/enumws/enumws.xml
index 2b73c9bf11f..e2261353db0 100644
--- a/rosapps/tests/enumws/enumws.xml
+++ b/rosapps/tests/enumws/enumws.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ enumws.c
+
diff --git a/rosapps/tests/event/event.xml b/rosapps/tests/event/event.xml
index 2b73c9bf11f..bd09dca0fa9 100644
--- a/rosapps/tests/event/event.xml
+++ b/rosapps/tests/event/event.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ event.c
+
diff --git a/rosapps/tests/eventpair/eventpair.xml b/rosapps/tests/eventpair/eventpair.xml
index 2b73c9bf11f..4793f6a79a7 100644
--- a/rosapps/tests/eventpair/eventpair.xml
+++ b/rosapps/tests/eventpair/eventpair.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ eventpair.c
+
diff --git a/rosapps/tests/fiber/fiber.xml b/rosapps/tests/fiber/fiber.xml
index 572ee6591b4..94e6f0acfc4 100644
--- a/rosapps/tests/fiber/fiber.xml
+++ b/rosapps/tests/fiber/fiber.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
fiber.c
-
\ No newline at end of file
+
diff --git a/rosapps/tests/gethostbyname/gethostbyname.xml b/rosapps/tests/gethostbyname/gethostbyname.xml
index 2b73c9bf11f..31bd5423b61 100644
--- a/rosapps/tests/gethostbyname/gethostbyname.xml
+++ b/rosapps/tests/gethostbyname/gethostbyname.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ gethostbyname.c
+
diff --git a/rosapps/tests/global_mem/global_mem.xml b/rosapps/tests/global_mem/global_mem.xml
index 2b73c9bf11f..c2bc3e1cbde 100644
--- a/rosapps/tests/global_mem/global_mem.xml
+++ b/rosapps/tests/global_mem/global_mem.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ global_mem.c
+
diff --git a/rosapps/tests/gradient/gradient.xml b/rosapps/tests/gradient/gradient.xml
index 2b73c9bf11f..87269a49749 100644
--- a/rosapps/tests/gradient/gradient.xml
+++ b/rosapps/tests/gradient/gradient.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ gradient.c
+
diff --git a/rosapps/tests/guithreadinfo/guithreadinfo.xml b/rosapps/tests/guithreadinfo/guithreadinfo.xml
index 2b73c9bf11f..4078ee099fe 100644
--- a/rosapps/tests/guithreadinfo/guithreadinfo.xml
+++ b/rosapps/tests/guithreadinfo/guithreadinfo.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ guithreadinfo.c
+
diff --git a/rosapps/tests/hello/hello.xml b/rosapps/tests/hello/hello.xml
index 2b73c9bf11f..929aef19b1c 100644
--- a/rosapps/tests/hello/hello.xml
+++ b/rosapps/tests/hello/hello.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ hello.c
+
diff --git a/rosapps/tests/hivetest/hivetest.xml b/rosapps/tests/hivetest/hivetest.xml
index 2b73c9bf11f..90647925aa0 100644
--- a/rosapps/tests/hivetest/hivetest.xml
+++ b/rosapps/tests/hivetest/hivetest.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ hivetest.c
+
diff --git a/rosapps/tests/icontest/icontest.xml b/rosapps/tests/icontest/icontest.xml
index 2b73c9bf11f..c97484d0ecf 100644
--- a/rosapps/tests/icontest/icontest.xml
+++ b/rosapps/tests/icontest/icontest.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ icontest.c
+
diff --git a/rosapps/tests/iptest/iptest.xml b/rosapps/tests/iptest/iptest.xml
index 2b73c9bf11f..c013f186f4c 100644
--- a/rosapps/tests/iptest/iptest.xml
+++ b/rosapps/tests/iptest/iptest.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ iptest.c
+
diff --git a/rosapps/tests/isotest/isotest.xml b/rosapps/tests/isotest/isotest.xml
index 2b73c9bf11f..63b0f23bd6f 100644
--- a/rosapps/tests/isotest/isotest.xml
+++ b/rosapps/tests/isotest/isotest.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ isotest.c
+
diff --git a/rosapps/tests/lantst/lantest.xml b/rosapps/tests/lantst/lantest.xml
index 2b73c9bf11f..640fcc9c7cc 100644
--- a/rosapps/tests/lantst/lantest.xml
+++ b/rosapps/tests/lantst/lantest.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ lantest.c
+
diff --git a/rosapps/tests/lineclip/lineclip.xml b/rosapps/tests/lineclip/lineclip.xml
index 2b73c9bf11f..444f3fcbb81 100644
--- a/rosapps/tests/lineclip/lineclip.xml
+++ b/rosapps/tests/lineclip/lineclip.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ lineclip.c
+
diff --git a/rosapps/tests/linetest/linetest.xml b/rosapps/tests/linetest/linetest.xml
index 2b73c9bf11f..4fce971706e 100644
--- a/rosapps/tests/linetest/linetest.xml
+++ b/rosapps/tests/linetest/linetest.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ linetest.c
+
diff --git a/rosapps/tests/lpctst/lpctst.xml b/rosapps/tests/lpctst/lpctst.xml
index 2b73c9bf11f..02b587f3404 100644
--- a/rosapps/tests/lpctst/lpctst.xml
+++ b/rosapps/tests/lpctst/lpctst.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ lpctst.c
+
diff --git a/rosapps/tests/map_dup_inherit/map_dup_inherit.xml b/rosapps/tests/map_dup_inherit/map_dup_inherit.xml
index 2b73c9bf11f..82b3972353d 100644
--- a/rosapps/tests/map_dup_inherit/map_dup_inherit.xml
+++ b/rosapps/tests/map_dup_inherit/map_dup_inherit.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ map_dup_inherit
+
diff --git a/rosapps/tests/mdi/mdi.xml b/rosapps/tests/mdi/mdi.xml
index 2b73c9bf11f..350835b3647 100644
--- a/rosapps/tests/mdi/mdi.xml
+++ b/rosapps/tests/mdi/mdi.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ mdi.c
+
diff --git a/rosapps/tests/miditest/miditest.xml b/rosapps/tests/miditest/miditest.xml
index 2b73c9bf11f..dcff19668c5 100644
--- a/rosapps/tests/miditest/miditest.xml
+++ b/rosapps/tests/miditest/miditest.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ miditest.c
+
diff --git a/rosapps/tests/mktime/mktime.xml b/rosapps/tests/mktime/mktime.xml
index 2b73c9bf11f..f5dd3168893 100644
--- a/rosapps/tests/mktime/mktime.xml
+++ b/rosapps/tests/mktime/mktime.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ mktime.c
+
diff --git a/rosapps/tests/moztest/moztest.xml b/rosapps/tests/moztest/moztest.xml
index 2b73c9bf11f..51f26d7b04e 100644
--- a/rosapps/tests/moztest/moztest.xml
+++ b/rosapps/tests/moztest/moztest.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ moztest.c
+
diff --git a/rosapps/tests/mstest/mstest.xml b/rosapps/tests/mstest/mstest.xml
index 2b73c9bf11f..061fa3a9f00 100644
--- a/rosapps/tests/mstest/mstest.xml
+++ b/rosapps/tests/mstest/mstest.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ mstest.c
+
diff --git a/rosapps/tests/multithrdwin/multithrdwin.xml b/rosapps/tests/multithrdwin/multithrdwin.xml
index 2b73c9bf11f..006642da9ff 100644
--- a/rosapps/tests/multithrdwin/multithrdwin.xml
+++ b/rosapps/tests/multithrdwin/multithrdwin.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ multithrdwin.c
+
diff --git a/rosapps/tests/multiwin/multiwin.xml b/rosapps/tests/multiwin/multiwin.xml
index 2b73c9bf11f..c56d560293a 100644
--- a/rosapps/tests/multiwin/multiwin.xml
+++ b/rosapps/tests/multiwin/multiwin.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ multiwin.c
+
diff --git a/rosapps/tests/mutex/mutex.xml b/rosapps/tests/mutex/mutex.xml
index 2b73c9bf11f..f34fb3479cc 100644
--- a/rosapps/tests/mutex/mutex.xml
+++ b/rosapps/tests/mutex/mutex.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ mutex.c
+
diff --git a/rosapps/tests/nameserverlist/nameserverlist.xml b/rosapps/tests/nameserverlist/nameserverlist.xml
index 2b73c9bf11f..12f4ef96cc1 100644
--- a/rosapps/tests/nameserverlist/nameserverlist.xml
+++ b/rosapps/tests/nameserverlist/nameserverlist.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ nameserverlist.c
+
diff --git a/rosapps/tests/noexecute/noexecute.xml b/rosapps/tests/noexecute/noexecute.xml
index 2b73c9bf11f..bbae6abaae2 100644
--- a/rosapps/tests/noexecute/noexecute.xml
+++ b/rosapps/tests/noexecute/noexecute.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ noexecute.c
+
diff --git a/rosapps/tests/wclickat/wclickat.xml b/rosapps/tests/wclickat/wclickat.xml
index 2b73c9bf11f..b5a7b3504b1 100644
--- a/rosapps/tests/wclickat/wclickat.xml
+++ b/rosapps/tests/wclickat/wclickat.xml
@@ -1,10 +1,9 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
+ wclickat.c
+
- alphablend.c
-
\ No newline at end of file
diff --git a/rosapps/tests/wpickclick/wpickclick.xml b/rosapps/tests/wpickclick/wpickclick.xml
index 2b73c9bf11f..b40a8105e39 100644
--- a/rosapps/tests/wpickclick/wpickclick.xml
+++ b/rosapps/tests/wpickclick/wpickclick.xml
@@ -1,10 +1,8 @@
-
+
0x0501
0x0501
-
kernel32
gdi32
-
- alphablend.c
-
\ No newline at end of file
+ wpickclick.c
+