Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[tkreuzer] 52315: [test.h] Fix a warning on MSVC
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 14:08:41 2011 New Revision: 52315 URL: http://svn.reactos.org/svn/reactos?rev=52315&view=rev Log: [test.h] Fix a warning on MSVC Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Fri Jun 17 14:08:41 2011 @@ -488,7 +488,7 @@ case '\\': *dst++ = '\\'; *dst++ = '\\'; break; default: if (c >= ' ' && c <= 126) - *dst++ = c; + *dst++ = (char)c; else { *dst++ = '\\';

1 0

[tkreuzer] 52314: [QUARTZ_WINETEST] Link to uuid. Fixes msvc build
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 13:59:21 2011 New Revision: 52314 URL: http://svn.reactos.org/svn/reactos?rev=52314&view=rev Log: [QUARTZ_WINETEST] Link to uuid. Fixes msvc build Modified: trunk/rostests/winetests/quartz/CMakeLists.txt Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis… ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Fri Jun 17 13:59:21 2011 @@ -15,7 +15,7 @@ testlist.c) add_executable(quartz_winetest ${SOURCE}) -target_link_libraries(quartz_winetest wine) +target_link_libraries(quartz_winetest wine uuid) set_module_type(quartz_winetest win32cui) add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin FOR all)

1 0

[cmihail] 52313: [IP] Fix memory leak caused by socket context overwriting when accepting a new connection.
by cmihail＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: cmihail Date: Fri Jun 17 13:39:28 2011 New Revision: 52313 URL: http://svn.reactos.org/svn/reactos?rev=52313&view=rev Log: [IP] Fix memory leak caused by socket context overwriting when accepting a new connection. Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Fri Jun 17 13:39:28 2011 @@ -48,6 +48,13 @@ static VOID +SocketContextCloseWorker(PVOID Context) +{ + LibTCPClose(Context); +} + +static +VOID CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket, BOOLEAN Synchronous) { ReferenceObject(Connection); @@ -96,6 +103,7 @@ Bucket->Status = Status; Bucket->Information = 0; + //DereferenceObject(Bucket->AssociatedEndpoint); CompleteBucket(Connection, Bucket, TRUE); } @@ -146,6 +154,7 @@ PIRP Irp; NTSTATUS Status; KIRQL OldIrql; + void *OldSocketContext; DbgPrint("[IP, TCPAcceptEventHandler] Called\n"); @@ -183,6 +192,10 @@ newpcb->identifier); LockObject(Bucket->AssociatedEndpoint, &OldIrql); + + /* free previously created socket context (we don't use it, we use newpcb) */ + //LibTCPClose(Bucket->AssociatedEndpoint->SocketContext); + OldSocketContext = Bucket->AssociatedEndpoint->SocketContext; Bucket->AssociatedEndpoint->SocketContext = newpcb; LibTCPAccept(newpcb, @@ -199,6 +212,10 @@ } DereferenceObject(Connection); + + /* free socket context created in FileOpenConnection, as we're using a new + one; we free it asynchornously because otherwise we create a dedlock */ + ChewCreate(SocketContextCloseWorker, OldSocketContext); } VOID

1 0

[tkreuzer] 52312: [SHDOCVW_WINETEST] Link to uuid. Fixes build with MSVC
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 13:08:11 2011 New Revision: 52312 URL: http://svn.reactos.org/svn/reactos?rev=52312&view=rev Log: [SHDOCVW_WINETEST] Link to uuid. Fixes build with MSVC Modified: trunk/rostests/winetests/shdocvw/CMakeLists.txt Modified: trunk/rostests/winetests/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shdocvw/CMakeLists.txt [iso-8859-1] Fri Jun 17 13:08:11 2011 @@ -11,7 +11,7 @@ testlist.c) add_executable(shdocvw_winetest ${SOURCE}) -target_link_libraries(shdocvw_winetest wine) +target_link_libraries(shdocvw_winetest wine uuid) set_module_type(shdocvw_winetest win32cui) add_importlibs(shdocvw_winetest gdi32 shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET shdocvw_winetest DESTINATION reactos/bin FOR all)

1 0

[sir_richard] 52311: Patch by Anton Yarotsky: [SACDRV]: Implement memory manager. [SACDRV]: Define debugging macros.
by sir_richard＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: sir_richard Date: Fri Jun 17 12:54:05 2011 New Revision: 52311 URL: http://svn.reactos.org/svn/reactos?rev=52311&view=rev Log: Patch by Anton Yarotsky: [SACDRV]: Implement memory manager. [SACDRV]: Define debugging macros. Modified: trunk/reactos/drivers/sac/driver/data.c trunk/reactos/drivers/sac/driver/memory.c trunk/reactos/drivers/sac/driver/sacdrv.h Modified: trunk/reactos/drivers/sac/driver/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/data.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] Fri Jun 17 12:54:05 2011 @@ -11,6 +11,8 @@ #include "sacdrv.h" /* GLOBALS ********************************************************************/ + +ULONG SACDebug; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/sac/driver/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/memory.… ============================================================================== --- trunk/reactos/drivers/sac/driver/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/memory.c [iso-8859-1] Fri Jun 17 12:54:05 2011 @@ -12,11 +12,43 @@ /* GLOBALS ********************************************************************/ +LONG TotalFrees, TotalBytesFreed, TotalAllocations, TotalBytesAllocated; +KSPIN_LOCK MemoryLock; +PSAC_MEMORY_LIST GlobalMemoryList; + /* FUNCTIONS ******************************************************************/ BOOLEAN InitializeMemoryManagement(VOID) { + PSAC_MEMORY_ENTRY Entry; + + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Entering\n"); + + GlobalMemoryList = ExAllocatePoolWithTagPriority( + NonPagedPool, + SAC_MEMORY_LIST_SIZE, + INITIAL_BLOCK_TAG, + HighPoolPriority); + if (GlobalMemoryList) + { + KeInitializeSpinLock(&MemoryLock); + + GlobalMemoryList->Signature = GLOBAL_MEMORY_SIGNATURE; + GlobalMemoryList->LocalDescriptor = + (PSAC_MEMORY_ENTRY)(GlobalMemoryList + 1); + GlobalMemoryList->Size = SAC_MEMORY_LIST_SIZE - sizeof(SAC_MEMORY_LIST); + + Entry = GlobalMemoryList->LocalDescriptor; + Entry->Signature = LOCAL_MEMORY_SIGNATURE; + Entry->Tag = FREE_POOL_TAG; + Entry->Size = GlobalMemoryList->Size - sizeof(SAC_MEMORY_ENTRY); + + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting with TRUE.\n"); + return TRUE; + } + + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting with FALSE. No pool.\n"); return FALSE; } @@ -25,7 +57,28 @@ VOID ) { - + PSAC_MEMORY_LIST Next; + KIRQL OldIrql; + + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Entering\n"); + + KeAcquireSpinLock(&MemoryLock, &OldIrql); + while (GlobalMemoryList) + { + ASSERT(GlobalMemoryList->Signature == GLOBAL_MEMORY_SIGNATURE); + + KeReleaseSpinLock(&MemoryLock, OldIrql); + + Next = GlobalMemoryList->Next; + + ExFreePoolWithTag(GlobalMemoryList, 0); + + KeAcquireSpinLock(&MemoryLock, &OldIrql); + GlobalMemoryList = Next; + } + + KeReleaseSpinLock(&MemoryLock, OldIrql); + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting\n"); } PVOID @@ -36,7 +89,117 @@ IN ULONG Line ) { - return NULL; + KIRQL OldIrql; + PSAC_MEMORY_LIST GlobalDescriptor, NewDescriptor; + PSAC_MEMORY_ENTRY LocalDescriptor, NextDescriptor; + ULONG GlobalSize, ActualSize; + PVOID Buffer; + + ASSERT("Tag != FREE_POOL_TAG"); + + SAC_DBG(SAC_DBG_MM, "Entering.\n"); + + OldIrql = KfAcquireSpinLock(&MemoryLock); + PoolSize = ALIGN_UP(PoolSize, ULONGLONG); + + GlobalDescriptor = GlobalMemoryList; + KeAcquireSpinLock(&MemoryLock, &OldIrql); + while (GlobalDescriptor) + { + ASSERT(GlobalMemoryList->Signature == GLOBAL_MEMORY_SIGNATURE); + + LocalDescriptor = GlobalDescriptor->LocalDescriptor; + + GlobalSize = GlobalDescriptor->Size; + while (GlobalSize) + { + ASSERT(LocalDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); + + if ((LocalDescriptor->Tag == FREE_POOL_TAG) && + (LocalDescriptor->Size >= PoolSize)) + { + break; + } + + GlobalSize -= (LocalDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); + + LocalDescriptor = + (PSAC_MEMORY_ENTRY)((ULONG_PTR)LocalDescriptor + + LocalDescriptor->Size + + sizeof(SAC_MEMORY_ENTRY)); + } + + GlobalDescriptor = GlobalDescriptor->Next; + } + + if (!GlobalDescriptor) + { + KeReleaseSpinLock(&MemoryLock, OldIrql); + + ActualSize = min( + PAGE_SIZE, + PoolSize + sizeof(SAC_MEMORY_ENTRY) + sizeof(SAC_MEMORY_LIST)); + + SAC_DBG(SAC_DBG_MM, "Allocating new space.\n"); + + NewDescriptor = ExAllocatePoolWithTagPriority( + 0, + ActualSize, + ALLOC_BLOCK_TAG, + HighPoolPriority); + if (!NewDescriptor) + { + SAC_DBG(SAC_DBG_MM, "No more memory, returning NULL.\n"); + return NULL; + } + + KeAcquireSpinLock(&MemoryLock, &OldIrql); + + NewDescriptor->Signature = GLOBAL_MEMORY_SIGNATURE; + NewDescriptor->LocalDescriptor = (PSAC_MEMORY_ENTRY)(NewDescriptor + 1); + NewDescriptor->Size = ActualSize - 16; + NewDescriptor->Next = GlobalMemoryList; + + GlobalMemoryList = NewDescriptor; + + LocalDescriptor = NewDescriptor->LocalDescriptor; + LocalDescriptor->Signature = LOCAL_MEMORY_SIGNATURE; + LocalDescriptor->Tag = FREE_POOL_TAG; + LocalDescriptor->Size = + GlobalMemoryList->Size - sizeof(SAC_MEMORY_ENTRY); + } + + SAC_DBG(SAC_DBG_MM, "Found a good sized block.\n"); + ASSERT(LocalDescriptor->Tag == FREE_POOL_TAG); + ASSERT(LocalDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); + + if (LocalDescriptor->Size > (PoolSize + sizeof(SAC_MEMORY_ENTRY))) + { + NextDescriptor = + (PSAC_MEMORY_ENTRY)((ULONG_PTR)LocalDescriptor + + PoolSize + + sizeof(SAC_MEMORY_ENTRY)); + if (NextDescriptor->Tag == FREE_POOL_TAG) + { + NextDescriptor->Tag = FREE_POOL_TAG; + NextDescriptor->Signature = LOCAL_MEMORY_SIGNATURE; + NextDescriptor->Size = + (LocalDescriptor->Size - PoolSize - sizeof(SAC_MEMORY_ENTRY)); + + LocalDescriptor->Size = PoolSize; + } + } + + LocalDescriptor->Tag = Tag; + KeReleaseSpinLock(&MemoryLock, OldIrql); + + InterlockedIncrement(&TotalAllocations); + InterlockedExchangeAdd(&TotalBytesAllocated, LocalDescriptor->Size); + SAC_DBG(1, "Returning block 0x%X.\n", LocalDescriptor); + + Buffer = LocalDescriptor + 1; + RtlZeroMemory(Buffer, PoolSize); + return Buffer; } VOID @@ -44,5 +207,100 @@ IN PVOID *Block ) { - + PSAC_MEMORY_ENTRY LocalDescriptor, NextDescriptor; + PSAC_MEMORY_ENTRY ThisDescriptor, FoundDescriptor; + ULONG GlobalSize, LocalSize; + PSAC_MEMORY_LIST GlobalDescriptor; + KIRQL OldIrql; + + LocalDescriptor = (PVOID)((ULONG_PTR)(*Block) - sizeof(SAC_MEMORY_ENTRY)); + + SAC_DBG(SAC_DBG_MM, "Entering with block 0x%X.\n", LocalDescriptor); + + ASSERT(LocalDescriptor->Size > 0); + ASSERT(LocalDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); + + InterlockedIncrement(&TotalFrees); + + InterlockedExchangeAdd(&TotalBytesFreed, LocalDescriptor->Size); + + GlobalDescriptor = GlobalMemoryList; + KeAcquireSpinLock(&MemoryLock, &OldIrql); + while (GlobalDescriptor) + { + ASSERT(GlobalMemoryList->Signature == GLOBAL_MEMORY_SIGNATURE); + + FoundDescriptor = NULL; + + ThisDescriptor = GlobalDescriptor->LocalDescriptor; + + GlobalSize = GlobalDescriptor->Size; + while (GlobalSize) + { + ASSERT(ThisDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); + + if (ThisDescriptor == LocalDescriptor) break; + + GlobalSize -= (ThisDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); + + ThisDescriptor = + (PSAC_MEMORY_ENTRY)((ULONG_PTR)ThisDescriptor + + ThisDescriptor->Size + + sizeof(SAC_MEMORY_ENTRY)); + } + + if (ThisDescriptor == LocalDescriptor) break; + + GlobalDescriptor = GlobalDescriptor->Next; + } + + if (!GlobalDescriptor) + { + KeReleaseSpinLock(&MemoryLock, OldIrql); + SAC_DBG(SAC_DBG_MM, "Could not find block.\n"); + return; + } + + ASSERT(ThisDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); + + if (LocalDescriptor->Tag == FREE_POOL_TAG) + { + KeReleaseSpinLock(&MemoryLock, OldIrql); + SAC_DBG(SAC_DBG_MM, "Attempted to free something twice.\n"); + return; + } + + LocalSize = LocalDescriptor->Size; + LocalDescriptor->Tag = FREE_POOL_TAG; + + if (GlobalSize > (LocalSize + sizeof(SAC_MEMORY_ENTRY))) + { + NextDescriptor = + (PSAC_MEMORY_ENTRY)((ULONG_PTR)LocalDescriptor + + LocalSize + + sizeof(SAC_MEMORY_ENTRY)); + if (NextDescriptor->Tag == FREE_POOL_TAG) + { + NextDescriptor->Tag = 0; + NextDescriptor->Signature = 0; + + LocalDescriptor->Size += + (NextDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); + } + } + + if ((FoundDescriptor) && (FoundDescriptor->Tag == FREE_POOL_TAG)) + { + LocalDescriptor->Signature = 0; + LocalDescriptor->Tag = 0; + + FoundDescriptor->Size += + (LocalDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); + } + + KeReleaseSpinLock(&MemoryLock, OldIrql); + *Block = NULL; + + SAC_DBG(SAC_DBG_MM, "exiting.\n"); + return; } Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Fri Jun 17 12:54:05 2011 @@ -8,6 +8,46 @@ /* INCLUDES *******************************************************************/ #include <ntddk.h> + +#define SAC_DBG_ENTRY_EXIT 0x01 +#define SAC_DBG_MM 0x1000 + +#define SAC_DBG(x, ...) \ + if (SACDebug & x) \ + { \ + DbgPrint("SAC %s: ", __FUNCTION__); \ + DbgPrint(__VA_ARGS__); \ + } + +//Rcp? - sacdrv.sys - SAC Driver (Headless) +//RcpA - sacdrv.sys - Internal memory mgr alloc block +//RcpI - sacdrv.sys - Internal memory mgr initial heap block +//RcpS - sacdrv.sys - Security related block +#define GENERIC_TAG '?pcR' +#define ALLOC_BLOCK_TAG 'ApcR' +#define INITIAL_BLOCK_TAG 'IpcR' +#define SECURITY_BLOCK_TAG 'SpcR' +#define FREE_POOL_TAG 'FpcR' + +#define LOCAL_MEMORY_SIGNATURE 'SSEL' +#define GLOBAL_MEMORY_SIGNATURE 'DAEH' + +#define SAC_MEMORY_LIST_SIZE (1 * 1024 * 1024) + +typedef struct _SAC_MEMORY_ENTRY +{ + ULONG Signature; + ULONG Tag; + ULONG Size; +} SAC_MEMORY_ENTRY, *PSAC_MEMORY_ENTRY; + +typedef struct _SAC_MEMORY_LIST +{ + ULONG Signature; + PSAC_MEMORY_ENTRY LocalDescriptor; + ULONG Size; + struct _SAC_MEMORY_LIST* Next; +} SAC_MEMORY_LIST, *PSAC_MEMORY_LIST; typedef enum _SAC_CHANNEL_TYPE { @@ -116,3 +156,6 @@ PKEVENT RedrawEvent; GUID ChannelId; } SAC_CHANNEL_ATTRIBUTES, *PSAC_CHANNEL_ATTRIBUTES; + +extern ULONG SACDebug; +

1 0

[tkreuzer] 52310: [CRTDLL] Comment out forwarded exports, where the target exports don't exist. Fixes MSVC build
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 12:47:14 2011 New Revision: 52310 URL: http://svn.reactos.org/svn/reactos?rev=52310&view=rev Log: [CRTDLL] Comment out forwarded exports, where the target exports don't exist. Fixes MSVC build Modified: trunk/reactos/dll/win32/crtdll/crtdll.spec Modified: trunk/reactos/dll/win32/crtdll/crtdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.sp… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.spec [iso-8859-1] Fri Jun 17 12:47:14 2011 @@ -1,5 +1,5 @@ # Old C runtime library. All functions provided by msvcrt - + @ cdecl ??2@YAPAXI@Z(long) msvcrt.??2@YAPAXI@Z @ cdecl ??3@YAXPAX@Z(ptr) msvcrt.??3@YAXPAX@Z @ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z @@ -166,9 +166,9 @@ @ cdecl _isnan( double ) msvcrt._isnan @ cdecl _itoa(long ptr long) msvcrt._itoa @ cdecl _itow(long ptr long) msvcrt._itow - @ cdecl _j0(double) msvcrt._j0 - @ cdecl _j1(double) msvcrt._j1 - @ cdecl _jn(long double) msvcrt._jn +# @ cdecl _j0(double) msvcrt._j0 +# @ cdecl _j1(double) msvcrt._j1 +# @ cdecl _jn(long double) msvcrt._jn @ cdecl _kbhit() msvcrt._kbhit @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind @ cdecl _loaddll(str) msvcrt._loaddll @@ -334,9 +334,9 @@ @ cdecl _write(long ptr long) msvcrt._write @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl _wtol(wstr) msvcrt._wtol - @ cdecl _y0(double) msvcrt._y0 - @ cdecl _y1(double) msvcrt._y1 - @ cdecl _yn(long double ) msvcrt._yn +# @ cdecl _y0(double) msvcrt._y0 +# @ cdecl _y1(double) msvcrt._y1 +# @ cdecl _yn(long double ) msvcrt._yn @ cdecl abort() msvcrt.abort @ cdecl abs(long) msvcrt.abs @ cdecl acos(double) msvcrt.acos

1 0

[ilardig] 52309: Revert 51698, problem is in win32k, see bug 6305
by ilardig＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: ilardig Date: Fri Jun 17 12:23:50 2011 New Revision: 52309 URL: http://svn.reactos.org/svn/reactos?rev=52309&view=rev Log: Revert 51698, problem is in win32k, see bug 6305 Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.c Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdit/kbdit.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdit/kbdit.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdit/kbdit.c [iso-8859-1] Fri Jun 17 12:23:50 2011 @@ -86,7 +86,7 @@ /* 32 */ 'M', /* 33 */ VK_OEM_COMMA, /* 34 */ VK_OEM_PERIOD, -/* 35 */ VK_DIVIDE, +/* 35 */ VK_OEM_MINUS, /* 36 */ VK_RSHIFT, /* 37 */ VK_MULTIPLY, /* 38 */ VK_LMENU,

1 0

[tkreuzer] 52308: [FREELDR] Convert drvmap.S to intel syntax
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 12:04:25 2011 New Revision: 52308 URL: http://svn.reactos.org/svn/reactos?rev=52308&view=rev Log: [FREELDR] Convert drvmap.S to intel syntax Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/drvmap.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/drvmap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/drvmap.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/drvmap.S [iso-8859-1] Fri Jun 17 12:04:25 2011 @@ -17,83 +17,92 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - .text - .code16 +#include <asm.inc> #include <arch/pc/x86common.h> -EXTERN(_DriveMapInt13HandlerStart) +.code16 + +PUBLIC _DriveMapInt13HandlerStart +_DriveMapInt13HandlerStart: Int13Handler: - pushw %bp - movw %sp,%bp - pushw %ax - pushw %cx - pushw %si + push bp + mov bp, sp + push ax + push cx + push si cld /* Get callers flags from stack */ - movw 0x06(%bp),%ax - movw %ax,%cs:(CallersFlags - Int13Handler) + mov ax, [bp + 6] + mov word ptr cs:[CallersFlags - Int13Handler], ax /* Save the drive number they passed in */ - movb %dl,%cs:(PassedInDriveNumber - Int13Handler) + mov cs:[PassedInDriveNumber - Int13Handler], dl /* Now we need to perform the mapping */ - xorw %cx,%cx - movw $(Int13HandlerMapCount - Int13Handler),%si + xor cx, cx + mov si, offset Int13HandlerMapCount - Int13Handler + /* Get the count of drives in the map list */ - movb %cs:(%si),%cl - incw %si + mov cl, cs:[si] + inc si /* If the map list is empty then just call the old int 13h handler */ - cmpb $0,%cl - jz CallOldInt13Handler + cmp cl, 0 + jz CallOldInt13Handler GetMappedDriveNumberLoop: /* Get the next drive number in the list */ - lodsw %cs:(%si),%ax + lods ax, cs:[si] + /* Check to see if it's the one they are calling int 13h for */ - cmpb %al,%dl + cmp dl, al + /* If not get the next one */ - jne GetMappedDriveNumberLoopNext + jne GetMappedDriveNumberLoopNext /* If we get here then we have found a mapped drive */ /* Send new drive number on to the old int 13h handler */ - movb %ah,%dl + mov dl, ah + /* Call BIOS Int 13 Handler */ - jmp CallOldInt13Handler + jmp CallOldInt13Handler GetMappedDriveNumberLoopNext: - loop GetMappedDriveNumberLoop + loop GetMappedDriveNumberLoop CallOldInt13Handler: /* Restore the registers we changed off the stack */ - popw %si - popw %cx - popw %ax + pop si + pop cx + pop ax /* Put flags onto stack */ - pushw %cs:(CallersFlags - Int13Handler) + push word ptr cs:[CallersFlags - Int13Handler] + /* Call old int 13h handler with new drive number */ - .byte 0x9a /* lcall */ -EXTERN(_DriveMapOldInt13HandlerAddress) + .byte HEX(9a) /* lcall */ +PUBLIC _DriveMapOldInt13HandlerAddress +_DriveMapOldInt13HandlerAddress: .word 0 .word 0 /* Update the callers flags with the values the BIOS returned */ - pushw %ax + push ax pushf - popw %ax - movw %ax,0x06(%bp) - popw %ax + pop ax + mov [bp + 6], ax + pop ax + /* Restore the callers drive number */ - movb %cs:(PassedInDriveNumber - Int13Handler),%dl + mov dl, cs:[PassedInDriveNumber - Int13Handler] - popw %bp + pop bp iret @@ -103,7 +112,8 @@ PassedInDriveNumber: .byte 0 -EXTERN(_DriveMapInt13HandlerMapList) +PUBLIC _DriveMapInt13HandlerMapList +_DriveMapInt13HandlerMapList: Int13HandlerMapCount: .byte 0 @@ -127,4 +137,6 @@ Int13HandlerDriveNew4: .byte 0 -EXTERN(_DriveMapInt13HandlerEnd) +PUBLIC _DriveMapInt13HandlerEnd +_DriveMapInt13HandlerEnd: + .byte 0

1 0

[cgutman] 52307: [IP] - Call the completion handler asynchronously to avoid a deadlock if AFD issues a synchronous request in its completion function - Complete all pending requests before closing ...
by cgutman＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: cgutman Date: Fri Jun 17 12:04:20 2011 New Revision: 52307 URL: http://svn.reactos.org/svn/reactos?rev=52307&view=rev Log: [IP] - Call the completion handler asynchronously to avoid a deadlock if AFD issues a synchronous request in its completion function - Complete all pending requests before closing the socket - Fixes send and receive on accepted sockets Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Fri Jun 17 12:04:20 2011 @@ -30,10 +30,41 @@ "TIME_WAIT" }; +static +VOID +BucketCompletionWorker(PVOID Context) +{ + PTDI_BUCKET Bucket = Context; + PTCP_COMPLETION_ROUTINE Complete; + + Complete = Bucket->Request.RequestNotifyObject; + + Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); + + ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + + DereferenceObject(Bucket->AssociatedEndpoint); +} + +static +VOID +CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket, BOOLEAN Synchronous) +{ + ReferenceObject(Connection); + Bucket->AssociatedEndpoint = Connection; + if (Synchronous) + { + BucketCompletionWorker(Bucket); + } + else + { + ChewCreate(BucketCompletionWorker, Bucket); + } +} + VOID FlushAllQueues(PCONNECTION_ENDPOINT Connection, NTSTATUS Status) { - PTCP_COMPLETION_ROUTINE Complete; PTDI_BUCKET Bucket; PLIST_ENTRY Entry; @@ -52,11 +83,7 @@ Bucket->Status = Status; Bucket->Information = 0; - Complete = Bucket->Request.RequestNotifyObject; - - Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); - - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + CompleteBucket(Connection, Bucket, TRUE); } if (Status == STATUS_SUCCESS) @@ -69,11 +96,7 @@ Bucket->Status = Status; Bucket->Information = 0; - Complete = Bucket->Request.RequestNotifyObject; - - Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); - - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + CompleteBucket(Connection, Bucket, TRUE); } while ((Entry = ExInterlockedRemoveHeadList(&Connection->SendRequest, &Connection->Lock))) @@ -87,11 +110,7 @@ Bucket->Status = Status; Bucket->Information = 0; - Complete = Bucket->Request.RequestNotifyObject; - - Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); - - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + CompleteBucket(Connection, Bucket, TRUE); } while ((Entry = ExInterlockedRemoveHeadList(&Connection->ConnectRequest, &Connection->Lock))) @@ -101,11 +120,7 @@ Bucket->Status = Status; Bucket->Information = 0; - Complete = Bucket->Request.RequestNotifyObject; - - Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); - - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + CompleteBucket(Connection, Bucket, TRUE); } DereferenceObject(Connection); @@ -126,7 +141,6 @@ TCPAcceptEventHandler(void *arg, struct tcp_pcb *newpcb) { PCONNECTION_ENDPOINT Connection = arg; - PTCP_COMPLETION_ROUTINE Complete; PTDI_BUCKET Bucket; PLIST_ENTRY Entry; PIRP Irp; @@ -160,8 +174,6 @@ Bucket->AssociatedEndpoint->SocketContext); DbgPrint("[IP, TCPAcceptEventHandler] Completing accept event %x\n", Status); - - Complete = Bucket->Request.RequestNotifyObject; if (Status == STATUS_SUCCESS) { @@ -183,10 +195,7 @@ DbgPrint("[IP, TCPAcceptEventHandler] Done!\n"); - Complete(Bucket->Request.RequestContext, - Bucket->Status, Bucket->Information); - - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + CompleteBucket(Connection, Bucket, FALSE); } DereferenceObject(Connection); @@ -196,7 +205,6 @@ TCPSendEventHandler(void *arg, u16_t space) { PCONNECTION_ENDPOINT Connection = arg; - PTCP_COMPLETION_ROUTINE Complete; PTDI_BUCKET Bucket; PLIST_ENTRY Entry; PIRP Irp; @@ -255,11 +263,7 @@ DbgPrint("Completing send req %x\n", Status); - Complete = Bucket->Request.RequestNotifyObject; - - Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); - - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + CompleteBucket(Connection, Bucket, FALSE); } } @@ -272,7 +276,6 @@ TCPRecvEventHandler(void *arg, struct pbuf *p) { PCONNECTION_ENDPOINT Connection = arg; - PTCP_COMPLETION_ROUTINE Complete; PTDI_BUCKET Bucket; PLIST_ENTRY Entry; PIRP Irp; @@ -324,11 +327,7 @@ Bucket->Status = STATUS_SUCCESS; Bucket->Information = Received; - Complete = Bucket->Request.RequestNotifyObject; - - Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); - - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + CompleteBucket(Connection, Bucket, FALSE); } DereferenceObject(Connection); @@ -342,7 +341,6 @@ TCPConnectEventHandler(void *arg, err_t err) { PCONNECTION_ENDPOINT Connection = arg; - PTCP_COMPLETION_ROUTINE Complete; PTDI_BUCKET Bucket; PLIST_ENTRY Entry; @@ -360,11 +358,7 @@ DbgPrint("[IP, TCPConnectEventHandler] Completing connection request! (0x%x)\n", err); - Complete = Bucket->Request.RequestNotifyObject; - - Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); - - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + CompleteBucket(Connection, Bucket, FALSE); } DbgPrint("[IP, TCPConnectEventHandler] Done\n"); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Fri Jun 17 12:04:20 2011 @@ -349,9 +349,9 @@ /* Don't try to close again if the other side closed us already */ if (Socket) { + FlushAllQueues(Connection, STATUS_CANCELLED); + LibTCPClose(Socket); - - FlushAllQueues(Connection, STATUS_CANCELLED); } UnlockObject(Connection, OldIrql);

1 0

[akhaldi] 52306: [CMAKE] * Skip idndl in msvc build.
by akhaldi＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: akhaldi Date: Fri Jun 17 11:56:40 2011 New Revision: 52306 URL: http://svn.reactos.org/svn/reactos?rev=52306&view=rev Log: [CMAKE] * Skip idndl in msvc build. Modified: trunk/reactos/dll/nls/CMakeLists.txt Modified: trunk/reactos/dll/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/dll/nls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/nls/CMakeLists.txt [iso-8859-1] Fri Jun 17 11:56:40 2011 @@ -1,3 +1,5 @@ -add_subdirectory(idndl) +if(NOT MSVC) + add_subdirectory(idndl) # FIXME: msvc build. +endif() add_subdirectory(normaliz)

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011