Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 61901: [MSGINA] Delay load secur32.dll.
by ekohl＠svn.reactos.org 01 Feb '14

01 Feb '14

Author: ekohl Date: Sat Feb 1 15:46:09 2014 New Revision: 61901 URL: http://svn.reactos.org/svn/reactos?rev=61901&view=rev Log: [MSGINA] Delay load secur32.dll. Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Sat Feb 1 15:46:09 2014 @@ -17,6 +17,7 @@ add_library(msgina SHARED ${SOURCE}) set_module_type(msgina win32dll) target_link_libraries(msgina wine) -add_importlibs(msgina advapi32 user32 gdi32 secur32 userenv msvcrt kernel32 ntdll) +add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll) +add_delay_importlibs(msgina secur32) add_pch(msgina msgina.h) add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all)

1 0

[tkreuzer] 61900: [NPFS] - Implement NpInitializeAliases + NpTranslateAlias - Add a number of debug traces, disabled by default
by tkreuzer＠svn.reactos.org 01 Feb '14

01 Feb '14

Author: tkreuzer Date: Sat Feb 1 14:28:15 2014 New Revision: 61900 URL: http://svn.reactos.org/svn/reactos?rev=61900&view=rev Log: [NPFS] - Implement NpInitializeAliases + NpTranslateAlias - Add a number of debug traces, disabled by default Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/main.c trunk/reactos/drivers/filesystems/npfs/npfs.h trunk/reactos/drivers/filesystems/npfs/strucsup.c trunk/reactos/drivers/filesystems/npfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Sat Feb 1 14:28:15 2014 @@ -59,12 +59,14 @@ { IO_STATUS_BLOCK Status; PAGED_CODE(); + TRACE("Entered\n"); NpSetFileObject(FileObject, NpVcb, NULL, FALSE); ++NpVcb->ReferenceCount; Status.Information = FILE_OPENED; Status.Status = STATUS_SUCCESS; + TRACE("Leaving, Status.Status = %lx\n", Status.Status); return Status; } @@ -78,6 +80,7 @@ IO_STATUS_BLOCK IoStatus; PNP_ROOT_DCB_FCB Ccb; PAGED_CODE(); + TRACE("Entered\n"); IoStatus.Status = NpCreateRootDcbCcb(&Ccb); if (NT_SUCCESS(IoStatus.Status)) @@ -93,6 +96,7 @@ IoStatus.Information = 0; } + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -116,6 +120,7 @@ USHORT NamedPipeConfiguration; PLIST_ENTRY NextEntry, ListHead; PNP_CCB Ccb = NULL; + TRACE("Entered\n"); IoStatus.Status = STATUS_SUCCESS; IoStatus.Information = 0; @@ -167,6 +172,7 @@ ((GrantedAccess & FILE_WRITE_DATA) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) { IoStatus.Status = STATUS_ACCESS_DENIED; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -185,6 +191,7 @@ if (NextEntry == ListHead) { IoStatus.Status = STATUS_PIPE_NOT_AVAILABLE; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -195,6 +202,7 @@ if (!NT_SUCCESS(IoStatus.Status)) { NpUninitializeSecurity(Ccb); + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -203,7 +211,149 @@ IoStatus.Information = FILE_OPENED; IoStatus.Status = STATUS_SUCCESS; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; +} + +NTSTATUS +NTAPI +NpTranslateAlias( + PUNICODE_STRING PipeName) +{ + WCHAR UpcaseBuffer[MAX_INDEXED_LENGTH + 1]; + UNICODE_STRING UpcaseString; + ULONG Length; + PNPFS_ALIAS CurrentAlias; + NTSTATUS Status; + BOOLEAN BufferAllocated, BackSlash; + LONG Result; + PAGED_CODE(); + + /* Get the pipe name length and check for empty string */ + Length = PipeName->Length; + if (Length == 0) + { + return STATUS_SUCCESS; + } + + /* Check if the name starts with a path separator */ + BackSlash = (PipeName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR); + if (BackSlash) + { + /* We are only interested in the part after the backslash */ + Length -= sizeof(WCHAR); + } + + /* Check if the length is within our indexed list bounds */ + if ((Length >= MIN_INDEXED_LENGTH * sizeof(WCHAR)) && + (Length <= MAX_INDEXED_LENGTH * sizeof(WCHAR))) + { + /* Length is within bounds, use the list by length */ + CurrentAlias = NpAliasListByLength[(Length / sizeof(WCHAR)) - MIN_INDEXED_LENGTH]; + } + else + { + /* We use the generic list, search for an entry of the right size */ + CurrentAlias = NpAliasList; + while ((CurrentAlias != NULL) && (CurrentAlias->Name.Length != Length)) + { + /* Check if we went past the desired length */ + if (CurrentAlias->Name.Length > Length) + { + /* In this case there is no matching alias, return success */ + return STATUS_SUCCESS; + } + + /* Go to the next alias in the list */ + CurrentAlias = CurrentAlias->Next; + } + } + + /* Did we find any alias? */ + if (CurrentAlias == NULL) + { + /* Nothing found, no matching alias */ + return STATUS_SUCCESS; + } + + /* Check whether we can use our stack buffer */ + if (Length <= MAX_INDEXED_LENGTH * sizeof(WCHAR)) + { + /* Initialize the upcased string */ + UpcaseString.Buffer = UpcaseBuffer; + UpcaseString.MaximumLength = sizeof(UpcaseBuffer); + + /* Upcase the pipe name */ + Status = RtlUpcaseUnicodeString(&UpcaseString, PipeName, FALSE); + NT_ASSERT(NT_SUCCESS(Status)); + BufferAllocated = FALSE; + } + else + { + /* Upcase the pipe name, allocate the string buffer */ + Status = RtlUpcaseUnicodeString(&UpcaseString, PipeName, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + BufferAllocated = TRUE; + } + + /* Did the original name start with a backslash? */ + if (BackSlash) + { + /* Skip it for the comparison */ + UpcaseString.Buffer++; + UpcaseString.Length -= sizeof(WCHAR); + } + + /* Make sure the length matches the "raw" length */ + NT_ASSERT(UpcaseString.Length == Length); + NT_ASSERT(CurrentAlias->Name.Length == Length); + + /* Loop while we have aliases */ + do + { + /* Compare the names and check if they match */ + Result = NpCompareAliasNames(&UpcaseString, &CurrentAlias->Name); + if (Result == 0) + { + /* The names match, use the target name */ + *PipeName = *CurrentAlias->TargetName; + + /* Did the original name start with a backslash? */ + if (!BackSlash) + { + /* It didn't, so skip it in the target name as well */ + PipeName->Buffer++; + PipeName->Length -= sizeof(WCHAR); + } + break; + } + + /* Check if we went past all string candidates */ + if (Result < 0) + { + /* Nothing found, we're done */ + break; + } + + /* Go to the next alias */ + CurrentAlias = CurrentAlias->Next; + + /* Keep looping while we have aliases of the right length */ + } while ((CurrentAlias != NULL) && (CurrentAlias->Name.Length == Length)); + + /* Did we allocate a buffer? */ + if (BufferAllocated) + { + /* Free the allocated buffer */ + ASSERT(UpcaseString.Buffer != UpcaseBuffer); + RtlFreeUnicodeString(&UpcaseString); + } + + return STATUS_SUCCESS; } NTSTATUS @@ -223,6 +373,8 @@ ACCESS_MASK DesiredAccess; LIST_ENTRY DeferredList; UNICODE_STRING Prefix; + NTSTATUS Status; + TRACE("Entered\n"); InitializeListHead(&DeferredList); IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); @@ -276,8 +428,9 @@ goto Quickie; } - // Status = NpTranslateAlias(&FileName);; // ignore this for now - // if (!NT_SUCCESS(Status)) goto Quickie; + Status = NpTranslateAlias(&FileName); + if (!NT_SUCCESS(Status)) goto Quickie; + if (RelatedFileObject) { if (Type == NPFS_NTC_ROOT_DCB) @@ -355,6 +508,7 @@ Irp->IoStatus = IoStatus; IoCompleteRequest(Irp, IO_NO_INCREMENT); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus.Status; } @@ -380,6 +534,7 @@ USHORT NamedPipeConfiguration, CheckShareAccess; BOOLEAN AccessGranted; PAGED_CODE(); + TRACE("Entered\n"); Privileges = NULL; @@ -424,17 +579,23 @@ &AccessState->GenerateOnClose); SeUnlockSubjectContext(SubjectSecurityContext); - if (!AccessGranted) return IoStatus; + if (!AccessGranted) + { + TRACE("Leaving, IoStatus = %lx\n", IoStatus); + return IoStatus; + } if (Fcb->CurrentInstances >= Fcb->MaximumInstances) { IoStatus.Status = STATUS_INSTANCE_NOT_AVAILABLE; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } if (Disposition == FILE_CREATE) { IoStatus.Status = STATUS_ACCESS_DENIED; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -455,6 +616,7 @@ if (CheckShareAccess != ShareAccess) { IoStatus.Status = STATUS_ACCESS_DENIED; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -476,6 +638,7 @@ { --Ccb->Fcb->CurrentInstances; NpDeleteCcb(Ccb, List); + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -485,6 +648,7 @@ IoStatus.Status = STATUS_SUCCESS; IoStatus.Information = 1; + TRACE("Leaving, IoStatus = %lx\n", IoStatus); return IoStatus; } @@ -509,6 +673,7 @@ PNP_CCB Ccb; PNP_FCB Fcb; PAGED_CODE(); + TRACE("Entered\n"); if (!(Parameters->TimeoutSpecified) || !(Parameters->MaximumInstances) || @@ -611,9 +776,11 @@ IoStatus->Status = STATUS_SUCCESS; IoStatus->Information = FILE_CREATED; + TRACE("Leaving, STATUS_SUCCESS\n"); return STATUS_SUCCESS; Quickie: + TRACE("Leaving, Status = %lx\n", Status); IoStatus->Information = 0; IoStatus->Status = Status; return Status; @@ -635,6 +802,7 @@ UNICODE_STRING Prefix; PNAMED_PIPE_CREATE_PARAMETERS Parameters; IO_STATUS_BLOCK IoStatus; + TRACE("Entered\n"); InitializeListHead(&DeferredList); Process = IoGetRequestorProcess(Irp); @@ -741,6 +909,7 @@ NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); Irp->IoStatus = IoStatus; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); return IoStatus.Status; Modified: trunk/reactos/drivers/filesystems/npfs/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/main.c [iso-8859-1] Sat Feb 1 14:28:15 2014 @@ -16,14 +16,292 @@ /* GLOBALS ********************************************************************/ PDEVICE_OBJECT NpfsDeviceObject; +PVOID NpAliases; +PNPFS_ALIAS NpAliasList; +PNPFS_ALIAS NpAliasListByLength[MAX_INDEXED_LENGTH + 1 - MIN_INDEXED_LENGTH]; /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +NpReadAlias( + PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PNPFS_QUERY_VALUE_CONTEXT QueryContext = Context; + PWSTR CurrentString; + USHORT Length; + PNPFS_ALIAS CurrentAlias; + UNICODE_STRING TempString; + PUNICODE_STRING CurrentTargetName; + + /* Check if we have the expected type */ + if (ValueType != REG_MULTI_SZ) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if only the size is requested */ + if (QueryContext->SizeOnly) + { + /* Count this entry */ + QueryContext->NumberOfEntries++; + + /* Get the length of the value name (i.e. the target name). */ + Length = wcslen(ValueName) * sizeof(WCHAR); + + /* Add the size of the name plus a '\' and a UNICODE_STRING structure */ + QueryContext->FullSize += Length + sizeof(UNICODE_NULL) + + sizeof(OBJ_NAME_PATH_SEPARATOR) + + sizeof(UNICODE_STRING); + + /* Loop while we have alias names */ + CurrentString = ValueData; + while (*CurrentString != UNICODE_NULL) + { + /* Count this alias */ + QueryContext->NumberOfAliases++; + + /* Get the length of the current string (i.e. the alias name) */ + Length = wcslen(CurrentString) * sizeof(WCHAR); + + /* Count the length plus the size of an NPFS_ALIAS structure */ + QueryContext->FullSize += Length + sizeof(UNICODE_NULL) + sizeof(NPFS_ALIAS); + + /* Go to the next string */ + CurrentString += (Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR); + } + } + else + { + /* Get the next name string pointer */ + CurrentTargetName = QueryContext->CurrentTargetName++; + + /* Get the length of the value name (i.e. the target name). */ + Length = wcslen(ValueName) * sizeof(WCHAR); + + /* Initialize the current name string (one char more than the name) */ + CurrentTargetName->Buffer = QueryContext->CurrentStringPointer; + CurrentTargetName->Length = Length + sizeof(OBJ_NAME_PATH_SEPARATOR); + CurrentTargetName->MaximumLength = CurrentTargetName->Length + sizeof(UNICODE_NULL); + + /* Update the current string pointer */ + QueryContext->CurrentStringPointer += + CurrentTargetName->MaximumLength / sizeof(WCHAR); + + /* Prepend a '\' before the name */ + CurrentTargetName->Buffer[0] = OBJ_NAME_PATH_SEPARATOR; + + /* Append the value name (including the NULL termination) */ + RtlCopyMemory(&CurrentTargetName->Buffer[1], + ValueName, + Length + sizeof(UNICODE_NULL)); + + /* Upcase the target name */ + RtlUpcaseUnicodeString(CurrentTargetName, CurrentTargetName, 0); + + /* Loop while we have alias names */ + CurrentString = ValueData; + while (*CurrentString != UNICODE_NULL) + { + /* Get the next alias pointer */ + CurrentAlias = QueryContext->CurrentAlias++; + + /* Get the length of the current string (i.e. the alias name) */ + Length = wcslen(CurrentString) * sizeof(WCHAR); + + /* Setup the alias structure */ + CurrentAlias->TargetName = CurrentTargetName; + CurrentAlias->Name.Buffer = QueryContext->CurrentStringPointer; + CurrentAlias->Name.Length = Length; + CurrentAlias->Name.MaximumLength = Length + sizeof(UNICODE_NULL); + + /* Upcase the alias name */ + TempString.Buffer = CurrentString; + TempString.Length = Length; + RtlUpcaseUnicodeString(&CurrentAlias->Name, + &TempString, + FALSE); + + /* Update the current string pointer */ + QueryContext->CurrentStringPointer += + CurrentAlias->Name.MaximumLength / sizeof(WCHAR); + + /* Go to the next string */ + CurrentString += (Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR); + } + } + + return STATUS_SUCCESS; +} + +LONG +NTAPI +NpCompareAliasNames( + _In_ PCUNICODE_STRING String1, + _In_ PCUNICODE_STRING String2) +{ + ULONG Count; + PWCHAR P1, P2; + + /* First check if the string sizes match */ + if (String1->Length != String2->Length) + { + /* They don't, return positive if the first is longer, negative otherwise */ + return String1->Length - String2->Length; + } + + /* Now loop all characters */ + Count = String1->Length / sizeof(WCHAR); + P1 = String1->Buffer; + P2 = String2->Buffer; + while (Count) + { + /* Check if they don't match */ + if (*P1 != *P2) + { + /* Return positive if the first char is greater, negative otherwise */ + return *P1 - *P2; + } + + /* Go to the next buffer position */ + P1++; + P2++; + Count--; + } + + /* All characters matched, return 0 */ + return 0; +} + +NTSTATUS +NTAPI +NpInitializeAliases(VOID) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NPFS_QUERY_VALUE_CONTEXT Context; + NTSTATUS Status; + USHORT Length; + ULONG i; + PNPFS_ALIAS CurrentAlias, *AliasPointer; + + /* Initialize the query table */ + QueryTable[0].QueryRoutine = NpReadAlias; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_NOEXPAND; + QueryTable[0].Name = NULL; + QueryTable[0].EntryContext = NULL; + QueryTable[0].DefaultType = REG_NONE; + QueryTable[0].DefaultData = NULL; + QueryTable[0].DefaultLength = 0; + QueryTable[1].QueryRoutine = NULL; + QueryTable[1].Flags = 0; + QueryTable[1].Name = NULL; + + /* Setup the query context */ + Context.SizeOnly = 1; + Context.FullSize = 0; + Context.NumberOfAliases = 0; + Context.NumberOfEntries = 0; + + /* Query the registry values (calculate length only) */ + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES | RTL_REGISTRY_OPTIONAL, + L"Npfs\\Aliases", + QueryTable, + &Context, + NULL); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + return STATUS_SUCCESS; + + return Status; + } + + /* Check if there is anything */ + if (Context.FullSize == 0) + { + /* Nothing to do, return success */ + return STATUS_SUCCESS; + } + + /* Allocate a structure large enough to hold all the data */ + NpAliases = ExAllocatePoolWithTag(NonPagedPool, Context.FullSize, 'sfpN'); + if (NpAliases == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Now setup the actual pointers in the context */ + Context.CurrentTargetName = NpAliases; + CurrentAlias = (PNPFS_ALIAS)&Context.CurrentTargetName[Context.NumberOfEntries]; + Context.CurrentAlias = CurrentAlias; + Context.CurrentStringPointer = (PWCHAR)&CurrentAlias[Context.NumberOfAliases]; + + /* This time query the real data */ + Context.SizeOnly = FALSE; + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES | RTL_REGISTRY_OPTIONAL, + L"Npfs\\Aliases", + QueryTable, + &Context, + NULL); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(NpAliases, 0); + NpAliases = NULL; + return Status; + } + + /* Make sure we didn't go past the end of the allocation! */ + NT_ASSERT((PUCHAR)Context.CurrentStringPointer <= + ((PUCHAR)NpAliases + Context.FullSize)); + + /* Loop all aliases we got */ + for (i = 0; i < Context.NumberOfAliases; i++) + { + /* Get the length and check what list to use */ + Length = CurrentAlias->Name.Length; + if ((Length >= MIN_INDEXED_LENGTH * sizeof(WCHAR)) && + (Length <= MAX_INDEXED_LENGTH * sizeof(WCHAR))) + { + /* For this length range, we use an indexed list */ + AliasPointer = &NpAliasListByLength[(Length / sizeof(WCHAR)) - 5]; + } + else + { + /* Length is outside of the range, use the default list */ + AliasPointer = &NpAliasList; + } + + /* Loop through all aliases already in the list until we find one that + is greater than our current alias */ + while ((*AliasPointer != NULL) && + (NpCompareAliasNames(&CurrentAlias->Name, + &(*AliasPointer)->Name) > 0)) + { + /* Go to the next alias */ + AliasPointer = &(*AliasPointer)->Next; + } + + /* Insert the alias in the list */ + CurrentAlias->Next = *AliasPointer; + *AliasPointer = CurrentAlias; + + /* Go to the next alias in the array */ + CurrentAlias++; + } + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI NpFsdDirectoryControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + TRACE("Entered\n"); UNIMPLEMENTED; Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; @@ -44,6 +322,13 @@ UNREFERENCED_PARAMETER(RegistryPath); DPRINT1("Next-Generation NPFS-Lite\n"); + + Status = NpInitializeAliases(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize aliases!\n"); + return Status; + } DriverObject->MajorFunction[IRP_MJ_CREATE] = NpFsdCreate; DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = NpFsdCreateNamedPipe; Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] Sat Feb 1 14:28:15 2014 @@ -14,8 +14,12 @@ #include <ntifs.h> #include <ntndk.h> #include <pseh/pseh2.h> -#define UNIMPLEMENTED -#define DPRINT1 DbgPrint +//#define UNIMPLEMENTED +//#define DPRINT1 DbgPrint + +#define NDEBUG +#include <debug.h> +#define TRACE(...) /* DPRINT1("%s: ", __FUNCTION__); DbgPrint(__VA_ARGS__) */ // // Allow Microsoft Extensions @@ -25,6 +29,9 @@ #pragma warning(disable:4214) #pragma warning(disable:4100) #endif + +#define MIN_INDEXED_LENGTH 5 +#define MAX_INDEXED_LENGTH 9 /* TYPEDEFS & DEFINES *********************************************************/ @@ -326,6 +333,32 @@ extern PNP_VCB NpVcb; +// +// Defines an alias +// +typedef struct _NPFS_ALIAS +{ + struct _NPFS_ALIAS *Next; + PUNICODE_STRING TargetName; + UNICODE_STRING Name; +} NPFS_ALIAS, *PNPFS_ALIAS; + +// +// Private structure used to enumerate the alias values +// +typedef struct _NPFS_QUERY_VALUE_CONTEXT +{ + BOOLEAN SizeOnly; + SIZE_T FullSize; + ULONG NumberOfAliases; + ULONG NumberOfEntries; + PNPFS_ALIAS CurrentAlias; + PUNICODE_STRING CurrentTargetName; + PWCHAR CurrentStringPointer; +} NPFS_QUERY_VALUE_CONTEXT, *PNPFS_QUERY_VALUE_CONTEXT; + +extern PNPFS_ALIAS NpAliasList; +extern PNPFS_ALIAS NpAliasListByLength[MAX_INDEXED_LENGTH + 1 - MIN_INDEXED_LENGTH]; /* FUNCTIONS ******************************************************************/ @@ -385,6 +418,12 @@ } } +LONG +NTAPI +NpCompareAliasNames( + _In_ PCUNICODE_STRING String1, + _In_ PCUNICODE_STRING String2); + BOOLEAN NTAPI NpDeleteEventTableEntry(IN PRTL_GENERIC_TABLE Table, @@ -415,7 +454,7 @@ NpAddDataQueueEntry(IN ULONG NamedPipeEnd, IN PNP_CCB Ccb, IN PNP_DATA_QUEUE DataQueue, - IN ULONG Who, + IN ULONG Who, IN ULONG Type, IN ULONG DataSize, IN PIRP Irp, @@ -510,20 +549,20 @@ NTSTATUS NTAPI NpSetListeningPipeState(IN PNP_CCB Ccb, - IN PIRP Irp, + IN PIRP Irp, IN PLIST_ENTRY List); NTSTATUS NTAPI -NpSetDisconnectedPipeState(IN PNP_CCB Ccb, +NpSetDisconnectedPipeState(IN PNP_CCB Ccb, IN PLIST_ENTRY List); NTSTATUS NTAPI NpSetClosingPipeState(IN PNP_CCB Ccb, - IN PIRP Irp, - IN ULONG NamedPipeEnd, + IN PIRP Irp, + IN ULONG NamedPipeEnd, IN PLIST_ENTRY List); VOID @@ -594,7 +633,7 @@ NTAPI NpAddWaiter(IN PNP_WAIT_QUEUE WaitQueue, IN LARGE_INTEGER WaitTime, - IN PIRP Irp, + IN PIRP Irp, IN PUNICODE_STRING AliasName); NTSTATUS @@ -607,27 +646,27 @@ IO_STATUS_BLOCK NTAPI -NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue, +NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue, IN BOOLEAN Peek, IN BOOLEAN ReadOverflowOperation, IN PVOID Buffer, - IN ULONG BufferSize, - IN ULONG Mode, + IN ULONG BufferSize, + IN ULONG Mode, IN PNP_CCB Ccb, IN PLIST_ENTRY List); -NTSTATUS +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 BytesWritten, + IN PNP_CCB Ccb, + IN ULONG NamedPipeEnd, + IN PETHREAD Thread, IN PLIST_ENTRY List); NTSTATUS Modified: trunk/reactos/drivers/filesystems/npfs/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/strucsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/strucsup.c [iso-8859-1] Sat Feb 1 14:28:15 2014 @@ -14,8 +14,6 @@ #define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_STRUCSUP) /* GLOBALS ********************************************************************/ - -#define UNIMPLEMENTED PWCHAR NpRootDCBName = L"\\"; PNP_VCB NpVcb; Modified: trunk/reactos/drivers/filesystems/npfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/volinfo.c [iso-8859-1] Sat Feb 1 14:28:15 2014 @@ -23,6 +23,7 @@ PFILE_FS_VOLUME_INFORMATION InfoBuffer = Buffer; NTSTATUS Status; USHORT NameLength; + TRACE("Entered\n"); *Length -= sizeof(*InfoBuffer); @@ -47,6 +48,7 @@ RtlCopyMemory(InfoBuffer->VolumeLabel, L"Named Pipe", NameLength); *Length -= NameLength; + TRACE("Leaving, Status = %lx\n", Status); return Status; } @@ -56,6 +58,7 @@ IN OUT PULONG Length) { PFILE_FS_SIZE_INFORMATION InfoBuffer = Buffer; + TRACE("Entered\n"); *Length -= sizeof(*InfoBuffer); @@ -64,6 +67,7 @@ InfoBuffer->SectorsPerAllocationUnit = 1; InfoBuffer->BytesPerSector = 1; + TRACE("Leaving, Status = STATUS_SUCCESS\n"); return STATUS_SUCCESS; } @@ -74,6 +78,7 @@ { PFILE_FS_DEVICE_INFORMATION InfoBuffer = Buffer; NTSTATUS Status; + TRACE("Entered\n"); if (*Length >= sizeof(*InfoBuffer)) { @@ -87,6 +92,7 @@ { Status = STATUS_BUFFER_OVERFLOW; } + TRACE("Leaving, Status = %lx\n", Status); return Status; } @@ -98,6 +104,7 @@ PFILE_FS_ATTRIBUTE_INFORMATION InfoBuffer = Buffer; NTSTATUS Status; USHORT NameLength; + TRACE("Entered\n"); NameLength = (USHORT)(*Length - 12); if (NameLength < 8) @@ -117,6 +124,7 @@ InfoBuffer->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES; RtlCopyMemory(InfoBuffer->FileSystemName, L"NPFS", NameLength); + TRACE("Leaving, Status = %lx\n", Status); return Status; } @@ -126,11 +134,13 @@ IN OUT PULONG Length) { PFILE_FS_FULL_SIZE_INFORMATION InfoBuffer = Buffer; + TRACE("Entered\n"); *Length -= sizeof(*InfoBuffer); RtlZeroMemory(InfoBuffer, sizeof(*InfoBuffer)); + TRACE("Leaving, Status = STATUS_SUCCESS\n"); return STATUS_SUCCESS; } @@ -145,6 +155,7 @@ PVOID Buffer; NTSTATUS Status; PAGED_CODE(); + TRACE("Entered\n"); IoStack = IoGetCurrentIrpStackLocation(Irp); Buffer = Irp->AssociatedIrp.SystemBuffer; @@ -174,6 +185,7 @@ } Irp->IoStatus.Information = IoStack->Parameters.QueryVolume.Length - Length; + TRACE("Leaving, Status = %lx\n", Status); return Status; } @@ -184,6 +196,7 @@ { NTSTATUS Status; PAGED_CODE(); + TRACE("Entered\n"); FsRtlEnterFileSystem(); ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); @@ -199,6 +212,7 @@ IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); } + TRACE("Leaving, Status = %lx\n", Status); return Status; }

1 0

[tkreuzer] 61899: [NDK] Add PsGetProcessSecurityPort, PsSetProcessSecurityPort, PsGetCurrentThreadProcessId
by tkreuzer＠svn.reactos.org 01 Feb '14

01 Feb '14

Author: tkreuzer Date: Sat Feb 1 12:12:26 2014 New Revision: 61899 URL: http://svn.reactos.org/svn/reactos?rev=61899&view=rev Log: [NDK] Add PsGetProcessSecurityPort, PsSetProcessSecurityPort, PsGetCurrentThreadProcessId Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Sat Feb 1 12:12:26 2014 @@ -282,6 +282,28 @@ PsReturnProcessPagedPoolQuota( _In_ PEPROCESS Process, _In_ SIZE_T Amount +); + +NTKERNELAPI +PVOID +NTAPI +PsGetProcessSecurityPort( + _In_ PEPROCESS Process +); + +NTKERNELAPI +NTSTATUS +NTAPI +PsSetProcessSecurityPort( + _Inout_ PEPROCESS Process, + _In_ PVOID SecurityPort +); + +NTKERNELAPI +HANDLE +NTAPI +PsGetCurrentThreadProcessId( + VOID ); #endif

1 0

[cwittich] 61898: [baseaddress] hackfix for VLC Player startup
by cwittich＠svn.reactos.org 01 Feb '14

