Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[cwittich] 30639: fix building with msvc
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 20:18:25 2007 New Revision: 30639 URL: http://svn.reactos.org/svn/reactos?rev=30639&view=rev Log: fix building with msvc Modified: trunk/reactos/drivers/filesystems/vfat/fcb.c Modified: trunk/reactos/drivers/filesystems/vfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/fcb.c (original) +++ trunk/reactos/drivers/filesystems/vfat/fcb.c Wed Nov 21 20:18:25 2007 @@ -10,7 +10,9 @@ /* ------------------------------------------------------- INCLUDES */ +#ifdef __GNUC__ #include <wctype.h> /* towlower prototype */ +#endif #define NDEBUG #include "vfat.h"

1 0

[cwittich] 30638: don't assign DO_DIRECT_IO directly to DeviceObject->Flags set DRIVER_DISPATCH where needed
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 20:11:49 2007 New Revision: 30638 URL: http://svn.reactos.org/svn/reactos?rev=30638&view=rev Log: don't assign DO_DIRECT_IO directly to DeviceObject->Flags set DRIVER_DISPATCH where needed Modified: trunk/reactos/drivers/filesystems/msfs/msfs.c trunk/reactos/drivers/filesystems/msfs/msfs.h Modified: trunk/reactos/drivers/filesystems/msfs/msfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.c (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.c Wed Nov 21 20:11:49 2007 @@ -67,7 +67,7 @@ } /* initialize the device object */ - DeviceObject->Flags = DO_DIRECT_IO; + DeviceObject->Flags |= DO_DIRECT_IO; /* initialize device extension */ DeviceExtension = DeviceObject->DeviceExtension; Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h Wed Nov 21 20:11:49 2007 @@ -76,16 +76,28 @@ #define KeUnlockMutex(x) KeReleaseMutex(x, FALSE); +DRIVER_DISPATCH MsfsCreate; NTSTATUS DEFAULTAPI MsfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +DRIVER_DISPATCH MsfsCreateMailslot; NTSTATUS DEFAULTAPI MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +DRIVER_DISPATCH MsfsClose; NTSTATUS DEFAULTAPI MsfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH MsfsQueryInformation; NTSTATUS DEFAULTAPI MsfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +DRIVER_DISPATCH MsfsSetInformation; NTSTATUS DEFAULTAPI MsfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH MsfsRead; NTSTATUS DEFAULTAPI MsfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +DRIVER_DISPATCH MsfsWrite; NTSTATUS DEFAULTAPI MsfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH MsfsFileSystemControl; NTSTATUS DEFAULTAPI MsfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); NTSTATUS NTAPI

1 0

[cwittich] 30637: fix some format strings
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 20:08:21 2007 New Revision: 30637 URL: http://svn.reactos.org/svn/reactos?rev=30637&view=rev Log: fix some format strings Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c trunk/reactos/drivers/filesystems/ntfs/close.c trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/b… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/blockdev.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/blockdev.c Wed Nov 21 20:08:21 2007 @@ -60,7 +60,7 @@ Offset.QuadPart = (LONGLONG)DiskSector * (LONGLONG)SectorSize; BlockSize = SectorCount * SectorSize; - DPRINT("NtfsReadSectors(DeviceObject %x, DiskSector %d, Buffer %x)\n", + DPRINT("NtfsReadSectors(DeviceObject %p, DiskSector %d, Buffer %p)\n", DeviceObject, DiskSector, Buffer); DPRINT("Offset %I64x BlockSize %ld\n", Offset.QuadPart, @@ -86,15 +86,15 @@ Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; } - DPRINT("Calling IO Driver... with irp %x\n", Irp); + DPRINT("Calling IO Driver... with irp %p\n", Irp); Status = IoCallDriver(DeviceObject, Irp); - DPRINT("Waiting for IO Operation for %x\n", Irp); + DPRINT("Waiting for IO Operation for %p\n", Irp); if (Status == STATUS_PENDING) { DPRINT("Operation pending\n"); KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT("Getting IO Status... for %x\n", Irp); + DPRINT("Getting IO Status... for %p\n", Irp); Status = IoStatus.Status; } @@ -143,7 +143,7 @@ Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; } - DPRINT("Calling IO Driver... with irp %x\n", Irp); + DPRINT("Calling IO Driver... with irp %p\n", Irp); Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/close.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c Wed Nov 21 20:08:21 2007 @@ -47,13 +47,13 @@ { PCCB Ccb; - DPRINT("NtfsCloseFile(DeviceExt %x, FileObject %x)\n", + DPRINT("NtfsCloseFile(DeviceExt %p, FileObject %p)\n", DeviceExt, FileObject); Ccb = (PCCB)(FileObject->FsContext2); - DPRINT("Ccb %x\n", Ccb); + DPRINT("Ccb %p\n", Ccb); if (Ccb == NULL) { return(STATUS_SUCCESS); Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c Wed Nov 21 20:08:21 2007 @@ -89,7 +89,7 @@ NTSTATUS Status; PWSTR AbsFileName = NULL; - DPRINT("NtfsOpenFile(%08lx, %08lx, %S)\n", DeviceExt, FileObject, FileName); + DPRINT("NtfsOpenFile(%p, %p, %S)\n", DeviceExt, FileObject, FileName); if (FileObject->RelatedFileObject) { Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c Wed Nov 21 20:08:21 2007 @@ -565,7 +565,7 @@ { Buffer = Irp->UserBuffer; } - DPRINT("Buffer=%x tofind=%S\n", Buffer, Ccb->DirectorySearchPattern); + DPRINT("Buffer=%p tofind=%S\n", Buffer, Ccb->DirectorySearchPattern); #if 0 TempFcb.ObjectName = TempFcb.PathName; while (Status == STATUS_SUCCESS && BufferLength > 0) Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c Wed Nov 21 20:08:21 2007 @@ -127,7 +127,7 @@ { KIRQL oldIrql; - DPRINT("grabbing FCB at %x: %S, refCount:%d\n", + DPRINT("grabbing FCB at %p: %S, refCount:%d\n", Fcb, Fcb->PathName, Fcb->RefCount); @@ -144,7 +144,7 @@ { KIRQL oldIrql; - DPRINT("releasing FCB at %x: %S, refCount:%d\n", + DPRINT("releasing FCB at %p: %S, refCount:%d\n", Fcb, Fcb->PathName, Fcb->RefCount); @@ -570,7 +570,7 @@ PFCB FCB; PFCB parentFCB; - DPRINT("NtfsGetFCBForFile(%x, %x, %x, '%S')\n", + DPRINT("NtfsGetFCBForFile(%p, %p, %p, '%S')\n", Vcb, pParentFCB, pFCB, @@ -612,7 +612,7 @@ } DPRINT("Parsing, currentElement:%S\n", currentElement); - DPRINT(" parentFCB:%x FCB:%x\n", parentFCB, FCB); + DPRINT(" parentFCB:%p FCB:%p\n", parentFCB, FCB); /* Descend to next directory level */ if (parentFCB) Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c Wed Nov 21 20:08:21 2007 @@ -76,7 +76,7 @@ NtfsGlobalData->DeviceObject = DeviceObject; /* Initialize driver data */ - DeviceObject->Flags = DO_DIRECT_IO; + DeviceObject->Flags |= DO_DIRECT_IO; DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsClose; DriverObject->MajorFunction[IRP_MJ_CREATE] = NtfsCreate; DriverObject->MajorFunction[IRP_MJ_READ] = NtfsRead; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Wed Nov 21 20:08:21 2007 @@ -337,12 +337,14 @@ /* close.c */ +DRIVER_DISPATCH NtfsClose; NTSTATUS STDCALL NtfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* create.c */ +DRIVER_DISPATCH NtfsCreate; NTSTATUS STDCALL NtfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -350,6 +352,7 @@ /* dirctl.c */ +DRIVER_DISPATCH NtfsDirectoryControl; NTSTATUS STDCALL NtfsDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -408,6 +411,7 @@ /* finfo.c */ +DRIVER_DISPATCH NtfsQueryInformation; NTSTATUS STDCALL NtfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -415,6 +419,7 @@ /* fsctl.c */ +DRIVER_DISPATCH NtfsFileSystemControl; NTSTATUS STDCALL NtfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -501,10 +506,12 @@ /* rw.c */ +DRIVER_DISPATCH NtfsRead; NTSTATUS STDCALL NtfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH NtfsWrite; NTSTATUS STDCALL NtfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -512,10 +519,12 @@ /* volinfo.c */ +DRIVER_DISPATCH NtfsQueryVolumeInformation; NTSTATUS STDCALL NtfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +DRIVER_DISPATCH NtfsSetVolumeInformation; NTSTATUS STDCALL NtfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c Wed Nov 21 20:08:21 2007 @@ -183,7 +183,7 @@ SystemBuffer = Irp->AssociatedIrp.SystemBuffer; DPRINT("FsInformationClass %d\n", FsInformationClass); - DPRINT("SystemBuffer %x\n", SystemBuffer); + DPRINT("SystemBuffer %p\n", SystemBuffer); switch (FsInformationClass) {

