Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[hyperion] 37051: modified crt1.c Translated inline assembler in __mingw_CRTStartup mingw_main now compiles with Visual C++ modified mingw.rbuild deleted strcasecmp.c deleted strncasecmp.c deleted wcscmpi.c strcasecmp, strncasecmp and wcscmpi are inlined in MinGW headers, no need to define them as library functions

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 29 08:03:03 2008 New Revision: 37051 URL: http://svn.reactos.org/svn/reactos?rev=37051&view=rev Log: modified crt1.c Translated inline assembler in __mingw_CRTStartup mingw_main now compiles with Visual C++ modified mingw.rbuild deleted strcasecmp.c deleted strncasecmp.c deleted wcscmpi.c strcasecmp, strncasecmp and wcscmpi are inlined in MinGW headers, no need to define them as library functions Removed: branches/the-real-msvc/lib/3rdparty/mingw/strcasecmp.c branches/the-real-msvc/lib/3rdparty/mingw/strncasecmp.c branches/the-real-msvc/lib/3rdparty/mingw/wcscmpi.c Modified: branches/the-real-msvc/lib/3rdparty/mingw/crt1.c branches/the-real-msvc/lib/3rdparty/mingw/mingw.rbuild Modified: branches/the-real-msvc/lib/3rdparty/mingw/crt1.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming… ============================================================================== --- branches/the-real-msvc/lib/3rdparty/mingw/crt1.c [iso-8859-1] (original) +++ branches/the-real-msvc/lib/3rdparty/mingw/crt1.c [iso-8859-1] Wed Oct 29 08:03:03 2008 @@ -220,6 +220,7 @@ _pei386_runtime_relocator (); #endif +#if defined(__GNUC__) #if defined(__i386__) /* Align the stack to 16 bytes for the sake of SSE ops in main or in functions inlined into main. */ @@ -233,6 +234,17 @@ #else #error Unsupported architecture #endif +#elif defined(_MSC_VER) +#if defined(_M_IX86) + /* Align the stack to 16 bytes for the sake of SSE ops in main + or in functions inlined into main. */ + __asm and esp, 0FFFFFFF0h +#else +#error TODO +#endif +#else +#error TODO +#endif /* * Call the main function. If the user does not supply one Modified: branches/the-real-msvc/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming… ============================================================================== --- branches/the-real-msvc/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/the-real-msvc/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Wed Oct 29 08:03:03 2008 @@ -13,10 +13,7 @@ <file>isascii.c</file> <file>iscsym.c</file> <file>iscsymf.c</file> - <file>strcasecmp.c</file> - <file>strncasecmp.c</file> <file>toascii.c</file> - <file>wcscmpi.c</file> <file>_wgetopt.c</file> <if property="ARCH" value="i386"> <file>pseudo-reloc.c</file> Removed: branches/the-real-msvc/lib/3rdparty/mingw/strcasecmp.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming… ============================================================================== --- branches/the-real-msvc/lib/3rdparty/mingw/strcasecmp.c [iso-8859-1] (original) +++ branches/the-real-msvc/lib/3rdparty/mingw/strcasecmp.c (removed) @@ -1,21 +1,0 @@ -/* - * strcasecmp.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Oldnames from ANSI header string.h - * - * Some wrapper functions for those old name functions whose appropriate - * equivalents are not simply underscore prefixed. - * - */ - -#include <string.h> - -int -strcasecmp (const char *sz1, const char *sz2) -{ - return _stricmp (sz1, sz2); -} - Removed: branches/the-real-msvc/lib/3rdparty/mingw/strncasecmp.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming… ============================================================================== --- branches/the-real-msvc/lib/3rdparty/mingw/strncasecmp.c [iso-8859-1] (original) +++ branches/the-real-msvc/lib/3rdparty/mingw/strncasecmp.c (removed) @@ -1,21 +1,0 @@ -/* - * strncasecmp.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Oldnames from ANSI header string.h - * - * Some wrapper functions for those old name functions whose appropriate - * equivalents are not simply underscore prefixed. - * - */ - -#include <string.h> - -int -strncasecmp (const char *sz1, const char *sz2, size_t sizeMaxCompare) -{ - return _strnicmp (sz1, sz2, sizeMaxCompare); -} - Removed: branches/the-real-msvc/lib/3rdparty/mingw/wcscmpi.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming… ============================================================================== --- branches/the-real-msvc/lib/3rdparty/mingw/wcscmpi.c [iso-8859-1] (original) +++ branches/the-real-msvc/lib/3rdparty/mingw/wcscmpi.c (removed) @@ -1,21 +1,0 @@ -/* - * wcscmpi.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Oldnames from ANSI header string.h - * - * Some wrapper functions for those old name functions whose appropriate - * equivalents are not simply underscore prefixed. - * - */ - -#include <string.h> - -int -wcscmpi (const wchar_t * ws1, const wchar_t * ws2) -{ - return _wcsicmp (ws1, ws2); -} -

