Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60029: [ATL] * Add _ATL_VER definition.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 10:20:46 2013 New Revision: 60029 URL: http://svn.reactos.org/svn/reactos?rev=60029&view=rev Log: [ATL] * Add _ATL_VER definition. Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] Wed Sep 11 10:20:46 2013 @@ -1,5 +1,7 @@ -add_definitions(-D__WINESRC__) +add_definitions( + -D__WINESRC__ + -D_ATL_VER=_ATL_VER_30) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600)

1 0

[ion] 60028: [NPFS-NEW]: NpfsCreate: 339 tests executed (0 marked as todo, 0 failures), 0 skipped. NpfsConnect: 679 tests executed (0 marked as todo, 0 failures), 0 skipped. NpfsReadWrite: 7154 tes...
by ion＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: ion Date: Wed Sep 11 07:05:15 2013 New Revision: 60028 URL: http://svn.reactos.org/svn/reactos?rev=60028&view=rev Log: [NPFS-NEW]: NpfsCreate: 339 tests executed (0 marked as todo, 0 failures), 0 skipped. NpfsConnect: 679 tests executed (0 marked as todo, 0 failures), 0 skipped. NpfsReadWrite: 7154 tests executed (0 marked as todo, 0 failures), 0 skipped. NpfsReadWriteAsync: 1176 tests executed (0 marked as todo, 0 failures), 0 skipped. 'Nuff said. Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c trunk/reactos/drivers/filesystems/npfs_new/close.c trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/main.c trunk/reactos/drivers/filesystems/npfs_new/read.c trunk/reactos/drivers/filesystems/npfs_new/statesup.c trunk/reactos/drivers/filesystems/npfs_new/write.c trunk/reactos/drivers/filesystems/npfs_new/writesup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -12,6 +12,7 @@ PNP_CCB Ccb; ULONG NamedPipeEnd; PLIST_ENTRY ThisEntry, NextEntry; + PIRP LocalIrp; PAGED_CODE(); IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -41,8 +42,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -12,6 +12,7 @@ PNP_CCB Ccb; ULONG NamedPipeEnd; PLIST_ENTRY ThisEntry, NextEntry; + PIRP LocalIrp; PAGED_CODE(); IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -40,8 +41,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } Irp->IoStatus.Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -217,11 +217,6 @@ FileName = FileObject->FileName; DesiredAccess = IoStack->Parameters.CreatePipe.SecurityContext->DesiredAccess; - DPRINT1("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - DPRINT1("FileObject %p\n", FileObject); - DPRINT1("FileName %wZ\n", &FileObject->FileName); - DPRINT1("FileName->Length: %hu RelatedFileObject: %p\n", FileName.Length, RelatedFileObject); - FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); @@ -346,7 +341,7 @@ NextEntry = NextEntry->Flink; ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(ListIrp, IO_DISK_INCREMENT); + IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); } FsRtlExitFileSystem(); @@ -636,8 +631,6 @@ IO_STATUS_BLOCK IoStatus; PIRP ListIrp; - DPRINT1("NpFsdCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - InitializeListHead(&LocalList); Process = IoGetRequestorProcess(Irp); @@ -658,10 +651,6 @@ FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); - - DPRINT1("FileObject %p\n", FileObject); - DPRINT1("FileName %wZ\n", &FileObject->FileName); - DPRINT1("FileName->Length: %hu RelatedFileObject: %p\n", FileName.Length, RelatedFileObject); if (RelatedFileObject) { @@ -754,13 +743,13 @@ NextEntry = NextEntry->Flink; ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(ListIrp, IO_DISK_INCREMENT); + IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); } FsRtlExitFileSystem(); Irp->IoStatus = IoStatus; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); return IoStatus.Status; } Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -192,6 +192,7 @@ PSECURITY_CLIENT_CONTEXT ClientSecurityContext; BOOLEAN CompleteWrites, FirstEntry; PLIST_ENTRY NextEntry, ThisEntry; + PIRP LocalIrp; if (DeviceObject) IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -263,7 +264,7 @@ NpFreeClientSecurityContext(ClientSecurityContext); Irp->IoStatus.Status = STATUS_CANCELLED; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); NextEntry = List.Flink; while (NextEntry != &List) @@ -271,8 +272,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } } @@ -307,7 +308,10 @@ Irp ? Irp->Tail.Overlay.Thread : PsGetCurrentThread(), &ClientContext); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + return Status; + } } switch (Type) @@ -317,29 +321,31 @@ case 3: ASSERT(Irp != NULL); - DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, sizeof(*DataEntry), NPFS_DATA_ENTRY_TAG); - if (DataEntry) - { - DataEntry->DataEntryType = Type; - DataEntry->QuotaInEntry = 0; - DataEntry->Irp = Irp; - DataEntry->DataSize = DataSize; - DataEntry->ClientSecurityContext = ClientContext; - ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); - Status = STATUS_PENDING; - break; - } - - NpFreeClientSecurityContext(ClientContext); - return STATUS_INSUFFICIENT_RESOURCES; - + DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, + sizeof(*DataEntry), + NPFS_DATA_ENTRY_TAG); + if (!DataEntry) + { + NpFreeClientSecurityContext(ClientContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + + DataEntry->DataEntryType = Type; + DataEntry->QuotaInEntry = 0; + DataEntry->Irp = Irp; + DataEntry->DataSize = DataSize; + DataEntry->ClientSecurityContext = ClientContext; + ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); + Status = STATUS_PENDING; + break; + case Buffered: EntrySize = sizeof(*DataEntry); - if (Who != Empty) - { - EntrySize = DataSize + sizeof(*DataEntry); - if ((DataSize + sizeof(*DataEntry)) < DataSize) + if (Who != ReadEntries) + { + EntrySize += DataSize; + if (EntrySize < DataSize) { NpFreeClientSecurityContext(ClientContext); return STATUS_INVALID_PARAMETER; @@ -350,14 +356,16 @@ if (DataQueue->Quota - DataQueue->QuotaUsed < QuotaInEntry) { QuotaInEntry = DataQueue->Quota - DataQueue->QuotaUsed; - HasSpace = 1; + HasSpace = TRUE; } else { - HasSpace = 0; - } - - DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, EntrySize, NPFS_DATA_ENTRY_TAG); + HasSpace = FALSE; + } + + DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, + EntrySize, + NPFS_DATA_ENTRY_TAG); if (!DataEntry) { NpFreeClientSecurityContext(ClientContext); @@ -382,9 +390,9 @@ { _SEH2_TRY { - RtlCopyMemory(DataEntry + 1, - Irp ? Irp->UserBuffer: Buffer, - DataSize); + RtlCopyMemory(DataEntry + 1, + Irp ? Irp->UserBuffer: Buffer, + DataSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -399,12 +407,14 @@ } else { - DataEntry->Irp = 0; + DataEntry->Irp = NULL; Status = STATUS_SUCCESS; } - - ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); - } + + ASSERT((DataQueue->QueueState == Empty) || + (DataQueue->QueueState == Who)); + } + break; default: ASSERT(FALSE); @@ -429,7 +439,8 @@ DataQueue->QuotaUsed += DataEntry->QuotaInEntry; DataQueue->QueueState = Who; DataQueue->BytesInQueue += DataEntry->DataSize; - ++DataQueue->EntriesInQueue; + DataQueue->EntriesInQueue++; + if (ByteOffset) { DataQueue->ByteOffset = ByteOffset; @@ -448,9 +459,8 @@ IoSetCancelRoutine(Irp, NpCancelDataQueueIrp); - if (Irp->Cancel) - { - IoSetCancelRoutine(Irp, NULL); + if ((Irp->Cancel) && (IoSetCancelRoutine(Irp, NULL))) + { NpCancelDataQueueIrp(NULL, Irp); } } Modified: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -102,6 +102,7 @@ NTSTATUS Status; LIST_ENTRY List; PLIST_ENTRY NextEntry, ThisEntry; + PIRP LocalIrp; PAGED_CODE(); InitializeListHead(&List); @@ -119,8 +120,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -572,6 +572,7 @@ LIST_ENTRY List; PLIST_ENTRY NextEntry, ThisEntry; NTSTATUS Status; + PIRP LocalIrp; PAGED_CODE(); InitializeListHead(&List); @@ -667,8 +668,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } return Status; Modified: trunk/reactos/drivers/filesystems/npfs_new/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -61,8 +61,7 @@ /* Initialize the device object */ NpfsDeviceObject = DeviceObject; - DeviceObject->Flags |= DO_DIRECT_IO; - DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + DeviceObject->Flags |= DO_LONG_TERM_REQUESTS; /* Initialize the Volume Control Block (VCB) */ NpVcb = DeviceObject->DeviceExtension; Modified: trunk/reactos/drivers/filesystems/npfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -144,6 +144,7 @@ IO_STATUS_BLOCK IoStatus; LIST_ENTRY List; PLIST_ENTRY NextEntry, ThisEntry; + PIRP LocalIrp; PAGED_CODE(); NpSlowReadCalls++; @@ -168,8 +169,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/npfs_new/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -235,6 +235,7 @@ PLIST_ENTRY NextEntry; PNP_DATA_QUEUE ReadQueue, WriteQueue, DataQueue; PNP_EVENT_BUFFER EventBuffer; + PIRP ListIrp; NonPagedCcb = Ccb->NonPagedCcb; Fcb = Ccb->Fcb; @@ -249,11 +250,11 @@ { NextEntry = RemoveHeadList(&Ccb->IrpList); - Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); - - if (IoSetCancelRoutine(Irp, NULL)) - { - Irp->IoStatus.Status = STATUS_PIPE_BROKEN; + ListIrp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + if (IoSetCancelRoutine(ListIrp, NULL)) + { + ListIrp->IoStatus.Status = STATUS_PIPE_BROKEN; InsertTailList(List, NextEntry); } else @@ -297,11 +298,11 @@ while (DataQueue->QueueState != Empty) { - Irp = NpRemoveDataQueueEntry(DataQueue, FALSE, List); - if (Irp) - { - Irp->IoStatus.Status = STATUS_PIPE_BROKEN; - InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + ListIrp = NpRemoveDataQueueEntry(DataQueue, FALSE, List); + if (ListIrp) + { + ListIrp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, &ListIrp->Tail.Overlay.ListEntry); } } @@ -342,21 +343,21 @@ while (ReadQueue->QueueState != Empty) { - Irp = NpRemoveDataQueueEntry(ReadQueue, FALSE, List); - if (Irp) - { - Irp->IoStatus.Status = STATUS_PIPE_BROKEN; - InsertTailList(List, &Irp->Tail.Overlay.ListEntry); - } - } - - while (WriteQueue->QueueState == WriteEntries) - { - Irp = NpRemoveDataQueueEntry(WriteQueue, FALSE, List); - if (Irp) - { - Irp->IoStatus.Status = STATUS_PIPE_BROKEN; - InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + ListIrp = NpRemoveDataQueueEntry(ReadQueue, FALSE, List); + if (ListIrp) + { + ListIrp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, &ListIrp->Tail.Overlay.ListEntry); + } + } + + while (WriteQueue->QueueState == ReadEntries) + { + ListIrp = NpRemoveDataQueueEntry(WriteQueue, FALSE, List); + if (ListIrp) + { + ListIrp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, &ListIrp->Tail.Overlay.ListEntry); } } Modified: trunk/reactos/drivers/filesystems/npfs_new/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -40,21 +40,25 @@ NonPagedCcb = Ccb->NonPagedCcb; ExAcquireResourceExclusiveLite(&NonPagedCcb->Lock, TRUE); - if (Ccb->NamedPipeState == FILE_PIPE_DISCONNECTED_STATE) - { - IoStatus->Status = STATUS_PIPE_DISCONNECTED; + if (Ccb->NamedPipeState != FILE_PIPE_CONNECTED_STATE) + { + if (Ccb->NamedPipeState == FILE_PIPE_DISCONNECTED_STATE) + { + IoStatus->Status = STATUS_PIPE_DISCONNECTED; + } + else if (Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE) + { + IoStatus->Status = STATUS_PIPE_LISTENING; + } + else + { + ASSERT(Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE); + IoStatus->Status = STATUS_PIPE_CLOSING; + } + WriteOk = TRUE; goto Quickie; } - - if (Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE || Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE) - { - IoStatus->Status = Ccb->NamedPipeState != FILE_PIPE_LISTENING_STATE ? STATUS_PIPE_LISTENING : STATUS_PIPE_CLOSING; - WriteOk = TRUE; - goto Quickie; - } - - ASSERT(Ccb->NamedPipeState == FILE_PIPE_CONNECTED_STATE); if ((NamedPipeEnd == FILE_PIPE_SERVER_END && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_INBOUND) || (NamedPipeEnd == FILE_PIPE_CLIENT_END && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_OUTBOUND)) @@ -111,6 +115,7 @@ Thread, List); IoStatus->Status = Status; + if (Status == STATUS_MORE_PROCESSING_REQUIRED) { ASSERT(WriteQueue->QueueState != ReadEntries); @@ -153,6 +158,7 @@ IO_STATUS_BLOCK IoStatus; LIST_ENTRY List; PLIST_ENTRY NextEntry, ThisEntry; + PIRP ListIrp; PAGED_CODE(); NpSlowWriteCalls++; @@ -178,8 +184,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); } FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/npfs_new/writesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -3,14 +3,14 @@ NTSTATUS NTAPI NpWriteDataQueue(IN PNP_DATA_QUEUE WriteQueue, - IN ULONG Mode, - IN PVOID OutBuffer, - IN ULONG OutBufferSize, - IN ULONG PipeType, - OUT PULONG BytesWritten, - IN PNP_CCB Ccb, - IN ULONG NamedPipeEnd, - IN PETHREAD Thread, + IN ULONG Mode, + IN PVOID OutBuffer, + IN ULONG OutBufferSize, + IN ULONG PipeType, + OUT PULONG BytesNotWritten, + IN PNP_CCB Ccb, + IN ULONG NamedPipeEnd, + IN PETHREAD Thread, IN PLIST_ENTRY List) { BOOLEAN HaveContext = FALSE, MoreProcessing, AllocatedBuffer; @@ -23,7 +23,7 @@ PSECURITY_CLIENT_CONTEXT ClientContext; PAGED_CODE(); - *BytesWritten = OutBufferSize; + *BytesNotWritten = OutBufferSize; MoreProcessing = TRUE; if ((PipeType != FILE_PIPE_MESSAGE_MODE) || (OutBufferSize)) @@ -33,7 +33,7 @@ for (DataEntry = NpGetNextRealDataQueueEntry(WriteQueue, List); ((WriteQueue->QueueState == ReadEntries) && - ((*BytesWritten > 0) || (MoreProcessing))); + ((*BytesNotWritten > 0) || (MoreProcessing))); DataEntry = NpGetNextRealDataQueueEntry(WriteQueue, List)) { DataSize = DataEntry->DataSize; @@ -58,7 +58,7 @@ DataEntry->Irp->Overlay.AllocationSize.QuadPart = 0; } - BufferSize = *BytesWritten; + BufferSize = *BytesNotWritten; if (BufferSize >= DataSize) BufferSize = DataSize; if (DataEntry->DataEntryType != Unbuffered && BufferSize) @@ -76,7 +76,7 @@ _SEH2_TRY { RtlCopyMemory(Buffer, - (PVOID)((ULONG_PTR)OutBuffer + OutBufferSize - *BytesWritten), + (PVOID)((ULONG_PTR)OutBuffer + OutBufferSize - *BytesNotWritten), BufferSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -106,7 +106,7 @@ WriteIrp = NpRemoveDataQueueEntry(WriteQueue, TRUE, List); if (WriteIrp) { - *BytesWritten -= BufferSize; + *BytesNotWritten -= BufferSize; WriteIrp->IoStatus.Information = BufferSize; if (AllocatedBuffer) @@ -115,7 +115,7 @@ WriteIrp->Flags |= IRP_DEALLOCATE_BUFFER | IRP_BUFFERED_IO | IRP_INPUT_OPERATION; } - if (!*BytesWritten) + if (!*BytesNotWritten) { MoreProcessing = FALSE; WriteIrp->IoStatus.Status = STATUS_SUCCESS; @@ -140,7 +140,7 @@ } } - if (*BytesWritten > 0 || MoreProcessing) + if (*BytesNotWritten > 0 || MoreProcessing) { ASSERT(WriteQueue->QueueState != ReadEntries); Status = STATUS_MORE_PROCESSING_REQUIRED;

1 0

[ion] 60027: [NPFS-NEW]: Multiple code fixes to almost all code paths. Mainly a collection of small bugs, structural errors, logic flaws, off-by-ones, etc. But they were enough to make the driver e...
by ion＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: ion Date: Wed Sep 11 02:04:17 2013 New Revision: 60027 URL: http://svn.reactos.org/svn/reactos?rev=60027&view=rev Log: [NPFS-NEW]: Multiple code fixes to almost all code paths. Mainly a collection of small bugs, structural errors, logic flaws, off-by-ones, etc. But they were enough to make the driver essentially useless. Now Thomas's kmtests NpfsCreate and NpfsConnect return absolutely zero failures. On to NpfsReadWrite.... Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/statesup.c trunk/reactos/drivers/filesystems/npfs_new/strucsup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] Wed Sep 11 02:04:17 2013 @@ -14,6 +14,7 @@ ListHead = &Dcb->NotifyList; for (i = 0; i < 2; i++) { + ASSERT(IsListEmpty(ListHead)); while (!IsListEmpty(ListHead)) { NextEntry = RemoveHeadList(ListHead); @@ -47,7 +48,7 @@ NpSetFileObject(FileObject, NpVcb, NULL, FALSE); ++NpVcb->ReferenceCount; - Status.Information = 1; + Status.Information = FILE_OPENED; Status.Status = STATUS_SUCCESS; return Status; } @@ -69,7 +70,7 @@ NpSetFileObject(FileObject, Dcb, Ccb, FALSE); ++Dcb->CurrentInstances; - Status.Information = 1; + Status.Information = FILE_OPENED; Status.Status = STATUS_SUCCESS; } else @@ -130,7 +131,7 @@ if (AccessGranted) { AccessState->PreviouslyGrantedAccess |= GrantedAccess; - AccessState->RemainingDesiredAccess &= ~(GrantedAccess | 0x2000000); + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | MAXIMUM_ALLOWED); } ObjectTypeName.Buffer = L"NamedPipe"; @@ -147,14 +148,14 @@ SeUnlockSubjectContext(SubjectSecurityContext); if (!AccessGranted) return IoStatus; - if (((GrantedAccess & 1) && (NamedPipeConfiguration == FILE_PIPE_INBOUND)) || - ((GrantedAccess & 2) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) + if (((AccessGranted & FILE_READ_DATA) && (NamedPipeConfiguration == FILE_PIPE_INBOUND)) || + ((AccessGranted & FILE_WRITE_DATA) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) { IoStatus.Status = STATUS_ACCESS_DENIED; return IoStatus; } - if (!(GrantedAccess & 3)) SecurityQos = NULL; + if (!(GrantedAccess & (FILE_READ_DATA | FILE_WRITE_DATA))) SecurityQos = NULL; ListHead = &Fcb->CcbList; NextEntry = ListHead->Flink; @@ -185,7 +186,7 @@ Ccb->ClientSession = NULL; Ccb->Process = IoThreadToProcess(Thread); - IoStatus.Information = 1; + IoStatus.Information = FILE_OPENED; IoStatus.Status = STATUS_SUCCESS; return IoStatus; } @@ -205,7 +206,9 @@ PNP_DCB Dcb; ACCESS_MASK DesiredAccess; LIST_ENTRY List; + PLIST_ENTRY NextEntry, ThisEntry; UNICODE_STRING Prefix; + PIRP ListIrp; InitializeListHead(&List); IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); @@ -235,20 +238,22 @@ if (FileName.Length) { - if ((FileName.Length == sizeof(WCHAR)) && + if ((FileName.Length == sizeof(OBJ_NAME_PATH_SEPARATOR)) && (FileName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) && !(RelatedFileObject)) { Irp->IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, - FileObject, - DesiredAccess, - &List); + FileObject, + DesiredAccess, + &List); + goto Quickie; } } else if (!(RelatedFileObject) || (Type == NPFS_NTC_VCB)) { Irp->IoStatus = NpOpenNamedPipeFileSystem(FileObject, DesiredAccess); + goto Quickie; } else if (Type == NPFS_NTC_ROOT_DCB) { @@ -256,77 +261,94 @@ FileObject, DesiredAccess, &List); - } - else - { - // Status = NpTranslateAlias(&FileName);; // ignore this for now - // if (!NT_SUCCESS(Status)) goto Quickie; - - if (RelatedFileObject) - { - if (Type == NPFS_NTC_ROOT_DCB) + goto Quickie; + } + + // Status = NpTranslateAlias(&FileName);; // ignore this for now + // if (!NT_SUCCESS(Status)) goto Quickie; + if (RelatedFileObject) + { + if (Type == NPFS_NTC_ROOT_DCB) + { + Dcb = (PNP_DCB)Ccb; + Irp->IoStatus.Status = NpFindRelativePrefix(Dcb, + &FileName, + 1, + &Prefix, + &Fcb); + if (!NT_SUCCESS(Irp->IoStatus.Status)) { - Dcb = (PNP_DCB)Ccb; - Irp->IoStatus.Status = NpFindRelativePrefix(Dcb, - &FileName, - 1, - &Prefix, - &Fcb); - if (!NT_SUCCESS(Irp->IoStatus.Status)) goto Quickie; - } - else if ((Type != NPFS_NTC_CCB) || (FileName.Length)) - { - Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; goto Quickie; } - else - { - Prefix.Length = 0; - } + } + else if ((Type != NPFS_NTC_CCB) || (FileName.Length)) + { + Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; } else { - if ((FileName.Length <= sizeof(WCHAR)) || - (FileName.Buffer[0] != OBJ_NAME_PATH_SEPARATOR)) - { - Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; - goto Quickie; - } - - Fcb = NpFindPrefix(&FileName, 1, &Prefix); - } - - if (Prefix.Length) - { - Irp->IoStatus.Status = Fcb->NodeType != NPFS_NTC_FCB ? - STATUS_OBJECT_NAME_NOT_FOUND : - STATUS_OBJECT_NAME_INVALID; - } - - if (!Fcb->CurrentInstances) - { - Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; - } - else - { - Irp->IoStatus = NpCreateClientEnd(Fcb, - FileObject, - DesiredAccess, - IoStack->Parameters.CreatePipe. - SecurityContext->SecurityQos, - IoStack->Parameters.CreatePipe. - SecurityContext->AccessState, - IoStack->Flags & - SL_FORCE_ACCESS_CHECK ? - UserMode : Irp->RequestorMode, - Irp->Tail.Overlay.Thread, - &List); - } - } + Prefix.Length = 0; + } + } + else + { + if ((FileName.Length <= sizeof(OBJ_NAME_PATH_SEPARATOR)) || + (FileName.Buffer[0] != OBJ_NAME_PATH_SEPARATOR)) + { + Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + + Fcb = NpFindPrefix(&FileName, TRUE, &Prefix); + } + + if (Prefix.Length) + { + Irp->IoStatus.Status = Fcb->NodeType != NPFS_NTC_FCB ? + STATUS_OBJECT_NAME_NOT_FOUND : + STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + + if (Fcb->NodeType != NPFS_NTC_FCB) + { + Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + + if (!Fcb->ServerOpenCount) + { + Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quickie; + } + + Irp->IoStatus = NpCreateClientEnd(Fcb, + FileObject, + DesiredAccess, + IoStack->Parameters.CreatePipe. + SecurityContext->SecurityQos, + IoStack->Parameters.CreatePipe. + SecurityContext->AccessState, + IoStack->Flags & + SL_FORCE_ACCESS_CHECK ? + UserMode : Irp->RequestorMode, + Irp->Tail.Overlay.Thread, + &List); Quickie: ExReleaseResourceLite(&NpVcb->Lock); - ASSERT(IsListEmpty(&List) == TRUE); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(ListIrp, IO_DISK_INCREMENT); + } + FsRtlExitFileSystem(); IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -582,10 +604,11 @@ NpSetFileObject(FileObject, Ccb, Ccb->NonPagedCcb, TRUE); Ccb->FileObject[FILE_PIPE_SERVER_END] = FileObject; - NpCheckForNotify(Dcb, 1, List); + NpCheckForNotify(Dcb, TRUE, List); IoStatus->Status = STATUS_SUCCESS; - IoStatus->Information = 2; + IoStatus->Information = FILE_CREATED; + return STATUS_SUCCESS; Quickie: @@ -605,11 +628,13 @@ USHORT Disposition, ShareAccess; PEPROCESS Process; LIST_ENTRY LocalList; + PLIST_ENTRY NextEntry, ThisEntry; UNICODE_STRING FileName; PNP_FCB Fcb; UNICODE_STRING Prefix; PNAMED_PIPE_CREATE_PARAMETERS Parameters; IO_STATUS_BLOCK IoStatus; + PIRP ListIrp; DPRINT1("NpFsdCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -655,16 +680,21 @@ TRUE, &Prefix, &Fcb); - if (!NT_SUCCESS(IoStatus.Status)) goto Quickie; + if (!NT_SUCCESS(IoStatus.Status)) + { + goto Quickie; + } } else { - if (FileName.Length <= 2u || *FileName.Buffer != '\\') + if (FileName.Length <= sizeof(OBJ_NAME_PATH_SEPARATOR) || + FileName.Buffer[0] != OBJ_NAME_PATH_SEPARATOR) { IoStatus.Status = STATUS_OBJECT_NAME_INVALID; goto Quickie; } - Fcb = NpFindPrefix(&FileName, 1u, &Prefix); + + Fcb = NpFindPrefix(&FileName, TRUE, &Prefix); } if (Prefix.Length) @@ -683,7 +713,7 @@ Parameters, Process, &LocalList, - &Irp->IoStatus); + &IoStatus); goto Quickie; } else @@ -692,30 +722,40 @@ goto Quickie; } } + if (Fcb->NodeType != NPFS_NTC_FCB) { IoStatus.Status = STATUS_OBJECT_NAME_INVALID; goto Quickie; } - Irp->IoStatus = NpCreateExistingNamedPipe(Fcb, - FileObject, - IoStack->Parameters.CreatePipe. - SecurityContext->DesiredAccess, - IoStack->Parameters.CreatePipe. - SecurityContext->AccessState, - IoStack->Flags & - SL_FORCE_ACCESS_CHECK ? - UserMode : Irp->RequestorMode, - Disposition, - ShareAccess, - Parameters, - Process, - &LocalList); + IoStatus = NpCreateExistingNamedPipe(Fcb, + FileObject, + IoStack->Parameters.CreatePipe. + SecurityContext->DesiredAccess, + IoStack->Parameters.CreatePipe. + SecurityContext->AccessState, + IoStack->Flags & + SL_FORCE_ACCESS_CHECK ? + UserMode : Irp->RequestorMode, + Disposition, + ShareAccess, + Parameters, + Process, + &LocalList); Quickie: ExReleaseResourceLite(&NpVcb->Lock); - ASSERT(IsListEmpty(&LocalList)); + + NextEntry = LocalList.Flink; + while (NextEntry != &LocalList) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(ListIrp, IO_DISK_INCREMENT); + } FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Wed Sep 11 02:04:17 2013 @@ -437,7 +437,7 @@ ASSERT(ByteOffset < DataEntry->DataSize); ASSERT(DataQueue->EntriesInQueue == 1); } - + InsertTailList(&DataQueue->Queue, &DataEntry->QueueEntry); if (Status == STATUS_PENDING) Modified: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] Wed Sep 11 02:04:17 2013 @@ -327,7 +327,7 @@ { InfoBuffer->ReadDataAvailable = InQueue->BytesInQueue - InQueue->ByteOffset; } - InfoBuffer->WriteQuotaAvailable = OutQueue->QuotaUsed; + InfoBuffer->WriteQuotaAvailable = OutQueue->Quota - OutQueue->QuotaUsed; } else { @@ -335,7 +335,7 @@ { InfoBuffer->ReadDataAvailable = OutQueue->BytesInQueue - OutQueue->ByteOffset; } - InfoBuffer->WriteQuotaAvailable = InQueue->QuotaUsed; + InfoBuffer->WriteQuotaAvailable = OutQueue->Quota - InQueue->QuotaUsed; } return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] Wed Sep 11 02:04:17 2013 @@ -181,6 +181,7 @@ LIST_ENTRY NotifyList; LIST_ENTRY NotifyList2; LIST_ENTRY FcbList; + ULONG Pad; // // Common Footer @@ -212,6 +213,8 @@ // NP_CB_FOOTER; } NP_FCB, *PNP_FCB; + +C_ASSERT(FIELD_OFFSET(NP_FCB, PrefixTableEntry) == FIELD_OFFSET(NP_DCB, PrefixTableEntry)); // // The nonpaged portion of the CCB Modified: trunk/reactos/drivers/filesystems/npfs_new/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] Wed Sep 11 02:04:17 2013 @@ -96,7 +96,7 @@ break; case FILE_PIPE_CONNECTED_STATE: - + EventBuffer = NonPagedCcb->EventBuffer[FILE_PIPE_CLIENT_END]; while (Ccb->DataQueue[FILE_PIPE_INBOUND].QueueState != Empty) @@ -121,12 +121,13 @@ if (EventBuffer) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); - Status = STATUS_SUCCESS; - break; + // drop down on purpose... queue will be empty so flush code is nop + ASSERT(Ccb->DataQueue[FILE_PIPE_OUTBOUND].QueueState == Empty); case FILE_PIPE_CLOSING_STATE: EventBuffer = NonPagedCcb->EventBuffer[FILE_PIPE_CLIENT_END]; + while (Ccb->DataQueue[FILE_PIPE_INBOUND].QueueState != Empty) { Irp = NpRemoveDataQueueEntry(&Ccb->DataQueue[FILE_PIPE_INBOUND], FALSE, List); @@ -177,11 +178,11 @@ { case FILE_PIPE_DISCONNECTED_STATE: - Status = NpCancelWaiter(&NpVcb->WaitQueue, - &Ccb->Fcb->FullName, - STATUS_SUCCESS, - List); - if (!NT_SUCCESS(Status)) return Status; + Status = NpCancelWaiter(&NpVcb->WaitQueue, + &Ccb->Fcb->FullName, + STATUS_SUCCESS, + List); + if (!NT_SUCCESS(Status)) return Status; // // Drop down on purpose @@ -203,7 +204,7 @@ Ccb->NamedPipeState = FILE_PIPE_LISTENING_STATE; IoMarkIrpPending(Irp); - InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + InsertTailList(&Ccb->IrpList, &Irp->Tail.Overlay.ListEntry); return STATUS_PENDING; case FILE_PIPE_CONNECTED_STATE: Modified: trunk/reactos/drivers/filesystems/npfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] Wed Sep 11 02:04:17 2013 @@ -53,7 +53,7 @@ PAGED_CODE(); Dcb = Fcb->ParentDcb; - if (!Fcb->CurrentInstances) KeBugCheckEx(NPFS_FILE_SYSTEM, 0x17025F, 0, 0, 0); + if (Fcb->CurrentInstances) KeBugCheckEx(NPFS_FILE_SYSTEM, 0x17025F, 0, 0, 0); NpCancelWaiter(&NpVcb->WaitQueue, &Fcb->FullName, @@ -205,23 +205,26 @@ BOOLEAN RootPipe; PWCHAR NameBuffer; ULONG BufferOffset; - USHORT PipeNameLength; - PAGED_CODE(); - - PipeNameLength = PipeName->Length; - - if ((PipeNameLength < sizeof(WCHAR)) || - ((PipeNameLength + sizeof(WCHAR)) < PipeNameLength) || - (PipeName->Buffer[0] != OBJ_NAME_PATH_SEPARATOR)) + USHORT Length, MaximumLength; + PAGED_CODE(); + + Length = PipeName->Length; + MaximumLength = Length + sizeof(UNICODE_NULL); + + if ((Length < sizeof(WCHAR)) || (MaximumLength < Length)) { return STATUS_INVALID_PARAMETER; } RootPipe = FALSE; - if (PipeNameLength == sizeof(WCHAR)) - { + if (PipeName->Buffer[0] != OBJ_NAME_PATH_SEPARATOR) + { + MaximumLength += sizeof(OBJ_NAME_PATH_SEPARATOR); RootPipe = TRUE; - PipeNameLength += sizeof(WCHAR); + if (MaximumLength < sizeof(WCHAR)) + { + return STATUS_INVALID_PARAMETER; + } } Fcb = ExAllocatePoolWithTag(PagedPool, sizeof(*Fcb), NPFS_FCB_TAG); @@ -235,7 +238,7 @@ InitializeListHead(&Fcb->CcbList); NameBuffer = ExAllocatePoolWithTag(PagedPool, - PipeName->Length + (RootPipe ? 4 : 2), + MaximumLength, NPFS_NAME_BLOCK_TAG); if (!NameBuffer) { @@ -248,19 +251,19 @@ BufferOffset = 0; if (RootPipe) { - *NameBuffer = OBJ_NAME_PATH_SEPARATOR; + NameBuffer[0] = OBJ_NAME_PATH_SEPARATOR; BufferOffset = 1; } - RtlCopyMemory(NameBuffer + BufferOffset, PipeName->Buffer, PipeNameLength); - NameBuffer[BufferOffset + (PipeNameLength / sizeof(WCHAR))] = UNICODE_NULL; - - Fcb->FullName.Length = PipeNameLength - sizeof(WCHAR); - Fcb->FullName.MaximumLength = PipeNameLength; + RtlCopyMemory(NameBuffer + BufferOffset, PipeName->Buffer, Length); + NameBuffer[BufferOffset + (Length / sizeof(WCHAR))] = UNICODE_NULL; + + Fcb->FullName.Length = Length; + Fcb->FullName.MaximumLength = MaximumLength; Fcb->FullName.Buffer = NameBuffer; - Fcb->ShortName.MaximumLength = PipeNameLength - sizeof(WCHAR); - Fcb->ShortName.Length = PipeNameLength - 2 * sizeof(WCHAR); + Fcb->ShortName.MaximumLength = Length; + Fcb->ShortName.Length = Length - sizeof(OBJ_NAME_PATH_SEPARATOR); Fcb->ShortName.Buffer = NameBuffer + 1; if (!RtlInsertUnicodePrefix(&NpVcb->PrefixTable, @@ -333,6 +336,8 @@ InsertTailList(&Fcb->CcbList, &Ccb->CcbEntry); + Fcb->CurrentInstances++; + Fcb->ServerOpenCount++; InitializeListHead(&Ccb->IrpList); ExInitializeResourceLite(&Ccb->NonPagedCcb->Lock); *NewCcb = Ccb;

1 0

[akhaldi] 60026: [ADVPACK_WINETEST] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 00:08:28 2013 New Revision: 60026 URL: http://svn.reactos.org/svn/reactos?rev=60026&view=rev Log: [ADVPACK_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/advpack/install.c Modified: trunk/rostests/winetests/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/install… ============================================================================== --- trunk/rostests/winetests/advpack/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/install.c [iso-8859-1] Wed Sep 11 00:08:28 2013 @@ -241,6 +241,13 @@ lstrcpy(cmdline, CURR_DIR); lstrcat(cmdline, "\\"); lstrcat(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); + hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); + ok(hr == 0, "Expected 0, got %d\n", hr); + + /* try quoting the parameters */ + lstrcpy(cmdline, "\""); + lstrcat(cmdline, CURR_DIR); + lstrcat(cmdline, "\\test.inf\",\"DefaultInstall\",\"c:,imacab.cab\",\"4\""); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr);

1 0

[akhaldi] 60025: [ADVPACK] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 00:07:58 2013 New Revision: 60025 URL: http://svn.reactos.org/svn/reactos?rev=60025&view=rev Log: [ADVPACK] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/advpack/advpack.c trunk/reactos/dll/win32/advpack/advpack_private.h trunk/reactos/dll/win32/advpack/files.c trunk/reactos/dll/win32/advpack/install.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] Wed Sep 11 00:07:58 2013 @@ -177,7 +177,7 @@ FIXME("Need to support changing paths - default will be used\n"); /* set all ldids to dest */ - while ((ptr = get_parameter(&key, ','))) + while ((ptr = get_parameter(&key, ',', FALSE))) { ldid = atolW(ptr); SetupSetDirectoryIdW(hInf, ldid, dest); @@ -510,12 +510,12 @@ cmdline_ptr = cmdline_copy; lstrcpyW(cmdline_copy, cmdlineW.Buffer); - ocx_filename = get_parameter(&cmdline_ptr, ','); + ocx_filename = get_parameter(&cmdline_ptr, ',', TRUE); if (!ocx_filename || !*ocx_filename) goto done; - str_flags = get_parameter(&cmdline_ptr, ','); - param = get_parameter(&cmdline_ptr, ','); + str_flags = get_parameter(&cmdline_ptr, ',', TRUE); + param = get_parameter(&cmdline_ptr, ',', TRUE); hm = LoadLibraryExW(ocx_filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!hm) Modified: trunk/reactos/dll/win32/advpack/advpack_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack_… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack_private.h [iso-8859-1] Wed Sep 11 00:07:58 2013 @@ -22,7 +22,7 @@ #define __ADVPACK_PRIVATE_H HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; -LPWSTR get_parameter(LPWSTR *params, WCHAR separator) DECLSPEC_HIDDEN; +LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Wed Sep 11 00:07:58 2013 @@ -503,8 +503,8 @@ lstrcpyW(cmdline_copy, cmdline); /* get the parameters at indexes 0 and 1 respectively */ - szFilename = get_parameter(&cmdline_ptr, ','); - szFlags = get_parameter(&cmdline_ptr, ','); + szFilename = get_parameter(&cmdline_ptr, ',', TRUE); + szFlags = get_parameter(&cmdline_ptr, ',', TRUE); if (szFlags) dwFlags = atolW(szFlags); Modified: trunk/reactos/dll/win32/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.… ============================================================================== --- trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] Wed Sep 11 00:07:58 2013 @@ -209,12 +209,23 @@ /* sequentially returns pointers to parameters in a parameter list * returns NULL if the parameter is empty, e.g. one,,three */ -LPWSTR get_parameter(LPWSTR *params, WCHAR separator) +LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) { LPWSTR token = *params; if (!*params) return NULL; + + if (quoted && *token == '"') + { + WCHAR *end = strchrW(token + 1, '"'); + if (end) + { + *end = 0; + *params = end + 1; + token = token + 1; + } + } *params = strchrW(*params, separator); if (*params) @@ -764,10 +775,10 @@ cmdline_ptr = cmdline_copy; lstrcpyW(cmdline_copy, cmdline); - inf_filename = get_parameter(&cmdline_ptr, ','); - install_sec = get_parameter(&cmdline_ptr, ','); - - str_flags = get_parameter(&cmdline_ptr, ','); + inf_filename = get_parameter(&cmdline_ptr, ',', TRUE); + install_sec = get_parameter(&cmdline_ptr, ',', TRUE); + + str_flags = get_parameter(&cmdline_ptr, ',', TRUE); if (str_flags) flags = atolW(str_flags); @@ -857,12 +868,12 @@ cmdline_ptr = cmdline_copy; lstrcpyW(cmdline_copy, cmdline); - cabinfo.pszInf = get_parameter(&cmdline_ptr, ','); - cabinfo.pszSection = get_parameter(&cmdline_ptr, ','); - cabinfo.pszCab = get_parameter(&cmdline_ptr, ','); + cabinfo.pszInf = get_parameter(&cmdline_ptr, ',', TRUE); + cabinfo.pszSection = get_parameter(&cmdline_ptr, ',', TRUE); + cabinfo.pszCab = get_parameter(&cmdline_ptr, ',', TRUE); *cabinfo.szSrcPath = '\0'; - flags = get_parameter(&cmdline_ptr, ','); + flags = get_parameter(&cmdline_ptr, ',', TRUE); if (flags) cabinfo.dwFlags = atolW(flags); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Sep 11 00:07:58 2013 @@ -41,7 +41,7 @@ reactos/dll/directx/quartz # Synced to Wine-1.5.26 reactos/dll/win32/activeds # Synced to Wine-1.1.43? reactos/dll/win32/actxprxy # Synced to Wine-1.5.26 -reactos/dll/win32/advpack # Synced to Wine-1.5.26 +reactos/dll/win32/advpack # Synced to Wine-1.7.1 reactos/dll/win32/atl # Synced to Wine-1.5.19 reactos/dll/win32/atl100 # Synced to Wine-1.5.19 reactos/dll/win32/avifil32 # Synced to Wine-1.5.26

1 0

[akhaldi] 60024: [CREDUI] * Move the resource files to the appropriate folders.
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 23:38:33 2013 New Revision: 60024 URL: http://svn.reactos.org/svn/reactos?rev=60024&view=rev Log: [CREDUI] * Move the resource files to the appropriate folders. Added: trunk/reactos/dll/win32/credui/lang/ (with props) trunk/reactos/dll/win32/credui/lang/credui_Da.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Da.rc trunk/reactos/dll/win32/credui/lang/credui_De.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_De.rc trunk/reactos/dll/win32/credui/lang/credui_En.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_En.rc trunk/reactos/dll/win32/credui/lang/credui_Es.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Es.rc trunk/reactos/dll/win32/credui/lang/credui_Fr.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Fr.rc trunk/reactos/dll/win32/credui/lang/credui_He.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_He.rc trunk/reactos/dll/win32/credui/lang/credui_Hu.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Hu.rc trunk/reactos/dll/win32/credui/lang/credui_It.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_It.rc trunk/reactos/dll/win32/credui/lang/credui_Ko.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Ko.rc trunk/reactos/dll/win32/credui/lang/credui_Lt.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Lt.rc trunk/reactos/dll/win32/credui/lang/credui_Nl.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Nl.rc trunk/reactos/dll/win32/credui/lang/credui_No.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_No.rc trunk/reactos/dll/win32/credui/lang/credui_Pl.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Pl.rc trunk/reactos/dll/win32/credui/lang/credui_Pt.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Pt.rc trunk/reactos/dll/win32/credui/lang/credui_Ro.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Ro.rc trunk/reactos/dll/win32/credui/lang/credui_Ru.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Ru.rc trunk/reactos/dll/win32/credui/lang/credui_Si.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Si.rc trunk/reactos/dll/win32/credui/lang/credui_Sv.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Sv.rc trunk/reactos/dll/win32/credui/lang/credui_Uk.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Uk.rc trunk/reactos/dll/win32/credui/lang/credui_Zh.rc - copied unchanged from r60021, trunk/reactos/dll/win32/credui/credui_Zh.rc trunk/reactos/dll/win32/credui/res/ (with props) trunk/reactos/dll/win32/credui/res/banner.bmp - copied unchanged from r60021, trunk/reactos/dll/win32/credui/banner.bmp Removed: trunk/reactos/dll/win32/credui/banner.bmp trunk/reactos/dll/win32/credui/credui_Da.rc trunk/reactos/dll/win32/credui/credui_De.rc trunk/reactos/dll/win32/credui/credui_En.rc trunk/reactos/dll/win32/credui/credui_Es.rc trunk/reactos/dll/win32/credui/credui_Fr.rc trunk/reactos/dll/win32/credui/credui_He.rc trunk/reactos/dll/win32/credui/credui_Hu.rc trunk/reactos/dll/win32/credui/credui_It.rc trunk/reactos/dll/win32/credui/credui_Ko.rc trunk/reactos/dll/win32/credui/credui_Lt.rc trunk/reactos/dll/win32/credui/credui_Nl.rc trunk/reactos/dll/win32/credui/credui_No.rc trunk/reactos/dll/win32/credui/credui_Pl.rc trunk/reactos/dll/win32/credui/credui_Pt.rc trunk/reactos/dll/win32/credui/credui_Ro.rc trunk/reactos/dll/win32/credui/credui_Ru.rc trunk/reactos/dll/win32/credui/credui_Si.rc trunk/reactos/dll/win32/credui/credui_Sv.rc trunk/reactos/dll/win32/credui/credui_Uk.rc trunk/reactos/dll/win32/credui/credui_Zh.rc Modified: trunk/reactos/dll/win32/credui/credui.rc Removed: trunk/reactos/dll/win32/credui/banner.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/banner.bm… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/dll/win32/credui/credui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.rc… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui.rc [iso-8859-1] Tue Sep 10 23:38:33 2013 @@ -25,67 +25,67 @@ #include "credui_resources.h" /* @makedep: banner.bmp */ -IDB_BANNER BITMAP banner.bmp +IDB_BANNER BITMAP "res/banner.bmp" #ifdef LANGUAGE_EN_US - #include "credui_En.rc" + #include "lang/credui_En.rc" #endif #ifdef LANGUAGE_KO_KR - #include "credui_Ko.rc" + #include "lang/credui_Ko.rc" #endif #ifdef LANGUAGE_NL_NL - #include "credui_Nl.rc" + #include "lang/credui_Nl.rc" #endif #ifdef LANGUAGE_NO_NO - #include "credui_No.rc" + #include "lang/credui_No.rc" #endif #ifdef LANGUAGE_PL_PL - #include "credui_Pl.rc" + #include "lang/credui_Pl.rc" #endif #ifdef LANGUAGE_SV_SE - #include "credui_Sv.rc" + #include "lang/credui_Sv.rc" #endif /* UTF-8 */ #ifdef LANGUAGE_DA_DK - #include "credui_Da.rc" + #include "lang/credui_Da.rc" #endif #ifdef LANGUAGE_DE_DE - #include "credui_De.rc" + #include "lang/credui_De.rc" #endif #ifdef LANGUAGE_ES_ES - #include "credui_Es.rc" + #include "lang/credui_Es.rc" #endif #ifdef LANGUAGE_FR_FR - #include "credui_Fr.rc" + #include "lang/credui_Fr.rc" #endif #ifdef LANGUAGE_HE_IL - #include "credui_He.rc" + #include "lang/credui_He.rc" #endif #ifdef LANGUAGE_HU_HU - #include "credui_Hu.rc" + #include "lang/credui_Hu.rc" #endif #ifdef LANGUAGE_IT_IT - #include "credui_It.rc" + #include "lang/credui_It.rc" #endif #ifdef LANGUAGE_LT_LT - #include "credui_Lt.rc" + #include "lang/credui_Lt.rc" #endif #ifdef LANGUAGE_PT_PT - #include "credui_Pt.rc" + #include "lang/credui_Pt.rc" #endif #ifdef LANGUAGE_RO_RO - #include "credui_Ro.rc" + #include "lang/credui_Ro.rc" #endif #ifdef LANGUAGE_RU_RU - #include "credui_Ru.rc" + #include "lang/credui_Ru.rc" #endif #ifdef LANGUAGE_SL_SI - #include "credui_Si.rc" + #include "lang/credui_Si.rc" #endif #ifdef LANGUAGE_UK_UA - #include "credui_Uk.rc" + #include "lang/credui_Uk.rc" #endif #ifdef LANGUAGE_ZH_CN - #include "credui_Zh.rc" + #include "lang/credui_Zh.rc" #endif Removed: trunk/reactos/dll/win32/credui/credui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Da… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Da.rc (removed) @@ -1,55 +0,0 @@ -/* - * Danish language resource file for Credentials UI - * - * Copyright 2008 Jens Albretsen - * 2010 Thomas Larsen - * - * 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 - */ - -#include "credui_resources.h" - -#pragma code_page(65001) - -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&Brugernavn:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Kodeord:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Husk mit kodeord",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Annuller",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "Tilslut til %s" - IDS_MESSAGEFORMAT "Tilslutter til %s" - IDS_INCORRECTPASSWORDTITLE "Tilslutning fejlede" - IDS_INCORRECTPASSWORD "VÃ¦r sikker pÃ¥ at dit brugernavn\nog kodeord er korrekt." - IDS_CAPSLOCKONTITLE "Caps Lock er pÃ¥" - IDS_CAPSLOCKON "Du har sat Caps Lock til, dette kan vÃ¦re Ã¥rsagen til at du indtaster kodeordet forkert.\n\nTryk pÃ¥ Caps Lock tasten for at slÃ¥ det fra fÃ¸r du indtaster dit kodeord." -} Removed: trunk/reactos/dll/win32/credui/credui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_De… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_De.rc (removed) @@ -1,54 +0,0 @@ -/* - * German language resource file for Credentials UI - * - * Copyright 2007 Frank Richter - * - * 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 - */ - -#include "credui_resources.h" - -#pragma code_page(65001) - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&Benutzername:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Kennwort:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Kennwort &merken",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Abbrechen",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "Mit %s verbinden" - IDS_MESSAGEFORMAT "Verbindung mit %s wird hergestellt" - IDS_INCORRECTPASSWORDTITLE "Anmeldung fehlgeschlagen" - IDS_INCORRECTPASSWORD "Bitte Ã¼berprÃ¼fen Sie Ihren Benutzernamen\nund geben Sie das Kennwort neu ein." - IDS_CAPSLOCKONTITLE "Die Feststelltaste ist aktiviert" - IDS_CAPSLOCKON "Mit aktivierter Feststelltaste kÃ¶nnte das Kennwort falsch eingeben werden.\n\nVor der Eingabe des Kennworts sollten Sie die Feststelltaste deaktivieren." -} Removed: trunk/reactos/dll/win32/credui/credui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_En… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_En.rc (removed) @@ -1,52 +0,0 @@ -/* - * English language resource file for Credentials UI - * - * Copyright 2007 Robert Shearman (for CodeWeavers) - * - * 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 - */ - -#include "credui_resources.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&User name:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Password:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Remember my password",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Cancel",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "Connect to %s" - IDS_MESSAGEFORMAT "Connecting to %s" - IDS_INCORRECTPASSWORDTITLE "Logon unsuccessful" - IDS_INCORRECTPASSWORD "Make sure that your user name\nand password are correct." - IDS_CAPSLOCKONTITLE "Caps Lock is On" - IDS_CAPSLOCKON "Having Caps Lock on may cause you to enter your password incorrectly.\n\nPress the Caps Lock key on your keyboard to turn off Caps Lock before\nentering your password." -} Removed: trunk/reactos/dll/win32/credui/credui_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Es… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Es.rc (removed) @@ -1,55 +0,0 @@ -/* - * Spanish language resource file for Credentials UI - * - * Copyright 2007 Luis Carlos Busquets PÃ©rez - * Copyright 2008 JosÃ© Manuel Ferrer Ortiz - * - * 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 - */ - -#include "credui_resources.h" - -#pragma code_page(65001) - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&Usuario:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&ContraseÃ±a:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Recordar mi contraseÃ±a",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "Aceptar",IDOK,97,128,50,14 - PUSHBUTTON "Cancelar",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "Conectar a %s" - IDS_MESSAGEFORMAT "Conectando to %s" - IDS_INCORRECTPASSWORDTITLE "IdentificaciÃ³n incorrecta" - IDS_INCORRECTPASSWORD "AsegÃºrese que su nombre de usuario\ny contraseÃ±a son correctos." - IDS_CAPSLOCKONTITLE "Bloq Mayus estÃ¡ activado" - IDS_CAPSLOCKON "El Bloq Mayus activado puede hacer que entre su contraseÃ±a incorrectamente.\n\nPulse la tecla Bloq Mayus de su teclado para desactivar Bloq Mayus antes\n de introducir su contraseÃ±a." -} Removed: trunk/reactos/dll/win32/credui/credui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Fr… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Fr.rc (removed) @@ -1,54 +0,0 @@ -/* - * French language resource file for Credentials UI - * - * Copyright 2007 JonathanÂ Ernst - * - * 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 - */ - -#include "credui_resources.h" - -#pragma code_page(65001) - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&Nom d'utilisateurÂ :",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,12 - LTEXT "&Mot de passeÂ :",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Se souvenir de mon mot de passe",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Annuler",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "Se connecter Ã %s" - IDS_MESSAGEFORMAT "Connexion Ã %s" - IDS_INCORRECTPASSWORDTITLE "Ãchec lors de la connexion" - IDS_INCORRECTPASSWORD "Assurez-vous que votre nom d'utilisateur\net votre mot de passe sont corrects." - IDS_CAPSLOCKONTITLE "VERR.MAJ est activÃ©" - IDS_CAPSLOCKON "Le verrouillage majuscule Ã©tant activÃ©, cela pourrait provoquer une erreur lors de la saisie de votre mot de passe.\n\nAppuyez sur la touche VERR.MAJ de votre clavier afin de dÃ©sactiver le verrouilage majuscule avant\nde saisir votre mot de passe." -} Removed: trunk/reactos/dll/win32/credui/credui_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_He… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_He.rc (removed) @@ -1,54 +0,0 @@ -/* - * Hebrew language resource file for Credentials UI - * - * Copyright 2007 Robert Shearman (for CodeWeavers) - * - * Translated by Baruch Rutman - * - * 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 - */ - -#include "credui_resources.h" - -LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "×©× ××©×ª××©:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "×¡××¡××:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "××××¨ ××ª ××¡××¡×× ×©××",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "×××©××¨",IDOK,97,128,50,14 - PUSHBUTTON "×××××",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "××ª×××¨ ×× %s" - IDS_MESSAGEFORMAT "××ª×××¨ ×× %s" - IDS_INCORRECTPASSWORDTITLE "××× ××¡× ×× ××¦××××" - IDS_INCORRECTPASSWORD "× × ××××× ×©×©× ×××©×ª××©/×¡××¡×× × ××× ××" - IDS_CAPSLOCKONTITLE "Caps Lock ×¤×¢××" - IDS_CAPSLOCKON "Having Caps Lock on may cause you to enter your password incorrectly.\n\nPress the Caps Lock key on your keyboard to turn off Caps Lock before\nentering your password." -} Removed: trunk/reactos/dll/win32/credui/credui_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Hu… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Hu.rc (removed) @@ -1,55 +0,0 @@ -/* - * Hungarian language resource file for Credentials UI - * - * Copyright 2010 Andras Kovacs - * - * 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 - */ - -#include "credui_resources.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&FelhasznÃ¡lÃ³nÃ©v:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&JelszÃ³:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Je&lszÃ³ megjegyzÃ©se",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "MÃ©gse",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "KapcsolÃ³dÃ¡s: %s" - IDS_MESSAGEFORMAT "KapcsolÃ³dÃ¡s: %s" - IDS_INCORRECTPASSWORDTITLE "BejelentkezÃ©s sikertelen" - IDS_INCORRECTPASSWORD "KÃ©rem ellenÅrizze a felhasznÃ¡lÃ³neve\nÃ©s a jelszava helyessÃ©gÃ©t." - IDS_CAPSLOCKONTITLE "A Caps Lock be van kapcsolva" - IDS_CAPSLOCKON "Ha Caps Lock be van kapcsolva, elkÃ©pzelhetÅ hogy hibÃ¡san Ãrja be a jelszavÃ¡t.\n\nNyomja meg a Caps Lock gombot a billentyÅ±zetÃ©n a Caps Lock kikapcsolÃ¡sÃ¡hoz\nmielÅtt megadja a jelszavÃ¡t." -} Removed: trunk/reactos/dll/win32/credui/credui_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_It… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_It.rc (removed) @@ -1,55 +0,0 @@ -/* - * Italian language resource file for Credentials UI - * - * Copyright 2010 Luca Bennati - * - * 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 - */ - -#include "credui_resources.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&Nome Utente:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Password:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Ricorda la mia password",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Annulla",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "Connetti a %s" - IDS_MESSAGEFORMAT "Connettendo a %s" - IDS_INCORRECTPASSWORDTITLE "Accesso fallito" - IDS_INCORRECTPASSWORD "Assicurati che il tuo nome utente\ne password siano corrette." - IDS_CAPSLOCKONTITLE "Il Caps Lock Ã¨ acceso" - IDS_CAPSLOCKON "Avere Caps Lock acceso puÃ² portarti a immettere la password incorrettamente.\n\nPremere il tasto Caps Lock sulla tua tastiera per spegnere Caps Lock prima\n di immettere la tua password." -} Removed: trunk/reactos/dll/win32/credui/credui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ko… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ko.rc (removed) @@ -1,54 +0,0 @@ -/* - * Korean language resource file for Credentials UI - * - * Copyright 2007 Robert Shearman (for CodeWeavers) - * Copyright 2007 YunSong Hwang-È²À±¼º(hys545(a)dreamwiz.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 - */ - -#include "credui_resources.h" - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 9, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "»ç¿ëÀÚ ÀÌ¸§(&U):",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "¾ÏÈ£(&P):",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "³» ¾ÏÈ£ ±â¾ï(&R)",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "È®ÀÎ",IDOK,97,128,50,14 - PUSHBUTTON "Ãë¼Ò",IDCANCEL,156,128,50,14 -END - - -STRINGTABLE -{ - IDS_TITLEFORMAT " %s ¿¬°á" - IDS_MESSAGEFORMAT " %s ¿¬°áÁß" - IDS_INCORRECTPASSWORDTITLE "·Î±×¿Â ½ÇÆÐ" - IDS_INCORRECTPASSWORD "´ç½ÅÀÇ »ç¿ëÀÚ ÀÌ¸§°ú ¾ÏÈ£°¡\n¿Ã¹Ù¸¥Áö È®ÀÎÇÏ½Ê½Ã¿À" - IDS_CAPSLOCKONTITLE "Caps Lock Ä¿Áü" - IDS_CAPSLOCKON "Caps Lock ÀÌ Ä¿Á® ÀÖÀ¸¸é ¾ÏÈ£°¡ Àß¸øÀÔ·ÂµÉ ¼ö ÀÖ½À´Ï´Ù.\n\n ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ±â Àü¿¡\nÅ°º¸µåÀÇ Caps Lock Å°¸¦ ²ô½Ã±â ¹Ù¶ø´Ï´Ù." -} Removed: trunk/reactos/dll/win32/credui/credui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Lt… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Lt.rc (removed) @@ -1,55 +0,0 @@ -/* - * Lithuanian language resource file for Credentials UI - * - * Copyright 2009 Aurimas FiÅ¡eras <aurimas(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 - */ - -#include "credui_resources.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&Naudotojo vardas:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&SlaptaÅ¾odis:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Ä®&siminti mano slaptaÅ¾odÄ¯",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "Gerai",IDOK,97,128,50,14 - PUSHBUTTON "Atsisakyti",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "UÅ¾megzti ryÅ¡Ä¯ su %s" - IDS_MESSAGEFORMAT "Jungiamasi prie %s" - IDS_INCORRECTPASSWORDTITLE "Prisijungimas nesÄkmingas" - IDS_INCORRECTPASSWORD "Ä®sitikinkite, kad naudotojo vardas\nir slaptaÅ¾odis yra teisingi." - IDS_CAPSLOCKONTITLE "DidÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«sena Ä¯jungta" - IDS_CAPSLOCKON "Kai Ä¯jungta didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«sena, savo slaptaÅ¾odÄ¯ galite Ä¯vesti neteisingai.\n\nPaspauskite didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ klaviatÅ«ros klaviÅ¡Ä didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«senai iÅ¡jungti\nprieÅ¡ rinkdami savo slaptaÅ¾odÄ¯." -} Removed: trunk/reactos/dll/win32/credui/credui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Nl… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Nl.rc (removed) @@ -1,52 +0,0 @@ -/* - * Dutch language resource file for Credentials UI - * - * Copyright 2008 Frans Kool - * - * 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 - */ - -#include "credui_resources.h" - -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&Gebruikersnaam:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Wachtwoord:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Onthoud mijn wachtwoord",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Annuleren",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "Verbind met %s" - IDS_MESSAGEFORMAT "Verbinden met %s" - IDS_INCORRECTPASSWORDTITLE "Inloggen mislukt" - IDS_INCORRECTPASSWORD "Controleer of uw gebruikersnaam\nen wachtwoord correct zijn." - IDS_CAPSLOCKONTITLE "Caps Lock staat Aan" - IDS_CAPSLOCKON "Met Caps Lock aan kan uw wachtwoord verkeerd worden ingevoerd.\n\nDruk op de Caps Lock toets op uw toetsenbord om Caps Lock uit\nte zetten voor invoer van uw wachtwoord." -} Removed: trunk/reactos/dll/win32/credui/credui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_No… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_No.rc (removed) @@ -1,52 +0,0 @@ -/* - * Norwegian Bokmål language resource file for Credentials UI - * - * Copyright 2007 Alexander N. Sørnes <alex(a)thehandofagony.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 - */ - -#include "credui_resources.h" - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "Br&ukernavn:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Passord:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Remember my password",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Avbryt",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "Koble til %s" - IDS_MESSAGEFORMAT "Kobler til %s" - IDS_INCORRECTPASSWORDTITLE "Klarte ikke logge på" - IDS_INCORRECTPASSWORD "Sørg for at du oppga riktig\nbrukernavn og passord." - IDS_CAPSLOCKONTITLE "Caps Lock er på" - IDS_CAPSLOCKON "Å ha Caps Lock på kan føre til at du skriver inn passordet på feil måte.\n\nTrykk på Caps Lock-knappen på tastaturet for å slå av Caps Lock før du\nskriver inn passordet på nytt." -} Removed: trunk/reactos/dll/win32/credui/credui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Pl… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Pl.rc (removed) @@ -1,53 +0,0 @@ -/* - * Polish language resource file for Credentials UI - * - * Copyright 2007 Robert Shearman (for CodeWeavers) - * Copyright 2007 Mikolaj Zalewski - * - * 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 - */ - -#include "credui_resources.h" - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&U¿ytkownik:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Has³o:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Zapamiêtaj has³o",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "&OK",IDOK,97,128,50,14 - PUSHBUTTON "&Anuluj",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "Po³¹cz z %s" - IDS_MESSAGEFORMAT "£¹czenie z %s" - IDS_INCORRECTPASSWORDTITLE "Logowanie nie powiod³o siê" - IDS_INCORRECTPASSWORD "Upewnij siê, ¿e nazwa u¿ytkownika\ni has³o s¹ poprawne." - IDS_CAPSLOCKONTITLE "Caps Lock jest w³¹czony" - IDS_CAPSLOCKON "W³¹czony tryb Caps Lock mo¿e spowodowaæ, ¿e wpiszesz has³o niepoprawnie.\n\nNacinik klawisz Caps Lock key na klawiaturze, aby go wy³¹czyæ\nprzed wprowadzeniem has³a." -} Removed: trunk/reactos/dll/win32/credui/credui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Pt… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Pt.rc (removed) @@ -1,91 +0,0 @@ -/* - * Portuguese language resource file for Credentials UI - * - * Copyright 2008 Ricardo Filipe - * Copyright 2010 Gustavo Henrique MilarÃ© - * - * 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 - */ - -#include "credui_resources.h" - -#pragma code_page(65001) - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "Nome de &usuÃ¡rio:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Senha:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Lembrar a senha",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Cancelar",IDCANCEL,156,128,50,14 -END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&User name:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Password:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Lembrar a password",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Cancelar",IDCANCEL,156,128,50,14 -END - - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -STRINGTABLE -{ - IDS_TITLEFORMAT "Conectar a %s" - IDS_MESSAGEFORMAT "Conectando a %s" - IDS_INCORRECTPASSWORDTITLE "Logon mal sucedido" - IDS_INCORRECTPASSWORD "Certifique-se de que nome de usuÃ¡rio\ne senha estÃ£o corretos." - IDS_CAPSLOCKONTITLE "Caps Lock ligado" - IDS_CAPSLOCKON "Ter o Caps Lock ligado pode provocar a introduÃ§Ã£o incorreta da sua senha.\n\nPressione a tecla Caps Lock no seu teclado para desligar o Caps Lock antes\nde introduzir a senha." -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -STRINGTABLE -{ - IDS_TITLEFORMAT "Ligar a %s" - IDS_MESSAGEFORMAT "A ligar a %s" - IDS_INCORRECTPASSWORDTITLE "Logon mal sucedido" - IDS_INCORRECTPASSWORD "Verifique que o seu nome de utilizador\ne password estÃ£o correctos." - IDS_CAPSLOCKONTITLE "Caps Lock ligado" - IDS_CAPSLOCKON "Tendo o Caps Lock ligado pode provocar que introduza a sua password incorrectamente.\n\nPressione a tecla Caps Lock no seu teclado para desligar o Caps Lock antes\nde introduzir a password." -} Removed: trunk/reactos/dll/win32/credui/credui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ro… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ro.rc (removed) @@ -1,53 +0,0 @@ -/* - * Copyright 2007 Robert Shearman (for CodeWeavers) - * Copyright 2009 Michael Stefaniuc - * - * 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 - */ - -#include "credui_resources.h" - -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "Nume &utilizator:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&ParolÄ:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Èine minte pa&rola",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "RenunÈÄ",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "Conectare la %s" - IDS_MESSAGEFORMAT "Conectez la %s" - IDS_INCORRECTPASSWORDTITLE "Autentificare eÈuatÄ" - IDS_INCORRECTPASSWORD "VerificaÈi numele de utilizator Èi parola." - IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activatÄ" - IDS_CAPSLOCKON "Cu tasta Caps Lock activatÄ este foarte probabil cÄ veÈi introduce parola greÈit.\n\nInainte de a introduce parola apÄsaÈi tasta Caps Lock pentru a dezactiva scrierea cu majuscule." -} Removed: trunk/reactos/dll/win32/credui/credui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ru… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ru.rc (removed) @@ -1,55 +0,0 @@ -/* - * Russian language resource file for Credentials UI - * - * Copyright 2008 Andrey Esin <andrey(a)esin.name> - * - * 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 - */ - -#include "credui_resources.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "ÐÐ¾&Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&ÐÐ°ÑÐ¾Ð»Ñ:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Ð¡Ð¾&ÑÑÐ°Ð½Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "ÐÐ",IDOK,97,128,50,14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº %s" - IDS_MESSAGEFORMAT "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº %s" - IDS_INCORRECTPASSWORDTITLE "ÐÑÐ¾Ð´ Ð½Ðµ Ð±ÑÐ» Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÑÐ½" - IDS_INCORRECTPASSWORD "Ð£Ð±ÐµÐ´Ð¸ÑÐµÑÑ, ÑÑÐ¾ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ\nÐ¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð²ÐµÑÐ½Ñ." - IDS_CAPSLOCKONTITLE "Caps Lock Ð²ÐºÐ»ÑÑÐµÐ½" - IDS_CAPSLOCKON "ÐÐ°ÑÐ¾Ð»Ñ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²Ð²ÐµÐ´ÑÐ½ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ Ð¸Ð·-Ð·Ð° Ð½Ð°Ð¶Ð°ÑÐ¾Ð¹ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ Caps Lock.\n\nÐÑÐºÐ»ÑÑÐ¸ÑÐµ Caps Lock Ð¿ÐµÑÐµÐ´ ÑÐµÐ¼, ÐºÐ°Ðº Ð²Ð²Ð¾Ð´Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ." -} Removed: trunk/reactos/dll/win32/credui/credui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Si… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Si.rc (removed) @@ -1,54 +0,0 @@ -/* - * Slovenian language resource file for Credentials UI - * - * Copyright 2008 Rok Mandeljc - * - * 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 - */ - -#include "credui_resources.h" - -#pragma code_page(65001) - -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&UporabniÅ¡ko ime:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Geslo:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Zapomni si geslo",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "V redu",IDOK,97,128,50,14 - PUSHBUTTON "PrekliÄi",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "PoveÅ¾i se na %s" - IDS_MESSAGEFORMAT "Povezovanje na %s" - IDS_INCORRECTPASSWORDTITLE "Prijava ni uspela" - IDS_INCORRECTPASSWORD "Preverite, ali ste vnesli pravilno uporabniÅ¡ko ime in/ali geslo." - IDS_CAPSLOCKONTITLE "Caps Lock je vkljuÄen" - IDS_CAPSLOCKON "VkljuÄen Caps Lock je lahko vzrok nepravilnega vnosa gesla.\n\nPritisnite tipko Caps Lock, s Äimer ga izklopite\nin ponovno vnesite geslo." -} Removed: trunk/reactos/dll/win32/credui/credui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Sv… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Sv.rc (removed) @@ -1,42 +0,0 @@ -/* - * Swedish language resource file for Credentials UI - * - * Copyright 2007 Daniel Nylander - * - * 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 - */ - -#include "credui_resources.h" - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "A&nvändarnamn:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Lösenord:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Remember my password",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Avbryt",IDCANCEL,156,128,50,14 -END Removed: trunk/reactos/dll/win32/credui/credui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Uk… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Uk.rc (removed) @@ -1,56 +0,0 @@ -/* - * Ukrainian language resource file for Credentials UI - * - * Copyright 2007 Robert Shearman (for CodeWeavers) - * Copyright 2010 Igor Paliychuk - * - * 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 - */ - -#include "credui_resources.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ:",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&ÐÐ°ÑÐ¾Ð»Ñ:",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&ÐÐ°Ð¿Ð°Ð¼'ÑÑÐ°ÑÐ¸ Ð¼ÑÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "OK",IDOK,97,128,50,14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "ÐÑÐ´'ÑÐ´Ð½Ð°ÑÐ¸ÑÑ Ð´Ð¾ %s" - IDS_MESSAGEFORMAT "ÐÑÐ´'ÑÐ´Ð½ÑÑÑÑ Ð´Ð¾ %s" - IDS_INCORRECTPASSWORDTITLE "ÐÑÑÐ´ Ð½Ðµ Ð²ÑÐ´Ð±ÑÐ²ÑÑ" - IDS_INCORRECTPASSWORD "ÐÐµÑÐµÐºÐ¾Ð½Ð°Ð¹ÑÐµÑÑ ÑÐ¾ ÑÐ¼'Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°\nÑ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ñ." - IDS_CAPSLOCKONTITLE "Caps Lock Ð²ÐºÐ»ÑÑÐµÐ½Ð¸Ð¹" - IDS_CAPSLOCKON "ÐÐ°ÑÐ¾Ð»Ñ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð²Ð²ÐµÐ´ÐµÐ½Ð¸Ð¹ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ ÑÐµÑÐµÐ· Ð½Ð°ÑÐ¸ÑÐ½ÐµÐ½Ñ ÐºÐ»Ð°Ð²ÑÑÑ Caps Lock.\n\nÐÐ¸Ð¼ÐºÐ½ÑÑÑ Caps Lock Ð¿ÐµÑÐµÐ´\nÐ²Ð²ÐµÐ´ÐµÐ½Ð½ÑÐ¼ Ð¿Ð°ÑÐ¾Ð»Ñ." -} Removed: trunk/reactos/dll/win32/credui/credui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Zh… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Zh.rc (removed) @@ -1,86 +0,0 @@ -/* - * Credentials UI (Simplified and Traditional Chinese Resource) - * - * Copyright 2008 Hongbo Ni <hongbo.at.njstar.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 - */ - -#include "credui_resources.h" - -/* Chinese text is encoded in UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 9, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "ç¨æ·å(&U):",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "å¯ç (&P):",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "è®°ä½æçå¯ç (&R)",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "ç¡®å®",IDOK,97,128,50,14 - PUSHBUTTON "åæ¶",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "è¿æ¥å° %s" - IDS_MESSAGEFORMAT "æ£å¨è¿æ¥å° %s" - IDS_INCORRECTPASSWORDTITLE "ç»å½å¤±è´¥" - IDS_INCORRECTPASSWORD "è¯·ç¡®è®¤ä½ è¾å¥çç¨æ·ååå¯ç \næ¯å¦æ£ç¡®." - IDS_CAPSLOCKONTITLE "å¤§åéå®å¼ç" - IDS_CAPSLOCKON "å¼çå¤§åéå®å¯è½å¯¼è´ä½ è¾å¥éè¯¯çå¯ç ." -} - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL - -IDD_CREDDIALOG DIALOG 0, 0, 213, 149 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "IDS_TITLEFORMAT" -FONT 9, "MS Shell Dlg" -BEGIN - CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, - 0,213,37 - LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "ç¨æ¶å(&U):",-1,8,62,72,12,SS_CENTERIMAGE - CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "å¯ç¢¼(&P):",-1,8,80,72,12,SS_CENTERIMAGE - EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "è¨ä½æçå¯ç¢¼(&R)",IDC_SAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "ç¢ºå®",IDOK,97,128,50,14 - PUSHBUTTON "åæ¶",IDCANCEL,156,128,50,14 -END - -STRINGTABLE -{ - IDS_TITLEFORMAT "é£æ¥å° %s" - IDS_MESSAGEFORMAT "æ£å¨é£æ¥å° %s" - IDS_INCORRECTPASSWORDTITLE "ç»éå¤±æ" - IDS_INCORRECTPASSWORD "è«ç¢ºèªä½ è¼¸å¥çç¨æ¶ååå¯ç¢¼\næ¯å¦æ£ç¢º." - IDS_CAPSLOCKONTITLE "å¤§å¯«éå®éè" - IDS_CAPSLOCKON "éèå¤§å¯«éå®å¯è½å°è´ä½ è¼¸å¥é¯èª¤çå¯ç¢¼." -} Propchange: trunk/reactos/dll/win32/credui/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Sep 10 23:38:33 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/credui/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/credui/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/credui/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/dll/win32/credui/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Sep 10 23:38:33 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/credui/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/credui/res/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/credui/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[akhaldi] 60023: [DDK] * Annotate swenum.h.
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 23:31:39 2013 New Revision: 60023 URL: http://svn.reactos.org/svn/reactos?rev=60023&view=rev Log: [DDK] * Annotate swenum.h. Modified: trunk/reactos/include/ddk/swenum.h Modified: trunk/reactos/include/ddk/swenum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/swenum.h?rev=6… ============================================================================== --- trunk/reactos/include/ddk/swenum.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/swenum.h [iso-8859-1] Tue Sep 10 23:31:39 2013 @@ -1,9 +1,16 @@ +#pragma once + #ifndef _SWENUM_ #define _SWENUM_ -#define IOCTL_SWENUM_INSTALL_INTERFACE CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x000, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SWENUM_REMOVE_INTERFACE CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x001, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SWENUM_GET_BUS_ID CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x002, METHOD_NEITHER, FILE_READ_ACCESS) +#define IOCTL_SWENUM_INSTALL_INTERFACE \ + CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x000, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_SWENUM_REMOVE_INTERFACE \ + CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x001, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_SWENUM_GET_BUS_ID \ + CTL_CODE(FILE_DEVICE_BUS_EXTENDER, 0x002, METHOD_NEITHER, FILE_READ_ACCESS) typedef struct _SWENUM_INSTALL_INTERFACE { GUID DeviceId; @@ -11,7 +18,7 @@ WCHAR ReferenceString[1]; } SWENUM_INSTALL_INTERFACE, *PSWENUM_INSTALL_INTERFACE; -#if defined(_KS_) +#ifdef _KS_ #define STATIC_BUSID_SoftwareDeviceEnumerator STATIC_KSMEDIUMSETID_Standard #define BUSID_SoftwareDeviceEnumerator KSMEDIUMSETID_Standard #else @@ -19,15 +26,26 @@ 0x4747B320L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 #endif /* _KS_ */ -#if defined(_NTDDK_) +#ifdef _NTDDK_ -#if !defined(_KS_) -typedef VOID (NTAPI *PFNREFERENCEDEVICEOBJECT)(PVOID Context); -typedef VOID (NTAPI *PFNDEREFERENCEDEVICEOBJECT)(PVOID Context); -typedef NTSTATUS (NTAPI *PFNQUERYREFERENCESTRING)(PVOID Context, PWCHAR *String); -#endif /* _KS_ */ +#ifndef _KS_ -#define BUS_INTERFACE_SWENUM_VERSION 0x100 +typedef VOID +(NTAPI *PFNREFERENCEDEVICEOBJECT)( + _In_ PVOID Context); + +typedef VOID +(NTAPI *PFNDEREFERENCEDEVICEOBJECT)( + _In_ PVOID Context); + +typedef NTSTATUS +(NTAPI *PFNQUERYREFERENCESTRING)( + _In_ PVOID Context, + _Inout_ PWCHAR *String); + +#endif /* !_KS_ */ + +#define BUS_INTERFACE_SWENUM_VERSION 0x100 typedef struct _BUS_INTERFACE_SWENUM { INTERFACE Interface; @@ -40,90 +58,98 @@ extern "C" { #endif -#if defined(_KS_) +#ifdef _KS_ KSDDKAPI NTSTATUS NTAPI KsQuerySoftwareBusInterface( - IN PDEVICE_OBJECT PnpDeviceObject, - OUT PBUS_INTERFACE_SWENUM BusInterface); + _In_ PDEVICE_OBJECT PnpDeviceObject, + _Out_ PBUS_INTERFACE_SWENUM BusInterface); KSDDKAPI NTSTATUS NTAPI KsReferenceSoftwareBusObject( - IN KSDEVICE_HEADER Header); + _In_ KSDEVICE_HEADER Header); KSDDKAPI VOID NTAPI KsDereferenceSoftwareBusObject( - IN KSDEVICE_HEADER Header); + _In_ KSDEVICE_HEADER Header); +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsCreateBusEnumObject( - IN PWSTR BusIdentifier, - IN PDEVICE_OBJECT BusDeviceObject, - IN PDEVICE_OBJECT PhysicalDeviceObject, - IN PDEVICE_OBJECT PnpDeviceObject, - IN REFGUID InterfaceGuid, - IN PWSTR ServiceRelativePath); + _In_ PWSTR BusIdentifier, + _In_ PDEVICE_OBJECT BusDeviceObject, + _In_ PDEVICE_OBJECT PhysicalDeviceObject, + _In_opt_ PDEVICE_OBJECT PnpDeviceObject, + _In_opt_ REFGUID InterfaceGuid, + _In_opt_ PWSTR ServiceRelativePath); KSDDKAPI NTSTATUS NTAPI KsGetBusEnumIdentifier( - IN OUT PIRP Irp); + _Inout_ PIRP Irp); +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsGetBusEnumPnpDeviceObject( - IN PDEVICE_OBJECT DeviceObject, - OUT PDEVICE_OBJECT *PnpDeviceObject); + _In_ PDEVICE_OBJECT DeviceObject, + _Out_ PDEVICE_OBJECT *PnpDeviceObject); +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsInstallBusEnumInterface( - IN PIRP Irp); + _In_ PIRP Irp); +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsIsBusEnumChildDevice( - IN PDEVICE_OBJECT DeviceObject, - OUT PBOOLEAN ChildDevice); + _In_ PDEVICE_OBJECT DeviceObject, + _Out_ PBOOLEAN ChildDevice); +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsRemoveBusEnumInterface( - IN PIRP Irp); + _In_ PIRP Irp); +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsServiceBusEnumPnpRequest( - IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp); + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp); +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsServiceBusEnumCreateRequest( - IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp); + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp); +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsGetBusEnumParentFDOFromChildPDO( - IN PDEVICE_OBJECT DeviceObject, - OUT PDEVICE_OBJECT *FunctionalDeviceObject); + _In_ PDEVICE_OBJECT DeviceObject, + _Out_ PDEVICE_OBJECT *FunctionalDeviceObject); #endif /* _KS_ */

1 0

[akhaldi] 60022: [WINE/TEST] * Add winetest_{get, add}_failures().
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 23:30:54 2013 New Revision: 60022 URL: http://svn.reactos.org/svn/reactos?rev=60022&view=rev Log: [WINE/TEST] * Add winetest_{get,add}_failures(). Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Tue Sep 10 23:30:54 2013 @@ -64,12 +64,14 @@ extern int winetest_loop_todo(void); extern void winetest_end_todo( const char* platform ); extern int winetest_get_mainargs( char*** pargv ); +extern LONG winetest_get_failures(void); +extern void winetest_add_failures( LONG new_failures ); extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } -/* strcmpW is avaiable for tests compiled under Wine, but not in standalone +/* strcmpW is available for tests compiled under Wine, but not in standalone * builds under Windows, so we reimplement it under a different name. */ static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) { @@ -440,6 +442,17 @@ return winetest_argc; } +LONG winetest_get_failures(void) +{ + return failures; +} + +void winetest_add_failures( LONG new_failures ) +{ + while (new_failures-- > 0) + InterlockedIncrement( &failures ); +} + void winetest_wait_child_process( HANDLE process ) { DWORD exit_code = 1;

1 0

[akhaldi] 60021: [NTOSKRNL] * Fix the locking in MiQueryBasicInformation to cover ARM3 too, not just RosMm. This makes sure we don't change the address space while querying it (or vice-versa). * Do...
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 22:21:52 2013 New Revision: 60021 URL: http://svn.reactos.org/svn/reactos?rev=60021&view=rev Log: [NTOSKRNL] * Fix the locking in MiQueryBasicInformation to cover ARM3 too, not just RosMm. This makes sure we don't change the address space while querying it (or vice-versa). * Don't attempt to query information for a terminated process (fixes some kernel32 loader winetests, matches Windows behavior). * Brought to you by Alex Ionescu. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Sep 10 22:21:52 2013 @@ -1533,6 +1533,26 @@ KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); } + /* Lock the address space and make sure the process isn't already dead */ + MmLockAddressSpace(&TargetProcess->Vm); + if (TargetProcess->VmDeleted) + { + /* Unlock the address space of the process */ + MmUnlockAddressSpace(&TargetProcess->Vm); + + /* Check if we were attached */ + if (ProcessHandle != NtCurrentProcess()) + { + /* Detach and dereference the process */ + KeUnstackDetachProcess(&ApcState); + ObDereferenceObject(TargetProcess); + } + + /* Bail out */ + DPRINT1("Process is dying\n"); + return STATUS_PROCESS_IS_TERMINATING; + } + /* Loop the VADs */ ASSERT(TargetProcess->VadRoot.NumberGenericTableElements); if (TargetProcess->VadRoot.NumberGenericTableElements) @@ -1609,6 +1629,9 @@ MemoryInfo.RegionSize = (PCHAR)MM_HIGHEST_VAD_ADDRESS + 1 - (PCHAR)Address; } + /* Unlock the address space of the process */ + MmUnlockAddressSpace(&TargetProcess->Vm); + /* Check if we were attached */ if (ProcessHandle != NtCurrentProcess()) { @@ -1662,9 +1685,6 @@ { MemoryInfo.Type = MEM_MAPPED; } - - /* Lock the address space of the process */ - MmLockAddressSpace(&TargetProcess->Vm); /* Find the memory area the specified address belongs to */ MemoryArea = MmLocateMemoryAreaByAddress(&TargetProcess->Vm, BaseAddress);

1 0

[akhaldi] 60020: [DDK] * Annotate ntddpcm.h and apply some formatting consistency to it.
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 22:20:09 2013 New Revision: 60020 URL: http://svn.reactos.org/svn/reactos?rev=60020&view=rev Log: [DDK] * Annotate ntddpcm.h and apply some formatting consistency to it. Modified: trunk/reactos/include/ddk/ntddpcm.h Modified: trunk/reactos/include/ddk/ntddpcm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddpcm.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] Tue Sep 10 22:20:09 2013 @@ -20,6 +20,8 @@ * */ +#pragma once + #ifndef _NTDDPCMH_ #define _NTDDPCMH_ @@ -27,10 +29,10 @@ extern "C" { #endif -#define IOCTL_PCMCIA_BASE FILE_DEVICE_CONTROLLER +#define IOCTL_PCMCIA_BASE FILE_DEVICE_CONTROLLER -#define DD_PCMCIA_DEVICE_NAME "\\\\.\\Pcmcia" -#define DD_PCMCIA_DEVICE_NAME_U L"\\\\.\\Pcmcia" +#define DD_PCMCIA_DEVICE_NAME "\\\\.\\Pcmcia" +#define DD_PCMCIA_DEVICE_NAME_U L"\\\\.\\Pcmcia" #define IOCTL_GET_TUPLE_DATA \ CTL_CODE(IOCTL_PCMCIA_BASE, 3000, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -38,118 +40,140 @@ #define IOCTL_SOCKET_INFORMATION \ CTL_CODE(IOCTL_PCMCIA_BASE, 3004, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define DEVICE_IDENTIFIER_LENGTH 64 -#define DRIVER_NAME_LENGTH 32 -#define MANUFACTURER_NAME_LENGTH 64 +#define DEVICE_IDENTIFIER_LENGTH 64 +#define DRIVER_NAME_LENGTH 32 +#define MANUFACTURER_NAME_LENGTH 64 -#define PcmciaInvalidControllerType 0xffffffff +#define PcmciaInvalidControllerType 0xffffffff typedef struct _TUPLE_REQUEST { - USHORT Socket; + USHORT Socket; } TUPLE_REQUEST, *PTUPLE_REQUEST; typedef enum _PCMCIA_CONTROLLER_CLASS { - PcmciaInvalidControllerClass = -1, - PcmciaIntelCompatible, - PcmciaCardBusCompatible, - PcmciaElcController, - PcmciaDatabook, - PcmciaPciPcmciaBridge, - PcmciaCirrusLogic, - PcmciaTI, - PcmciaTopic, - PcmciaRicoh, - PcmciaDatabookCB, - PcmciaOpti, - PcmciaTrid, - PcmciaO2Micro, - PcmciaNEC, - PcmciaNEC_98 + PcmciaInvalidControllerClass = -1, + PcmciaIntelCompatible, + PcmciaCardBusCompatible, + PcmciaElcController, + PcmciaDatabook, + PcmciaPciPcmciaBridge, + PcmciaCirrusLogic, + PcmciaTI, + PcmciaTopic, + PcmciaRicoh, + PcmciaDatabookCB, + PcmciaOpti, + PcmciaTrid, + PcmciaO2Micro, + PcmciaNEC, + PcmciaNEC_98 } PCMCIA_CONTROLLER_CLASS, *PPCMCIA_CONTROLLER_CLASS; typedef struct _PCMCIA_SOCKET_INFORMATION { - USHORT Socket; - USHORT TupleCrc; - UCHAR Manufacturer[MANUFACTURER_NAME_LENGTH]; - UCHAR Identifier[DEVICE_IDENTIFIER_LENGTH]; - UCHAR DriverName[DRIVER_NAME_LENGTH]; - UCHAR DeviceFunctionId; - UCHAR Reserved; - UCHAR CardInSocket; - UCHAR CardEnabled; - ULONG ControllerType; + USHORT Socket; + USHORT TupleCrc; + UCHAR Manufacturer[MANUFACTURER_NAME_LENGTH]; + UCHAR Identifier[DEVICE_IDENTIFIER_LENGTH]; + UCHAR DriverName[DRIVER_NAME_LENGTH]; + UCHAR DeviceFunctionId; + UCHAR Reserved; + UCHAR CardInSocket; + UCHAR CardEnabled; + ULONG ControllerType; } PCMCIA_SOCKET_INFORMATION, *PPCMCIA_SOCKET_INFORMATION; -#define PcmciaClassFromControllerType(type) ((PCMCIA_CONTROLLER_CLASS)((type) & 0xff)) -#define PcmciaModelFromControllerType(type) (((type) >> 8) & 0x3ffff) -#define PcmciaRevisionFromControllerType(type) ((type) >> 26) - +#define PcmciaClassFromControllerType(type) ((PCMCIA_CONTROLLER_CLASS)((type) & 0xff)) +#define PcmciaModelFromControllerType(type) (((type) >> 8) & 0x3ffff) +#define PcmciaRevisionFromControllerType(type) ((type) >> 26) DEFINE_GUID(GUID_PCMCIA_INTERFACE_STANDARD, \ 0xbed5dadfL, 0x38fb, 0x11d1, 0x94, 0x62, 0x00, 0xc0, 0x4f, 0xb9, 0x60, 0xee); typedef ULONG MEMORY_SPACE; -typedef ULONG -(NTAPI *PPCMCIA_READ_WRITE_CONFIG)( - IN PVOID Context, - IN ULONG WhichSpace, - IN PUCHAR Buffer, - IN ULONG Offset, - IN ULONG Length); +typedef +_Function_class_(PCMCIA_READ_CONFIG) +ULONG +(NTAPI PCMCIA_READ_CONFIG)( + _In_opt_ PVOID Context, + _In_ ULONG WhichSpace, + _Out_writes_bytes_all_(Length) PUCHAR Buffer, + _In_ ULONG Offset, + _In_ ULONG Length); +typedef PCMCIA_READ_CONFIG *PPCMCIA_READ_CONFIG; -#define PCCARD_PCI_CONFIGURATION_SPACE 0 -#define PCCARD_ATTRIBUTE_MEMORY 1 -#define PCCARD_COMMON_MEMORY 2 -#define PCCARD_ATTRIBUTE_MEMORY_INDIRECT 3 -#define PCCARD_COMMON_MEMORY_INDIRECT 4 +typedef +_Function_class_(PCMCIA_WRITE_CONFIG) +ULONG +(NTAPI PCMCIA_WRITE_CONFIG)( + _In_opt_ PVOID Context, + _In_ ULONG WhichSpace, + _In_reads_bytes_(Length) PUCHAR Buffer, + _In_ ULONG Offset, + _In_ ULONG Length); +typedef PCMCIA_WRITE_CONFIG *PPCMCIA_WRITE_CONFIG; + +#define PCCARD_PCI_CONFIGURATION_SPACE 0 +#define PCCARD_ATTRIBUTE_MEMORY 1 +#define PCCARD_COMMON_MEMORY 2 +#define PCCARD_ATTRIBUTE_MEMORY_INDIRECT 3 +#define PCCARD_COMMON_MEMORY_INDIRECT 4 typedef struct _PCMCIA_BUS_INTERFACE_STANDARD { - USHORT Size; - USHORT Version; - PVOID Context; - PINTERFACE_REFERENCE InterfaceReference; - PINTERFACE_DEREFERENCE InterfaceDereference; - PPCMCIA_READ_WRITE_CONFIG ReadConfig; - PPCMCIA_READ_WRITE_CONFIG WriteConfig; + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PPCMCIA_READ_WRITE_CONFIG ReadConfig; + PPCMCIA_READ_WRITE_CONFIG WriteConfig; } PCMCIA_BUS_INTERFACE_STANDARD, *PPCMCIA_BUS_INTERFACE_STANDARD; -#define PCMCIA_MEMORY_8BIT_ACCESS 0 -#define PCMCIA_MEMORY_16BIT_ACCESS 1 +#define PCMCIA_MEMORY_8BIT_ACCESS 0 +#define PCMCIA_MEMORY_16BIT_ACCESS 1 -typedef BOOLEAN -(NTAPI *PPCMCIA_MODIFY_MEMORY_WINDOW)( - IN PVOID Context, - IN ULONGLONG HostBase, - IN ULONGLONG CardBase, - IN BOOLEAN Enable, - IN ULONG WindowSize OPTIONAL, - IN UCHAR AccessSpeed OPTIONAL, - IN UCHAR BusWidth OPTIONAL, - IN BOOLEAN IsAttributeMemory OPTIONAL); +typedef +_Function_class_(PCMCIA_MODIFY_MEMORY_WINDOW) +BOOLEAN +(NTAPI PCMCIA_MODIFY_MEMORY_WINDOW)( + _In_opt_ PVOID Context, + _In_ ULONGLONG HostBase, + _In_ ULONGLONG CardBase, + _In_ BOOLEAN Enable, + _In_opt_ ULONG WindowSize, + _In_opt_ UCHAR AccessSpeed, + _In_opt_ UCHAR BusWidth, + _In_opt_ BOOLEAN IsAttributeMemory); +typedef PCMCIA_MODIFY_MEMORY_WINDOW *PPCMCIA_MODIFY_MEMORY_WINDOW; -#define PCMCIA_VPP_0V 0 -#define PCMCIA_VPP_12V 1 -#define PCMCIA_VPP_IS_VCC 2 +#define PCMCIA_VPP_0V 0 +#define PCMCIA_VPP_12V 1 +#define PCMCIA_VPP_IS_VCC 2 -typedef BOOLEAN -(NTAPI *PPCMCIA_SET_VPP)( - IN PVOID Context, - IN UCHAR VppLevel); +typedef +_Function_class_(PCMCIA_SET_VPP) +BOOLEAN +(NTAPI PCMCIA_SET_VPP)( + _In_opt_ PVOID Context, + _In_ UCHAR VppLevel); +typedef PCMCIA_SET_VPP *PPCMCIA_SET_VPP; -typedef BOOLEAN -(NTAPI *PPCMCIA_IS_WRITE_PROTECTED)( - IN PVOID Context); +typedef +_Function_class_(PCMCIA_IS_WRITE_PROTECTED) +BOOLEAN +(NTAPI PCMCIA_IS_WRITE_PROTECTED)( + _In_opt_ PVOID Context); +typedef PCMCIA_IS_WRITE_PROTECTED *PPCMCIA_IS_WRITE_PROTECTED; typedef struct _PCMCIA_INTERFACE_STANDARD { - USHORT Size; - USHORT Version; - PINTERFACE_REFERENCE InterfaceReference; - PINTERFACE_DEREFERENCE InterfaceDereference; - PVOID Context; - PPCMCIA_MODIFY_MEMORY_WINDOW ModifyMemoryWindow; - PPCMCIA_SET_VPP SetVpp; - PPCMCIA_IS_WRITE_PROTECTED IsWriteProtected; + USHORT Size; + USHORT Version; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PVOID Context; + PPCMCIA_MODIFY_MEMORY_WINDOW ModifyMemoryWindow; + PPCMCIA_SET_VPP SetVpp; + PPCMCIA_IS_WRITE_PROTECTED IsWriteProtected; } PCMCIA_INTERFACE_STANDARD, *PPCMCIA_INTERFACE_STANDARD; #ifdef __cplusplus

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