Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[cgutman] 54280: [USETUP] - Fix FAT32 boot sector pointer arithmetic - Fixes setup error when installing FAT32 boot sector to file

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Oct 31 07:32:00 2011 New Revision: 54280 URL: http://svn.reactos.org/svn/reactos?rev=54280&view=rev Log: [USETUP] - Fix FAT32 boot sector pointer arithmetic - Fixes setup error when installing FAT32 boot sector to file Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Mon Oct 31 07:32:00 2011 @@ -1088,7 +1088,7 @@ NULL, NULL, &IoStatusBlock, - (NewBootSector + SECTORSIZE), + ((PUCHAR)NewBootSector + SECTORSIZE), SECTORSIZE, &FileOffset, NULL);

12 years, 10 months

[ion] 54279: [KERNEL32]: In failure cases we should return one more byte for ANSI_NULL as well. Also fix another length check.

by ion＠svn.reactos.org

Author: ion Date: Sun Oct 30 21:41:12 2011 New Revision: 54279 URL: http://svn.reactos.org/svn/reactos?rev=54279&view=rev Log: [KERNEL32]: In failure cases we should return one more byte for ANSI_NULL as well. Also fix another length check. Modified: trunk/reactos/dll/win32/kernel32/client/environ.c Modified: trunk/reactos/dll/win32/kernel32/client/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] Sun Oct 30 21:41:12 2011 @@ -457,8 +457,8 @@ Status = RtlExpandEnvironmentStrings_U(NULL, &SourceU, &DestU, &Length); if (NT_SUCCESS(Status)) { - /* Get the ASCII length of the variable */ - Result = RtlUnicodeStringToAnsiSize(&DestU); + /* Get the ASCII length of the variable, add a byte for NULL */ + Result = RtlUnicodeStringToAnsiSize(&DestU) + sizeof(ANSI_NULL); } } else @@ -475,16 +475,14 @@ /* Check the size */ Result = RtlUnicodeStringToAnsiSize(&DestU); - if (Result <= nSize) + if (Result <= UniSize) { /* Convert the string */ RtlInitEmptyAnsiString(&Dest, lpDst, UniSize); Status = RtlUnicodeStringToAnsiString(&Dest, &DestU, FALSE); - if (!NT_SUCCESS(Status)) - { - /* Clear the destination */ - *lpDst = ANSI_NULL; - } + + /* Write a NULL-char in case of failure only */ + if (!NT_SUCCESS(Status)) *lpDst = ANSI_NULL; } } Quickie:

12 years, 10 months

[jgardou] 54278: [NTOSKRNL] - Fix typo

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Oct 30 19:19:49 2011 New Revision: 54278 URL: http://svn.reactos.org/svn/reactos?rev=54278&view=rev Log: [NTOSKRNL] - Fix typo Modified: trunk/reactos/ntoskrnl/ex/lookas.c Modified: trunk/reactos/ntoskrnl/ex/lookas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/lookas.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] Sun Oct 30 19:19:49 2011 @@ -313,9 +313,9 @@ } /* Insert it into the list */ - ExInterlockedInsertTailList(&ExpNonPagedLookasideListHead, + ExInterlockedInsertTailList(&ExpPagedLookasideListHead, &Lookaside->L.ListEntry, - &ExpNonPagedLookasideListLock); + &ExpPagedLookasideListLock); } /* EOF */

12 years, 10 months

[jgardou] 54277: [WIN32K] - Allocate lokkaside lists from non paged pool. - Add allocation failure check.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Oct 30 18:37:30 2011 New Revision: 54277 URL: http://svn.reactos.org/svn/reactos?rev=54277&view=rev Log: [WIN32K] - Allocate lokkaside lists from non paged pool. - Add allocation failure check. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun Oct 30 18:37:30 2011 @@ -27,7 +27,7 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserIcon); -static PAGED_LOOKASIDE_LIST gProcessLookasideList; +static PPAGED_LOOKASIDE_LIST pgProcessLookasideList; static LIST_ENTRY gCurIconList; SYSTEM_CURSORINFO gSysCursorInfo; @@ -35,7 +35,11 @@ BOOL InitCursorImpl() { - ExInitializePagedLookasideList(&gProcessLookasideList, + pgProcessLookasideList = ExAllocatePool(NonPagedPool, sizeof(PAGED_LOOKASIDE_LIST)); + if(!pgProcessLookasideList) + return FALSE; + + ExInitializePagedLookasideList(pgProcessLookasideList, NULL, NULL, 0, @@ -154,7 +158,7 @@ } /* Not registered yet */ - Current = ExAllocateFromPagedLookasideList(&gProcessLookasideList); + Current = ExAllocateFromPagedLookasideList(pgProcessLookasideList); if (NULL == Current) { return FALSE; @@ -266,7 +270,7 @@ } } - ExFreeToPagedLookasideList(&gProcessLookasideList, Current); + ExFreeToPagedLookasideList(pgProcessLookasideList, Current); /* If there are still processes referencing this object we can't destroy it yet */ if (! IsListEmpty(&CurIcon->ProcessList)) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Oct 30 18:37:30 2011 @@ -13,7 +13,7 @@ /* GLOBALS *******************************************************************/ -static PAGED_LOOKASIDE_LIST MessageLookasideList; +static PPAGED_LOOKASIDE_LIST pgMessageLookasideList; PUSER_MESSAGE_QUEUE gpqCursor; /* FUNCTIONS *****************************************************************/ @@ -23,7 +23,10 @@ NTAPI MsqInitializeImpl(VOID) { - ExInitializePagedLookasideList(&MessageLookasideList, + pgMessageLookasideList = ExAllocatePoolWithTag(NonPagedPool, sizeof(PAGED_LOOKASIDE_LIST), TAG_USRMSG); + if(!pgMessageLookasideList) + return STATUS_NO_MEMORY; + ExInitializePagedLookasideList(pgMessageLookasideList, NULL, NULL, 0, @@ -640,7 +643,7 @@ { PUSER_MESSAGE Message; - Message = ExAllocateFromPagedLookasideList(&MessageLookasideList); + Message = ExAllocateFromPagedLookasideList(pgMessageLookasideList); if (!Message) { return NULL; @@ -654,7 +657,7 @@ VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message) { - ExFreeToPagedLookasideList(&MessageLookasideList, Message); + ExFreeToPagedLookasideList(pgMessageLookasideList, Message); } BOOLEAN FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sun Oct 30 18:37:30 2011 @@ -207,6 +207,8 @@ gpaLookasideList = ExAllocatePoolWithTag(NonPagedPool, GDIObjTypeTotal * sizeof(PAGED_LOOKASIDE_LIST), TAG_GDIHNDTBLE); + if(!gpaLookasideList) + return STATUS_NO_MEMORY; InitLookasideList(GDIObjType_DC_TYPE, sizeof(DC)); InitLookasideList(GDIObjType_RGN_TYPE, sizeof(REGION));

12 years, 10 months

[ion] 54276: [KERNEL32]: Fix many bugs and confusion regarding string sizes in previous commit.

by ion＠svn.reactos.org

Author: ion Date: Sun Oct 30 16:49:25 2011 New Revision: 54276 URL: http://svn.reactos.org/svn/reactos?rev=54276&view=rev Log: [KERNEL32]: Fix many bugs and confusion regarding string sizes in previous commit. Modified: trunk/reactos/dll/win32/kernel32/client/environ.c Modified: trunk/reactos/dll/win32/kernel32/client/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] Sun Oct 30 16:49:25 2011 @@ -31,7 +31,8 @@ ANSI_STRING VarName, VarValue; UNICODE_STRING VarNameU, VarValueU; PWSTR Buffer; - ULONG Result = 0, UniSize = 0; + ULONG Result = 0; + USHORT UniSize; NTSTATUS Status; /* Initialize all the strings */ @@ -42,27 +43,37 @@ if (!NT_SUCCESS(Status)) goto Quickie; /* Check if the size is too big to fit */ - if (nSize <= UNICODE_STRING_MAX_BYTES) - { - /* Keep the given size, minus a NULL-char */ - if (nSize) UniSize = nSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); + UniSize = UNICODE_STRING_MAX_CHARS - 2; + if (nSize <= UniSize) + { + /* It fits, but was there a string at all? */ + if (nSize) + { + /* Keep the given size, minus a NULL-char */ + UniSize = nSize - 1; + } + else + { + /* No size */ + UniSize = 0; + } } else { - /* Set the maximum possible */ - UniSize = UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL); + /* String is too big, so we need to return a NULL char as well */ + UniSize--; } /* Allocate the value string buffer */ - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, UniSize); + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, UniSize * sizeof(WCHAR)); if (!Buffer) { - Status = STATUS_NO_MEMORY; + Status = STATUS_NO_MEMORY;; goto Quickie; } /* And initialize its string */ - RtlInitEmptyUnicodeString(&VarValueU, Buffer, UniSize); + RtlInitEmptyUnicodeString(&VarValueU, Buffer, UniSize * sizeof(WCHAR)); /* Acquire the PEB lock since we'll be querying variables now */ RtlAcquirePebLock(); @@ -72,7 +83,7 @@ if ((NT_SUCCESS(Status)) && !(nSize)) Status = STATUS_BUFFER_TOO_SMALL; /* Check if we didn't have enough space */ - if (Status == STATUS_BUFFER_TOO_SMALL) + if (!(NT_SUCCESS(Status)) && (Status == STATUS_BUFFER_TOO_SMALL)) { /* Fixup the length that the API returned */ VarValueU.MaximumLength = VarValueU.Length + 2; @@ -99,26 +110,18 @@ Status = STATUS_NO_MEMORY; } } - else + else if (NT_SUCCESS(Status)) { /* Check if the size is too big to fit */ - if (nSize <= MAXULONG) - { - /* Keep the given size, minus a NULL-char */ - if (nSize) nSize = nSize - sizeof(ANSI_NULL); - } - else - { - /* Set the maximum possible */ - nSize = MAXULONG - sizeof(ANSI_NULL); - } + UniSize = UNICODE_STRING_MAX_BYTES - 1; + if (nSize <= UniSize) UniSize = nSize; /* Check the size */ Result = RtlUnicodeStringToAnsiSize(&VarValueU); - if (Result <= nSize) + if (Result <= UniSize) { /* Convert the string */ - RtlInitEmptyAnsiString(&VarValue, lpBuffer, nSize); + RtlInitEmptyAnsiString(&VarValue, lpBuffer, UniSize); Status = RtlUnicodeStringToAnsiString(&VarValue, &VarValueU, FALSE); if (NT_SUCCESS(Status)) { @@ -160,20 +163,28 @@ { UNICODE_STRING VarName, VarValue; NTSTATUS Status; - - if (nSize <= UNICODE_STRING_MAX_BYTES) - { - if (nSize) nSize = nSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); + USHORT UniSize; + + if (nSize <= (UNICODE_STRING_MAX_CHARS - 1)) + { + if (nSize) + { + UniSize = nSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); + } + else + { + UniSize = 0; + } } else { - nSize = UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL); + UniSize = UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL); } Status = RtlInitUnicodeStringEx(&VarName, lpName); if (NT_SUCCESS(Status)) { - RtlInitEmptyUnicodeString(&VarValue, lpBuffer, nSize); + RtlInitEmptyUnicodeString(&VarValue, lpBuffer, UniSize); Status = RtlQueryEnvironmentVariable_U(NULL, &VarName, &VarValue); if (!NT_SUCCESS(Status)) @@ -384,9 +395,17 @@ ANSI_STRING Source, Dest; UNICODE_STRING SourceU, DestU; PWSTR Buffer; - ULONG Result = 0, UniSize = 0, Length; - NTSTATUS Status; - + ULONG Result = 0, Length; + USHORT UniSize; + NTSTATUS Status; + + /* Check if the size is too big to fit */ + UniSize = UNICODE_STRING_MAX_CHARS - 2; + if (nSize <= UniSize) UniSize = nSize; + + /* Clear the input buffer */ + if (lpDst) *lpDst = ANSI_NULL; + /* Initialize all the strings */ RtlInitAnsiString(&Source, lpSrc); RtlInitUnicodeString(&SourceU, NULL); @@ -394,20 +413,19 @@ Status = RtlAnsiStringToUnicodeString(&SourceU, &Source, TRUE); if (!NT_SUCCESS(Status)) goto Quickie; - /* Check if the size is too big to fit */ - if (nSize <= UNICODE_STRING_MAX_BYTES) - { - /* Keep the given size, minus a NULL-char */ - if (nSize) UniSize = nSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); + /* If the string fit in, make space for a NULL char */ + if (UniSize) + { + UniSize--; } else { - /* Set the maximum possible */ - UniSize = UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL); + /* No input size, so no string size */ + UniSize = 0; } /* Allocate the value string buffer */ - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, UniSize); + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, UniSize * sizeof(WCHAR)); if (!Buffer) { Status = STATUS_NO_MEMORY; @@ -415,14 +433,14 @@ } /* And initialize its string */ - RtlInitEmptyUnicodeString(&DestU, Buffer, UniSize); + RtlInitEmptyUnicodeString(&DestU, Buffer, UniSize * sizeof(WCHAR)); /* Query the variable */ Length = 0; Status = RtlExpandEnvironmentStrings_U(NULL, &SourceU, &DestU, &Length); /* Check if we didn't have enough space */ - if (Status == STATUS_BUFFER_TOO_SMALL) + if (!(NT_SUCCESS(Status)) && (Status == STATUS_BUFFER_TOO_SMALL)) { /* Fixup the length that the API returned */ DestU.MaximumLength = Length; @@ -449,26 +467,18 @@ Status = STATUS_NO_MEMORY; } } - else + else if (NT_SUCCESS(Status)) { /* Check if the size is too big to fit */ - if (nSize <= MAXULONG) - { - /* Keep the given size, minus a NULL-char */ - if (nSize) nSize = nSize - sizeof(ANSI_NULL); - } - else - { - /* Set the maximum possible */ - nSize = MAXULONG - sizeof(ANSI_NULL); - } + UniSize = UNICODE_STRING_MAX_BYTES - 1; + if (nSize <= UniSize) UniSize = nSize; /* Check the size */ Result = RtlUnicodeStringToAnsiSize(&DestU); if (Result <= nSize) { /* Convert the string */ - RtlInitEmptyAnsiString(&Dest, lpDst, nSize); + RtlInitEmptyAnsiString(&Dest, lpDst, UniSize); Status = RtlUnicodeStringToAnsiString(&Dest, &DestU, FALSE); if (!NT_SUCCESS(Status)) { @@ -504,14 +514,15 @@ IN DWORD nSize) { UNICODE_STRING Source, Destination; - NTSTATUS Status;; + NTSTATUS Status; + USHORT UniSize; + + UniSize = UNICODE_STRING_MAX_CHARS - 2; + if (nSize <= UniSize) UniSize = nSize; RtlInitUnicodeString(&Source, (LPWSTR)lpSrc); - - /* make sure we don't overflow the maximum UNICODE_STRING size */ - if (nSize > UNICODE_STRING_MAX_BYTES) nSize = UNICODE_STRING_MAX_BYTES; - - RtlInitEmptyUnicodeString(&Destination, lpDst, nSize * sizeof(WCHAR)); + RtlInitEmptyUnicodeString(&Destination, lpDst, UniSize * sizeof(WCHAR)); + Status = RtlExpandEnvironmentStrings_U(NULL, &Source, &Destination, @@ -521,9 +532,8 @@ return nSize / sizeof(WCHAR); } - BaseSetLastNTError (Status); + BaseSetLastNTError(Status); return 0; - } /*

12 years, 10 months

[jimtabor] 54275: [Win32k] - don't hangup on the user while in send message.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Oct 30 15:44:31 2011 New Revision: 54275 URL: http://svn.reactos.org/svn/reactos?rev=54275&view=rev Log: [Win32k] - don't hangup on the user while in send message. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Oct 30 15:44:31 2011 @@ -663,6 +663,7 @@ PUSER_SENT_MESSAGE SaveMsg, Message; PLIST_ENTRY Entry; PTHREADINFO pti; + BOOL Ret; LRESULT Result = 0; if (IsListEmpty(&MessageQueue->SentMessagesListHead)) @@ -732,7 +733,8 @@ RemoveEntryList(&Message->ListEntry); InsertTailList(&Message->CallBackSenderQueue->SentMessagesListHead, &Message->ListEntry); TRACE("Callback Message not processed yet. Requeuing the message\n"); - return (FALSE); + Ret = FALSE; + goto Exit; } } else @@ -760,7 +762,8 @@ MsqWakeQueue(Message->CallBackSenderQueue, QS_SENDMESSAGE, TRUE); IntDereferenceMessageQueue(Message->CallBackSenderQueue); } - return (TRUE); + Ret = TRUE; + goto Exit; } /* remove the message from the dispatching list if needed, so lock the sender's message queue */ @@ -808,12 +811,13 @@ /* free the message */ ExFreePoolWithTag(Message, TAG_USRMSG); - + Ret = TRUE; +Exit: /* do not hangup on the user if this is reentering */ if (!SaveMsg) pti->pcti->CTI_flags &= ~CTI_INSENDMESSAGE; pti->pusmCurrent = SaveMsg; - return(TRUE); + return Ret; } VOID APIENTRY

12 years, 10 months

[ion] 54274: [KERNEL32]: Rewrite (in some cases, simply clean-up) environment handling functions for better string handling, error codes, and performance. Part of ongoing kernel32 work.

by ion＠svn.reactos.org

Author: ion Date: Sun Oct 30 01:07:09 2011 New Revision: 54274 URL: http://svn.reactos.org/svn/reactos?rev=54274&view=rev Log: [KERNEL32]: Rewrite (in some cases, simply clean-up) environment handling functions for better string handling, error codes, and performance. Part of ongoing kernel32 work. Modified: trunk/reactos/dll/win32/kernel32/client/environ.c Modified: trunk/reactos/dll/win32/kernel32/client/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] Sun Oct 30 01:07:09 2011 @@ -24,489 +24,506 @@ */ DWORD WINAPI -GetEnvironmentVariableA ( - LPCSTR lpName, - LPSTR lpBuffer, - DWORD nSize - ) -{ - ANSI_STRING VarName; - ANSI_STRING VarValue; - UNICODE_STRING VarNameU; - UNICODE_STRING VarValueU; - NTSTATUS Status; - - /* initialize unicode variable name string */ - RtlInitAnsiString (&VarName, - (LPSTR)lpName); - RtlAnsiStringToUnicodeString (&VarNameU, - &VarName, - TRUE); - - /* initialize ansi variable value string */ - VarValue.Length = 0; - VarValue.MaximumLength = (USHORT)nSize; - VarValue.Buffer = lpBuffer; - - /* initialize unicode variable value string and allocate buffer */ - VarValueU.Length = 0; - if (nSize != 0) - { - VarValueU.MaximumLength = (USHORT)(nSize - 1) * sizeof(WCHAR); - VarValueU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - nSize * sizeof(WCHAR)); - if (VarValueU.Buffer != NULL) - { - /* NULL-terminate the buffer in any case! RtlQueryEnvironmentVariable_U - only terminates it if MaximumLength < Length! */ - VarValueU.Buffer[nSize - 1] = L'\0'; - } - } - else - { - VarValueU.MaximumLength = 0; - VarValueU.Buffer = NULL; - } - - if (VarValueU.Buffer != NULL || nSize == 0) - { - /* get unicode environment variable */ - Status = RtlQueryEnvironmentVariable_U (NULL, - &VarNameU, - &VarValueU); - if (!NT_SUCCESS(Status)) - { - /* free unicode buffer */ - RtlFreeHeap (RtlGetProcessHeap (), - 0, - VarValueU.Buffer); - - /* free unicode variable name string */ - RtlFreeUnicodeString (&VarNameU); - - BaseSetLastNTError (Status); - if (Status == STATUS_BUFFER_TOO_SMALL) - { - return (VarValueU.Length / sizeof(WCHAR)) + 1; - } - else - { - return 0; - } - } - - /* convert unicode value string to ansi */ - RtlUnicodeStringToAnsiString (&VarValue, - &VarValueU, - FALSE); - - if (VarValueU.Buffer != NULL) - { - /* free unicode buffer */ - RtlFreeHeap (RtlGetProcessHeap (), - 0, - VarValueU.Buffer); - } - - /* free unicode variable name string */ - RtlFreeUnicodeString (&VarNameU); - - return (VarValueU.Length / sizeof(WCHAR)); - } - else - { - SetLastError (ERROR_NOT_ENOUGH_MEMORY); - return 0; - } -} - +GetEnvironmentVariableA(IN LPCSTR lpName, + IN LPSTR lpBuffer, + IN DWORD nSize) +{ + ANSI_STRING VarName, VarValue; + UNICODE_STRING VarNameU, VarValueU; + PWSTR Buffer; + ULONG Result = 0, UniSize = 0; + NTSTATUS Status; + + /* Initialize all the strings */ + RtlInitAnsiString(&VarName, lpName); + RtlInitUnicodeString(&VarNameU, NULL); + RtlInitUnicodeString(&VarValueU, NULL); + Status = RtlAnsiStringToUnicodeString(&VarNameU, &VarName, TRUE); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Check if the size is too big to fit */ + if (nSize <= UNICODE_STRING_MAX_BYTES) + { + /* Keep the given size, minus a NULL-char */ + if (nSize) UniSize = nSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); + } + else + { + /* Set the maximum possible */ + UniSize = UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL); + } + + /* Allocate the value string buffer */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, UniSize); + if (!Buffer) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* And initialize its string */ + RtlInitEmptyUnicodeString(&VarValueU, Buffer, UniSize); + + /* Acquire the PEB lock since we'll be querying variables now */ + RtlAcquirePebLock(); + + /* Query the variable */ + Status = RtlQueryEnvironmentVariable_U(NULL, &VarNameU, &VarValueU); + if ((NT_SUCCESS(Status)) && !(nSize)) Status = STATUS_BUFFER_TOO_SMALL; + + /* Check if we didn't have enough space */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Fixup the length that the API returned */ + VarValueU.MaximumLength = VarValueU.Length + 2; + + /* Free old Unicode buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, VarValueU.Buffer); + + /* Allocate new one */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, VarValueU.MaximumLength); + if (Buffer) + { + /* Query the variable so we can know its size */ + VarValueU.Buffer = Buffer; + Status = RtlQueryEnvironmentVariable_U(NULL, &VarNameU, &VarValueU); + if (NT_SUCCESS(Status)) + { + /* Get the ASCII length of the variable */ + Result = RtlUnicodeStringToAnsiSize(&VarValueU); + } + } + else + { + /* Set failure status */ + Status = STATUS_NO_MEMORY; + } + } + else + { + /* Check if the size is too big to fit */ + if (nSize <= MAXULONG) + { + /* Keep the given size, minus a NULL-char */ + if (nSize) nSize = nSize - sizeof(ANSI_NULL); + } + else + { + /* Set the maximum possible */ + nSize = MAXULONG - sizeof(ANSI_NULL); + } + + /* Check the size */ + Result = RtlUnicodeStringToAnsiSize(&VarValueU); + if (Result <= nSize) + { + /* Convert the string */ + RtlInitEmptyAnsiString(&VarValue, lpBuffer, nSize); + Status = RtlUnicodeStringToAnsiString(&VarValue, &VarValueU, FALSE); + if (NT_SUCCESS(Status)) + { + /* NULL-terminate and set the final length */ + lpBuffer[VarValue.Length] = ANSI_NULL; + Result = VarValue.Length; + } + } + } + + /* Release the lock */ + RtlReleasePebLock(); + +Quickie: + /* Free the strings */ + RtlFreeUnicodeString(&VarNameU); + if (VarValueU.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, VarValueU.Buffer); + + /* Check if we suceeded */ + if (!NT_SUCCESS(Status)) + { + /* We did not, clear the result and set the error code */ + BaseSetLastNTError(Status); + Result = 0; + } + + /* Return the result */ + return Result; +} /* * @implemented */ DWORD WINAPI -GetEnvironmentVariableW ( - LPCWSTR lpName, - LPWSTR lpBuffer, - DWORD nSize - ) -{ - UNICODE_STRING VarName; - UNICODE_STRING VarValue; - NTSTATUS Status; - - RtlInitUnicodeString (&VarName, - lpName); - - VarValue.Length = 0; - VarValue.MaximumLength = (USHORT) (nSize ? nSize - 1 : 0) * sizeof(WCHAR); - VarValue.Buffer = lpBuffer; - - Status = RtlQueryEnvironmentVariable_U (NULL, - &VarName, - &VarValue); - if (!NT_SUCCESS(Status)) - { - if (Status == STATUS_BUFFER_TOO_SMALL) - { - return (VarValue.Length / sizeof(WCHAR)) + 1; - } - else - { - BaseSetLastNTError (Status); - return 0; - } - } - - if (nSize != 0) - { - /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U - only terminates it if MaximumLength < Length */ - lpBuffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; - } - - return (VarValue.Length / sizeof(WCHAR)); -} - - -/* - * @implemented - */ -BOOL -WINAPI -SetEnvironmentVariableA ( - LPCSTR lpName, - LPCSTR lpValue - ) -{ - ANSI_STRING VarName; - ANSI_STRING VarValue; - UNICODE_STRING VarNameU; - UNICODE_STRING VarValueU; - NTSTATUS Status; - - DPRINT("SetEnvironmentVariableA(Name '%s', Value '%s')\n", lpName, lpValue); - - RtlInitAnsiString (&VarName, - (LPSTR)lpName); - RtlAnsiStringToUnicodeString (&VarNameU, - &VarName, - TRUE); - - if (lpValue) - { - RtlInitAnsiString (&VarValue, - (LPSTR)lpValue); - RtlAnsiStringToUnicodeString (&VarValueU, - &VarValue, - TRUE); - - Status = RtlSetEnvironmentVariable (NULL, - &VarNameU, - &VarValueU); - - RtlFreeUnicodeString (&VarValueU); - } - else - { - Status = RtlSetEnvironmentVariable (NULL, - &VarNameU, - NULL); - } - RtlFreeUnicodeString (&VarNameU); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError (Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -SetEnvironmentVariableW ( - LPCWSTR lpName, - LPCWSTR lpValue - ) -{ - UNICODE_STRING VarName; - UNICODE_STRING VarValue; - NTSTATUS Status; - - DPRINT("SetEnvironmentVariableW(Name '%S', Value '%S')\n", lpName, lpValue); - - RtlInitUnicodeString (&VarName, - lpName); - - RtlInitUnicodeString (&VarValue, - lpValue); - - Status = RtlSetEnvironmentVariable (NULL, - &VarName, - &VarValue); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError (Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -LPSTR -WINAPI -GetEnvironmentStringsA ( - VOID - ) -{ - UNICODE_STRING UnicodeString; - ANSI_STRING AnsiString; - PWCHAR EnvU; - PWCHAR PtrU; - ULONG Length; - PCHAR EnvPtr = NULL; - - EnvU = (PWCHAR)(NtCurrentPeb ()->ProcessParameters->Environment); - - if (EnvU == NULL) - return NULL; - - if (*EnvU == 0) - return NULL; - - /* get environment size */ - PtrU = EnvU; - while (*PtrU) - { - while (*PtrU) - PtrU++; - PtrU++; - } - Length = (ULONG)(PtrU - EnvU); - DPRINT("Length %lu\n", Length); - - /* allocate environment buffer */ - EnvPtr = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - Length + 1); - if (EnvPtr == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - DPRINT("EnvPtr %p\n", EnvPtr); - - /* convert unicode environment to ansi */ - UnicodeString.MaximumLength = (USHORT)Length * sizeof(WCHAR) + sizeof(WCHAR); - UnicodeString.Buffer = EnvU; - - AnsiString.MaximumLength = (USHORT)Length + 1; - AnsiString.Length = 0; - AnsiString.Buffer = EnvPtr; - - DPRINT ("UnicodeString.Buffer \'%S\'\n", UnicodeString.Buffer); - - while (*(UnicodeString.Buffer)) - { - UnicodeString.Length = wcslen (UnicodeString.Buffer) * sizeof(WCHAR); - UnicodeString.MaximumLength = UnicodeString.Length + sizeof(WCHAR); - if (UnicodeString.Length > 0) - { - AnsiString.Length = 0; - AnsiString.MaximumLength = (USHORT)Length + 1 - (AnsiString.Buffer - EnvPtr); - - RtlUnicodeStringToAnsiString (&AnsiString, - &UnicodeString, - FALSE); - - AnsiString.Buffer += (AnsiString.Length + 1); - UnicodeString.Buffer += ((UnicodeString.Length / sizeof(WCHAR)) + 1); - } - } - *(AnsiString.Buffer) = 0; - - return EnvPtr; -} - - -/* - * @implemented - */ -LPWSTR -WINAPI -GetEnvironmentStringsW ( - VOID - ) -{ - return (LPWSTR)(NtCurrentPeb ()->ProcessParameters->Environment); -} - - -/* - * @implemented - */ -BOOL -WINAPI -FreeEnvironmentStringsA ( - LPSTR EnvironmentStrings - ) -{ - if (EnvironmentStrings == NULL) - return FALSE; - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - EnvironmentStrings); - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -FreeEnvironmentStringsW ( - LPWSTR EnvironmentStrings - ) -{ - return TRUE; -} - - -/* - * @implemented - */ -DWORD -WINAPI -ExpandEnvironmentStringsA ( - LPCSTR lpSrc, - LPSTR lpDst, - DWORD nSize - ) -{ - ANSI_STRING Source; - ANSI_STRING Destination; - UNICODE_STRING SourceU; - UNICODE_STRING DestinationU; - NTSTATUS Status; - ULONG Length = 0; - - RtlInitAnsiString (&Source, - (LPSTR)lpSrc); - Status = RtlAnsiStringToUnicodeString (&SourceU, - &Source, - TRUE); +GetEnvironmentVariableW(IN LPCWSTR lpName, + IN LPWSTR lpBuffer, + IN DWORD nSize) +{ + UNICODE_STRING VarName, VarValue; + NTSTATUS Status; + + if (nSize <= UNICODE_STRING_MAX_BYTES) + { + if (nSize) nSize = nSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); + } + else + { + nSize = UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL); + } + + Status = RtlInitUnicodeStringEx(&VarName, lpName); + if (NT_SUCCESS(Status)) + { + RtlInitEmptyUnicodeString(&VarValue, lpBuffer, nSize); + + Status = RtlQueryEnvironmentVariable_U(NULL, &VarName, &VarValue); if (!NT_SUCCESS(Status)) { + if (Status == STATUS_BUFFER_TOO_SMALL) + { + return (VarValue.Length / sizeof(WCHAR)) + sizeof(ANSI_NULL); + } BaseSetLastNTError (Status); return 0; } - /* make sure we don't overflow the maximum ANSI_STRING size */ - if (nSize > 0x7fff) - nSize = 0x7fff; - - Destination.Length = 0; - Destination.MaximumLength = (USHORT)nSize; - Destination.Buffer = lpDst; - - DestinationU.Length = 0; - DestinationU.MaximumLength = (USHORT)nSize * sizeof(WCHAR); - DestinationU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - DestinationU.MaximumLength); - if (DestinationU.Buffer == NULL) - { - RtlFreeUnicodeString(&SourceU); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - - Status = RtlExpandEnvironmentStrings_U (NULL, - &SourceU, - &DestinationU, - &Length); - - RtlFreeUnicodeString (&SourceU); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError (Status); - if (Status != STATUS_BUFFER_TOO_SMALL) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - DestinationU.Buffer); - return 0; - } - } - - RtlUnicodeStringToAnsiString (&Destination, - &DestinationU, - FALSE); - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - DestinationU.Buffer); - - return (Length / sizeof(WCHAR)); -} - + lpBuffer[VarValue.Length / sizeof(WCHAR)] = UNICODE_NULL; + } + + return (VarValue.Length / sizeof(WCHAR)); +} + +/* + * @implemented + */ +BOOL +WINAPI +SetEnvironmentVariableA(IN LPCSTR lpName, + IN LPCSTR lpValue) +{ + ANSI_STRING VarName, VarValue; + UNICODE_STRING VarNameU, VarValueU; + NTSTATUS Status; + + RtlInitAnsiString(&VarName, (LPSTR)lpName); + Status = RtlAnsiStringToUnicodeString(&VarNameU, &VarName, TRUE); + if (NT_SUCCESS(Status)) + { + if (lpValue) + { + RtlInitAnsiString(&VarValue, (LPSTR)lpValue); + Status = RtlAnsiStringToUnicodeString(&VarValueU, &VarValue, TRUE); + if (NT_SUCCESS(Status)) + { + Status = RtlSetEnvironmentVariable(NULL, &VarNameU, &VarValueU); + RtlFreeUnicodeString(&VarValueU); + } + } + else + { + Status = RtlSetEnvironmentVariable(NULL, &VarNameU, NULL); + } + + RtlFreeUnicodeString(&VarNameU); + + if (NT_SUCCESS(Status)) return TRUE; + } + + BaseSetLastNTError(Status); + return FALSE; +} + +/* + * @implemented + */ +BOOL +WINAPI +SetEnvironmentVariableW(IN LPCWSTR lpName, + IN LPCWSTR lpValue) +{ + UNICODE_STRING VarName, VarValue; + NTSTATUS Status; + + Status = RtlInitUnicodeStringEx(&VarName, lpName); + if (NT_SUCCESS(Status)) + { + if (lpValue) + { + Status = RtlInitUnicodeStringEx(&VarValue, lpValue); + if (NT_SUCCESS(Status)) + { + Status = RtlSetEnvironmentVariable(NULL, &VarName, &VarValue); + } + } + else + { + Status = RtlSetEnvironmentVariable(NULL, &VarName, NULL); + } + + if (NT_SUCCESS(Status)) return TRUE; + } + + BaseSetLastNTError(Status); + return FALSE; +} + +/* + * @implemented + */ +LPSTR +WINAPI +GetEnvironmentStringsA(VOID) +{ + ULONG Length, Size; + NTSTATUS Status; + PWCHAR Environment, p; + PCHAR Buffer = NULL; + + RtlAcquirePebLock(); + p = Environment = NtCurrentPeb()->ProcessParameters->Environment; + + do + { + p += wcslen(Environment) + 1; + } while (*p); + + Length = p - Environment + sizeof(UNICODE_NULL); + + Status = RtlUnicodeToMultiByteSize(&Size, Environment, Length); + if (NT_SUCCESS(Status)) + { + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); + if (Buffer) + { + Status = RtlUnicodeToOemN(Buffer, Size, 0, Environment, Length); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + Buffer = NULL; + + BaseSetLastNTError(Status); + } + } + else + { + BaseSetLastNTError(STATUS_NO_MEMORY); + } + } + else + { + BaseSetLastNTError(Status); + } + + RtlReleasePebLock(); + return Buffer; +} + +/* + * @implemented + */ +LPWSTR +WINAPI +GetEnvironmentStringsW(VOID) +{ + PWCHAR Environment, p; + ULONG Length; + + RtlAcquirePebLock(); + + p = Environment = NtCurrentPeb()->ProcessParameters->Environment; + + do + { + p += wcslen(Environment) + 1; + } while (*p); + + Length = p - Environment + sizeof(UNICODE_NULL); + + p = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + if (p) + { + RtlCopyMemory(p, Environment, Length); + } + else + { + BaseSetLastNTError(STATUS_NO_MEMORY); + } + + RtlReleasePebLock(); + return p; +} + +/* + * @implemented + */ +BOOL +WINAPI +FreeEnvironmentStringsA(IN LPSTR EnvironmentStrings) +{ + return (BOOL)RtlFreeHeap(RtlGetProcessHeap(), 0, EnvironmentStrings); +} + +/* + * @implemented + */ +BOOL +WINAPI +FreeEnvironmentStringsW(IN LPWSTR EnvironmentStrings) +{ + return (BOOL)RtlFreeHeap(RtlGetProcessHeap(), 0, EnvironmentStrings); +} /* * @implemented */ DWORD WINAPI -ExpandEnvironmentStringsW ( - LPCWSTR lpSrc, - LPWSTR lpDst, - DWORD nSize - ) -{ - UNICODE_STRING Source; - UNICODE_STRING Destination; - NTSTATUS Status; - ULONG Length = 0; - - RtlInitUnicodeString (&Source, - (LPWSTR)lpSrc); +ExpandEnvironmentStringsA(IN LPCSTR lpSrc, + IN LPSTR lpDst, + IN DWORD nSize) +{ + ANSI_STRING Source, Dest; + UNICODE_STRING SourceU, DestU; + PWSTR Buffer; + ULONG Result = 0, UniSize = 0, Length; + NTSTATUS Status; + + /* Initialize all the strings */ + RtlInitAnsiString(&Source, lpSrc); + RtlInitUnicodeString(&SourceU, NULL); + RtlInitUnicodeString(&DestU, NULL); + Status = RtlAnsiStringToUnicodeString(&SourceU, &Source, TRUE); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Check if the size is too big to fit */ + if (nSize <= UNICODE_STRING_MAX_BYTES) + { + /* Keep the given size, minus a NULL-char */ + if (nSize) UniSize = nSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); + } + else + { + /* Set the maximum possible */ + UniSize = UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL); + } + + /* Allocate the value string buffer */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, UniSize); + if (!Buffer) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* And initialize its string */ + RtlInitEmptyUnicodeString(&DestU, Buffer, UniSize); + + /* Query the variable */ + Length = 0; + Status = RtlExpandEnvironmentStrings_U(NULL, &SourceU, &DestU, &Length); + + /* Check if we didn't have enough space */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Fixup the length that the API returned */ + DestU.MaximumLength = Length; + + /* Free old Unicode buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, DestU.Buffer); + + /* Allocate new one */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + if (Buffer) + { + /* Query the variable so we can know its size */ + DestU.Buffer = Buffer; + Status = RtlExpandEnvironmentStrings_U(NULL, &SourceU, &DestU, &Length); + if (NT_SUCCESS(Status)) + { + /* Get the ASCII length of the variable */ + Result = RtlUnicodeStringToAnsiSize(&DestU); + } + } + else + { + /* Set failure status */ + Status = STATUS_NO_MEMORY; + } + } + else + { + /* Check if the size is too big to fit */ + if (nSize <= MAXULONG) + { + /* Keep the given size, minus a NULL-char */ + if (nSize) nSize = nSize - sizeof(ANSI_NULL); + } + else + { + /* Set the maximum possible */ + nSize = MAXULONG - sizeof(ANSI_NULL); + } + + /* Check the size */ + Result = RtlUnicodeStringToAnsiSize(&DestU); + if (Result <= nSize) + { + /* Convert the string */ + RtlInitEmptyAnsiString(&Dest, lpDst, nSize); + Status = RtlUnicodeStringToAnsiString(&Dest, &DestU, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Clear the destination */ + *lpDst = ANSI_NULL; + } + } + } +Quickie: + /* Free the strings */ + RtlFreeUnicodeString(&SourceU); + if (DestU.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, DestU.Buffer); + + /* Check if we suceeded */ + if (!NT_SUCCESS(Status)) + { + /* We did not, clear the result and set the error code */ + BaseSetLastNTError(Status); + Result = 0; + } + + /* Return the result */ + return Result; +} + +/* + * @implemented + */ +DWORD +WINAPI +ExpandEnvironmentStringsW(IN LPCWSTR lpSrc, + IN LPWSTR lpDst, + IN DWORD nSize) +{ + UNICODE_STRING Source, Destination; + NTSTATUS Status;; + + RtlInitUnicodeString(&Source, (LPWSTR)lpSrc); /* make sure we don't overflow the maximum UNICODE_STRING size */ - if (nSize > 0x7fff) - nSize = 0x7fff; - - Destination.Length = 0; - Destination.MaximumLength = (USHORT)nSize * sizeof(WCHAR); - Destination.Buffer = lpDst; - - Status = RtlExpandEnvironmentStrings_U (NULL, - &Source, - &Destination, - &Length); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError (Status); - if (Status != STATUS_BUFFER_TOO_SMALL) - return 0; - } - - return (Length / sizeof(WCHAR)); + if (nSize > UNICODE_STRING_MAX_BYTES) nSize = UNICODE_STRING_MAX_BYTES; + + RtlInitEmptyUnicodeString(&Destination, lpDst, nSize * sizeof(WCHAR)); + Status = RtlExpandEnvironmentStrings_U(NULL, + &Source, + &Destination, + &nSize); + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_TOO_SMALL)) + { + return nSize / sizeof(WCHAR); + } + + BaseSetLastNTError (Status); + return 0; + } /*

12 years, 10 months

[jgardou] 54273: [CDFS] - Read all blocks at once for misaligned read.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Oct 30 00:58:21 2011 New Revision: 54273 URL: http://svn.reactos.org/svn/reactos?rev=54273&view=rev Log: [CDFS] - Read all blocks at once for misaligned read. Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] Sun Oct 30 00:58:21 2011 @@ -55,6 +55,7 @@ { NTSTATUS Status = STATUS_SUCCESS; PFCB Fcb; + ULONG ToRead = Length; DPRINT("CdfsReadFile(ReadOffset %lu Length %lu)\n", ReadOffset, Length); @@ -67,6 +68,9 @@ if (ReadOffset >= Fcb->Entry.DataLengthL) return(STATUS_END_OF_FILE); + + if (ReadOffset + Length > Fcb->Entry.DataLengthL) + ToRead = Fcb->Entry.DataLengthL - ReadOffset; DPRINT("Reading %d bytes at %d\n", Length, ReadOffset); @@ -77,9 +81,6 @@ CC_FILE_SIZES FileSizes; DPRINT("Using cache\n"); - - if (ReadOffset + Length > Fcb->Entry.DataLengthL) - Length = Fcb->Entry.DataLengthL - ReadOffset; if (FileObject->PrivateCacheMap == NULL) { @@ -101,79 +102,56 @@ FileOffset.QuadPart = (LONGLONG)ReadOffset; CcCopyRead(FileObject, &FileOffset, - Length, + ToRead, TRUE, Buffer, &IoStatus); *LengthRead = IoStatus.Information; - return(IoStatus.Status); - } - - if ((ReadOffset % BLOCKSIZE) != 0 || (Length % BLOCKSIZE) != 0) - { - /* Then we need to do a partial or misaligned read ... */ - PCHAR PageBuf = ExAllocatePool(NonPagedPool, BLOCKSIZE); - PCHAR TargetRead = (PCHAR)Buffer; - ULONG ActualReadOffset, EndOfExtent, ReadLen; - - if (!PageBuf) - { - return STATUS_NO_MEMORY; - } - - ActualReadOffset = ROUND_DOWN(ReadOffset, BLOCKSIZE); - EndOfExtent = ReadOffset + Length; - - while (ActualReadOffset < EndOfExtent) - { - Status = CdfsReadSectors - (DeviceExt->StorageDevice, - Fcb->Entry.ExtentLocationL + (ActualReadOffset / BLOCKSIZE), - 1, - (PVOID)PageBuf, - FALSE); - - if (!NT_SUCCESS(Status)) - break; - - ReadLen = BLOCKSIZE - (ReadOffset - ActualReadOffset); - if (ReadLen > EndOfExtent - ReadOffset) + Status = IoStatus.Status; + } + else + { + ULONG ActualReadOffset = ROUND_DOWN(ReadOffset, BLOCKSIZE); + ULONG nBlocks = (ROUND_UP(ReadOffset + ToRead, BLOCKSIZE) - ActualReadOffset) / BLOCKSIZE; + PUCHAR PageBuf; + BOOLEAN bFreeBuffer = FALSE; + if ((ReadOffset % BLOCKSIZE) != 0 || (ToRead % BLOCKSIZE) != 0) + { + PageBuf = ExAllocatePool(NonPagedPool, nBlocks * BLOCKSIZE); + if (!PageBuf) { - ReadLen = EndOfExtent - ReadOffset; + return STATUS_NO_MEMORY; } - DPRINT("Copying %d bytes.\n", ReadLen); - RtlCopyMemory(TargetRead, PageBuf + (ReadOffset - ActualReadOffset), ReadLen); - - ActualReadOffset += BLOCKSIZE; - TargetRead += ReadLen; - ReadOffset += ReadLen; - } - - ExFreePool(PageBuf); - } - else - { - if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) - Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; - + bFreeBuffer = TRUE; + } + else + { + PageBuf = Buffer; + } Status = CdfsReadSectors(DeviceExt->StorageDevice, - Fcb->Entry.ExtentLocationL + (ReadOffset / BLOCKSIZE), - Length / BLOCKSIZE, - Buffer, + Fcb->Entry.ExtentLocationL + (ActualReadOffset / BLOCKSIZE), + nBlocks, + (PVOID)PageBuf, FALSE); - if (NT_SUCCESS(Status)) - { - *LengthRead = Length; - if (Length + ReadOffset > Fcb->Entry.DataLengthL) + + if(NT_SUCCESS(Status)) + { + *LengthRead = ToRead; + if(bFreeBuffer) { - memset(Buffer + Fcb->Entry.DataLengthL - ReadOffset, - 0, - Length + ReadOffset - Fcb->Entry.DataLengthL); + /* Copy what we've got */ + RtlCopyMemory(Buffer, PageBuf + (ReadOffset - ActualReadOffset), ToRead); } - } - } - + /* Zero out the rest */ + if(ToRead != Length) + RtlZeroMemory(Buffer + ToRead, Length - ToRead); + } + + if(bFreeBuffer) + ExFreePool(PageBuf); + } + return Status; }

12 years, 10 months

[ekohl] 54272: [UMPNPMGR] - Implement PNP_GetHwProfInfo. - Fix PNP_GetClassRegProp: Set the transfer length only in case of success.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 29 21:54:24 2011 New Revision: 54272 URL: http://svn.reactos.org/svn/reactos?rev=54272&view=rev Log: [UMPNPMGR] - Implement PNP_GetHwProfInfo. - Fix PNP_GetClassRegProp: Set the transfer length only in case of success. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat Oct 29 21:54:24 2011 @@ -1333,7 +1333,8 @@ } done:; - *pulTransferLen = (ret == CR_SUCCESS) ? *pulLength : 0; + if (ret == CR_SUCCESS) + *pulTransferLen = *pulLength; if (hPropKey != NULL) RegCloseKey(hPropKey); @@ -2145,8 +2146,128 @@ DWORD ulProfileInfoSize, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + WCHAR szProfileName[5]; + HKEY hKeyConfig = NULL; + HKEY hKeyProfiles = NULL; + HKEY hKeyProfile = NULL; + DWORD dwDisposition; + DWORD dwSize; + LONG lError; + CONFIGRET ret = CR_SUCCESS; + + UNREFERENCED_PARAMETER(hBinding); + + DPRINT("PNP_GetHwProfInfo() called\n"); + + if (ulProfileInfoSize == 0) + { + ret = CR_INVALID_DATA; + goto done; + } + + if (ulFlags != 0) + { + ret = CR_INVALID_FLAG; + goto done; + } + + /* Initialize the profile information */ + pHWProfileInfo->HWPI_ulHWProfile = 0; + pHWProfileInfo->HWPI_szFriendlyName[0] = 0; + pHWProfileInfo->HWPI_dwFlags = 0; + + /* Open the 'IDConfigDB' key */ + lError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\IDConfigDB", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_QUERY_VALUE, + NULL, + &hKeyConfig, + &dwDisposition); + if (lError != ERROR_SUCCESS) + { + ret = CR_REGISTRY_ERROR; + goto done; + } + + /* Open the 'Hardware Profiles' subkey */ + lError = RegCreateKeyExW(hKeyConfig, + L"Hardware Profiles", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + NULL, + &hKeyProfiles, + &dwDisposition); + if (lError != ERROR_SUCCESS) + { + ret = CR_REGISTRY_ERROR; + goto done; + } + + if (ulIndex == (ULONG)-1) + { + dwSize = sizeof(ULONG); + lError = RegQueryValueExW(hKeyConfig, + L"CurrentConfig", + NULL, + NULL, + (LPBYTE)&pHWProfileInfo->HWPI_ulHWProfile, + &dwSize); + if (lError != ERROR_SUCCESS) + { + pHWProfileInfo->HWPI_ulHWProfile = 0; + ret = CR_REGISTRY_ERROR; + goto done; + } + } + else + { + /* FIXME: not implemented yet */ + ret = CR_CALL_NOT_IMPLEMENTED; + goto done; + } + + swprintf(szProfileName, L"%04lu", pHWProfileInfo->HWPI_ulHWProfile); + + lError = RegOpenKeyExW(hKeyProfiles, + szProfileName, + 0, + KEY_QUERY_VALUE, + &hKeyProfile); + if (lError != ERROR_SUCCESS) + { + ret = CR_REGISTRY_ERROR; + goto done; + } + + dwSize = sizeof(pHWProfileInfo->HWPI_szFriendlyName); + lError = RegQueryValueExW(hKeyProfile, + L"FriendlyName", + NULL, + NULL, + (LPBYTE)&pHWProfileInfo->HWPI_szFriendlyName, + &dwSize); + if (lError != ERROR_SUCCESS) + { + ret = CR_REGISTRY_ERROR; + goto done; + } + +done: + if (hKeyProfile != NULL) + RegCloseKey(hKeyProfile); + + if (hKeyProfiles != NULL) + RegCloseKey(hKeyProfiles); + + if (hKeyConfig != NULL) + RegCloseKey(hKeyConfig); + + return ret; } @@ -2515,6 +2636,8 @@ handle_t hBinding, WORD *pwVersion) { + *pwVersion = 0x501; + return CR_SUCCESS; UNIMPLEMENTED; return CR_CALL_NOT_IMPLEMENTED; } @@ -3144,6 +3267,8 @@ case SERVICE_CONTROL_SHUTDOWN: DPRINT1(" SERVICE_CONTROL_SHUTDOWN received\n"); + /* Stop listening to RPC Messages */ + RpcMgmtStopServerListening(NULL); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS;

12 years, 10 months

[jgardou] 54271: [CDFS] - fix non cached reading when offset or length is not aligned on block size

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Oct 29 20:34:08 2011 New Revision: 54271 URL: http://svn.reactos.org/svn/reactos?rev=54271&view=rev Log: [CDFS] - fix non cached reading when offset or length is not aligned on block size Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] Sat Oct 29 20:34:08 2011 @@ -75,6 +75,8 @@ LARGE_INTEGER FileOffset; IO_STATUS_BLOCK IoStatus; CC_FILE_SIZES FileSizes; + + DPRINT("Using cache\n"); if (ReadOffset + Length > Fcb->Entry.DataLengthL) Length = Fcb->Entry.DataLengthL - ReadOffset; @@ -111,8 +113,7 @@ if ((ReadOffset % BLOCKSIZE) != 0 || (Length % BLOCKSIZE) != 0) { /* Then we need to do a partial or misaligned read ... */ - PVOID PageBuf = ExAllocatePool(NonPagedPool, BLOCKSIZE); - PCHAR ReadInPage = (PCHAR)PageBuf + (ReadOffset & (BLOCKSIZE - 1)); + PCHAR PageBuf = ExAllocatePool(NonPagedPool, BLOCKSIZE); PCHAR TargetRead = (PCHAR)Buffer; ULONG ActualReadOffset, EndOfExtent, ReadLen; @@ -121,7 +122,7 @@ return STATUS_NO_MEMORY; } - ActualReadOffset = ReadOffset & ~(BLOCKSIZE - 1); + ActualReadOffset = ROUND_DOWN(ReadOffset, BLOCKSIZE); EndOfExtent = ReadOffset + Length; while (ActualReadOffset < EndOfExtent) @@ -130,22 +131,23 @@ (DeviceExt->StorageDevice, Fcb->Entry.ExtentLocationL + (ActualReadOffset / BLOCKSIZE), 1, - PageBuf, + (PVOID)PageBuf, FALSE); if (!NT_SUCCESS(Status)) break; - ReadLen = BLOCKSIZE - (ActualReadOffset & (BLOCKSIZE - 1)); - if (ReadLen > EndOfExtent - ActualReadOffset) + ReadLen = BLOCKSIZE - (ReadOffset - ActualReadOffset); + if (ReadLen > EndOfExtent - ReadOffset) { - ReadLen = EndOfExtent - ActualReadOffset; + ReadLen = EndOfExtent - ReadOffset; } - - RtlCopyMemory(TargetRead, ReadInPage, ReadLen); - - ActualReadOffset += ReadLen; - TargetRead += ReadLen; + DPRINT("Copying %d bytes.\n", ReadLen); + RtlCopyMemory(TargetRead, PageBuf + (ReadOffset - ActualReadOffset), ReadLen); + + ActualReadOffset += BLOCKSIZE; + TargetRead += ReadLen; + ReadOffset += ReadLen; } ExFreePool(PageBuf);

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2011