Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[akhaldi] 53960: [PSDK] * Add some missing defines.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 3 15:17:57 2011 New Revision: 53960 URL: http://svn.reactos.org/svn/reactos?rev=53960&view=rev Log: [PSDK] * Add some missing defines. Modified: trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/winioctl.h trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Mon Oct 3 15:17:57 2011 @@ -104,6 +104,8 @@ #define LongToPtr( l ) ((VOID*)(LONG_PTR)((long)l)) #define ULongToPtr( ul ) ((VOID*)(ULONG_PTR)((unsigned long)ul)) #endif /* !_WIN64 */ + +#define HandleToULong(h) HandleToUlong(h) #define UlongToHandle(ul) ULongToHandle(ul) #define UlongToPtr(ul) ULongToPtr(ul) Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Mon Oct 3 15:17:57 2011 @@ -80,6 +80,8 @@ #define IOCTL_DISK_GET_MEDIA_TYPES CTL_CODE(IOCTL_DISK_BASE,0x300,METHOD_BUFFERED,FILE_ANY_ACCESS) #define IOCTL_DISK_UPDATE_DRIVE_SIZE CTL_CODE(IOCTL_DISK_BASE, 0x0032, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_SERIAL_LSRMST_INSERT CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define IOCTL_VOLUME_BASE ((DWORD)'V') +#define IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS CTL_CODE(IOCTL_VOLUME_BASE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_LOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,6,METHOD_BUFFERED,FILE_ANY_ACCESS) #define FSCTL_UNLOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,7,METHOD_BUFFERED,FILE_ANY_ACCESS) #define FSCTL_PIPE_IMPERSONATE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Mon Oct 3 15:17:57 2011 @@ -13,6 +13,9 @@ #define GEOID_NOT_AVAILABLE (-1) #define MAX_LEADBYTES 12 #define MAX_DEFAULTCHAR 2 + +#define LOCALE_ALL 0x00 + #define LOCALE_NOUSEROVERRIDE 0x80000000 #define LOCALE_USE_CP_ACP 0x40000000 #if (WINVER >= 0x0400) @@ -199,6 +202,7 @@ #define C1_BLANK 64 #define C1_XDIGIT 128 #define C1_ALPHA 256 +#define C1_DEFINED 512 #define C2_LEFTTORIGHT 1 #define C2_RIGHTTOLEFT 2 #define C2_EUROPENUMBER 3 @@ -473,6 +477,7 @@ typedef BOOL (CALLBACK *UILANGUAGE_ENUMPROCA)(LPSTR, LONG_PTR); typedef BOOL (CALLBACK *LOCALE_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *LOCALE_ENUMPROCW)(LPWSTR); +typedef BOOL (CALLBACK *LOCALE_ENUMPROCEX)(LPWSTR, DWORD, LPARAM); typedef BOOL (CALLBACK *CODEPAGE_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *CODEPAGE_ENUMPROCW)(LPWSTR); typedef BOOL (CALLBACK *DATEFMT_ENUMPROCA)(LPSTR);

12 years, 11 months

[akhaldi] 53959: [XDK/DDK/PSDK] * Fix a compiler (clang) warning.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 3 15:17:27 2011 New Revision: 53959 URL: http://svn.reactos.org/svn/reactos?rev=53959&view=rev Log: [XDK/DDK/PSDK] * Fix a compiler (clang) warning. Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/x86/ke.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5395… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Mon Oct 3 15:17:27 2011 @@ -7713,7 +7713,9 @@ VOID KeMemoryBarrier(VOID) { - volatile LONG Barrier; + LONG Barrier, *Dummy = &Barrier; + UNREFERENCED_LOCAL_VARIABLE(Dummy); + #if defined(__GNUC__) __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "%eax"); #elif defined(_MSC_VER) Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Mon Oct 3 15:17:27 2011 @@ -417,11 +417,6 @@ # define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type; #endif -#define UNREFERENCED_PARAMETER(P) {(P)=(P);} -#define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);} -#define DBG_UNREFERENCED_PARAMETER(P) -#define DBG_UNREFERENCED_LOCAL_VARIABLE(L) - #ifndef __WATCOMC__ #ifndef _export #define _export Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Oct 3 15:17:27 2011 @@ -66,6 +66,10 @@ #endif #endif /* __ANONYMOUS_DEFINED */ +#define UNREFERENCED_PARAMETER(P) {(P)=(P);} +#define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);} +#define DBG_UNREFERENCED_PARAMETER(P) +#define DBG_UNREFERENCED_LOCAL_VARIABLE(L) #ifndef DECLSPEC_ALIGN # if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS) @@ -5251,7 +5255,8 @@ VOID MemoryBarrier(VOID) { - LONG Barrier; + LONG Barrier, *Dummy = &Barrier; + UNREFERENCED_LOCAL_VARIABLE(Dummy); __asm__ __volatile__("xchgl %%eax, %[Barrier]" : : [Barrier] "m" (Barrier) : "memory"); } #endif Modified: trunk/reactos/include/xdk/x86/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/x86/ke.h?rev=5… ============================================================================== --- trunk/reactos/include/xdk/x86/ke.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/x86/ke.h [iso-8859-1] Mon Oct 3 15:17:27 2011 @@ -51,7 +51,9 @@ VOID KeMemoryBarrier(VOID) { - volatile LONG Barrier; + LONG Barrier, *Dummy = &Barrier; + UNREFERENCED_LOCAL_VARIABLE(Dummy); + #if defined(__GNUC__) __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "%eax"); #elif defined(_MSC_VER)

12 years, 11 months

[akhaldi] 53958: [HEADERS/CRT] * Work around an issue with clang and __debugbreak(). They mark __debugbreak as built-in (so we can't use ours) but it's not supported yet (so if we use nothing we ge...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 3 15:11:33 2011 New Revision: 53958 URL: http://svn.reactos.org/svn/reactos?rev=53958&view=rev Log: [HEADERS/CRT] * Work around an issue with clang and __debugbreak(). They mark __debugbreak as built-in (so we can't use ours) but it's not supported yet (so if we use nothing we get an error). Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Mon Oct 3 15:11:33 2011 @@ -1204,10 +1204,14 @@ } /*** Interrupts ***/ +#ifdef __clang__ +#define __debugbreak() __asm__("int $3") +#else __INTRIN_INLINE void __debugbreak(void) { __asm__("int $3"); } +#endif __INTRIN_INLINE void __int2c(void) {

12 years, 11 months

[tfaber] 53957: [MSAFD] - More consistent error handling in WSPConnect - Fix a DPRINT

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 3 15:01:48 2011 New Revision: 53957 URL: http://svn.reactos.org/svn/reactos?rev=53957&view=rev Log: [MSAFD] - More consistent error handling in WSPConnect - Fix a DPRINT Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Oct 3 15:01:48 2011 @@ -1434,6 +1434,7 @@ PAFD_CONNECT_INFO ConnectInfo; PSOCKET_INFORMATION Socket = NULL; NTSTATUS Status; + INT Errno; UCHAR ConnectBuffer[0x22]; ULONG ConnectDataLength; ULONG InConnectDataLength; @@ -1447,8 +1448,8 @@ 1, FALSE); - if( !NT_SUCCESS(Status) ) - return -1; + if (!NT_SUCCESS(Status)) + return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); AFD_DbgPrint(MID_TRACE,("Called\n")); @@ -1456,9 +1457,9 @@ Socket = GetSocketStructure(Handle); if (!Socket) { - NtClose(SockEvent); - *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; + NtClose(SockEvent); + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; } /* Bind us First */ @@ -1469,15 +1470,15 @@ BindAddress = HeapAlloc(GetProcessHeap(), 0, BindAddressLength); if (!BindAddress) { - MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); - return INVALID_SOCKET; + NtClose(SockEvent); + return MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); } Socket->HelperData->WSHGetWildcardSockaddr (Socket->HelperContext, BindAddress, &BindAddressLength); /* Bind it */ if (WSPBind(Handle, BindAddress, BindAddressLength, lpErrno) == SOCKET_ERROR) - return INVALID_SOCKET; + return SOCKET_ERROR; } /* Set the Connect Data */ @@ -1618,38 +1619,38 @@ /* FIXME: THIS IS NOT RIGHT!!! HACK HACK HACK! */ SockReenableAsyncSelectEvent(Socket, FD_CONNECT); - NtClose( SockEvent ); + NtClose(SockEvent); if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_CONNECT)) { - Status = Socket->HelperData->WSHNotify(Socket->HelperContext, - Socket->Handle, - Socket->TdiAddressHandle, - Socket->TdiConnectionHandle, - WSH_NOTIFY_CONNECT); - - if (Status) - { - if (lpErrno) *lpErrno = Status; + Errno = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_CONNECT); + + if (Errno) + { + if (lpErrno) *lpErrno = Errno; return SOCKET_ERROR; } } else if (Status != STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_CONNECT_ERROR)) { - Status = Socket->HelperData->WSHNotify(Socket->HelperContext, - Socket->Handle, - Socket->TdiAddressHandle, - Socket->TdiConnectionHandle, - WSH_NOTIFY_CONNECT_ERROR); - - if (Status) - { - if (lpErrno) *lpErrno = Status; + Errno = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_CONNECT_ERROR); + + if (Errno) + { + if (lpErrno) *lpErrno = Errno; return SOCKET_ERROR; } } - return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); + return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); } int WSPAPI Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Mon Oct 3 15:01:48 2011 @@ -495,7 +495,7 @@ } else { - DbgPrint("%s: Received invalid lpErrno pointer! %s\n", __FUNCTION__); + DbgPrint("%s: Received invalid lpErrno pointer!\n", __FUNCTION__); if (ReturnedBytes) *ReturnedBytes = (Status == STATUS_SUCCESS) ? Received : 0;

12 years, 11 months

[tkreuzer] 53956: [FREELDR] Implement new heap code. The code is much less complex than bget and allows to use allocation tags and releasing unused memory. Its not yet active.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 3 14:46:38 2011 New Revision: 53956 URL: http://svn.reactos.org/svn/reactos?rev=53956&view=rev Log: [FREELDR] Implement new heap code. The code is much less complex than bget and allows to use allocation tags and releasing unused memory. Its not yet active. Added: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c (with props) Added: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c (added) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Mon Oct 3 14:46:38 2011 @@ -1,0 +1,420 @@ +/* + * FreeLoader + * Copyright (C) 2011 Timo Kreuzer (timo.kreuzer(a)reactos.orh) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <freeldr.h> +#include <debug.h> + +DBG_DEFAULT_CHANNEL(HEAP); + +PVOID FrLdrDefaultHeap; +PVOID FrLdrTempHeap; + +typedef struct _HEAP_BLOCK +{ + USHORT Size; + USHORT PreviousSize; + ULONG Tag; + UCHAR Data[]; +} HEAP_BLOCK, *PHEAP_BLOCK; + +typedef struct _HEAP +{ + ULONG MaximumSize; + ULONG CurrentAllocBytes; + ULONG MaxAllocBytes; + ULONG NumAllocs; + ULONG NumFrees; + ULONG LargestAllocation; + HEAP_BLOCK Blocks; +} HEAP, *PHEAP; + +PVOID +HeapCreate( + ULONG MaximumSize, + TYPE_OF_MEMORY MemoryType) +{ + PHEAP Heap; + PHEAP_BLOCK Block; + ULONG Remaining; + USHORT PreviousSize; + TRACE("HeapCreate(MemoryType=%ld)\n", MemoryType); + + /* Allocate some memory for the heap */ + Heap = MmAllocateMemoryWithType(MaximumSize, MemoryType); + if (!Heap) + { + ERR("HEAP: Failed to allocate heap of size 0x%lx, Type\n", + MaximumSize, MemoryType); + return NULL; + } + + /* Initialize the heap header */ + Heap->MaximumSize = ALIGN_UP_BY(MaximumSize, MM_PAGE_SIZE); + Heap->CurrentAllocBytes = 0; + Heap->MaxAllocBytes = 0; + Heap->NumAllocs = 0; + Heap->NumFrees = 0; + Heap->LargestAllocation = 0; + + /* Calculate what's left to process */ + Remaining = (MaximumSize - sizeof(HEAP)) / sizeof(HEAP_BLOCK); + TRACE("Remaining = %ld\n", Remaining); + + /* Substract one for the terminating entry */ + Remaining--; + + Block = &Heap->Blocks; + PreviousSize = 0; + + /* Create free blocks */ + while (Remaining > 1) + { + /* Initialize this free block */ + Block->Size = (USHORT)min(MAXUSHORT, Remaining - 1); + Block->PreviousSize = PreviousSize; + Block->Tag = 0; + + /* Substract current block size from remainder */ + Remaining -= (Block->Size + 1); + + /* Go to next block */ + PreviousSize = Block->Size; + Block = Block + Block->Size + 1; + + TRACE("Remaining = %ld\n", Remaining); + } + + /* Now finish with a terminating block */ + Block->Size = 0; + Block->PreviousSize = PreviousSize; + Block->Tag = 'dnE#'; + + return Heap; +} + +VOID +HeapDestroy( + PVOID HeapHandle) +{ + PHEAP Heap = HeapHandle; + + /* Mark all pages free */ + MmMarkPagesInLookupTable(PageLookupTableAddress, + (ULONG_PTR)Heap / MM_PAGE_SIZE, + Heap->MaximumSize / MM_PAGE_SIZE, + LoaderFree); +} + +VOID +HeapRelease( + PVOID HeapHandle) +{ + PHEAP Heap = HeapHandle; + PHEAP_BLOCK Block; + PUCHAR StartAddress, EndAddress; + ULONG FreePages, AllFreePages = 0; + TRACE("HeapRelease(%p)\n", HeapHandle); + + /* Loop all heap chunks */ + for (Block = &Heap->Blocks; + Block->Size != 0; + Block = Block + 1 + Block->Size) + { + /* Continue, if its not free */ + if (Block->Tag != 0) continue; + + /* Calculate page aligned start address of the free region */ + StartAddress = ALIGN_UP_POINTER_BY(Block->Data, PAGE_SIZE); + + /* Walk over adjacent free blocks */ + while (Block->Tag == 0) Block = Block + Block->Size + 1; + + /* Check if this was the last block */ + if (Block->Size == 0) + { + /* Align the end address up to cover the end of the heap */ + EndAddress = ALIGN_DOWN_POINTER_BY(Block->Data, PAGE_SIZE); + } + else + { + /* Align the end address down to not cover any allocations */ + EndAddress = ALIGN_DOWN_POINTER_BY(Block->Data, PAGE_SIZE); + } + + FreePages = (EndAddress - StartAddress) / MM_PAGE_SIZE; + AllFreePages += FreePages; + + /* Now mark the pages free */ + MmMarkPagesInLookupTable(PageLookupTableAddress, + (ULONG_PTR)StartAddress / MM_PAGE_SIZE, + FreePages, + LoaderFree); + + /* bail out, if it was the last block */ + if (Block->Size == 0) break; + } + + TRACE("HeapRelease() done, freed %ld pages\n", AllFreePages); +} + +PVOID +HeapAllocate( + PVOID HeapHandle, + SIZE_T ByteSize, + ULONG Tag) +{ + PHEAP Heap = HeapHandle; + PHEAP_BLOCK Block, NextBlock; + USHORT BlockSize, Remaining; + + /* Check if the allocation is too large */ + if ((ByteSize + sizeof(HEAP_BLOCK)) > MAXUSHORT * sizeof(HEAP_BLOCK)) + { + ERR("HEAP: Allocation of 0x%lx bytes too large\n", ByteSize); + return NULL; + } + + /* We need a proper tag */ + if (Tag == 0) Tag = 'enoN'; + + /* Calculate alloc size */ + BlockSize = (USHORT)(ByteSize + sizeof(HEAP_BLOCK) - 1) / sizeof(HEAP_BLOCK); + + /* Loop all heap chunks */ + for (Block = &Heap->Blocks; + Block->Size != 0; + Block = Block + 1 + Block->Size) + { + /* Continue, if its not free */ + if (Block->Tag != 0) continue; + + /* Continue, if its too small */ + if (Block->Size < BlockSize) continue; + + /* This block is just fine, use it */ + Block->Tag = Tag; + + /* Calculate the remaining size */ + Remaining = Block->Size - BlockSize; + + /* Check if the remaining space is large enough for a new block */ + if (Remaining > 1) + { + /* Make the allocated block as large as neccessary */ + Block->Size = BlockSize; + + /* Get pointer to the new block */ + NextBlock = Block + 1 + BlockSize; + + /* Make it a free block */ + NextBlock->Size = Remaining - 1; + NextBlock->PreviousSize = BlockSize; + NextBlock->Tag = 0; + + /* Advance to the next block */ + BlockSize = NextBlock->Size; + NextBlock = NextBlock + 1 + BlockSize; + } + else + { + /* Not enough left, use the full block */ + NextBlock = Block + 1 + BlockSize; + } + + /* Update the next blocks back link */ + NextBlock->PreviousSize = Block->Size; + + /* Update heap usage */ + Heap->NumAllocs++; + Heap->CurrentAllocBytes += Block->Size * sizeof(HEAP_BLOCK); + Heap->MaxAllocBytes = max(Heap->MaxAllocBytes, Heap->CurrentAllocBytes); + Heap->LargestAllocation = max(Heap->LargestAllocation, + Block->Size * sizeof(HEAP_BLOCK)); + + TRACE("HeapAllocate(%p, %ld, %.4s) -> return %p\n", + HeapHandle, ByteSize, &Tag, Block->Data); + + /* Return pointer to the data */ + return Block->Data; + } + + /* We found nothing */ + WARN("HEAP: nothing suitable found for 0x%lx bytes\n", ByteSize); + return NULL; +} + +VOID +HeapFree( + PVOID HeapHandle, + PVOID Pointer, + ULONG Tag) +{ + PHEAP Heap = HeapHandle; + PHEAP_BLOCK Block, PrevBlock, NextBlock; + TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer); + ASSERT(Tag != 'dnE#'); + + /* Check if the block is really inside this heap */ + if ((Pointer < (PVOID)(Heap + 1)) || + (Pointer > (PVOID)((PUCHAR)Heap + Heap->MaximumSize))) + { + ERR("Bad free of %p from heap %p\n", Pointer, Heap); + ASSERT(FALSE); + } + + Block = ((PHEAP_BLOCK)Pointer) - 1; + + /* Check if the tag matches */ + if (Tag && Block->Tag != Tag) + { + ERR("HEAP: Bad tag! Pointer = %p: block tag '%.4s', requested '%.4s'\n", + Pointer, &Block->Tag, &Tag); + ASSERT(FALSE); + } + + /* Mark as free */ + Block->Tag = 0; + + /* Update heap usage */ + Heap->NumFrees++; + Heap->CurrentAllocBytes -= Block->Size * sizeof(HEAP_BLOCK); + + /* Get pointers to the next and previous block */ + PrevBlock = Block - Block->PreviousSize - 1; + NextBlock = Block + Block->Size + 1; + + /* Check if next block is free */ + if (NextBlock->Tag == 0) + { + /* Check if their combined size if small enough */ + if ((Block->Size + NextBlock->Size + 1) <= MAXUSHORT) + { + /* Merge next block into current */ + Block->Size += NextBlock->Size + 1; + NextBlock = Block + Block->Size + 1; + NextBlock->PreviousSize = Block->Size; + } + } + + /* Check if there is a block before and is free */ + if ((Block->PreviousSize != 0) && (PrevBlock->Tag == 0)) + { + /* Check if their combined size if small enough */ + if ((PrevBlock->Size + Block->Size + 2) < MAXUSHORT) + { + /* Merge current block into previous */ + PrevBlock->Size += Block->Size + 1; + NextBlock->PreviousSize = PrevBlock->Size; + } + } +} + + +/* Wrapper functions *********************************************************/ + +#define HEAP_SIZE_PROCESS_HEAP (1024 * 1024) + +VOID +MmInitializeHeap(PVOID PageLookupTable) +{ + TRACE("MmInitializeHeap()\n"); + + /* Create the process heap */ + FrLdrDefaultHeap = HeapCreate(HEAP_SIZE_PROCESS_HEAP, LoaderOsloaderHeap); + + /* Create the process heap */ + FrLdrTempHeap = HeapCreate(HEAP_SIZE_PROCESS_HEAP, LoaderFirmwareTemporary); + + /* Create the pool heap */ + TRACE("MmInitializeHeap() done\n"); + +} + +PVOID +MmHeapAlloc(ULONG MemorySize) +{ + return HeapAllocate(FrLdrDefaultHeap, MemorySize, 'pHmM'); +} + +VOID +MmHeapFree(PVOID MemoryPointer) +{ + HeapFree(FrLdrDefaultHeap, MemoryPointer, 'pHmM'); +} + + +#undef ExAllocatePoolWithTag +PVOID +NTAPI +ExAllocatePoolWithTag( + IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes, + IN ULONG Tag) +{ + return HeapAllocate(FrLdrDefaultHeap, NumberOfBytes, Tag); +} + +#undef ExFreePool +VOID +NTAPI +ExFreePool( + IN PVOID P) +{ + HeapFree(FrLdrDefaultHeap, P, 0); +} + +#undef ExFreePoolWithTag +VOID +NTAPI +ExFreePoolWithTag( + IN PVOID P, + IN ULONG Tag) +{ + HeapFree(FrLdrDefaultHeap, P, Tag); +} + +PVOID +NTAPI +RtlAllocateHeap( + IN PVOID HeapHandle, + IN ULONG Flags, + IN SIZE_T Size) +{ + PVOID ptr; + + ptr = HeapAllocate(FrLdrDefaultHeap, Size, ' ltR'); + if (ptr && (Flags & HEAP_ZERO_MEMORY)) + { + RtlZeroMemory(ptr, Size); + } + + return ptr; +} + +BOOLEAN +NTAPI +RtlFreeHeap( + IN PVOID HeapHandle, + IN ULONG Flags, + IN PVOID HeapBase) +{ + HeapFree(FrLdrDefaultHeap, HeapBase, ' ltR'); + return TRUE; +} + Propchange: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 11 months

[tfaber] 53955: [MSAFD/FORMATTING] - Trim trailing whitespace

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 3 14:40:39 2011 New Revision: 53955 URL: http://svn.reactos.org/svn/reactos?rev=53955&view=rev Log: [MSAFD/FORMATTING] - Trim trailing whitespace Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/dll/win32/msafd/misc/helpers.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c trunk/reactos/dll/win32/msafd/misc/stubs.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Oct 3 14:40:39 2011 @@ -43,8 +43,8 @@ * RETURNS: * Created socket, or INVALID_SOCKET if it could not be created */ -SOCKET -WSPAPI +SOCKET +WSPAPI WSPSocket(int AddressFamily, int SocketType, int Protocol, @@ -148,8 +148,8 @@ EABuffer->NextEntryOffset = 0; EABuffer->Flags = 0; EABuffer->EaNameLength = AFD_PACKET_COMMAND_LENGTH; - RtlCopyMemory (EABuffer->EaName, - AfdCommand, + RtlCopyMemory (EABuffer->EaName, + AfdCommand, AFD_PACKET_COMMAND_LENGTH + 1); EABuffer->EaValueLength = SizeOfPacket; @@ -157,7 +157,7 @@ AfdPacket = (PAFD_CREATE_PACKET)(EABuffer->EaName + EABuffer->EaNameLength + 1); AfdPacket->SizeOfTransportName = TransportName.Length; RtlCopyMemory (AfdPacket->TransportName, - TransportName.Buffer, + TransportName.Buffer, TransportName.Length + sizeof(WCHAR)); AfdPacket->GroupID = g; @@ -483,7 +483,7 @@ break; } - /* + /* * We have to execute a sleep, so it's kind of like * a block. If the socket is Nonblock, we cannot * go on since asyncronous operation is expected @@ -498,7 +498,7 @@ } /* Now we can sleep, and decrement the linger wait */ - /* + /* * FIXME: It seems Windows does some funky acceleration * since the waiting seems to be longer and longer. I * don't think this improves performance so much, so we @@ -515,7 +515,7 @@ { DisconnectInfo.Timeout = RtlConvertLongToLargeInteger(0); DisconnectInfo.DisconnectType = LingerWait < 0 ? AFD_DISCONNECT_SEND : AFD_DISCONNECT_ABORT; - + if (((DisconnectInfo.DisconnectType & AFD_DISCONNECT_SEND) && (!Socket->SharedData.SendShutdown)) || ((DisconnectInfo.DisconnectType & AFD_DISCONNECT_ABORT) && (!Socket->SharedData.ReceiveShutdown))) { @@ -530,7 +530,7 @@ sizeof(DisconnectInfo), NULL, 0); - + /* Wait for return */ if (Status == STATUS_PENDING) { @@ -709,7 +709,7 @@ return MsafdReturnWithErrno ( Status, lpErrno, 0, NULL ); } -int +int WSPAPI WSPListen(SOCKET Handle, int Backlog, @@ -813,7 +813,7 @@ BOOL HandleCounted; LARGE_INTEGER Timeout; - /* Find out how many sockets we have, and how large the buffer needs + /* Find out how many sockets we have, and how large the buffer needs * to be */ HandleCount = ( readfds ? readfds->fd_count : 0 ) + @@ -830,7 +830,7 @@ PollBufferSize = sizeof(*PollInfo) + ((HandleCount - 1) * sizeof(AFD_HANDLE)); - AFD_DbgPrint(MID_TRACE,("HandleCount: %u BufferSize: %u\n", + AFD_DbgPrint(MID_TRACE,("HandleCount: %u BufferSize: %u\n", HandleCount, PollBufferSize)); /* Convert Timeout to NT Format */ @@ -844,7 +844,7 @@ { Timeout = RtlEnlargedIntegerMultiply ((timeout->tv_sec * 1000) + (timeout->tv_usec / 1000), -10000); - /* Negative timeouts are illegal. Since the kernel represents an + /* Negative timeouts are illegal. Since the kernel represents an * incremental timeout as a negative number, we check for a positive * result. */ @@ -1010,7 +1010,7 @@ { switch( IOSB.Status ) { - case STATUS_SUCCESS: + case STATUS_SUCCESS: case STATUS_TIMEOUT: *lpErrno = 0; break; @@ -1027,7 +1027,7 @@ } SOCKET -WSPAPI +WSPAPI WSPAccept(SOCKET Handle, struct sockaddr *SocketAddress, int *SocketAddressLength, @@ -1128,7 +1128,7 @@ if (lpfnCondition != NULL) { - if ((Socket->SharedData.ServiceFlags1 & XP1_CONNECT_DATA) != 0) + if ((Socket->SharedData.ServiceFlags1 & XP1_CONNECT_DATA) != 0) { /* Find out how much data is pending */ PendingAcceptData.SequenceNumber = ListenReceiveData->SequenceNumber; @@ -1221,8 +1221,8 @@ } /* Set up Address in SOCKADDR Format */ - RtlCopyMemory (RemoteAddress, - &ListenReceiveData->Address.Address[0].AddressType, + RtlCopyMemory (RemoteAddress, + &ListenReceiveData->Address.Address[0].AddressType, sizeof(*RemoteAddress)); /* Build Caller ID */ @@ -1244,7 +1244,7 @@ } CalleeData.buf = CalleeDataBuffer; CalleeData.len = 4096; - } + } else { /* Nothing */ @@ -1369,7 +1369,7 @@ MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); return INVALID_SOCKET; } - + AcceptSocketInfo = GetSocketStructure(AcceptSocket); if (!AcceptSocketInfo) { @@ -1378,7 +1378,7 @@ MsafdReturnWithErrno( STATUS_INVALID_CONNECTION, lpErrno, 0, NULL ); return INVALID_SOCKET; } - + AcceptSocketInfo->SharedData.State = SocketConnected; /* Return Address in SOCKADDR FORMAT */ @@ -1420,7 +1420,7 @@ } int -WSPAPI +WSPAPI WSPConnect(SOCKET Handle, const struct sockaddr * SocketAddress, int SocketAddressLength, @@ -1472,8 +1472,8 @@ MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); return INVALID_SOCKET; } - Socket->HelperData->WSHGetWildcardSockaddr (Socket->HelperContext, - BindAddress, + Socket->HelperData->WSHGetWildcardSockaddr (Socket->HelperContext, + BindAddress, &BindAddressLength); /* Bind it */ if (WSPBind(Handle, BindAddress, BindAddressLength, lpErrno) == SOCKET_ERROR) @@ -1516,8 +1516,8 @@ SocketAddress->sa_data, SocketAddressLength - sizeof(SocketAddress->sa_family)); - /* - * Disable FD_WRITE and FD_CONNECT + /* + * Disable FD_WRITE and FD_CONNECT * The latter fixes a race condition where the FD_CONNECT is re-enabled * at the end of this function right after the Async Thread disables it. * This should only happen at the *next* WSPConnect @@ -1652,7 +1652,7 @@ return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); } int -WSPAPI +WSPAPI WSPShutdown(SOCKET Handle, int HowTo, LPINT lpErrno) @@ -1772,7 +1772,7 @@ } /* Allocate a buffer for the address */ - TdiAddressSize = + TdiAddressSize = sizeof(TRANSPORT_ADDRESS) + Socket->SharedData.SizeOfLocalAddress; TdiAddress = HeapAlloc(GlobalHeap, 0, TdiAddressSize); @@ -1812,7 +1812,7 @@ { Name->sa_family = SocketAddress->Address[0].AddressType; RtlCopyMemory (Name->sa_data, - SocketAddress->Address[0].Address, + SocketAddress->Address[0].Address, SocketAddress->Address[0].AddressLength); *NameLength = Socket->SharedData.SizeOfLocalAddress; AFD_DbgPrint (MID_TRACE, ("NameLength %d Address: %x Port %x\n", @@ -1917,7 +1917,7 @@ { Name->sa_family = SocketAddress->Address[0].AddressType; RtlCopyMemory (Name->sa_data, - SocketAddress->Address[0].Address, + SocketAddress->Address[0].Address, SocketAddress->Address[0].AddressLength); *NameLength = Socket->SharedData.SizeOfRemoteAddress; AFD_DbgPrint (MID_TRACE, ("NameLength %d Address: %s Port %x\n", @@ -1962,7 +1962,7 @@ *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } - + *lpcbBytesReturned = 0; switch( dwIoControlCode ) @@ -2011,7 +2011,7 @@ lpOverlapped, lpCompletionRoutine, (LPBOOL)&NeedsCompletion); - + if (*lpErrno != NO_ERROR) return SOCKET_ERROR; else @@ -2110,7 +2110,7 @@ *lpErrno = WSAEINVAL; return SOCKET_ERROR; } - + if (*OptionLength < BufferSize) { *lpErrno = WSAEFAULT; @@ -2296,11 +2296,11 @@ -int -GetSocketInformation(PSOCKET_INFORMATION Socket, - ULONG AfdInformationClass, +int +GetSocketInformation(PSOCKET_INFORMATION Socket, + ULONG AfdInformationClass, PBOOLEAN Boolean OPTIONAL, - PULONG Ulong OPTIONAL, + PULONG Ulong OPTIONAL, PLARGE_INTEGER LargeInteger OPTIONAL) { IO_STATUS_BLOCK IOSB; @@ -2363,11 +2363,11 @@ } -int -SetSocketInformation(PSOCKET_INFORMATION Socket, +int +SetSocketInformation(PSOCKET_INFORMATION Socket, ULONG AfdInformationClass, PBOOLEAN Boolean OPTIONAL, - PULONG Ulong OPTIONAL, + PULONG Ulong OPTIONAL, PLARGE_INTEGER LargeInteger OPTIONAL) { IO_STATUS_BLOCK IOSB; @@ -2469,11 +2469,11 @@ /* Create Context */ ContextData.SharedData = Socket->SharedData; ContextData.SizeOfHelperData = 0; - RtlCopyMemory (&ContextData.LocalAddress, - Socket->LocalAddress, + RtlCopyMemory (&ContextData.LocalAddress, + Socket->LocalAddress, Socket->SharedData.SizeOfLocalAddress); - RtlCopyMemory (&ContextData.RemoteAddress, - Socket->RemoteAddress, + RtlCopyMemory (&ContextData.RemoteAddress, + Socket->RemoteAddress, Socket->SharedData.SizeOfRemoteAddress); /* Send IOCTL */ @@ -2527,7 +2527,7 @@ AFD_DbgPrint(MID_TRACE,("Failed to create completion port\n")); return FALSE; } - /* Protect Handle */ + /* Protect Handle */ HandleFlags.ProtectFromClose = TRUE; HandleFlags.Inherit = FALSE; Status = NtSetInformationObject(SockAsyncCompletionPort, @@ -2570,7 +2570,7 @@ SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL); /* Do a KQUEUE/WorkItem Style Loop, thanks to IoCompletion Ports */ - do + do { Status = NtRemoveIoCompletion (SockAsyncCompletionPort, (PVOID*)&AsyncCompletionRoutine, @@ -2628,8 +2628,8 @@ NULL, 0); - /* - * Now Set up the Completion Port Information + /* + * Now Set up the Completion Port Information * This means that whenever a Poll is finished, the routine will be executed */ CompletionInfo.Port = SockAsyncCompletionPort; @@ -2873,7 +2873,7 @@ BOOL FreeContext = TRUE; PSOCKET_INFORMATION Socket; - /* Get the Socket */ + /* Get the Socket */ Socket = AsyncData->ParentSocket; /* If someone closed it, stop the function */ @@ -2925,7 +2925,7 @@ AsyncData = HeapAlloc(GetProcessHeap(), 0, sizeof(ASYNC_DATA)); if (!AsyncData) return; - /* Create the Asynch Thread if Needed */ + /* Create the Asynch Thread if Needed */ SockCreateOrReferenceAsyncThread(); /* Increase the sequence number to stop anything else */ Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Mon Oct 3 14:40:39 2011 @@ -12,12 +12,12 @@ #include <msafd.h> -int -WSPAPI +int +WSPAPI WSPEventSelect( - SOCKET Handle, - WSAEVENT hEventObject, - long lNetworkEvents, + SOCKET Handle, + WSAEVENT hEventObject, + long lNetworkEvents, LPINT lpErrno) { IO_STATUS_BLOCK IOSB; @@ -133,9 +133,9 @@ INT WSPAPI WSPEnumNetworkEvents( - IN SOCKET Handle, - IN WSAEVENT hEventObject, - OUT LPWSANETWORKEVENTS lpNetworkEvents, + IN SOCKET Handle, + IN WSAEVENT hEventObject, + OUT LPWSANETWORKEVENTS lpNetworkEvents, OUT LPINT lpErrno) { AFD_ENUM_NETWORK_EVENTS_INFO EnumReq; @@ -193,7 +193,7 @@ return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); AFD_DbgPrint(MID_TRACE,("Closed event\n")); - AFD_DbgPrint(MID_TRACE,("About to touch struct at %x (%d)\n", + AFD_DbgPrint(MID_TRACE,("About to touch struct at %x (%d)\n", lpNetworkEvents, sizeof(*lpNetworkEvents))); lpNetworkEvents->lNetworkEvents = 0; @@ -221,13 +221,13 @@ lpNetworkEvents->iErrorCode[FD_ACCEPT_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_ACCEPT_BIT]); } - if (EnumReq.PollEvents & + if (EnumReq.PollEvents & (AFD_EVENT_CONNECT | AFD_EVENT_CONNECT_FAIL)) { lpNetworkEvents->lNetworkEvents |= FD_CONNECT; lpNetworkEvents->iErrorCode[FD_CONNECT_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_CONNECT_BIT]); } - if (EnumReq.PollEvents & + if (EnumReq.PollEvents & (AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE)) { lpNetworkEvents->lNetworkEvents |= FD_CLOSE; lpNetworkEvents->iErrorCode[FD_CLOSE_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_CLOSE_BIT]); Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/helpe… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] Mon Oct 3 14:40:39 2011 @@ -15,16 +15,16 @@ LIST_ENTRY HelperDLLDatabaseListHead; -INT +INT SockGetTdiName( - PINT AddressFamily, - PINT SocketType, - PINT Protocol, - GROUP Group, - DWORD Flags, - PUNICODE_STRING TransportName, - PVOID *HelperDllContext, - PHELPER_DATA *HelperDllData, + PINT AddressFamily, + PINT SocketType, + PINT Protocol, + GROUP Group, + DWORD Flags, + PUNICODE_STRING TransportName, + PVOID *HelperDllContext, + PHELPER_DATA *HelperDllData, PDWORD Events) { PHELPER_DATA HelperData; @@ -38,15 +38,15 @@ /* Check in our Current Loaded Helpers */ for (Helpers = SockHelpersListHead.Flink; - Helpers != &SockHelpersListHead; + Helpers != &SockHelpersListHead; Helpers = Helpers->Flink ) { HelperData = CONTAINING_RECORD(Helpers, HELPER_DATA, Helpers); /* See if this Mapping works for us */ - if (SockIsTripleInMapping (HelperData->Mapping, - *AddressFamily, - *SocketType, + if (SockIsTripleInMapping (HelperData->Mapping, + *AddressFamily, + *SocketType, *Protocol)) { /* Call the Helper Dll function get the Transport Name */ @@ -86,16 +86,16 @@ AFD_DbgPrint(MIN_TRACE, ("Can't get transport list\n")); return Status; } - + /* Loop through each transport until we find one that can satisfy us */ - for (Transport = Transports; - *Transports != 0; + for (Transport = Transports; + *Transports != 0; Transport += wcslen(Transport) + 1) { AFD_DbgPrint(MID_TRACE, ("Transport: %S\n", Transports)); /* See what mapping this Transport supports */ Status = SockLoadTransportMapping(Transport, &Mapping); - + /* Check for error */ if (Status) { AFD_DbgPrint(MIN_TRACE, ("Can't get mapping\n")); @@ -146,7 +146,7 @@ /*HeapFree(GlobalHeap, 0, Mapping);*/ return NO_ERROR; } - + HeapFree(GlobalHeap, 0, Mapping); } HeapFree(GlobalHeap, 0, Transports); @@ -155,7 +155,7 @@ INT SockLoadTransportMapping( - PWSTR TransportName, + PWSTR TransportName, PWINSOCK_MAPPING *Mapping) { PWSTR TransportKey; @@ -211,7 +211,7 @@ /* Read the Mapping */ Status = RegQueryValueExW(KeyHandle, L"Mapping", NULL, NULL, (LPBYTE)*Mapping, &MappingSize); - + /* Check for error */ if (Status) { AFD_DbgPrint(MIN_TRACE, ("Error reading transport mapping registry\n")); @@ -224,7 +224,7 @@ return 0; } -INT +INT SockLoadTransportList( PWSTR *TransportList) { @@ -233,12 +233,12 @@ LONG Status; AFD_DbgPrint(MID_TRACE,("Called\n")); - + /* Open the Transports Key */ Status = RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\Winsock\\Parameters", - 0, - KEY_READ, + L"SYSTEM\\CurrentControlSet\\Services\\Winsock\\Parameters", + 0, + KEY_READ, &KeyHandle); /* Check for error */ @@ -246,7 +246,7 @@ AFD_DbgPrint(MIN_TRACE, ("Error reading transport list registry\n")); return WSAEINVAL; } - + /* Get the Transport List Size */ Status = RegQueryValueExW(KeyHandle, L"Transports", @@ -271,11 +271,11 @@ } /* Get the Transports */ - Status = RegQueryValueExW (KeyHandle, - L"Transports", - NULL, - NULL, - (LPBYTE)*TransportList, + Status = RegQueryValueExW (KeyHandle, + L"Transports", + NULL, + NULL, + (LPBYTE)*TransportList, &TransportListSize); /* Check for error */ @@ -292,8 +292,8 @@ INT SockLoadHelperDll( - PWSTR TransportName, - PWINSOCK_MAPPING Mapping, + PWSTR TransportName, + PWINSOCK_MAPPING Mapping, PHELPER_DATA *HelperDllData) { PHELPER_DATA HelperData; @@ -303,7 +303,7 @@ HKEY KeyHandle; ULONG DataSize; LONG Status; - + /* Allocate space for the Helper Structure and TransportName */ HelperData = HeapAlloc(GlobalHeap, 0, sizeof(*HelperData) + (wcslen(TransportName) + 1) * sizeof(WCHAR)); @@ -312,10 +312,10 @@ AFD_DbgPrint(MIN_TRACE, ("Buffer allocation failed\n")); return WSAEINVAL; } - + /* Allocate Space for the Helper DLL Key */ HelperKey = HeapAlloc(GlobalHeap, 0, (54 + wcslen(TransportName)) * sizeof(WCHAR)); - + /* Check for error */ if (HelperKey == NULL) { AFD_DbgPrint(MIN_TRACE, ("Buffer allocation failed\n")); @@ -339,37 +339,37 @@ HeapFree(GlobalHeap, 0, HelperData); return WSAEINVAL; } - + /* Read Size of SockAddr Structures */ DataSize = sizeof(HelperData->MinWSAddressLength); HelperData->MinWSAddressLength = 16; - RegQueryValueExW (KeyHandle, - L"MinSockaddrLength", - NULL, - NULL, - (LPBYTE)&HelperData->MinWSAddressLength, + RegQueryValueExW (KeyHandle, + L"MinSockaddrLength", + NULL, + NULL, + (LPBYTE)&HelperData->MinWSAddressLength, &DataSize); DataSize = sizeof(HelperData->MinWSAddressLength); HelperData->MaxWSAddressLength = 16; - RegQueryValueExW (KeyHandle, - L"MaxSockaddrLength", - NULL, - NULL, - (LPBYTE)&HelperData->MaxWSAddressLength, + RegQueryValueExW (KeyHandle, + L"MaxSockaddrLength", + NULL, + NULL, + (LPBYTE)&HelperData->MaxWSAddressLength, &DataSize); /* Size of TDI Structures */ HelperData->MinTDIAddressLength = HelperData->MinWSAddressLength + 6; HelperData->MaxTDIAddressLength = HelperData->MaxWSAddressLength + 6; - + /* Read Delayed Acceptance Setting */ DataSize = sizeof(DWORD); HelperData->UseDelayedAcceptance = FALSE; - RegQueryValueExW (KeyHandle, - L"UseDelayedAcceptance", - NULL, - NULL, - (LPBYTE)&HelperData->UseDelayedAcceptance, + RegQueryValueExW (KeyHandle, + L"UseDelayedAcceptance", + NULL, + NULL, + (LPBYTE)&HelperData->UseDelayedAcceptance, &DataSize); /* Allocate Space for the Helper DLL Names */ @@ -383,7 +383,7 @@ } FullHelperDllName = HeapAlloc(GlobalHeap, 0, 512); - + /* Check for error */ if (FullHelperDllName == NULL) { AFD_DbgPrint(MIN_TRACE, ("Buffer allocation failed\n")); @@ -394,11 +394,11 @@ /* Get the name of the Helper DLL*/ DataSize = 512; - Status = RegQueryValueExW (KeyHandle, - L"HelperDllName", - NULL, - NULL, - (LPBYTE)HelperDllName, + Status = RegQueryValueExW (KeyHandle, + L"HelperDllName", + NULL, + NULL, + (LPBYTE)HelperDllName, &DataSize); /* Check for error */ @@ -412,7 +412,7 @@ /* Get the Full name, expanding Environment Strings */ ExpandEnvironmentStringsW (HelperDllName, - FullHelperDllName, + FullHelperDllName, 256); /* Load the DLL */ @@ -443,7 +443,7 @@ HelperData->WSHNotify = (PWSH_NOTIFY) GetProcAddress(HelperData->hInstance, "WSHNotify"); HelperData->WSHGetSocketInformation = (PWSH_GET_SOCKET_INFORMATION) - GetProcAddress(HelperData->hInstance, + GetProcAddress(HelperData->hInstance, "WSHGetSocketInformation"); HelperData->WSHSetSocketInformation = (PWSH_SET_SOCKET_INFORMATION) GetProcAddress(HelperData->hInstance, @@ -484,14 +484,14 @@ BOOL SockIsTripleInMapping( - PWINSOCK_MAPPING Mapping, - INT AddressFamily, - INT SocketType, + PWINSOCK_MAPPING Mapping, + INT AddressFamily, + INT SocketType, INT Protocol) { /* The Windows version returns more detailed information on which of the 3 parameters failed...we should do this later */ ULONG Row; - + AFD_DbgPrint(MID_TRACE,("Called, Mapping rows = %d\n", Mapping->Rows)); /* Loop through Mapping to Find a matching one */ @@ -503,8 +503,8 @@ (INT)Mapping->Mapping[Row].Protocol)); /* Check of all three values Match */ - if (((INT)Mapping->Mapping[Row].AddressFamily == AddressFamily) && - ((INT)Mapping->Mapping[Row].SocketType == SocketType) && + if (((INT)Mapping->Mapping[Row].AddressFamily == AddressFamily) && + ((INT)Mapping->Mapping[Row].SocketType == SocketType) && ((INT)Mapping->Mapping[Row].Protocol == Protocol)) { AFD_DbgPrint(MID_TRACE,("Found\n")); return TRUE; Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Oct 3 14:40:39 2011 @@ -55,7 +55,7 @@ } } - /* Create the Asynch Thread if Needed */ + /* Create the Asynch Thread if Needed */ SockCreateOrReferenceAsyncThread(); /* Open a Handle to AFD's Async Helper */ @@ -91,7 +91,7 @@ } -int +int WSPAPI WSPRecv(SOCKET Handle, LPWSABUF lpBuffers, @@ -167,7 +167,7 @@ APCFunction = NULL; Event = SockEvent; IOSB = &DummyIOSB; - } + } else { if (lpCompletionRoutine == NULL) @@ -225,7 +225,7 @@ case STATUS_RECEIVE_EXPEDITED: *ReceiveFlags = MSG_OOB; break; - case STATUS_RECEIVE_PARTIAL_EXPEDITED: + case STATUS_RECEIVE_PARTIAL_EXPEDITED: *ReceiveFlags = MSG_PARTIAL | MSG_OOB; break; case STATUS_RECEIVE_PARTIAL: @@ -246,18 +246,18 @@ return MsafdReturnWithErrno ( Status, lpErrno, IOSB->Information, lpNumberOfBytesRead ); } -int -WSPAPI -WSPRecvFrom(SOCKET Handle, - LPWSABUF lpBuffers, - DWORD dwBufferCount, - LPDWORD lpNumberOfBytesRead, - LPDWORD ReceiveFlags, - struct sockaddr *SocketAddress, - int *SocketAddressLength, - LPWSAOVERLAPPED lpOverlapped, - LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - LPWSATHREADID lpThreadId, +int +WSPAPI +WSPRecvFrom(SOCKET Handle, + LPWSABUF lpBuffers, + DWORD dwBufferCount, + LPDWORD lpNumberOfBytesRead, + LPDWORD ReceiveFlags, + struct sockaddr *SocketAddress, + int *SocketAddressLength, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + LPWSATHREADID lpThreadId, LPINT lpErrno ) { PIO_STATUS_BLOCK IOSB; @@ -277,7 +277,7 @@ *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } - + if (!(Socket->SharedData.ServiceFlags1 & XP1_CONNECTIONLESS)) { /* Call WSPRecv for a non-datagram socket */ @@ -313,7 +313,7 @@ } else { - if (*ReceiveFlags & MSG_OOB) + if (*ReceiveFlags & MSG_OOB) { RecvInfo.TdiFlags |= TDI_RECEIVE_EXPEDITED; } @@ -331,7 +331,7 @@ /* Verifiy if we should use APC */ - if (lpOverlapped == NULL) + if (lpOverlapped == NULL) { /* Not using Overlapped structure, so use normal blocking on event */ APCContext = NULL; @@ -390,7 +390,7 @@ { case STATUS_RECEIVE_EXPEDITED: *ReceiveFlags = MSG_OOB; break; - case STATUS_RECEIVE_PARTIAL_EXPEDITED: + case STATUS_RECEIVE_PARTIAL_EXPEDITED: *ReceiveFlags = MSG_PARTIAL | MSG_OOB; break; case STATUS_RECEIVE_PARTIAL: @@ -413,7 +413,7 @@ int -WSPAPI +WSPAPI WSPSend(SOCKET Handle, LPWSABUF lpBuffers, DWORD dwBufferCount, @@ -536,7 +536,7 @@ return MsafdReturnWithErrno( Status, lpErrno, IOSB->Information, lpNumberOfBytesSent ); } -int +int WSPAPI WSPSendTo(SOCKET Handle, LPWSABUF lpBuffers, @@ -570,7 +570,7 @@ *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } - + if (!(Socket->SharedData.ServiceFlags1 & XP1_CONNECTIONLESS)) { /* Use WSPSend for connection-oriented sockets */ Modified: trunk/reactos/dll/win32/msafd/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] Mon Oct 3 14:40:39 2011 @@ -69,9 +69,9 @@ BOOL WSPAPI WSPGetQOSByName( - IN SOCKET s, - IN OUT LPWSABUF lpQOSName, - OUT LPQOS lpQOS, + IN SOCKET s, + IN OUT LPWSABUF lpQOSName, + OUT LPQOS lpQOS, OUT LPINT lpErrno) { UNIMPLEMENTED Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Mon Oct 3 14:40:39 2011 @@ -148,17 +148,17 @@ INT WSPAPI WSPAsyncSelect( - IN SOCKET s, - IN HWND hWnd, - IN UINT wMsg, - IN LONG lEvent, + IN SOCKET s, + IN HWND hWnd, + IN UINT wMsg, + IN LONG lEvent, OUT LPINT lpErrno); INT WSPAPI WSPBind( IN SOCKET s, - IN CONST SOCKADDR *name, - IN INT namelen, + IN CONST SOCKADDR *name, + IN INT namelen, OUT LPINT lpErrno); INT @@ -200,9 +200,9 @@ INT WSPAPI WSPEnumNetworkEvents( - IN SOCKET s, - IN WSAEVENT hEventObject, - OUT LPWSANETWORKEVENTS lpNetworkEvents, + IN SOCKET s, + IN WSAEVENT hEventObject, + OUT LPWSANETWORKEVENTS lpNetworkEvents, OUT LPINT lpErrno); INT @@ -226,17 +226,17 @@ INT WSPAPI WSPGetPeerName( - IN SOCKET s, - OUT LPSOCKADDR name, - IN OUT LPINT namelen, + IN SOCKET s, + OUT LPSOCKADDR name, + IN OUT LPINT namelen, OUT LPINT lpErrno); BOOL WSPAPI WSPGetQOSByName( - IN SOCKET s, - IN OUT LPWSABUF lpQOSName, - OUT LPQOS lpQOS, + IN SOCKET s, + IN OUT LPWSABUF lpQOSName, + OUT LPQOS lpQOS, OUT LPINT lpErrno); INT @@ -443,7 +443,7 @@ PVOID ThreadParam ); -VOID +VOID SockProcessAsyncSelect( PSOCKET_INFORMATION Socket, PASYNC_DATA AsyncData @@ -476,7 +476,7 @@ ); typedef VOID (*PASYNC_COMPLETION_ROUTINE)(PVOID Context, PIO_STATUS_BLOCK IoStatusBlock); - + DWORD FORCEINLINE MsafdReturnWithErrno(NTSTATUS Status,

12 years, 11 months

[akhaldi] 53954: [GDI32_WINETEST] * Skip some parts of bitmap test to allow Testman to handle it. See issue #6527 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 3 14:13:41 2011 New Revision: 53954 URL: http://svn.reactos.org/svn/reactos?rev=53954&view=rev Log: [GDI32_WINETEST] * Skip some parts of bitmap test to allow Testman to handle it. See issue #6527 for more details. Modified: trunk/rostests/winetests/gdi32/bitmap.c Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… ============================================================================== --- trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] Mon Oct 3 14:13:41 2011 @@ -820,11 +820,11 @@ BITMAPINFO *bi = (BITMAPINFO *)buffer; char data[256]; void *bits; - int planes, bpp, compr; + //int planes, bpp, compr; HBITMAP hdib, hbmp; HDC hdc, memdc; UINT ret; - BOOL expect_ok, todo; + //BOOL expect_ok, todo; hdc = GetDC( 0 ); memdc = CreateCompatibleDC( 0 ); @@ -832,6 +832,7 @@ memset( data, 0xaa, sizeof(data) ); +#if 0 // FIXME: ReactOS Bug 6527 for (bpp = 0; bpp <= 64; bpp++) { for (planes = 0; planes <= 64; planes++) @@ -993,6 +994,7 @@ } } } +#endif memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

12 years, 11 months

[ekohl] 53953: [UMPNPMGR] Implement PNP_GetCustomDevProp().

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Oct 3 13:51:00 2011 New Revision: 53953 URL: http://svn.reactos.org/svn/reactos?rev=53953&view=rev Log: [UMPNPMGR] Implement PNP_GetCustomDevProp(). 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] Mon Oct 3 13:51:00 2011 @@ -2427,8 +2427,86 @@ PNP_RPC_STRING_LEN *pulLength, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + HKEY hDeviceKey = NULL; + HKEY hParamKey = NULL; + LONG lError; + CONFIGRET ret = CR_SUCCESS; + + UNREFERENCED_PARAMETER(hBinding); + + DPRINT("PNP_GetCustomDevProp() called\n"); + + if (pulTransferLen == NULL || pulLength == NULL) + { + ret = CR_INVALID_POINTER; + goto done; + } + + if (ulFlags & ~CM_CUSTOMDEVPROP_BITS) + { + ret = CR_INVALID_FLAG; + goto done; + } + + if (*pulLength < *pulTransferLen) + *pulLength = *pulTransferLen; + + *pulTransferLen = 0; + + lError = RegOpenKeyExW(hEnumKey, + pDeviceID, + 0, + KEY_READ, + &hDeviceKey); + if (lError != ERROR_SUCCESS) + { + ret = CR_REGISTRY_ERROR; + goto done; + } + + lError = RegOpenKeyExW(hDeviceKey, + L"Device Parameters", + 0, + KEY_READ, + &hParamKey); + if (lError != ERROR_SUCCESS) + { + ret = CR_REGISTRY_ERROR; + goto done; + } + + lError = RegQueryValueExW(hParamKey, + CustomPropName, + NULL, + pulRegDataType, + Buffer, + pulLength); + if (lError != ERROR_SUCCESS) + { + if (lError == ERROR_MORE_DATA) + { + ret = CR_BUFFER_SMALL; + } + else + { + *pulLength = 0; + ret = CR_NO_SUCH_VALUE; + } + } + +done:; + if (ret == CR_SUCCESS) + *pulTransferLen = *pulLength; + + if (hParamKey != NULL) + RegCloseKey(hParamKey); + + if (hDeviceKey != NULL) + RegCloseKey(hDeviceKey); + + DPRINT("PNP_GetCustomDevProp() done (returns %lx)\n", ret); + + return ret; }

12 years, 11 months

[gadamopoulos] 53952: [main.cpl] - Add the icons for the fonts and administrator tools in the same id and index with windows

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 3 11:02:43 2011 New Revision: 53952 URL: http://svn.reactos.org/svn/reactos?rev=53952&view=rev Log: [main.cpl] - Add the icons for the fonts and administrator tools in the same id and index with windows Added: trunk/reactos/dll/cpl/main/resources/admintools_folder.ico - copied unchanged from r53916, trunk/reactos/dll/win32/shell32/res/icons/36.ico trunk/reactos/dll/cpl/main/resources/fonts_folder.ico - copied unchanged from r53916, trunk/reactos/dll/win32/shell32/res/icons/39.ico Modified: trunk/reactos/dll/cpl/main/main.rc trunk/reactos/dll/cpl/main/resource.h Modified: trunk/reactos/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=5… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/main.rc [iso-8859-1] Mon Oct 3 11:02:43 2011 @@ -20,6 +20,8 @@ IDI_MOUSE_SPEED ICON "resources/mouse_speed.ico" IDI_MOUSE_BUTTON ICON "resources/mouse_button.ico" IDI_MOUSE_TRAILS ICON "resources/mouse_trails.ico" +IDI_FONTS_FOLDER ICON "resources/fonts_folder.ico" +IDI_ADMIN_TOOLS_FOLDER ICON "resources/admintools_folder.ico" IDI_MOUSE_POINTER ICON "resources/mouse_pointer.ico" IDI_MOUSE_WHEEL ICON "resources/mouse_wheel.ico" IDI_REPEAT_RATE ICON "resources/repeat_rate.ico" Modified: trunk/reactos/dll/cpl/main/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/main/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/resource.h [iso-8859-1] Mon Oct 3 11:02:43 2011 @@ -1,6 +1,7 @@ #pragma once /* Icons */ + #define IDC_CPLICON_1 100 #define IDC_CPLICON_2 200 @@ -11,11 +12,13 @@ #define IDI_MOUSE_SPEED 205 #define IDI_MOUSE_BUTTON 206 #define IDI_MOUSE_TRAILS 207 -#define IDI_MOUSE_POINTER 208 -#define IDI_MOUSE_WHEEL 209 -#define IDI_REPEAT_RATE 210 -#define IDI_REPEAT_DELAY 211 -#define IDI_LOOK_KEY 212 +#define IDI_FONTS_FOLDER 400 +#define IDI_ADMIN_TOOLS_FOLDER 500 +#define IDI_MOUSE_POINTER 600 +#define IDI_MOUSE_WHEEL 601 +#define IDI_REPEAT_RATE 602 +#define IDI_REPEAT_DELAY 603 +#define IDI_LOOK_KEY 604 #define IDD_PAGE_BUTTON 101 #define IDD_PAGE_POINTER 102

12 years, 11 months

[gadamopoulos] 53951: [shell32] - Add two dummy icons for id 26 and 27. Now trying to load the recycle bin icon by index works

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 3 09:40:55 2011 New Revision: 53951 URL: http://svn.reactos.org/svn/reactos?rev=53951&view=rev Log: [shell32] - Add two dummy icons for id 26 and 27. Now trying to load the recycle bin icon by index works Modified: trunk/reactos/dll/win32/shell32/icon_res.rc Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Mon Oct 3 09:40:55 2011 @@ -23,6 +23,8 @@ IDI_SHELL_SEARCH ICON "res/icons/23.ico" IDI_SHELL_HELP ICON "res/icons/24.ico" IDI_SHELL_RUN ICON "res/icons/25.ico" +26 ICON "res/icons/1.ico" +27 ICON "res/icons/1.ico" IDI_SHELL_SHUTDOWN ICON "res/icons/28.ico" IDI_SHELL_SHARE ICON "res/icons/29.ico" IDI_SHELL_SHORTCUT ICON "res/icons/30.ico"

12 years, 11 months

← Newer
1
...
30
31
32
33
34
35
36
37
Older →

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