01 Feb '14

Author: cwittich Date: Sat Feb 1 08:55:54 2014 New Revision: 61898 URL: http://svn.reactos.org/svn/reactos?rev=61898&view=rev Log: [baseaddress] hackfix for VLC Player startup Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sat Feb 1 08:55:54 2014 @@ -283,7 +283,7 @@ set(baseaddress_ws2_32_new 0x70790000) set(baseaddress_wshirda 0x70760000) set(baseaddress_wshtcpip 0x70730000) -set(baseaddress_wsock32 0x70700000) +set(baseaddress_wsock32 0x78700000) # FIXME: hackfix for VLC player set(baseaddress_wtsapi32 0x706d0000) set(baseaddress_wuapi 0x70690000) set(baseaddress_xinput1_1 0x70660000)

1 0

[aandrejevic] 61897: [KERNEL32] Add the definition for the structure used by GetNextVDMCommand.
by aandrejevic＠svn.reactos.org 01 Feb '14

01 Feb '14

Author: aandrejevic Date: Sat Feb 1 02:49:02 2014 New Revision: 61897 URL: http://svn.reactos.org/svn/reactos?rev=61897&view=rev Log: [KERNEL32] Add the definition for the structure used by GetNextVDMCommand. Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c branches/ntvdm/dll/win32/kernel32/include/vdm.h Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sat Feb 1 02:49:02 2014 @@ -774,9 +774,7 @@ */ DWORD WINAPI -GetNextVDMCommand ( - DWORD Unknown0 - ) +GetNextVDMCommand(PGET_NEXT_VDM_COMMAND_DATA CommandData) { STUB; return 0; Modified: branches/ntvdm/dll/win32/kernel32/include/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/includ… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] Sat Feb 1 02:49:02 2014 @@ -43,6 +43,38 @@ #define VDM_NOT_READY 0x02 #define VDM_READY 0x04 +/* STRUCTURES *****************************************************************/ + +typedef struct _GET_NEXT_VDM_COMMAND_DATA +{ + ULONG iTask; + ULONG dwUnused; + ULONG dwExitCode; + ULONG dwCodePage; + HANDLE hStdIn; + HANDLE hStdOut; + HANDLE hStdErr; + LPSTR lpCmdLine; + LPSTR lpAppName; + LPSTR lpPifFile; + LPSTR lpCurDirectory; + LPSTR lpEnv; + ULONG dwEnvLen; + STARTUPINFOA StartupInfo; + LPSTR lpDesktop; + ULONG dwDesktopLen; + LPSTR lpTitle; + ULONG dwTitleLen; + LPVOID lpReserved; + ULONG dwReservedLen; + USHORT wCmdLen; + USHORT wAppLen; + USHORT wPifLen; + USHORT wCurDirectoryLen; + USHORT wVDMState; + USHORT wCurrentDrive; + BOOLEAN fComingFromBat; +} GET_NEXT_VDM_COMMAND_DATA, *PGET_NEXT_VDM_COMMAND_DATA; /* FUNCTION PROTOTYPES ********************************************************/

1 0

[hbelusca] 61896: [APPS] Remove idiotic usage of REACTOS_VERSION_DLL in resources of executable files.
by hbelusca＠svn.reactos.org 01 Feb '14

01 Feb '14

Author: hbelusca Date: Sat Feb 1 01:27:13 2014 New Revision: 61896 URL: http://svn.reactos.org/svn/reactos?rev=61896&view=rev Log: [APPS] Remove idiotic usage of REACTOS_VERSION_DLL in resources of executable files. Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/dxdiag/dxdiag.rc trunk/reactos/base/applications/msconfig/msconfig.rc Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Sat Feb 1 01:27:13 2014 @@ -20,7 +20,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "xcopy command" #define REACTOS_STR_INTERNAL_NAME "xcopy" #define REACTOS_STR_ORIGINAL_FILENAME "xcopy.exe" Modified: trunk/reactos/base/applications/dxdiag/dxdiag.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.rc [iso-8859-1] Sat Feb 1 01:27:13 2014 @@ -6,7 +6,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactX Diagnosis Tool" #define REACTOS_STR_INTERNAL_NAME "dxdiag" #define REACTOS_STR_ORIGINAL_FILENAME "dxdiag.exe" Modified: trunk/reactos/base/applications/msconfig/msconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rc [iso-8859-1] Sat Feb 1 01:27:13 2014 @@ -6,7 +6,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Configuration Tool" #define REACTOS_STR_INTERNAL_NAME "msconfig" #define REACTOS_STR_ORIGINAL_FILENAME "msconfig.exe"

1 0

[ekohl] 61895: [MSGINA] Revert r61888. CORE-7824.
by ekohl＠svn.reactos.org 31 Jan '14

31 Jan '14

Author: ekohl Date: Fri Jan 31 19:26:00 2014 New Revision: 61895 URL: http://svn.reactos.org/svn/reactos?rev=61895&view=rev Log: [MSGINA] Revert r61888. CORE-7824. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Fri Jan 31 19:26:00 2014 @@ -259,6 +259,9 @@ ULONG RequestBufferSize; ULONG ResponseBufferSize = 0; LPWSTR Ptr; + LSA_STRING PackageName; + HANDLE LsaHandle = NULL; + ULONG AuthenticationPackage = 0; BOOL res = FALSE; NTSTATUS ProtocolStatus; NTSTATUS Status; @@ -345,9 +348,30 @@ NewPassword1, RequestBuffer->NewPassword.MaximumLength); + /* Connect to the LSA server */ + Status = LsaConnectUntrusted(&LsaHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaConnectUntrusted failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Get the authentication package */ + RtlInitAnsiString((PANSI_STRING)&PackageName, + MSV1_0_PACKAGE_NAME); + + Status = LsaLookupAuthenticationPackage(LsaHandle, + &PackageName, + &AuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Call the authentication package */ - Status = LsaCallAuthenticationPackage(pgContext->LsaHandle, - pgContext->AuthenticationPackage, + Status = LsaCallAuthenticationPackage(LsaHandle, + AuthenticationPackage, RequestBuffer, RequestBufferSize, (PVOID*)&ResponseBuffer, @@ -379,6 +403,9 @@ if (ResponseBuffer != NULL) LsaFreeReturnBuffer(ResponseBuffer); + + if (LsaHandle != NULL) + NtClose(LsaHandle); return res; } Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Fri Jan 31 19:26:00 2014 @@ -254,46 +254,6 @@ } -static -BOOL -ConnectToLsa( - PGINA_CONTEXT pgContext) -{ - LSA_STRING LogonProcessName; - LSA_STRING PackageName; - LSA_OPERATIONAL_MODE SecurityMode = 0; - NTSTATUS Status; - - /* Connect to the LSA server */ - RtlInitAnsiString((PANSI_STRING)&LogonProcessName, - "MSGINA"); - - Status = LsaRegisterLogonProcess(&LogonProcessName, - &pgContext->LsaHandle, - &SecurityMode); - if (!NT_SUCCESS(Status)) - { - ERR("LsaRegisterLogonProcess failed (Status 0x%08lx)\n", Status); - return FALSE; - } - - /* Get the authentication package */ - RtlInitAnsiString((PANSI_STRING)&PackageName, - MSV1_0_PACKAGE_NAME); - - Status = LsaLookupAuthenticationPackage(pgContext->LsaHandle, - &PackageName, - &pgContext->AuthenticationPackage); - if (!NT_SUCCESS(Status)) - { - ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); - return FALSE; - } - - return TRUE; -} - - /* * @implemented */ @@ -319,13 +279,6 @@ if (!GetRegistrySettings(pgContext)) { WARN("GetRegistrySettings() failed\n"); - LocalFree(pgContext); - return FALSE; - } - - if (!ConnectToLsa(pgContext)) - { - WARN("ConnectToLsa() failed\n"); LocalFree(pgContext); return FALSE; } Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Fri Jan 31 19:26:00 2014 @@ -38,8 +38,6 @@ PWLX_DISPATCH_VERSION_1_3 pWlxFuncs; HANDLE hDllInstance; HWND hStatusWindow; - HANDLE LsaHandle; - ULONG AuthenticationPackage; DWORD AutoLogonState; BOOL bDisableCAD; BOOL bAutoAdminLogon;

1 0

[zguo] 61894: [0.3.16] Enable Lautus theme by default only for release.
by zguo＠svn.reactos.org 30 Jan '14

30 Jan '14

Author: zguo Date: Thu Jan 30 22:36:38 2014 New Revision: 61894 URL: http://svn.reactos.org/svn/reactos?rev=61894&view=rev Log: [0.3.16] Enable Lautus theme by default only for release. Modified: branches/ReactOS-0.3.16/reactos/boot/bootdata/hivedef.inf Modified: branches/ReactOS-0.3.16/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.16/reactos/boot/boo… ============================================================================== --- branches/ReactOS-0.3.16/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ReactOS-0.3.16/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Thu Jan 30 22:36:38 2014 @@ -1605,6 +1605,139 @@ HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Contrast",0x00010001,0x00000000 HKCU,"Control Panel\Sound","Beep",2,"yes" HKCU,"Control Panel\Sound","ExtendedSounds",2,"yes" + +; Lautus Theme +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager","FlatMenu",0x10001,00,00,00,00 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager","GradientCaption",0x10001,01,00,00,00 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager","NonClientMetrics",0x1,f4,01,\ +00,00,01,00,00,00,0f,00,00,00,0f,00,00,00,18,00,00,00,18,00,00,00,f5,ff,ff,ff,00,00,00,00,00,00,\ +00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,15,00,00,00,13,00,00,00,f5,ff,ff,ff,00,00,\ +00,00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,\ +61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,12,00,00,00,12,00,00,00,f5,ff,\ +ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,\ +6f,00,6d,00,61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,f5,ff,ff,ff,00,00,\ +00,00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,\ +61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,f5,ff,ff,ff,00,00,00,00,00,00,\ +00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager","IconTitleFont",0x1,f5,ff,ff,\ +ff,00,00,00,00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,\ +00,6d,00,61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager","ThemeActive",0x0,"1" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager","ColorName",0x0,"Normal Color" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager","SizeName",0x0,"Normal Size" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager","DllName",0x00020000,"%SystemRoot%\Resources\Themes\Lautus\Lautus.msstyles" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel",,0x10 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors",,0x00000012 +; Theme Colors +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","Scrollbar",0x0,"212 208 200" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","Background",0x0,"58 110 165" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","ActiveTitle",0x0,"10 36 106" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","InactiveTitle",0x0,"128 128 128" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","Menu",0x0,"212 208 200" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","Window",0x0,"255 255 255" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","WindowFrame",0x0,"0 0 0" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","MenuText",0x0,"0 0 0" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","WindowText",0x0,"0 0 0" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","TitleText",0x0,"255 255 255" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","ActiveBorder",0x0,"212 208 200" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","InactiveBorder",0x0,"212 208 200" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","AppWorkSpace",0x0,"128 128 128" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","Hilight",0x0,"10 36 106" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","HilightText",0x0,"255 255 255" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","ButtonFace",0x0,"212 208 200" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","ButtonShadow",0x0,"128 128 128" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","GrayText",0x0,"128 128 128" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","ButtonText",0x0,"0 0 0" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","InactiveTitleText",0x0,"212 208 200" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","ButtonHilight",0x0,"255 255 255" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","ButtonDkShadow",0x0,"64 64 64" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","ButtonLight",0x0,"212 208 200" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","InfoText",0x0,"0 0 0" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","InfoWindow",0x0,"255 255 225" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","ButtonAlternateFace",0x0,"181 181 181" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","HotTrackingColor",0x0,"0 0 128" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","GradientActiveTitle",0x0,"166 202 240" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","GradientInactiveTitle",0x0,"192 192 192" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","MenuHilight",0x0,"10 36 106" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\ThemeManager\Control Panel\Colors","MenuBar",0x0,"212 208 200" +; Color/WindowMetric overrides +HKCU,"Control Panel\Colors","Scrollbar",0x0,"0 0 0" +HKCU,"Control Panel\Colors","Background",0x0,"73 73 73" +HKCU,"Control Panel\Colors","ActiveTitle",0x0,"21 21 21" +HKCU,"Control Panel\Colors","InactiveTitle",0x0,"65 65 65" +HKCU,"Control Panel\Colors","Menu",0x0,"255 255 255" +HKCU,"Control Panel\Colors","Window",0x0,"255 255 255" +HKCU,"Control Panel\Colors","WindowFrame",0x0,"0 0 0" +HKCU,"Control Panel\Colors","MenuText",0x0,"75 75 75" +HKCU,"Control Panel\Colors","WindowText",0x0,"0 0 0" +HKCU,"Control Panel\Colors","TitleText",0x0,"255 255 255" +HKCU,"Control Panel\Colors","ActiveBorder",0x0,"0 0 0" +HKCU,"Control Panel\Colors","InactiveBorder",0x0,"0 0 0" +HKCU,"Control Panel\Colors","AppWorkSpace",0x0,"0 0 0" +HKCU,"Control Panel\Colors","Hilight",0x0,"75 75 75" +HKCU,"Control Panel\Colors","HilightText",0x0,"255 255 255" +HKCU,"Control Panel\Colors","ButtonFace",0x0,"239 238 243" +HKCU,"Control Panel\Colors","ButtonShadow",0x0,"162 162 162" +HKCU,"Control Panel\Colors","GrayText",0x0,"172 168 153" +HKCU,"Control Panel\Colors","ButtonText",0x0,"0 0 0" +HKCU,"Control Panel\Colors","InactiveTitleText",0x0,"180 180 180" +HKCU,"Control Panel\Colors","ButtonHilight",0x0,"255 255 255" +HKCU,"Control Panel\Colors","ButtonDkShadow",0x0,"162 162 162" +HKCU,"Control Panel\Colors","ButtonLight",0x0,"241 239 226" +HKCU,"Control Panel\Colors","InfoText",0x0,"0 0 0" +HKCU,"Control Panel\Colors","InfoWindow",0x0,"0 0 0" +HKCU,"Control Panel\Colors","ButtonAlternateFace",0x0,"0 0 0" +HKCU,"Control Panel\Colors","HotTrackingColor",0x0,"0 0 128" +HKCU,"Control Panel\Colors","GradientActiveTitle",0x0,"58 58 58" +HKCU,"Control Panel\Colors","GradientInactiveTitle",0x0,"81 81 81" +HKCU,"Control Panel\Colors","MenuHilight",0x0,"100 100 100" +HKCU,"Control Panel\Colors","MenuBar",0x0,"239 238 243" +HKCU,"Control Panel\Desktop\WindowMetrics","ScrollWidth",0x0,"-225" +HKCU,"Control Panel\Desktop\WindowMetrics","ScrollHeight",0x0,"-225" +HKCU,"Control Panel\Desktop\WindowMetrics","CaptionWidth",0x0,"-360" +HKCU,"Control Panel\Desktop\WindowMetrics","CaptionHeight",0x0,"-360" +HKCU,"Control Panel\Desktop\WindowMetrics","SmCaptionWidth",0x0,"-315" +HKCU,"Control Panel\Desktop\WindowMetrics","SmCaptionHeight",0x0,"-285" +HKCU,"Control Panel\Desktop\WindowMetrics","MenuWidth",0x0,"-270" +HKCU,"Control Panel\Desktop\WindowMetrics","MenuHeight",0x0,"-270" +HKCU,"Control Panel\Desktop\WindowMetrics","BorderWidth",0x0,"-15" +HKCU,"Control Panel\Desktop\WindowMetrics","Shell Icon Size",0x0,"32" +HKCU,"Control Panel\Desktop\WindowMetrics","IconSpacing",0x0,"-1125" +HKCU,"Control Panel\Desktop\WindowMetrics","IconVerticalspacing",0x0,"-1125" +HKCU,"Control Panel\Desktop\WindowMetrics","CaptionFont",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,55,00,62,00,75,00,6e,00,74,\ +00,75,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Desktop\WindowMetrics","IconFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ +00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,55,00,62,00,75,00,6e,00,74,00,\ +75,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Desktop\WindowMetrics","MenuFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ +00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,55,00,62,00,75,00,6e,00,74,00,\ +75,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Desktop\WindowMetrics","MessageFont",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,55,00,62,00,75,00,6e,00,74,\ +00,75,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Desktop\WindowMetrics","SmCaptionFont",0x00000001,f5,ff,ff,ff,00,00,\ +00,00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,55,00,62,00,75,00,6e,00,\ +74,00,75,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Desktop\WindowMetrics","StatusFont",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,55,00,62,00,75,00,6e,00,74,\ +00,75,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Desktop\WindowMetrics","IconTitleWrap",0x0,"0" HKCU,"Environment",,0x00000012 HKCU,"Environment","TEMP",0x00020000,"%TEMP_DIR%"

1 0

[cwittich] 61893: [crt] revert 61885 and 61887
by cwittich＠svn.reactos.org 30 Jan '14

30 Jan '14

Author: cwittich Date: Thu Jan 30 21:23:25 2014 New Revision: 61893 URL: http://svn.reactos.org/svn/reactos?rev=61893&view=rev Log: [crt] revert 61885 and 61887 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Thu Jan 30 21:23:25 2014 @@ -89,25 +89,15 @@ #define WX_APPEND 0x20 #define WX_TEXT 0x80 -/* values for exflag - it's used differently in msvcr90.dll*/ -#define EF_UTF8 0x01 -#define EF_UTF16 0x02 -#define EF_CRIT_INIT 0x04 -#define EF_UNK_UNICODE 0x08 - -static char utf8_bom[3] = { 0xef, 0xbb, 0xbf }; -static char utf16_bom[2] = { 0xff, 0xfe }; - /* FIXME: this should be allocated dynamically */ #define MAX_FILES 2048 #define FD_BLOCK_SIZE 64 -/* ioinfo structure size is different in msvcrXX.dll's */ typedef struct { HANDLE handle; unsigned char wxflag; char unk1; - int exflag; + BOOL crit_init; CRITICAL_SECTION crit; } ioinfo; @@ -744,8 +734,10 @@ /* _flushall calls fflush which calls _flushall */ int CDECL fflush(FILE* file); -/* INTERNAL: Flush all stream buffer */ -static int flush_all_buffers(int mask) +/********************************************************************* + * _flushall (MSVCRT.@) + */ +int CDECL _flushall(void) { int i, num_flushed = 0; FILE *file; @@ -756,8 +748,8 @@ if (file->_flag) { - if(file->_flag & mask) { - fflush(file); + if(file->_flag & _IOWRT) { + fflush(file); num_flushed++; } } @@ -769,40 +761,21 @@ } /********************************************************************* - * _flushall (MSVCRT.@) - */ -int CDECL _flushall(void) -{ - return flush_all_buffers(_IOWRT | _IOREAD); -} - -/********************************************************************* * fflush (MSVCRT.@) */ int CDECL fflush(FILE* file) { if(!file) { - flush_all_buffers(_IOWRT); + _flushall(); } else if(file->_flag & _IOWRT) { int res; _lock_file(file); res = flush_buffer(file); - /* FIXME - if(!res && (file->_flag & _IOCOMMIT)) - res = _commit(file->_file) ? EOF : 0; - */ _unlock_file(file); return res; - } else if(file->_flag & _IOREAD) { - _lock_file(file); - file->_cnt = 0; - file->_ptr = file->_base; - _unlock_file(file); - - return 0; - } + } return 0; } @@ -817,15 +790,18 @@ LOCK_FILES(); hand = fdtoh(fd); TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (!is_valid_fd(fd)) { + if (hand == INVALID_HANDLE_VALUE) ret = -1; - } else { + else if (!CloseHandle(hand)) + { + WARN(":failed-last error (%d)\n",GetLastError()); + _dosmaperr(GetLastError()); + ret = -1; + } + else + { free_fd(fd); - ret = CloseHandle(hand) ? 0 : -1; - if (ret) { - WARN(":failed-last error (%d)\n",GetLastError()); - _dosmaperr(GetLastError()); - } + ret = 0; } UNLOCK_FILES(); TRACE(":ok\n"); @@ -1244,9 +1220,7 @@ static int get_flags(const wchar_t* mode, int *open_flags, int* stream_flags) { int plus = strchrW(mode, '+') != NULL; - - while(*mode == ' ') mode++; - + switch(*mode++) { case 'R': case 'r': @@ -1267,10 +1241,7 @@ return -1; } - /* FIXME */ - /* *stream_flags |= MSVCRT__commode; */ - - while (*mode && *mode!=',') + while (*mode) switch (*mode++) { case 'B': case 'b': @@ -1281,83 +1252,12 @@ *open_flags |= _O_TEXT; *open_flags &= ~_O_BINARY; break; - case 'D': - *open_flags |= _O_TEMPORARY; - break; - case 'T': - *open_flags |= _O_SHORT_LIVED; - break; - /* FIXME - case 'c': - *stream_flags |= _IOCOMMIT; - break; - case 'n': - *stream_flags &= ~_IOCOMMIT; - break; - */ - case 'N': - *open_flags |= _O_NOINHERIT; - break; case '+': case ' ': - case 'a': - case 'w': - break; - case 'S': - case 'R': - FIXME("ignoring cache optimization flag: %c\n", mode[-1]); break; default: - ERR("incorrect mode flag: %c\n", mode[-1]); - break; - } - - if(*mode == ',') - { - static const WCHAR ccs[] = {'c','c','s'}; - static const WCHAR utf8[] = {'u','t','f','-','8'}; - static const WCHAR utf16le[] = {'u','t','f','-','1','6','l','e'}; - static const WCHAR unicode[] = {'u','n','i','c','o','d','e'}; - - mode++; - while(*mode == ' ') mode++; - if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, sizeof(ccs)/sizeof(ccs[0])))) - return -1; - mode += sizeof(ccs)/sizeof(ccs[0]); - while(*mode == ' ') mode++; - if(!MSVCRT_CHECK_PMT(*mode == '=')) - return -1; - mode++; - while(*mode == ' ') mode++; - - if(!strncmpiW(utf8, mode, sizeof(utf8)/sizeof(utf8[0]))) - { - *open_flags |= _O_U8TEXT; - mode += sizeof(utf8)/sizeof(utf8[0]); - } - else if(!strncmpiW(utf16le, mode, sizeof(utf16le)/sizeof(utf16le[0]))) - { - *open_flags |= _O_U16TEXT; - mode += sizeof(utf16le)/sizeof(utf16le[0]); - } - else if(!strncmpiW(unicode, mode, sizeof(unicode)/sizeof(unicode[0]))) - { - *open_flags |= _O_WTEXT; - mode += sizeof(unicode)/sizeof(unicode[0]); - } - else - { - _invalid_parameter(NULL, NULL, NULL, 0, 0); - *_errno() = EINVAL; - return -1; - } - - while(*mode == ' ') mode++; - } - - if(!MSVCRT_CHECK_PMT(*mode == 0)) - return -1; - + FIXME(":unknown flag %c not supported\n",mode[-1]); + } return 0; } @@ -1546,23 +1446,19 @@ int wxflags = 0; unsigned unsupp; /* until we support everything */ - if (oflags & _O_APPEND) wxflags |= WX_APPEND; - if (oflags & _O_BINARY) {/* Nothing to do */} - else if (oflags & _O_TEXT) wxflags |= WX_TEXT; - else if (oflags & _O_WTEXT) wxflags |= WX_TEXT; - else if (oflags & _O_U16TEXT) wxflags |= WX_TEXT; - else if (oflags & _O_U8TEXT) wxflags |= WX_TEXT; - else if (*__p__fmode() & _O_BINARY) {/* Nothing to do */} + if (oflags & _O_APPEND) wxflags |= WX_APPEND; + if (oflags & _O_BINARY) {/* Nothing to do */} + else if (oflags & _O_TEXT) wxflags |= WX_TEXT; + else if (*__p__fmode() & _O_BINARY) {/* Nothing to do */} else wxflags |= WX_TEXT; /* default to TEXT*/ - if (oflags & _O_NOINHERIT) wxflags |= WX_DONTINHERIT; + if (oflags & _O_NOINHERIT) wxflags |= WX_DONTINHERIT; if ((unsupp = oflags & ~( _O_BINARY|_O_TEXT|_O_APPEND| _O_TRUNC|_O_EXCL|_O_CREAT| _O_RDWR|_O_WRONLY|_O_TEMPORARY| _O_NOINHERIT| - _O_SEQUENTIAL|_O_RANDOM|_O_SHORT_LIVED| - _O_WTEXT|_O_U16TEXT|_O_U8TEXT + _O_SEQUENTIAL|_O_RANDOM|_O_SHORT_LIVED ))) ERR(":unsupported oflags 0x%04x\n",unsupp); @@ -1715,9 +1611,7 @@ } *fd = alloc_fd(hand, wxflag); - if (*fd == -1) - return *_errno(); - + TRACE(":fd (%d) handle (%p)\n", *fd, hand); return 0; } @@ -1743,29 +1637,6 @@ _sopen_s(&fd, path, oflags, shflags, pmode); return fd; -} - -static int check_bom(HANDLE h, int oflags, BOOL seek) -{ - char bom[sizeof(utf8_bom)]; - DWORD r; - - oflags &= ~(_O_WTEXT|_O_U16TEXT|_O_U8TEXT); - - if (!ReadFile(h, bom, sizeof(utf8_bom), &r, NULL)) - return oflags; - - if (r==sizeof(utf8_bom) && !memcmp(bom, utf8_bom, sizeof(utf8_bom))) { - oflags |= _O_U8TEXT; - }else if (r>=sizeof(utf16_bom) && !memcmp(bom, utf16_bom, sizeof(utf16_bom))) { - if (seek && r>2) - SetFilePointer(h, 2, NULL, FILE_BEGIN); - oflags |= _O_U16TEXT; - }else if (seek) { - SetFilePointer(h, 0, NULL, FILE_BEGIN); - } - - return oflags; } /********************************************************************* @@ -1782,7 +1653,12 @@ TRACE("fd*: %p :file (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x\n", fd, debugstr_w(path), oflags, shflags, pmode); - if (!MSVCRT_CHECK_PMT( fd != NULL )) return EINVAL; + if (!fd) + { + MSVCRT_INVALID_PMT("null out fd pointer"); + *_errno() = EINVAL; + return EINVAL; + } *fd = -1; wxflag = split_oflags(oflags); @@ -1846,78 +1722,15 @@ sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = (oflags & _O_NOINHERIT) ? FALSE : TRUE; - if ((oflags&(_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) - && (creation==OPEN_ALWAYS || creation==OPEN_EXISTING) - && !(access&GENERIC_READ)) - { - hand = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, - &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (hand != INVALID_HANDLE_VALUE) - { - oflags = check_bom(hand, oflags, FALSE); - CloseHandle(hand); - } - else - oflags &= ~(_O_WTEXT|_O_U16TEXT|_O_U8TEXT); - } - hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); + if (hand == INVALID_HANDLE_VALUE) { WARN(":failed-last error (%d)\n",GetLastError()); _dosmaperr(GetLastError()); return *_errno(); } - if (oflags & (_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) - { - if ((access & GENERIC_WRITE) && (creation==CREATE_NEW - || creation==CREATE_ALWAYS || creation==TRUNCATE_EXISTING - || (creation==OPEN_ALWAYS && GetLastError()==ERROR_ALREADY_EXISTS))) - { - if (oflags & _O_U8TEXT) - { - DWORD written = 0, tmp; - - while(written!=sizeof(utf8_bom) && WriteFile(hand, (char*)utf8_bom+written, - sizeof(utf8_bom)-written, &tmp, NULL)) - written += tmp; - if (written != sizeof(utf8_bom)) { - WARN("error writing BOM\n"); - CloseHandle(hand); - _dosmaperr(GetLastError()); - return *_errno(); - } - } - else - { - DWORD written = 0, tmp; - - while(written!=sizeof(utf16_bom) && WriteFile(hand, (char*)utf16_bom+written, - sizeof(utf16_bom)-written, &tmp, NULL)) - written += tmp; - if (written != sizeof(utf16_bom)) - { - WARN("error writing BOM\n"); - CloseHandle(hand); - _dosmaperr(GetLastError()); - return *_errno(); - } - } - } - else if (access & GENERIC_READ) - oflags = check_bom(hand, oflags, TRUE); - } - *fd = alloc_fd(hand, wxflag); - if (*fd == -1) - return *_errno(); - - if (oflags & _O_WTEXT) - get_ioinfo(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; - else if (oflags & _O_U16TEXT) - get_ioinfo(*fd)->exflag |= EF_UTF16; - else if (oflags & _O_U8TEXT) - get_ioinfo(*fd)->exflag |= EF_UTF8; TRACE(":fd (%d) handle (%p)\n", *fd, hand); return 0;

1 0

[akhaldi] 61892: [KERNEL32] * Fix MSVC x64 build.
by akhaldi＠svn.reactos.org 30 Jan '14

30 Jan '14

Author: akhaldi Date: Thu Jan 30 20:00:29 2014 New Revision: 61892 URL: http://svn.reactos.org/svn/reactos?rev=61892&view=rev Log: [KERNEL32] * Fix MSVC x64 build. Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Thu Jan 30 20:00:29 2014 @@ -191,7 +191,9 @@ CONSOLE_START_INFO ConsoleStartInfo; } CONSRV_API_CONNECTINFO, *PCONSRV_API_CONNECTINFO; +#if defined(_M_IX86) C_ASSERT(sizeof(CONSRV_API_CONNECTINFO) == 0x638); +#endif typedef struct {

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