Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 37266: - Fix the parameter check - Now AfdGetSockOrPeerName should work with Local == FALSE - "MSAFD: STATUS_INVALID_PARAMETER" shouldn't fill the debug log anymore when AfdGetSockOrPeerName gets called with Local == FALSE
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 11:39:55 2008 New Revision: 37266 URL: http://svn.reactos.org/svn/reactos?rev=37266&view=rev Log: - Fix the parameter check - Now AfdGetSockOrPeerName should work with Local == FALSE - "MSAFD: STATUS_INVALID_PARAMETER" shouldn't fill the debug log anymore when AfdGetSockOrPeerName gets called with Local == FALSE Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Sun Nov 9 11:39:55 2008 @@ -83,11 +83,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( FCB->AddressFile.Object == NULL) { - return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, - NULL ); - } - Mdl = IoAllocateMdl ( Irp->UserBuffer, IrpSp->Parameters.DeviceIoControl.OutputBufferLength, @@ -105,11 +100,21 @@ if( NT_SUCCESS(Status) ) { if( Local ) { + if( FCB->AddressFile.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } + Status = TdiQueryInformation ( FCB->AddressFile.Object, TDI_QUERY_ADDRESS_INFO, Mdl ); } else { + if( FCB->Connection.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } + if( NT_SUCCESS ( Status = TdiBuildNullConnectionInfo ( &ConnInfo,

1 0

[cgutman] 37265: - Don't complete unimplemented IOCTL_DISK_FORMAT_TRACKS/IOCTL_DISK_FORMAT_TRACKS_EX with STATUS_SUCCESS - Floppy drivers don't need to support IOCTL_DISK_GET_PARTITION_INFO so complete the irp with STATUS_INVALID_DEVICE_REQUEST
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 10:15:50 2008 New Revision: 37265 URL: http://svn.reactos.org/svn/reactos?rev=37265&view=rev Log: - Don't complete unimplemented IOCTL_DISK_FORMAT_TRACKS/IOCTL_DISK_FORMAT_TRACKS_EX with STATUS_SUCCESS - Floppy drivers don't need to support IOCTL_DISK_GET_PARTITION_INFO so complete the irp with STATUS_INVALID_DEVICE_REQUEST Modified: trunk/reactos/drivers/storage/floppy/ioctl.c Modified: trunk/reactos/drivers/storage/floppy/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/ioc… ============================================================================== --- trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] Sun Nov 9 10:15:50 2008 @@ -250,11 +250,13 @@ case IOCTL_DISK_FORMAT_TRACKS: case IOCTL_DISK_FORMAT_TRACKS_EX: ERR_(FLOPPY, "Format called; not supported yet\n"); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; break; case IOCTL_DISK_GET_PARTITION_INFO: - INFO_(FLOPPY, "IOCTL_DISK_GET_PARTITION_INFO Called; not supported\n"); - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + INFO_(FLOPPY, "IOCTL_DISK_GET_PARTITION_INFO Called; not supported by a floppy driver\n"); + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; Irp->IoStatus.Information = 0; break;

1 0

[cgutman] 37264: - Remove the work item from the work queue in ChewRemove
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 09:55:55 2008 New Revision: 37264 URL: http://svn.reactos.org/svn/reactos?rev=37264&view=rev Log: - Remove the work item from the work queue in ChewRemove Modified: trunk/reactos/lib/drivers/chew/workqueue.c Modified: trunk/reactos/lib/drivers/chew/workqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/chew/workqueue… ============================================================================== --- trunk/reactos/lib/drivers/chew/workqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/chew/workqueue.c [iso-8859-1] Sun Nov 9 09:55:55 2008 @@ -101,6 +101,7 @@ VOID ChewRemove( PVOID Item ) { PWORK_ITEM WorkItem = Item; + RemoveEntryList( &WorkItem->Entry ); IoFreeWorkItem( WorkItem->WorkItem ); ExFreePool( WorkItem ); }

1 0