16 years, 1 month

[hyperion] 37050: modified winbase.h Include <intrin.h> for compiler intrinsics modified winuser.h Removed duplicate accessibility definitions

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 29 07:58:41 2008 New Revision: 37050 URL: http://svn.reactos.org/svn/reactos?rev=37050&view=rev Log: modified winbase.h Include <intrin.h> for compiler intrinsics modified winuser.h Removed duplicate accessibility definitions Modified: branches/the-real-msvc/include/psdk/winbase.h branches/the-real-msvc/include/psdk/winuser.h Modified: branches/the-real-msvc/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/winb… ============================================================================== --- branches/the-real-msvc/include/psdk/winbase.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/psdk/winbase.h [iso-8859-1] Wed Oct 29 07:58:41 2008 @@ -3,6 +3,8 @@ #if __GNUC__ >= 3 #pragma GCC system_header #endif + +#include <intrin.h> #if !defined(_KERNEL32_) #define WINBASEAPI DECLSPEC_IMPORT Modified: branches/the-real-msvc/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/winu… ============================================================================== --- branches/the-real-msvc/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/psdk/winuser.h [iso-8859-1] Wed Oct 29 07:58:41 2008 @@ -1543,12 +1543,6 @@ #define UIS_SET 1 #define UIS_CLEAR 2 #define UIS_INITIALIZE 3 - -#define UISF_HIDEFOCUS 0x1 -#define UISF_HIDEACCEL 0x2 -#if (WINVER >= 0x0501) -#define UISF_ACTIVE 0x4 -#endif #endif

16 years, 1 month

[hyperion] 37049: No stubs in hal, don't use the spec file

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 29 07:56:57 2008 New Revision: 37049 URL: http://svn.reactos.org/svn/reactos?rev=37049&view=rev Log: No stubs in hal, don't use the spec file Modified: branches/the-real-msvc/hal/hal/hal.rbuild Modified: branches/the-real-msvc/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/hal/hal/hal.rbuil… ============================================================================== --- branches/the-real-msvc/hal/hal/hal.rbuild [iso-8859-1] (original) +++ branches/the-real-msvc/hal/hal/hal.rbuild [iso-8859-1] Wed Oct 29 07:56:57 2008 @@ -9,7 +9,6 @@ <define name="_NTHAL_" /> <file>hal.c</file> <file>hal.rc</file> - <file>hal.spec</file> </module> </if> <if property="ARCH" value="i386"> @@ -20,7 +19,6 @@ <define name="_NTHAL_" /> <file>hal.c</file> <file>hal.rc</file> - <file>hal.spec</file> </module> </if> <if property="ARCH" value="i386">

16 years, 1 month

[hyperion] 37048: Make acpi compile with Visual C++

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 29 07:56:17 2008 New Revision: 37048 URL: http://svn.reactos.org/svn/reactos?rev=37048&view=rev Log: Make acpi compile with Visual C++ Added: branches/the-real-msvc/drivers/bus/acpi/include/platform/acmsc.h (with props) Modified: branches/the-real-msvc/drivers/bus/acpi/include/platform/acwin.h Added: branches/the-real-msvc/drivers/bus/acpi/include/platform/acmsc.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/drivers/bus/acpi/… ============================================================================== --- branches/the-real-msvc/drivers/bus/acpi/include/platform/acmsc.h (added) +++ branches/the-real-msvc/drivers/bus/acpi/include/platform/acmsc.h [iso-8859-1] Wed Oct 29 07:56:17 2008 @@ -1,0 +1,67 @@ +#ifndef __ACMSC_H__ +#define __ACMSC_H__ + +#define COMPILER_DEPENDENT_UINT64 unsigned __int64 + +#if defined(_M_IX86) + +#define ACPI_ASM_MACROS +#define causeinterrupt(level) +#define BREAKPOINT3 +#define halt() { __asm { sti } __asm { hlt } } +#define wbinvd() + +__forceinline void _ACPI_ACQUIRE_GLOBAL_LOCK(void * GLptr, unsigned char * Acq_) +{ + unsigned char Acq; + + __asm + { + mov ecx, [GLptr] + + L1: mov eax, [ecx] + mov edx, eax + and edx, ecx + bts edx, 1 + adc edx, 0 + lock cmpxchg [ecx], edx + jne L1 + cmp dl, 3 + sbb eax, eax + + mov [Acq], al + }; + + *Acq_ = Acq; +} + +#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ + _ACPI_ACQUIRE_GLOBAL_LOCK((GLptr), (unsigned char *)&(Acq)) + +__forceinline void _ACPI_RELEASE_GLOBAL_LOCK(void * GLptr, unsigned char * Acq_) +{ + unsigned char Acq; + + __asm + { + mov ecx, [GLptr] + + L1: mov eax, [ecx] + mov edx, eax + and edx, ecx + lock cmpxchg [ecx], edx + jnz L1 + and eax, 1 + + mov [Acq], al + }; + + *Acq_ = Acq; +} + +#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \ + _ACPI_RELEASE_GLOBAL_LOCK((GLptr), (unsigned char *)&(Acq)) + +#endif + +#endif /* __ACMSC_H__ */ Propchange: branches/the-real-msvc/drivers/bus/acpi/include/platform/acmsc.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/the-real-msvc/drivers/bus/acpi/include/platform/acwin.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/drivers/bus/acpi/… ============================================================================== --- branches/the-real-msvc/drivers/bus/acpi/include/platform/acwin.h [iso-8859-1] (original) +++ branches/the-real-msvc/drivers/bus/acpi/include/platform/acwin.h [iso-8859-1] Wed Oct 29 07:56:17 2008 @@ -47,14 +47,25 @@ #endif -/* ReactOS uses GCC */ +#if defined(__GNUC__) #include "acgcc.h" #undef disable -#define disable() __asm__("cli\n\t"); +#define disable() __asm__("cli\n\t") #undef enable -#define enable() __asm__("sti\n\t"); +#define enable() __asm__("sti\n\t") + +#elif defined(_MSC_VER) + +#include "acmsc.h" + +#undef disable +#define disable() __asm { cli } +#undef enable +#define enable() __asm { sti } + +#endif #undef DEBUGGER_THREADING #define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED

16 years, 1 month

[pschweitzer] 37047: Changes to match with previous commit (r37046): - Added PSEH to CDFS - Encapsulated FsRtlIsNameInExpression calls inside a PSEH block in fastfat and CDFS drivers

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Oct 29 04:44:28 2008 New Revision: 37047 URL: http://svn.reactos.org/svn/reactos?rev=37047&view=rev Log: Changes to match with previous commit (r37046): - Added PSEH to CDFS - Encapsulated FsRtlIsNameInExpression calls inside a PSEH block in fastfat and CDFS drivers Modified: branches/pierre-fsd/drivers/filesystems/cdfs/cdfs.h branches/pierre-fsd/drivers/filesystems/cdfs/cdfs.rbuild branches/pierre-fsd/drivers/filesystems/cdfs/dirctl.c branches/pierre-fsd/drivers/filesystems/cdfs/fcb.c branches/pierre-fsd/drivers/filesystems/fastfat/create.c Modified: branches/pierre-fsd/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Wed Oct 29 04:44:28 2008 @@ -5,6 +5,7 @@ #include <ntddk.h> #include <ntddcdrm.h> #include <ccros.h> +#include <pseh/pseh.h> #define CDFS_BASIC_SECTOR 2048 #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 Modified: branches/pierre-fsd/drivers/filesystems/cdfs/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/cdfs/cdfs.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/cdfs/cdfs.rbuild [iso-8859-1] Wed Oct 29 04:44:28 2008 @@ -5,6 +5,7 @@ <include base="cdfs">.</include> <library>ntoskrnl</library> <library>hal</library> + <library>pseh</library> <file>cdfs.c</file> <file>cleanup.c</file> <file>close.c</file> Modified: branches/pierre-fsd/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Wed Oct 29 04:44:28 2008 @@ -172,6 +172,7 @@ ULONG DirIndex; ULONG Offset = 0; BOOLEAN IsRoot; + BOOLEAN Found = FALSE; PVOID Context = NULL; ULONG DirSize; PDIR_RECORD Record; @@ -306,8 +307,22 @@ DPRINT("ShortName '%wZ'\n", &ShortName); - if (FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL)) + _SEH_TRY + { + Found = FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || + FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) + { + CcUnpinData(Context); + return Status; + } + if (Found) { if (Parent && Parent->PathName) { Modified: branches/pierre-fsd/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Wed Oct 29 04:44:28 2008 @@ -454,7 +454,8 @@ PDIR_RECORD Record; ULONG Offset; ULONG BlockOffset; - NTSTATUS Status; + NTSTATUS Status = STATUS_OBJECT_NAME_NOT_FOUND; + BOOLEAN Found; LARGE_INTEGER StreamOffset; PVOID Context; @@ -539,8 +540,22 @@ DPRINT("ShortName '%wZ'\n", &ShortName); - if (FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL)) + _SEH_TRY + { + Found = FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || + FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) + { + CcUnpinData(Context); + return Status; + } + if (Found) { DPRINT("Match found, %S\n", Name); Status = CdfsMakeFCBFromDirEntry(DeviceExt, @@ -585,7 +600,7 @@ CcUnpinData(Context); - return(STATUS_OBJECT_NAME_NOT_FOUND); + return Status; } Modified: branches/pierre-fsd/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/create.c [iso-8859-1] Wed Oct 29 04:44:28 2008 @@ -191,7 +191,7 @@ PVOID Context = NULL; PVOID Page; PVFATFCB rcFcb; - BOOLEAN Found; + BOOLEAN Found = FALSE; UNICODE_STRING PathNameU; UNICODE_STRING FileToFindUpcase; BOOLEAN WildCard; @@ -283,8 +283,22 @@ } if (WildCard) { - Found = FsRtlIsNameInExpression(&FileToFindUpcase, &DirContext->LongNameU, TRUE, NULL) || - FsRtlIsNameInExpression(&FileToFindUpcase, &DirContext->ShortNameU, TRUE, NULL); + _SEH_TRY + { + Found = FsRtlIsNameInExpression(&FileToFindUpcase, &DirContext->LongNameU, TRUE, NULL) || + FsRtlIsNameInExpression(&FileToFindUpcase, &DirContext->ShortNameU, TRUE, NULL); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&FileToFindUpcase); + ExFreePool(PathNameBuffer); + return Status; + } } else {

