Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 22838: - Misc formatting fixes.
by ion＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: ion Date: Tue Jul 4 20:53:29 2006 New Revision: 22838 URL: http://svn.reactos.org/svn/reactos?rev=22838&view=rev Log: - Misc formatting fixes. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Tue Jul 4 20:53:29 2006 @@ -830,6 +830,7 @@ OUT PVOID OutputBuffer, IN ULONG OutputBufferLength OPTIONAL) { + /* Call the Generic Function */ return IopDeviceFsIoControl(DeviceHandle, Event, UserApcRoutine, @@ -1494,7 +1495,7 @@ NTSTATUS NTAPI NtQueryInformationFile(IN HANDLE FileHandle, - IN PIO_STATUS_BLOCK IoStatusBlock, + OUT PIO_STATUS_BLOCK IoStatusBlock, IN PVOID FileInformation, IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass) @@ -2009,7 +2010,7 @@ NTSTATUS NTAPI NtSetInformationFile(IN HANDLE FileHandle, - IN PIO_STATUS_BLOCK IoStatusBlock, + OUT PIO_STATUS_BLOCK IoStatusBlock, IN PVOID FileInformation, IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass) @@ -2324,17 +2325,17 @@ */ NTSTATUS NTAPI -NtSetQuotaInformationFile(HANDLE FileHandle, - PIO_STATUS_BLOCK IoStatusBlock, - PVOID Buffer, - ULONG BufferLength) +NtSetQuotaInformationFile(IN HANDLE FileHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID Buffer, + IN ULONG BufferLength) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI

1 0