1 0

[cwittich] 30636: fix some format strings
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 19:50:07 2007 New Revision: 30636 URL: http://svn.reactos.org/svn/reactos?rev=30636&view=rev Log: fix some format strings Modified: trunk/reactos/drivers/filesystems/vfat/blockdev.c trunk/reactos/drivers/filesystems/vfat/cleanup.c trunk/reactos/drivers/filesystems/vfat/close.c trunk/reactos/drivers/filesystems/vfat/create.c trunk/reactos/drivers/filesystems/vfat/dir.c trunk/reactos/drivers/filesystems/vfat/fat.c trunk/reactos/drivers/filesystems/vfat/finfo.c trunk/reactos/drivers/filesystems/vfat/flush.c trunk/reactos/drivers/filesystems/vfat/fsctl.c trunk/reactos/drivers/filesystems/vfat/misc.c trunk/reactos/drivers/filesystems/vfat/rw.c trunk/reactos/drivers/filesystems/vfat/shutdown.c trunk/reactos/drivers/filesystems/vfat/vfat.h trunk/reactos/drivers/filesystems/vfat/volume.c Modified: trunk/reactos/drivers/filesystems/vfat/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/b… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/blockdev.c (original) +++ trunk/reactos/drivers/filesystems/vfat/blockdev.c Wed Nov 21 19:50:07 2007 @@ -14,6 +14,7 @@ /* FUNCTIONS ***************************************************************/ +static IO_COMPLETION_ROUTINE VfatReadWritePartialCompletion; static NTSTATUS NTAPI VfatReadWritePartialCompletion (IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -66,7 +67,7 @@ KeInitializeEvent (&event, NotificationEvent, FALSE); - DPRINT ("VfatReadDisk(pDeviceObject %x, Offset %I64x, Length %d, Buffer %x)\n", + DPRINT ("VfatReadDisk(pDeviceObject %p, Offset %I64x, Length %d, Buffer %p)\n", pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); DPRINT ("Building synchronous FSD Request...\n"); @@ -89,26 +90,26 @@ Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; } - DPRINT ("Calling IO Driver... with irp %x\n", Irp); + DPRINT ("Calling IO Driver... with irp %p\n", Irp); Status = IoCallDriver (pDeviceObject, Irp); - DPRINT ("Waiting for IO Operation for %x\n", Irp); + DPRINT ("Waiting for IO Operation for %p\n", Irp); if (Status == STATUS_PENDING) { DPRINT ("Operation pending\n"); KeWaitForSingleObject (&event, Suspended, KernelMode, FALSE, NULL); - DPRINT ("Getting IO Status... for %x\n", Irp); + DPRINT ("Getting IO Status... for %p\n", Irp); Status = IoStatus.Status; } if (!NT_SUCCESS (Status)) { DPRINT ("IO failed!!! VfatReadDisk : Error code: %x\n", Status); - DPRINT ("(pDeviceObject %x, Offset %I64x, Size %d, Buffer %x\n", + DPRINT ("(pDeviceObject %p, Offset %I64x, Size %d, Buffer %p\n", pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); return (Status); } - DPRINT ("Block request succeeded for %x\n", Irp); + DPRINT ("Block request succeeded for %p\n", Irp); return (STATUS_SUCCESS); } @@ -124,7 +125,7 @@ NTSTATUS Status; PVOID Buffer; - DPRINT ("VfatReadDiskPartial(IrpContext %x, ReadOffset %I64x, ReadLength %d, BufferOffset %x, Wait %d)\n", + DPRINT ("VfatReadDiskPartial(IrpContext %p, ReadOffset %I64x, ReadLength %d, BufferOffset %x, Wait %d)\n", IrpContext, ReadOffset->QuadPart, ReadLength, BufferOffset, Wait); DPRINT ("Building asynchronous FSD Request...\n"); @@ -178,7 +179,7 @@ InterlockedIncrement((PLONG)&IrpContext->RefCount); } - DPRINT ("Calling IO Driver... with irp %x\n", Irp); + DPRINT ("Calling IO Driver... with irp %p\n", Irp); Status = IoCallDriver (IrpContext->DeviceExt->StorageDevice, Irp); if (Wait && Status == STATUS_PENDING) @@ -204,7 +205,7 @@ NTSTATUS Status; PVOID Buffer; - DPRINT ("VfatWriteDiskPartial(IrpContext %x, WriteOffset %I64x, WriteLength %d, BufferOffset %x, Wait %d)\n", + DPRINT ("VfatWriteDiskPartial(IrpContext %p, WriteOffset %I64x, WriteLength %d, BufferOffset %x, Wait %d)\n", IrpContext, WriteOffset->QuadPart, WriteLength, BufferOffset, Wait); Buffer = (PCHAR)MmGetMdlVirtualAddress(IrpContext->Irp->MdlAddress) + BufferOffset; @@ -283,9 +284,9 @@ IO_STATUS_BLOCK IoStatus; NTSTATUS Status; - DPRINT("VfatBlockDeviceIoControl(DeviceObject %x, CtlCode %x, " - "InputBuffer %x, InputBufferSize %x, OutputBuffer %x, " - "OutputBufferSize %x (%x)\n", DeviceObject, CtlCode, + DPRINT("VfatBlockDeviceIoControl(DeviceObject %p, CtlCode %x, " + "InputBuffer %p, InputBufferSize %x, OutputBuffer %p, " + "OutputBufferSize %p (%x)\n", DeviceObject, CtlCode, InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, OutputBufferSize ? *OutputBufferSize : 0); @@ -313,15 +314,15 @@ Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; } - DPRINT ("Calling IO Driver... with irp %x\n", Irp); + DPRINT ("Calling IO Driver... with irp %p\n", Irp); Status = IoCallDriver(DeviceObject, Irp); - DPRINT ("Waiting for IO Operation for %x\n", Irp); + DPRINT ("Waiting for IO Operation for %p\n", Irp); if (Status == STATUS_PENDING) { DPRINT ("Operation pending\n"); KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT ("Getting IO Status... for %x\n", Irp); + DPRINT ("Getting IO Status... for %p\n", Irp); Status = IoStatus.Status; } Modified: trunk/reactos/drivers/filesystems/vfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/cleanup.c (original) +++ trunk/reactos/drivers/filesystems/vfat/cleanup.c Wed Nov 21 19:50:07 2007 @@ -22,7 +22,7 @@ PVFATFCB pFcb; PFILE_OBJECT FileObject = IrpContext->FileObject; - DPRINT("VfatCleanupFile(DeviceExt %x, FileObject %x)\n", + DPRINT("VfatCleanupFile(DeviceExt %p, FileObject %p)\n", IrpContext->DeviceExt, FileObject); /* FIXME: handle file/directory deletion here */ @@ -122,7 +122,7 @@ { NTSTATUS Status; - DPRINT("VfatCleanup(DeviceObject %x, Irp %x)\n", IrpContext->DeviceObject, IrpContext->Irp); + DPRINT("VfatCleanup(DeviceObject %p, Irp %p)\n", IrpContext->DeviceObject, IrpContext->Irp); if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { Modified: trunk/reactos/drivers/filesystems/vfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/close.c (original) +++ trunk/reactos/drivers/filesystems/vfat/close.c Wed Nov 21 19:50:07 2007 @@ -23,7 +23,7 @@ PVFATCCB pCcb; NTSTATUS Status = STATUS_SUCCESS; - DPRINT ("VfatCloseFile(DeviceExt %x, FileObject %x)\n", + DPRINT ("VfatCloseFile(DeviceExt %p, FileObject %p)\n", DeviceExt, FileObject); /* FIXME : update entry in directory? */ @@ -76,7 +76,7 @@ { NTSTATUS Status; - DPRINT ("VfatClose(DeviceObject %x, Irp %x)\n", IrpContext->DeviceObject, IrpContext->Irp); + DPRINT ("VfatClose(DeviceObject %p, Irp %p)\n", IrpContext->DeviceObject, IrpContext->Irp); if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { Modified: trunk/reactos/drivers/filesystems/vfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/create.c (original) +++ trunk/reactos/drivers/filesystems/vfat/create.c Wed Nov 21 19:50:07 2007 @@ -196,7 +196,7 @@ UNICODE_STRING FileToFindUpcase; BOOLEAN WildCard; - DPRINT ("FindFile(Parent %x, FileToFind '%wZ', DirIndex: %d)\n", + DPRINT ("FindFile(Parent %p, FileToFind '%wZ', DirIndex: %d)\n", Parent, FileToFindU, DirContext->DirIndex); DPRINT ("FindFile: Path %wZ)\n",&Parent->PathNameU); @@ -350,7 +350,7 @@ PVFATFCB Fcb; NTSTATUS Status; - DPRINT ("VfatOpenFile(%08lx, '%wZ', %08lx, %08lx)\n", DeviceExt, PathNameU, FileObject, ParentFcb); + DPRINT ("VfatOpenFile(%p, '%wZ', %p, %p)\n", DeviceExt, PathNameU, FileObject, ParentFcb); if (FileObject->RelatedFileObject) { Modified: trunk/reactos/drivers/filesystems/vfat/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/d… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/dir.c (original) +++ trunk/reactos/drivers/filesystems/vfat/dir.c Wed Nov 21 19:50:07 2007 @@ -389,7 +389,7 @@ DirContext.DirIndex = pCcb->Entry; } - DPRINT ("Buffer=%x tofind=%wZ\n", Buffer, &pCcb->SearchPattern); + DPRINT ("Buffer=%p tofind=%wZ\n", Buffer, &pCcb->SearchPattern); DirContext.LongNameU.Buffer = LongNameBuffer; DirContext.LongNameU.MaximumLength = sizeof(LongNameBuffer); Modified: trunk/reactos/drivers/filesystems/vfat/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/fat.c (original) +++ trunk/reactos/drivers/filesystems/vfat/fat.c Wed Nov 21 19:50:07 2007 @@ -626,7 +626,7 @@ { NTSTATUS Status; - DPRINT ("GetNextCluster(DeviceExt %x, CurrentCluster %x)\n", + DPRINT ("GetNextCluster(DeviceExt %p, CurrentCluster %x)\n", DeviceExt, CurrentCluster); if (CurrentCluster == 0) @@ -649,7 +649,7 @@ { NTSTATUS Status; - DPRINT ("GetNextClusterExtend(DeviceExt %x, CurrentCluster %x)\n", + DPRINT ("GetNextClusterExtend(DeviceExt %p, CurrentCluster %x)\n", DeviceExt, CurrentCluster); ExAcquireResourceExclusiveLite(&DeviceExt->FatResource, TRUE); Modified: trunk/reactos/drivers/filesystems/vfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/finfo.c (original) +++ trunk/reactos/drivers/filesystems/vfat/finfo.c Wed Nov 21 19:50:07 2007 @@ -104,7 +104,7 @@ { DPRINT ("FsdSetPositionInformation()\n"); - DPRINT ("PositionInfo %x\n", PositionInfo); + DPRINT ("PositionInfo %p\n", PositionInfo); DPRINT ("Setting position %d\n", PositionInfo->CurrentByteOffset.u.LowPart); FileObject->CurrentByteOffset.QuadPart = @@ -868,7 +868,7 @@ /* PRECONDITION */ ASSERT(IrpContext); - DPRINT("VfatSetInformation(IrpContext %x)\n", IrpContext); + DPRINT("VfatSetInformation(IrpContext %p)\n", IrpContext); /* INITIALIZATION */ FileInformationClass = @@ -880,7 +880,7 @@ FileInformationClass >= FileMaximumInformation - 1 ? "????" : FileInformationClassNames[ FileInformationClass]); DPRINT("FileInformationClass %d\n", FileInformationClass); - DPRINT("SystemBuffer %x\n", SystemBuffer); + DPRINT("SystemBuffer %p\n", SystemBuffer); if (!(FCB->Flags & FCB_IS_PAGE_FILE)) { Modified: trunk/reactos/drivers/filesystems/vfat/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/flush.c (original) +++ trunk/reactos/drivers/filesystems/vfat/flush.c Wed Nov 21 19:50:07 2007 @@ -18,7 +18,7 @@ IO_STATUS_BLOCK IoStatus; NTSTATUS Status; - DPRINT("VfatFlushFile(DeviceExt %x, Fcb %x) for '%wZ'\n", DeviceExt, Fcb, &Fcb->PathNameU); + DPRINT("VfatFlushFile(DeviceExt %p, Fcb %p) for '%wZ'\n", DeviceExt, Fcb, &Fcb->PathNameU); CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, &IoStatus); if (IoStatus.Status == STATUS_INVALID_PARAMETER) @@ -43,7 +43,7 @@ PVFATFCB Fcb; NTSTATUS Status, ReturnStatus = STATUS_SUCCESS; - DPRINT("VfatFlushVolume(DeviceExt %x, FatFcb %x)\n", DeviceExt, VolumeFcb); + DPRINT("VfatFlushVolume(DeviceExt %p, FatFcb %p)\n", DeviceExt, VolumeFcb); ListEntry = DeviceExt->FcbListHead.Flink; while (ListEntry != &DeviceExt->FcbListHead) Modified: trunk/reactos/drivers/filesystems/vfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/vfat/fsctl.c Wed Nov 21 19:50:07 2007 @@ -379,7 +379,7 @@ ULONG eocMark; FATINFO FatInfo; - DPRINT("VfatMount(IrpContext %x)\n", IrpContext); + DPRINT("VfatMount(IrpContext %p)\n", IrpContext); ASSERT(IrpContext); @@ -504,7 +504,7 @@ DeviceObject->StackSize = DeviceExt->StorageDevice->StackSize + 1; DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - DPRINT("FsDeviceObject %lx\n", DeviceObject); + DPRINT("FsDeviceObject %p\n", DeviceObject); DeviceExt->FATFileObject = IoCreateStreamFileObject(NULL, DeviceExt->StorageDevice); Fcb = vfatNewFCB(DeviceExt, &NameU); @@ -631,7 +631,7 @@ BOOLEAN RecognizedFS; PDEVICE_EXTENSION DeviceExt = IrpContext->DeviceExt; - DPRINT("VfatVerify(IrpContext %x)\n", IrpContext); + DPRINT("VfatVerify(IrpContext %p)\n", IrpContext); DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject; Status = VfatBlockDeviceIoControl(DeviceToVerify, @@ -677,7 +677,7 @@ static NTSTATUS VfatGetVolumeBitmap(PVFAT_IRP_CONTEXT IrpContext) { - DPRINT("VfatGetVolumeBitmap (IrpContext %x)\n", IrpContext); + DPRINT("VfatGetVolumeBitmap (IrpContext %p)\n", IrpContext); return STATUS_INVALID_DEVICE_REQUEST; } @@ -698,7 +698,7 @@ ULONG LastCluster; NTSTATUS Status; - DPRINT("VfatGetRetrievalPointers(IrpContext %x)\n", IrpContext); + DPRINT("VfatGetRetrievalPointers(IrpContext %p)\n", IrpContext); DeviceExt = IrpContext->DeviceExt; FileObject = IrpContext->FileObject; @@ -779,7 +779,7 @@ static NTSTATUS VfatMoveFile(PVFAT_IRP_CONTEXT IrpContext) { - DPRINT("VfatMoveFile(IrpContext %x)\n", IrpContext); + DPRINT("VfatMoveFile(IrpContext %p)\n", IrpContext); return STATUS_INVALID_DEVICE_REQUEST; } @@ -792,7 +792,7 @@ PROS_QUERY_LCN_MAPPING LcnQuery; PIO_STACK_LOCATION Stack; - DPRINT("VfatRosQueryLcnMapping(IrpContext %x)\n", IrpContext); + DPRINT("VfatRosQueryLcnMapping(IrpContext %p)\n", IrpContext); DeviceExt = IrpContext->DeviceExt; Stack = IrpContext->Stack; @@ -813,7 +813,7 @@ { PULONG Flags; - DPRINT("VfatIsVolumeDirty(IrpContext %x)\n", IrpContext); + DPRINT("VfatIsVolumeDirty(IrpContext %p)\n", IrpContext); if (IrpContext->Stack->Parameters.FileSystemControl.OutputBufferLength != sizeof(ULONG)) return STATUS_INVALID_BUFFER_SIZE; @@ -839,7 +839,7 @@ PDEVICE_EXTENSION DeviceExt; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("VfatMarkVolumeDirty(IrpContext %x)\n", IrpContext); + DPRINT("VfatMarkVolumeDirty(IrpContext %p)\n", IrpContext); DeviceExt = IrpContext->DeviceExt; if (!(DeviceExt->VolumeFcb->Flags & VCB_IS_DIRTY)) @@ -866,7 +866,7 @@ NTSTATUS Status; - DPRINT("VfatFileSystemControl(IrpContext %x)\n", IrpContext); + DPRINT("VfatFileSystemControl(IrpContext %p)\n", IrpContext); ASSERT(IrpContext); ASSERT(IrpContext->Irp); Modified: trunk/reactos/drivers/filesystems/vfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/m… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/misc.c (original) +++ trunk/reactos/drivers/filesystems/vfat/misc.c Wed Nov 21 19:50:07 2007 @@ -58,7 +58,7 @@ PVFATFCB Fcb; NTSTATUS Status; - DPRINT("VfatLockControl(IrpContext %x)\n", IrpContext); + DPRINT("VfatLockControl(IrpContext %p)\n", IrpContext); ASSERT(IrpContext); @@ -94,7 +94,7 @@ static NTSTATUS VfatDispatchRequest (IN PVFAT_IRP_CONTEXT IrpContext) { - DPRINT ("VfatDispatchRequest (IrpContext %x), is called for %s\n", IrpContext, + DPRINT ("VfatDispatchRequest (IrpContext %p), is called for %s\n", IrpContext, IrpContext->MajorFunction >= IRP_MJ_MAXIMUM_FUNCTION ? "????" : MajorFunctionNames[IrpContext->MajorFunction]); ASSERT(IrpContext); @@ -144,7 +144,7 @@ PVFAT_IRP_CONTEXT IrpContext; KIRQL Irql; - DPRINT ("VfatBuildRequest (DeviceObject %x, Irp %x)\n", DeviceObject, Irp); + DPRINT ("VfatBuildRequest (DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(DeviceObject); ASSERT(Irp); @@ -188,7 +188,7 @@ PVFAT_IRP_CONTEXT IrpContext; /*PIO_STACK_LOCATION Stack;*/ UCHAR MajorFunction; - DPRINT ("VfatAllocateIrpContext(DeviceObject %x, Irp %x)\n", DeviceObject, Irp); + DPRINT ("VfatAllocateIrpContext(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(DeviceObject); ASSERT(Irp); @@ -227,7 +227,7 @@ static VOID NTAPI VfatDoRequest (PVOID IrpContext) { InterlockedDecrement(&QueueCount); - DPRINT ("VfatDoRequest (IrpContext %x), MajorFunction %x, %d\n", IrpContext, ((PVFAT_IRP_CONTEXT)IrpContext)->MajorFunction, QueueCount); + DPRINT ("VfatDoRequest (IrpContext %p), MajorFunction %x, %d\n", IrpContext, ((PVFAT_IRP_CONTEXT)IrpContext)->MajorFunction, QueueCount); FsRtlEnterFileSystem(); VfatDispatchRequest((PVFAT_IRP_CONTEXT)IrpContext); FsRtlExitFileSystem(); @@ -237,7 +237,7 @@ NTSTATUS VfatQueueRequest(PVFAT_IRP_CONTEXT IrpContext) { InterlockedIncrement(&QueueCount); - DPRINT ("VfatQueueRequest (IrpContext %x), %d\n", IrpContext, QueueCount); + DPRINT ("VfatQueueRequest (IrpContext %p), %d\n", IrpContext, QueueCount); ASSERT(IrpContext != NULL); ASSERT(IrpContext->Irp != NULL); Modified: trunk/reactos/drivers/filesystems/vfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/r… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/rw.c (original) +++ trunk/reactos/drivers/filesystems/vfat/rw.c Wed Nov 21 19:50:07 2007 @@ -139,7 +139,7 @@ ASSERT(IrpContext->FileObject); ASSERT(IrpContext->FileObject->FsContext2 != NULL); - DPRINT("VfatReadFileData(DeviceExt %x, FileObject %x, " + DPRINT("VfatReadFileData(DeviceExt %p, FileObject %p, " "Length %d, ReadOffset 0x%I64x)\n", DeviceExt, IrpContext->FileObject, Length, ReadOffset.QuadPart); @@ -358,7 +358,7 @@ BytesPerCluster = DeviceExt->FatInfo.BytesPerCluster; BytesPerSector = DeviceExt->FatInfo.BytesPerSector; - DPRINT("VfatWriteFileData(DeviceExt %x, FileObject %x, " + DPRINT("VfatWriteFileData(DeviceExt %p, FileObject %p, " "Length %d, WriteOffset 0x%I64x), '%wZ'\n", DeviceExt, IrpContext->FileObject, Length, WriteOffset, &Fcb->PathNameU); @@ -547,7 +547,7 @@ ASSERT(IrpContext); - DPRINT("VfatRead(IrpContext %x)\n", IrpContext); + DPRINT("VfatRead(IrpContext %p)\n", IrpContext); ASSERT(IrpContext->DeviceObject); @@ -789,7 +789,7 @@ ASSERT(IrpContext); - DPRINT("VfatWrite(IrpContext %x)\n", IrpContext); + DPRINT("VfatWrite(IrpContext %p)\n", IrpContext); ASSERT(IrpContext->DeviceObject); Modified: trunk/reactos/drivers/filesystems/vfat/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/s… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/shutdown.c (original) +++ trunk/reactos/drivers/filesystems/vfat/shutdown.c Wed Nov 21 19:50:07 2007 @@ -49,7 +49,7 @@ PDEVICE_EXTENSION DeviceExt; ULONG eocMark; - DPRINT("VfatShutdown(DeviceObject %x, Irp %x)\n",DeviceObject, Irp); + DPRINT("VfatShutdown(DeviceObject %p, Irp %p)\n",DeviceObject, Irp); /* FIXME: block new mount requests */ Modified: trunk/reactos/drivers/filesystems/vfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/v… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/vfat.h (original) +++ trunk/reactos/drivers/filesystems/vfat/vfat.h Wed Nov 21 19:50:07 2007 @@ -463,6 +463,7 @@ /* ------------------------------------------------------ shutdown.c */ +DRIVER_DISPATCH VfatShutdown; NTSTATUS NTAPI VfatShutdown (PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -762,6 +763,7 @@ VOID VfatFreeIrpContext(PVFAT_IRP_CONTEXT IrpContext); +DRIVER_DISPATCH VfatBuildRequest; NTSTATUS NTAPI VfatBuildRequest (PDEVICE_OBJECT DeviceObject, PIRP Irp); Modified: trunk/reactos/drivers/filesystems/vfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/v… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/volume.c (original) +++ trunk/reactos/drivers/filesystems/vfat/volume.c Wed Nov 21 19:50:07 2007 @@ -306,7 +306,7 @@ /* PRECONDITION */ ASSERT(IrpContext); - DPRINT("VfatQueryVolumeInformation(IrpContext %x)\n", IrpContext); + DPRINT("VfatQueryVolumeInformation(IrpContext %p)\n", IrpContext); if (!ExAcquireResourceSharedLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) @@ -321,7 +321,7 @@ DPRINT ("FsInformationClass %d\n", FsInformationClass); - DPRINT ("SystemBuffer %x\n", SystemBuffer); + DPRINT ("SystemBuffer %p\n", SystemBuffer); switch (FsInformationClass) { @@ -380,7 +380,7 @@ /* PRECONDITION */ ASSERT(IrpContext); - DPRINT ("VfatSetVolumeInformation(IrpContext %x)\n", IrpContext); + DPRINT ("VfatSetVolumeInformation(IrpContext %p)\n", IrpContext); if (!ExAcquireResourceExclusiveLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) @@ -394,7 +394,7 @@ DPRINT ("FsInformationClass %d\n", FsInformationClass); DPRINT ("BufferLength %d\n", BufferLength); - DPRINT ("SystemBuffer %x\n", SystemBuffer); + DPRINT ("SystemBuffer %p\n", SystemBuffer); switch(FsInformationClass) {

1 0

[cfinck] 30635: Use "call" again instead of just executing the command, so the batch waits for the application to end. But put the parameter into quotation marks, so the /? parameter is correctly passed to scut.exe.
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Wed Nov 21 19:47:28 2007 New Revision: 30635 URL: http://svn.reactos.org/svn/reactos?rev=30635&view=rev Log: Use "call" again instead of just executing the command, so the batch waits for the application to end. But put the parameter into quotation marks, so the /? parameter is correctly passed to scut.exe. Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Wed Nov 21 19:47:28 2007 @@ -31,7 +31,7 @@ goto :EOC :paramcall -"%_ROSBE_BASEDIR%\Tools\scut.exe" %* +call "%_ROSBE_BASEDIR%\Tools\scut.exe" "%*" :EOC title ReactOS Build Environment %_ROSBE_VERSION%

1 0

[cfinck] 30634: Add the greek translation for comctl32 from Wine on request of Apostolos Alexiadis (djapal AT gmail DOT com) He published it some months ago in bug 2464, then sent it to Wine and now it got applied there. As I don't want to risk new regressions, I only imported the translation from Wine instead of doing a full winesync.
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Wed Nov 21 19:27:35 2007 New Revision: 30634 URL: http://svn.reactos.org/svn/reactos?rev=30634&view=rev Log: Add the greek translation for comctl32 from Wine on request of Apostolos Alexiadis (djapal AT gmail DOT com) He published it some months ago in bug 2464, then sent it to Wine and now it got applied there. As I don't want to risk new regressions, I only imported the translation from Wine instead of doing a full winesync. Added: trunk/reactos/dll/win32/comctl32/comctl_El.rc (with props) Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc Added: trunk/reactos/dll/win32/comctl32/comctl_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_El.rc (added) +++ trunk/reactos/dll/win32/comctl32/comctl_El.rc Wed Nov 21 19:27:35 2007 @@ -1,0 +1,87 @@ +/* + * Copyright 2007 Apostolos Alexiadis (djapal(a)gmail.com) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Éäéüôçôåò ãéá %s" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Áêýñùóç", IDCANCEL,58,122,50,14 + PUSHBUTTON "&ÅöáñìïãÞ", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "ÂïÞèåéá", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Âïçèüò" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Ðñïçãïýìåíï", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Åðüìåíï >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "ÏëïêëÞñùóç", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Áêýñùóç", IDCANCEL,178,138,50,14 + PUSHBUTTON "ÂïÞèåéá", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ðáñáìåôñïðïßçóç ÌðÜñáò Åñãáëåßùí" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Êëåßóéìï", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&ÂïÞèåéá", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Ìåôáêßíçóç &ÐÜíù", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Ìåôáêßíçóç &ÊÜôù", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "Ä&éáèÝóéìá êïõìðéÜ:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&ÐñïóèÞêç ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Áöáßñåóç", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&ÊïõìðéÜ ìðÜñáò åñãáëåßùí:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Êëåßóéìï" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "ÓÞìåñá:" + IDM_GOTODAY "ÌåôÜâáóç óôá óçìåñéíÜ" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Äéá÷ùñéóôÞò" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "ÊáíÝíá" +} Propchange: trunk/reactos/dll/win32/comctl32/comctl_El.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc Wed Nov 21 19:27:35 2007 @@ -1204,6 +1204,7 @@ #include "comctl_Cs.rc" #include "comctl_De.rc" #include "comctl_En.rc" +#include "comctl_El.rc" #include "comctl_Eo.rc" #include "comctl_Es.rc" #include "comctl_Fr.rc"

1 0

[cwittich] 30633: don't assign DO_DIRECT_IO directly to DeviceObject->Flags
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 19:01:59 2007 New Revision: 30633 URL: http://svn.reactos.org/svn/reactos?rev=30633&view=rev Log: don't assign DO_DIRECT_IO directly to DeviceObject->Flags Modified: trunk/reactos/drivers/filesystems/mup/mup.c trunk/reactos/drivers/filesystems/mup/mup.h trunk/reactos/drivers/filesystems/npfs/npfs.c Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c Wed Nov 21 19:01:59 2007 @@ -72,7 +72,7 @@ } /* Initialize driver data */ - DeviceObject->Flags = DO_DIRECT_IO; + DeviceObject->Flags |= DO_DIRECT_IO; // DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsClose; DriverObject->MajorFunction[IRP_MJ_CREATE] = MupCreate; DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = MupCreate; Modified: trunk/reactos/drivers/filesystems/mup/mup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.h (original) +++ trunk/reactos/drivers/filesystems/mup/mup.h Wed Nov 21 19:01:59 2007 @@ -18,7 +18,7 @@ /* create.c */ - +DRIVER_DISPATCH MupCreate; NTSTATUS STDCALL MupCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); Modified: trunk/reactos/drivers/filesystems/npfs/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.c (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.c Wed Nov 21 19:01:59 2007 @@ -69,7 +69,7 @@ } /* initialize the device object */ - DeviceObject->Flags = DO_DIRECT_IO; + DeviceObject->Flags |= DO_DIRECT_IO; /* initialize the device extension */ DeviceExtension = DeviceObject->DeviceExtension;

1 0

[cfinck] 30632: Italian translation for mstsc by Gabriel Ilardi (gabrielilardi AT hotmail DOT it) See issue #2794 for more details.
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Wed Nov 21 18:58:33 2007 New Revision: 30632 URL: http://svn.reactos.org/svn/reactos?rev=30632&view=rev Log: Italian translation for mstsc by Gabriel Ilardi (gabrielilardi AT hotmail DOT it) See issue #2794 for more details. Added: trunk/reactos/base/applications/mstsc/lang/it-IT.rc (with props) Modified: trunk/reactos/base/applications/mstsc/rsrc.rc Added: trunk/reactos/base/applications/mstsc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/it-IT.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/it-IT.rc Wed Nov 21 18:58:33 2007 @@ -1,0 +1,63 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Impostazioni di accesso",IDC_STATIC,7,7,228,89 + GROUPBOX "Impostazioni di connessione",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "Digitare il nome o indirizzo del computer",IDC_STATIC,47,24,81,8 + LTEXT "Computer:",IDC_STATIC,47,41,25,8 + LTEXT "Nome utente:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Salva",IDC_SAVE,67,139,50,14 + PUSHBUTTON "Salva con nome...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "Apri...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "Salvare le impostazioni correnti o aprire una configurazione salvata",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Dimensioni desktop remoto",IDC_STATIC,7,7,228,68 + GROUPBOX "Colori",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "Scegliere la dimensione del desktop remoto. Trascinare verso destra per ottenere la visualizzazione a schermo intero",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 + LTEXT "Nota: Le impostazioni del computer remoto potrebbereo avere la precedenza su questa impostazione.",IDC_STATIC,56,143,165,18 + LTEXT "Min",IDC_STATIC,35,42,15,8 + LTEXT "Max",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Connessione desktop remoto" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Connetti",IDOK,147,245,50,14 + PUSHBUTTON "Annulla",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "Generale" + IDS_TAB_DISPLAY "Visualizza" + IDS_256COLORS "256 Colori" + IDS_HIGHCOLOR15 "65.536 colori (15 bit)" + IDS_HIGHCOLOR16 "65.536 colori (16 bit)" + IDS_HIGHCOLOR24 "16,8 milioni di colori (24 bit)" + IDS_PIXEL "%lux%lu Pixel" + IDS_FULLSCREEN "Schermo Intero" + IDS_BROWSESERVER "<Cerca...>" + IDS_HEADERTEXT1 "Desktop Remoto" + IDS_HEADERTEXT2 "Connessione" +END Propchange: trunk/reactos/base/applications/mstsc/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Wed Nov 21 18:58:33 2007 @@ -18,5 +18,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" //#include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[gedmurphy] 30631: add some basic command line parsing
by gedmurphy＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: gedmurphy Date: Wed Nov 21 18:58:00 2007 New Revision: 30631 URL: http://svn.reactos.org/svn/reactos?rev=30631&view=rev Log: add some basic command line parsing Removed: trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.sln trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj Modified: trunk/reactos/base/applications/mstsc/win32.c Removed: trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… ============================================================================== --- trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.sln (original) +++ trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.sln (removed) @@ -1,32 +1,0 @@ -ï»¿ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mstsc", "mstsc_vc8_auto.vcproj", "{B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug - ReactOS headers|Win32 = Debug - ReactOS headers|Win32 - Debug|Win32 = Debug|Win32 - Release - ReactOS headers|Win32 = Release - ReactOS headers|Win32 - Release|Win32 = Release|Win32 - Speed - ReactOS headers|Win32 = Speed - ReactOS headers|Win32 - Speed|Win32 = Speed|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Debug - ReactOS headers|Win32.ActiveCfg = Debug - ReactOS headers|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Debug - ReactOS headers|Win32.Build.0 = Debug - ReactOS headers|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Debug|Win32.Build.0 = Debug|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Release - ReactOS headers|Win32.ActiveCfg = Release - ReactOS headers|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Release - ReactOS headers|Win32.Build.0 = Release - ReactOS headers|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Release|Win32.ActiveCfg = Release|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Release|Win32.Build.0 = Release|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Speed - ReactOS headers|Win32.ActiveCfg = Speed - ReactOS headers|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Speed - ReactOS headers|Win32.Build.0 = Speed - ReactOS headers|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Speed|Win32.ActiveCfg = Speed|Win32 - {B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}.Speed|Win32.Build.0 = Speed|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal Removed: trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… ============================================================================== --- trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj (original) +++ trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj (removed) @@ -1,649 +1,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="mstsc" - ProjectGUID="{B6EF8F33-E4EA-495D-9E94-9A6ADBC235ED}" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\output-i386\base\applications\mstsc\vc8\Debug" - IntermediateDirectory="..\..\..\obj-i386\base\applications\mstsc\vc8\Debug" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos" - PreprocessorDefinitions="DBG=1;KDBG=1;STDCALL=__stdcall;_DEBUG;_LIB;_M_IX86;_SEH_ENABLE_TRACE;_WIN32_IE=0x600;_WIN32_WINNT=0x501;_X86_;__REACTOS__;__i386__;_CRT_SECURE_NO_DEPRECATE;UNICODE" - MinimalRebuild="false" - BasicRuntimeChecks="0" - RuntimeLibrary="1" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="false" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib comctl32.lib ws2_32.lib" - OutputFile="$(OutDir)/mstsc.exe" - LinkIncremental="2" - AdditionalLibraryDirectories="..\..\..\output-i386\dll\win32\kernel32\vc8\Debug;..\..\..\output-i386\dll\win32\user32\vc8\Debug;..\..\..\output-i386\dll\win32\gdi32\vc8\Debug;..\..\..\output-i386\dll\win32\comctl32\vc8\Debug;..\..\..\output-i386\dll\win32\ws2_32\vc8\Debug" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/mstsc.pdb" - SubSystem="2" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\..\..\output-i386\base\applications\mstsc\vc8\Release" - IntermediateDirectory="..\..\..\obj-i386\base\applications\mstsc\vc8\Release" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - FavorSizeOrSpeed="1" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos" - PreprocessorDefinitions=";DBG=1;KDBG=1;STDCALL=__stdcall;_LIB;_M_IX86;_SEH_ENABLE_TRACE;_WIN32_IE=0x600;_WIN32_WINNT=0x501;_X86_;__REACTOS__;__i386__" - StringPooling="true" - MinimalRebuild="false" - BasicRuntimeChecks="0" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="false" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib comctl32.lib ws2_32.lib" - OutputFile="$(OutDir)/mstsc.exe" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\output-i386\dll\win32\kernel32\vc8\Release;..\..\..\output-i386\dll\win32\user32\vc8\Release;..\..\..\output-i386\dll\win32\gdi32\vc8\Release;..\..\..\output-i386\dll\win32\comctl32\vc8\Release;..\..\..\output-i386\dll\win32\ws2_32\vc8\Release" - GenerateDebugInformation="true" - SubSystem="2" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Speed|Win32" - OutputDirectory="..\..\..\output-i386\base\applications\mstsc\vc8\Speed" - IntermediateDirectory="..\..\..\obj-i386\base\applications\mstsc\vc8\Speed" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos" - PreprocessorDefinitions=";DBG=1;KDBG=1;STDCALL=__stdcall;_LIB;_M_IX86;_SEH_ENABLE_TRACE;_WIN32_IE=0x600;_WIN32_WINNT=0x501;_X86_;__REACTOS__;__i386__" - MinimalRebuild="true" - BasicRuntimeChecks="0" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="false" - UsePrecompiledHeader="0" - WarningLevel="0" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib comctl32.lib ws2_32.lib" - OutputFile="$(OutDir)/mstsc.exe" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\output-i386\dll\win32\kernel32\vc8\Speed;..\..\..\output-i386\dll\win32\user32\vc8\Speed;..\..\..\output-i386\dll\win32\gdi32\vc8\Speed;..\..\..\output-i386\dll\win32\comctl32\vc8\Speed;..\..\..\output-i386\dll\win32\ws2_32\vc8\Speed" - GenerateDebugInformation="false" - SubSystem="2" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug - ReactOS headers|Win32" - OutputDirectory="..\..\..\output-i386\base\applications\mstsc\vc8\Debug - ReactOS headers" - IntermediateDirectory="..\..\..\obj-i386\base\applications\mstsc\vc8\Debug - ReactOS headers" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL" - PreprocessorDefinitions=";DBG=1;KDBG=1;_DEBUG;_LIB;_M_IX86;_SEH_ENABLE_TRACE;_WIN32_IE=0x600;_WIN32_WINNT=0x501;_X86_;__REACTOS__;__i386__" - MinimalRebuild="false" - BasicRuntimeChecks="0" - RuntimeLibrary="1" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="false" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib comctl32.lib ws2_32.lib" - OutputFile="$(OutDir)/mstsc.exe" - LinkIncremental="2" - AdditionalLibraryDirectories="..\..\..\output-i386\dll\win32\kernel32\vc8\Debug - ReactOS headers;..\..\..\output-i386\dll\win32\user32\vc8\Debug - ReactOS headers;..\..\..\output-i386\dll\win32\gdi32\vc8\Debug - ReactOS headers;..\..\..\output-i386\dll\win32\comctl32\vc8\Debug - ReactOS headers;..\..\..\output-i386\dll\win32\ws2_32\vc8\Debug - ReactOS headers" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/mstsc.pdb" - SubSystem="2" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release - ReactOS headers|Win32" - OutputDirectory="..\..\..\output-i386\base\applications\mstsc\vc8\Release - ReactOS headers" - IntermediateDirectory="..\..\..\obj-i386\base\applications\mstsc\vc8\Release - ReactOS headers" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - FavorSizeOrSpeed="1" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL" - PreprocessorDefinitions=";DBG=1;KDBG=1;_LIB;_M_IX86;_SEH_ENABLE_TRACE;_WIN32_IE=0x600;_WIN32_WINNT=0x501;_X86_;__REACTOS__;__i386__" - StringPooling="true" - MinimalRebuild="false" - BasicRuntimeChecks="0" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="false" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib comctl32.lib ws2_32.lib" - OutputFile="$(OutDir)/mstsc.exe" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\output-i386\dll\win32\kernel32\vc8\Release - ReactOS headers;..\..\..\output-i386\dll\win32\user32\vc8\Release - ReactOS headers;..\..\..\output-i386\dll\win32\gdi32\vc8\Release - ReactOS headers;..\..\..\output-i386\dll\win32\comctl32\vc8\Release - ReactOS headers;..\..\..\output-i386\dll\win32\ws2_32\vc8\Release - ReactOS headers" - GenerateDebugInformation="true" - SubSystem="2" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Speed - ReactOS headers|Win32" - OutputDirectory="..\..\..\output-i386\base\applications\mstsc\vc8\Speed - ReactOS headers" - IntermediateDirectory="..\..\..\obj-i386\base\applications\mstsc\vc8\Speed - ReactOS headers" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL" - PreprocessorDefinitions=";DBG=1;KDBG=1;_LIB;_M_IX86;_SEH_ENABLE_TRACE;_WIN32_IE=0x600;_WIN32_WINNT=0x501;_X86_;__REACTOS__;__i386__" - MinimalRebuild="true" - BasicRuntimeChecks="0" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="false" - UsePrecompiledHeader="0" - WarningLevel="0" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib comctl32.lib ws2_32.lib" - OutputFile="$(OutDir)/mstsc.exe" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\output-i386\dll\win32\kernel32\vc8\Speed - ReactOS headers;..\..\..\output-i386\dll\win32\user32\vc8\Speed - ReactOS headers;..\..\..\output-i386\dll\win32\gdi32\vc8\Speed - ReactOS headers;..\..\..\output-i386\dll\win32\comctl32\vc8\Speed - ReactOS headers;..\..\..\output-i386\dll\win32\ws2_32\vc8\Speed - ReactOS headers" - GenerateDebugInformation="false" - SubSystem="2" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S" - > - <File - RelativePath=".\bitmap.c" - > - </File> - <File - RelativePath=".\bsops.c" - > - </File> - <File - RelativePath=".\cache.c" - > - </File> - <File - RelativePath=".\channels.c" - > - </File> - <File - RelativePath=".\connectdialog.c" - > - </File> - <File - RelativePath=".\iso.c" - > - </File> - <File - RelativePath=".\licence.c" - > - </File> - <File - RelativePath=".\mcs.c" - > - </File> - <File - RelativePath=".\mppc.c" - > - </File> - <File - RelativePath=".\orders.c" - > - </File> - <File - RelativePath=".\pstcache.c" - > - </File> - <File - RelativePath=".\rdp.c" - > - </File> - <File - RelativePath=".\rdp5.c" - > - </File> - <File - RelativePath=".\secure.c" - > - </File> - <File - RelativePath=".\settings.c" - > - </File> - <File - RelativePath=".\ssl_calls.c" - > - </File> - <File - RelativePath=".\tcp.c" - > - </File> - <File - RelativePath=".\uimain.c" - > - </File> - <File - RelativePath=".\win32.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - <File - RelativePath=".\rdc.rc" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Wed Nov 21 18:58:00 2007 @@ -965,340 +965,69 @@ } -#if 0 -/*****************************************************************************/ -static int -mi_process_a_param(char * param1, int state) -{ - char * p; - - if (state == 0) - { - if (strcmp(param1, "-g") == 0 || strcmp(param1, "geometry") == 0) + +static BOOL +ParseCommandLine(LPWSTR lpCmdLine, + PRDPSETTINGS pRdpSettings, + BOOL *bSkipDlg) +{ + LPWSTR lpStr = lpCmdLine; + WCHAR szSeps[] = L"/"; + LPWSTR lpToken; + BOOL bRet = TRUE; + INT i; + + *bSkipDlg = TRUE; + + if (*lpCmdLine != L'/') { - state = 1; - } - if (strcmp(param1, "-t") == 0 || strcmp(param1, "port") == 0) - { - state = 2; - } - if (strcmp(param1, "-a") == 0 || strcmp(param1, "bpp") == 0) - { - state = 3; - } - if (strcmp(param1, "-f") == 0 || strcmp(param1, "fullscreen") == 0) - { - g_fullscreen = 1; - } - if (strcmp(param1, "-u") == 0 || strcmp(param1, "username") == 0) - { - state = 5; - } - if (strcmp(param1, "-p") == 0 || strcmp(param1, "password") == 0) - { - state = 6; - } - if (strcmp(param1, "-d") == 0 || strcmp(param1, "domain") == 0) - { - state = 7; - } - if (strcmp(param1, "-s") == 0 || strcmp(param1, "shell") == 0) - { - state = 8; - } - if (strcmp(param1, "-c") == 0 || strcmp(param1, "directory") == 0) - { - state = 9; - } - if (strcmp(param1, "-n") == 0 || strcmp(param1, "hostname") == 0) - { - state = 10; - } - } - else - { - if (state == 1) /* -g widthxheight*/ - { - state = 0; - if (strcmp(param1, "workarea") == 0) - { - g_workarea = 1; - return state; - } - g_width = strtol(param1, &p, 10); - if (g_width <= 0) - { - mi_error("invalid geometry\r\n"); - } - if (*p == 'x') - { - g_height = strtol(p + 1, &p, 10); - } - if (g_height <= 0) - { - mi_error("invalid geometry\r\n"); - } - g_width_height_set = 1; - } - if (state == 2) /* -t port */ - { - state = 0; - g_tcp_port_rdp = atol(param1); - } - if (state == 3) /* -a bpp */ - { - state = 0; - g_server_depth = atol(param1); - if (g_server_depth != 8 && g_server_depth != 15 && g_server_depth != 16 && g_server_depth != 24) - { - mi_error("invalid server bpp\r\n"); - } - } - if (state == 5) /* -u username */ - { - state = 0; - strcpy(g_username, param1); - } - if (state == 6) /* -p password */ - { - state = 0; - strcpy(g_password, param1); - } - if (state == 7) /* -d domain */ - { - state = 0; - strcpy(g_domain, param1); - } - if (state == 8) /* -s shell */ - { - state = 0; - strcpy(g_shell, param1); - } - if (state == 9) /* -c workin directory*/ - { - state = 0; - strcpy(g_directory, param1); - } - if (state == 10) /* -n host name*/ - { - state = 0; - strcpy(g_hostname, param1); - } - } - return state; -} - -/*****************************************************************************/ -static int -mi_post_param(void) -{ - /* after parameters */ - if (g_fullscreen) - { - g_xoff = 0; - g_yoff = 0; - if (!g_width_height_set) - { - g_width = g_screen_width; - g_height = g_screen_height; - } - } - else if (g_workarea) - { - g_xoff = GetSystemMetrics(SM_CXEDGE) * 2; - g_yoff = GetSystemMetrics(SM_CYCAPTION) + - GetSystemMetrics(SM_CYEDGE) * 2; - g_width = g_screen_width; - g_height = g_screen_height; - g_height = (g_height - g_yoff) - g_xoff - 20; /* todo */ - g_width_height_set = 1; - } - else - { - g_xoff = GetSystemMetrics(SM_CXEDGE) * 2; - g_yoff = GetSystemMetrics(SM_CYCAPTION) + - GetSystemMetrics(SM_CYEDGE) * 2; - } - g_width = g_width & (~3); - return 1; -} - - -/*****************************************************************************/ -static int -mi_check_config_file(void) -{ - HANDLE fd; - DWORD count; - TCHAR filename[256]; - char buffer[256]; - char vname[256]; - char value[256]; - int index; - int mode; - int vnameindex; - int valueindex; - int state; - int rv; - - rv = 0; - mode = 0; - vnameindex = 0; - valueindex = 0; - vname[vnameindex] = 0; - value[valueindex] = 0; - str_to_uni(filename, ".\\winrdesktop.ini"); - - fd = CreateFile(filename, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - count = 255; - while (ReadFile(fd, buffer, count, &count, NULL)) - { - if (count == 0) - { - break; - } - buffer[count] = 0; - index = 0; - while (index < (int) count) - { - if (buffer[index] == '=') - { - mode = 1; - } - else if (buffer[index] == 10 || buffer[index] == 13) - { - mode = 0; - vname[vnameindex] = 0; - value[valueindex] = 0; - if (strlen(vname) > 0 || strlen(value) > 0) - { - if (strcmp(vname, "server") == 0) - { - strcpy(g_servername, value); - rv = 1; - } - else - { - state = mi_process_a_param(vname, 0); - mi_process_a_param(value, state); - } - } - vnameindex = 0; - valueindex = 0; - } - else if (mode == 0) - { - vname[vnameindex] = buffer[index]; - vnameindex++; - } - else - { - value[valueindex] = buffer[index]; - valueindex++; - } - index++; - } - count = 255; - } - CloseHandle(fd); - if (rv) - { - mi_post_param(); - } - return rv; -} - - -/*****************************************************************************/ -/* process the command line parameters */ -/* returns boolean, non zero is ok */ -static int -mi_process_cl(LPTSTR lpCmdLine) -{ - char param[256]; - char param1[256]; - TCHAR l_username[256]; - DWORD size; - int len; - int i; - int i1; - int state; - - strcpy(g_hostname, "test"); - strcpy(g_username, "pda"); - /* get username and convert it from unicode */ - size = 255; - - if (GetUserName(l_username, &size)) - { - for (i = size; i >= 0; i--) - { - g_username[i] = (char) l_username[i]; - } - g_username[size] = 0; - } - else - { - mi_show_error("GetUserName"); - } - - /* get computer name */ - if (gethostname(g_hostname, 255) != 0) - { - mi_show_error("gethostname"); - } - /* defaults */ - strcpy(g_servername, "127.0.0.1"); - g_server_depth = 8; - g_screen_width = GetSystemMetrics(SM_CXSCREEN); - g_screen_height = GetSystemMetrics(SM_CYSCREEN); - /* process parameters */ - i1 = 0; - state = 0; - len = lstrlen(lpCmdLine); - if (len == 0) - { - return mi_check_config_file(); - } - for (i = 0; i < len; i++) - { - if (lpCmdLine[i] != 32 && lpCmdLine[i] != 9) /* space or tab */ - { - param[i1] = (char) lpCmdLine[i]; - i1++; + LoadRdpSettingsFromFile(pRdpSettings, lpCmdLine); } else { - param[i1] = 0; - i1 = 0; - strcpy(param1, param); - state = mi_process_a_param(param1, state); - strcpy(g_servername, param1); + /* default to 16bpp */ + SetIntegerToSettings(pRdpSettings, L"session bpp", 16); + + lpToken = wcstok(lpStr, szSeps); + while (lpToken) + { + if (wcsncmp(lpToken, L"edit", 4) == 0) + { + lpToken += 5; + LoadRdpSettingsFromFile(pRdpSettings, lpToken); + *bSkipDlg = FALSE; + break; + } + + if (*lpToken == L'v') + { + lpToken += 2; + SetStringToSettings(pRdpSettings, L"full address", lpToken); + } + else if (*lpToken == L'w') + { + lpToken += 2; + SetIntegerToSettings(pRdpSettings, L"desktopwidth", _wtoi(lpToken)); + } + else if (*lpToken == L'h') + { + lpToken += 2; + SetIntegerToSettings(pRdpSettings, L"desktopheight", _wtoi(lpToken)); + } + + lpToken = wcstok(NULL, szSeps); + } } - } - if (i1 > 0) - { - param[i1] = 0; - strcpy(param1, param); - state = mi_process_a_param(param1, state); - strcpy(g_servername, param1); - } - if (state == 0) - { - mi_post_param(); - } - return (state == 0); -} -#endif + + return bRet; +} /*****************************************************************************/ int WINAPI wWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPWSTR lpCmdLine, - int nCmdShow) + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nCmdShow) { PRDPSETTINGS pRdpSettings; WSADATA d; @@ -1316,11 +1045,15 @@ if (InitRdpSettings(pRdpSettings)) { - LoadRdpSettingsFromFile(pRdpSettings, NULL); - - //mi_process_cl(lpCmdLine) - if (OpenRDPConnectDialog(hInstance, - pRdpSettings)) + BOOL bSkipDlg = FALSE; + + if (*lpCmdLine) + ParseCommandLine(lpCmdLine, pRdpSettings,&bSkipDlg); + else + LoadRdpSettingsFromFile(pRdpSettings, NULL); + + if (bSkipDlg || OpenRDPConnectDialog(hInstance, + pRdpSettings)) { char szValue[MAXVALUE];

1 0

[cwittich] 30630: fix format strings
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 18:55:58 2007 New Revision: 30630 URL: http://svn.reactos.org/svn/reactos?rev=30630&view=rev Log: fix format strings Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/rw.c trunk/reactos/drivers/filesystems/npfs/volume.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c Wed Nov 21 18:55:58 2007 @@ -532,7 +532,7 @@ Ccb->PipeState = FILE_PIPE_LISTENING_STATE; Ccb->OtherSide = NULL; - DPRINT("CCB: %x\n", Ccb); + DPRINT("CCB: %p\n", Ccb); KeInitializeEvent(&Ccb->ConnectEvent, SynchronizationEvent, FALSE); KeInitializeEvent(&Ccb->ReadEvent, SynchronizationEvent, FALSE); @@ -718,7 +718,7 @@ return STATUS_SUCCESS; } - DPRINT("CCB %x\n", Ccb); + DPRINT("CCB %p\n", Ccb); Fcb = Ccb->Fcb; DPRINT("Closing pipe %wZ\n", &Fcb->PipeName); Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c Wed Nov 21 18:55:58 2007 @@ -54,7 +54,7 @@ PNPFS_CCB Ccb; BOOLEAN Complete = FALSE; - DPRINT("NpfsReadWriteCancelRoutine(DeviceObject %x, Irp %x)\n", DeviceObject, Irp); + DPRINT("NpfsReadWriteCancelRoutine(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); IoReleaseCancelSpinLock(Irp->CancelIrql); Modified: trunk/reactos/drivers/filesystems/npfs/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/volume.c (original) +++ trunk/reactos/drivers/filesystems/npfs/volume.c Wed Nov 21 18:55:58 2007 @@ -73,7 +73,7 @@ ASSERT(DeviceObject != NULL); ASSERT(Irp != NULL); - DPRINT("NpfsQueryVolumeInformation(DeviceObject %x, Irp %x)\n", + DPRINT("NpfsQueryVolumeInformation(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); @@ -83,7 +83,7 @@ SystemBuffer = Irp->AssociatedIrp.SystemBuffer; DPRINT("FsInformationClass %d\n", FsInformationClass); - DPRINT("SystemBuffer %x\n", SystemBuffer); + DPRINT("SystemBuffer %p\n", SystemBuffer); switch (FsInformationClass) {

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007