16 years, 1 month

[pschweitzer] 37046: FsRtlIsNameInExpression: - Get rid of stupid helper FsRtlpUpcaseUnicodeChar - Use a wrapper (FsRtlIsNameInExpressionPrivate) to uppercase Name when needed (and not expression, it mustn't be uppercased by the function!) - Move most of the code to FsRtlIsNameInExpressionPrivate Be carrefull, with that commit, FsRtlIsNameInExpression calls must be done inside a PSEH block.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Oct 29 04:10:03 2008 New Revision: 37046 URL: http://svn.reactos.org/svn/reactos?rev=37046&view=rev Log: FsRtlIsNameInExpression: - Get rid of stupid helper FsRtlpUpcaseUnicodeChar - Use a wrapper (FsRtlIsNameInExpressionPrivate) to uppercase Name when needed (and not expression, it mustn't be uppercased by the function!) - Move most of the code to FsRtlIsNameInExpressionPrivate Be carrefull, with that commit, FsRtlIsNameInExpression calls must be done inside a PSEH block. Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Wed Oct 29 04:10:03 2008 @@ -16,24 +16,51 @@ /* PRIVATE FUNCTIONS *********************************************************/ -WCHAR -NTAPI -FsRtlpUpcaseUnicodeChar(IN WCHAR SourceCharacter, - IN BOOLEAN IgnoreCase, - IN PWCHAR UpcaseTable OPTIONAL) -{ - if (IgnoreCase) - { - if (!UpcaseTable) - { - return RtlUpcaseUnicodeChar(SourceCharacter); +BOOLEAN +NTAPI +FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression, + IN PUNICODE_STRING Name, + IN BOOLEAN IgnoreCase, + IN PWCHAR UpcaseTable OPTIONAL) +{ + ULONG i, j, k = 0; + + ASSERT(!FsRtlDoesNameContainWildCards(Name)); + + for (i = 0 ; i < Expression->Length / sizeof(WCHAR) ; i++) + { + if ((Expression->Buffer[i] == (IgnoreCase ? UpcaseTable[Name->Buffer[k]] : Name->Buffer[k])) || + (Expression->Buffer[i] == L'?') || (Expression->Buffer[i] == DOS_QM) || + (Expression->Buffer[i] == DOS_DOT && (Name->Buffer[k] == L'.' || Name->Buffer[k] == L'0'))) + { + k++; + } + else if (Expression->Buffer[i] == L'*') + { + k = Name->Length / sizeof(WCHAR); + } + else if (Expression->Buffer[i] == DOS_STAR) + { + for (j = k ; j < Name->Length / sizeof(WCHAR) ; j++) + { + if (Name->Buffer[j] == L'.') + { + k = j; + break; + } + } } else { - return UpcaseTable[SourceCharacter]; - } - } - return SourceCharacter; + k = 0; + } + if (k >= Expression->Length / sizeof(WCHAR)) + { + return TRUE; + } + } + + return FALSE; } /* PUBLIC FUNCTIONS **********************************************************/ @@ -250,7 +277,8 @@ * Check if the Name string is in the Expression string. * * @param Expression - * The string in which we've to find Name. It can contain wildcards + * The string in which we've to find Name. It can contain wildcards. + * If IgnoreCase is set to TRUE, this string MUST BE uppercase. * * @param Name * The string to find. It cannot contain wildcards @@ -276,43 +304,31 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - ULONG i, j, k = 0; - - ASSERT(!FsRtlDoesNameContainWildCards(Name)); - - for (i = 0 ; i < Expression->Length / sizeof(WCHAR) ; i++) - { - if ((FsRtlpUpcaseUnicodeChar(Expression->Buffer[i], IgnoreCase, UpcaseTable) == - FsRtlpUpcaseUnicodeChar(Name->Buffer[k], IgnoreCase, UpcaseTable)) || - (Expression->Buffer[i] == L'?') || (Expression->Buffer[i] == DOS_QM) || - (Expression->Buffer[i] == DOS_DOT && (Name->Buffer[k] == L'.' || Name->Buffer[k] == L'0'))) - { - k++; - } - else if (Expression->Buffer[i] == L'*') - { - k = Name->Length / sizeof(WCHAR); - } - else if (Expression->Buffer[i] == DOS_STAR) - { - for (j = k ; j < Name->Length / sizeof(WCHAR) ; j++) - { - if (Name->Buffer[j] == L'.') - { - k = j; - break; - } - } - } - else - { - k = 0; - } - if (k >= Expression->Length / sizeof(WCHAR)) - { - return TRUE; - } - } - - return FALSE; -} + BOOLEAN Result; + NTSTATUS Status; + UNICODE_STRING IntName; + + if (IgnoreCase && !UpcaseTable) + { + Status = RtlUpcaseUnicodeString(&IntName, Name, TRUE); + if (Status != STATUS_SUCCESS) + { + ExRaiseStatus(Status); + } + Name = &IntName; + IgnoreCase = FALSE; + } + else + { + IntName.Buffer = NULL; + } + + Result = FsRtlIsNameInExpressionPrivate(Expression, Name, IgnoreCase, UpcaseTable); + + if (IntName.Buffer != NULL) + { + RtlFreeUnicodeString(&IntName); + } + + return Result; +}

