Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[ekohl] 14723: Move RtlAreAllAccessesGranted, RtlAreAnyAccessesGranted and RtlMapGenericMask to the shared runtime library.
by ekohl＠svn.reactos.com 20 Apr '05

20 Apr '05

Move RtlAreAllAccessesGranted, RtlAreAnyAccessesGranted and RtlMapGenericMask to the shared runtime library. Modified: trunk/reactos/lib/ntdll/makefile Deleted: trunk/reactos/lib/ntdll/rtl/access.c Added: trunk/reactos/lib/rtl/access.c Modified: trunk/reactos/lib/rtl/makefile Modified: trunk/reactos/ntoskrnl/se/access.c _____ Modified: trunk/reactos/lib/ntdll/makefile --- trunk/reactos/lib/ntdll/makefile 2005-04-20 20:48:55 UTC (rev 14722) +++ trunk/reactos/lib/ntdll/makefile 2005-04-20 20:58:16 UTC (rev 14723) @@ -63,7 +63,6 @@ rtl/i386/ftol.o RTL_OBJECTS = \ - rtl/access.o \ rtl/apc.o \ rtl/atom.o \ rtl/callback.o \ _____ Deleted: trunk/reactos/lib/ntdll/rtl/access.c --- trunk/reactos/lib/ntdll/rtl/access.c 2005-04-20 20:48:55 UTC (rev 14722) +++ trunk/reactos/lib/ntdll/rtl/access.c 2005-04-20 20:58:16 UTC (rev 14723) @@ -1,70 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Access rights handling functions - * FILE: lib/ntdll/rtl/access.c - * PROGRAMER: Eric Kohl <ekohl(a)rz-online.de> - * REVISION HISTORY: - * 06/04/2000: Created - */ - -/* INCLUDES *****************************************************************/ - -#include <ddk/ntddk.h> - -#include <ntdll/ntdll.h> - -/* FUNCTIONS ***************************************************************/ - -BOOLEAN -STDCALL -RtlAreAllAccessesGranted ( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess - ) -{ - return ((GrantedAccess & DesiredAccess) == DesiredAccess); -} - - -/* - * @implemented - */ -BOOLEAN -STDCALL -RtlAreAnyAccessesGranted ( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess - ) -{ - return ((GrantedAccess & DesiredAccess) != 0); -} - - -/* - * @implemented - */ -VOID -STDCALL -RtlMapGenericMask ( - PACCESS_MASK AccessMask, - PGENERIC_MAPPING GenericMapping - ) -{ - if (*AccessMask & GENERIC_READ) - *AccessMask |= GenericMapping->GenericRead; - - if (*AccessMask & GENERIC_WRITE) - *AccessMask |= GenericMapping->GenericWrite; - - if (*AccessMask & GENERIC_EXECUTE) - *AccessMask |= GenericMapping->GenericExecute; - - if (*AccessMask & GENERIC_ALL) - *AccessMask |= GenericMapping->GenericAll; - - *AccessMask &= 0x0FFFFFFF; -} - -/* EOF */ _____ Added: trunk/reactos/lib/rtl/access.c --- trunk/reactos/lib/rtl/access.c 2005-04-20 20:48:55 UTC (rev 14722) +++ trunk/reactos/lib/rtl/access.c 2005-04-20 20:58:16 UTC (rev 14723) @@ -0,0 +1,68 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/rtl/access.c + * PURPOSE: Access rights handling functions + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include <ddk/ntddk.h> +#include <ntdll/rtl.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ***************************************************************/ + +/* + * @implemented + */ +BOOLEAN STDCALL +RtlAreAllAccessesGranted(ACCESS_MASK GrantedAccess, + ACCESS_MASK DesiredAccess) +{ + PAGED_CODE_RTL(); + return ((GrantedAccess & DesiredAccess) == DesiredAccess); +} + + +/* + * @implemented + */ +BOOLEAN STDCALL +RtlAreAnyAccessesGranted(ACCESS_MASK GrantedAccess, + ACCESS_MASK DesiredAccess) +{ + PAGED_CODE_RTL(); + return ((GrantedAccess & DesiredAccess) != 0); +} + + +/* + * @implemented + */ +VOID STDCALL +RtlMapGenericMask(PACCESS_MASK AccessMask, + PGENERIC_MAPPING GenericMapping) +{ + PAGED_CODE_RTL(); + + if (*AccessMask & GENERIC_READ) + *AccessMask |= GenericMapping->GenericRead; + + if (*AccessMask & GENERIC_WRITE) + *AccessMask |= GenericMapping->GenericWrite; + + if (*AccessMask & GENERIC_EXECUTE) + *AccessMask |= GenericMapping->GenericExecute; + + if (*AccessMask & GENERIC_ALL) + *AccessMask |= GenericMapping->GenericAll; + + *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + +/* EOF */ _____ Modified: trunk/reactos/lib/rtl/makefile --- trunk/reactos/lib/rtl/makefile 2005-04-20 20:48:55 UTC (rev 14722) +++ trunk/reactos/lib/rtl/makefile 2005-04-20 20:58:16 UTC (rev 14723) @@ -17,6 +17,7 @@ endif TARGET_OBJECTS = \ + access.o \ acl.o \ ppb.o \ bit.o \ _____ Modified: trunk/reactos/ntoskrnl/se/access.c --- trunk/reactos/ntoskrnl/se/access.c 2005-04-20 20:48:55 UTC (rev 14722) +++ trunk/reactos/ntoskrnl/se/access.c 2005-04-20 20:58:16 UTC (rev 14723) @@ -1,11 +1,10 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/access.c - * PURPOSE: Access rights handling functions - * - * PROGRAMMERS: Eric Kohl <eric.kohl(a)t-online.de> + * PURPOSE: Access state functions + * + * PROGRAMMERS: Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -17,65 +16,6 @@ /* FUNCTIONS ***************************************************************/ /* - * @implemented - */ -BOOLEAN -STDCALL -RtlAreAllAccessesGranted ( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess - ) -{ - PAGED_CODE_RTL(); - - return ((GrantedAccess & DesiredAccess) == DesiredAccess); -} - - -/* - * @implemented - */ -BOOLEAN -STDCALL -RtlAreAnyAccessesGranted ( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess - ) -{ - PAGED_CODE_RTL(); - - return ((GrantedAccess & DesiredAccess) != 0); -} - - -/* - * @implemented - */ -VOID -STDCALL -RtlMapGenericMask ( - PACCESS_MASK AccessMask, - PGENERIC_MAPPING GenericMapping - ) -{ - PAGED_CODE_RTL(); - - if (*AccessMask & GENERIC_READ) - *AccessMask |= GenericMapping->GenericRead; - - if (*AccessMask & GENERIC_WRITE) - *AccessMask |= GenericMapping->GenericWrite; - - if (*AccessMask & GENERIC_EXECUTE) - *AccessMask |= GenericMapping->GenericExecute; - - if (*AccessMask & GENERIC_ALL) - *AccessMask |= GenericMapping->GenericAll; - - *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); -} - -/* * @unimplemented */ NTSTATUS

1 0

[chorns] 14722: Don't put \ at end of path
by chorns＠svn.reactos.com 20 Apr '05

20 Apr '05

Don't put \ at end of path Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-20 19:52:45 UTC (rev 14721) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-20 20:48:55 UTC (rev 14722) @@ -2550,7 +2550,7 @@ backend->outputDirectory ); string bootcdReactosNoFixup = bootcdDirectory + SSEP "reactos"; string bootcdReactos = PassThruCacheDirectory ( - NormalizeFilename ( bootcdReactosNoFixup ) + SSEP, + NormalizeFilename ( bootcdReactosNoFixup + SSEP ), backend->outputDirectory ); CLEAN_FILE ( bootcdReactos ); string reactosInf = PassThruCacheDirectory (

1 0

[gvg] 14721: Roman Hoegg <roman.hoegg@unisg.ch>
by gvg＠svn.reactos.com 20 Apr '05

20 Apr '05

Roman Hoegg <roman.hoegg(a)unisg.ch> Add configuration stuff for Swiss German keyboard Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/txtsetup.sif _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-04-20 19:38:39 UTC (rev 14720) +++ trunk/reactos/bootdata/hivesys.inf 2005-04-20 19:52:45 UTC (rev 14721) @@ -70,6 +70,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"SE" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout File",0x00000000,"kbduk.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout Text",0x00000000,"UK" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layou t File",0x00000000,"kbdsg.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layou t Text",0x00000000,"SG" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}",,0x00000000,"Network Adapters" @@ -170,6 +172,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0410",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","041d",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0809",0x00000000," l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0807",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x0000000 0,"0409" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0 x00000000,"0409" _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-04-20 19:38:39 UTC (rev 14720) +++ trunk/reactos/bootdata/txtsetup.sif 2005-04-20 19:52:45 UTC (rev 14721) @@ -80,6 +80,7 @@ 00000419 = "Russian" 0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" +00000807 = "German (Swiss)" [Files.KeyboardLayout] 00000406 = kbdda.dll @@ -91,6 +92,7 @@ 00000419 = kbdru.dll 0000041D = kbdse.dll 00000809 = kbduk.dll +00000807 = kbdsg.dll [Mouse] ;<id> = <user friendly name>,<spare>,<service key name>

1 0

[hpoussin] 14720: Implement IoRegisterDeviceInterface
by hpoussin＠svn.reactos.com 20 Apr '05

20 Apr '05

Implement IoRegisterDeviceInterface Modified: trunk/reactos/include/ddk/defines.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/deviface.c _____ Modified: trunk/reactos/include/ddk/defines.h --- trunk/reactos/include/ddk/defines.h 2005-04-20 19:33:48 UTC (rev 14719) +++ trunk/reactos/include/ddk/defines.h 2005-04-20 19:38:39 UTC (rev 14720) @@ -28,7 +28,8 @@ OBJ_CASE_INSENSITIVE = 0x40, OBJ_OPENIF = 0x80, OBJ_OPENLINK = 0x100, - OBJ_VALID_ATTRIBUTES = 0x1F2, + OBJ_KERNEL_HANDLE = 0x200, + OBJ_VALID_ATTRIBUTES = 0x3F2, }; /* _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-04-20 19:33:48 UTC (rev 14719) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-04-20 19:38:39 UTC (rev 14720) @@ -64,6 +64,15 @@ #include <pseh.h> +#ifndef RTL_CONSTANT_STRING +#define RTL_CONSTANT_STRING(__SOURCE_STRING__) \ +{ \ + sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ + sizeof(__SOURCE_STRING__), \ + (__SOURCE_STRING__) \ +} +#endif + #ifdef DBG #ifndef PAGED_CODE #define PAGED_CODE() \ _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2005-04-20 19:33:48 UTC (rev 14719) +++ trunk/reactos/ntoskrnl/io/deviface.c 2005-04-20 19:38:39 UTC (rev 14720) @@ -16,11 +16,10 @@ #define NDEBUG #include <internal/debug.h> -DEFINE_GUID(GUID_SERENUM_BUS_ENUMERATOR, - 0x4D36E978L, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); - /* FUNCTIONS *****************************************************************/ +static PWCHAR BaseKeyString = L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\DeviceClasses \\"; + /* * @unimplemented */ @@ -93,7 +92,6 @@ IN ULONG Flags, OUT PWSTR *SymbolicLinkList) { - PWCHAR BaseKeyString = L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\DeviceClasses \\"; PWCHAR BaseInterfaceString = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; UNICODE_STRING GuidString; UNICODE_STRING BaseKeyName; @@ -561,7 +559,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL @@ -571,16 +569,212 @@ IN PUNICODE_STRING ReferenceString OPTIONAL, OUT PUNICODE_STRING SymbolicLinkName) { - PWCHAR KeyNameString = L"\\Device\\Serenum"; - - DPRINT("IoRegisterDeviceInterface called (UNIMPLEMENTED)\n"); - if (!memcmp(InterfaceClassGuid, (LPGUID)&GUID_SERENUM_BUS_ENUMERATOR, sizeof(GUID))) + PUNICODE_STRING InstancePath; + UNICODE_STRING GuidString; + UNICODE_STRING SubKeyName; + UNICODE_STRING BaseKeyName; + UNICODE_STRING DeviceInstance = RTL_CONSTANT_STRING(L"DeviceInstance"); + UNICODE_STRING SymbolicLink = RTL_CONSTANT_STRING(L"SymbolicLink"); + HANDLE InterfaceKey; + HANDLE SubKey; + ULONG StartIndex; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG i; + NTSTATUS Status; + + Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString); + if (!NT_SUCCESS(Status)) { - RtlInitUnicodeString(SymbolicLinkName, KeyNameString); - return STATUS_SUCCESS; + DPRINT("RtlStringFromGUID() failed with status 0x%08lx\n", Status); + return Status; } - - return STATUS_INVALID_DEVICE_REQUEST; + + /* Create base key name for this interface: HKLM\SYSTEM\CurrentControlSet\DeviceClasses\{GUID}\##?#ACPI#PNP0501#1#{G UID} */ + InstancePath = &PhysicalDeviceObject->DeviceObjectExtension->DeviceNode->InstancePath; + BaseKeyName.Length = wcslen(BaseKeyString) * sizeof(WCHAR); + BaseKeyName.MaximumLength = BaseKeyName.Length + + GuidString.Length + + 5 * sizeof(WCHAR) /* 5 = size of \##?# */ + + InstancePath->Length + + sizeof(WCHAR) /* 1 = size of # */ + + GuidString.Length; + BaseKeyName.Buffer = ExAllocatePool( + NonPagedPool, + BaseKeyName.MaximumLength); + if (!BaseKeyName.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + wcscpy(BaseKeyName.Buffer, BaseKeyString); + RtlAppendUnicodeStringToString(&BaseKeyName, &GuidString); + RtlAppendUnicodeToString(&BaseKeyName, L"\\##?#"); + StartIndex = BaseKeyName.Length / sizeof(WCHAR); + RtlAppendUnicodeStringToString(&BaseKeyName, InstancePath); + for (i = 0; i < InstancePath->Length / sizeof(WCHAR); i++) + { + if (BaseKeyName.Buffer[StartIndex + i] == '\\') + BaseKeyName.Buffer[StartIndex + i] = '#'; + } + RtlAppendUnicodeToString(&BaseKeyName, L"#"); + RtlAppendUnicodeStringToString(&BaseKeyName, &GuidString); + + /* Create BaseKeyName key in registry */ + InitializeObjectAttributes( + &ObjectAttributes, + &BaseKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_OPENIF, + NULL, /* RootDirectory */ + NULL); /* SecurityDescriptor */ + + Status = ZwCreateKey( + &InterfaceKey, + KEY_WRITE, + &ObjectAttributes, + 0, /* TileIndex */ + NULL, /* Class */ + REG_OPTION_VOLATILE, + NULL); /* Disposition */ + + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + ExFreePool(BaseKeyName.Buffer); + return Status; + } + + /* Write DeviceInstance entry. Value is InstancePath */ + Status = ZwSetValueKey( + InterfaceKey, + &DeviceInstance, + 0, /* TileIndex */ + REG_SZ, + InstancePath->Buffer, + InstancePath->Length); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); + ZwClose(InterfaceKey); + ExFreePool(BaseKeyName.Buffer); + return Status; + } + + /* Create subkey. Name is #ReferenceString */ + SubKeyName.Length = 0; + SubKeyName.MaximumLength = sizeof(WCHAR); + if (ReferenceString && ReferenceString->Length) + SubKeyName.MaximumLength += ReferenceString->Length; + SubKeyName.Buffer = ExAllocatePool( + NonPagedPool, + SubKeyName.MaximumLength); + if (!SubKeyName.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + ZwClose(InterfaceKey); + ExFreePool(BaseKeyName.Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlAppendUnicodeToString(&SubKeyName, L"#"); + if (ReferenceString && ReferenceString->Length) + RtlAppendUnicodeStringToString(&SubKeyName, ReferenceString); + + /* Create SubKeyName key in registry */ + InitializeObjectAttributes( + &ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + InterfaceKey, /* RootDirectory */ + NULL); /* SecurityDescriptor */ + + Status = ZwCreateKey( + &SubKey, + KEY_WRITE, + &ObjectAttributes, + 0, /* TileIndex */ + NULL, /* Class */ + REG_OPTION_VOLATILE, + NULL); /* Disposition */ + + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + ZwClose(InterfaceKey); + ExFreePool(BaseKeyName.Buffer); + return Status; + } + + /* Create symbolic link name: \\?\ACPI#PNP0501#1#{GUID}\ReferenceString */ + SymbolicLinkName->Length = 0; + SymbolicLinkName->MaximumLength = SymbolicLinkName->Length + + 4 * sizeof(WCHAR) /* 5 = size of \\??\ */ + + InstancePath->Length + + sizeof(WCHAR) /* 1 = size of # */ + + GuidString.Length + + sizeof(WCHAR); /* final NULL */ + if (ReferenceString && ReferenceString->Length) + SymbolicLinkName->MaximumLength += sizeof(WCHAR) + ReferenceString->Length; + SymbolicLinkName->Buffer = ExAllocatePool( + NonPagedPool, + SymbolicLinkName->MaximumLength); + if (!SymbolicLinkName->Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + ZwClose(InterfaceKey); + ZwClose(SubKey); + ExFreePool(SubKeyName.Buffer); + ExFreePool(BaseKeyName.Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlAppendUnicodeToString(SymbolicLinkName, L"\\\\??\\"); + StartIndex = SymbolicLinkName->Length / sizeof(WCHAR); + RtlAppendUnicodeStringToString(SymbolicLinkName, InstancePath); + for (i = 0; i < InstancePath->Length / sizeof(WCHAR); i++) + { + if (SymbolicLinkName->Buffer[StartIndex + i] == '\\') + SymbolicLinkName->Buffer[StartIndex + i] = '#'; + } + RtlAppendUnicodeToString(SymbolicLinkName, L"#"); + RtlAppendUnicodeStringToString(SymbolicLinkName, &GuidString); + if (ReferenceString && ReferenceString->Length) + { + RtlAppendUnicodeToString(SymbolicLinkName, L"\\"); + RtlAppendUnicodeStringToString(SymbolicLinkName, ReferenceString); + } + SymbolicLinkName->Buffer[SymbolicLinkName->Length] = '\0'; + + /* Create symbolic link */ + Status = IoCreateSymbolicLink(SymbolicLinkName, InstancePath); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoCreateSymbolicLink() failed with status 0x%08lx\n", Status); + ZwClose(InterfaceKey); + ZwClose(SubKey); + ExFreePool(SubKeyName.Buffer); + ExFreePool(BaseKeyName.Buffer); + ExFreePool(SymbolicLinkName->Buffer); + return Status; + } + + /* Write symbolic link name in registry */ + Status = ZwSetValueKey( + SubKey, + &SymbolicLink, + 0, /* TileIndex */ + REG_SZ, + SymbolicLinkName->Buffer, + SymbolicLinkName->Length); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); + ExFreePool(SymbolicLinkName->Buffer); + } + + ZwClose(InterfaceKey); + ZwClose(SubKey); + ExFreePool(SubKeyName.Buffer); + ExFreePool(BaseKeyName.Buffer); + + return Status; } /* @@ -592,7 +786,8 @@ IN PUNICODE_STRING SymbolicLinkName, IN BOOLEAN Enable) { - return STATUS_NOT_IMPLEMENTED; + DPRINT("IoSetDeviceInterfaceState called (UNIMPLEMENTED)\n"); + return STATUS_SUCCESS; } /* EOF */

1 0

[mbosma] 14719: PackageManager: Corrected default setting
by mbosma＠svn.reactos.com 20 Apr '05

20 Apr '05

PackageManager: Corrected default setting Modified: trunk/rosapps/packmgr/cmd-line/options.xml Modified: trunk/rosapps/packmgr/gui/options.xml _____ Modified: trunk/rosapps/packmgr/cmd-line/options.xml --- trunk/rosapps/packmgr/cmd-line/options.xml 2005-04-20 19:01:30 UTC (rev 14718) +++ trunk/rosapps/packmgr/cmd-line/options.xml 2005-04-20 19:33:48 UTC (rev 14719) @@ -1,4 +1,3 @@ <options> - <source>file://C:\Programmieren\reactos\rosapps\packmgr\tree\</source> <source>http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/ tree/</source> </options> \ No newline at end of file _____ Modified: trunk/rosapps/packmgr/gui/options.xml --- trunk/rosapps/packmgr/gui/options.xml 2005-04-20 19:01:30 UTC (rev 14718) +++ trunk/rosapps/packmgr/gui/options.xml 2005-04-20 19:33:48 UTC (rev 14719) @@ -1,4 +1,3 @@ <options> - <source>file://C:\Programmieren\reactos\rosapps\packmgr\tree\</source> <source>http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/ tree/</source> </options> \ No newline at end of file

1 0

[mbosma] 14718: PackageManager: Options.xml
by mbosma＠svn.reactos.com 20 Apr '05

20 Apr '05

PackageManager: Options.xml Added: trunk/rosapps/packmgr/cmd-line/options.xml Added: trunk/rosapps/packmgr/gui/help.txt Modified: trunk/rosapps/packmgr/gui/main.c Added: trunk/rosapps/packmgr/gui/options.xml Deleted: trunk/rosapps/packmgr/help.txt Modified: trunk/rosapps/packmgr/lib/download.cpp Modified: trunk/rosapps/packmgr/lib/functions.cpp Modified: trunk/rosapps/packmgr/lib/main.cpp Modified: trunk/rosapps/packmgr/lib/makefile Modified: trunk/rosapps/packmgr/lib/package.cpp Modified: trunk/rosapps/packmgr/lib/package.hpp Modified: trunk/rosapps/packmgr/lib/tree.cpp _____ Added: trunk/rosapps/packmgr/cmd-line/options.xml --- trunk/rosapps/packmgr/cmd-line/options.xml 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/cmd-line/options.xml 2005-04-20 19:01:30 UTC (rev 14718) @@ -0,0 +1,4 @@ +<options> + <source>file://C:\Programmieren\reactos\rosapps\packmgr\tree\</source> + <source>http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/ tree/</source> +</options> \ No newline at end of file _____ Added: trunk/rosapps/packmgr/gui/help.txt --- trunk/rosapps/packmgr/gui/help.txt 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/gui/help.txt 2005-04-20 19:01:30 UTC (rev 14718) @@ -0,0 +1,8 @@ +Welcome to ReactOS's Package Manager ! + +WARNING: This is still pre-alfa software you can't do much with it yet. + +This is the online help. You can show it at any time by clicking on the the Questionmark Icon above. + +You can use this package manager like this: click on the +You can also use the Buttons [ctrl] + [0] to [4] to set the action. \ No newline at end of file _____ Modified: trunk/rosapps/packmgr/gui/main.c --- trunk/rosapps/packmgr/gui/main.c 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/gui/main.c 2005-04-20 19:01:30 UTC (rev 14718) @@ -121,8 +121,9 @@ for(i=0; i<2000; i++) { buffer[i] = getc(file); - if(!buffer[i]) break; + if(buffer[i]==EOF) break; } + buffer[i] = 0; SetText(buffer); } @@ -245,9 +246,12 @@ { buffer[j] = text[i]; if(buffer[j] == '\n') - buffer[++j] = '\r'; + { + buffer[j] = '\r'; + buffer[++j] = '\n'; + } } - buffer[i] = 0; + buffer[j] = 0; SetWindowTextA(hEdit, buffer); _____ Added: trunk/rosapps/packmgr/gui/options.xml --- trunk/rosapps/packmgr/gui/options.xml 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/gui/options.xml 2005-04-20 19:01:30 UTC (rev 14718) @@ -0,0 +1,4 @@ +<options> + <source>file://C:\Programmieren\reactos\rosapps\packmgr\tree\</source> + <source>http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/ tree/</source> +</options> \ No newline at end of file _____ Deleted: trunk/rosapps/packmgr/help.txt --- trunk/rosapps/packmgr/help.txt 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/help.txt 2005-04-20 19:01:30 UTC (rev 14718) @@ -1,9 +0,0 @@ -Welcome to ReactOS's Package Manager ! - -WARNING: This is still pre-alfa software you can't do much with it yet. - -This is the online help. You can show it at any time by clicking on the the Questionmark Icon above. - -You can use this package manager like this: click on the -You can also use the Buttons [ctrl] + [0] to [4] to set the action. - _____ Modified: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-04-20 19:01:30 UTC (rev 14718) @@ -15,9 +15,6 @@ #include "log.h" #include <wine/urlmon.h> -// Server there all the files lie -const char* tree_server = "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/"; - HRESULT WINAPI URLDownloadToFileA( LPUNKNOWN pCaller, LPCSTR szURL, @@ -29,12 +26,17 @@ int FindCount (string What, string Where, int start = 0, int end = -1); -// Download a file -char* PML_Download (const char* url, const char* server = "tree", const char* filename = NULL) +// Download a file +char* PML_Download (pTree tree, const char* url, const char* server = "tree", const char* filename = NULL) { - char downl [MAX_PATH]; - static char path [MAX_PATH]; + UINT i; + static char downl [MAX_PATH]; // the full url + static char path [MAX_PATH]; // the full resulting Path + // It goes to the temp folder when no other path is entered (or even compleatly no filename) + // If server == "tree" it will be downloaded from the server speficied in option.xml + // File:// links are possible too + // get temp dir if(!filename) GetTempPathA (200, path); @@ -52,18 +54,42 @@ GetTempFileNameA (path, "pml", 0, path); // get the url - if (!server) strcpy(downl, ""); else if(!strcmp(server, "tree")) - strcpy(downl, tree_server); + { + char* ret; + for (i=0; i<tree->sources.size(); i++) + { + ret = PML_Download(tree, url, tree->sources[i], filename); + if(ret) + return ret; + } + return NULL; + } else strcpy(downl, server); strcat(downl, url); + // is this a file link ? + if (strstr(downl, "file://") || strstr(downl, "File://")) + {/* + if(downl[strlen(downl)] == '\') + downl[strlen(downl)] = '\0'; + */ + if(!filename) + return &downl[7]; + + else + { + CopyFileA(filename, &downl[7], FALSE); + return (char*)filename; + } + } + // download the file if(URLDownloadToFileA (NULL, downl, path, 0, NULL) != S_OK) { @@ -77,19 +103,25 @@ } // Download and prozess a xml file -int PML_XmlDownload (const char* url, void* usrdata, XML_StartElementHandler start, - XML_EndElementHandler end, XML_CharacterDataHandler text) +int PML_XmlDownload (pTree tree, const char* url, void* usrdata, + XML_StartElementHandler start, XML_EndElementHandler end, XML_CharacterDataHandler text) { + int done = 0; char buffer[255]; - int done = 0; + char* filename = 0; // logging Log("* prozess the xml file: "); LogAdd(url); // download the file - char* filename = PML_Download(url); + if(strstr(url, "file://")) + filename = PML_Download(tree, url, NULL); + else + filename = PML_Download(tree, url); + + if(!filename) { Log("! ERROR: Could not download the xml file"); @@ -100,7 +132,9 @@ FILE* file = fopen(filename, "r"); if(!file) { - Log("! ERROR: Could not open the xml file"); + MessageBoxA(0,filename,0,0); + Log("! ERROR: Could not open the xml file \""); + LogAdd(filename); return ERR_GENERIC; } _____ Modified: trunk/rosapps/packmgr/lib/functions.cpp --- trunk/rosapps/packmgr/lib/functions.cpp 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/lib/functions.cpp 2005-04-20 19:01:30 UTC (rev 14718) @@ -15,7 +15,7 @@ #include "log.h" extern const char* tree_server; -char* PML_Download (const char* url, const char* server, const char* filename); +char* PML_Download (pTree, const char* url, const char* server, const char* filename); int debuglog (int argc, char* argv[]) @@ -31,10 +31,10 @@ char* result; if (argc==3) - result = PML_Download(argv[1], argv[3], argv[2]); + result = PML_Download(NULL, argv[1], argv[3], argv[2]); else if (argc==2) - result = PML_Download(argv[1], NULL, argv[2]); + result = PML_Download(NULL, argv[1], NULL, argv[2]); else return ERR_GENERIC; _____ Modified: trunk/rosapps/packmgr/lib/main.cpp --- trunk/rosapps/packmgr/lib/main.cpp 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/lib/main.cpp 2005-04-20 19:01:30 UTC (rev 14718) @@ -19,7 +19,7 @@ HANDLE hThread = NULL; BOOL thread_abort = FALSE; -char* PML_Download (const char* url, const char* server = "tree", const char* filename = NULL); +char* PML_Download (pTree, const char* url, const char* server = "tree", const char* filename = NULL); // Abort other thread @@ -47,7 +47,7 @@ { SCRIPT* script; - char* path = PML_Download(tree->todo[i]); + char* path = PML_Download(tree, tree->todo[i]); if(RPS_Load(&script, path) == ERR_OK) scripts.push_back(script); _____ Modified: trunk/rosapps/packmgr/lib/makefile --- trunk/rosapps/packmgr/lib/makefile 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/lib/makefile 2005-04-20 19:01:30 UTC (rev 14718) @@ -6,7 +6,7 @@ TARGET_SDKLIBS = kernel32.a shell32.a user32.a package.a expat.a urlmon.a -TARGET_OBJECTS = main.o tree.o package.o download.o script.o functions.o log.o +TARGET_OBJECTS = main.o tree.o package.o download.o script.o functions.o options.o log.o TARGET_GCCLIBS = stdc++ uuid _____ Modified: trunk/rosapps/packmgr/lib/package.cpp --- trunk/rosapps/packmgr/lib/package.cpp 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/lib/package.cpp 2005-04-20 19:01:30 UTC (rev 14718) @@ -14,8 +14,8 @@ #include "expat.h" #include "log.h" -int PML_XmlDownload (const char* url, void* usrdata, XML_StartElementHandler start, - XML_EndElementHandler end, XML_CharacterDataHandler text=0); +int PML_XmlDownload (pTree, const char* url, void* usrdata, XML_StartElementHandler start, + XML_EndElementHandler end, XML_CharacterDataHandler text=0); // expat callback for start of a package tag @@ -109,7 +109,7 @@ if(!pack->loaded) { - PML_XmlDownload (pack->path, (void*)pack, pack_start, pack_end, pack_text); + PML_XmlDownload (tree, pack->path, (void*)pack, pack_start, pack_end, pack_text); pack->loaded = TRUE; } @@ -208,7 +208,7 @@ // load it if it's not loaded yet else if (!pack->loaded && pack->path) { - PML_XmlDownload (pack->path, (void*)pack, pack_start, pack_end, pack_text); + PML_XmlDownload (tree, pack->path, (void*)pack, pack_start, pack_end, pack_text); pack->loaded = TRUE; return PML_SetAction(tree, id, action, SetIcon, Ask); @@ -262,17 +262,17 @@ } } - // set action back - pack->action = 0; - // root notes (like network) return here if(!pack->path || pack->action==0) return ret; - + // erase from todo list for(i=0; i<tree->todo.size(); i++) if(!strcmp(tree->todo[i], pack->files[pack->action-1])) // look for right entry tree->todo.erase(tree->todo.begin()+i); // delete it + + // set action back + pack->action = 0; } return ret; _____ Modified: trunk/rosapps/packmgr/lib/package.hpp --- trunk/rosapps/packmgr/lib/package.hpp 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/lib/package.hpp 2005-04-20 19:01:30 UTC (rev 14718) @@ -26,15 +26,15 @@ typedef struct { char* path; + char* name; + char* description; + char** field; + BOOL icon; BOOL loaded; + vector<int> neededBy; vector<int> children; - - char** field; - char* name; - char* description; vector<char*> depencies; - vector<int> neededBy; int action; char* files [4]; @@ -49,10 +49,11 @@ typedef struct { - char* xmltree; + char** field; + vector<char*> todo; + vector<char*> sources; vector<char*> descriptionPath; - vector<char*> todo; vector<PACKAGE> packages; PML_AddItem addItem; _____ Modified: trunk/rosapps/packmgr/lib/tree.cpp --- trunk/rosapps/packmgr/lib/tree.cpp 2005-04-20 18:16:32 UTC (rev 14717) +++ trunk/rosapps/packmgr/lib/tree.cpp 2005-04-20 19:01:30 UTC (rev 14718) @@ -15,11 +15,13 @@ vector <int> parents; +int LoadOptions (TREE* tree); + void tree_end (void* tree, const char* tag); void tree_start (void* usrdata, const char* tag, const char** arg); -int PML_XmlDownload (const char* file, void* usrdata, XML_StartElementHandler start, - XML_EndElementHandler end, XML_CharacterDataHandler text=0); +int PML_XmlDownload (pTree tree, const char* file, void* usrdata, XML_StartElementHandler start, + XML_EndElementHandler end, XML_CharacterDataHandler text=0); // Load the tree @@ -34,7 +36,9 @@ // set addItem callback (*tree)->addItem = AddItem; - return PML_XmlDownload (url, (void*)(*tree), tree_start, tree_end); + LoadOptions(*tree); + + return PML_XmlDownload (*tree, url, (void*)(*tree), tree_start, tree_end); } // expat callback for start of a "node" tag @@ -119,3 +123,4 @@ // delete last item parents.pop_back(); } +

1 0

[royce] 14717: latest version of ArchBlackmann
by royce＠svn.reactos.com 20 Apr '05

20 Apr '05

latest version of ArchBlackmann Modified: trunk/irc/ArchBlackmann/ArchBlackmann.cpp Modified: trunk/irc/ArchBlackmann/IRCClient.cpp Modified: trunk/irc/ArchBlackmann/IRCClient.h Added: trunk/irc/ArchBlackmann/curse.txt Added: trunk/irc/ArchBlackmann/cursecop.txt Modified: trunk/irc/ArchBlackmann/dev.txt Added: trunk/irc/ArchBlackmann/func.txt Added: trunk/irc/ArchBlackmann/grovel.txt Added: trunk/irc/ArchBlackmann/irql.txt Added: trunk/irc/ArchBlackmann/nogrovel.txt Added: trunk/irc/ArchBlackmann/status.txt Modified: trunk/irc/ArchBlackmann/tech.txt Added: trunk/irc/ArchBlackmann/type.txt _____ Modified: trunk/irc/ArchBlackmann/ArchBlackmann.cpp --- trunk/irc/ArchBlackmann/ArchBlackmann.cpp 2005-04-20 17:57:26 UTC (rev 14716) +++ trunk/irc/ArchBlackmann/ArchBlackmann.cpp 2005-04-20 18:16:32 UTC (rev 14717) @@ -9,59 +9,118 @@ #include "File.h" #include "ssprintf.h" +#include "trim.h" #include "IRCClient.h" using std::string; using std::vector; -const char* ArchBlackmann = "ArchBlackmann"; +#if defined(_DEBUG) && 0 +const char* BOTNAME = "RoyBot"; +const char* CHANNEL = "#RoyBotTest"; +#else +const char* BOTNAME = "ArchBlackmann"; +const char* CHANNEL = "#ReactOS"; +#endif -vector<string> tech, module, dev, stru, period; +//vector<string> tech, module, dev, stru, period, status, type, func, irql, curse, cursecop; -void ImportList ( vector<string>& list, const char* filename ) +class List { - File f ( filename, "r" ); +public: + string name; + bool macro; + std::vector<std::string> list; + string tag; + int last; + List() { last = -1; } + List ( const char* _name, bool _macro ) : name(_name), macro(_macro) + { + tag = ssprintf("%%%s%%",_name); + last = -1; + } +}; + +vector<List> lists; +vector<string> ops; + +void ImportList ( const char* listname, bool macro ) +{ + lists.push_back ( List ( listname, macro ) ); + List& list = lists.back(); + File f ( ssprintf("%s.txt",listname).c_str(), "r" ); string line; while ( f.next_line ( line, true ) ) - list.push_back ( line ); + list.list.push_back ( line ); } -const char* ListRand ( const vector<string>& list ) +const char* ListRand ( List& list ) { - return list[rand()%list.size()].c_str(); + vector<string>& l = list.list; + if ( !l.size() ) + { + static string nothing; + nothing = ssprintf ( "<list '%s' empty>", list.name.c_str() ); + return nothing.c_str(); + } + else if ( l.size() == 1 ) + return l[0].c_str(); + int sel = list.last; + while ( sel == list.last ) + sel = rand()%l.size(); + list.last = sel; + return l[sel].c_str(); } -string TechReply() +const char* ListRand ( int i ) { - string t = ListRand(tech); + return ListRand ( lists[i] ); +} + +int GetListIndex ( const char* listname ) +{ + for ( int i = 0; i < lists.size(); i++ ) + { + if ( !stricmp ( lists[i].name.c_str(), listname ) ) + return i; + } + return -1; +} + +List& GetList ( const char* listname ) +{ + return lists[GetListIndex(listname)]; +} + +const char* ListRand ( const char* list ) +{ + int i = GetListIndex ( list ); + if ( i < 0 ) + return NULL; + return ListRand(i); +} + +string TaggedReply ( const char* listname ) +{ + string t = ListRand(listname); string out; const char* p = t.c_str(); while ( *p ) { if ( *p == '%' ) { - if ( !strnicmp ( p, "%dev%", 5 ) ) + bool found = false; + for ( int i = 0; i < lists.size() && !found; i++ ) { - out += ListRand(dev); - p += 5; + if ( lists[i].macro && !strnicmp ( p, lists[i].tag.c_str(), lists[i].tag.size() ) ) + { + out += ListRand(i); + p += lists[i].tag.size(); + found = true; + } } - else if ( !strnicmp ( p, "%period%", 8 ) ) - { - out += ListRand(period); - p += 8; - } - else if ( !strnicmp ( p, "%module%", 8 ) ) - { - out += ListRand(module); - p += 8; - } - else if ( !strnicmp ( p, "%stru%", 6 ) ) - { - out += ListRand(stru); - p += 6; - } - else + if ( !found ) out += *p++; } const char* p2 = strchr ( p, '%' ); @@ -76,6 +135,28 @@ return out; } +string gobble ( string& s, const char* delim ) +{ + const char* p = s.c_str(); + p += strspn ( p, delim ); + const char* p2 = strpbrk ( p, delim ); + if ( !p2 ) p2 = p + strlen(p); + string out ( p, p2-p ); + p2 += strspn ( p2, delim ); + s = string ( p2 ); + return out; +} + +bool isop ( const string& who ) +{ + for ( int i = 0; i < ops.size(); i++ ) + { + if ( ops[i] == who ) + return true; + } + return false; +} + // do custom stuff with the IRCClient from your subclass via the provided callbacks... class MyIRCClient : public IRCClient { @@ -92,8 +173,34 @@ } bool OnJoin ( const string& user, const string& channel ) { + printf ( "user '%s' joined channel '%s'\n", user.c_str(), channel.c_str() ); return true; } + bool OnPart ( const std::string& user, const std::string& channel ) + { + for ( int i = 0; i < ops.size(); i++ ) + { + if ( ops[i] == user ) + { + printf ( "remove '%s' to ops list\n", user.c_str() ); + ops.erase ( &ops[i] ); + } + } + return true; + } + bool OnNick ( const std::string& oldNick, const std::string& newNick ) + { + for ( int i = 0; i < ops.size(); i++ ) + { + if ( ops[i] == oldNick ) + { + printf ( "op '%s' changed nick to '%s'\n", oldNick.c_str(), newNick.c_str() ); + ops[i] = newNick; + return true; + } + } + return true; + } bool OnEndChannelUsers ( const string& channel ) { return true; @@ -102,20 +209,169 @@ { printf ( "<%s> %s\n", from.c_str(), text.c_str() ); flog.printf ( "<%s> %s\n", from.c_str(), text.c_str() ); - return PrivMsg ( from, "hey, your tongue doesn't belong there!" ); + if ( strnicmp ( text.c_str(), "!say ", 5 ) || !isop(from) ) + return PrivMsg ( from, "hey, your tongue doesn't belong there!" ); + string say = trim(&text[5]); + if ( !strnicmp ( say.c_str(), "/me ", 4 ) ) + return Action ( CHANNEL, trim(&say[4]) ); + else + return PrivMsg ( CHANNEL, trim(say) ); } bool OnChannelMsg ( const string& channel, const string& from, const string& text ) { printf ( "%s <%s> %s\n", channel.c_str(), from.c_str(), text.c_str() ); flog.printf ( "%s <%s> %s\n", channel.c_str(), from.c_str(), text.c_str() ); - string text2(text); + bool found_name = false; + string text2 ( text ); strlwr ( &text2[0] ); - if ( !strnicmp ( text2.c_str(), ArchBlackmann, strlen(ArchBlackmann) ) ) + + if ( !strnicmp ( text.c_str(), BOTNAME, strlen(BOTNAME) ) ) + found_name = true; + else if ( !strnicmp ( text.c_str(), "arch ", 5 ) ) + found_name = true; + + if ( found_name ) { - string reply = ssprintf("%s: %s", from.c_str(), TechReply().c_str()); - flog.printf ( "TECH-REPLY: %s\n", reply.c_str() ); - return PrivMsg ( channel, reply ); + string s ( text ); + gobble ( s, " \t" ); // remove bot name + found_name = true; + if ( s[0] == '!' ) + { + bool from_op = isop(from); + string cmd = gobble ( s, " \t" ); + if ( !from_op ) + { + if ( cmd == "!grovel" ) + { + string out = ssprintf(TaggedReply("nogrovel").c_str(),from.c_str()); + if ( !strnicmp ( out.c_str(), "/me ", 4 ) ) + return Action ( channel, &out[4] ); + else + return PrivMsg ( channel, out ); + } + return PrivMsg ( channel, ssprintf("%s: I don't take commands from non-ops",from.c_str()) ); + } + if ( cmd == "!add" ) + { + string listname = gobble ( s, " \t" ); + int i = GetListIndex ( listname.c_str() ); + if ( i == -1 ) + return PrivMsg ( channel, ssprintf("%s: I don't have a list named '%s'",from.c_str(),listname.c_str()) ); + List& list = lists[i]; + if ( s[0] == '\"' || s[0] == '\'' ) + { + char delim = s[0]; + const char* p = &s[1]; + const char* p2 = strchr ( p, delim ); + if ( !p2 ) + return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) ); + s = string ( p, p2-p ); + } + for ( i = 0; i < list.list.size(); i++ ) + { + if ( list.list[i] == s ) + return PrivMsg ( channel, ssprintf("%s: entry already exists in list '%s'",from.c_str(),listname.c_str()) ); + } + if ( !stricmp ( listname.c_str(), "curse" ) ) + strlwr ( &s[0] ); + list.list.push_back ( s ); + { + File f ( ssprintf("%s.txt",list.name.c_str()), "w" ); + for ( i = 0; i < list.list.size(); i++ ) + f.printf ( "%s\n", list.list[i].c_str() ); + } + return PrivMsg ( channel, ssprintf("%s: entry added to list '%s'",from.c_str(),listname.c_str()) ); + } + else if ( cmd == "!remove" ) + { + string listname = gobble ( s, " \t" ); + int i = GetListIndex ( listname.c_str() ); + if ( i == -1 ) + return PrivMsg ( channel, ssprintf("%s: I don't have a list named '%s'",from.c_str(),listname.c_str()) ); + List& list = lists[i]; + if ( s[0] == '\"' || s[0] == '\'' ) + { + char delim = s[0]; + const char* p = &s[1]; + const char* p2 = strchr ( p, delim ); + if ( !p2 ) + return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) ); + s = string ( p, p2-p ); + } + for ( i = 0; i < list.list.size(); i++ ) + { + if ( list.list[i] == s ) + { + list.list.erase ( &list.list[i] ); + { + File f ( ssprintf("%s.txt",list.name.c_str()), "w" ); + for ( i = 0; i < list.list.size(); i++ ) + f.printf ( "%s\n", list.list[i].c_str() ); + } + return PrivMsg ( channel, ssprintf("%s: entry removed from list '%s'",from.c_str(),listname.c_str()) ); + } + } + return PrivMsg ( channel, ssprintf("%s: entry doesn't exist in list '%s'",from.c_str(),listname.c_str()) ); + } + else if ( cmd == "!grovel" ) + { + string out = ssprintf(TaggedReply("grovel").c_str(),from.c_str()); + if ( !strnicmp ( out.c_str(), "/me ", 4 ) ) + return Action ( channel, &out[4] ); + else + return PrivMsg ( channel, out ); + } + else if ( cmd == "!kiss" ) + { + if ( s.size() ) + return Action ( channel, ssprintf("kisses %s",s.c_str()) ); + else + return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + } + else if ( cmd == "!hug" ) + { + if ( s.size() ) + return Action ( channel, ssprintf("hugs %s",s.c_str()) ); + else + return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + } + else if ( cmd == "!give" ) + { + string who = gobble(s," \t"); + if ( who.size() && s.size() ) + return Action ( channel, ssprintf("gives %s a %s",who.c_str(),s.c_str()) ); + else + return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + } + else + { + return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + } + } } + + bool found_curse = false; + static vector<string>& curse = GetList("curse").list; + text2 = ssprintf(" %s ",text2.c_str()); + for ( int i = 0; i < curse.size() && !found_curse; i++ ) + { + if ( strstr ( text2.c_str(), curse[i].c_str() ) ) + found_curse = true; + } + if ( found_curse ) + { + static List& cursecop = GetList("cursecop"); + return PrivMsg ( channel, ssprintf("%s: %s", from.c_str(), ListRand(cursecop)) ); + } + else if ( found_name ) + { + string out = ssprintf("%s: %s", from.c_str(), TaggedReply("tech").c_str()); + flog.printf ( "TECH-REPLY: %s\n", out.c_str() ); + if ( !strnicmp ( out.c_str(), "/me ", 4 ) ) + return Action ( channel, &out[4] ); + else + return PrivMsg ( channel, out ); + } return true; } bool OnChannelMode ( const string& channel, const string& mode ) @@ -123,9 +379,45 @@ //printf ( "OnChannelMode(%s,%s)\n", channel.c_str(), mode.c_str() ); return true; } - bool OnUserModeInChannel ( const string& src, const string& channel, const string& user, const string& mode ) + bool OnUserModeInChannel ( const string& src, const string& channel, const string& mode, const string& target ) { - //printf ( "OnUserModeInChannel(%s,%s%s,%s)\n", src.c_str(), channel.c_str(), user.c_str(), mode.c_str() ); + printf ( "OnUserModeInChannel(%s,%s,%s,%s)\n", src.c_str(), channel.c_str(), mode.c_str(), target.c_str() ); + const char* p = mode.c_str(); + if ( !p ) + return true; + while ( *p ) + { + switch ( *p++ ) + { + case '+': + while ( *p != 0 && *p != ' ' ) + { + if ( *p == 'o' ) + { + printf ( "adding '%s' to ops list\n", target.c_str() ); + ops.push_back ( target ); + } + break; + } + break; + case '-': + while ( *p != 0 && *p != ' ' ) + { + if ( *p == 'o' ) + { + for ( int i = 0; i < ops.size(); i++ ) + { + if ( ops[i] == target ) + { + printf ( "remove '%s' to ops list\n", target.c_str() ); + ops.erase ( &ops[i] ); + } + } + break; + } + } + } + } return true; } bool OnMode ( const string& user, const string& mode ) @@ -135,14 +427,16 @@ } bool OnChannelUsers ( const string& channel, const vector<string>& users ) { - printf ( "[%s has %i users]: ", channel.c_str(), users.size() ); + //printf ( "[%s has %i users]: ", channel.c_str(), users.size() ); for ( int i = 0; i < users.size(); i++ ) { - if ( i ) + if ( users[i][0] == '@' ) + ops.push_back ( &users[i][1] ); + /*if ( i ) printf ( ", " ); - printf ( "%s", users[i].c_str() ); + printf ( "%s", users[i].c_str() );*/ } - printf ( "\n" ); + //printf ( "\n" ); return true; } }; @@ -150,32 +444,50 @@ int main ( int argc, char** argv ) { srand ( time(NULL) ); - ImportList ( tech, "tech.txt" ); - ImportList ( stru, "stru.txt" ); - ImportList ( dev, "dev.txt" ); - ImportList ( period, "period.txt" ); - ImportList ( module, "module.txt" ); + ImportList ( "dev", true ); + ImportList ( "func", true ); + ImportList ( "dev", true ); + ImportList ( "func", true ); + ImportList ( "irql", true ); + ImportList ( "module", true ); + ImportList ( "period", true ); + ImportList ( "status", true ); + ImportList ( "stru", true ); + ImportList ( "type", true ); + + ImportList ( "tech", false ); + ImportList ( "curse", false ); + ImportList ( "cursecop", false ); + ImportList ( "grovel", false ); + ImportList ( "nogrovel", false ); + +#ifdef _DEBUG printf ( "initializing IRCClient debugging\n" ); IRCClient::SetDebug ( true ); +#endif//_DEBUG printf ( "calling suStartup()\n" ); suStartup(); printf ( "creating IRCClient object\n" ); MyIRCClient irc; printf ( "connecting to freenode\n" ); - if ( !irc.Connect ( "212.204.214.114" ) ) // irc.freenode.net + + //const char* server = "212.204.214.114"; + const char* server = "irc.freenode.net"; + + if ( !irc.Connect ( server ) ) // irc.freenode.net { printf ( "couldn't connect to server\n" ); return -1; } printf ( "sending user command\n" ); - if ( !irc.User ( "ArchBlackmann", "", "irc.freenode.net", "Arch Blackmann" ) ) + if ( !irc.User ( BOTNAME, "", "irc.freenode.net", BOTNAME ) ) { printf ( "USER command failed\n" ); return -1; } printf ( "sending nick\n" ); - if ( !irc.Nick ( "ArchBlackmann" ) ) + if ( !irc.Nick ( BOTNAME ) ) { printf ( "NICK command failed\n" ); return -1; @@ -186,8 +498,8 @@ printf ( "MODE command failed\n" ); return -1; } - printf ( "joining #ReactOS\n" ); - if ( !irc.Join ( "#ReactOS" ) ) + printf ( "joining channel\n" ); + if ( !irc.Join ( CHANNEL ) ) { printf ( "JOIN command failed\n" ); return -1; _____ Modified: trunk/irc/ArchBlackmann/IRCClient.cpp --- trunk/irc/ArchBlackmann/IRCClient.cpp 2005-04-20 17:57:26 UTC (rev 14716) +++ trunk/irc/ArchBlackmann/IRCClient.cpp 2005-04-20 18:16:32 UTC (rev 14717) @@ -81,10 +81,16 @@ bool IRCClient::PrivMsg ( const string& to, const string& text ) { - return Send ( "PRIVMSG " + to + " :" + text + "\n" ); + return Send ( "PRIVMSG " + to + " :" + text + '\n' ); } bool +IRCClient::Action ( const string& to, const string& text ) +{ + return Send ( "PRIVMSG " + to + " :" + (char)1 + "ACTION " + text + (char)1 + '\n' ); +} + +bool IRCClient::Part ( const string& channel, const string& text ) { return Send ( "PART " + channel + " :" + text + "\n" ); @@ -226,10 +232,41 @@ printf ( "!!!:OnRecv failure 5 (PRIVMSG w/o target): %s", buf.c_str() ); continue; } - if ( tgt[0] == '#' ) - OnChannelMsg ( tgt, src, text ); + if ( *p == 1 ) + { + p++; + p2 = strchr ( p, ' ' ); + if ( !p2 ) p2 = p + strlen(p); + cmd = string ( p, p2-p ); + strlwr ( &cmd[0] ); + p = p2 + 1; + p2 = strchr ( p, 1 ); + if ( !p2 ) + { + printf ( "!!!:OnRecv failure 6 (no terminating \x01 for initial \x01 found: %s", buf.c_str() ); + continue; + } + text = string ( p, p2-p ); + if ( cmd == "action" ) + { + if ( tgt[0] == '#' ) + OnChannelAction ( tgt, src, text ); + else + OnPrivAction ( src, text ); + } + else + { + printf ( "!!!:OnRecv failure 7 (unrecognized \x01 command '%s': %s", cmd.c_str(), buf.c_str() ); + continue; + } + } else - OnPrivMsg ( src, text ); + { + if ( tgt[0] == '#' ) + OnChannelMsg ( tgt, src, text ); + else + OnPrivMsg ( src, text ); + } } else if ( cmd == "mode" ) { @@ -237,22 +274,22 @@ //printf ( "[MODE] src='%s' cmd='%s' tgt='%s' text='%s'", src.c_str(), cmd.c_str(), tgt.c_str(), text.c_str() ); //OnMode ( // self mode change: - // [MODE] src=Relic3_14 cmd=mode tgt=Relic3_14 text=+i + // [MODE] src=Nick cmd=mode tgt=Nick text=+i // channel mode change: - // [MODE] src=Royce3 cmd=mode tgt=#Royce3 text=+o Relic3_14 + // [MODE] src=Nick cmd=mode tgt=#Channel text=+o Nick if ( tgt[0] == '#' ) { p = text.c_str(); p2 = strchr ( p, ' ' ); - if ( !p2 ) - OnChannelMode ( tgt, text ); - else + if ( p2 && *p2 ) { - string user ( p, p2-p ); + string mode ( p, p2-p ); p = p2 + 1; p += strspn ( p, " " ); - OnUserModeInChannel ( src, tgt, user, p ); + OnUserModeInChannel ( src, tgt, mode, trim(p) ); } + else + OnChannelMode ( tgt, text ); } else OnMode ( tgt, text ); @@ -261,6 +298,14 @@ { OnJoin ( src, text ); } + else if ( cmd == "part" ) + { + OnPart ( src, text ); + } + else if ( cmd == "nick" ) + { + OnNick ( src, text ); + } else if ( isdigit(cmd[0]) ) { int i = atoi(cmd.c_str()); @@ -307,7 +352,13 @@ } else { - if ( _debug ) printf ( "unrecognized ':' response: %s", buf.c_str() ); + if ( strstr ( buf.c_str(), "ACTION" ) ) + { + printf ( "ACTION: " ); + for ( int i = 0; i < buf.size(); i++ ) + printf ( "%c(%xh)", buf[i], (unsigned)(unsigned char)buf[i] ); + } + else if ( _debug ) printf ( "unrecognized ':' response: %s", buf.c_str() ); } } else _____ Modified: trunk/irc/ArchBlackmann/IRCClient.h --- trunk/irc/ArchBlackmann/IRCClient.h 2005-04-20 17:57:26 UTC (rev 14716) +++ trunk/irc/ArchBlackmann/IRCClient.h 2005-04-20 18:16:32 UTC (rev 14717) @@ -48,6 +48,9 @@ // send message to someone or some channel bool PrivMsg ( const std::string& to, const std::string& text ); + // send /me to someone or some channel + bool Action ( const std::string& to, const std::string& text ); + // leave a channel bool Part ( const std::string& channel, const std::string& text ); @@ -59,32 +62,45 @@ // OnConnected: you just successfully logged into irc server virtual bool OnConnected() = 0; - // OnJoin: you just successfully joined this channel - virtual bool OnJoin ( const std::string& user, const std::string& channel ) = 0; + virtual bool OnNick ( const std::string& oldNick, const std::string& newNick ) { return true; } + // OnJoin: someone just successfully joined a channel you are in ( also sent when you successfully join a channel ) + virtual bool OnJoin ( const std::string& user, const std::string& channel ) { return true; } + + // OnPart: someone just left a channel you are in + virtual bool OnPart ( const std::string& user, const std::string& channel ) { return true; } + // OnPrivMsg: you just received a private message from a user - virtual bool OnPrivMsg ( const std::string& from, const std::string& text ) = 0; + virtual bool OnPrivMsg ( const std::string& from, const std::string& text ) { return true; } + virtual bool OnPrivAction ( const std::string& from, const std::string& text ) { return true; } + // OnChannelMsg: you just received a chat line in a channel virtual bool OnChannelMsg ( const std::string& channel, const std::string& from, - const std::string& text ) = 0; + const std::string& text ) { return true; } + // OnChannelAction: you just received a "/me" line in a channel + virtual bool OnChannelAction ( const std::string& channel, const std::string& from, + const std::string& text ) { return true; } + // OnChannelMode: notification of a change of a channel's mode - virtual bool OnChannelMode ( const std::string& channel, const std::string& mode ) = 0; + virtual bool OnChannelMode ( const std::string& channel, const std::string& mode ) + { return true; } // OnUserModeInChannel: notification of a mode change of a user with respect to a channel. // f.ex.: this will be called when someone is oped in a channel. virtual bool OnUserModeInChannel ( const std::string& src, const std::string& channel, - const std::string& user, const std::string& mode ) = 0; + const std::string& mode, const std::string& target ) { return true; } // OnMode: you will receive this when you change your own mode, at least... - virtual bool OnMode ( const std::string& user, const std::string& mode ) = 0; + virtual bool OnMode ( const std::string& user, const std::string& mode ) { return true; } // notification of what users are in a channel ( you may get multiple of these... ) - virtual bool OnChannelUsers ( const std::string& channel, const std::vector<std::string>& users ) = 0; + virtual bool OnChannelUsers ( const std::string& channel, const std::vector<std::string>& users ) + { return true; } // notification that you have received the entire list of users for a channel - virtual bool OnEndChannelUsers ( const std::string& channel ) = 0; + virtual bool OnEndChannelUsers ( const std::string& channel ) { return true; } // OnPing - default implementation replies to PING with a valid PONG. required on some systems to // log in. Most systems require a response in order to stay connected, used to verify a client hasn't _____ Added: trunk/irc/ArchBlackmann/curse.txt --- trunk/irc/ArchBlackmann/curse.txt 2005-04-20 17:57:26 UTC (rev 14716) +++ trunk/irc/ArchBlackmann/curse.txt 2005-04-20 18:16:32 UTC (rev 14717) @@ -0,0 +1,26 @@ +shit +fuck +pussy + ass + ass- +-ass +dumbass +jackass +fatass +asshole +smartass +cunt +fucker +bitch +dick +penile +stfu +omfg +lmao + ass. +-ass. +semprini +goat.cx +ekush +akshor +poop Property changes on: trunk/irc/ArchBlackmann/curse.txt ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/irc/ArchBlackmann/cursecop.txt --- trunk/irc/ArchBlackmann/cursecop.txt 2005-04-20 17:57:26 UTC (rev 14716) +++ trunk/irc/ArchBlackmann/cursecop.txt 2005-04-20 18:16:32 UTC (rev 14717) @@ -0,0 +1,10 @@ +You should have your mouth washed out with soap! +This is a clean channel... please watch your language +Please try to keep it clean +Hey, there's children present ( I'm not even a year old yet! ) +Could you find a less-offensive way to express yourself, please? +Such language :( +Those aren't nice words to use +Oh, my poor innocent ears :( +Help! My mind is being corrupted! +filthy mouths are not appreciated here Property changes on: trunk/irc/ArchBlackmann/cursecop.txt ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/irc/ArchBlackmann/dev.txt --- trunk/irc/ArchBlackmann/dev.txt 2005-04-20 17:57:26 UTC (rev 14716) +++ trunk/irc/ArchBlackmann/dev.txt 2005-04-20 18:16:32 UTC (rev 14717) @@ -11,4 +11,5 @@ blight_ jimtabor mtempel -Gge \ No newline at end of file +Gge +Alex_Ionescu _____ Added: trunk/irc/ArchBlackmann/func.txt --- trunk/irc/ArchBlackmann/func.txt 2005-04-20 17:57:26 UTC (rev 14716) +++ trunk/irc/ArchBlackmann/func.txt 2005-04-20 18:16:32 UTC (rev 14717) @@ -0,0 +1,581 @@ +BOOLEAN +CcCanIWrite +CcCopyRead +CcCopyWrite +CcDeferWrite +CcFastCopyRead +CcFastCopyWrite +CcFlushCache +CcGetDirtyPages +CcGetFileObjectFromBcb +CcGetFileObjectFromSectionPtrs +CcGetFlushedValidData +CcGetLsnForFileObject +CcInitializeCacheMap +CcIsThereDirtyData +CcMapData +CcMdlRead +CcMdlReadComplete +CcMdlWriteAbort +CcMdlWriteComplete +CcPinMappedData +CcPinRead +CcPrepareMdlWrite +CcPreparePinWrite +CcPurgeCacheSection +CcRemapBcb +CcRepinBcb +CcScheduleReadAhead +CcSetAdditionalCacheAttributes +CcSetBcbOwnerPointer +CcSetDirtyPageThreshold +CcSetDirtyPinnedData +CcSetFileSizes +CcSetLogHandleForFile +CcSetReadAheadGranularity +CcUninitializeCacheMap +CcUnpinData +CcUnpinDataForThread +CcUnpinRepinnedBcb +CcWaitForCurrentLazyWriterActivity +CcZeroData +DbgLoadImageSymbols +DbgQueryDebugFilterState +DbgSetDebugFilterState +EVENT_TYPE +ExAcquireResourceExclusive +ExAcquireResourceExclusiveLite +ExAcquireResourceSharedLite +ExAcquireSharedStarveExclusive +ExAcquireSharedWaitForExclusive +ExAllocateFromZone +ExAllocatePool +ExAllocatePoolWithQuota +ExAllocatePoolWithQuotaTag +ExAllocatePoolWithTag +ExConvertExclusiveToSharedLite +ExCreateCallback +ExDeleteNPagedLookasideList +ExDeletePagedLookasideList +ExDeleteResource +ExDeleteResourceLite +ExDisableResourceBoostLite +ExEnumHandleTable +ExExtendZone +ExFreePool +ExGetCurrentProcessorCounts +ExGetCurrentProcessorCpuUsage +ExGetExclusiveWaiterCount +ExGetPreviousMode +ExGetSharedWaiterCount +ExInitializeNPagedLookasideList +ExInitializePagedLookasideList +ExInitializeResource +ExInitializeResourceLite +ExInitializeZone +ExInterlockedAddLargeInteger +ExInterlockedAddUlong +ExInterlockedDecrementLong +ExInterlockedExchangeUlong +ExInterlockedExtendZone +ExInterlockedIncrementLong +ExInterlockedInsertHeadList +ExInterlockedInsertTailList +ExInterlockedPopEntryList +ExInterlockedPushEntryList +ExInterlockedRemoveHeadList +ExIsProcessorFeaturePresent +ExIsResourceAcquiredExclusiveLite +ExIsResourceAcquiredSharedLite +ExLocalTimeToSystemTime +ExNotifyCallback +ExPostSystemEvent +ExQueryPoolBlockSize +ExQueueWorkItem +ExRaiseAccessViolation +ExRaiseDatatypeMisalignment +ExRaiseException +ExRaiseHardError +ExRaiseStatus +ExRegisterCallback +ExReinitializeResourceLite +ExReleaseResource +ExReleaseResourceForThread +ExReleaseResourceForThreadLite +ExRosDumpPagedPoolByTag +ExRosQueryPoolTag +ExSetResourceOwnerPointer +ExSetTimerResolution +ExSystemExceptionFilter +ExSystemTimeToLocalTime +ExTryToAcquireResourceExclusiveLite +ExUnregisterCallback +ExUuidCreate +ExVerifySuite +FsRtlAcquireFileExclusive +FsRtlAddMcbEntry +FsRtlAddToTunnelCache +FsRtlAllocateFileLock +FsRtlAllocatePool +FsRtlAllocatePoolWithQuota +FsRtlAllocatePoolWithQuotaTag +FsRtlAllocatePoolWithTag +FsRtlAllocateResource +FsRtlAreNamesEqual +FsRtlBalanceReads +FsRtlCheckLockForReadAccess +FsRtlCheckLockForWriteAccess +FsRtlCopyRead +FsRtlCopyWrite +FsRtlFastCheckLockForRead +FsRtlFastCheckLockForWrite +FsRtlFastUnlockAll +FsRtlFastUnlockAllByKey +FsRtlFastUnlockSingle +FsRtlFindInTunnelCache +FsRtlFreeFileLock +FsRtlGetFileSize +FsRtlGetNextFileLock +FsRtlGetNextMcbEntry +FsRtlIncrementCcFastReadNoWait +FsRtlIncrementCcFastReadNotPossible +FsRtlIncrementCcFastReadResourceMiss +FsRtlIncrementCcFastReadWait +FsRtlInitializeFileLock +FsRtlInitializeMcb +FsRtlInitializeTunnelCache +FsRtlInsertPerFileObjectContext +FsRtlInsertPerStreamContext +FsRtlIsDbcsInExpression +FsRtlIsFatDbcsLegal +FsRtlIsHpfsDbcsLegal +FsRtlIsNameInExpression +FsRtlLookupLastLargeMcbEntryAndIndex +FsRtlLookupLastMcbEntry +FsRtlLookupMcbEntry +FsRtlLookupPerFileObjectContext +FsRtlLookupPerStreamContextInternal +FsRtlMdlRead +FsRtlMdlReadComplete +FsRtlMdlReadCompleteDev +FsRtlMdlReadDev +FsRtlMdlWriteComplete +FsRtlMdlWriteCompleteDev +FsRtlNotifyChangeDirectory +FsRtlNotifyCleanup +FsRtlNotifyFilterChangeDirectory +FsRtlNotifyFilterReportChange +FsRtlNotifyFullChangeDirectory +FsRtlNotifyFullReportChange +FsRtlNotifyReportChange +FsRtlNotifyUninitializeSync +FsRtlNumberOfRunsInMcb +FsRtlPostPagingFileStackOverflow +FsRtlPostStackOverflow +FsRtlPrepareMdlWrite +FsRtlPrepareMdlWriteDev +FsRtlPrivateLock +FsRtlProcessFileLock +FsRtlRegisterFileSystemFilterCallbacks +FsRtlReleaseFile +FsRtlRemoveMcbEntry +FsRtlRemovePerFileObjectContext +FsRtlRemovePerStreamContext +FsRtlResetLargeMcb +FsRtlSyncVolumes +FsRtlTeardownPerStreamContexts +FsRtlTruncateMcb +FsRtlUninitializeFileLock +FsRtlUninitializeMcb +HalAdjustResourceList +HalAllocateCommonBuffer +HalAssignSlotResources +HalCalibratePerformanceCounter +HalFlushCommonBuffer +HalFreeCommonBuffer +HalGetAdapter +HalGetBusData +HalGetBusDataByOffset +HalGetDmaAlignmentRequirement +HalMakeBeep +HalQueryDisplayParameters +HalQueryRealTimeClock +HalReadDmaCounter [truncated at 1000 lines; 2154 more skipped]

1 0

[chorns] 14716: Don't link kernel-mode modules to kernel32.dll
by chorns＠svn.reactos.com 20 Apr '05

20 Apr '05

Don't link kernel-mode modules to kernel32.dll Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml Modified: branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml Modified: branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-20 16:01:19 UTC (rev 14715) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-20 17:57:26 UTC (rev 14716) @@ -35,7 +35,6 @@ # # ROS_RBUILDFLAGS # Pass parameters to rbuild. -# .PHONY: all .PHONY: clean _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml --- branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml 2005-04-20 16:01:19 UTC (rev 14715) +++ branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml 2005-04-20 17:57:26 UTC (rev 14716) @@ -1,9 +1,9 @@ <module name="null" type="kernelmodedriver" installbase="system32/drivers" installname="null.sys"> <include base="null">.</include> <define name="__USE_W32API" /> + <library>pseh</library> <library>ntoskrnl</library> <library>hal</library> - <library>pseh</library> <file>null.c</file> <file>null.rc</file> </module> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml 2005-04-20 16:01:19 UTC (rev 14715) +++ branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml 2005-04-20 17:57:26 UTC (rev 14716) @@ -2,6 +2,7 @@ <bootstrap base="reactos" /> <include base="vfatfs">.</include> <define name="__USE_W32API" /> + <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library> <file>blockdev.c</file> _____ Modified: branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml --- branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml 2005-04-20 16:01:19 UTC (rev 14715) +++ branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml 2005-04-20 17:57:26 UTC (rev 14716) @@ -3,6 +3,7 @@ <define name="BZ_NO_STDIO" /> <define name="BZ_DECOMPRESS_ONLY" /> <define name="__USE_W32API" /> + <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library> <file>bzlib.c</file> _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml --- branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml 2005-04-20 16:01:19 UTC (rev 14715) +++ branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml 2005-04-20 17:57:26 UTC (rev 14716) @@ -2,11 +2,11 @@ <include base="afd">include</include> <include base="ReactOS">include/afd</include> <define name="__USE_W32API" /> + <library>pseh</library> <library>ntoskrnl</library> <library>hal</library> - <library>pseh</library> <directory name="include"> - <pch>afd.h</pch> + <pch>afd.h</pch> </directory> <directory name="afd"> <file>bind.c</file> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml --- branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-04-20 16:01:19 UTC (rev 14715) +++ branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-04-20 17:57:26 UTC (rev 14716) @@ -1,5 +1,6 @@ <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="debugout.sys"> <bootstrap base="reactos" /> + <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library> <library>class2</library> _____ Modified: branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml --- branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml 2005-04-20 16:01:19 UTC (rev 14715) +++ branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml 2005-04-20 17:57:26 UTC (rev 14716) @@ -9,10 +9,10 @@ <define name="_WIN32_WINNT">0x0501</define> <define name="WINVER">0x600</define> <define name="_WIN32K_" /> + <library>pseh</library> <library>rosrtl</library> <library>ntoskrnl</library> <library>hal</library> - <library>pseh</library> <library>freetype</library> <pch>w32k.h</pch> <directory name="dib"> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-20 16:01:19 UTC (rev 14715) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-20 17:57:26 UTC (rev 14716) @@ -1511,6 +1511,15 @@ nasmflags.c_str () ); } + string linkerflags = TypeSpecificLinkerFlags(); + if ( linkerflags.size() > 0 ) + { + fprintf ( fMakefile, + "%s += %s\n\n", + linkerflagsMacro.c_str (), + linkerflags.c_str () ); + } + fprintf ( fMakefile, "\n\n" ); // future references to the macros will be to get their values _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-20 16:01:19 UTC (rev 14715) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-20 17:57:26 UTC (rev 14716) @@ -49,6 +49,7 @@ virtual void Process () = 0; virtual std::string TypeSpecificCFlags() { return ""; } virtual std::string TypeSpecificNasmFlags() { return ""; } + virtual std::string TypeSpecificLinkerFlags() { return ""; } void GenerateInvocations () const; void GenerateCleanTarget () const; static bool ReferenceObjects ( const Module& module ); @@ -196,6 +197,7 @@ MingwKernelModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); + std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; } private: void GenerateKernelModuleTarget (); }; @@ -229,6 +231,8 @@ MingwKernelModeDLLModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); + std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; } + std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } private: void GenerateKernelModeDLLModuleTarget (); }; @@ -240,7 +244,8 @@ MingwKernelModeDriverModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificCFlags() { return "-D__NTDRIVER__"; } + std::string TypeSpecificCFlags() { return "-D__NTDRIVER__ -D_SEH_NO_NATIVE_NLG"; } + std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } private: void GenerateKernelModeDriverModuleTarget (); }; @@ -252,6 +257,8 @@ MingwNativeDLLModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); + std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; } + std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } private: void GenerateNativeDLLModuleTarget (); }; @@ -263,7 +270,8 @@ MingwNativeCUIModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificCFlags() { return "-D__NTAPP__"; } + std::string TypeSpecificCFlags() { return "-D__NTAPP__ -D_SEH_NO_NATIVE_NLG"; } + std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } private: void GenerateNativeCUIModuleTarget (); }; @@ -309,6 +317,7 @@ MingwBootLoaderModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); + std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } private: void GenerateBootLoaderModuleTarget (); };

1 0

[ion] 14711: Remove bogus error message. It is normal for Mutex creation to fail since the Object will alredy exist after the first time it's created
by ion＠svn.reactos.com 20 Apr '05

20 Apr '05

Remove bogus error message. It is normal for Mutex creation to fail since the Object will alredy exist after the first time it's created Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c --- trunk/reactos/lib/rpcrt4/rpcrt4_main.c 2005-04-20 12:46:39 UTC (rev 14710) +++ trunk/reactos/lib/rpcrt4/rpcrt4_main.c 2005-04-20 12:52:13 UTC (rev 14711) @@ -152,8 +152,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); master_mutex = CreateMutexA( NULL, FALSE, RPCSS_MASTER_MUTEX_NAME); - if (!master_mutex) - ERR("Failed to create master mutex\n"); break; case DLL_PROCESS_DETACH:

4 7

[hpoussin] 14715: Don't hardcode "Reactos.xml" name
by hpoussin＠svn.reactos.com 20 Apr '05

20 Apr '05

Don't hardcode "Reactos.xml" name Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-04-20 15:19:09 UTC (rev 14714) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-04-20 16:01:19 UTC (rev 14715) @@ -17,6 +17,7 @@ using std::vector; static string BuildSystem; +static string RootXmlFile = "ReactOS.xml"; static bool Verbose = false; bool @@ -28,6 +29,9 @@ case 'v': Verbose = true; break; + case 'r': + RootXmlFile = string(&argv[index][2]); + break; default: printf ( "Unknown switch -%c", switchChar ); @@ -62,9 +66,10 @@ if ( !ParseArguments ( argc, argv ) ) { printf ( "Generates project files for buildsystems\n\n" ); - printf ( " rbuild [-v] buildsystem\n\n" ); + printf ( " rbuild [-v] [-rfile.xml] buildsystem\n\n" ); printf ( "Switches:\n" ); printf ( " -v Be verbose\n" ); + printf ( " -rfile.xml Name of the root xml file. Default is ReactOS.xml\n" ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); printf ( " mingw MinGW\n" ); @@ -73,7 +78,7 @@ } try { - string projectFilename ( "ReactOS.xml" ); + string projectFilename ( RootXmlFile ); printf ( "Reading build files..." ); Project project ( projectFilename ); printf ( "done\n" );

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005