Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 38220: Use "C" interface for intrinsic functions to avoid problems with C++. Fix _rotr and _rotl.
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sat Dec 20 21:22:17 2008 New Revision: 38220 URL: http://svn.reactos.org/svn/reactos?rev=38220&view=rev Log: Use "C" interface for intrinsic functions to avoid problems with C++. Fix _rotr and _rotl. 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] Sat Dec 20 21:22:17 2008 @@ -64,6 +64,10 @@ Pay attention to the type of barrier. Make it match with what Visual C++ would use in the same case */ + +#ifdef __cplusplus +extern "C" { +#endif /*** Stack frame juggling ***/ #define _ReturnAddress() (__builtin_return_address(0)) @@ -819,14 +823,14 @@ return retval; } -static __inline__ __attribute__((always_inline)) unsigned char _rotl8(const unsigned char value, const unsigned char shift) +static __inline__ __attribute__((always_inline)) unsigned char _rotl8(unsigned char value, unsigned char shift) { unsigned char retval; __asm__("rolb %b[shift], %b[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } -static __inline__ __attribute__((always_inline)) unsigned short _rotl16(const unsigned short value, const unsigned char shift) +static __inline__ __attribute__((always_inline)) unsigned short _rotl16(unsigned short value, unsigned char shift) { unsigned short retval; __asm__("rolw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); @@ -834,14 +838,14 @@ } #ifndef __MSVCRT__ -static __inline__ __attribute__((always_inline)) unsigned int _rotl(const unsigned int value, const int shift) +static __inline__ __attribute__((always_inline)) unsigned int _rotl(unsigned int value, int shift) { unsigned long retval; __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } -static __inline__ __attribute__((always_inline)) unsigned long _rotr(const unsigned int value, const unsigned char shift) +static __inline__ __attribute__((always_inline)) unsigned int _rotr(unsigned int value, int shift) { unsigned long retval; __asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); @@ -849,14 +853,14 @@ } #endif -static __inline__ __attribute__((always_inline)) unsigned char _rotr8(const unsigned char value, const unsigned char shift) +static __inline__ __attribute__((always_inline)) unsigned char _rotr8(unsigned char value, unsigned char shift) { unsigned char retval; __asm__("rorb %b[shift], %b[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } -static __inline__ __attribute__((always_inline)) unsigned short _rotr16(const unsigned short value, const unsigned char shift) +static __inline__ __attribute__((always_inline)) unsigned short _rotr16(unsigned short value, unsigned char shift) { unsigned short retval; __asm__("rorw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); @@ -1292,6 +1296,10 @@ __asm__ __volatile__("sidt %0" : : "m"(*(short*)Destination) : "memory"); } +#ifdef __cplusplus +} +#endif + #endif /* KJK_INTRIN_X86_H_ */ /* EOF */

1 0

[tkreuzer] 38219: Include io.h. It's needed and was implicitly included so far. But that'll be soon gone.
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sat Dec 20 21:15:46 2008 New Revision: 38219 URL: http://svn.reactos.org/svn/reactos?rev=38219&view=rev Log: Include io.h. It's needed and was implicitly included so far. But that'll be soon gone. Modified: trunk/reactos/lib/sdk/crt/precomp.h Modified: trunk/reactos/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/precomp.h?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] Sat Dec 20 21:15:46 2008 @@ -18,6 +18,7 @@ #include <malloc.h> #include <math.h> #include <limits.h> +#include <io.h> #include <sys/stat.h> #include <sys/locking.h>

1 0

[tkreuzer] 38218: Don't use sys/time.h
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sat Dec 20 21:12:09 2008 New Revision: 38218 URL: http://svn.reactos.org/svn/reactos?rev=38218&view=rev Log: Don't use sys/time.h Modified: trunk/reactos/lib/3rdparty/libxml2/config.h Modified: trunk/reactos/lib/3rdparty/libxml2/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/config.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/config.h [iso-8859-1] Sat Dec 20 21:12:09 2008 @@ -227,7 +227,7 @@ #define HAVE_SYS_TIMEB_H 1 /* Define to 1 if you have the <sys/time.h> header file. */ -#define HAVE_SYS_TIME_H 1 +//#define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1

1 0