16 years, 1 month

[cgutman] 37045: - We don't need allowwarnings="true"

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 28 20:04:58 2008 New Revision: 37045 URL: http://svn.reactos.org/svn/reactos?rev=37045&view=rev Log: - We don't need allowwarnings="true" Modified: branches/aicom-network-fixes/lib/drivers/ip/ip.rbuild Modified: branches/aicom-network-fixes/lib/drivers/ip/ip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/ip.rbuild [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/ip.rbuild [iso-8859-1] Tue Oct 28 20:04:58 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ip" type="staticlibrary" allowwarnings="true"> +<module name="ip" type="staticlibrary"> <define name="__NTDRIVER__"/> <include base="tcpip">include</include> <include base="oskittcp">include</include>

16 years, 1 month

[cgutman] 37044: - Set the loopback adapter's broadcast address

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 28 18:42:32 2008 New Revision: 37044 URL: http://svn.reactos.org/svn/reactos?rev=37044&view=rev Log: - Set the loopback adapter's broadcast address Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] Tue Oct 28 18:42:32 2008 @@ -196,6 +196,7 @@ AddrInitIPv4(&Loopback->Unicast, LOOPBACK_ADDRESS_IPv4); AddrInitIPv4(&Loopback->Netmask, LOOPBACK_ADDRMASK_IPv4); + AddrInitIPv4(&Loopback->Broadcast, LOOPBACK_BCASTADDR_IPv4); IPRegisterInterface(Loopback);

16 years, 1 month

[dreimer] 37043: Overhaul of the help file. Now it starts to be worth its name.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Oct 28 12:52:14 2008 New Revision: 37043 URL: http://svn.reactos.org/svn/reactos?rev=37043&view=rev Log: Overhaul of the help file. Now it starts to be worth its name. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Tue Oct 28 12:52:14 2008 @@ -13,17 +13,16 @@ if ("$args" -eq "") { "" "Available Commands:" - " make [OPTIONS] - Without options it does a standard build of" - " ReactOS. OPTIONS are the standard ReactOS build" - " options ie. ""bootcd""" + " make [OPTIONS] - Make does a standard build of ReactOS. OPTIONS are" + " the standard ReactOS build options." " makex [OPTIONS] - Same as 'make' but automatically determines the" - " number of CPU Cores in the system and uses -j" - " with the appropriate number." + " number of CPU Cores in the system and uses -j with" + " the appropriate number." " basedir - Switch back to the ReactOS source directory." if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { - " charch [OPTIONS] - Change the Architecture to build for the" - " current RosBE session." + " charch [OPTIONS] - Change the Architecture to build ReactOS for" + " for the current RosBE session." } if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { @@ -32,18 +31,18 @@ } if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { - " chdefgcc [PATH] - Change the MinGW/GCC directory for the" - " current RosBE session." - } - - " clean [OPTIONS] - Fully clean the ReactOS source directory and/or" - " the RosBE build logs." + " chdefgcc [PATH] - Change the Host or Target MinGW/GCC directory" + " for the current RosBE session." + } + + " clean [OPTIONS] - Fully clean the ReactOS source directory and/or the" + " RosBE build logs." if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { " config [OPTIONS] - Configures the way, ReactOS will be built." } - " help [COMMAND] - Display the available commands or help on a" + " help [COMMAND] - Display the available commands or give help on a" " specific command." if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { @@ -64,7 +63,8 @@ } if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { - " options - Starts the RosBE configurator." + " options - Starts the RosBE configurator and sets the." + " changes active immediately." } if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { @@ -81,15 +81,50 @@ # if ("$args" -eq "make") { " Usage: make [OPTIONS]" - " Without options it does a standard build of ReactOS. OPTIONS are the" - " standard ReactOS build options ie. ""bootcd"", ""livecd"", etc." + " Make does a standard build of ReactOS. OPTIONS are the standard ReactOS build" + " options:" + "" + " all - This target builds all of ReactOS." + " ""module"" - Builds only the module with the appropiate name." + " bootcd - Generates a BootCD ISO." + " livecd - Generates a LiveCD ISO." + " install - Installs ReactOS in the folder specified by the" + " environment variable ""ROS_INSTALL""." + " ""module""_install - Installs only the module with the appropiate name in" + " the folder specified by the environment variable" + " ""ROS_INSTALL""." + " clean - Deletes all files generated by the build process." + " ""module""_clean - Deletes only the files of one module with the" + " appropiate name." + " depends - Does a full dependency check on the ReactOS Source" + " and generates a new makefile. This will take a while." + " ""module""-depends - Does a dependency check for one module with the" + " appropiate name." exit } if ("$args" -eq "makex") { " Usage: makex [OPTIONS]" - " Same as 'make' but automatically determines the number of CPU Cores in" - " the system and uses ""make -j x"" with the appropriate number." - " NOTE: The number makex uses can be modified by editing Build.ps1" + " Same as 'make' but automatically determines the number of CPU Cores in the" + " system and uses ""make -j x"" with the appropriate number. OPTIONS are the" + " standard ReactOS build options:" + "" + " all - This target builds all of ReactOS." + " ""module"" - Builds only the module with the appropiate name." + " bootcd - Generates a BootCD ISO." + " livecd - Generates a LiveCD ISO." + " install - Installs ReactOS in the folder specified by the" + " environment variable ""ROS_INSTALL""." + " ""module""_install - Installs only the module with the appropiate name in" + " the folder specified by the environment variable" + " ""ROS_INSTALL""." + " clean - Deletes all files generated by the build process." + " ""module""_clean - Deletes only the files of one module with the" + " appropiate name." + " depends - Does a full dependency check on the ReactOS Source" + " and generates a new makefile. This will take a while." + " ""module""-depends - Does a dependency check for one module with the" + " appropiate name." + " NOTE: The number makex uses can be modified by editing Build.cmd" " located in the RosBE directory, instructions for doing so are" " contained within the file." exit @@ -102,7 +137,7 @@ if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { if ("$args" -eq "charch") { " Usage: charch [OPTIONS]" - " Change the ReactOS source directory for the current RosBE session." + " Change the Architecture to build ReactOS for, for the current RosBE session." " Possible Architectures are: i386, ppc, arm, amd64." "" exit @@ -122,6 +157,8 @@ " Usage: chdefgcc [PATH]" " Change the MinGW/GCC directory for the current RosBE session." "" + " Path - Path to set the Host or Target GCC to." + " Type - Set it to ""target"" or ""host""" exit } } @@ -138,10 +175,10 @@ " Usage: config [OPTIONS]" " Creates a configuration file, which tells RosBE how to build the tree." "" - " delete - Deletes the created configuration file and so sets back" - " to default settings." - " update - Deletes the old created configuration file and updates" - " it with a new, default one." + " delete - Deletes the created configuration file and so sets back to the" + " default settings." + " update - Deletes the old created configuration file and updates it with a" + " new, default one." exit } } @@ -153,15 +190,14 @@ if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { if ("$args" -eq "raddr2line") { " Usage: raddr2line [FILE] [ADDRESS]" - " Translates program addresses into file names and line numbers to" - " assist developers with finding specific bugs in ReactOS. If" - " either of the options is not given you will be prompted for it." - "" - " FILE - This can be either a fully specified path or just the" - " file name [you can use a partial name ie. ntdll*] of" - " the executable to be analyzed. When using just a file" - " the current directory and all sub-directories are" - " searched." + " Translates program addresses into file names and line numbers to assist" + " developers with finding specific bugs in ReactOS. If either of the options" + " is not given you will be prompted for it." + "" + " FILE - This can be either a fully specified path or just the file name" + " [you can use a partial name ie. ntdll*] of the executable to be" + " analyzed. When using just a file the current directory and all" + " sub-directories are searched." " ADDRESS - The address to be translated." "" exit @@ -176,11 +212,11 @@ if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { if ("$args" -eq "ssvn") { " Usage: ssvn [OPTIONS]" - " Creates, updates or cleans up your ReactOS source tree or shows the" - " revision number of the local and online trees." - "" - " update - Updates to HEAD revision or to a specific one when" - " second parameter specifies one." + " Creates, updates or cleans up your ReactOS source tree or shows the revision" + " number of the local and online trees." + "" + " update - Updates to HEAD revision or to a specific one when the second" + " parameter specifies one." " create - Creates a new ReactOS source tree." " cleanup - Cleans up and fixes errors in the source tree." " status - Show the current local and online revision numbers." @@ -190,7 +226,8 @@ if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { if ("$args" -eq "options") { " Usage: options" - " Starts the RosBE configurator." + " Starts the RosBE configurator and sets the changes active in the current." + " RosBE session." exit } } Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Tue Oct 28 12:52:14 2008 @@ -19,17 +19,16 @@ if "%1" == "" ( echo. echo Available Commands: - echo make [OPTIONS] - Without options it does a standard build of - echo ReactOS. OPTIONS are the standard ReactOS build - echo options ie. "bootcd" + echo make [OPTIONS] - Make does a standard build of ReactOS. OPTIONS are + echo the standard ReactOS build options. echo makex [OPTIONS] - Same as 'make' but automatically determines the - echo number of CPU Cores in the system and uses -j - echo with the appropriate number. + echo number of CPU Cores in the system and uses -j with + echo the appropriate number. echo basedir - Switch back to the ReactOS source directory. if exist "%_ROSBE_BASEDIR%\charch.cmd" ( - echo charch [OPTIONS] - Change the Architecture to build for the - echo current RosBE session. + echo charch [OPTIONS] - Change the Architecture to build ReactOS for + echo for the current RosBE session. ) if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( @@ -38,18 +37,18 @@ ) if exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( - echo chdefgcc [OPTIONS] - Change the MinGW/GCC directory for the - echo current RosBE session. - ) - - echo clean [OPTIONS] - Fully clean the ReactOS source directory and/or - echo the RosBE build logs. + echo chdefgcc [OPTIONS] - Change the Host or Target MinGW/GCC directory + echo for the current RosBE session. + ) + + echo clean [OPTIONS] - Fully clean the ReactOS source directory and/or the + echo RosBE build logs. if exist "%_ROSBE_BASEDIR%\Config.cmd" ( echo config [OPTIONS] - Configures the way, ReactOS will be built. ) - echo help [COMMAND] - Display the available commands or help on a + echo help [COMMAND] - Display the available commands or give help on a echo specific command. if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( @@ -70,7 +69,8 @@ ) if exist "%_ROSBE_BASEDIR%\options.cmd" ( - echo options - Starts the RosBE configurator. + echo options - Starts the RosBE configurator and sets the + echo changes active immediately. ) if exist "%_ROSBE_BASEDIR%\update.cmd" ( @@ -87,14 +87,49 @@ :: if /i "%1" == "make" ( echo Usage: make [OPTIONS] - echo Without options it does a standard build of ReactOS. OPTIONS are the - echo standard ReactOS build options ie. "bootcd", "livecd", etc. + echo Make does a standard build of ReactOS. OPTIONS are the standard ReactOS build + echo options: + echo. + echo all - This target builds all of ReactOS. + echo "module" - Builds only the module with the appropiate name. + echo bootcd - Generates a BootCD ISO. + echo livecd - Generates a LiveCD ISO. + echo install - Installs ReactOS in the folder specified by the + echo environment variable "ROS_INSTALL". + echo "module"_install - Installs only the module with the appropiate name in + echo the folder specified by the environment variable + echo "ROS_INSTALL". + echo clean - Deletes all files generated by the build process. + echo "module"_clean - Deletes only the files of one module with the + echo appropiate name. + echo depends - Does a full dependency check on the ReactOS Source + echo and generates a new makefile. This will take a while. + echo "module"-depends - Does a dependency check for one module with the + echo appropiate name. goto :EOC ) if /i "%1" == "makex" ( echo Usage: makex [OPTIONS] - echo Same as 'make' but automatically determines the number of CPU Cores in - echo the system and uses "make -j x" with the appropriate number. + echo Same as 'make' but automatically determines the number of CPU Cores in the + echo system and uses "make -j x" with the appropriate number. OPTIONS are the + echo standard ReactOS build options: + echo. + echo all - This target builds all of ReactOS. + echo "module" - Builds only the module with the appropiate name. + echo bootcd - Generates a BootCD ISO. + echo livecd - Generates a LiveCD ISO. + echo install - Installs ReactOS in the folder specified by the + echo environment variable "ROS_INSTALL". + echo "module"_install - Installs only the module with the appropiate name in + echo the folder specified by the environment variable + echo "ROS_INSTALL". + echo clean - Deletes all files generated by the build process. + echo "module"_clean - Deletes only the files of one module with the + echo appropiate name. + echo depends - Does a full dependency check on the ReactOS Source + echo and generates a new makefile. This will take a while. + echo "module"-depends - Does a dependency check for one module with the + echo appropiate name. echo NOTE: The number makex uses can be modified by editing Build.cmd echo located in the RosBE directory, instructions for doing so are echo contained within the file. @@ -108,7 +143,7 @@ if exist "%_ROSBE_BASEDIR%\charch.cmd" ( if /i "%1" == "charch" ( echo Usage: charch [OPTIONS] - echo Change the ReactOS source directory for the current RosBE session. + echo Change the Architecture to build ReactOS for, for the current RosBE session. echo Possible Architectures are: i386, ppc, arm, amd64. echo. goto :EOC @@ -128,7 +163,7 @@ echo Usage: chdefgcc [OPTIONS] echo Change the MinGW/GCC Target/Host directory for the current RosBE session. echo. - echo Path - Path to set the Host of Target GCC to. + echo Path - Path to set the Host or Target GCC to. echo Type - Set it to "target" or "host" goto :EOC ) @@ -146,10 +181,10 @@ echo Usage: config [OPTIONS] echo Creates a configuration file, which tells RosBE how to build the tree. echo. - echo delete - Deletes the created configuration file and so sets back - echo to default settings. - echo update - Deletes the old created configuration file and updates - echo it with a new, default one. + echo delete - Deletes the created configuration file and so sets back to default + echo settings. + echo update - Deletes the old created configuration file and updates it with a + echo new, default one. goto :EOC ) ) @@ -161,15 +196,14 @@ if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( if /i "%1" == "raddr2line" ( echo Usage: raddr2line [FILE] [ADDRESS] - echo Translates program addresses into file names and line numbers to - echo assist developers with finding specific bugs in ReactOS. If - echo either of the options is not given you will be prompted for it. - echo. - echo FILE - This can be either a fully specified path or just the - echo file name [you can use a partial name ie. ntdll*] of - echo the executable to be analyzed. When using just a file - echo the current directory and all sub-directories are - echo searched. + echo Translates program addresses into file names and line numbers to assist + echo developers with finding specific bugs in ReactOS. If either of the options + echo is not given you will be prompted for it. + echo. + echo FILE - This can be either a fully specified path or just the file name + echo [you can use a partial name ie. ntdll*] of the executable to be + echo analyzed. When using just a file the current directory and all + echo sub-directories are searched. echo ADDRESS - The address to be translated. echo. goto :EOC @@ -184,11 +218,11 @@ if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( if /i "%1" == "ssvn" ( echo Usage: ssvn [OPTIONS] - echo Creates, updates or cleans up your ReactOS source tree or shows the - echo revision number of the local and online trees. - echo. - echo update - Updates to HEAD revision or to a specific one when - echo second parameter specifies one. + echo Creates, updates or cleans up your ReactOS source tree or shows the revision + echo number of the local and online trees. + echo. + echo update - Updates to HEAD revision or to a specific one when the second + echo parameter specifies one. echo create - Creates a new ReactOS source tree. echo cleanup - Cleans up and fixes errors in the source tree. echo status - Show the current local and online revision numbers. @@ -198,7 +232,8 @@ if exist "%_ROSBE_BASEDIR%\options.cmd" ( if /i "%1" == "options" ( echo Usage: options - echo Starts the RosBE configurator. + echo Starts the RosBE configurator and sets the changes active in the current + echo RosBE session. goto :EOC ) )