[ion] 22837: - Fix NtSetInformationFile to use correct sync/async semantics and use deferred I/O completion. This routine doesn't use IopSyncronous/Asyncronous helper routines because it can be optimized to handle some Information classes in-line (not currently being done except for Completion Ports, like the previous code).
by ion＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: ion Date: Tue Jul 4 20:50:56 2006 New Revision: 22837 URL: http://svn.reactos.org/svn/reactos?rev=22837&view=rev Log: - Fix NtSetInformationFile to use correct sync/async semantics and use deferred I/O completion. This routine doesn't use IopSyncronous/Asyncronous helper routines because it can be optimized to handle some Information classes in-line (not currently being done except for Completion Ports, like the previous code). Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Tue Jul 4 20:50:56 2006 @@ -24,12 +24,6 @@ /// // // TODO: -// - Update to new semantics: -// - Lock/Unlock <= DONE -// - Query/Set Volume Info <= DONE -// - Read/Write file <= DONE -// - QueryDirectoryFile <= DONE -// - Query/Set File Info // - Add SEH to some places where it's missing (MDLs, etc) // - Add a generic Cleanup/Exception Routine // - Add probe/alignment checks for Query/Set routines @@ -2014,311 +2008,311 @@ */ NTSTATUS NTAPI -NtSetInformationFile(HANDLE FileHandle, - PIO_STATUS_BLOCK IoStatusBlock, - PVOID FileInformation, - ULONG Length, - FILE_INFORMATION_CLASS FileInformationClass) +NtSetInformationFile(IN HANDLE FileHandle, + IN PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID FileInformation, + IN ULONG Length, + IN FILE_INFORMATION_CLASS FileInformationClass) { - OBJECT_HANDLE_INFORMATION HandleInformation; + PFILE_OBJECT FileObject; + NTSTATUS Status = STATUS_SUCCESS; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; - PFILE_OBJECT FileObject; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - KEVENT Event; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PKEVENT Event = NULL; BOOLEAN LocalEvent = FALSE; - NTSTATUS Status = STATUS_SUCCESS; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - BOOLEAN Failed = FALSE; - + PKNORMAL_ROUTINE NormalRoutine; + PVOID NormalContext; + KIRQL OldIrql; + IO_STATUS_BLOCK KernelIosb; + PVOID Queue; + PFILE_COMPLETION_INFORMATION CompletionInfo = FileInformation; + PIO_COMPLETION_CONTEXT Context; + + /* Check if we're called from user mode */ if (PreviousMode != KernelMode) { + /* Enter SEH for probing */ _SEH_TRY { - if (IoStatusBlock) - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - } - + /* Probe the I/O Status block */ + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + + /* Probe the information */ if (Length) ProbeForRead(FileInformation, Length, 1); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - - /* Get the file object from the file handle */ + + /* Check if probing failed */ + if (!NT_SUCCESS(Status)) return Status; + } + + /* Reference the Handle */ Status = ObReferenceObjectByHandle(FileHandle, - 0, + 0, // FIXME IoFileObjectType, PreviousMode, (PVOID *)&FileObject, - &HandleInformation); + NULL); if (!NT_SUCCESS(Status)) return Status; - /* Check information class specific access rights */ - switch (FileInformationClass) - { - case FileBasicInformation: - if (!(HandleInformation.GrantedAccess & FILE_WRITE_ATTRIBUTES)) - Failed = TRUE; - break; - - case FileDispositionInformation: - if (!(HandleInformation.GrantedAccess & DELETE)) - Failed = TRUE; - break; - - case FilePositionInformation: - if (!(HandleInformation.GrantedAccess & (FILE_READ_DATA | FILE_WRITE_DATA)) || - !(FileObject->Flags & FO_SYNCHRONOUS_IO)) - Failed = TRUE; - break; - - case FileEndOfFileInformation: - if (!(HandleInformation.GrantedAccess & FILE_WRITE_DATA)) - Failed = TRUE; - break; - - default: - break; - } - - if (Failed) - { - ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; - } - - if (FileInformationClass == FilePositionInformation) - { - if (Length < sizeof(FILE_POSITION_INFORMATION)) - { - Status = STATUS_BUFFER_OVERFLOW; - } - else - { - _SEH_TRY - { - FileObject->CurrentByteOffset = ((PFILE_POSITION_INFORMATION)FileInformation)->CurrentByteOffset; - IoStatusBlock->Information = 0; - Status = IoStatusBlock->Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - ObDereferenceObject(FileObject); - return Status; - } + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + /* Get the device object */ + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + /* Get the device object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Check if this is a file that was opened for Synch I/O */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Lock it */ + IopLockFileObject(FileObject); + + /* Check if the caller just wants the position */ + if (FileInformationClass == FilePositionInformation) + { + /* Protect write in SEH */ + _SEH_TRY + { + /* Write the offset */ + FileObject->CurrentByteOffset = + ((PFILE_POSITION_INFORMATION)FileInformation)-> + CurrentByteOffset; + + /* Fill out the I/O Status Block */ + IoStatusBlock->Information = 0; + Status = IoStatusBlock->Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Release the file lock, dereference the file and return */ + IopUnlockFileObject(FileObject); + ObDereferenceObject(FileObject); + return Status; + } + } + else + { + /* Use local event */ + Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + KeInitializeEvent(Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } + + /* Clear the File Object event */ + KeClearEvent(&FileObject->Event); + + /* Allocate the IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + + /* Set the IRP */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->RequestorMode = PreviousMode; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->UserIosb = (LocalEvent) ? &KernelIosb : IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? Event : NULL; + Irp->AssociatedIrp.SystemBuffer = NULL; + Irp->MdlAddress = NULL; + Irp->UserBuffer = FileInformation; + + /* Set the Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; + StackPtr->FileObject = FileObject; + + /* Allocate a buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + + /* Copy the data into it */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, FileInformation, Length); + + /* Set the flags */ + Irp->Flags = (IRP_BUFFERED_IO | + IRP_DEALLOCATE_BUFFER | + IRP_DEFER_IO_COMPLETION); + + /* Set the Parameters */ + StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass; + StackPtr->Parameters.SetFile.Length = Length; + + /* Queue the IRP */ + //IopQueueIrpToThread(Irp); + + /* Update operation counts */ + IopUpdateOperationCount(IopOtherTransfer); /* FIXME: Later, we can implement a lot of stuff here and avoid a driver call */ /* Handle IO Completion Port quickly */ if (FileInformationClass == FileCompletionInformation) { - PVOID Queue; - PFILE_COMPLETION_INFORMATION CompletionInfo = FileInformation; - PIO_COMPLETION_CONTEXT Context; - - if (FileObject->Flags & FO_SYNCHRONOUS_IO || FileObject->CompletionContext != NULL) - { + /* Check if the file object already has a completion port */ + if ((FileObject->Flags & FO_SYNCHRONOUS_IO) || + (FileObject->CompletionContext)) + { + /* Fail */ Status = STATUS_INVALID_PARAMETER; } else { - if (Length < sizeof(FILE_COMPLETION_INFORMATION)) + /* Reference the Port */ + CompletionInfo = Irp->AssociatedIrp.SystemBuffer; + Status = ObReferenceObjectByHandle(CompletionInfo->Port, + IO_COMPLETION_MODIFY_STATE, + IoCompletionType, + PreviousMode, + (PVOID*)&Queue, + NULL); + if (NT_SUCCESS(Status)) { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - /* Reference the Port */ - Status = ObReferenceObjectByHandle(CompletionInfo->Port, /* FIXME - protect with SEH! */ - IO_COMPLETION_MODIFY_STATE, - IoCompletionType, - PreviousMode, - (PVOID*)&Queue, - NULL); - if (NT_SUCCESS(Status)) + /* Allocate the Context */ + Context = ExAllocatePoolWithTag(PagedPool, + sizeof(IO_COMPLETION_CONTEXT), + IOC_TAG); + if (Context) { - /* Allocate the Context */ - Context = ExAllocatePoolWithTag(PagedPool, - sizeof(IO_COMPLETION_CONTEXT), - TAG('I', 'o', 'C', 'p')); - - if (Context != NULL) + /* Set the Data */ + Context->Key = CompletionInfo->Key; + Context->Port = Queue; + if (InterlockedCompareExchangePointer(&FileObject-> + CompletionContext, + Context, + NULL)) { - /* Set the Data */ - Context->Key = CompletionInfo->Key; /* FIXME - protect with SEH! */ - Context->Port = Queue; - - if (InterlockedCompareExchangePointer(&FileObject->CompletionContext, - Context, - NULL) != NULL) - { - /* someone else set the completion port in the - meanwhile, fail */ - ExFreePool(Context); - ObDereferenceObject(Queue); - Status = STATUS_INVALID_PARAMETER; - } - } - else - { - /* Dereference the Port now */ + /* + * Someone else set the completion port in the + * meanwhile, so dereference the port and fail. + */ + ExFreePool(Context); ObDereferenceObject(Queue); - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_INVALID_PARAMETER; } } + else + { + /* Dereference the Port now */ + ObDereferenceObject(Queue); + Status = STATUS_INSUFFICIENT_RESOURCES; + } } } - /* Complete the I/O */ - ObDereferenceObject(FileObject); - return Status; - } - - /* Check if this is a direct open or not */ - if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) - { - DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + /* Set the IRP Status */ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; } else { - DeviceObject = IoGetRelatedDeviceObject(FileObject); - } - - /* Check if we should use Sync IO or not */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); - } - else - { - /* Use local event */ - KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - LocalEvent = TRUE; - } - - /* Allocate the IRP */ - if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Allocate the System Buffer */ - Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (!Irp->AssociatedIrp.SystemBuffer) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto failfreeirp; - } - - /* Copy the data inside */ - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - /* no need to probe again */ - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - FileInformation, - Length); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, - TAG_SYSB); - Irp->AssociatedIrp.SystemBuffer = NULL; -failfreeirp: - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return Status; - } - } - else - { - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - FileInformation, - Length); - } - - /* Set up the IRP */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->UserIosb = IoStatusBlock; - Irp->UserEvent = (LocalEvent) ? &Event : NULL; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; - Irp->Flags |= (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; - - /* Set up Stack Data */ - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; - StackPtr->FileObject = FileObject; - - /* Set the Parameters */ - StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass; - StackPtr->Parameters.SetFile.Length = Length; - - /* Call the Driver */ - Status = IoCallDriver(DeviceObject, Irp); + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + } + + /* Check if we're waiting for the IRP to complete */ if (Status == STATUS_PENDING) { + /* Check if this was async I/O */ if (LocalEvent) { - KeWaitForSingleObject(&Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); + /* Then to a non-alertable wait */ + Status = KeWaitForSingleObject(&Event, + Executive, + PreviousMode, + FALSE, + NULL); + if (Status == STATUS_USER_APC) + { + /* Abort the request */ + IopAbortInterruptedIrp(Event, Irp); + } + + /* Set the final status */ + Status = KernelIosb.Status; + + /* Enter SEH to write the IOSB back */ _SEH_TRY { - Status = IoStatusBlock->Status; + /* Write it back to the caller */ + *IoStatusBlock = KernelIosb; } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + + /* Free the event */ + ExFreePool(Event); } else { - KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - _SEH_TRY + /* Wait for the IRP */ + Status = KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + if ((Status == STATUS_USER_APC) || (Status == STATUS_ALERTED)) { - Status = FileObject->FinalStatus; + /* Abort the request */ + IopAbortInterruptedIrp(&FileObject->Event, Irp); } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } + + /* Set the final status */ + Status = FileObject->FinalStatus; + + /* Release the file lock */ + IopUnlockFileObject(FileObject); + } + } + else + { + /* Free the event if we had one */ + if (LocalEvent) + { + /* Clear it in the IRP for completion */ + Irp->UserEvent = NULL; + ExFreePool(Event); + } + + /* Set the caller IOSB */ + Irp->UserIosb = IoStatusBlock; + + /* The IRP wasn't completed, complete it ourselves */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + IopCompleteRequest(&Irp->Tail.Apc, + &NormalRoutine, + &NormalContext, + (PVOID*)&FileObject, + &NormalContext); + KeLowerIrql(OldIrql); + + /* Release the file object if we had locked it*/ + if (!LocalEvent) IopUnlockFileObject(FileObject); } /* Return the Status */

1 0

[ion] 22836: - Fix NtQueryInformationFile to use correct sync/async semantics and use deferred I/O completion. This routine doesn't use IopSyncronous/Asyncronous helper routines because it can be optimized to handle some Information classes in-line (not currently being done).
by ion＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: ion Date: Tue Jul 4 19:36:55 2006 New Revision: 22836 URL: http://svn.reactos.org/svn/reactos?rev=22836&view=rev Log: - Fix NtQueryInformationFile to use correct sync/async semantics and use deferred I/O completion. This routine doesn't use IopSyncronous/Asyncronous helper routines because it can be optimized to handle some Information classes in-line (not currently being done). Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Tue Jul 4 19:36:55 2006 @@ -32,6 +32,7 @@ // - Query/Set File Info // - Add SEH to some places where it's missing (MDLs, etc) // - Add a generic Cleanup/Exception Routine +// - Add probe/alignment checks for Query/Set routines // - Add another parameter to IopCleanupFailedIrp // - Add support for Fast Dispatch I/O // - Add support for some fast-paths when querying/setting data @@ -1506,178 +1507,234 @@ { OBJECT_HANDLE_INFORMATION HandleInformation; PFILE_OBJECT FileObject; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PIRP Irp; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - KEVENT Event; + PKEVENT Event = NULL; BOOLEAN LocalEvent = FALSE; - BOOLEAN Failed = FALSE; + PKNORMAL_ROUTINE NormalRoutine; + PVOID NormalContext; + KIRQL OldIrql; + IO_STATUS_BLOCK KernelIosb; + + /* Check if we're called from user mode */ + if (PreviousMode != KernelMode) + { + /* Enter SEH for probing */ + _SEH_TRY + { + /* Probe the I/O Status block */ + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + + /* Probe the information */ + if (Length) ProbeForWrite(FileInformation, Length, 1); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Check if probing failed */ + if (!NT_SUCCESS(Status)) return Status; + } /* Reference the Handle */ Status = ObReferenceObjectByHandle(FileHandle, - 0, + 0, // FIXME IoFileObjectType, PreviousMode, (PVOID *)&FileObject, &HandleInformation); if (!NT_SUCCESS(Status)) return Status; - /* Check information class specific access rights */ - switch (FileInformationClass) - { - case FileBasicInformation: - if (!(HandleInformation.GrantedAccess & FILE_READ_ATTRIBUTES)) - Failed = TRUE; - break; - - case FilePositionInformation: - if (!(HandleInformation.GrantedAccess & (FILE_READ_DATA | FILE_WRITE_DATA)) || - !(FileObject->Flags & FO_SYNCHRONOUS_IO)) - Failed = TRUE; - break; - - default: - break; - } - - if (Failed) - { - ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; - } - - if (FileInformationClass == FilePositionInformation) - { - if (Length < sizeof(FILE_POSITION_INFORMATION)) - { - Status = STATUS_BUFFER_OVERFLOW; - } - else - { - _SEH_TRY - { - ((PFILE_POSITION_INFORMATION)FileInformation)->CurrentByteOffset = FileObject->CurrentByteOffset; - IoStatusBlock->Information = sizeof(FILE_POSITION_INFORMATION); - Status = IoStatusBlock->Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - ObDereferenceObject(FileObject); - return Status; - } - /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { + /* Get the device object */ DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); } else { + /* Get the device object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); } - if (FileInformationClass == FileAlignmentInformation) - { - if (Length < sizeof(FILE_ALIGNMENT_INFORMATION)) - { - Status = STATUS_BUFFER_OVERFLOW; - } - else - { - _SEH_TRY - { - ((PFILE_ALIGNMENT_INFORMATION)FileInformation)->AlignmentRequirement = DeviceObject->AlignmentRequirement; - IoStatusBlock->Information = sizeof(FILE_ALIGNMENT_INFORMATION); - Status = IoStatusBlock->Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - ObDereferenceObject(FileObject); - return Status; - } - - /* Check if we should use Sync IO or not */ + /* Check if this is a file that was opened for Synch I/O */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); + /* Lock it */ + IopLockFileObject(FileObject); + + /* Check if the caller just wants the position */ + if (FileInformationClass == FilePositionInformation) + { + /* Protect write in SEH */ + _SEH_TRY + { + /* Write the offset */ + ((PFILE_POSITION_INFORMATION)FileInformation)-> + CurrentByteOffset = FileObject->CurrentByteOffset; + + /* Fill out the I/O Status Block */ + IoStatusBlock->Information = sizeof(FILE_POSITION_INFORMATION); + Status = IoStatusBlock->Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Release the file lock, dereference the file and return */ + IopUnlockFileObject(FileObject); + ObDereferenceObject(FileObject); + return Status; + } } else { /* Use local event */ - KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + KeInitializeEvent(Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } + /* Clear the File Object event */ + KeClearEvent(&FileObject->Event); + /* Allocate the IRP */ - if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Allocate the System Buffer */ - Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (!Irp->AssociatedIrp.SystemBuffer) - { - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Set up the IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + + /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->RequestorMode = PreviousMode; - Irp->UserIosb = IoStatusBlock; - Irp->UserEvent = (LocalEvent) ? &Event : NULL; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->UserIosb = (LocalEvent) ? &KernelIosb : IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? Event : NULL; + Irp->AssociatedIrp.SystemBuffer = NULL; + Irp->MdlAddress = NULL; Irp->UserBuffer = FileInformation; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER | IRP_INPUT_OPERATION; - Irp->Flags |= (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; - - /* Set up Stack Data */ + + /* Set the Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; StackPtr->FileObject = FileObject; + /* Allocate a buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + + /* Set the flags */ + Irp->Flags = (IRP_BUFFERED_IO | + IRP_DEALLOCATE_BUFFER | + IRP_INPUT_OPERATION | + IRP_DEFER_IO_COMPLETION); + /* Set the Parameters */ StackPtr->Parameters.QueryFile.FileInformationClass = FileInformationClass; StackPtr->Parameters.QueryFile.Length = Length; + /* Queue the IRP */ + //IopQueueIrpToThread(Irp); + + /* Update operation counts */ + IopUpdateOperationCount(IopOtherTransfer); + /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { + /* Check if this was async I/O */ if (LocalEvent) { - KeWaitForSingleObject(&Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock->Status; + /* Then to a non-alertable wait */ + Status = KeWaitForSingleObject(&Event, + Executive, + PreviousMode, + FALSE, + NULL); + if (Status == STATUS_USER_APC) + { + /* Abort the request */ + IopAbortInterruptedIrp(Event, Irp); + } + + /* Set the final status */ + Status = KernelIosb.Status; + + /* Enter SEH to write the IOSB back */ + _SEH_TRY + { + /* Write it back to the caller */ + *IoStatusBlock = KernelIosb; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Free the event */ + ExFreePool(Event); } else { - KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); + /* Wait for the IRP */ + Status = KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + if ((Status == STATUS_USER_APC) || (Status == STATUS_ALERTED)) + { + /* Abort the request */ + IopAbortInterruptedIrp(&FileObject->Event, Irp); + } + + /* Set the final status */ Status = FileObject->FinalStatus; - } + + /* Release the file lock */ + IopUnlockFileObject(FileObject); + } + } + else + { + /* Free the event if we had one */ + if (LocalEvent) + { + /* Clear it in the IRP for completion */ + Irp->UserEvent = NULL; + ExFreePool(Event); + } + + /* Set the caller IOSB */ + Irp->UserIosb = IoStatusBlock; + + /* The IRP wasn't completed, complete it ourselves */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + IopCompleteRequest(&Irp->Tail.Apc, + &NormalRoutine, + &NormalContext, + (PVOID*)&FileObject, + &NormalContext); + KeLowerIrql(OldIrql); + + /* Release the file object if we had locked it*/ + if (!LocalEvent) IopUnlockFileObject(FileObject); } /* Return the Status */

1 0

[janderwald] 22835: fix build
by janderwald＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: janderwald Date: Tue Jul 4 19:15:45 2006 New Revision: 22835 URL: http://svn.reactos.org/svn/reactos?rev=22835&view=rev Log: fix build Modified: trunk/reactos/dll/win32/powrprof/powrprof.spec Modified: trunk/reactos/dll/win32/powrprof/powrprof.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.spec (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.spec Tue Jul 4 19:15:45 2006 @@ -18,3 +18,4 @@ @ stdcall WriteGlobalPwrPolicy (ptr) @ stdcall WriteProcessorPwrScheme (long ptr) @ stdcall WritePwrScheme (ptr str str ptr) +@ stdcall ValidatePowerPolicies (ptr ptr)

1 0

[winesync] 22834: Autosyncing with Wine
by winesync＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: winesync Date: Tue Jul 4 18:20:20 2006 New Revision: 22834 URL: http://svn.reactos.org/svn/reactos?rev=22834&view=rev Log: Autosyncing with Wine Modified: trunk/reactos/dll/win32/shfolder/shfolder.rbuild trunk/reactos/dll/win32/shfolder/shfolder.spec (props changed) trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild Modified: trunk/reactos/dll/win32/shfolder/shfolder.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shfolder/shfolde… ============================================================================== --- trunk/reactos/dll/win32/shfolder/shfolder.rbuild (original) +++ trunk/reactos/dll/win32/shfolder/shfolder.rbuild Tue Jul 4 18:20:20 2006 @@ -1,10 +1,17 @@ -<module name="shfolder" type="win32dll" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll"> +<module name="shfolder" type="win32dll" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll" allowwarnings="true"> <importlibrary definition="shfolder.spec.def" /> <include base="shfolder">.</include> - <include base="shfolder">include</include> + <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> <library>shell32</library> + <library>kernel32</library> + <library>ntdll</library> <file>shfolder_main.c</file> <file>shfolder.spec</file> </module> Propchange: trunk/reactos/dll/win32/shfolder/shfolder.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild Tue Jul 4 18:20:20 2006 @@ -3,17 +3,17 @@ <include base="uxtheme">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> - <library>shlwapi</library> - <library>ntdll</library> + <library>user32</library> + <library>gdi32</library> <library>advapi32</library> <library>kernel32</library> - <library>gdi32</library> - <library>user32</library> + <library>ntdll</library> <library>msimg32</library> <file>draw.c</file> <file>main.c</file>

1 0

[winesync] 22833: Autosyncing with Wine
by winesync＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: winesync Date: Tue Jul 4 18:17:14 2006 New Revision: 22833 URL: http://svn.reactos.org/svn/reactos?rev=22833&view=rev Log: Autosyncing with Wine Modified: trunk/reactos/dll/win32/riched32/riched32.rbuild Modified: trunk/reactos/dll/win32/riched32/riched32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched32/riched3… ============================================================================== --- trunk/reactos/dll/win32/riched32/riched32.rbuild (original) +++ trunk/reactos/dll/win32/riched32/riched32.rbuild Tue Jul 4 18:17:14 2006 @@ -1,17 +1,18 @@ -<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installbase="system32" installname="riched32.dll"> +<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installbase="system32" installname="riched32.dll" allowwarnings="true"> <importlibrary definition="riched32.spec.def" /> <include base="riched32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>riched20</library> + <library>user32</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>user32</library> - <library>riched20</library> <file>richedit.c</file> <file>riched32.spec</file> </module>

1 0

[winesync] 22832: Autosyncing with Wine
by winesync＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: winesync Date: Tue Jul 4 18:14:41 2006 New Revision: 22832 URL: http://svn.reactos.org/svn/reactos?rev=22832&view=rev Log: Autosyncing with Wine Added: trunk/reactos/dll/win32/powrprof/powrprof.spec (with props) Removed: trunk/reactos/dll/win32/powrprof/powrprof.rc trunk/reactos/dll/win32/powrprof/powrprof_gcc.def Modified: trunk/reactos/dll/win32/powrprof/powrprof.rbuild Modified: trunk/reactos/dll/win32/powrprof/powrprof.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.rbuild (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.rbuild Tue Jul 4 18:14:41 2006 @@ -1,18 +1,17 @@ <module name="powrprof" type="win32dll" baseaddress="${BASEADDRESS_POWRPROF}" installbase="system32" installname="powrprof.dll" allowwarnings="true"> - <importlibrary definition="powrprof_gcc.def" /> - <include base="ReactOS">include/wine</include> - <define name="_DISABLE_TIDENTS" /> + <importlibrary definition="powrprof.spec.def" /> + <include base="powrprof">.</include> + <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>advapi32</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>ntoskrnl</library> <file>powrprof.c</file> - <file>powrprof.rc</file> + <file>powrprof.spec</file> </module> Removed: trunk/reactos/dll/win32/powrprof/powrprof.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.rc (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.rc (removed) @@ -1,10 +1,0 @@ -/* $Id: version.rc 12852 2005-01-06 13:58:04Z mf $ */ - -#include "powrprof.h" -//#include "misc.h" -//#include "type.h" -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Power Profile Helper DLL\0" -#define REACTOS_STR_INTERNAL_NAME "powerprof\0" -#define REACTOS_STR_ORIGINAL_FILENAME "powerprof.dll\0" -#include <reactos/version.rc> Added: trunk/reactos/dll/win32/powrprof/powrprof.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.spec (added) +++ trunk/reactos/dll/win32/powrprof/powrprof.spec Tue Jul 4 18:14:41 2006 @@ -1,0 +1,20 @@ +@ stdcall CallNtPowerInformation (long ptr long ptr long) +@ stdcall CanUserWritePwrScheme () +@ stdcall DeletePwrScheme (long) +@ stdcall EnumPwrSchemes (ptr long) +@ stdcall GetActivePwrScheme (ptr) +@ stdcall GetCurrentPowerPolicies (ptr ptr) +@ stdcall GetPwrCapabilities (ptr) +@ stdcall GetPwrDiskSpindownRange (ptr ptr) +@ stdcall IsAdminOverrideActive (ptr) +@ stdcall IsPwrHibernateAllowed () +@ stdcall IsPwrShutdownAllowed () +@ stdcall IsPwrSuspendAllowed () +@ stdcall ReadGlobalPwrPolicy (ptr) +@ stdcall ReadProcessorPwrScheme (long ptr) +@ stdcall ReadPwrScheme (long ptr) +@ stdcall SetActivePwrScheme (long ptr ptr) +@ stdcall SetSuspendState (long long long) +@ stdcall WriteGlobalPwrPolicy (ptr) +@ stdcall WriteProcessorPwrScheme (long ptr) +@ stdcall WritePwrScheme (ptr str str ptr) Propchange: trunk/reactos/dll/win32/powrprof/powrprof.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/powrprof/powrprof_gcc.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof_gcc.def (original) +++ trunk/reactos/dll/win32/powrprof/powrprof_gcc.def (removed) @@ -1,36 +1,0 @@ - -; $Id: version.def 12852 2005-01-06 13:58:04Z mf $ -; ReactOS Operating System -; -LIBRARY powrprof.dll -EXPORTS -CallNtPowerInformation@20 -;NtPowerInformation@20=ntokrnl._NtPowerInformation@20 -CanUserWritePwrScheme@0 -;DebugPrintA -;DllInitialize -DeletePwrScheme@4 -;DevicePowerClose -;DevicePowerEnumDevices -;DevicePowerOpen -;DevicePowerSetDeviceState -EnumPwrSchemes@8 -GetActivePwrScheme@4 -GetCurrentPowerPolicies@8 -GetPwrCapabilities@4 -GetPwrDiskSpindownRange@8 -IsAdminOverrideActive@4 -IsPwrHibernateAllowed@0 -IsPwrShutdownAllowed@0 -IsPwrSuspendAllowed@0 -;LoadCurrentPwrScheme -;MergeLegacyPwrScheme -ReadGlobalPwrPolicy@4 -ReadProcessorPwrScheme@8 -ReadPwrScheme@8 -SetActivePwrScheme@12 -SetSuspendState@12 -ValidatePowerPolicies@8 -WriteGlobalPwrPolicy@4 -WriteProcessorPwrScheme@8 -WritePwrScheme@16

1 0

[winesync] 22831: Autosyncing with Wine
by winesync＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: winesync Date: Tue Jul 4 18:12:07 2006 New Revision: 22831 URL: http://svn.reactos.org/svn/reactos?rev=22831&view=rev Log: Autosyncing with Wine Removed: trunk/reactos/dll/win32/olepro32/olepro32.rc Modified: trunk/reactos/dll/win32/olepro32/olepro32.rbuild Modified: trunk/reactos/dll/win32/olepro32/olepro32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro32.rbuild (original) +++ trunk/reactos/dll/win32/olepro32/olepro32.rbuild Tue Jul 4 18:12:07 2006 @@ -1,18 +1,17 @@ -<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> +<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll" allowwarnings="true"> <importlibrary definition="olepro32.spec.def" /> <include base="olepro32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>oleaut32</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>oleaut32</library> <file>olepro32stubs.c</file> - <file>olepro32.rc</file> <file>olepro32.spec</file> </module> Removed: trunk/reactos/dll/win32/olepro32/olepro32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro32.rc (original) +++ trunk/reactos/dll/win32/olepro32/olepro32.rc (removed) @@ -1,28 +1,0 @@ -/* Language neutral resources. - * - * Copyright 2003 Stefan Leichter - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#define WINE_FILEDESCRIPTION_STR "Wine Cabinet File API" -#define WINE_FILENAME_STR "cabinet.dll" -#define WINE_FILEVERSION 5,0,2147,1 -#define WINE_FILEVERSION_STR "5.0.2147.1" - -#define WINE_PRODUCTVERSION 5,0,2147,1 -#define WINE_PRODUCTVERSION_STR "5.0" - -#include "wine/wine_common_ver.rc"

1 0

[winesync] 22830: Autosyncing with Wine
by winesync＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: winesync Date: Tue Jul 4 18:09:35 2006 New Revision: 22830 URL: http://svn.reactos.org/svn/reactos?rev=22830&view=rev Log: Autosyncing with Wine Added: trunk/reactos/dll/win32/netapi32/share.c (with props) trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc (with props) Removed: trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc Modified: trunk/reactos/dll/win32/msimg32/msimg32.rbuild trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/netapi32.rbuild trunk/reactos/dll/win32/netapi32/wksta.c trunk/reactos/dll/win32/oleacc/oleacc.rbuild trunk/reactos/dll/win32/oledlg/oledlg.rbuild trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc (contents, props changed) trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc trunk/reactos/dll/win32/oledlg/rsrc.rc Modified: trunk/reactos/dll/win32/msimg32/msimg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimg32/msimg32.… ============================================================================== --- trunk/reactos/dll/win32/msimg32/msimg32.rbuild (original) +++ trunk/reactos/dll/win32/msimg32/msimg32.rbuild Tue Jul 4 18:09:35 2006 @@ -1,12 +1,17 @@ <module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}" installbase="system32" installname="msimg32.dll" allowwarnings="true"> <importlibrary definition="msimg32.spec.def" /> <include base="msimg32">.</include> - <include base="msimg32">include</include> + <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>gdi32</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>gdi32</library> <file>msimg32_main.c</file> <file>msimg32.spec</file> </module> Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c (original) +++ trunk/reactos/dll/win32/netapi32/access.c Tue Jul 4 18:09:35 2006 @@ -554,6 +554,12 @@ NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR szServer, DWORD level, LPBYTE *pbuffer) { FIXME("(%s %ld %p) stub!\n", debugstr_w(szServer), level, pbuffer); + + if (level == 2) + { + *pbuffer = NULL; + return NERR_Success; + } return NERR_InternalError; } Modified: trunk/reactos/dll/win32/netapi32/netapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.rbuild (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.rbuild Tue Jul 4 18:09:35 2006 @@ -3,26 +3,35 @@ <include base="netapi32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> - <define name="_SVRAPI_" /> <library>wine</library> + <library>iphlpapi</library> + <library>ws2_32</library> + <library>advapi32</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>ws2_32</library> - <library>iphlpapi</library> <file>access.c</file> + <library>ntdll</library> <file>apibuf.c</file> + <library>ntdll</library> <file>browsr.c</file> + <library>ntdll</library> <file>ds.c</file> + <library>ntdll</library> <file>nbcmdqueue.c</file> + <library>ntdll</library> <file>nbnamecache.c</file> + <library>ntdll</library> <file>nbt.c</file> + <library>ntdll</library> <file>netapi32.c</file> + <library>ntdll</library> <file>netbios.c</file> + <library>ntdll</library> <file>wksta.c</file> <file>netapi32.spec</file> </module> Added: trunk/reactos/dll/win32/netapi32/share.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/share.c (added) +++ trunk/reactos/dll/win32/netapi32/share.c Tue Jul 4 18:09:35 2006 @@ -1,0 +1,85 @@ +/* Copyright 2006 Paul Vriens + * + * 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 "wine/debug.h" +#include "lm.h" +#include "winerror.h" + +WINE_DEFAULT_DEBUG_CHANNEL(share); + +/************************************************************ + * NetSessionEnum (NETAPI32.@) + * + * PARAMS + * servername [I] Pointer to a string with the name of the server + * UncClientName [I] Pointer to a string with the name of the session + * username [I] Pointer to a string with the name of the user + * level [I] Data information level + * bufptr [O] Buffer to the data + * prefmaxlen [I] Preferred maximum length of the data + * entriesread [O] Pointer to the number of entries enumerated + * totalentries [O] Pointer to the possible number of entries + * resume_handle [I/O] Pointer to a handle for subsequent searches + * + * RETURNS + * If successful, the function returns NERR_Success + * On failure it returns: + * ERROR_ACCESS_DENIED User has no access to the requested information + * ERROR_INVALID_LEVEL Value of 'level' is not correct + * ERROR_INVALID_PARAMETER Wrong parameter + * ERROR_MORE_DATA Need a larger buffer + * ERROR_NOT_ENOUGH_MEMORY Not enough memory + * NERR_ClientNameNotFound A session does not exist on a given computer + * NERR_InvalidComputer Invalid computer name + * NERR_UserNotFound User name could not be found. + */ +NET_API_STATUS WINAPI NetSessionEnum(LPWSTR servername, LPWSTR UncClientName, + LPWSTR username, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, + LPDWORD totalentries, LPDWORD resume_handle) +{ + FIXME("Stub (%s %s %s %ld %p %ld %p %p %p)\n", debugstr_w(servername), + debugstr_w(UncClientName), debugstr_w(username), + level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + + return NERR_Success; +} + +/************************************************************ + * NetShareEnum (NETAPI32.@) + * + * PARAMS + * servername [I] Pointer to a string with the name of the server + * level [I] Data information level + * bufptr [O] Buffer to the data + * prefmaxlen [I] Preferred maximum length of the data + * entriesread [O] Pointer to the number of entries enumerated + * totalentries [O] Pointer to the possible number of entries + * resume_handle [I/O] Pointer to a handle for subsequent searches + * + * RETURNS + * If successful, the function returns NERR_Success + * On failure it returns a system error code (FIXME: find out which) + * + */ +NET_API_STATUS WINAPI NetShareEnum( LPWSTR servername, DWORD level, LPBYTE* bufptr, + DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) +{ + FIXME("Stub (%s %ld %p %ld %p %p %p)\n", debugstr_w(servername), level, bufptr, + prefmaxlen, entriesread, totalentries, resume_handle); + + return ERROR_NOT_SUPPORTED; +} Propchange: trunk/reactos/dll/win32/netapi32/share.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c Tue Jul 4 18:09:35 2006 @@ -36,6 +36,7 @@ #include "iphlpapi.h" #include "winerror.h" #include "winreg.h" +#include "winternl.h" #include "ntsecapi.h" #include "netbios.h" #include "wine/debug.h" Modified: trunk/reactos/dll/win32/oleacc/oleacc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rb… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.rbuild (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.rbuild Tue Jul 4 18:09:35 2006 @@ -1,13 +1,16 @@ -<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> +<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true"> <importlibrary definition="oleacc.spec.def" /> <include base="oleacc">.</include> <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>wine</library> <file>main.c</file> <file>oleacc.spec</file> </module> Modified: trunk/reactos/dll/win32/oledlg/oledlg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg.rb… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg.rbuild (original) +++ trunk/reactos/dll/win32/oledlg/oledlg.rbuild Tue Jul 4 18:09:35 2006 @@ -3,17 +3,20 @@ <include base="oledlg">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>ole32</library> + <library>comdlg32</library> + <library>user32</library> + <library>advapi32</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>comdlg32</library> - <library>ole32</library> + <file>insobjdlg.c</file> <file>oledlg_main.c</file> - <file>insobjdlg.c</file> <file>rsrc.rc</file> <file>oledlg.spec</file> </module> Modified: trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Cs… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc Tue Jul 4 18:09:35 2006 @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * Czech resources or oledlg * Copyright 2003 Ulrich Czekalla for CodeWeavers * Copyright 2004 David Kredba @@ -20,9 +21,11 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* Czech strings in CP1250 */ + UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Vlo¾it objekt" +CAPTION "Vloit objekt" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | @@ -49,8 +52,8 @@ STRINGTABLE DISCARDABLE { - IDS_RESULTOBJDESC "Vlo¾en nový %s objekt do Va¹eho dokumentu" - IDS_RESULTFILEOBJDESC "Vlo¾en obsah souboru jako objekt do Va¹eho dokumentu, tak¾e ho mù¾ete upravit programem, kterým byl vytvoøen." + IDS_RESULTOBJDESC "Vloen nový %s objekt do Vaeho dokumentu" + IDS_RESULTFILEOBJDESC "Vloen obsah souboru jako objekt do Vaeho dokumentu, take ho mùete upravit programem, kterým byl vytvoøen." IDS_BROWSE "Procházet" IDS_NOTOLEMOD "Soubor není platným OLE modulem. Nelze registrovat OLE propojení." IDS_NOTOLEMODCAPTION "Pøidat propojení" Modified: trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Hu… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc Tue Jul 4 18:09:35 2006 @@ -1,56 +1,55 @@ -/* - * Copyright 2003 Ulrich Czekalla for CodeWeavers - * Copyright 2005 Gergely Risko - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Objektum Beszúrása" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "Objektum típusa:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Mégse",IDCANCEL,221,24,66,14 - GROUPBOX "Eredmény",IDC_RESULT,7,103,208,41 - CONTROL "Új",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "Vezérlõelem létrehozása",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Létrehozás állományból",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON /* NOT TRANSLATED */ "&Add Control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Megjelenítés ikonként",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Böngészés...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Állomány:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "Új %s objektum beszúrása a dokumentumba" - IDS_RESULTFILEOBJDESC "Az állomány tartalmának beszúrása objektumként a dokumentumba, így azzal a programmal tudod használni, amelyikkel készült." - IDS_BROWSE "Böngészés" - IDS_NOTOLEMOD "Az állomány nem tûnik helyes OLE modulnak. Nem lehet regisztrálni az OLE modult." - IDS_NOTOLEMODCAPTION "Vezérlõelem hozzáadása" -} +/* + * Copyright 2006 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Objektum beszúrása" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Obktum típus:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Mégse",IDCANCEL,221,24,66,14 + GROUPBOX "Eredmény",IDC_RESULT,7,103,208,41 + CONTROL "Új létrehozása",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Vezérlõ létrehozása",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Létrehozás fájlból",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "Vezérlõ hozzá&adása...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Megjelenítés ikonként",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Tallóz...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Fájl:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Új %s objektum behelyezése az Ön dokumentumába" + IDS_RESULTFILEOBJDESC "Kérem illesssze be a fájl tartalmát, mint objektumot a dokumentumába, azzal a programmal amivel létrehozta." + IDS_BROWSE "Tallózás" + IDS_NOTOLEMOD "A fájl úgy tûnik nem egy érvényes OLE modul. Nem tudom regisztrálni az OLE vezérlõt." + IDS_NOTOLEMODCAPTION "Vezérlõ hozzáadása" +} Propchange: trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ja… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc Tue Jul 4 18:09:35 2006 @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -38,7 +38,7 @@ BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "Rg[ðÇÁ(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "ACRÆµÄ\\¦",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "ACRÆµÄ\¦",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "QÆ...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "t@C:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE Removed: trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ru… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc (removed) @@ -1,56 +1,0 @@ -/* - * Copyright 2005 Mikhail Y. Zvyozdochkin - * Aleksey Bragin - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Âñòàâêà îáúåêòà" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "Òèï îáúåêòà:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Îòìåíà",IDCANCEL,221,24,66,14 - GROUPBOX "Ðåçóëüòàò",IDC_RESULT,7,103,208,41 - CONTROL "Ñîçäàòü íîâûé",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "Ñîçäàòü ýëåìåíò óïðàâëåíèÿ",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Ñîçäàòü èç ôàéëà",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "&Äîáàâèòü ýëåìåíò óïðàâëåíèÿ...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Îòîáðàæàòü â âèäå çíà÷êà",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Îáçîð...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Ôàéë:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "Âñòàâèòü íîâûé îáúåêò %s â Âàø äîêóìåíò" - IDS_RESULTFILEOBJDESC "Âñòàâèòü ñîäåðæèìîå ôàéëà êàê îáúåêò â Âàø äîêóìåíò òàê, ÷òî Âû ìîæåòå ðàáîòàòü ñ íèì, èñïîëüçóÿ òó ïðîãðàììó, êîòîðîé îí ñîçäàí." - IDS_BROWSE "Îáçîð" - IDS_NOTOLEMOD "Ôàéë íå ÿâëÿåòñÿ êîððåêòíûì ìîäóëåì OLE. Íå âîçìîæíî çàðåãèñòðèðîâàòü ýëåìåíò óïðàâëåíèÿ OLE." - IDS_NOTOLEMODCAPTION "Äîáàâëÿåò ýëåìåíò óïðàâëåíèÿ" -} Added: trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Tr… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc (added) +++ trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc Tue Jul 4 18:09:35 2006 @@ -1,0 +1,57 @@ +/* + * Turkish Resources + * + * Copyright 2006 Fatih Aþýcý + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Nesne Ekle" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Nesne Türü:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "Tamam",IDOK,221,7,66,14 + PUSHBUTTON "Ýptal",IDCANCEL,221,24,66,14 + GROUPBOX "Sonuç",IDC_RESULT,7,103,208,41 + CONTROL "Yeni Oluþtur",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Denetim Oluþtur",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Dosyadan Oluþtur",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Denetim Ekle...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Simge Olarak Göster",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Gözat...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Dosya:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Belgenize yeni bir %s nesnesi ekle" + IDS_RESULTFILEOBJDESC "Dosya içeriðini belgenize nesne olarak ekleyin. Böylece kendisini oluþturan programý kullanarak onu etkinleþtirebilirsiniz." + IDS_BROWSE "Gözat" + IDS_NOTOLEMOD "Dosya geçerli bir OLE modülü olarak görünmüyor. OLE denetimi kaydedilemiyor." + IDS_NOTOLEMODCAPTION "Denetim Ekle" +} Propchange: trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/oledlg/rsrc.rc (original) +++ trunk/reactos/dll/win32/oledlg/rsrc.rc Tue Jul 4 18:09:35 2006 @@ -36,11 +36,11 @@ #include "oledlg_En.rc" #include "oledlg_Es.rc" #include "oledlg_Fr.rc" +#include "oledlg_Hu.rc" #include "oledlg_It.rc" #include "oledlg_Ja.rc" #include "oledlg_Ko.rc" #include "oledlg_Nl.rc" #include "oledlg_No.rc" #include "oledlg_Pt.rc" -#include "oledlg_Ru.rc" -#include "oledlg_Hu.rc" +#include "oledlg_Tr.rc"

1 0

[winesync] 22829: Autosyncing with Wine
by winesync＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: winesync Date: Tue Jul 4 18:04:07 2006 New Revision: 22829 URL: http://svn.reactos.org/svn/reactos?rev=22829&view=rev Log: Autosyncing with Wine Added: trunk/reactos/dll/win32/mpr/mpr_Eo.rc (with props) trunk/reactos/dll/win32/mpr/mpr_Tr.rc (with props) Removed: trunk/reactos/dll/win32/mpr/mpr_Ru.rc trunk/reactos/dll/win32/mpr/mpr_Sv.rc trunk/reactos/dll/win32/mpr/mpr_Uk.rc Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild trunk/reactos/dll/win32/mpr/mpr.rc trunk/reactos/dll/win32/mpr/mpr.spec trunk/reactos/dll/win32/mpr/mpr_Cs.rc trunk/reactos/dll/win32/mpr/mpr_Hu.rc trunk/reactos/dll/win32/mpr/mpr_Ja.rc trunk/reactos/dll/win32/mpr/nps.c trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rbuild (original) +++ trunk/reactos/dll/win32/mpr/mpr.rbuild Tue Jul 4 18:04:07 2006 @@ -2,24 +2,29 @@ <importlibrary definition="mpr.spec.def" /> <include base="mpr">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>user32</library> + <library>advapi32</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>user32</library> <file>auth.c</file> + <library>ntdll</library> <file>mpr_main.c</file> + <library>ntdll</library> <file>multinet.c</file> + <library>ntdll</library> <file>nps.c</file> + <library>ntdll</library> <file>pwcache.c</file> + <library>ntdll</library> <file>wnet.c</file> + <library>ntdll</library> <file>mpr.rc</file> <file>mpr.spec</file> </module> Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=2… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr.rc Tue Jul 4 18:04:07 2006 @@ -30,13 +30,11 @@ #include "mpr_En.rc" #include "mpr_Es.rc" #include "mpr_Fr.rc" +#include "mpr_Hu.rc" #include "mpr_It.rc" #include "mpr_Ja.rc" #include "mpr_Ko.rc" #include "mpr_Nl.rc" #include "mpr_No.rc" #include "mpr_Pt.rc" -#include "mpr_Ru.rc" -#include "mpr_Sv.rc" -#include "mpr_Hu.rc" -#include "mpr_Uk.rc" +#include "mpr_Tr.rc" Modified: trunk/reactos/dll/win32/mpr/mpr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.spec (original) +++ trunk/reactos/dll/win32/mpr/mpr.spec Tue Jul 4 18:04:07 2006 @@ -40,12 +40,12 @@ @ stdcall NPSNotifyRegisterA(long ptr) @ stdcall NPSSetCustomTextA(str) @ stdcall NPSSetExtendedErrorA(long str) -@ stub PwdChangePasswordA -@ stub PwdChangePasswordW -@ stub PwdGetPasswordStatusA -@ stub PwdGetPasswordStatusW -@ stub PwdSetPasswordStatusA -@ stub PwdSetPasswordStatusW +@ stdcall PwdChangePasswordA(str ptr long ptr) +@ stdcall PwdChangePasswordW(wstr ptr long ptr) +@ stdcall PwdGetPasswordStatusA(str long ptr) +@ stdcall PwdGetPasswordStatusW(wstr long ptr) +@ stdcall PwdSetPasswordStatusA(str long long) +@ stdcall PwdSetPasswordStatusW(wstr long long) @ stdcall WNetAddConnection2A(ptr str str long) @ stdcall WNetAddConnection2W(ptr wstr wstr long) @ stdcall WNetAddConnection3A(long ptr str str long) Modified: trunk/reactos/dll/win32/mpr/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Cs.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Cs.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Cs.rc Tue Jul 4 18:04:07 2006 @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * Czech MPR dll resources * Copyright (C) 2004 Juan Lang * Copyright (C) 2004, 2005 David Kredba @@ -20,27 +21,29 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* Czech strings in CP1250 */ + STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "Celá sí»" + IDS_ENTIRENETWORK "Celá sí" } IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Zadání sí»ového hesla" +CAPTION "Zadání síového hesla" FONT 8, "MS Shell Dlg" { - LTEXT "Prosím zadejte své u¾ivatelské jméno a heslo:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Prosím zadejte své uivatelské jméno a heslo:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "U¾ivatel", -1, 40, 66, 50, 10 + LTEXT "Uivatel", -1, 40, 66, 50, 10 LTEXT "Heslo", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Ulo¾it toto heslo (Není bezpeèné) ?", IDC_SAVEPASSWORD, + CHECKBOX "&Uloit toto heslo (Není bezpeèné) ?", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Zru¹it", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Zruit", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } Added: trunk/reactos/dll/win32/mpr/mpr_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Eo.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Eo.rc (added) +++ trunk/reactos/dll/win32/mpr/mpr_Eo.rc Tue Jul 4 18:04:07 2006 @@ -1,0 +1,46 @@ +/* + * MPR dll resources - Esperanto Language Support + * + * Copyright 2006 Antonio Codazzi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Tuta Reto" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Enmetu Retan Pasvorton" +FONT 8, "MS Shell Dlg" +{ +LTEXT "Enmetu uzantonomon kaj pasvorton:", IDC_EXPLAIN, 40, 6, 150, 15 +LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ +LTEXT "Uzanto", -1, 40, 66, 50, 10 +LTEXT "Pasvorto", -1, 40, 86, 50, 10 +LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 +LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 +EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP +EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD +CHECKBOX "&Storu pasvorton ( RISKE! )", IDC_SAVEPASSWORD, +80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +PUSHBUTTON "Bone", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON +PUSHBUTTON "Rezigni", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Propchange: trunk/reactos/dll/win32/mpr/mpr_Eo.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mpr/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Hu.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Hu.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Hu.rc Tue Jul 4 18:04:07 2006 @@ -1,8 +1,7 @@ /* * MPR dll resources * - * Copyright (C) 2004 Juan Lang - * Copyright (C) 2005 Gergely Risko + * Copyright (C) 2006 Andras Kovacs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,28 +18,28 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "Teljes álózat" + IDS_ENTIRENETWORK "Teljes hálózat" } IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Hálózati Bejelentkezés" +CAPTION "Hálózati jelszó megadása" FONT 8, "MS Shell Dlg" { - LTEXT "Írd be a felhasználó nevet és jelszót:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Kérem adja meg a felhasználónevét és jelszavát:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Felhasználó", -1, 40, 66, 50, 10 + LTEXT "Felhasználónév", -1, 40, 66, 50, 10 LTEXT "Jelszó", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "Jelszó &mentése (Nem biztonságos)", IDC_SAVEPASSWORD, + CHECKBOX "&Jelszó mentése (nem biztonságos)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Mégse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mpr/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ja.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ja.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ja.rc Tue Jul 4 18:04:07 2006 @@ -18,29 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { IDS_ENTIRENETWORK "lbg[NSÌ" } - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "lbg[NpX[hÌüÍ" -FONT 9, "MS UI Gothic" -{ - LTEXT "[U[¼ÆpX[hðüÍµÄº³¢:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "vLV", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "[U¼", -1, 40, 66, 50, 10 - LTEXT "pX[h", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "pX[hðÛ¶·é(&S) (ÀSÅÍ èÜ¹ñ)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "LZ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} Removed: trunk/reactos/dll/win32/mpr/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ru.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ru.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ru.rc (removed) @@ -1,46 +1,0 @@ -/* - * MPR dll resources - * - * Copyright (C) 2005 Mikhail Y. Zvyozdochkin - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Âñÿ ñåòü" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ââåäèòå Ñåòåâîé Ïàðîëü" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Ïîæàëóéñòà, ââåäèòå Âàøè èìÿ è ïàðîëü:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ïðîêñè-ñåðâåð", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Èìÿ ïîëüçîâàòåëÿ", -1, 40, 66, 50, 10 - LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Ñîõðàíèòü ïàðîëü (íåáåçîïàñíî)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Îòìåíà", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} Removed: trunk/reactos/dll/win32/mpr/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Sv.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Sv.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Sv.rc (removed) @@ -1,46 +1,0 @@ -/* - * MPR dll Swedish resources - * - * Copyright (C) 2005 Andreas Bjerkeholt - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Hela nätverket" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ange nätverkslösenord" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Ange ditt användarnamn och lösenord:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Användare", -1, 40, 66, 50, 10 - LTEXT "Lösenord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Spara detta lösenord (Osäkert)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} Added: trunk/reactos/dll/win32/mpr/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Tr.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Tr.rc (added) +++ trunk/reactos/dll/win32/mpr/mpr_Tr.rc Tue Jul 4 18:04:07 2006 @@ -1,0 +1,46 @@ +/* + * MPR dll resources for Turkish + * + * Copyright (C) 2006 Fatih Aþýcý + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Tüm Að" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Að Parolanýzý Girin" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Lütfen kullanýcý adýnýzý ve parolanýzý girin:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Kullanýcý", -1, 40, 66, 50, 10 + LTEXT "Parola", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Bu parolayý &sakla (Güvensiz)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Tamam", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Ýptal", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Propchange: trunk/reactos/dll/win32/mpr/mpr_Tr.rc ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/mpr/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Uk.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Uk.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Uk.rc (removed) @@ -1,46 +1,0 @@ -/* - * MPR dll resources (Ukrainian) - * - * Copyright 2006 Artem Reznikov - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Âñÿ Ìåðåæà" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ââåä³òü Ìåðåæíèé Ïàðîëü" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Áóäü ëàñêà, ââåä³òü Âàø³ ³ì'ÿ òà ïàðîëü:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ïðîêñ³", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Êîðèñòóâà÷", -1, 40, 66, 50, 10 - LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Çáåðåãòè öåé ïàðîëü (íåáåçïå÷íî)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} Modified: trunk/reactos/dll/win32/mpr/nps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/nps.c?rev=22… ============================================================================== --- trunk/reactos/dll/win32/mpr/nps.c (original) +++ trunk/reactos/dll/win32/mpr/nps.c Tue Jul 4 18:04:07 2006 @@ -211,3 +211,71 @@ FIXME( "(%p): stub\n", pfNotifyCallBack ); return NULL; } + +/***************************************************************** + * PwdGetPasswordStatusA [MPR.@] + */ +DWORD WINAPI PwdGetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, LPDWORD status ) +{ + FIXME("%s %ld %p\n", debugstr_a(lpProvider), dwIndex, status ); + *status = 0; + return WN_SUCCESS; +} + +/***************************************************************** + * PwdGetPasswordStatusA [MPR.@] + */ +DWORD WINAPI PwdGetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, LPDWORD status ) +{ + FIXME("%s %ld %p\n", debugstr_w(lpProvider), dwIndex, status ); + *status = 0; + return WN_SUCCESS; +} + +/***************************************************************** + * PwdSetPasswordStatusA [MPR.@] + */ +DWORD WINAPI PwdSetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, DWORD status ) +{ + FIXME("%s %ld %ld\n", debugstr_a(lpProvider), dwIndex, status ); + return WN_SUCCESS; +} + +/***************************************************************** + * PwdSetPasswordStatusW [MPR.@] + */ +DWORD WINAPI PwdSetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, DWORD status ) +{ + FIXME("%s %ld %ld\n", debugstr_w(lpProvider), dwIndex, status ); + return WN_SUCCESS; +} + +typedef struct _CHANGEPWDINFOA { + LPSTR lpUsername; + LPSTR lpPassword; + DWORD cbPassword; +} CHANGEPWDINFOA, *LPCHANGEPWDINFOA; + +typedef struct _CHANGEPWDINFOW { + LPWSTR lpUsername; + LPWSTR lpPassword; + DWORD cbPassword; +} CHANGEPWDINFOW, *LPCHANGEPWDINFOW; + +/***************************************************************** + * PwdChangePasswordA [MPR.@] + */ +DWORD WINAPI PwdChangePasswordA( LPCSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOA info ) +{ + FIXME("%s %p %lx %p\n", debugstr_a(lpProvider), hWnd, flags, info ); + return WN_SUCCESS; +} + +/***************************************************************** + * PwdChangePasswordA [MPR.@] + */ +DWORD WINAPI PwdChangePasswordW( LPCWSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOW info ) +{ + FIXME("%s %p %lx %p\n", debugstr_w(lpProvider), hWnd, flags, info ); + return WN_SUCCESS; +} Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=2… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c (original) +++ trunk/reactos/dll/win32/mpr/wnet.c Tue Jul 4 18:04:07 2006 @@ -22,7 +22,6 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "winuser.h" #include "winnls.h" #include "winnetwk.h" #include "npapi.h"

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