[tkreuzer] 38217: Avoid using non-standard names (S_IFITO, ...).
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sat Dec 20 20:51:14 2008 New Revision: 38217 URL: http://svn.reactos.org/svn/reactos?rev=38217&view=rev Log: Avoid using non-standard names (S_IFITO, ...). Modified: trunk/reactos/lib/sdk/crt/stdio/stat64.c Modified: trunk/reactos/lib/sdk/crt/stdio/stat64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/stat64.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] Sat Dec 20 20:51:14 2008 @@ -111,13 +111,13 @@ if (type == FILE_TYPE_PIPE) { buf->st_dev = buf->st_rdev = fd; - buf->st_mode = S_IFIFO; + buf->st_mode = _S_IFIFO; buf->st_nlink = 1; } else if (type == FILE_TYPE_CHAR) { buf->st_dev = buf->st_rdev = fd; - buf->st_mode = S_IFCHR; + buf->st_mode = _S_IFCHR; buf->st_nlink = 1; } else /* FILE_TYPE_DISK etc. */ @@ -128,9 +128,9 @@ __set_errno(ERROR_INVALID_PARAMETER); return -1; } - buf->st_mode = S_IFREG | S_IREAD; + buf->st_mode = _S_IFREG | _S_IREAD; if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - buf->st_mode |= S_IWRITE; + buf->st_mode |= _S_IWRITE; buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow; RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); buf->st_atime = dw;

1 0

[tkreuzer] 38216: use _wcsicmp instead of non-standard wcscmpi
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sat Dec 20 20:40:09 2008 New Revision: 38216 URL: http://svn.reactos.org/svn/reactos?rev=38216&view=rev Log: use _wcsicmp instead of non-standard wcscmpi Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] Sat Dec 20 20:40:09 2008 @@ -305,7 +305,7 @@ TEST(bTemp == 0); cbSize = sizeof(szReg); TEST(QueryUserRegValueW(L"Control Panel\\Sound", L"Beep", &szReg, &cbSize, NULL) == ERROR_SUCCESS); - TEST(wcscmpi(szReg, L"No") == 0); + TEST(_wcsicmp(szReg, L"No") == 0); /* Value 1 */ NtUserSystemParametersInfo(SPI_SETBEEP, 1, NULL, SPIF_UPDATEINIFILE); @@ -313,7 +313,7 @@ TEST(bTemp == 1); cbSize = sizeof(szReg); TEST(QueryUserRegValueW(L"Control Panel\\Sound", L"Beep", &szReg, &cbSize, NULL) == ERROR_SUCCESS); - TEST(wcscmpi(szReg, L"Yes") == 0); + TEST(_wcsicmp(szReg, L"Yes") == 0); /* Value 2 */ NtUserSystemParametersInfo(SPI_SETBEEP, 2, NULL, SPIF_UPDATEINIFILE); @@ -321,7 +321,7 @@ TEST(bTemp == 1); cbSize = sizeof(szReg); TEST(QueryUserRegValueW(L"Control Panel\\Sound", L"Beep", &szReg, &cbSize, NULL) == ERROR_SUCCESS); - TEST(wcscmpi(szReg, L"Yes") == 0); + TEST(_wcsicmp(szReg, L"Yes") == 0); /* Restore original value */ NtUserSystemParametersInfo(SPI_SETBEEP, 0, &bOrig, SPIF_UPDATEINIFILE);

1 0