16 years, 1 month

[janderwald] 37042: - Fix setting manual ip address

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Oct 28 10:53:01 2008 New Revision: 37042 URL: http://svn.reactos.org/svn/reactos?rev=37042&view=rev Log: - Fix setting manual ip address Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] Tue Oct 28 10:53:01 2008 @@ -14,6 +14,7 @@ <library>ole32</library> <library>user32</library> <library>comctl32</library> + <library>ws2_32</library> <file>netcfgx.c</file> <file>netcfgx.spec</file> <file>classfactory.c</file> Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Tue Oct 28 10:53:01 2008 @@ -3194,7 +3194,7 @@ //TODO // add multiple ip addresses when required - if (AddIPAddress(pCurrentConfig->Ip->IpAddress, pCurrentConfig->Ip->u.Subnetmask, pCurrentConfig->Index, &pCurrentConfig->Ip->NTEContext, &NTEInstance) == NO_ERROR) + if (AddIPAddress(htonl(pCurrentConfig->Ip->IpAddress), htonl(pCurrentConfig->Ip->u.Subnetmask), pCurrentConfig->Index, &pCurrentConfig->Ip->NTEContext, &NTEInstance) == NO_ERROR) { pStr = CreateMultiSzString(pCurrentConfig->Ip, IPADDR, &dwSize, FALSE); if(pStr)

16 years, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
52
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 October 2008