[pschweitzer] 37263: Fix pierre-fsd branch (and cdfs.sys): FsRtlIsNameInExpression needs Expression to be uppercase if IgnoreCase is set to TRUE
by pschweitzer＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: pschweitzer Date: Sun Nov 9 09:55:13 2008 New Revision: 37263 URL: http://svn.reactos.org/svn/reactos?rev=37263&view=rev Log: Fix pierre-fsd branch (and cdfs.sys): FsRtlIsNameInExpression needs Expression to be uppercase if IgnoreCase is set to TRUE Modified: branches/pierre-fsd/drivers/filesystems/cdfs/dirctl.c branches/pierre-fsd/drivers/filesystems/cdfs/fcb.c 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] Sun Nov 9 09:55:13 2008 @@ -166,6 +166,7 @@ UNICODE_STRING TempString; UNICODE_STRING ShortName; UNICODE_STRING LongName; + UNICODE_STRING FileToFindUpcase; PVOID Block; NTSTATUS Status; ULONG len; @@ -264,6 +265,14 @@ Record = (PDIR_RECORD)((ULONG_PTR)Record + Record->RecordLength); } + /* FsRtlIsNameInExpression need the searched string to be upcase, + * even if IgnoreCase is specified */ + Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFind, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + while(TRUE) { DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", @@ -309,8 +318,8 @@ _SEH_TRY { - Found = FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL); + Found = FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || + FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL); } _SEH_HANDLE { @@ -319,6 +328,7 @@ _SEH_END; if (!NT_SUCCESS(Status)) { + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return Status; } @@ -361,6 +371,7 @@ DPRINT("FindFile: new Pathname %S, new Objectname %S, DirIndex %d\n", Fcb->PathName, Fcb->ObjectName, DirIndex); + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return STATUS_SUCCESS; @@ -371,6 +382,7 @@ DirIndex++; } + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); if (pDirIndex) 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] Sun Nov 9 09:55:13 2008 @@ -463,6 +463,7 @@ WCHAR ShortNameBuffer[13]; UNICODE_STRING ShortName; UNICODE_STRING LongName; + UNICODE_STRING FileToFindUpcase; GENERATE_NAME_CONTEXT NameContext; @@ -500,6 +501,15 @@ Offset = 0; BlockOffset = 0; Record = (PDIR_RECORD)Block; + + /* FsRtlIsNameInExpression need the searched string to be upcase, + * even if IgnoreCase is specified */ + Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFind, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + while(TRUE) { if (Record->RecordLength == 0) @@ -542,8 +552,8 @@ _SEH_TRY { - Found = FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL); + Found = FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || + FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL); } _SEH_HANDLE { @@ -552,6 +562,7 @@ _SEH_END; if (!NT_SUCCESS(Status)) { + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return Status; } @@ -567,6 +578,7 @@ Offset, FoundFCB); + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return(Status); @@ -589,6 +601,7 @@ &Context, &Block)) { DPRINT("CcMapData() failed\n"); + RtlFreeUnicodeString(&FileToFindUpcase); return(STATUS_UNSUCCESSFUL); } Record = (PDIR_RECORD)((ULONG_PTR)Block + BlockOffset); @@ -598,6 +611,7 @@ break; } + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return Status;

1 0

[cgutman] 37262: - Revert part of r37261
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 09:35:18 2008 New Revision: 37262 URL: http://svn.reactos.org/svn/reactos?rev=37262&view=rev Log: - Revert part of r37261 Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/csq… ============================================================================== --- trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] Sun Nov 9 09:35:18 2008 @@ -175,6 +175,5 @@ TRACE_(FLOPPY, "CSQ: Inserting IRP 0x%p\n", Irp); InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE); - IoMarkIrpPending(Irp); }

1 0