[tkreuzer] 38215: revert 38201 and 38203 due to regressions
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sat Dec 20 20:27:44 2008 New Revision: 38215 URL: http://svn.reactos.org/svn/reactos?rev=38215&view=rev Log: revert 38201 and 38203 due to regressions Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sat Dec 20 20:27:44 2008 @@ -3135,8 +3135,6 @@ BOOL DoBreak = FALSE; LPCWSTR String, SafeString = NULL; HPALETTE hDestPalette; - PVOID TmpBuffer = NULL; - ULONG TmpBufSize, StringSize, DxSize = 0; // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -3162,70 +3160,41 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); goto fail; } - - Status = STATUS_SUCCESS; if (Count > 0) { - TmpBufSize = StringSize = Count * sizeof(WCHAR); - if (UnsafeDx) - { - /* If ETO_PDY is specified, we have pairs of INTs */ - DxSize = Count * sizeof(INT) * (fuOptions & ETO_PDY ? 2 : 1); - TmpBufSize += DxSize; - } - - /* Allocate a temp buffer for the string and the Dx values */ - TmpBuffer = ExAllocatePoolWithTag(PagedPool, TmpBufSize, TAG_GDITEXT); - SafeString = TmpBuffer; - if (!TmpBuffer) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + SafeString = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), TAG_GDITEXT); + if (!SafeString) + { goto fail; } - - /* Probe and copy user mode data to the temp buffer */ - _SEH2_TRY - { - if (UnsafeString) - { - ProbeForRead(UnsafeString, StringSize, 1); - memcpy((PVOID)SafeString, UnsafeString, StringSize); - } - - if (UnsafeDx) - { - ProbeForRead(UnsafeDx, DxSize, 1); - Dx = (INT*)((ULONG_PTR)TmpBuffer + StringSize); - memcpy(Dx, UnsafeString, DxSize); - } - - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END + Status = MmCopyFromCaller(SafeString, UnsafeString, Count * sizeof(WCHAR)); + if (! NT_SUCCESS(Status)) + { + goto fail; + } + } + String = SafeString; + + if (NULL != UnsafeDx && Count > 0) + { + Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); + if (NULL == Dx) + { + goto fail; + } + Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT)); if (!NT_SUCCESS(Status)) { goto fail; } } - String = SafeString; if (lprc) { - _SEH2_TRY - { - ProbeForRead(lprc, sizeof(RECT), 1); - memcpy(&SpecifiedDestRect, lprc, sizeof(RECT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END + Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); if (!NT_SUCCESS(Status)) { + SetLastWin32Error(ERROR_INVALID_PARAMETER); goto fail; } } @@ -3669,14 +3638,7 @@ } else { - if (fuOptions & ETO_PDY) - { - TextLeft += Dx[i*2] << 6; - } - else - { - TextLeft += Dx[i] << 6; - } + TextLeft += Dx[i] << 6; // DbgPrint("new TextLeft2: %d\n", TextLeft); } previous = glyph_index; @@ -3730,9 +3692,13 @@ BRUSHOBJ_UnlockBrush(BrushFg); NtGdiDeleteObject(hBrushFg); } - if (TmpBuffer) - { - ExFreePoolWithTag(TmpBuffer, TAG_GDITEXT); + if (NULL != SafeString) + { + ExFreePoolWithTag((void*)SafeString, TAG_GDITEXT); + } + if (NULL != Dx) + { + ExFreePoolWithTag(Dx, TAG_GDITEXT); } DC_UnlockDc(dc);

1 0

[tkreuzer] 38214: Fix definition of EMRCREATECOLORSPACE and EMRPOLYXXX, should fix a bunch of winetests.
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sat Dec 20 19:45:13 2008 New Revision: 38214 URL: http://svn.reactos.org/svn/reactos?rev=38214&view=rev Log: Fix definition of EMRCREATECOLORSPACE and EMRPOLYXXX, should fix a bunch of winetests. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat Dec 20 19:45:13 2008 @@ -1665,7 +1665,7 @@ typedef struct tagEMRCREATECOLORSPACE { EMR emr; DWORD ihCS; - LOGCOLORSPACEW lcs; + LOGCOLORSPACEA lcs; } EMRCREATECOLORSPACE,*PEMRCREATECOLORSPACE; typedef struct tagEMRCREATEDIBPATTERNBRUSHPT { EMR emr; @@ -1983,7 +1983,7 @@ EMR emr; RECTL rclBounds; DWORD cpts; - POINTL apts[1]; + POINTS apts[1]; } EMRPOLYLINE16,*PEMRPOLYLINE16,EMRPOLYBEZIER16,*PEMRPOLYBEZIER16,EMRPOLYGON16,*PEMRPOLYGON16,EMRPOLYBEZIERTO16,*PEMRPOLYBEZIERTO16,EMRPOLYLINETO16,*PEMRPOLYLINETO16; typedef struct tagEMRPOLYPOLYLINE { EMR emr;

1 0

