Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[tkreuzer] 38214: Fix definition of EMRCREATECOLORSPACE and EMRPOLYXXX, should fix a bunch of winetests.

by tkreuzer＠svn.reactos.org

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;

16 years

[cgutman] 38213: - Merge aicom-network-fixes up to r38205

by cgutman＠svn.reactos.org

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; }

16 years

[jmorlan] 38212: widl: Don't assume that host void* is the same size as target void*

by jmorlan＠svn.reactos.org

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)

16 years

[tkreuzer] 38211: add _tcscpy_s and _tsplitpath_s

by tkreuzer＠svn.reactos.org

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

16 years

[hyperion] 38210: modified dll/win32/gdi32/gdi32.rbuild modified dll/win32/kernel32/kernel32.rbuild modified dll/win32/user32/user32.rbuild Inexplicably missed the "big three" in r37187. Don't link msvcrt in core Win32 DLLs, for real this time modified dll/win32/user32/misc/dllmain.c Don't use wcstok. Removes the dependency on msvcrt

by hyperion＠svn.reactos.org

Author: hyperion Date: Sat Dec 20 18:13:08 2008 New Revision: 38210 URL: http://svn.reactos.org/svn/reactos?rev=38210&view=rev Log: modified dll/win32/gdi32/gdi32.rbuild modified dll/win32/kernel32/kernel32.rbuild modified dll/win32/user32/user32.rbuild Inexplicably missed the "big three" in r37187. Don't link msvcrt in core Win32 DLLs, for real this time modified dll/win32/user32/misc/dllmain.c Don't use wcstok. Removes the dependency on msvcrt Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/user32.rbuild Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Sat Dec 20 18:13:08 2008 @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll"> <importlibrary definition="gdi32.def" /> <include base="gdi32">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sat Dec 20 18:13:08 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> - <module name="kernel32_base" type="objectlibrary"> + <module name="kernel32_base" type="objectlibrary" crt="dll"> <include base="kernel32_base">.</include> <include base="kernel32_base">include</include> <include base="ReactOS">include/reactos/subsys</include> @@ -135,7 +135,7 @@ </directory> <library>normalize</library> </module> - <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> + <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" crt="dll"> <importlibrary definition="kernel32.def" /> <include base="kernel32">.</include> <include base="kernel32" root="intermediate">.</include> Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Sat Dec 20 18:13:08 2008 @@ -132,16 +132,27 @@ { WCHAR buffer[KEY_LENGTH]; LPWSTR ptr; - LPWSTR seps = L" ,"; - - RtlCopyMemory(buffer, szAppInit, KEY_LENGTH);; - - ptr = wcstok(buffer, seps); - while (ptr) - { - LoadLibraryW(ptr); - ptr = wcstok(NULL, seps); - } + size_t i; + + RtlCopyMemory(buffer, szAppInit, KEY_LENGTH); + + for (i = 0; i < KEY_LENGTH; ++ i) + { + if(buffer[i] == L' ' || buffer[i] == L',') + buffer[i] = 0; + } + + for (i = 0; i < KEY_LENGTH; ) + { + if(buffer[i] == 0) + ++ i; + else + { + ptr = buffer + i; + i += wcslen(ptr); + LoadLibraryW(ptr); + } + } } } @@ -153,17 +164,28 @@ WCHAR buffer[KEY_LENGTH]; HMODULE hModule; LPWSTR ptr; - LPWSTR seps = L" ,"; + size_t i; RtlCopyMemory(buffer, szAppInit, KEY_LENGTH); - ptr = wcstok(buffer, seps); - while (ptr) - { - hModule = GetModuleHandleW(ptr); - FreeLibrary(hModule); - ptr = wcstok(NULL, seps); - } + for (i = 0; i < KEY_LENGTH; ++ i) + { + if(buffer[i] == L' ' || buffer[i] == L',') + buffer[i] = 0; + } + + for (i = 0; i < KEY_LENGTH; ) + { + if(buffer[i] == 0) + ++ i; + else + { + ptr = buffer + i; + i += wcslen(ptr); + hModule = GetModuleHandleW(ptr); + FreeLibrary(hModule); + } + } } } Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Sat Dec 20 18:13:08 2008 @@ -1,4 +1,4 @@ -<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes"> +<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll"> <importlibrary definition="user32.def" /> <include base="user32">.</include> <include base="user32">include</include>

16 years

[tkreuzer] 38209: Don't redefine _tcscpy_s and _tsplitpath_s

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 20 17:55:05 2008 New Revision: 38209 URL: http://svn.reactos.org/svn/reactos?rev=38209&view=rev Log: Don't redefine _tcscpy_s and _tsplitpath_s Modified: trunk/reactos/base/shell/explorer/utility/utility.h Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Sat Dec 20 17:55:05 2008 @@ -191,11 +191,12 @@ #else // __STDC_WANT_SECURE_LIB__ #define strcpy_s(d, l, s) strcpy(d, s) -#define _tcscpy_s(d, l, s) _tcscpy(d, s) +#define wcscpy_s(d, l, s) wcscpy(d, s) #define wcsncpy_s(d, l, s, n) wcsncpy(d, s, n) #define _stprintf_s1(b, l, f, p1) _stprintf(b, f, p1) #define _stprintf_s2(b, l, f, p1,p2) _stprintf(b, f, p1,p2) -#define _tsplitpath_s(f, d,dl, p,pl, n,nl, e,el) _tsplitpath(f, d, p, n, e) +#define _wsplitpath_s(f, d,dl, p,pl, n,nl, e,el) _wsplitpath(f, d, p, n, e) +#define _splitpath_s(f, d,dl, p,pl, n,nl, e,el) _splitpath(f, d, p, n, e) #endif // __STDC_WANT_SECURE_LIB__

16 years

[hyperion] 38208: modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S For some reason, "call _RtlUnwind@16" is being linked as "call 0" (very likely a linker bug). Reimplementing _SEH2GlobalUnwind in C and taking the address of RtlUnwind from C code seems to work Annotate functions implemented in assembler with .func/.endfunc, so the symbols are more correct

by hyperion＠svn.reactos.org

Author: hyperion Date: Sat Dec 20 17:27:17 2008 New Revision: 38208 URL: http://svn.reactos.org/svn/reactos?rev=38208&view=rev Log: modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S For some reason, "call _RtlUnwind@16" is being linked as "call 0" (very likely a linker bug). Reimplementing _SEH2GlobalUnwind in C and taking the address of RtlUnwind from C code seems to work Annotate functions implemented in assembler with .func/.endfunc, so the symbols are more correct Modified: trunk/reactos/lib/pseh/framebased-gcchack.c trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Sat Dec 20 17:27:17 2008 @@ -38,7 +38,6 @@ #endif extern _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void); -extern void _SEH2GlobalUnwind(void *); extern int __SEH2Except(void *, void *); extern void __SEH2Finally(void *, void *); @@ -49,6 +48,24 @@ extern int __cdecl __SEH2FrameHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); extern int __cdecl __SEH2NestedHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); + +FORCEINLINE +void _SEH2GlobalUnwind(void * target) +{ + __asm__ __volatile__ + ( + "push %%ebp\n" + "push $0\n" + "push $0\n" + "push $Return%=\n" + "push %[target]\n" + "call %c[RtlUnwind]\n" + "Return%=: pop %%ebp\n" : + : + [target] "g" (target), [RtlUnwind] "g" (&RtlUnwind) : + "eax", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" + ); +} FORCEINLINE int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Sat Dec 20 17:27:17 2008 @@ -21,11 +21,14 @@ .text .intel_syntax noprefix +.func _SEH2CurrentRegistration .globl __SEH2CurrentRegistration __SEH2CurrentRegistration: mov eax, [fs:0] ret +.endfunc +.func __SEH2EnterFrame .globl ___SEH2EnterFrame ___SEH2EnterFrame: mov eax, [esp+4] @@ -33,24 +36,39 @@ mov [eax], ecx mov [fs:0], eax ret +.endfunc +.func __SEH2LeaveFrame .globl ___SEH2LeaveFrame ___SEH2LeaveFrame: mov eax, [fs:0] mov eax, [eax] mov [fs:0], eax ret +.endfunc +.func __SEH2Handle .globl ___SEH2Handle ___SEH2Handle: mov eax, [esp+4] mov ebp, [esp+8] mov esp, [esp+12] jmp eax +.endfunc +.func __SEH2Except .globl ___SEH2Except +___SEH2Except: + mov eax, [esp+4] + mov ecx, [esp+8] + + call eax + + ret +.endfunc + +.func __SEH2Finally .globl ___SEH2Finally -___SEH2Except: ___SEH2Finally: mov eax, [esp+4] mov ecx, [esp+8] @@ -58,30 +76,9 @@ call eax ret +.endfunc -.globl __SEH2GlobalUnwind -__SEH2GlobalUnwind: - -.extern _RtlUnwind@16 - - push ebx - mov ebx, [esp+8] - push esi - push edi - - push 0 // ReturnValue - push 0 // ExceptionRecord - push .RestoreRegisters // TargetIp - push ebx // TargetFrame - call _RtlUnwind@16 - -.RestoreRegisters: - pop edi - pop esi - pop ebx - - ret - +.func __SEH2FrameHandler .globl ___SEH2FrameHandler ___SEH2FrameHandler: @@ -89,7 +86,9 @@ cld jmp __SEH2FrameHandler +.endfunc +.func __SEH2NestedHandler .globl ___SEH2NestedHandler ___SEH2NestedHandler: @@ -97,5 +96,6 @@ cld jmp __SEH2NestedHandler +.endfunc // EOF

16 years

[tkreuzer] 38207: define _INTEGRAL_MAX_BITS only if it was not already defined

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 20 17:16:49 2008 New Revision: 38207 URL: http://svn.reactos.org/svn/reactos?rev=38207&view=rev Log: define _INTEGRAL_MAX_BITS only if it was not already defined Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Dec 20 17:16:49 2008 @@ -180,7 +180,9 @@ typedef WORD LANGID; #ifdef __GNUC__ #define _HAVE_INT64 -#define _INTEGRAL_MAX_BITS 64 +#ifndef _INTEGRAL_MAX_BITS +# define _INTEGRAL_MAX_BITS 64 +#endif #undef __int64 #define __int64 long long #elif defined(__WATCOMC__) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 )

16 years

[tkreuzer] 38206: Update ETO constants

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 20 16:47:24 2008 New Revision: 38206 URL: http://svn.reactos.org/svn/reactos?rev=38206&view=rev Log: Update ETO constants 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 16:47:24 2008 @@ -576,10 +576,21 @@ #define DCBA_FACEDOWNRIGHT 259 #define FLOODFILLBORDER 0 #define FLOODFILLSURFACE 1 -#define ETO_CLIPPED 4 -#define ETO_GLYPH_INDEX 16 -#define ETO_OPAQUE 2 -#define ETO_RTLREADING 128 +#define ETO_OPAQUE 0x00002 +#define ETO_CLIPPED 0x00004 +#if (WINVER >= 0x0400) +#define ETO_GLYPH_INDEX 0x00010 +#define ETO_RTLREADING 0x00080 +#define ETO_NUMERICSLOCAL 0x00400 +#define ETO_NUMERICSLATIN 0x00800 +#define ETO_IGNORELANGUAGE 0x01000 +#endif +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) +#define ETO_PDY 0x02000 +#endif +#if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN) +#define ETO_REVERSE_INDEX_MAP 0x10000 +#endif #define GDICOMMENT_WINDOWS_METAFILE (-2147483647) #define GDICOMMENT_BEGINGROUP 2 #define GDICOMMENT_ENDGROUP 3 @@ -866,7 +877,7 @@ #define TCI_SRCCODEPAGE 2 #define TCI_SRCFONTSIG 3 #if (_WIN32_WINNT >= 0x0500) -#define SHADEBLENDCAPS 120 +#define SHADEBLENDCAPS 120 #define COLORMGMTCAPS 121 /* SHADEBLENDCAPS */ #define SB_NONE 0x00000000

16 years

[cgutman] 38205: - Remove a leftover variable

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Dec 20 16:20:36 2008 New Revision: 38205 URL: http://svn.reactos.org/svn/reactos?rev=38205&view=rev Log: - Remove a leftover variable Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Sat Dec 20 16:20:36 2008 @@ -64,7 +64,6 @@ IP_PACKET Packet = { 0 }; IP_ADDRESS RemoteAddress, LocalAddress; PIPv4_HEADER Header; - NTSTATUS Status; if( *data == 0x45 ) { /* IPv4 */ Header = (PIPv4_HEADER)data; @@ -103,7 +102,7 @@ Packet.SrcAddr = LocalAddress; Packet.DstAddr = RemoteAddress; - if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, TCPPacketSendComplete, NULL ))) + if (!NT_SUCCESS(IPSendDatagram( &Packet, NCE, TCPPacketSendComplete, NULL ))) { FreeNdisPacket(Packet.NdisPacket); return OSK_EINVAL;

16 years

← Newer
1
...
26
27
28
29
30
31
32
...
71
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 December 2008