fix most of the rest of the tests, disable the rest till tomorrow Modified: trunk/rosapps/tests/directory.xml Modified: trunk/rosapps/tests/dnsapi/dnsapi.xml Modified: trunk/rosapps/tests/dnsquery/dnsquery.xml Deleted: trunk/rosapps/tests/dump_shared_data/ Deleted: trunk/rosapps/tests/eventpair/ Modified: trunk/rosapps/tests/gethostbyname/gethostbyname.xml Modified: trunk/rosapps/tests/gradient/gradient.c Modified: trunk/rosapps/tests/gradient/gradient.xml Modified: trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml Modified: trunk/rosapps/tests/hivetest/hivetest.c Modified: trunk/rosapps/tests/hivetest/hivetest.xml Modified: trunk/rosapps/tests/icontest/icontest.c Modified: trunk/rosapps/tests/icontest/icontest.xml Modified: trunk/rosapps/tests/isotest/isotest.c Modified: trunk/rosapps/tests/isotest/isotest.xml Modified: trunk/rosapps/tests/linetest/linetest.c Modified: trunk/rosapps/tests/linetest/linetest.xml Modified: trunk/rosapps/tests/mdi/mdi.xml Modified: trunk/rosapps/tests/miditest/miditest.xml Modified: trunk/rosapps/tests/moztest/moztest.c Modified: trunk/rosapps/tests/moztest/moztest.xml Modified: trunk/rosapps/tests/multithrdwin/multithrdwin.c Modified: trunk/rosapps/tests/multithrdwin/multithrdwin.xml Modified: trunk/rosapps/tests/nameserverlist/nameserverlist.xml Modified: trunk/rosapps/tests/noexecute/noexecute.c Modified: trunk/rosapps/tests/noexecute/noexecute.xml Modified: trunk/rosapps/tests/palbitblt/palbitblt.xml Modified: trunk/rosapps/tests/patblt/patblt.xml Modified: trunk/rosapps/tests/polytest/polytest.xml Modified: trunk/rosapps/tests/regdump/regdump.xml Modified: trunk/rosapps/tests/regqueryvalue/regqueryvalue.xml Modified: trunk/rosapps/tests/sectest/sectest.c Modified: trunk/rosapps/tests/sectest/sectest.xml _____
Modified: trunk/rosapps/tests/directory.xml --- trunk/rosapps/tests/directory.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/directory.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -67,9 +67,6 @@
<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> @@ -88,9 +85,6 @@ <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> @@ -109,21 +103,21 @@ <directory name="hello"> <xi:include href="hello/hello.xml" /> </directory> -<directory name="hivetest"> - <xi:include href="hivetest/hivetest.xml" /> -</directory> + +<!-- fixme: hivetest --> + <directory name="icontest"> <xi:include href="icontest/icontest.xml" /> </directory> -<directory name="iptest"> - <xi:include href="iptest/iptest.xml" /> -</directory> + +<!-- fixme: iptest --> + <directory name="isotest"> <xi:include href="isotest/isotest.xml" /> </directory> -<directory name="lantst"> - <xi:include href="lantst/lantest.xml" /> -</directory> + +<!-- fixme: lantst --> + <directory name="lineclip"> <xi:include href="lineclip/lineclip.xml" /> </directory> @@ -169,9 +163,8 @@
<!-- fixme: nptest -->
-<directory name="oskittcp"> - <xi:include href="oskittcp/oskittcp.xml" /> -</directory> +<!-- fixme: oskittcp --> + <directory name="palbitblt"> <xi:include href="palbitblt/palbitblt.xml" /> </directory> @@ -187,21 +180,22 @@ <directory name="primitives"> <xi:include href="primitives/primitives.xml" /> </directory> -<directory name="pteb"> - <xi:include href="pteb/pteb.xml" /> -</directory> + +<!-- fixme: pteb --> + <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> + +<!-- fixme: regdump --> + <directory name="regqueryvalue"> <xi:include href="regqueryvalue/regqueryvalue.xml" /> </directory> -<directory name="regtest"> - <xi:include href="regtest/regtest.xml" /> -</directory> + +<!-- fixme: regtest --> + +<!-- <directory name="sectest"> <xi:include href="sectest/sectest.xml" /> </directory> @@ -212,7 +206,7 @@ <xi:include href="shaptest/shaptest.xml" /> </directory>
-<!-- fixme: shm --> +fixme: shm
<directory name="statst"> <xi:include href="statst/statst.xml" /> @@ -274,4 +268,4 @@ <directory name="zwcontinue"> <xi:include href="zwcontinue/zwcontinue.xml" /> </directory> - +--> _____
Modified: trunk/rosapps/tests/dnsapi/dnsapi.xml --- trunk/rosapps/tests/dnsapi/dnsapi.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/dnsapi/dnsapi.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -3,6 +3,7 @@
<define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>dnsapi</library> + <library>ws2_32</library> <file>dnsapi.c</file> </module> _____
Modified: trunk/rosapps/tests/dnsquery/dnsquery.xml --- trunk/rosapps/tests/dnsquery/dnsquery.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/dnsquery/dnsquery.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -3,6 +3,7 @@
<define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>dnsapi</library> + <library>ws2_32</library> <file>dnsquery.c</file> </module> _____
Modified: trunk/rosapps/tests/gethostbyname/gethostbyname.xml --- trunk/rosapps/tests/gethostbyname/gethostbyname.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/gethostbyname/gethostbyname.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -3,6 +3,6 @@
<define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>ws2_32</library> <file>gethostbyname.c</file> </module> _____
Modified: trunk/rosapps/tests/gradient/gradient.c --- trunk/rosapps/tests/gradient/gradient.c 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/gradient/gradient.c 2005-11-12 08:40:47 UTC (rev 19171) @@ -2,6 +2,9 @@
#include <stdio.h> #include <string.h>
+BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, + void * grad_array, ULONG ngrad, ULONG mode ); + LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM);
int WINAPI _____
Modified: trunk/rosapps/tests/gradient/gradient.xml --- trunk/rosapps/tests/gradient/gradient.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/gradient/gradient.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,6 +1,7 @@
<module name="gradient" type="win32gui" installbase="bin" installname="gradient.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> _____
Modified: trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml --- trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,6 +1,7 @@
<module name="guithreadinfo" type="win32gui" installbase="bin" installname="guithreadinfo.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> _____
Modified: trunk/rosapps/tests/hivetest/hivetest.c --- trunk/rosapps/tests/hivetest/hivetest.c 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/hivetest/hivetest.c 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,9 +1,10 @@
#include <stdarg.h> #include <string.h> #include <stdio.h> + #include <windows.h> -#include <ddk/ntddk.h> -#include <rosrtl/string.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h>
HANDLE OutputHandle; HANDLE InputHandle; @@ -55,12 +56,11 @@ { HKEY hKey; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; NTSTATUS Status; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\Registry\Machine\Software\testkey");
dprintf("Create key '\Registry\Machine\Software\testkey':\n"); - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\Registry\Machine\Software\testkey"); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -85,13 +85,12 @@ void DeleteKeyTest(void) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\Registry\Machine\Software\testkey"); HKEY hKey; NTSTATUS Status;
dprintf("Delete key '\Registry\Machine\Software\testkey':\n"); - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\Registry\Machine\Software\testkey"); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -117,15 +116,14 @@ HKEY hKey = NULL; OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; - UNICODE_STRING KeyName; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\Registry\Machine\Software"); ULONG Index; ULONG Length; ULONG i; KEY_BASIC_INFORMATION KeyInformation[5];
dprintf("Enumerate key '\Registry\Machine\Software':\n"); - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\Registry\Machine\Software"); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -184,13 +182,12 @@ { HKEY hKey; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\Registry\Machine\Software\testkey"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"TestValue"); NTSTATUS Status;
dprintf("Create key '\Registry\Machine\Software\testkey':\n"); - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\Registry\Machine\Software\testkey"); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, @@ -208,8 +205,7 @@ if (!NT_SUCCESS(Status)) return;
- RtlRosInitUnicodeStringFromLiteral(&ValueName, - L"TestValue"); + dprintf("NtSetValueKey:\n"); Status = NtSetValueKey(hKey, &ValueName, @@ -227,13 +223,12 @@ { HKEY hKey; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\Registry\Machine\Software\testkey"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"TestValue"); NTSTATUS Status;
dprintf("Create key '\Registry\Machine\Software\testkey':\n"); - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\Registry\Machine\Software\testkey"); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, @@ -251,8 +246,6 @@ if (!NT_SUCCESS(Status)) return;
- RtlRosInitUnicodeStringFromLiteral(&ValueName, - L"TestValue"); dprintf("NtSetValueKey:\n"); Status = NtSetValueKey(hKey, &ValueName, @@ -269,14 +262,13 @@ void DeleteValueTest(void) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\Registry\Machine\Software\testkey"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"TestValue"); HKEY KeyHandle; NTSTATUS Status;
dprintf("Open key '\Registry\Machine\Software\testkey':\n"); - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\Registry\Machine\Software\testkey"); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -290,8 +282,8 @@ return;
dprintf("Delete value:\n"); - RtlRosInitUnicodeStringFromLiteral(&ValueName, - L"TestValue"); + + Status = NtDeleteValueKey(KeyHandle, &ValueName); dprintf(" Status = %lx\n", Status); @@ -306,14 +298,13 @@ { KEY_VALUE_FULL_INFORMATION KeyValueInformation[5]; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\Registry\Machine\Software\testkey"); ULONG Index,Length,i; HKEY hKey = NULL; NTSTATUS Status;
dprintf("Open key '\Registry\Machine\Software\testkey':\n"); - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\Registry\Machine\Software\testkey"); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -369,10 +360,7 @@ HKEY hKey = NULL, hKey1; OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; -#if 0 - UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\Registry"); -#endif - UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\Registry\Machine\Software"); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\Registry\Machine\Software"); ULONG Index,Length,i; KEY_BASIC_INFORMATION KeyInformation[5];
@@ -421,73 +409,6 @@ dprintf("\t\t\t\t\tStatus =%x\n",Status); } NtClose(hKey); - -#if 0 - dprintf("NtOpenKey \Registry\Machine : "); - RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\Registry\Machine"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status=NtOpenKey( &hKey1, MAXIMUM_ALLOWED, &ObjectAttributes); - dprintf("\t\t\tStatus =%x\n",Status); - - dprintf("NtOpenKey System\Setup : "); - RtlRosInitUnicodeStringFromLiteral(&KeyName, L"System\Setup"); - InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE - , hKey1 , NULL); - Status = NtOpenKey ( &hKey, KEY_READ , &ObjectAttributes); - dprintf("\t\t\tStatus =%x\n",Status); - if(Status==0) - { - dprintf("NtQueryValueKey : "); - RtlRosInitUnicodeStringFromLiteral(&KeyName, L"CmdLine"); - Status=NtQueryValueKey(hKey,&KeyName,KeyValueFullInformation - ,&KeyValueInformation[0], sizeof(KeyValueInformation) - ,&Length); - dprintf("\t\t\t\tStatus =%x\n",Status); - if (Status == STATUS_SUCCESS) - { - dprintf("\tValue:DO=%d, DL=%d, NL=%d, Name = " - ,KeyValueInformation[0].DataOffset - ,KeyValueInformation[0].DataLength - ,KeyValueInformation[0].NameLength); - for (i=0;i<10 && i<KeyValueInformation[0].NameLength/2;i++) - dprintf("%C",KeyValueInformation[0].Name[i]); - dprintf("\n"); - dprintf("\t\tType = %d\n",KeyValueInformation[0].Type); - if (KeyValueInformation[0].Type == REG_SZ) - dprintf("\t\tValue = %S\n", - (PWCHAR)((PCHAR)&KeyValueInformation[0] + KeyValueInformation[0].DataOffset)); - } - dprintf("NtEnumerateValueKey : \n"); - Index=0; - while(Status == STATUS_SUCCESS) - { - Status=NtEnumerateValueKey(hKey,Index++,KeyValueFullInformation - ,&KeyValueInformation[0], sizeof(KeyValueInformation) - ,&Length); - if(Status== STATUS_SUCCESS) - { - dprintf("\tValue:DO=%d, DL=%d, NL=%d, Name = " - ,KeyValueInformation[0].DataOffset - ,KeyValueInformation[0].DataLength - ,KeyValueInformation[0].NameLength); - for (i=0;i<KeyValueInformation[0].NameLength/2;i++) - dprintf("%C",KeyValueInformation[0].Name[i]); - dprintf(", Type = %d\n",KeyValueInformation[0].Type); - if (KeyValueInformation[0].Type == REG_SZ) - dprintf("\t\tValue = %S\n",((char*)&KeyValueInformation[0] - +KeyValueInformation[0].DataOffset)); - } - } - dprintf("NtClose : "); - Status = NtClose( hKey ); - dprintf("\t\t\t\t\tStatus =%x\n",Status); - } - NtClose( hKey1 ); -#endif }
@@ -508,106 +429,11 @@ ,0,NULL,REG_OPTION_NON_VOLATILE,NULL); dprintf("\t\tStatus=%x\n",Status); NtClose(hKey); -#if 0 - do_enumeratekey(L"\Registry\Machine\Software"); - dprintf("NtOpenKey: "); - Status=NtOpenKey( &hKey, MAXIMUM_ALLOWED, &ObjectAttributes); - dprintf("\t\tStatus=%x\n",Status); - NtClose(hKey); - dprintf(" ...\test3 :"); - RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\Registry\Machine\Software\test3reactos\test3"); - InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE - , NULL, NULL); - Status = NtCreateKey ( &hKey, KEY_ALL_ACCESS , &ObjectAttributes - ,0,NULL,REG_OPTION_NON_VOLATILE,NULL); - dprintf("\t\t\t\t\tStatus=%x\n",Status); - dprintf("NtOpenKey: "); - Status=NtOpenKey( &hKey1, MAXIMUM_ALLOWED, &ObjectAttributes); - dprintf("\t\tStatus=%x\n",Status); - NtClose(hKey); - dprintf(" ...\testNonVolatile :"); - RtlRosInitUnicodeStringFromLiteral(&KeyName, L"TestNonVolatile"); - InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE - , hKey1, NULL); - Status = NtCreateKey ( &hKey, KEY_ALL_ACCESS , &ObjectAttributes - ,0,NULL,REG_OPTION_NON_VOLATILE,NULL); - dprintf("\t\t\t\tStatus=%x\n",Status); - NtClose(hKey1); - RtlRosInitUnicodeStringFromLiteral(&ValueName, L"TestREG_SZ"); - dprintf("NtSetValueKey reg_sz: "); - Status=NtSetValueKey(hKey,&ValueName,0,REG_SZ,(PVOID)L"Test Reg_sz",24); - dprintf("\t\t\t\tStatus=%x\n",Status); - RtlRosInitUnicodeStringFromLiteral(&ValueName, L"TestDWORD"); - dprintf("NtSetValueKey reg_dword: "); - Status=NtSetValueKey(hKey,&ValueName,0,REG_DWORD,(PVOID)"reac",4); - dprintf("\t\t\tStatus=%x\n",Status); - NtClose(hKey); - dprintf("NtOpenKey \Registry\Machine\Software\test3reactos\test3\testNonVolatile : "); - RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\Registry\Machine\Software\test3reactos\test3\testNonVolatile"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status=NtOpenKey( &hKey, MAXIMUM_ALLOWED, &ObjectAttributes); - dprintf("\t\t\t\tStatus =%x\n",Status); - if(Status==0) - { - dprintf("NtEnumerateValueKey : \n"); - Index=0; - while(Status == STATUS_SUCCESS) - { - Status=NtEnumerateValueKey(hKey,Index++,KeyValueFullInformation - ,&KeyValueInformation[0], sizeof(KeyValueInformation) - ,&Length); - if(Status== STATUS_SUCCESS) - { - dprintf("\tValue:DO=%d, DL=%d, NL=%d, Name = " - ,KeyValueInformation[0].DataOffset - ,KeyValueInformation[0].DataLength - ,KeyValueInformation[0].NameLength); - for (i=0;i<KeyValueInformation[0].NameLength/2;i++) - dprintf("%C",KeyValueInformation[0].Name[i]); - dprintf(", Type = %d\n",KeyValueInformation[0].Type); - if (KeyValueInformation[0].Type == REG_SZ) - dprintf("\t\tValue = %S\n",((char*)&KeyValueInformation[0] - +KeyValueInformation[0].DataOffset)); - } - } - } - NtClose(hKey); -#endif
dprintf("delete \Registry\Machine\software\test3reactos ?"); ReadConsoleA(InputHandle, Buffer, 3, &Result, NULL) ; if (Buffer[0] != 'y' && Buffer[0] != 'Y') return; -#if 0 - RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\Registry\Machine\Software\test3reactos\test3\testNonvolatile"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - dprintf("NtOpenKey : "); - Status=NtOpenKey( &hKey, KEY_ALL_ACCESS, &ObjectAttributes); - dprintf("\t\t\t\tStatus =%x\n",Status); - dprintf("NtDeleteKey : "); - Status=NtDeleteKey(hKey); - dprintf("\t\t\t\tStatus =%x\n",Status); - RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\Registry\Machine\Software\test3reactos\test3"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - dprintf("NtOpenKey : "); - Status=NtOpenKey( &hKey, KEY_ALL_ACCESS, &ObjectAttributes); - dprintf("\t\t\t\tStatus =%x\n",Status); - dprintf("NtDeleteKey : "); - Status=NtDeleteKey(hKey); - dprintf("\t\t\t\tStatus =%x\n",Status); - NtClose(hKey); -#endif + dprintf("delete \Registry\Machine\software\test3reactos ?"); RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\Registry\Machine\Software\test3reactos"); InitializeObjectAttributes(&ObjectAttributes, @@ -1029,7 +855,7 @@ HKEY hKey = NULL, hKey1; OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; - UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\Registry"); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\Registry"); ULONG Index,Length,i; KEY_BASIC_INFORMATION KeyInformation[5]; KEY_VALUE_FULL_INFORMATION KeyValueInformation[5]; @@ -1194,3 +1020,4 @@ } return(0); } + _____
Modified: trunk/rosapps/tests/hivetest/hivetest.xml --- trunk/rosapps/tests/hivetest/hivetest.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/hivetest/hivetest.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,8 +1,8 @@
-<module name="hivetest" type="win32gui" installbase="bin" installname="hivetest.exe"> +<module name="hivetest" type="win32gui" installbase="bin" installname="hivetest.exe" allowwarnings="true"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>ntdll</library> <file>hivetest.c</file> </module> _____
Modified: trunk/rosapps/tests/icontest/icontest.c --- trunk/rosapps/tests/icontest/icontest.c 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/icontest/icontest.c 2005-11-12 08:40:47 UTC (rev 19171) @@ -3,9 +3,7 @@
#include <string.h> #include <stdio.h>
-#ifndef GetCursorInfo - #define _GetCursorInfo -#endif +ULONG __cdecl DbgPrint(IN PCH Format, IN ...);
const char titleDrwIco[] = "DrawIcon Output"; const char titleMask[] = "Mask(AND image)"; @@ -16,12 +14,6 @@ const char cursormask[] = "Cursor Mask Bitmap"; const char cursorcolor[] = "Cursor Color Bitmap";
-#ifdef _GetCursorInfo -typedef BOOL (__stdcall *GETCURSORINFO) (CURSORINFO *CursorInfo); - -static GETCURSORINFO GetCursorInfo = NULL; -#endif - HFONT tf; HINSTANCE hInst;
_____
Modified: trunk/rosapps/tests/icontest/icontest.xml --- trunk/rosapps/tests/icontest/icontest.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/icontest/icontest.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -4,5 +4,7 @@
<define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> + <library>ntdll</library> <file>icontest.c</file> + <efile>icontest.rc</efile> </module> _____
Modified: trunk/rosapps/tests/isotest/isotest.c --- trunk/rosapps/tests/isotest/isotest.c 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/isotest/isotest.c 2005-11-12 08:40:47 UTC (rev 19171) @@ -3,7 +3,9 @@
*/
#include <windows.h> -//#include <winioctl.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #include <stdio.h> #include <stdlib.h> #include <string.h> _____
Modified: trunk/rosapps/tests/isotest/isotest.xml --- trunk/rosapps/tests/isotest/isotest.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/isotest/isotest.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -3,6 +3,6 @@
<define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>ntdll</library> <file>isotest.c</file> </module> _____
Modified: trunk/rosapps/tests/linetest/linetest.c --- trunk/rosapps/tests/linetest/linetest.c 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/linetest/linetest.c 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,6 +1,9 @@
+ #include <windows.h> #include <stdio.h>
+#include <tchar.h> + LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM);
const TCHAR* CLASS_NAME = _T("LineTestClass"); _____
Modified: trunk/rosapps/tests/linetest/linetest.xml --- trunk/rosapps/tests/linetest/linetest.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/linetest/linetest.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,6 +1,7 @@
<module name="linetest" type="win32gui" installbase="bin" installname="linetest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> _____
Modified: trunk/rosapps/tests/mdi/mdi.xml --- trunk/rosapps/tests/mdi/mdi.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/mdi/mdi.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -4,5 +4,8 @@
<define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> + <library>comctl32</library> + <library>comdlg32</library> <file>mdi.c</file> + <efile>mdi.rc</efile> </module> _____
Modified: trunk/rosapps/tests/miditest/miditest.xml --- trunk/rosapps/tests/miditest/miditest.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/miditest/miditest.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -3,6 +3,6 @@
<define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>winmm</library> <file>miditest.c</file> </module> _____
Modified: trunk/rosapps/tests/moztest/moztest.c --- trunk/rosapps/tests/moztest/moztest.c 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/moztest/moztest.c 2005-11-12 08:40:47 UTC (rev 19171) @@ -8,9 +8,10 @@
ULONG DbgPrint(PCH Format,...);
+#undef DBG #define DBG(x) \ - printf("%s:%i - %s", __FILE__, __LINE__, x); \ - DbgPrint("%s:%i - %s", __FILE__, __LINE__, x); + printf("%s:%i - %s", __FILE__, __LINE__, x); \ + DbgPrint("%s:%i - %s", __FILE__, __LINE__, x);
int SocketTest() { _____
Modified: trunk/rosapps/tests/moztest/moztest.xml --- trunk/rosapps/tests/moztest/moztest.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/moztest/moztest.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -3,6 +3,7 @@
<define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>ntdll</library> + <library>ws2_32</library> <file>moztest.c</file> </module> _____
Modified: trunk/rosapps/tests/multithrdwin/multithrdwin.c --- trunk/rosapps/tests/multithrdwin/multithrdwin.c 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/multithrdwin/multithrdwin.c 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,6 +1,8 @@
#include <windows.h> #include <stdio.h>
+ULONG DbgPrint(PCH Format,...); + typedef struct _THRDCREATEWIN { HANDLE hThread; _____
Modified: trunk/rosapps/tests/multithrdwin/multithrdwin.xml --- trunk/rosapps/tests/multithrdwin/multithrdwin.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/multithrdwin/multithrdwin.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -4,5 +4,6 @@
<define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> + <library>ntdll</library> <file>multithrdwin.c</file> </module> _____
Modified: trunk/rosapps/tests/nameserverlist/nameserverlist.xml --- trunk/rosapps/tests/nameserverlist/nameserverlist.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/nameserverlist/nameserverlist.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -3,6 +3,6 @@
<define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>iphlpapi</library> <file>nameserverlist.c</file> </module> _____
Modified: trunk/rosapps/tests/noexecute/noexecute.c --- trunk/rosapps/tests/noexecute/noexecute.c 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/noexecute/noexecute.c 2005-11-12 08:40:47 UTC (rev 19171) @@ -7,7 +7,7 @@
#include <string.h> #include <windows.h>
-#include <pseh.h> +#include <pseh/pseh.h>
int test(int x) { _____
Modified: trunk/rosapps/tests/noexecute/noexecute.xml --- trunk/rosapps/tests/noexecute/noexecute.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/noexecute/noexecute.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -3,6 +3,6 @@
<define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>pseh</library> <file>noexecute.c</file> </module> _____
Modified: trunk/rosapps/tests/palbitblt/palbitblt.xml --- trunk/rosapps/tests/palbitblt/palbitblt.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/palbitblt/palbitblt.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,4 +1,4 @@
-<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe"> +<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" allowwarnings="true"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> _____
Modified: trunk/rosapps/tests/patblt/patblt.xml --- trunk/rosapps/tests/patblt/patblt.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/patblt/patblt.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,4 +1,4 @@
-<module name="patblt" type="win32gui" installbase="bin" installname="patblt.exe"> +<module name="patblt" type="win32gui" installbase="bin" installname="patblt.exe" allowwarnings="true"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> _____
Modified: trunk/rosapps/tests/polytest/polytest.xml --- trunk/rosapps/tests/polytest/polytest.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/polytest/polytest.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,4 +1,4 @@
-<module name="polytest" type="win32gui" installbase="bin" installname="polytest.exe"> +<module name="polytest" type="win32gui" installbase="bin" installname="polytest.exe" allowwarnings="true"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> _____
Modified: trunk/rosapps/tests/regdump/regdump.xml --- trunk/rosapps/tests/regdump/regdump.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/regdump/regdump.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,8 +1,12 @@
-<module name="regdump" type="win32gui" installbase="bin" installname="regdump.exe"> +<module name="regdump" type="win32cui" installbase="bin" installname="regdump.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> + <library>advapi32</library> <library>gdi32</library> + <file>main.c</file> <file>regdump.c</file> + <file>regcmds.c</file> + <file>regproc.c</file> </module> _____
Modified: trunk/rosapps/tests/regqueryvalue/regqueryvalue.xml --- trunk/rosapps/tests/regqueryvalue/regqueryvalue.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/regqueryvalue/regqueryvalue.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,4 +1,4 @@
-<module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.exe"> +<module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.exe" allowwarnings="true"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> _____
Modified: trunk/rosapps/tests/sectest/sectest.c --- trunk/rosapps/tests/sectest/sectest.c 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/sectest/sectest.c 2005-11-12 08:40:47 UTC (rev 19171) @@ -5,6 +5,8 @@
#include <stdio.h> #include <string.h>
+#include <tchar.h> + int main(int argc, char* argv[]) { HANDLE hFile; _____
Modified: trunk/rosapps/tests/sectest/sectest.xml --- trunk/rosapps/tests/sectest/sectest.xml 2005-11-12 06:37:36 UTC (rev 19170) +++ trunk/rosapps/tests/sectest/sectest.xml 2005-11-12 08:40:47 UTC (rev 19171) @@ -1,6 +1,7 @@
-<module name="sectest" type="win32gui" installbase="bin" installname="sectest.exe"> +<module name="sectest" type="win32gui" installbase="bin" installname="sectest.exe" allowwarnings="true"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library>
-
sedwards＠svn.reactos.com