[cgutman] 37261: - Mark the irp pending before adding it to the queue - Fix a few comments - Return a better status when a drive isn't present - Complete the read/write irp with IO_DISK_INCREMENT instead of IO_NO_INCREMENT
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 09:21:59 2008 New Revision: 37261 URL: http://svn.reactos.org/svn/reactos?rev=37261&view=rev Log: - Mark the irp pending before adding it to the queue - Fix a few comments - Return a better status when a drive isn't present - Complete the read/write irp with IO_DISK_INCREMENT instead of IO_NO_INCREMENT Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/floppy/readwrite.c Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/csq… ============================================================================== --- trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] Sun Nov 9 09:21:59 2008 @@ -175,5 +175,6 @@ TRACE_(FLOPPY, "CSQ: Inserting IRP 0x%p\n", Irp); InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE); + IoMarkIrpPending(Irp); } Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Sun Nov 9 09:21:59 2008 @@ -686,16 +686,16 @@ return STATUS_IO_DEVICE_ERROR; } -/* Check if floppy drive exists */ + /* Check if floppy drive exists */ if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS) - { - WARN_(FLOPPY, "Floppy drive not detected! Returning STATUS_IO_DEVICE_ERROR\n"); - return STATUS_IO_DEVICE_ERROR; - } + { + WARN_(FLOPPY, "Floppy drive not detected!\n"); + return STATUS_NO_SUCH_DEVICE; + } INFO_(FLOPPY, "InitController: resetting the controller after floppy detection\n"); - /* Reset the controller */ + /* Reset the controller again after drive detection */ if(HwReset(ControllerInfo) != STATUS_SUCCESS) { WARN_(FLOPPY, "InitController: unable to reset controller\n"); @@ -984,6 +984,9 @@ /* 3i: Now that we're done, set the Initialized flag so we know to free this in Unload */ gControllerInfo[i].DriveInfo[j].Initialized = TRUE; + + /* 3j: Clear the DO_DEVICE_INITIALIZING flag */ + gControllerInfo[i].DriveInfo[j].DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; } } Modified: trunk/reactos/drivers/storage/floppy/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] Sun Nov 9 09:21:59 2008 @@ -758,7 +758,7 @@ INFO_(FLOPPY, "ReadWritePassive(): success; Completing with STATUS_SUCCESS\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Length; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); StopMotor(DriveInfo->ControllerInfo); }

1 0

[ekohl] 37260: Sync to wine-0.9.60: - Rob Shearman <rob@codeweavers.com> Fri, 11 Apr 2008 widl: Support non-default calling conventions for object methods. - Rob Shearman <rob@codeweavers.com> Fri, 11 Apr 2008 widl: Support non-default calling conventions for non-object functions. - Rob Shearman <rob@codeweavers.com> Mon, 14 Apr 2008 widl: Check that attributes applied to interfaces, functions and arguments are applicable and issue an error if not. - Rob Shearman <rob@codeweavers.com> Mon, 14 Ap
by ekohl＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: ekohl Date: Sun Nov 9 08:21:53 2008 New Revision: 37260 URL: http://svn.reactos.org/svn/reactos?rev=37260&view=rev Log: Sync to wine-0.9.60: - Rob Shearman <rob(a)codeweavers.com> Fri, 11 Apr 2008 widl: Support non-default calling conventions for object methods. - Rob Shearman <rob(a)codeweavers.com> Fri, 11 Apr 2008 widl: Support non-default calling conventions for non-object functions. - Rob Shearman <rob(a)codeweavers.com> Mon, 14 Apr 2008 widl: Check that attributes applied to interfaces, functions and arguments are applicable and issue an error if not. - Rob Shearman <rob(a)codeweavers.com> Mon, 14 Apr 2008 widl: Check that attributes applied to typedefs and fields are applicable and issue an error otherwise. - Rob Shearman <rob(a)codeweavers.com> Mon, 14 Apr 2008 widl: Make the attrs parameter passed to start_typelib const. - Rob Shearman <rob(a)codeweavers.com> Mon, 14 Apr 2008 widl: The odl attribute is valid for dispinterfaces. - Rob Shearman <rob(a)codeweavers.com> Mon, 14 Apr 2008 widl: Check that attributes are applicable for libraries, modules, dispinterfaces and coclasses and otherwise issue an error. - Rob Shearman <rob(a)codeweavers.com> Mon, 14 Apr 2008 widl: Output a warning if duplicate attributes are specified. - Rob Shearman <rob(a)codeweavers.com> Mon, 14 Apr 2008 widl: Add support for the broadcast and idempotent operation attributes. - Rob Shearman <rob(a)codeweavers.com> Mon, 14 Apr 2008 widl: Write out TYPEFLAG, FUNCFLAG and VARFLAG flags for all attribute we currently parse. Add FIXMEs for the remaining ones and remove the warning for unimplemented attribute types since we now support all the attributes that we parse. - Rob Shearman <rob(a)codeweavers.com> Mon, 14 Apr 2008 widl: Add functions to print an error or warning message using location information to enable these to be printed accurately when a check is done after an element is parsed. Add location information to variable automatically, since this is will be useful for type checking of arguments. - Rob Shearman <rob(a)codeweavers.com> Mon, 14 Apr 2008 widl: Add checking to arguments of non-local functions. Check that out arguments have enough levels of indirection and that they don't derive from void * or a function pointer. - Rob Shearman <rob(a)codeweavers.com> Tue, 15 Apr 2008 widl: Change alls calls to error in the parser to error_loc so that line number information is printed. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib.h trunk/reactos/tools/widl/utils.c trunk/reactos/tools/widl/utils.h trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=37… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=37… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=372… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… Modified: trunk/reactos/tools/widl/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.h?rev=3… Modified: trunk/reactos/tools/widl/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.c?rev=372… Modified: trunk/reactos/tools/widl/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.h?rev=372… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