[cgutman] 38213: - Merge aicom-network-fixes up to r38205
by cgutman＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: cgutman Date: Sat Dec 20 19:29:35 2008 New Revision: 38213 URL: http://svn.reactos.org/svn/reactos?rev=38213&view=rev Log: - Merge aicom-network-fixes up to r38205 Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/lib/drivers/ip/network/loopback.c trunk/reactos/lib/drivers/ip/network/transmit.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sat Dec 20 19:29:35 2008 @@ -9,9 +9,6 @@ */ #include "precomp.h" - -/* Define this to bugcheck on double complete */ -/* #define BREAK_ON_DOUBLE_COMPLETE */ UINT TransferDataCalled = 0; UINT TransferDataCompleteCalled = 0; @@ -51,54 +48,6 @@ LIST_ENTRY AdapterListHead; KSPIN_LOCK AdapterListLock; -/* Double complete protection */ -KSPIN_LOCK LanSendCompleteLock; -LIST_ENTRY LanSendCompleteList; - -VOID LanChainCompletion( PLAN_ADAPTER Adapter, PNDIS_PACKET NdisPacket ) { - PLAN_WQ_ITEM PendingCompletion = - ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); - - if( !PendingCompletion ) return; - - PendingCompletion->Packet = NdisPacket; - PendingCompletion->Adapter = Adapter; - - ExInterlockedInsertTailList( &LanSendCompleteList, - &PendingCompletion->ListEntry, - &LanSendCompleteLock ); -} - -BOOLEAN LanShouldComplete( PLAN_ADAPTER Adapter, PNDIS_PACKET NdisPacket ) { - PLIST_ENTRY ListEntry; - PLAN_WQ_ITEM CompleteEntry; - KIRQL OldIrql; - - KeAcquireSpinLock( &LanSendCompleteLock, &OldIrql ); - for( ListEntry = LanSendCompleteList.Flink; - ListEntry != &LanSendCompleteList; - ListEntry = ListEntry->Flink ) { - CompleteEntry = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - - if( CompleteEntry->Adapter == Adapter && - CompleteEntry->Packet == NdisPacket ) { - RemoveEntryList( ListEntry ); - KeReleaseSpinLock( &LanSendCompleteLock, OldIrql ); - ExFreePool( CompleteEntry ); - return TRUE; - } - } - KeReleaseSpinLock( &LanSendCompleteLock, OldIrql ); - - DbgPrint("NDIS completed the same send packet twice " - "(Adapter %x Packet %x)!!\n", Adapter, NdisPacket); -#ifdef BREAK_ON_DOUBLE_COMPLETE - KeBugCheck(0); -#endif - - return FALSE; -} - NDIS_STATUS NDISCall( PLAN_ADAPTER Adapter, NDIS_REQUEST_TYPE Type, @@ -283,13 +232,11 @@ */ { TI_DbgPrint(DEBUG_DATALINK, ("Calling completion routine\n")); - if( LanShouldComplete( (PLAN_ADAPTER)BindingContext, Packet ) ) { - ASSERT_KM_POINTER(Packet); - ASSERT_KM_POINTER(PC(Packet)); - ASSERT_KM_POINTER(PC(Packet)->DLComplete); - (*PC(Packet)->DLComplete)( PC(Packet)->Context, Packet, Status); - TI_DbgPrint(DEBUG_DATALINK, ("Finished\n")); - } + ASSERT_KM_POINTER(Packet); + ASSERT_KM_POINTER(PC(Packet)); + ASSERT_KM_POINTER(PC(Packet)->DLComplete); + (*PC(Packet)->DLComplete)( PC(Packet)->Context, Packet, Status); + TI_DbgPrint(DEBUG_DATALINK, ("Finished\n")); } VOID LanReceiveWorker( PVOID Context ) { @@ -646,8 +593,6 @@ * not needed immediately */ GetDataPtr( NdisPacket, 0, &Data, &Size ); - LanChainCompletion( Adapter, NdisPacket ); - switch (Adapter->Media) { case NdisMedium802_3: EHeader = (PETH_HEADER)Data; @@ -1046,6 +991,7 @@ if (NdisStatus != NDIS_STATUS_SUCCESS) { TI_DbgPrint(DEBUG_DATALINK, ("Could not set packet filter (0x%X).\n", NdisStatus)); + IPUnregisterInterface(IF); IPDestroyInterface(IF); return FALSE; } @@ -1380,24 +1326,4 @@ } } -VOID LANStartup() { - InitializeListHead( &LanSendCompleteList ); - KeInitializeSpinLock( &LanSendCompleteLock ); -} - -VOID LANShutdown() { - KIRQL OldIrql; - PLAN_WQ_ITEM WorkItem; - PLIST_ENTRY ListEntry; - - KeAcquireSpinLock( &LanSendCompleteLock, &OldIrql ); - while( !IsListEmpty( &LanSendCompleteList ) ) { - ListEntry = RemoveHeadList( &LanSendCompleteList ); - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - FreeNdisPacket( WorkItem->Packet ); - ExFreePool( WorkItem ); - } - KeReleaseSpinLock( &LanSendCompleteLock, OldIrql ); -} - /* EOF */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sat Dec 20 19:29:35 2008 @@ -585,9 +585,6 @@ /* Shutdown network level protocol subsystem */ IPShutdown(); - /* Shutdown the lan worker */ - LANShutdown(); - /* Free NDIS buffer descriptors */ if (GlobalBufferPool) NdisFreeBufferPool(GlobalBufferPool); @@ -827,9 +824,6 @@ return Status; } - /* Initialize the lan worker */ - LANStartup(); - /* Register protocol with NDIS */ /* This used to be IP_DEVICE_NAME but the DDK says it has to match your entry in the SCM */ Status = LANRegisterProtocol(&strNdisDeviceName); @@ -843,7 +837,6 @@ NULL, 0, NULL); - LANShutdown(); TCPShutdown(); UDPShutdown(); RawIPShutdown(); @@ -863,7 +856,6 @@ Status = LoopRegisterAdapter(NULL, NULL); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); - LANShutdown(); TCPShutdown(); UDPShutdown(); RawIPShutdown(); Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sat Dec 20 19:29:35 2008 @@ -22,6 +22,7 @@ KSPIN_LOCK LoopWorkLock; LIST_ENTRY LoopWorkList; WORK_QUEUE_ITEM LoopWorkItem; +BOOLEAN LoopReceiveWorkerBusy = FALSE; VOID NTAPI LoopReceiveWorker( PVOID Context ) { PLIST_ENTRY ListEntry; @@ -34,43 +35,46 @@ TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); - ListEntry = ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock ); - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - - TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); - - Packet = WorkItem->Packet; - Adapter = WorkItem->Adapter; - BytesTransferred = WorkItem->BytesTransferred; - - ExFreePool( WorkItem ); - - IPPacket.NdisPacket = Packet; - - TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", - Packet, Adapter, BytesTransferred)); - - NdisGetFirstBufferFromPacket(Packet, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); - - IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; - /* Determine which upper layer protocol that should receive - this packet and pass it to the correct receive handler */ - - TI_DbgPrint(MID_TRACE, - ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", - IPPacket.ContigSize, IPPacket.TotalSize, - BytesTransferred)); - - IPPacket.Position = 0; - - IPReceive(Loopback, &IPPacket); - - FreeNdisPacket( Packet ); + while( (ListEntry = + ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock )) ) { + WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); + + TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); + + Packet = WorkItem->Packet; + Adapter = WorkItem->Adapter; + BytesTransferred = WorkItem->BytesTransferred; + + ExFreePool( WorkItem ); + + IPPacket.NdisPacket = Packet; + + TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", + Packet, Adapter, BytesTransferred)); + + NdisGetFirstBufferFromPacket(Packet, + &NdisBuffer, + &IPPacket.Header, + &IPPacket.ContigSize, + &IPPacket.TotalSize); + + IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; + /* Determine which upper layer protocol that should receive + this packet and pass it to the correct receive handler */ + + TI_DbgPrint(MID_TRACE, + ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", + IPPacket.ContigSize, IPPacket.TotalSize, + BytesTransferred)); + + IPPacket.Position = 0; + + IPReceive(Loopback, &IPPacket); + + FreeNdisPacket( Packet ); + } TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n")); + LoopReceiveWorkerBusy = FALSE; } VOID LoopSubmitReceiveWork( @@ -80,19 +84,34 @@ UINT BytesTransferred) { PLAN_WQ_ITEM WQItem; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; + KIRQL OldIrql; + + TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); WQItem = ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); - if( !WQItem ) return; + if( !WQItem ) { + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); + return; + } WQItem->Packet = Packet; WQItem->Adapter = Adapter; WQItem->BytesTransferred = BytesTransferred; - ExInterlockedInsertTailList( &LoopWorkList, &WQItem->ListEntry, &LoopWorkLock ); + InsertTailList( &LoopWorkList, &WQItem->ListEntry ); TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x BytesTrans %x\n", Packet, Adapter, BytesTransferred)); - ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); + if( !LoopReceiveWorkerBusy ) { + LoopReceiveWorkerBusy = TRUE; + ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); + TI_DbgPrint(DEBUG_DATALINK, + ("Work item inserted %x %x\n", &LoopWorkItem, WQItem)); + } else { + TI_DbgPrint(DEBUG_DATALINK, + ("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem)); + } + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); } VOID LoopTransmit( Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Sat Dec 20 19:29:35 2008 @@ -216,7 +216,13 @@ return NDIS_STATUS_FAILURE; } - return IPSendFragment(IFC->NdisPacket, NCE, IFC); + if (!NT_SUCCESS((NdisStatus = IPSendFragment(IFC->NdisPacket, NCE, IFC)))) + { + FreeNdisPacket(IFC->NdisPacket); + ExFreePool(IFC); + } + + return NdisStatus; } NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE, Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Sat Dec 20 19:29:35 2008 @@ -230,7 +230,11 @@ TI_DbgPrint(MID_TRACE,("About to send datagram\n")); - IPSendDatagram( &Packet, NCE, RawIpSendPacketComplete, NULL ); + if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, RawIpSendPacketComplete, NULL ))) + { + FreeNdisPacket(Packet.NdisPacket); + return Status; + } TI_DbgPrint(MID_TRACE,("Leaving\n")); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Sat Dec 20 19:29:35 2008 @@ -102,7 +102,11 @@ Packet.SrcAddr = LocalAddress; Packet.DstAddr = RemoteAddress; - IPSendDatagram( &Packet, NCE, TCPPacketSendComplete, NULL ); + if (!NT_SUCCESS(IPSendDatagram( &Packet, NCE, TCPPacketSendComplete, NULL ))) + { + FreeNdisPacket(Packet.NdisPacket); + return OSK_EINVAL; + } return 0; } Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sat Dec 20 19:29:35 2008 @@ -47,8 +47,6 @@ if (!NT_SUCCESS(Status)) return Status; - /* Build UDP header */ - UDPHeader = (PUDP_HEADER)((ULONG_PTR)IPPacket->Data - sizeof(UDP_HEADER)); /* Port values are already big-endian values */ UDPHeader->SourcePort = LocalPort; UDPHeader->DestPort = RemotePort; @@ -56,8 +54,6 @@ UDPHeader->Checksum = 0; /* Length of UDP header and data */ UDPHeader->Length = WH2N(DataLength + sizeof(UDP_HEADER)); - - IPPacket->Data = ((PCHAR)UDPHeader) + sizeof(UDP_HEADER); TI_DbgPrint(MID_TRACE, ("Packet: %d ip %d udp %d payload\n", (PCHAR)UDPHeader - (PCHAR)IPPacket->Header, @@ -204,7 +200,11 @@ return STATUS_UNSUCCESSFUL; } - IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ); + if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ))) + { + FreeNdisPacket(Packet.NdisPacket); + return Status; + } return STATUS_SUCCESS; }

