Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 34567: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) - Don't mess with cancelled IRPs - Don't attempt to cancel an already cancelled IRP - Unmap MDL when then IRP gets completed
by arty＠svn.reactos.org 17 Jul '08

17 Jul '08

Author: arty Date: Thu Jul 17 14:42:26 2008 New Revision: 34567 URL: http://svn.reactos.org/svn/reactos?rev=34567&view=rev Log: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) - Don't mess with cancelled IRPs - Don't attempt to cancel an already cancelled IRP - Unmap MDL when then IRP gets completed Modified: trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Thu Jul 17 14:42:26 2008 @@ -82,6 +82,7 @@ if ( Irp->Cancel ) { /* FIXME: is this anything else we need to do? */ + FCB->ListenIrp.InFlightRequest = NULL; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Thu Jul 17 14:42:26 2008 @@ -243,7 +243,9 @@ otherwise it may be completed by StreamSocketConnectComplete() before we return from SocketStateUnlock(). */ IoMarkIrpPending( Irp ); - SocketStateUnlock( FCB ); + SocketStateUnlock( FCB ); + if( ShouldUnlock ) + UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); } else { SocketStateUnlock( FCB ); Irp->IoStatus.Status = Status; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Thu Jul 17 14:42:26 2008 @@ -154,6 +154,7 @@ FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; NextIrp->IoStatus.Information = 0; if( NextIrp == Irp ) RetStatus = Status; + UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); FCB->Overread = TRUE; //FCB->PollState |= AFD_EVENT_DISCONNECT; @@ -197,6 +198,7 @@ NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = TotalBytesCopied; if( NextIrp == Irp ) RetStatus = Status; + UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } } @@ -224,6 +226,11 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); ASSERT_IRQL(APC_LEVEL); + + if (Irp->Cancel) { + FCB->ReceiveIrp.InFlightRequest = NULL; + return STATUS_SUCCESS; + } if( !SocketAcquireStateLock( FCB ) ) return Status; @@ -299,7 +306,7 @@ if( !RecvReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, - Irp, 0, NULL, FALSE ); + Irp, 0, NULL, TRUE ); } Irp->IoStatus.Status = STATUS_PENDING; @@ -440,6 +447,11 @@ UINT DGSize = Irp->IoStatus.Information + sizeof( AFD_STORED_DATAGRAM ); AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); + + if (Irp->Cancel) { + FCB->ReceiveIrp.InFlightRequest = NULL; + return STATUS_SUCCESS; + } if( !SocketAcquireStateLock( FCB ) ) return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Thu Jul 17 14:42:26 2008 @@ -40,6 +40,11 @@ ASSERT_IRQL(APC_LEVEL); + if (Irp->Cancel) { + FCB->ReceiveIrp.InFlightRequest = NULL; + return STATUS_SUCCESS; + } + if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->SendIrp.InFlightRequest = NULL; @@ -169,6 +174,11 @@ Irp->IoStatus.Status, Irp->IoStatus.Information)); + if (Irp->Cancel) { + FCB->ReceiveIrp.InFlightRequest = NULL; + return STATUS_SUCCESS; + } + /* It's ok if the FCB already died */ if( !SocketAcquireStateLock( FCB ) ) return STATUS_SUCCESS;

1 0