1 0

[gschneider] 37259: - Don't hard code pixel size to 16bpp. - Fixes crashes in 8bpp and halved bitmaps in 32bpp. - This SRCCOPY code is not in use atm and will probably stay this way because it's slower then the version in win32k/dib.
by gschneider＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: gschneider Date: Sun Nov 9 08:00:31 2008 New Revision: 37259 URL: http://svn.reactos.org/svn/reactos?rev=37259&view=rev Log: - Don't hard code pixel size to 16bpp. - Fixes crashes in 8bpp and halved bitmaps in 32bpp. - This SRCCOPY code is not in use atm and will probably stay this way because it's slower then the version in win32k/dib. Modified: trunk/reactos/tools/gendib/gendib.c Modified: trunk/reactos/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.c?rev=… ============================================================================== --- trunk/reactos/tools/gendib/gendib.c [iso-8859-1] (original) +++ trunk/reactos/tools/gendib/gendib.c [iso-8859-1] Sun Nov 9 08:00:31 2008 @@ -542,7 +542,7 @@ if (ROPCODE_SRCCOPY == RopInfo->RopCode && 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) { - Output(Out, "CenterCount = 2 * (BltInfo->DestRect.right -\n"); + Output(Out, "CenterCount = %u * (BltInfo->DestRect.right -\n", Bpp >> 3); Output(Out, " BltInfo->DestRect.left);\n"); } if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE))

1 0

[spetreolle] 37258: fix UNICODE redefined warning
by spetreolle＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: spetreolle Date: Sun Nov 9 07:56:31 2008 New Revision: 37258 URL: http://svn.reactos.org/svn/reactos?rev=37258&view=rev Log: fix UNICODE redefined warning Modified: trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c Modified: trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkd… ============================================================================== --- trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c [iso-8859-1] Sun Nov 9 07:56:31 2008 @@ -42,7 +42,6 @@ //====================================================================== #define WIN32_NO_STATUS #define NTOS_MODE_USER -#define UNICODE #include <windows.h> #include <stdio.h> #include <ndk/ntndk.h>

1 0