1 0

[jmorlan] 38212: widl: Don't assume that host void* is the same size as target void*
by jmorlan＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: jmorlan Date: Sat Dec 20 18:43:56 2008 New Revision: 38212 URL: http://svn.reactos.org/svn/reactos?rev=38212&view=rev Log: widl: Don't assume that host void* is the same size as target void* Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sat Dec 20 18:43:56 2008 @@ -823,7 +823,13 @@ } else if (is_ptr(t) || is_conformant_array(t)) { - size = sizeof(void *); +#if defined(TARGET_i386) + size = 4; +#elif defined(TARGET_amd64) + size = 8; +#else +#error Unsupported CPU +#endif if (size > *align) *align = size; } else switch (t->type)

1 0

[tkreuzer] 38211: add _tcscpy_s and _tsplitpath_s
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sat Dec 20 18:22:15 2008 New Revision: 38211 URL: http://svn.reactos.org/svn/reactos?rev=38211&view=rev Log: add _tcscpy_s and _tsplitpath_s Modified: trunk/reactos/include/crt/tchar.h Modified: trunk/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/tchar.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/tchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/tchar.h [iso-8859-1] Sat Dec 20 18:22:15 2008 @@ -241,6 +241,7 @@ #define _tcscat wcscat #define _tcschr wcschr #define _tcscpy wcscpy +#define _tcscpy_s wcscpy_s #define _tcscspn wcscspn #define _tcslen wcslen #define _tcsnlen wcsnlen @@ -342,6 +343,7 @@ #define _tputenv _wputenv #define _tsearchenv _wsearchenv #define _tsplitpath _wsplitpath +#define _tsplitpath_s _wsplitpath_s #define _tfdopen _wfdopen #define _tfsopen _wfsopen @@ -619,6 +621,7 @@ #define _tcscat strcat #define _tcscpy strcpy +#define _tcscpy_s strcpy_s #define _tcsdup _strdup #define _tcslen strlen #if 0 @@ -683,6 +686,7 @@ #define _tputenv _putenv #define _tsearchenv _searchenv #define _tsplitpath _splitpath +#define _tsplitpath_s _splitpath_s #ifdef _POSIX_ #define _tfdopen fdopen

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs