Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[hpoussin] 19172: Move the initialization of USB keyboard and mouse to DriverEntry, to prevent some (not all!) race conditions with the loading of kbd/mouclass.

by hpoussin＠svn.reactos.com

Move the initialization of USB keyboard and mouse to DriverEntry, to prevent some (not all!) race conditions with the loading of kbd/mouclass. It is still not satisfying (they are not real USB drivers), but that's better... Modified: trunk/reactos/drivers/usb/miniport/common/main.c _____ Modified: trunk/reactos/drivers/usb/miniport/common/main.c --- trunk/reactos/drivers/usb/miniport/common/main.c 2005-11-12 08:40:47 UTC (rev 19171) +++ trunk/reactos/drivers/usb/miniport/common/main.c 2005-11-12 09:27:52 UTC (rev 19172) @@ -280,11 +280,6 @@ Status = IoCreateSymbolicLink(&LinkDeviceName, &DeviceName); - if (NT_SUCCESS(Status)) - Status = AddDevice_Keyboard(DriverObject, pdo); - if (NT_SUCCESS(Status)) - Status = AddDevice_Mouse(DriverObject, pdo); - if (!NT_SUCCESS(Status)) { DPRINT("USBMP: IoCreateSymbolicLink() call failed with status 0x%08x\n", Status); @@ -428,5 +423,8 @@ RegisterPortDriver(DriverObject, &UsbPortInterface); + AddDevice_Keyboard(DriverObject, NULL); + AddDevice_Mouse(DriverObject, NULL); + return STATUS_SUCCESS; }

18 years, 10 months

[sedwards] 19171: fix most of the rest of the tests, disable the rest till tomorrow

by sedwards＠svn.reactos.com

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> + + + <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> @@ -169,9 +163,8 @@  -<directory name="oskittcp"> - <xi:include href="oskittcp/oskittcp.xml" /> -</directory> + + <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> + + + <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> + + + + +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>

18 years, 10 months

[sedwards] 19170: build fixes

by sedwards＠svn.reactos.com

build fixes Modified: trunk/rosapps/tests/accelerator/accelerator.c Modified: trunk/rosapps/tests/alphablend/alphablend.c Modified: trunk/rosapps/tests/apc/apc.c Modified: trunk/rosapps/tests/apc/apc.xml Modified: trunk/rosapps/tests/atomtest/atomtest.c Modified: trunk/rosapps/tests/atomtest/atomtest.xml Modified: trunk/rosapps/tests/carets/carets.c Modified: trunk/rosapps/tests/carets/carets.rc Modified: trunk/rosapps/tests/carets/carets.xml Modified: trunk/rosapps/tests/combotst/combotst.xml Modified: trunk/rosapps/tests/create-links/create-links.xml Modified: trunk/rosapps/tests/diskspeed/diskspeed.c _____ Modified: trunk/rosapps/tests/accelerator/accelerator.c --- trunk/rosapps/tests/accelerator/accelerator.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/accelerator/accelerator.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -7,6 +7,10 @@ #define ID_ACCEL3 0x102 #define ID_ACCEL4 0x103 +#ifndef VK_A +#define VK_A 0x41 +#endif + /* * {fVirt, key, cmd} * fVirt |= FVIRTKEY | FCONTROL | FALT | FSHIFT _____ Modified: trunk/rosapps/tests/alphablend/alphablend.c --- trunk/rosapps/tests/alphablend/alphablend.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/alphablend/alphablend.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -1,6 +1,10 @@ #include <windows.h> #include <string.h> +BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heightDst, + HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc, + BLENDFUNCTION blendFunction); + #ifndef AC_SRC_ALPHA #define AC_SRC_ALPHA (0x1) #endif _____ Modified: trunk/rosapps/tests/apc/apc.c --- trunk/rosapps/tests/apc/apc.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/apc/apc.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -1,9 +1,8 @@ -#include <stdarg.h> -#include <string.h> #include <stdio.h> +#include <string.h> #include <windows.h> -#include <ddk/ntddk.h> -#include <rosrtl/string.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> HANDLE OutputHandle; HANDLE InputHandle; @@ -22,7 +21,7 @@ NTSTATUS Status; HANDLE FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING FileName = ROS_STRING_INITIALIZER(L"\\C:\\a.txt"); + UNICODE_STRING FileName = RTL_CONSTANT_STRING(L"\\C:\\a.txt"); IO_STATUS_BLOCK IoStatus; CHAR Buffer[256]; HANDLE EventHandle; _____ Modified: trunk/rosapps/tests/apc/apc.xml --- trunk/rosapps/tests/apc/apc.xml 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/apc/apc.xml 2005-11-12 06:37:36 UTC (rev 19170) @@ -3,5 +3,6 @@ <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> + <library>ntdll</library> <file>apc.c</file> </module> _____ Modified: trunk/rosapps/tests/atomtest/atomtest.c --- trunk/rosapps/tests/atomtest/atomtest.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/atomtest/atomtest.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -1,7 +1,8 @@ #include <stdio.h> #include <string.h> #include <windows.h> -#include <ddk/ntddk.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #define BUFFER_SIZE 256 _____ Modified: trunk/rosapps/tests/atomtest/atomtest.xml --- trunk/rosapps/tests/atomtest/atomtest.xml 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/atomtest/atomtest.xml 2005-11-12 06:37:36 UTC (rev 19170) @@ -3,6 +3,6 @@ <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> - <library>gdi32</library> + <library>ntdll</library> <file>atomtest.c</file> </module> _____ Modified: trunk/rosapps/tests/carets/carets.c --- trunk/rosapps/tests/carets/carets.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/carets/carets.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -8,6 +8,8 @@ static int CharHeight = 16; static HBITMAP CaretBitmap; +ULONG __cdecl DbgPrint(IN PCH Format, IN ...); + LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM); int WINAPI _____ Modified: trunk/rosapps/tests/carets/carets.rc --- trunk/rosapps/tests/carets/carets.rc 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/carets/carets.rc 2005-11-12 06:37:36 UTC (rev 19170) @@ -1,5 +1,3 @@ #include <windows.h> -#include <reactos/resource.h> -#include "resource.h" -IDB_CARET BITMAP DISCARDABLE "caret.bmp" +1 BITMAP DISCARDABLE "caret.bmp" _____ Modified: trunk/rosapps/tests/carets/carets.xml --- trunk/rosapps/tests/carets/carets.xml 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/carets/carets.xml 2005-11-12 06:37:36 UTC (rev 19170) @@ -4,5 +4,7 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> + <library>ntdll</library> <file>carets.c</file> + <efile>carets.rc</efile> </module> _____ Modified: trunk/rosapps/tests/combotst/combotst.xml --- trunk/rosapps/tests/combotst/combotst.xml 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/combotst/combotst.xml 2005-11-12 06:37:36 UTC (rev 19170) @@ -5,4 +5,5 @@ <library>kernel32</library> <library>gdi32</library> <file>combotst.c</file> + <file>utils.c</file> </module> _____ Modified: trunk/rosapps/tests/create-links/create-links.xml --- trunk/rosapps/tests/create-links/create-links.xml 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/create-links/create-links.xml 2005-11-12 06:37:36 UTC (rev 19170) @@ -4,5 +4,9 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> + <library>ole32</library> + <library>uuid</library> + <library>shell32</library> + <library>shlwapi</library> <file>create-links.c</file> </module> _____ Modified: trunk/rosapps/tests/diskspeed/diskspeed.c --- trunk/rosapps/tests/diskspeed/diskspeed.c 2005-11-12 05:51:44 UTC (rev 19169) +++ trunk/rosapps/tests/diskspeed/diskspeed.c 2005-11-12 06:37:36 UTC (rev 19170) @@ -8,13 +8,17 @@ * PROGRAMMER: Hartmut Birr */ -#include <windows.h> #include <stdio.h> #include <stdlib.h> -#include <ddk/ntddk.h> -#include <ddk/ntddscsi.h> -#include <ddk/scsi.h> +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +#define _NTSCSI_USER_MODE_ +#include <ntddscsi.h> +#include <scsi.h> + BOOL GetInquiryData(HANDLE hDevice, PINQUIRYDATA InquiryData) { BOOL Result;

18 years, 10 months

[ion] 19169: - Add RtlPinAtomInAtomTable

by ion＠svn.reactos.com

- Add RtlPinAtomInAtomTable Modified: trunk/reactos/include/ndk/rtlfuncs.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-11-12 04:27:10 UTC (rev 19168) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-11-12 05:51:44 UTC (rev 19169) @@ -1315,6 +1315,14 @@ NTSYSAPI NTSTATUS NTAPI +RtlPinAtomInAtomTable( + IN PRTL_ATOM_TABLE AtomTable, + IN RTL_ATOM Atom +); + +NTSYSAPI +NTSTATUS +NTAPI RtlLookupAtomInAtomTable( IN PRTL_ATOM_TABLE AtomTable, IN PWSTR AtomName,

18 years, 10 months

[sedwards] 19168: fixed most of the tests to process in rbuild. will fix linking in a bit

by sedwards＠svn.reactos.com

fixed most of the tests to process in rbuild. will fix linking in a bit Modified: trunk/rosapps/tests/README.txt Modified: trunk/rosapps/tests/bench/bench.xml Modified: trunk/rosapps/tests/button/button.xml Modified: trunk/rosapps/tests/button2/button2.xml Modified: trunk/rosapps/tests/directory.xml Modified: trunk/rosapps/tests/dnsapi/dnsapi.xml Modified: trunk/rosapps/tests/edit/edit.xml Modified: trunk/rosapps/tests/enumfonts/enumfonts.xml Modified: trunk/rosapps/tests/iptest/iptest.xml Modified: trunk/rosapps/tests/lantst/lantest.xml Modified: trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml Modified: trunk/rosapps/tests/oskittcp/oskittcp.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/primitives/primitives.xml Modified: trunk/rosapps/tests/stretchblt/stretchblt.xml Modified: trunk/rosapps/tests/tmrqueue/tmrqueue.xml Modified: trunk/rosapps/tests/txtscale/txtscale.xml Modified: trunk/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml _____ Modified: trunk/rosapps/tests/README.txt --- trunk/rosapps/tests/README.txt 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/README.txt 2005-11-12 04:27:10 UTC (rev 19168) @@ -1,3 +1,4 @@ -This folder contains tests that are not merged in to the new regression system. +This folder contains tests that are not merged in to +the new regression testing system. Please DO NOT add new tests here. \ No newline at end of file _____ Modified: trunk/rosapps/tests/bench/bench.xml --- trunk/rosapps/tests/bench/bench.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/bench/bench.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -1,8 +1,8 @@ -<module name="bench" type="win32gui" installbase="bin" installname="bench.exe"> +<module name="bench-thread" type="win32gui" installbase="bin" installname="bench-thread.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>bench.c</file> + <file>bench-thread.c</file> </module> _____ Modified: trunk/rosapps/tests/button/button.xml --- trunk/rosapps/tests/button/button.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/button/button.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>button.c</file> + <file>buttontst.c</file> </module> _____ Modified: trunk/rosapps/tests/button2/button2.xml --- trunk/rosapps/tests/button2/button2.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/button2/button2.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -1,8 +1,8 @@ -<module name="button2" type="win32gui" installbase="bin" installname="button2.exe"> +<module name="buttontst2" type="win32gui" installbase="bin" installname="buttontst2.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>button2.c</file> + <file>buttontst2.c</file> </module> _____ Modified: trunk/rosapps/tests/directory.xml --- trunk/rosapps/tests/directory.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/directory.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -130,9 +130,9 @@ <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> @@ -148,9 +148,9 @@ <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> @@ -166,9 +166,9 @@ <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> @@ -211,9 +211,9 @@ <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> @@ -253,8 +253,7 @@ <directory name="txtscale"> <xi:include href="txtscale/txtscale.xml" /> </directory> - -<directory name="vmtest/vmtest"> +<directory name="vmtest"> <xi:include href="vmtest/vmtest.xml" /> </directory> <directory name="wclickat"> _____ Modified: trunk/rosapps/tests/dnsapi/dnsapi.xml --- trunk/rosapps/tests/dnsapi/dnsapi.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/dnsapi/dnsapi.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>dnsapitst.c</file> + <file>dnsapi.c</file> </module> _____ Modified: trunk/rosapps/tests/edit/edit.xml --- trunk/rosapps/tests/edit/edit.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/edit/edit.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,6 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>edit.c</file> + <file>edittest.c</file> + <file>utils.c</file> </module> _____ Modified: trunk/rosapps/tests/enumfonts/enumfonts.xml --- trunk/rosapps/tests/enumfonts/enumfonts.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/enumfonts/enumfonts.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>enumfonts.c</file> + <file>enumfonts.cpp</file> </module> _____ Modified: trunk/rosapps/tests/iptest/iptest.xml --- trunk/rosapps/tests/iptest/iptest.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/iptest/iptest.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>iptest.c</file> + <file>iptest.cpp</file> </module> _____ Modified: trunk/rosapps/tests/lantst/lantest.xml --- trunk/rosapps/tests/lantst/lantest.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/lantst/lantest.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>lantest.c</file> + <file>lantest.cpp</file> </module> _____ Modified: trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml --- trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>map_dup_inherit</file> + <file>map_dup_inherit.c</file> </module> _____ Modified: trunk/rosapps/tests/oskittcp/oskittcp.xml --- trunk/rosapps/tests/oskittcp/oskittcp.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/oskittcp/oskittcp.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -1,8 +1,8 @@ -<module name="oskittcp" type="win32gui" installbase="bin" installname="oskittcp.exe"> +<module name="oskittcptst" type="win32gui" installbase="bin" installname="tcptest.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>oskittcp.c</file> + <file>tcptest.cpp</file> </module> _____ Modified: trunk/rosapps/tests/palbitblt/palbitblt.xml --- trunk/rosapps/tests/palbitblt/palbitblt.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/palbitblt/palbitblt.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>palbitblt.c</file> + <file>pal.c</file> </module> _____ Modified: trunk/rosapps/tests/patblt/patblt.xml --- trunk/rosapps/tests/patblt/patblt.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/patblt/patblt.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>patblt.c</file> + <file>patblt.cpp</file> </module> _____ Modified: trunk/rosapps/tests/polytest/polytest.xml --- trunk/rosapps/tests/polytest/polytest.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/polytest/polytest.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>polytest.c</file> + <file>polytest.cpp</file> </module> _____ Modified: trunk/rosapps/tests/primitives/primitives.xml --- trunk/rosapps/tests/primitives/primitives.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/primitives/primitives.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,6 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>primitives.c</file> + <file>primitives.cpp</file> + <file>mk_font.cpp</file> </module> _____ Modified: trunk/rosapps/tests/stretchblt/stretchblt.xml --- trunk/rosapps/tests/stretchblt/stretchblt.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/stretchblt/stretchblt.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>stretchblt.c</file> + <file>stretchblt.cpp</file> </module> _____ Modified: trunk/rosapps/tests/tmrqueue/tmrqueue.xml --- trunk/rosapps/tests/tmrqueue/tmrqueue.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/tmrqueue/tmrqueue.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -1,8 +1,8 @@ -<module name="tnrqueue" type="win32gui" installbase="bin" installname="tnrqueue.exe"> +<module name="tmrqueue" type="win32gui" installbase="bin" installname="tmrqueue.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>tnrqueue.c</file> + <file>tmrqueue.c</file> </module> _____ Modified: trunk/rosapps/tests/txtscale/txtscale.xml --- trunk/rosapps/tests/txtscale/txtscale.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/txtscale/txtscale.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,6 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>txtscale.c</file> + <file>txtscale.cpp</file> + <file>mk_font.cpp</file> </module> _____ Modified: trunk/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml --- trunk/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml 2005-11-12 03:53:21 UTC (rev 19167) +++ trunk/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml 2005-11-12 04:27:10 UTC (rev 19168) @@ -4,5 +4,5 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> - <file>wm_erasebkgnd.c</file> + <file>wm_erasebkgnd.cpp</file> </module>

18 years, 10 months

[sedwards] 19167: adjust the rest of the old test makefiles. 80% done porting to rbuild.

by sedwards＠svn.reactos.com

adjust the rest of the old test makefiles. 80% done porting to rbuild. Modified: trunk/rosapps/tests/nptest/nptest.xml Modified: trunk/rosapps/tests/oskittcp/oskittcp.xml Modified: trunk/rosapps/tests/p_dup_handle/p_dup_handle.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/popupmenu/popupmenu.xml Modified: trunk/rosapps/tests/primitives/primitives.xml Modified: trunk/rosapps/tests/pteb/pteb.xml Modified: trunk/rosapps/tests/regdump/regdump.xml Modified: trunk/rosapps/tests/regqueryvalue/regqueryvalue.xml Modified: trunk/rosapps/tests/regtest/regtest.xml Modified: trunk/rosapps/tests/sectest/sectest.xml Modified: trunk/rosapps/tests/sertest/sertest.xml Modified: trunk/rosapps/tests/shaptest/shaptest.xml Modified: trunk/rosapps/tests/shm/shm.xml Modified: trunk/rosapps/tests/statst/statst.xml Modified: trunk/rosapps/tests/statst2/statst2.xml Modified: trunk/rosapps/tests/stretchblt/stretchblt.xml Modified: trunk/rosapps/tests/subclass/subclass.xml Modified: trunk/rosapps/tests/suspend/suspend.xml Modified: trunk/rosapps/tests/tcpsvr/tcpsvr.xml Modified: trunk/rosapps/tests/terminate/terminate.xml Modified: trunk/rosapps/tests/thread/thread.xml Modified: trunk/rosapps/tests/thread_msg/thread_msg.xml Modified: trunk/rosapps/tests/threadwait/threadwait.xml Modified: trunk/rosapps/tests/tmrqueue/tmrqueue.xml Modified: trunk/rosapps/tests/tokentest/tokentest.xml Modified: trunk/rosapps/tests/txtscale/txtscale.xml Modified: trunk/rosapps/tests/vmtest/vmtest.xml Modified: trunk/rosapps/tests/winhello/winhello.xml Modified: trunk/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml Modified: trunk/rosapps/tests/wm_paint/wm_paint.xml Modified: trunk/rosapps/tests/zwcontinue/zwcontinue.xml _____ Modified: trunk/rosapps/tests/nptest/nptest.xml --- trunk/rosapps/tests/nptest/nptest.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/nptest/nptest.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="nptest" type="win32gui" installbase="bin" installname="nptest.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 + <file>nptest.c</file> +</module> _____ Modified: trunk/rosapps/tests/oskittcp/oskittcp.xml --- trunk/rosapps/tests/oskittcp/oskittcp.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/oskittcp/oskittcp.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="oskittcp" type="win32gui" installbase="bin" installname="oskittcp.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 + <file>oskittcp.c</file> +</module> _____ Modified: trunk/rosapps/tests/p_dup_handle/p_dup_handle.xml --- trunk/rosapps/tests/p_dup_handle/p_dup_handle.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/p_dup_handle/p_dup_handle.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="p_dup_handle" type="win32gui" installbase="bin" installname="p_dup_handle.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 + <file>p_dup_handle.c</file> +</module> _____ Modified: trunk/rosapps/tests/palbitblt/palbitblt.xml --- trunk/rosapps/tests/palbitblt/palbitblt.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/palbitblt/palbitblt.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.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 + <file>palbitblt.c</file> +</module> _____ Modified: trunk/rosapps/tests/patblt/patblt.xml --- trunk/rosapps/tests/patblt/patblt.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/patblt/patblt.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="patblt" type="win32gui" installbase="bin" installname="patblt.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 + <file>patblt.c</file> +</module> _____ Modified: trunk/rosapps/tests/polytest/polytest.xml --- trunk/rosapps/tests/polytest/polytest.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/polytest/polytest.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="polytest" type="win32gui" installbase="bin" installname="polytest.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 + <file>polytest.c</file> +</module> _____ Modified: trunk/rosapps/tests/popupmenu/popupmenu.xml --- trunk/rosapps/tests/popupmenu/popupmenu.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/popupmenu/popupmenu.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="popupmenu" type="win32gui" installbase="bin" installname="popupmenu.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 + <file>popupmenu.c</file> +</module> _____ Modified: trunk/rosapps/tests/primitives/primitives.xml --- trunk/rosapps/tests/primitives/primitives.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/primitives/primitives.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="primitives" type="win32gui" installbase="bin" installname="primitives.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 + <file>primitives.c</file> +</module> _____ Modified: trunk/rosapps/tests/pteb/pteb.xml --- trunk/rosapps/tests/pteb/pteb.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/pteb/pteb.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="pteb" type="win32gui" installbase="bin" installname="pteb.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 + <file>pteb.c</file> +</module> _____ Modified: trunk/rosapps/tests/regdump/regdump.xml --- trunk/rosapps/tests/regdump/regdump.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/regdump/regdump.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="regdump" type="win32gui" 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>gdi32</library> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>regdump.c</file> +</module> _____ Modified: trunk/rosapps/tests/regqueryvalue/regqueryvalue.xml --- trunk/rosapps/tests/regqueryvalue/regqueryvalue.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/regqueryvalue/regqueryvalue.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.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 + <file>regqueryvalue.c</file> +</module> _____ Modified: trunk/rosapps/tests/regtest/regtest.xml --- trunk/rosapps/tests/regtest/regtest.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/regtest/regtest.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="regtest" type="win32gui" installbase="bin" installname="regtest.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 + <file>regtest.c</file> +</module> _____ Modified: trunk/rosapps/tests/sectest/sectest.xml --- trunk/rosapps/tests/sectest/sectest.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/sectest/sectest.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="sectest" type="win32gui" installbase="bin" installname="sectest.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 + <file>sectest.c</file> +</module> _____ Modified: trunk/rosapps/tests/sertest/sertest.xml --- trunk/rosapps/tests/sertest/sertest.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/sertest/sertest.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="sertest" type="win32gui" installbase="bin" installname="sertest.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 + <file>sertest.c</file> +</module> _____ Modified: trunk/rosapps/tests/shaptest/shaptest.xml --- trunk/rosapps/tests/shaptest/shaptest.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/shaptest/shaptest.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="shaptest" type="win32gui" installbase="bin" installname="shaptest.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 + <file>shaptest.c</file> +</module> _____ Modified: trunk/rosapps/tests/shm/shm.xml --- trunk/rosapps/tests/shm/shm.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/shm/shm.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="shm" type="win32gui" installbase="bin" installname="shm.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 + <file>shm.c</file> +</module> _____ Modified: trunk/rosapps/tests/statst/statst.xml --- trunk/rosapps/tests/statst/statst.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/statst/statst.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="statst" type="win32gui" installbase="bin" installname="statst.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 + <file>statst.c</file> +</module> _____ Modified: trunk/rosapps/tests/statst2/statst2.xml --- trunk/rosapps/tests/statst2/statst2.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/statst2/statst2.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="statst2" type="win32gui" installbase="bin" installname="statst2.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 + <file>statst2.c</file> +</module> _____ Modified: trunk/rosapps/tests/stretchblt/stretchblt.xml --- trunk/rosapps/tests/stretchblt/stretchblt.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/stretchblt/stretchblt.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="stretchblt" type="win32gui" installbase="bin" installname="stretchblt.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 + <file>stretchblt.c</file> +</module> _____ Modified: trunk/rosapps/tests/subclass/subclass.xml --- trunk/rosapps/tests/subclass/subclass.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/subclass/subclass.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="subclass" type="win32gui" installbase="bin" installname="subclass.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 + <file>subclass.c</file> +</module> _____ Modified: trunk/rosapps/tests/suspend/suspend.xml --- trunk/rosapps/tests/suspend/suspend.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/suspend/suspend.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="suspend" type="win32gui" installbase="bin" installname="suspend.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 + <file>suspend.c</file> +</module> _____ Modified: trunk/rosapps/tests/tcpsvr/tcpsvr.xml --- trunk/rosapps/tests/tcpsvr/tcpsvr.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/tcpsvr/tcpsvr.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="tcpsvr" type="win32gui" 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> - - <file>alphablend.c</file> -</module> \ No newline at end of file + <file>tcpsvr.c</file> +</module> _____ Modified: trunk/rosapps/tests/terminate/terminate.xml --- trunk/rosapps/tests/terminate/terminate.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/terminate/terminate.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="terminate" type="win32gui" installbase="bin" installname="terminate.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 + <file>terminate.c</file> +</module> _____ Modified: trunk/rosapps/tests/thread/thread.xml --- trunk/rosapps/tests/thread/thread.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/thread/thread.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="thread" type="win32gui" installbase="bin" installname="thread.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 + <file>thread.c</file> +</module> _____ Modified: trunk/rosapps/tests/thread_msg/thread_msg.xml --- trunk/rosapps/tests/thread_msg/thread_msg.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/thread_msg/thread_msg.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="thread_msg" type="win32gui" installbase="bin" installname="thread_msg.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 + <file>thread_msg.c</file> +</module> _____ Modified: trunk/rosapps/tests/threadwait/threadwait.xml --- trunk/rosapps/tests/threadwait/threadwait.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/threadwait/threadwait.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="threadwait" type="win32gui" installbase="bin" installname="threadwait.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 + <file>threadwait.c</file> +</module> _____ Modified: trunk/rosapps/tests/tmrqueue/tmrqueue.xml --- trunk/rosapps/tests/tmrqueue/tmrqueue.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/tmrqueue/tmrqueue.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="tnrqueue" type="win32gui" installbase="bin" installname="tnrqueue.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 + <file>tnrqueue.c</file> +</module> _____ Modified: trunk/rosapps/tests/tokentest/tokentest.xml --- trunk/rosapps/tests/tokentest/tokentest.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/tokentest/tokentest.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="tokentest" type="win32gui" installbase="bin" installname="tokentest.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 + <file>tokentest.c</file> +</module> _____ Modified: trunk/rosapps/tests/txtscale/txtscale.xml --- trunk/rosapps/tests/txtscale/txtscale.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/txtscale/txtscale.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="txtscale" type="win32gui" installbase="bin" installname="txtscale.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 + <file>txtscale.c</file> +</module> _____ Modified: trunk/rosapps/tests/vmtest/vmtest.xml --- trunk/rosapps/tests/vmtest/vmtest.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/vmtest/vmtest.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="vmtest" type="win32gui" installbase="bin" installname="vmtest.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 + <file>vmtest.c</file> +</module> _____ Modified: trunk/rosapps/tests/winhello/winhello.xml --- trunk/rosapps/tests/winhello/winhello.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/winhello/winhello.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="winhello" type="win32gui" installbase="bin" installname="winhello.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 + <file>winhello.c</file> +</module> _____ Modified: trunk/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml --- trunk/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="wm_erasebkgnd" type="win32gui" installbase="bin" installname="wm_erasebkgnd.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 + <file>wm_erasebkgnd.c</file> +</module> _____ Modified: trunk/rosapps/tests/wm_paint/wm_paint.xml --- trunk/rosapps/tests/wm_paint/wm_paint.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/wm_paint/wm_paint.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="wm_paint" type="win32gui" installbase="bin" installname="wm_paint.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 + <file>wm_paint.c</file> +</module> _____ Modified: trunk/rosapps/tests/zwcontinue/zwcontinue.xml --- trunk/rosapps/tests/zwcontinue/zwcontinue.xml 2005-11-12 01:11:28 UTC (rev 19166) +++ trunk/rosapps/tests/zwcontinue/zwcontinue.xml 2005-11-12 03:53:21 UTC (rev 19167) @@ -1,10 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> +<module name="zwcontinue" type="win32gui" installbase="bin" installname="zwcontinue.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 + <file>zwcontinue.c</file> +</module>

18 years, 10 months

[gdalsnes] 19166: merge with wine (by hand!). fixes two failing kernel32 profile winetests. now all pass

by gdalsnes＠svn.reactos.com

merge with wine (by hand!). fixes two failing kernel32 profile winetests. now all pass Modified: trunk/reactos/lib/kernel32/misc/profile.c _____ Modified: trunk/reactos/lib/kernel32/misc/profile.c --- trunk/reactos/lib/kernel32/misc/profile.c 2005-11-12 00:26:21 UTC (rev 19165) +++ trunk/reactos/lib/kernel32/misc/profile.c 2005-11-12 01:11:28 UTC (rev 19166) @@ -112,8 +112,7 @@ { WCHAR quote = '\0'; - if (!buffer) - return; + if (!buffer) return; if (strip_quote && ((*value == '\'') || (*value == '\"'))) { @@ -122,6 +121,7 @@ } lstrcpynW( buffer, value, len ); + if (quote && (len >= wcslen(value))) buffer[wcslen(buffer)-1] = '\0'; } @@ -214,19 +214,16 @@ { int len = 0; - if (section->name[0]) - len += wcslen(section->name) + 6; + if (section->name[0]) len += wcslen(section->name) + 6; for (key = section->key; key; key = key->next) { len += wcslen(key->name) + 2; - if (key->value) - len += wcslen(key->value) + 1; + if (key->value) len += wcslen(key->value) + 1; } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!buffer) - return; + if (!buffer) return; p = buffer; if (section->name[0]) @@ -274,8 +271,7 @@ for (key = section->key; key; key = next_key) { next_key = key->next; - if (key->value) - HeapFree( GetProcessHeap(), 0, key->value ); + HeapFree( GetProcessHeap(), 0, key->value ); HeapFree( GetProcessHeap(), 0, key ); } next_section = section->next; @@ -321,10 +317,6 @@ return ENCODING_ANSI; } -static const WCHAR * PROFILE_GetLine(const WCHAR * szStart, const WCHAR * szEnd) -{ - return memchrW(szStart, '\n', szEnd - szStart); -} /*********************************************************************** * PROFILE_Load @@ -336,7 +328,7 @@ void *pBuffer; WCHAR * szFile; const WCHAR *szLineStart, *szLineEnd; - const WCHAR *szValueStart, *szNameEnd, *szEnd; + const WCHAR *szValueStart, *szEnd, *next_line; int line = 0, len; PROFILESECTION *section, *first_section; PROFILESECTION **next_section; @@ -429,20 +421,21 @@ next_section = &first_section->next; next_key = &first_section->key; prev_key = NULL; - szLineEnd = szFile - 1; /* will be increased to correct value in loop */ + next_line = szFile; - while (TRUE) + while (next_line < szEnd) { - szLineStart = szLineEnd + 1; - if (szLineStart >= szEnd) - break; - szLineEnd = PROFILE_GetLine(szLineStart, szEnd); - if (!szLineEnd) - szLineEnd = szEnd; + szLineStart = next_line; + next_line = memchrW(szLineStart, '\n', szEnd - szLineStart); + if (!next_line) next_line = szEnd; + else next_line++; + szLineEnd = next_line; + line++; - while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) - szLineStart++; + /* get rid of white space */ + while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) szLineStart++; + while ((szLineEnd > szLineStart) && ((szLineEnd[-1] == '\n') || PROFILE_isspaceW(szLineEnd[-1]))) szLineEnd--; if (szLineStart >= szLineEnd) continue; @@ -478,31 +471,18 @@ } } - /* get rid of white space at the end of the line */ - while ((szLineEnd > szLineStart) && ((*szLineEnd == '\n') || PROFILE_isspaceW(*szLineEnd))) - szLineEnd--; - - /* line end should be pointing to character *after* the last wanted character */ - szLineEnd++; - /* get rid of white space after the name and before the start * of the value */ - if ((szNameEnd = szValueStart = memchrW( szLineStart, '=', szLineEnd - szLineStart )) != NULL) + len = szLineEnd - szLineStart; + if ((szValueStart = memchrW( szLineStart, '=', szLineEnd - szLineStart )) != NULL) { - szNameEnd = szValueStart - 1; - while ((szNameEnd > szLineStart) && PROFILE_isspaceW(*szNameEnd)) - szNameEnd--; + const WCHAR *szNameEnd = szValueStart; + while ((szNameEnd > szLineStart) && PROFILE_isspaceW(szNameEnd[-1])) szNameEnd--; + len = szNameEnd - szLineStart; szValueStart++; - while (szValueStart < szLineEnd && PROFILE_isspaceW(*szValueStart)) - szValueStart++; + while (szValueStart < szLineEnd && PROFILE_isspaceW(*szValueStart)) szValueStart++; } - if (!szNameEnd) - szNameEnd = szLineEnd - 1; - /* name end should be pointing to character *after* the last wanted character */ - szNameEnd++; - len = (int)(szNameEnd - szLineStart); - if (len || !prev_key || *prev_key->name) { /* no need to allocate +1 for NULL terminating character as @@ -577,8 +557,7 @@ { PROFILEKEY *to_del = *key; *key = to_del->next; - if (to_del->value) - HeapFree( GetProcessHeap(), 0, to_del->value); + HeapFree( GetProcessHeap(), 0, to_del->value); HeapFree( GetProcessHeap(), 0, to_del ); return TRUE; } @@ -596,7 +575,7 @@ * * Delete all keys from a profile tree. */ -void PROFILE_DeleteAllKeys( LPCWSTR section_name) +static void PROFILE_DeleteAllKeys( LPCWSTR section_name) { PROFILESECTION **section= &CurProfile->section; while (*section) @@ -608,8 +587,7 @@ { PROFILEKEY *to_del = *key; *key = to_del->next; - if (to_del->value) - HeapFree( GetProcessHeap(), 0, to_del->value); + HeapFree( GetProcessHeap(), 0, to_del->value); HeapFree( GetProcessHeap(), 0, to_del ); CurProfile->changed =TRUE; } @@ -737,8 +715,7 @@ { PROFILE_FlushFile(); PROFILE_Free( CurProfile->section ); - if (CurProfile->filename) - HeapFree( GetProcessHeap(), 0, CurProfile->filename ); + HeapFree( GetProcessHeap(), 0, CurProfile->filename ); CurProfile->changed = FALSE; CurProfile->section = NULL; CurProfile->filename = NULL; @@ -877,7 +854,7 @@ * If return_values is TRUE, also include the corresponding values. */ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, - LPWSTR buffer, UINT len, BOOL return_values ) + LPWSTR buffer, UINT len, BOOL return_values, BOOL return_noequalkeys ) { PROFILEKEY *key; @@ -893,12 +870,10 @@ UINT oldlen = len; for (key = section->key; key; key = key->next) { - if (len <= 2) - break; - if (!*key->name) - continue; /* Skip empty lines */ - if (IS_ENTRY_COMMENT(key->name)) - continue; /* Skip comments */ + if (len <= 2) break; + if (!*key->name) continue; /* Skip empty lines */ + if (IS_ENTRY_COMMENT(key->name)) continue; /* Skip comments */ + if (!return_noequalkeys && !return_values && !key->value) continue; /* Skip lines w.o. '=' */ PROFILE_CopyEntry( buffer, key->name, len - 1, 0 ); len -= wcslen(buffer) + 1; buffer += wcslen(buffer) + 1; @@ -935,41 +910,36 @@ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) { LPWSTR buf; - UINT f,l; + UINT buflen,tmplen; PROFILESECTION *section; DPRINT("(%p, %d)\n", buffer, len); if (!buffer || !len) return 0; - if (len == 1) - { + if (len == 1) { *buffer = '\0'; return 0; } - f = len - 1; + buflen=len-1; buf = buffer; section = CurProfile->section; - while ((section!=NULL)) - { - if (section->name[0]) - { - l = wcslen(section->name)+1; - if (l > f) - { - if (f > 0) - { - memcpy(buf, section->name, (f - 1) * sizeof(WCHAR)); - buf += f - 1; + while ((section!=NULL)) { + if (section->name[0]) { + tmplen = wcslen(section->name)+1; + if (tmplen > buflen) { + if (buflen > 0) { + memcpy(buf, section->name, (buflen - 1) * sizeof(WCHAR)); + buf += buflen - 1; *buf++ = '\0'; } *buf='\0'; return len - 2; } - wcscpy(buf, section->name); - buf += l; - f -= l; + memcpy(buf, section->name, tmplen * sizeof(WCHAR)); + buf += tmplen; + buflen -= tmplen; } section = section->next; } @@ -1001,17 +971,14 @@ * */ static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, - LPCWSTR def_val, LPWSTR buffer, UINT len ) + LPCWSTR def_val, LPWSTR buffer, UINT len, BOOL win32 ) { PROFILEKEY *key = NULL; static const WCHAR empty_strW[] = { 0 }; - if (!buffer) - return 0; + if (!buffer) return 0; - if (!def_val) - def_val = empty_strW; - + if (!def_val) def_val = empty_strW; if (key_name) { if (!key_name[0]) @@ -1031,7 +998,7 @@ /* no "else" here ! */ if (section && section[0]) { - INT ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, FALSE); + INT ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, FALSE, !win32); if (!buffer[0]) /* no luck -> def_val */ { PROFILE_CopyEntry(buffer, def_val, len, TRUE); @@ -1073,13 +1040,11 @@ key_name, TRUE, create_always ); DPRINT("(%S, %S, %S):\n", section_name, key_name, value); - if (!key) - return FALSE; + if (!key) return FALSE; /* strip the leading spaces. We can safely strip \n\r and * friends too, they should not happen here anyway. */ - while (PROFILE_isspaceW(*value)) - value++; + while (PROFILE_isspaceW(*value)) value++; if (key->value) { @@ -1123,15 +1088,15 @@ } /* - * if allow_section_name_copy is TRUE, allow the copying : - * - of Section names if 'section' is NULL - * - of Keys in a Section if 'entry' is NULL + * if win32, copy: + * - Section names if 'section' is NULL + * - Keys in a Section if 'entry' is NULL * (see MSDN doc for GetPrivateProfileString) */ static int PROFILE_GetPrivateProfileString( LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, LPWSTR buffer, UINT len, LPCWSTR filename, - BOOL allow_section_name_copy ) + BOOL win32 ) { int ret; LPCWSTR pDefVal = NULL; @@ -1172,16 +1137,13 @@ RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) - { - if ((allow_section_name_copy) && (section == NULL)) + if (PROFILE_Open( filename )) { + if (win32 && (section == NULL)) ret = PROFILE_GetSectionNames(buffer, len); else - /* PROFILE_GetString already handles the 'entry == NULL' case */ - ret = PROFILE_GetString( section, entry, pDefVal, buffer, len ); - } - else - { + /* PROFILE_GetString can handle the 'entry == NULL' case */ + ret = PROFILE_GetString( section, entry, pDefVal, buffer, len, win32 ); + } else { lstrcpynW( buffer, pDefVal, len ); ret = wcslen( buffer ); } @@ -1237,7 +1199,7 @@ RtlFreeUnicodeString(&entryW); RtlFreeUnicodeString(&def_valW); RtlFreeUnicodeString(&filenameW); - if (bufferW) HeapFree(GetProcessHeap(), 0, bufferW); + HeapFree(GetProcessHeap(), 0, bufferW); return ret; } @@ -1368,7 +1330,7 @@ RtlEnterCriticalSection( &PROFILE_CritSect ); if (PROFILE_Open( filename )) - ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE); + ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE, FALSE); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1413,7 +1375,7 @@ RtlFreeUnicodeString(&sectionW); RtlFreeUnicodeString(&filenameW); - if (bufferW) HeapFree(GetProcessHeap(), 0, bufferW); + HeapFree(GetProcessHeap(), 0, bufferW); return ret; } @@ -1444,25 +1406,21 @@ RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) + if (!section && !entry && !string) /* documented "file flush" case */ { - if (!section && !entry && !string) /* documented "file flush" case */ + if (!filename || PROFILE_Open( filename )) { - PROFILE_FlushFile(); - PROFILE_ReleaseFile(); /* always return FALSE in this case */ + if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } - else - { - if (!section) - { - DPRINT1("(NULL?, %S, %S, %S)?\n", + } + else if (PROFILE_Open( filename )) + { + if (!section) { + DPRINT1("(NULL?, %S, %S, %S)?\n", entry, string, filename); - } - else - { - ret = PROFILE_SetString( section, entry, string, FALSE); - PROFILE_FlushFile(); - } + } else { + ret = PROFILE_SetString( section, entry, string, FALSE); + PROFILE_FlushFile(); } } @@ -1508,28 +1466,24 @@ RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename )) + if (!section && !string) { - if (!section && !string) + if (!filename || PROFILE_Open( filename )) { - PROFILE_ReleaseFile(); /* always return FALSE in this case */ + if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } - else if (!string) - { - /* delete the named section*/ + } + else if (PROFILE_Open( filename )) { + if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); PROFILE_FlushFile(); - } - else - { + } else { PROFILE_DeleteAllKeys(section); ret = TRUE; - while(*string) - { - LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (wcslen(string) + 1) * sizeof(WCHAR) ); + while(*string) { + LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (wcslen(string)+1) * sizeof(WCHAR) ); wcscpy( buf, string ); - if ((p = wcschr( buf, L'='))) - { + if((p = wcschr( buf, '='))) { *p = '\0'; ret = PROFILE_SetString( section, buf, p + 1, TRUE); } @@ -1560,8 +1514,7 @@ INT lenA, lenW; LPCSTR p = string; - while(*p) - p += strlen(p) + 1; + while(*p) p += strlen(p) + 1; lenA = p - string + 1; lenW = MultiByteToWideChar(CP_ACP, 0, string, lenA, NULL, 0); if ((stringW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)))) @@ -1680,7 +1633,7 @@ } RtlFreeUnicodeString(&filenameW); - if (bufferW) HeapFree(GetProcessHeap(), 0, bufferW); + HeapFree(GetProcessHeap(), 0, bufferW); return ret; }

18 years, 10 months

[gedmurphy] 19165: - build as unicode

by gedmurphy＠svn.reactos.com

- build as unicode - use a _tmain hack w3seek put together Modified: trunk/reactos/subsys/system/sc/sc.c Modified: trunk/reactos/subsys/system/sc/sc.xml _____ Modified: trunk/reactos/subsys/system/sc/sc.c --- trunk/reactos/subsys/system/sc/sc.c 2005-11-12 00:24:16 UTC (rev 19164) +++ trunk/reactos/subsys/system/sc/sc.c 2005-11-12 00:26:21 UTC (rev 19165) @@ -137,10 +137,13 @@ return 0; } +#if defined(_UNICODE) && defined(__GNUC__) +static +#endif int _tmain(int argc, LPCTSTR argv[]) { - LPTSTR MachineName = NULL; // remote machine + LPTSTR MachineName = NULL; // remote machine LPCTSTR Command = NULL; // sc command LPCTSTR ServiceName = NULL; // Name of service @@ -169,3 +172,42 @@ return MainUsage(); } + + +#if defined(_UNICODE) && defined(__GNUC__) +/* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */ +int main( int argc, char **argv ) +{ + WCHAR **argvW; + int i, j, Ret = 1; + + if ((argvW = malloc(argc * sizeof(WCHAR*)))) + { + /* convert the arguments */ + for (i = 0, j = 0; i < argc; i++) + { + if (!(argvW[i] = malloc((strlen(argv[i]) + 1) * sizeof(WCHAR)))) + { + j++; + } + swprintf(argvW[i], L"%hs", argv[i]); + } + + if (j == 0) + { + /* no error converting the parameters, call wmain() */ + Ret = wmain(argc, (LPCTSTR *)argvW); + } + + /* free the arguments */ + for (i = 0; i < argc; i++) + { + if (argvW[i]) + free(argvW[i]); + } + free(argvW); + } + + return Ret; +} +#endif _____ Modified: trunk/reactos/subsys/system/sc/sc.xml --- trunk/reactos/subsys/system/sc/sc.xml 2005-11-12 00:24:16 UTC (rev 19164) +++ trunk/reactos/subsys/system/sc/sc.xml 2005-11-12 00:26:21 UTC (rev 19165) @@ -1,6 +1,8 @@ <module name="sc" type="win32cui" installbase="system32" installname="sc.exe"> <define name="__USE_W32API" /> <define name="DEFINE_GUID" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>kernel32</library> <file>sc.c</file> <file>start.c</file>

18 years, 10 months

[greatlrd] 19164: fixed last part of bug 910 change Windows/ to ReactOS

by greatlrd＠svn.reactos.com

fixed last part of bug 910 change Windows/ to ReactOS Modified: trunk/reactos/subsys/system/cmd/De.rc Modified: trunk/reactos/subsys/system/cmd/En.rc _____ Modified: trunk/reactos/subsys/system/cmd/De.rc --- trunk/reactos/subsys/system/cmd/De.rc 2005-11-12 00:19:03 UTC (rev 19163) +++ trunk/reactos/subsys/system/cmd/De.rc 2005-11-12 00:24:16 UTC (rev 19164) @@ -527,7 +527,7 @@ FOR Fuehrt einen angegebenen Befehl fuer jede Datei in einem Dateiensatz\n\ aus.\n\ FREE Zeigt den (freien) Speicherplatz an.\n\ -GOTO Setzt den Windows-Befehlsinterpreter auf eine markierte Zeile in\n\ +GOTO Setzt den ReactOS-Befehlsinterpreter auf eine markierte Zeile in\n\ einem Batchprogramm.\n\ HELP Zeigt Hilfeinformationen zu ReactOS-Befehlen an.\n\ HISTORY Listet alle Befehle auf welche sich im Speicher befinden.\n\ @@ -557,7 +557,7 @@ TIMER Erlaubt die Benutzung von bis zu 10 Stopuhren\n\ TITLE Legt den Fenstertitel fuer das Eingabeaufforderungsfenster fest.\n\ TYPE Zeigt den Inhalt einer Textdatei an.\n\ -VER Zeigt die Windows-Version an.\n\ +VER Zeigt die ReactOS-Version an.\n\ VERIFY Legt fest, ob ueberwacht werden soll, ob Dateien korrekt auf den\n\ Datentraeger geschrieben werden.\n\ VOL Zeigt die Datentraegervolumebezeichnung und die Seriennummer an.\n" _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-11-12 00:19:03 UTC (rev 19163) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-11-12 00:24:16 UTC (rev 19164) @@ -524,7 +524,7 @@ EXIT Quits the CMD.EXE program (command interpreter).\n\ FOR Runs a specified command for each file in a set of files.\n\ FREE (free) disc space.\n\ -GOTO Directs the Windows command interpreter to a labeled line in\n\ +GOTO Directs the ReactOS command interpreter to a labeled line in\n\ a batch program.\n\ HELP Provides Help information for ReactOS commands.\n\ HISTORY List alle commands which has been used\n\ @@ -546,7 +546,7 @@ RENAME Renames a file or files.\n\ RMDIR Removes a directory.\n\ SCREEN Move cursor and optionally print text.\n\ -SET Displays, sets, or removes Windows environment variables.\n\ +SET Displays, sets, or removes ReactOS environment variables.\n\ SHIFT Shifts the position of replaceable parameters in batch files.\n" STRING_HELP2, "START Starts a separate window to run a specified program or command.\n\ Executes command.\n\ @@ -554,8 +554,8 @@ TIMER Allow the use of ten stopwaches.\n\ TITLE Sets the window title for a CMD.EXE session.\n\ TYPE Displays the contents of a text file.\n\ -VER Displays the Windows version.\n\ -VERIFY Tells Windows whether to verify that your files are written\n\ +VER Displays the ReactOS version.\n\ +VERIFY Tells ReactOS whether to verify that your files are written\n\ correctly to a disk.\n\ VOL Displays a disk volume label and serial number.\n"

18 years, 10 months

[greatlrd] 19163: fixed last part of bug 910 change Windows/ to ReactOS

by greatlrd＠svn.reactos.com

18 years, 10 months

← Newer
1
...
60
61
62
63
64
65
66
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005