[greatlrd] 37257: Old code lying around. Adding more test to NtGdiCreateBitmap
by greatlrd＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: greatlrd Date: Sun Nov 9 07:26:15 2008 New Revision: 37257 URL: http://svn.reactos.org/svn/reactos?rev=37257&view=rev Log: Old code lying around. Adding more test to NtGdiCreateBitmap Modified: branches/reactx/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c Modified: branches/reactx/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/w32kna… ============================================================================== --- branches/reactx/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] (original) +++ branches/reactx/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] Sun Nov 9 07:26:15 2008 @@ -5,52 +5,52 @@ BITMAP bitmap; BYTE BitmapData[10] = {0x11, 0x22, 0x33}; - /* Test simple params */ - SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 1, NULL)) != NULL); - TEST(GetLastError() == ERROR_SUCCESS); - DeleteObject(hBmp); - - /* Test all zero */ - SetLastError(ERROR_SUCCESS); + SetLastError(ERROR_SUCCESS); TEST(NtGdiCreateBitmap(0, 0, 0, 0, NULL) == NULL); TEST(GetLastError() == ERROR_INVALID_PARAMETER); - /* Test cx == 0 */ - SetLastError(ERROR_SUCCESS); - TEST(NtGdiCreateBitmap(0, 1, 1, 1, NULL) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); - - /* Test negative cx */ - SetLastError(ERROR_SUCCESS); - TEST(NtGdiCreateBitmap(-10, 1, 1, 1, NULL) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); - - /* Test cy == 0 */ - SetLastError(ERROR_SUCCESS); - TEST(NtGdiCreateBitmap(1, 0, 1, 1, NULL) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); - - /* Test negative cy */ - SetLastError(ERROR_SUCCESS); - TEST(NtGdiCreateBitmap(1, -2, 1, 1, NULL) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); - - /* Test negative cy */ - SetLastError(ERROR_SUCCESS); - TEST(NtGdiCreateBitmap(1, -2, 1, 1, BitmapData) == NULL); - TEST(GetLastError() == ERROR_SUCCESS); - - /* Test huge size */ - SetLastError(ERROR_SUCCESS); - TEST(NtGdiCreateBitmap(100000, 100000, 1, 1, NULL) == NULL); - TEST(GetLastError() == ERROR_NOT_ENOUGH_MEMORY); - - /* Test cPlanes == 0 */ - SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(1, 1, 0, 1, NULL)) != NULL); - TEST(GetLastError() == ERROR_SUCCESS); - ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(0, 0, 0, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(0, 0, 1, 0, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(0, 1, 0, 0, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, 0, 0, 0, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, 0, 0, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, 0, 1, 0, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, 1, 0, 0, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, 1, 0, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, 1, 1, 0, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST( (hBmp =NtGdiCreateBitmap(1, 1, 1, 1, NULL)) != NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + RtlZeroMemory(&bitmap,sizeof(BITMAP)); + TEST(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmType == 0); TEST(bitmap.bmWidth == 1); TEST(bitmap.bmHeight == 1); @@ -59,18 +59,39 @@ TEST(bitmap.bmBitsPixel == 1); DeleteObject(hBmp); - /* Test big cPlanes */ - SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(1, 1, 32, 1, NULL)) != NULL); - TEST(GetLastError() == ERROR_SUCCESS); - DeleteObject(hBmp); - - TEST(NtGdiCreateBitmap(1, 1, 33, 1, NULL) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); - - /* Test cBPP == 0 */ - SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 0, NULL)) != NULL); + SetLastError(ERROR_SUCCESS); + TEST( (hBmp =NtGdiCreateBitmap(1, 1, 1, -1, NULL)) != NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + DeleteObject(hBmp); + + SetLastError(ERROR_SUCCESS); + TEST( (hBmp =NtGdiCreateBitmap(1, 1, -1, 1, NULL)) != NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + DeleteObject(hBmp); + + SetLastError(ERROR_SUCCESS); + TEST( (hBmp =NtGdiCreateBitmap(1, -1, 1, 1, NULL)) != NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + DeleteObject(hBmp); + + SetLastError(ERROR_SUCCESS); + TEST( (hBmp =NtGdiCreateBitmap(-1, 1, 1, 1, NULL)) != NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + DeleteObject(hBmp); + + + + + + + /* Test huge size */ + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(100000, 100000, 1, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_NOT_ENOUGH_MEMORY); + + /* Test cPlanes == 0 */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 1, 0, 1, NULL)) != NULL); TEST(GetLastError() == ERROR_SUCCESS); ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmType == 0); @@ -81,10 +102,28 @@ TEST(bitmap.bmBitsPixel == 1); DeleteObject(hBmp); - /* Test negative cBPP */ - SetLastError(ERROR_SUCCESS); - TEST(NtGdiCreateBitmap(1, 1, 1, -1, NULL) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); + /* Test big cPlanes */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 1, 32, 1, NULL)) != NULL); + TEST(GetLastError() == ERROR_SUCCESS); + DeleteObject(hBmp); + + TEST(NtGdiCreateBitmap(1, 1, 33, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test cBPP == 0 */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 0, NULL)) != NULL); + TEST(GetLastError() == ERROR_SUCCESS); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmType == 0); + TEST(bitmap.bmWidth == 1); + TEST(bitmap.bmHeight == 1); + TEST(bitmap.bmWidthBytes == 2); + TEST(bitmap.bmPlanes == 1); + TEST(bitmap.bmBitsPixel == 1); + DeleteObject(hBmp); + /* Test bad cBPP */ SetLastError(ERROR_SUCCESS); @@ -148,31 +187,14 @@ DeleteObject(hBmp); - /* Test height 0 params */ - SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(1, 0, 1, 1, NULL)) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); - - /* Test height -1 params */ - SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(1, -1, 1, 1, NULL)) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); - - /* Test witdth 0 params */ - SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(0, 1, 1, 1, NULL)) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); - - /* Test witdth -1 params */ - SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(-1, 0, 1, 1, NULL)) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); - - - /* Test witdth -1 params */ - SetLastError(ERROR_SUCCESS); - TEST((hBmp = NtGdiCreateBitmap(0, 0, 1, 1, NULL)) == NULL); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + + + + + + + return APISTATUS_NORMAL;

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