[jmorlan] 34566: Fix argument parsing for label command. It should not split the arguments by spaces; on Windows you can do 'label c:x y z' and it will set the label to X Y Z. (Bug 3530 #2)
by jmorlan＠svn.reactos.org 17 Jul '08

17 Jul '08

Author: jmorlan Date: Thu Jul 17 11:46:09 2008 New Revision: 34566 URL: http://svn.reactos.org/svn/reactos?rev=34566&view=rev Log: Fix argument parsing for label command. It should not split the arguments by spaces; on Windows you can do 'label c:x y z' and it will set the label to X Y Z. (Bug 3530 #2) Modified: trunk/reactos/base/shell/cmd/label.c Modified: trunk/reactos/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/label.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/label.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/label.c [iso-8859-1] Thu Jul 17 11:46:09 2008 @@ -29,11 +29,11 @@ TCHAR szLabel[80]; TCHAR szOldLabel[80]; DWORD dwSerialNr; - LPTSTR *arg; - INT args; /* set empty label string */ szLabel[0] = _T('\0'); + + nErrorLevel = 0; /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) @@ -42,55 +42,34 @@ return 0; } - nErrorLevel = 0; - /* get parameters */ - arg = split (param, &args, FALSE); - - if (args > 2) + if (param[0] != _T('\0') && param[1] == _T(':')) { - /* too many parameters */ - error_too_many_parameters (arg[args - 1]); - freep (arg); - nErrorLevel = 1; - return 1; + szRootPath[0] = toupper(*param); + param += 2; + while (_istspace(*param)) + param++; } - - if (args == 0) + else { /* get label of current drive */ TCHAR szCurPath[MAX_PATH]; GetCurrentDirectory (MAX_PATH, szCurPath); szRootPath[0] = szCurPath[0]; } - else - { - if ((_tcslen (arg[0]) >= 2) && (arg[0][1] == _T(':'))) - { - szRootPath[0] = toupper (*arg[0]); - if (args == 2) - _tcsncpy (szLabel, arg[1], 12); - } - else - { - TCHAR szCurPath[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, szCurPath); - szRootPath[0] = szCurPath[0]; - _tcsncpy (szLabel, arg[0], 12); - } - } + + _tcsncpy (szLabel, param, 12); /* check root path */ if (!IsValidPathName (szRootPath)) { error_invalid_drive (); - freep (arg); - nErrorLevel = 1; + nErrorLevel = 1; return 1; } GetVolumeInformation(szRootPath, szOldLabel, 80, &dwSerialNr, - NULL, NULL, NULL, 0); + NULL, NULL, NULL, 0); /* print drive info */ if (szOldLabel[0] != _T('\0')) @@ -110,7 +89,6 @@ if (szLabel[0] == _T('\0')) { - LoadString(CMD_ModuleHandle, STRING_LABEL_HELP5, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_LABEL_HELP5); ConInString(szLabel, 80); @@ -118,8 +96,6 @@ SetVolumeLabel(szRootPath, szLabel); - freep(arg); - return 0; }

1 0

[pschweitzer] 34565: Header update: - Added FsRtlIsFatDbcsLegal() - Code cleanup
by pschweitzer＠svn.reactos.org 17 Jul '08

17 Jul '08

Author: pschweitzer Date: Thu Jul 17 10:54:26 2008 New Revision: 34565 URL: http://svn.reactos.org/svn/reactos?rev=34565&view=rev Log: Header update: - Added FsRtlIsFatDbcsLegal() - Code cleanup Modified: branches/pierre-fsd/include/ddk/ntifs.h Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… ============================================================================== --- branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] Thu Jul 17 10:54:26 2008 @@ -2482,6 +2482,36 @@ #define FlagOn(x, f) ((x) & (f)) NTKERNELAPI +BOOLEAN +NTAPI +FsRtlAddBaseMcbEntry ( + IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG Lbn, + IN LONGLONG SectorCount +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlAddLargeMcbEntry ( + IN PLARGE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG Lbn, + IN LONGLONG SectorCount +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlAddMcbEntry ( + IN PMCB Mcb, + IN VBN Vbn, + IN LBN Lbn, + IN ULONG SectorCount +); + +NTKERNELAPI VOID NTAPI FsRtlAddToTunnelCache ( @@ -2545,8 +2575,8 @@ FsRtlAreNamesEqual ( IN PCUNICODE_STRING Name1, IN PCUNICODE_STRING Name2, - IN BOOLEAN IgnoreCase, - IN PCWCH UpcaseTable OPTIONAL + IN BOOLEAN IgnoreCase, + IN PCWCH UpcaseTable OPTIONAL ); #define FsRtlAreThereCurrentFileLocks(FL) ( \ @@ -2688,18 +2718,18 @@ VOID NTAPI FsRtlDissectDbcs ( - IN ANSI_STRING Name, - OUT PANSI_STRING FirstPart, - OUT PANSI_STRING RemainingPart + IN ANSI_STRING Name, + OUT PANSI_STRING FirstPart, + OUT PANSI_STRING RemainingPart ); NTKERNELAPI VOID NTAPI FsRtlDissectName ( - IN UNICODE_STRING Name, - OUT PUNICODE_STRING FirstPart, - OUT PUNICODE_STRING RemainingPart + IN UNICODE_STRING Name, + OUT PUNICODE_STRING FirstPart, + OUT PUNICODE_STRING RemainingPart ); NTKERNELAPI @@ -2823,6 +2853,17 @@ IN OUT PLARGE_INTEGER FileSize ); +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlGetNextBaseMcbEntry ( + IN PBASE_MCB Mcb, + IN ULONG RunIndex, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn, + OUT PLONGLONG SectorCount +); + /* FsRtlGetNextFileLock: @@ -2844,6 +2885,36 @@ ); NTKERNELAPI +BOOLEAN +NTAPI +FsRtlGetNextLargeMcbEntry ( + IN PLARGE_MCB Mcb, + IN ULONG RunIndex, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn, + OUT PLONGLONG SectorCount +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlGetNextMcbEntry ( + IN PMCB Mcb, + IN ULONG RunIndex, + OUT PVBN Vbn, + OUT PLBN Lbn, + OUT PULONG SectorCount +); + +NTKERNELAPI +VOID +NTAPI +FsRtlInitializeBaseMcb ( + IN PBASE_MCB Mcb, + IN POOL_TYPE PoolType +); + +NTKERNELAPI VOID NTAPI FsRtlInitializeFileLock ( @@ -2855,6 +2926,22 @@ NTKERNELAPI VOID NTAPI +FsRtlInitializeLargeMcb ( + IN PLARGE_MCB Mcb, + IN POOL_TYPE PoolType +); + +NTKERNELAPI +VOID +NTAPI +FsRtlInitializeMcb ( + IN PMCB Mcb, + IN POOL_TYPE PoolType +); + +NTKERNELAPI +VOID +NTAPI FsRtlInitializeOplock ( IN OUT POPLOCK Oplock ); @@ -2864,6 +2951,16 @@ NTAPI FsRtlInitializeTunnelCache ( IN PTUNNEL Cache +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlIsFatDbcsLegal ( + IN ANSI_STRING DbcsName, + IN BOOLEAN WildCardsPermissible, + IN BOOLEAN PathNamePermissible, + IN BOOLEAN LeadingBackslashPermissible ); NTKERNELAPI @@ -2902,6 +2999,90 @@ FALSE : \ FlagOn(FsRtlLegalAnsiCharacterArray[(C)], FSRTL_WILD_CHARACTER )) \ ) + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupBaseMcbEntry ( + IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + OUT PLONGLONG Lbn OPTIONAL, + OUT PLONGLONG SectorCountFromLbn OPTIONAL, + OUT PLONGLONG StartingLbn OPTIONAL, + OUT PLONGLONG SectorCountFromStartingLbn OPTIONAL, + OUT PULONG Index OPTIONAL +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLargeMcbEntry ( + IN PLARGE_MCB Mcb, + IN LONGLONG Vbn, + OUT PLONGLONG Lbn OPTIONAL, + OUT PLONGLONG SectorCountFromLbn OPTIONAL, + OUT PLONGLONG StartingLbn OPTIONAL, + OUT PLONGLONG SectorCountFromStartingLbn OPTIONAL, + OUT PULONG Index OPTIONAL +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLastBaseMcbEntry ( + IN PBASE_MCB Mcb, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLastLargeMcbEntry ( + IN PLARGE_MCB Mcb, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLastMcbEntry ( + IN PMCB Mcb, + OUT PVBN Vbn, + OUT PLBN Lbn +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLastBaseMcbEntryAndIndex ( + IN PBASE_MCB OpaqueMcb, + IN OUT PLONGLONG LargeVbn, + IN OUT PLONGLONG LargeLbn, + IN OUT PULONG Index +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLastLargeMcbEntryAndIndex ( + IN PLARGE_MCB OpaqueMcb, + OUT PLONGLONG LargeVbn, + OUT PLONGLONG LargeLbn, + OUT PULONG Index +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupMcbEntry ( + IN PMCB Mcb, + IN VBN Vbn, + OUT PLBN Lbn, + OUT PULONG SectorCount OPTIONAL, + OUT PULONG Index +); NTKERNELAPI BOOLEAN @@ -3070,6 +3251,27 @@ #endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI +ULONG +NTAPI +FsRtlNumberOfRunsInBaseMcb ( + IN PBASE_MCB Mcb +); + +NTKERNELAPI +ULONG +NTAPI +FsRtlNumberOfRunsInLargeMcb ( + IN PLARGE_MCB Mcb +); + +NTKERNELAPI +ULONG +NTAPI +FsRtlNumberOfRunsInMcb ( + IN PMCB Mcb +); + +NTKERNELAPI NTSTATUS NTAPI FsRtlOplockFsctrl ( @@ -3083,6 +3285,30 @@ NTAPI FsRtlOplockIsFastIoPossible ( IN POPLOCK Oplock +); + +NTKERNELAPI +VOID +NTAPI +FsRtlPostPagingFileStackOverflow ( + IN PVOID Context, + IN PKEVENT Event, + IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine +); + +typedef VOID +(NTAPI *PFSRTL_STACK_OVERFLOW_ROUTINE) ( + IN PVOID Context, + IN PKEVENT Event +); + +NTKERNELAPI +VOID +NTAPI +FsRtlPostStackOverflow ( + IN PVOID Context, + IN PKEVENT Event, + IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine ); /* @@ -3151,28 +3377,95 @@ IN BOOLEAN MailslotsSupported ); -typedef VOID -(NTAPI *PFSRTL_STACK_OVERFLOW_ROUTINE) ( - IN PVOID Context, - IN PKEVENT Event -); - -NTKERNELAPI -VOID -NTAPI -FsRtlPostStackOverflow ( - IN PVOID Context, - IN PKEVENT Event, - IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine -); - -NTKERNELAPI -VOID -NTAPI -FsRtlPostPagingFileStackOverflow ( - IN PVOID Context, - IN PKEVENT Event, - IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlRemoveBaseMcbEntry ( + IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG SectorCount +); + +NTKERNELAPI +VOID +NTAPI +FsRtlRemoveLargeMcbEntry ( + IN PLARGE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG SectorCount +); + +NTKERNELAPI +VOID +NTAPI +FsRtlRemoveMcbEntry ( + IN PMCB Mcb, + IN VBN Vbn, + IN ULONG SectorCount +); + +NTKERNELAPI +VOID +NTAPI +FsRtlResetBaseMcb ( + IN PBASE_MCB Mcb +); + +NTKERNELAPI +VOID +NTAPI +FsRtlResetLargeMcb ( + IN PLARGE_MCB Mcb, + IN BOOLEAN SelfSynchronized +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlSplitBaseMcb ( + IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG Amount +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlSplitLargeMcb ( + IN PLARGE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG Amount +); + +NTKERNELAPI +VOID +NTAPI +FsRtlTruncateBaseMcb ( + IN PBASE_MCB Mcb, + IN LONGLONG Vbn +); + +NTKERNELAPI +VOID +NTAPI +FsRtlTruncateLargeMcb ( + IN PLARGE_MCB Mcb, + IN LONGLONG Vbn +); + +NTKERNELAPI +VOID +NTAPI +FsRtlTruncateMcb ( + IN PMCB Mcb, + IN VBN Vbn +); + +NTKERNELAPI +VOID +NTAPI +FsRtlUninitializeBaseMcb ( + IN PBASE_MCB Mcb ); NTKERNELAPI @@ -3185,305 +3478,22 @@ NTKERNELAPI VOID NTAPI +FsRtlUninitializeLargeMcb ( + IN PLARGE_MCB Mcb +); + +NTKERNELAPI +VOID +NTAPI +FsRtlUninitializeMcb ( + IN PMCB Mcb +); + +NTKERNELAPI +VOID +NTAPI FsRtlUninitializeOplock ( IN OUT POPLOCK Oplock -); - -NTKERNELAPI -VOID -NTAPI -FsRtlInitializeLargeMcb ( - IN PLARGE_MCB Mcb, - IN POOL_TYPE PoolType -); - -NTKERNELAPI -VOID -NTAPI -FsRtlUninitializeLargeMcb ( - IN PLARGE_MCB Mcb -); - -NTKERNELAPI -VOID -NTAPI -FsRtlResetLargeMcb ( - IN PLARGE_MCB Mcb, - IN BOOLEAN SelfSynchronized -); - -NTKERNELAPI -VOID -NTAPI -FsRtlTruncateLargeMcb ( - IN PLARGE_MCB Mcb, - IN LONGLONG Vbn -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlAddLargeMcbEntry ( - IN PLARGE_MCB Mcb, - IN LONGLONG Vbn, - IN LONGLONG Lbn, - IN LONGLONG SectorCount -); - -NTKERNELAPI -VOID -NTAPI -FsRtlRemoveLargeMcbEntry ( - IN PLARGE_MCB Mcb, - IN LONGLONG Vbn, - IN LONGLONG SectorCount -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlLookupLargeMcbEntry ( - IN PLARGE_MCB Mcb, - IN LONGLONG Vbn, - OUT PLONGLONG Lbn OPTIONAL, - OUT PLONGLONG SectorCountFromLbn OPTIONAL, - OUT PLONGLONG StartingLbn OPTIONAL, - OUT PLONGLONG SectorCountFromStartingLbn OPTIONAL, - OUT PULONG Index OPTIONAL -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlLookupLastLargeMcbEntry ( - IN PLARGE_MCB Mcb, - OUT PLONGLONG Vbn, - OUT PLONGLONG Lbn -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlLookupLastLargeMcbEntryAndIndex ( - IN PLARGE_MCB OpaqueMcb, - OUT PLONGLONG LargeVbn, - OUT PLONGLONG LargeLbn, - OUT PULONG Index -); - -NTKERNELAPI -ULONG -NTAPI -FsRtlNumberOfRunsInLargeMcb ( - IN PLARGE_MCB Mcb -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlGetNextLargeMcbEntry ( - IN PLARGE_MCB Mcb, - IN ULONG RunIndex, - OUT PLONGLONG Vbn, - OUT PLONGLONG Lbn, - OUT PLONGLONG SectorCount -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlSplitLargeMcb ( - IN PLARGE_MCB Mcb, - IN LONGLONG Vbn, - IN LONGLONG Amount -); - -NTKERNELAPI -VOID -NTAPI -FsRtlInitializeBaseMcb ( - IN PBASE_MCB Mcb, - IN POOL_TYPE PoolType -); - -NTKERNELAPI -VOID -NTAPI -FsRtlUninitializeBaseMcb ( - IN PBASE_MCB Mcb -); - -NTKERNELAPI -VOID -NTAPI -FsRtlResetBaseMcb ( - IN PBASE_MCB Mcb -); - -NTKERNELAPI -VOID -NTAPI -FsRtlTruncateBaseMcb ( - IN PBASE_MCB Mcb, - IN LONGLONG Vbn -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlAddBaseMcbEntry ( - IN PBASE_MCB Mcb, - IN LONGLONG Vbn, - IN LONGLONG Lbn, - IN LONGLONG SectorCount -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlRemoveBaseMcbEntry ( - IN PBASE_MCB Mcb, - IN LONGLONG Vbn, - IN LONGLONG SectorCount -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlLookupBaseMcbEntry ( - IN PBASE_MCB Mcb, - IN LONGLONG Vbn, - OUT PLONGLONG Lbn OPTIONAL, - OUT PLONGLONG SectorCountFromLbn OPTIONAL, - OUT PLONGLONG StartingLbn OPTIONAL, - OUT PLONGLONG SectorCountFromStartingLbn OPTIONAL, - OUT PULONG Index OPTIONAL -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlLookupLastBaseMcbEntry ( - IN PBASE_MCB Mcb, - OUT PLONGLONG Vbn, - OUT PLONGLONG Lbn -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlLookupLastBaseMcbEntryAndIndex ( - IN PBASE_MCB OpaqueMcb, - IN OUT PLONGLONG LargeVbn, - IN OUT PLONGLONG LargeLbn, - IN OUT PULONG Index -); - -NTKERNELAPI -ULONG -NTAPI -FsRtlNumberOfRunsInBaseMcb ( - IN PBASE_MCB Mcb -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlGetNextBaseMcbEntry ( - IN PBASE_MCB Mcb, - IN ULONG RunIndex, - OUT PLONGLONG Vbn, - OUT PLONGLONG Lbn, - OUT PLONGLONG SectorCount -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlSplitBaseMcb ( - IN PBASE_MCB Mcb, - IN LONGLONG Vbn, - IN LONGLONG Amount -); - -NTKERNELAPI -VOID -NTAPI -FsRtlInitializeMcb ( - IN PMCB Mcb, - IN POOL_TYPE PoolType -); - -NTKERNELAPI -VOID -NTAPI -FsRtlUninitializeMcb ( - IN PMCB Mcb -); - -NTKERNELAPI -VOID -NTAPI -FsRtlTruncateMcb ( - IN PMCB Mcb, - IN VBN Vbn -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlAddMcbEntry ( - IN PMCB Mcb, - IN VBN Vbn, - IN LBN Lbn, - IN ULONG SectorCount -); - -NTKERNELAPI -VOID -NTAPI -FsRtlRemoveMcbEntry ( - IN PMCB Mcb, - IN VBN Vbn, - IN ULONG SectorCount -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlLookupMcbEntry ( - IN PMCB Mcb, - IN VBN Vbn, - OUT PLBN Lbn, - OUT PULONG SectorCount OPTIONAL, - OUT PULONG Index -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlLookupLastMcbEntry ( - IN PMCB Mcb, - OUT PVBN Vbn, - OUT PLBN Lbn -); - -NTKERNELAPI -ULONG -NTAPI -FsRtlNumberOfRunsInMcb ( - IN PMCB Mcb -); - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlGetNextMcbEntry ( - IN PMCB Mcb, - IN ULONG RunIndex, - OUT PVBN Vbn, - OUT PLBN Lbn, - OUT PULONG SectorCount ); NTHALAPI

1 0

[sginsberg] 34564: - Patch by Cameron Gutman aicommander <at> gmail <dot> com - Don't release the device spinlock twice if KeSynchronizeExecution returns false See issue #3520 for more details.
by sginsberg＠svn.reactos.org 17 Jul '08

17 Jul '08

Author: sginsberg Date: Thu Jul 17 09:43:36 2008 New Revision: 34564 URL: http://svn.reactos.org/svn/reactos?rev=34564&view=rev Log: - Patch by Cameron Gutman aicommander <at> gmail <dot> com - Don't release the device spinlock twice if KeSynchronizeExecution returns false See issue #3520 for more details. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Thu Jul 17 09:43:36 2008 @@ -2894,8 +2894,12 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); } - - KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); + else + { + /* Release the spinlock only */ + KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); + } + DPRINT("ScsiPortStartIo() done\n"); }

1 0

[pschweitzer] 34563: Fixed bugs in FsRtlIsFatDbcsLegal
by pschweitzer＠svn.reactos.org 17 Jul '08

17 Jul '08

Author: pschweitzer Date: Thu Jul 17 07:41:20 2008 New Revision: 34563 URL: http://svn.reactos.org/svn/reactos?rev=34563&view=rev Log: Fixed bugs in FsRtlIsFatDbcsLegal Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/dbcsn… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Thu Jul 17 07:41:20 2008 @@ -217,10 +217,10 @@ return FALSE; /* Now, only work on filename */ - if (LastSlash) + if (LastSlash || FirstSlash) { FileName.Buffer = DbcsName.Buffer + LastSlash + 1; - FileName.Length = (DbcsName.Length - LastSlash) * sizeof(CHAR); + FileName.Length = (DbcsName.Length - LastSlash - 1) * sizeof(CHAR); FileName.MaximumLength = DbcsName.MaximumLength - FileName.Length; }

1 0

[sginsberg] 34562: -PCHify OpenGL32
by sginsberg＠svn.reactos.org 17 Jul '08

17 Jul '08

Author: sginsberg Date: Thu Jul 17 06:37:49 2008 New Revision: 34562 URL: http://svn.reactos.org/svn/reactos?rev=34562&view=rev Log: -PCHify OpenGL32 Removed: trunk/reactos/dll/win32/opengl32/teb.h Modified: trunk/reactos/dll/win32/opengl32/gl.c trunk/reactos/dll/win32/opengl32/opengl32.c trunk/reactos/dll/win32/opengl32/opengl32.h trunk/reactos/dll/win32/opengl32/opengl32.rbuild trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/gl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/gl.c?re… ============================================================================== --- trunk/reactos/dll/win32/opengl32/gl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/gl.c [iso-8859-1] Thu Jul 17 06:37:49 2008 @@ -19,15 +19,10 @@ * * On other machines we use C to forward the calls (slow...) */ - -#define WIN32_LEANER_AND_MEANER -#define WIN32_NO_STATUS -#include <windows.h> -#include "teb.h" + +#include "opengl32.h" C_ASSERT(FIELD_OFFSET(TEB, glTable) == 0xbe8); - -#include "opengl32.h" int STDCALL glEmptyFunc0() { return 0; } int STDCALL glEmptyFunc4( long l1 ) { return 0; } Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] Thu Jul 17 06:37:49 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/opengl32/opengl32.c @@ -9,15 +8,7 @@ * Feb 1, 2004: Created */ -#define WIN32_LEAN_AND_MEAN -#define WIN32_NO_STATUS -#include <windows.h> -#include <winreg.h> -#include "teb.h" - -#include <string.h> #include "opengl32.h" - /* function prototypes */ static void OPENGL32_AppendICD( GLDRIVERDATA *icd ); Modified: trunk/reactos/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] Thu Jul 17 06:37:49 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/opengl32/opengl32.h @@ -28,6 +27,22 @@ #define OPENGL_DRIVERS_SUBKEY L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers" #define OPENGL_DRIVERS_SUBKEY2 L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers\\" + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS +#include <windows.h> + +#include <winreg.h> + +#define NTOS_MODE_USER +#include <ddraw.h> +#include <ddrawi.h> +#include <winddi.h> +#include <ndk/ntndk.h> /* gl function list */ #include "glfuncs.h" Modified: trunk/reactos/dll/win32/opengl32/opengl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] Thu Jul 17 06:37:49 2008 @@ -6,6 +6,7 @@ <library>gdi32</library> <library>user32</library> <library>advapi32</library> + <pch>opengl32.h</pch> <file>gl.c</file> <file>opengl32.c</file> <file>wgl.c</file> Removed: trunk/reactos/dll/win32/opengl32/teb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/teb.h?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/teb.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/teb.h (removed) @@ -1,5 +1,0 @@ -// teb.h - -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] Thu Jul 17 06:37:49 2008 @@ -7,21 +7,6 @@ * UPDATE HISTORY: * Feb 2, 2004: Created */ - -#define WIN32_LEAN_AND_MEAN -#define WIN32_NO_STATUS -#include <windows.h> - -#define NTOS_MODE_USER -#include <ddraw.h> -#include <ddrawi.h> -#include <winddi.h> - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "teb.h" #define OPENGL32_GL_FUNC_PROTOTYPES #include "opengl32.h"

1 0

[pschweitzer] 34561: - Implemented FsRtlDissectDbcs, FsRtlIsFatDbcsLegal - Updated comments
by pschweitzer＠svn.reactos.org 17 Jul '08

17 Jul '08

Author: pschweitzer Date: Thu Jul 17 04:57:23 2008 New Revision: 34561 URL: http://svn.reactos.org/svn/reactos?rev=34561&view=rev Log: - Implemented FsRtlDissectDbcs, FsRtlIsFatDbcsLegal - Updated comments Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/dbcsn… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Thu Jul 17 04:57:23 2008 @@ -45,19 +45,58 @@ OUT PANSI_STRING FirstPart, OUT PANSI_STRING RemainingPart) { - KEBUGCHECK(0); + ULONG FirstPosition, i; + ULONG SkipFirstSlash = 0; + + /* Just quit if the string is empty */ + if (!Name.Length) return; + + /* Find first backslash */ + FirstPosition = Name.Length / sizeof(CHAR) ; + for (i = 0; i < Name.Length / sizeof(CHAR); i++) + { + /* If we found one... */ + if (Name.Buffer[i] == '\\') + { + /* If it begins string, just notice it and continue */ + if (i == 0) + { + SkipFirstSlash = 1; + } + else + { + /* Else, save its position and break out of the loop */ + FirstPosition = i; + break; + } + } + } + + /* Set up the first result string */ + FirstPart->Buffer = Name.Buffer + SkipFirstSlash; + FirstPart->Length = (FirstPosition - SkipFirstSlash) * sizeof(CHAR); + FirstPart->MaximumLength = Name.MaximumLength - FirstPart->Length; + + /* And second one, if necessary */ + if (FirstPosition < (Name.Length / sizeof(CHAR))) + { + RemainingPart->Buffer = Name.Buffer + FirstPosition + 1; + RemainingPart->Length = (Name.Length - FirstPosition) * sizeof(CHAR); + RemainingPart->MaximumLength = Name.MaximumLength - RemainingPart->Length; + } } /*++ * @name FsRtlDoesDbcsContainWildCards * @implemented * - * FILLME + * Returns TRUE if the given DbcsName contains wildcards such as *, ?, + * ANSI_DOS_STAR, ANSI_DOS_DOT, and ANSI_DOS_QM * * @param Name - * FILLME - * - * @return None + * The Name to check + * + * @return TRUE if there are wildcards, FALSE otherwise * * @remarks None * @@ -115,21 +154,24 @@ /*++ * @name FsRtlIsFatDbcsLegal - * @unimplemented - * - * FILLME + * @implemented + * + * Returns TRUE if the given DbcsName is a valid FAT filename (in 8.3) * * @param DbcsName - * FILLME + * The filename to check. It can also contains pathname. * * @param WildCardsPermissible - * FILLME + * If this is set to FALSE and if filename contains wildcard, the function + * will fail * * @param PathNamePermissible - * FILLME + * If this is set to FALSE and if the filename comes with a pathname, the + * function will fail * * @param LeadingBackslashPermissible - * FILLME + * If this is set to FALSE and if the filename starts with a backslash, the + * function will fail * * @return TRUE if the DbcsName is legal, FALSE otherwise * @@ -143,8 +185,98 @@ IN BOOLEAN PathNamePermissible, IN BOOLEAN LeadingBackslashPermissible) { - KEBUGCHECK(0); - return FALSE; + BOOLEAN FirstSlash = FALSE, IsIllegal = FALSE; + ULONG i, LastSlash = 0, LastDot = 0; + ANSI_STRING FileName; + + /* Just quit if the string is empty */ + if (!DbcsName.Length) + return FALSE; + + /* Check if we have a filename and a pathname + * Continue until we get the last one to extract the filename + */ + for (i = 0; i < DbcsName.Length / sizeof(CHAR); i++) + { + if (DbcsName.Buffer[i] == '\\') + { + LastSlash = i; + if (!i) + { + FirstSlash = TRUE; + } + } + } + + /* DbcsName was to be a filename */ + if (!PathNamePermissible && LastSlash) + return FALSE; + + /* DbcsName wasn't supposed to be started with \ if it's a filename */ + if (!LeadingBackslashPermissible && !LastSlash && FirstSlash) + return FALSE; + + /* Now, only work on filename */ + if (LastSlash) + { + FileName.Buffer = DbcsName.Buffer + LastSlash + 1; + FileName.Length = (DbcsName.Length - LastSlash) * sizeof(CHAR); + FileName.MaximumLength = DbcsName.MaximumLength - FileName.Length; + + } + else + { + FileName.Buffer = DbcsName.Buffer; + FileName.Length = DbcsName.Length; + FileName.MaximumLength = DbcsName.MaximumLength; + } + + /* Filename must be 8.3 filename */ + if (FileName.Length < 3 || FileName.Length > 12) + return FALSE; + + if (!WildCardsPermissible && FsRtlDoesDbcsContainWildCards(&FileName)) + return FALSE; + + /* Now, we will parse the filename to find everything bad in + * It mustn't contain: + * 0x00-0x1F, 0x22, 0x2B, 0x2C, 0x2F, 0x3A, 0x3B, 0x3D, 0x5B, 0x5D, 0x7C */ + for (i = 0; i < FileName.Length / sizeof(CHAR); i++) + { + if ((FileName.Buffer[i] < 0x1F) || (FileName.Buffer[i] == 0x22) || + (FileName.Buffer[i] == 0x2B) || (FileName.Buffer[i] == 0x2C) || + (FileName.Buffer[i] == 0x2F) || (FileName.Buffer[i] == 0x3A) || + (FileName.Buffer[i] == 0x3B) || (FileName.Buffer[i] == 0x3D) || + (FileName.Buffer[i] == 0x5B) || (FileName.Buffer[i] == 0x5D) || + (FileName.Buffer[i] == 0x7C)) + { + IsIllegal = TRUE; + break; + } + if (FileName.Buffer[i] == '.') + { + LastDot = i; + if (!i) + { + IsIllegal = TRUE; + break; + } + } + } + if (IsIllegal || LastDot == (FileName.Length / sizeof(CHAR)) - 1) + return FALSE; + + /* We mustn't have spaces before dot or at the end of the filename */ + if ((LastDot && FileName.Buffer[LastDot - 1] == ' ') || + (FileName.Buffer[FileName.Length / sizeof(CHAR) - 1] == ' ')) + return FALSE; + + /* Filename must be 8.3 filename and not 3.8 filename */ + if (LastDot && ((FileName.Length / sizeof(CHAR) - 1) - LastDot > 3)) + return FALSE; + + /* We have a valid filename */ + return TRUE; } /*++

1 0

[cwittich] 34560: fix for getaddrinfo patch by Yuri Sidorov <jura at cp-lab dot com>
by cwittich＠svn.reactos.org 17 Jul '08

17 Jul '08

Author: cwittich Date: Thu Jul 17 03:07:37 2008 New Revision: 34560 URL: http://svn.reactos.org/svn/reactos?rev=34560&view=rev Log: fix for getaddrinfo patch by Yuri Sidorov <jura at cp-lab dot com> Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Thu Jul 17 03:07:37 2008 @@ -1427,7 +1427,9 @@ return WSAHOST_NOT_FOUND; port = se->s_port; } - + else + port = htons(port); + if (nodename) { /* Is it an IPv6 address? */

1 0

[jmorlan] 34559: - CsrReleaseObject: Fix locking to prevent possibility of closing the same handle twice. - GuiConsolePaint: Clip the paint area to the screen buffer, to stop heap corruption if the window gets oversized. - ConioDeleteConsole: Do decrement the active screen buffer's refcount, but only after calling ConioCleanupConsole to destroy the window. - Remove Win32CsrInsertObject. This function did two unrelated things (initialize lock and create handle), but in the only place it was used
by jmorlan＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: jmorlan Date: Wed Jul 16 18:16:40 2008 New Revision: 34559 URL: http://svn.reactos.org/svn/reactos?rev=34559&view=rev Log: - CsrReleaseObject: Fix locking to prevent possibility of closing the same handle twice. - GuiConsolePaint: Clip the paint area to the screen buffer, to stop heap corruption if the window gets oversized. - ConioDeleteConsole: Do decrement the active screen buffer's refcount, but only after calling ConioCleanupConsole to destroy the window. - Remove Win32CsrInsertObject. This function did two unrelated things (initialize lock and create handle), but in the only place it was used (CsrCreateScreenBuffer) the lock had already been initialized in CsrInitConsoleScreenBuffer, so this use was erroneous. - Rename Win32CsrInsertObject2 (creates handle only) to Win32CsrInsertObject. Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Wed Jul 16 18:16:40 2008 @@ -115,23 +115,23 @@ HANDLE Handle) { ULONG h = (((ULONG)Handle) >> 2) - 1; - NTSTATUS Status; + Object_t *Object; if (ProcessData == NULL) { return STATUS_INVALID_PARAMETER; } - if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize || ProcessData->HandleTable[h] == NULL) - { + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize + || (Object = ProcessData->HandleTable[h]) == NULL) + { + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_INVALID_HANDLE; } - - Status = CsrReleaseObjectByPointer(ProcessData->HandleTable[h]); - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - ProcessData->HandleTable[h] = 0; + ProcessData->HandleTable[h] = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return Status; + + return CsrReleaseObjectByPointer(Object); } NTSTATUS STDCALL CsrInsertObject( PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object ) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Wed Jul 16 18:16:40 2008 @@ -12,9 +12,6 @@ #define NDEBUG #include <debug.h> - -extern NTSTATUS FASTCALL -Win32CsrInsertObject2(PCSRSS_PROCESS_DATA, PHANDLE, Object_t *); /* GLOBALS *******************************************************************/ @@ -315,9 +312,9 @@ if (NewConsole || !ProcessData->bInheritHandles) { /* Insert the Objects */ - Status = Win32CsrInsertObject2(ProcessData, - &Request->Data.AllocConsoleRequest.InputHandle, - &Console->Header); + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.InputHandle, + &Console->Header); if (! NT_SUCCESS(Status)) { DPRINT1("Failed to insert object\n"); @@ -326,9 +323,9 @@ return Request->Status = Status; } - Status = Win32CsrInsertObject2(ProcessData, - &Request->Data.AllocConsoleRequest.OutputHandle, - &Console->ActiveBuffer->Header); + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.OutputHandle, + &Console->ActiveBuffer->Header); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert object\n"); @@ -984,16 +981,14 @@ HeapFree(Win32CsrApiHeap, 0, Event); } -#if 0 // FIXME + ConioCleanupConsole(Console); if (0 == InterlockedDecrement(&Console->ActiveBuffer->Header.ReferenceCount)) { ConioDeleteScreenBuffer((Object_t *) Console->ActiveBuffer); } -#endif Console->ActiveBuffer = NULL; Console->hActiveBuffer = INVALID_HANDLE_VALUE; - ConioCleanupConsole(Console); CloseHandle(Console->ActiveEvent); DeleteCriticalSection(&Console->Header.Lock); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Wed Jul 16 18:16:40 2008 @@ -95,16 +95,6 @@ NTSTATUS FASTCALL Win32CsrInsertObject(PCSRSS_PROCESS_DATA ProcessData, - PHANDLE Handle, - Object_t *Object) -{ - InitializeCriticalSection(&(Object->Lock)); - - return (CsrExports.CsrInsertObjectProc)(ProcessData, Handle, Object); -} - -NTSTATUS FASTCALL -Win32CsrInsertObject2(PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object) { Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Wed Jul 16 18:16:40 2008 @@ -886,6 +886,9 @@ SetBkColor(hDC, GuiConsoleRGBFromAttribute(GuiData, LastAttribute >> 4)); EnterCriticalSection(&Buff->Header.Lock); + + if (BottomLine >= Buff->MaxY) BottomLine = Buff->MaxY - 1; + if (RightChar >= Buff->MaxX) RightChar = Buff->MaxX - 1; OldFont = SelectObject(hDC, GuiData->Font);

1 0

[cfinck] 34558: Commit my test suite I used for verifying the behaviours of wctomb, wcstombs and WideCharToMultiByte and writing the reimplementations for ReactOS on request of Stefan
by cfinck＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: cfinck Date: Wed Jul 16 17:08:58 2008 New Revision: 34558 URL: http://svn.reactos.org/svn/reactos?rev=34558&view=rev Log: Commit my test suite I used for verifying the behaviours of wctomb, wcstombs and WideCharToMultiByte and writing the reimplementations for ReactOS on request of Stefan Added: trunk/rostests/tests/wcstombs-tests/ trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c (with props) trunk/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild (with props) Modified: trunk/rostests/tests/directory.rbuild Modified: trunk/rostests/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/directory.rbuild?re… ============================================================================== --- trunk/rostests/tests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/directory.rbuild [iso-8859-1] Wed Jul 16 17:08:58 2008 @@ -267,6 +267,9 @@ <directory name="wclickat"> <xi:include href="wclickat/wclickat.rbuild" /> </directory> + <directory name="wcstombs-tests"> + <xi:include href="wcstombs-tests/wcstombs-tests.rbuild" /> + </directory> <directory name="winhello"> <xi:include href="winhello/winhello.rbuild" /> </directory> Added: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/wcstombs-tests/wcst… ============================================================================== --- trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c (added) +++ trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c [iso-8859-1] Wed Jul 16 17:08:58 2008 @@ -1,0 +1,336 @@ +/* + * PROJECT: ReactOS wcstombs Test Suite + * LICENSE: GPL v2 or any later version + * FILE: tests/wcstombs-tests/wcstombs-tests.c + * PURPOSE: Application for testing the CRT API's (wcstombs and wctomb) and the Win32 API WideCharToMultiByte for the Unicode to MultiByte string conversion + * COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + */ + +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> +#include <locale.h> +#include <errno.h> + +/* Macros for simplification */ +#define SETLOCALE(locale) \ + loc = setlocale(LC_ALL, locale); \ + if(!loc) \ + { \ + puts("setlocale failed for " locale ", this locale is probably not installed on your system"); \ + return; \ + } + +#define OK(condition, fail_message, ...) \ + if(!(condition)) \ + printf("%d: " fail_message "\n", __LINE__, ##__VA_ARGS__); + +/* Global variables for easier handling */ +char mbc; +char mbs[5]; +int ret; +wchar_t wc1 = 228; /* Western Windows-1252 character */ +wchar_t wc2 = 1088; /* Russian Windows-1251 character not displayable for Windows-1252 */ +wchar_t wcs[5] = {'T', 'h', 1088, 'i', 0}; /* String with ASCII characters and a Russian character */ +wchar_t dbwcs[3] = {28953, 25152, 0}; /* String with Chinese (codepage 950) characters */ + + +void CRT_Tests() +{ + char* loc; + + puts("CRT-Tests"); + puts("---------"); + + /* Current locale is "C", wcstombs should return the length of the input buffer without the terminating null character */ + ret = wcstombs(NULL, dbwcs, 0); + OK(ret == 2, "ret is %d", ret); + + ret = wcstombs(mbs, dbwcs, ret); + OK(ret == -1, "ret is %d", ret); + OK(mbs[0] == 0, "mbs[0] is %d", mbs[0]); + OK(errno == EILSEQ, "errno is %d", errno); + + ret = wcstombs(NULL, wcs, 0); + OK(ret == 4, "ret is %d", ret); + + ret = wcstombs(mbs, wcs, ret); + OK(ret == -1, "ret is %d", ret); + OK(!strcmp(mbs, "Th"), "mbs is %s", mbs); + OK(errno == EILSEQ, "errno is %d", errno); + + ret = wctomb(&mbc, wcs[0]); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 84, "mbc is %d", mbc); + + mbc = 84; + ret = wcstombs(&mbc, &dbwcs[0], 1); + OK(ret == -1, "ret is %d", ret); + OK(mbc == 84, "mbc is %d", mbc); + + ret = wcstombs(mbs, wcs, 0); + OK(ret == 0, "ret is %d", ret); + + /* The length for the null character (in any locale) is 0, but if you pass a variable, it will be set to 0 and wctomb returns 1 */ + ret = wctomb(NULL, 0); + OK(ret == 0, "ret is %d", ret); + + ret = wctomb(&mbc, 0); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 0, "mbc is %d", mbc); + + /* msvcr80.dll changes mbc in the following call back to 0, msvcrt.dll from WinXP SP2 leaves it untouched */ + mbc = 84; + ret = wctomb(&mbc, dbwcs[0]); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + OK(mbc == 84, "mbc is %d", mbc); + + /* With a real locale, -1 also becomes a possible return value in case of an invalid character */ + SETLOCALE("German"); + ret = wcstombs(NULL, dbwcs, 0); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + + ret = wcstombs(NULL, wcs, 2); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + + /* Test if explicitly setting the locale back to "C" also leads to the same results as above */ + SETLOCALE("C"); + + ret = wcstombs(NULL, dbwcs, 0); + OK(ret == 2, "ret is %d", ret); + + ret = wcstombs(NULL, wcs, 0); + OK(ret == 4, "ret is %d", ret); + + /* Test wctomb() as well */ + SETLOCALE("English"); + + ret = wctomb(&mbc, wc1); + OK(ret == 1, "ret is %d", ret); + OK(mbc == -28, "mbc is %d", mbc); + + ret = wctomb(&mbc, wc2); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + OK(mbc == 63, "mbc is %d", mbc); + + SETLOCALE("Russian"); + + ret = wcstombs(mbs, wcs, sizeof(mbs)); + OK(ret == 4, "ret is %d", ret); + OK(!strcmp(mbs, "Thði"), "mbs is %s", mbs); + + ret = wctomb(&mbc, wc2); + OK(ret == 1, "ret is %d", ret); + OK(mbc == -16, "mbc is %d", mbc); + + ret = wctomb(&mbc, wc1); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 97, "mbc is %d", mbc); + + SETLOCALE("English"); + + ret = wcstombs(&mbc, wcs, 1); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 84, "mbc is %d", mbc); + + ZeroMemory(mbs, sizeof(mbs)); + ret = wcstombs(mbs, wcs, sizeof(mbs)); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); + mbs[0] = 0; + + /* wcstombs mustn't add any null character automatically. + So in this case, we should get the same string again, even if we only copied the first three bytes. */ + ret = wcstombs(mbs, wcs, 3); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); + ZeroMemory(mbs, 5); + + /* Now this shouldn't be the case like above as we zeroed the complete string buffer. */ + ret = wcstombs(mbs, wcs, 3); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + OK(!strcmp(mbs, "Th?"), "mbs is %s", mbs); + + /* Double-byte tests */ + SETLOCALE("Chinese"); + ret = wcstombs(mbs, dbwcs, sizeof(mbs)); + OK(ret == 4, "ret is %d", ret); + OK(!strcmp(mbs, "µH©Ò"), "mbs is %s", mbs); + ZeroMemory(mbs, 5); + + /* Length-only tests */ + SETLOCALE("English"); + ret = wcstombs(NULL, wcs, 0); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + + SETLOCALE("Chinese"); + ret = wcstombs(NULL, dbwcs, 0); + OK(ret == 4, "ret is %d", ret); + + /* This call causes an ERROR_INSUFFICIENT_BUFFER in the called WideCharToMultiByte function. + For some reason, wcstombs under Windows doesn't reset the last error to the previous value here, so we can check for ERROR_INSUFFICIENT_BUFFER with GetLastError(). + This could also be seen as an indication that Windows uses WideCharToMultiByte internally for wcstombs. */ + ret = wcstombs(mbs, dbwcs, 1); + OK(ret == 0, "ret is %d", ret); + OK(mbs[0] == 0, "mbs[0] is %d", mbs[0]); + + /* ERROR_INSUFFICIENT_BUFFER is also the result of this call with SBCS characters. WTF?! + Anyway this is a Win32 error not related to the CRT, so we leave out this criteria. */ + ret = wcstombs(mbs, wcs, 1); + OK(ret == 1, "ret is %d", ret); + OK(mbs[0] == 84, "mbs[0] is %d", mbs[0]); + + putchar('\n'); +} + +void Win32_Tests(LPBOOL bUsedDefaultChar) +{ + /*int i;*/ + + SetLastError(0xdeadbeef); + + puts("Win32-Tests"); + puts("-----------"); + + ret = WideCharToMultiByte(1252, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == -28, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1252, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 63, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1251, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == -16, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1251, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 97, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + /* This call triggers the last Win32 error */ + ret = WideCharToMultiByte(1252, 0, wcs, -1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + OK(mbc == 84, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() is %lu", GetLastError()); + SetLastError(0xdeadbeef); + + ret = WideCharToMultiByte(1252, 0, wcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + mbs[0] = 0; + + /* WideCharToMultiByte mustn't add any null character automatically. + So in this case, we should get the same string again, even if we only copied the first three bytes. */ + ret = WideCharToMultiByte(1252, 0, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 3, "ret is %d", ret); + OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + ZeroMemory(mbs, 5); + + /* Now this shouldn't be the case like above as we zeroed the complete string buffer. */ + ret = WideCharToMultiByte(1252, 0, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 3, "ret is %d", ret); + OK(!strcmp(mbs, "Th?"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + /* Double-byte tests */ + ret = WideCharToMultiByte(950, 0, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + OK(!strcmp(mbs, "µH©Ò"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(950, 0, dbwcs, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar == FALSE"); + OK(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() is %lu", GetLastError()); + SetLastError(0xdeadbeef); + ZeroMemory(mbs, 5); + + ret = WideCharToMultiByte(950, 0, dbwcs, 1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 2, "ret is %d", ret); + OK(!strcmp(mbs, "µH"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + /* Length-only tests */ + ret = WideCharToMultiByte(1252, 0, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1252, 0, wcs, -1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(950, 0, dbwcs, 1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 2, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(950, 0, dbwcs, -1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + /* Abnormal uses of WideCharToMultiByte */ + ret = WideCharToMultiByte(1252, 0, NULL, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); + SetLastError(0xdeadbeef); + + ret = WideCharToMultiByte(0, 0, dbwcs, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + OK(!strcmp(mbs, "??"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + + ret = WideCharToMultiByte(1252, 0, wcs, -1, (LPSTR)wcs, 5, NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); + SetLastError(0xdeadbeef); + + ret = WideCharToMultiByte(1252, 0, wcs, -1, mbs, -1, NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); + SetLastError(0xdeadbeef); + + putchar('\n'); +} + +int main() +{ + BOOL UsedDefaultChar; + + CRT_Tests(); + + /* There are two code pathes in WideCharToMultiByte, one when Flags || DefaultChar || UsedDefaultChar is set and one when it's not. + Test both here. */ + Win32_Tests(NULL); + Win32_Tests(&UsedDefaultChar); + + return 0; +} Propchange: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/wcstombs-tests/wcst… ============================================================================== --- trunk/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild (added) +++ trunk/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild [iso-8859-1] Wed Jul 16 17:08:58 2008 @@ -1,0 +1,4 @@ +<module name="wcstombs-tests" type="win32cui" installbase="bin" installname="wcstombs-tests.exe"> + <library>kernel32</library> + <file>wcstombs-tests.c</file> +</module> Propchange: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs