Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[arty] 19966: Revert my patch from yesterday. Need to take more time to work on it.

by arty＠svn.reactos.com

Revert my patch from yesterday. Need to take more time to work on it. Modified: trunk/reactos/drivers/lib/ip/network/receive.c Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h Modified: trunk/reactos/drivers/net/tcpip/include/titypes.h Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c _____ Modified: trunk/reactos/drivers/lib/ip/network/receive.c --- trunk/reactos/drivers/lib/ip/network/receive.c 2005-12-08 17:09:25 UTC (rev 19965) +++ trunk/reactos/drivers/lib/ip/network/receive.c 2005-12-08 17:09:47 UTC (rev 19966) @@ -521,8 +521,6 @@ * IPPacket = Pointer to IP packet */ { - IP_ADDRESS Address; - TI_DbgPrint(DEBUG_IP, ("Received IPv4 datagram.\n")); IPPacket->HeaderSize = (((PIPv4_HEADER)IPPacket->Header)->VerIHL & 0x0F) << 2; @@ -564,16 +562,7 @@ /* FIXME: Should we allow packets to be received on the wrong interface? */ /* XXX Find out if this packet is destined for us */ - - if( AddrLocateADEv4( IPPacket->DstAddr.Address.IPv4Address, &Address ) ) { - ProcessFragment( IF, IPPacket ); - } else { - PNEIGHBOR_CACHE_ENTRY NCE; - - if((NCE = RouteGetRouteToDestination( &IPPacket->DstAddr ))) { - IPSendDatagram( IPPacket, NCE, NULL, NULL ); - } - } + ProcessFragment(IF, IPPacket); #if 0 } else { /* This packet is not destined for us. If we are a router, _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c --- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-08 17:09:25 UTC (rev 19965) +++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-08 17:09:47 UTC (rev 19966) @@ -647,8 +647,4 @@ return STATUS_SUCCESS; } -void TCPMarkForDisconnect( PCONNECTION_ENDPOINT Context, BOOLEAN Marked ) { - Context->Disconnecting = Marked; -} - /* EOF */ _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h --- trunk/reactos/drivers/net/tcpip/include/tcp.h 2005-12-08 17:09:25 UTC (rev 19965) +++ trunk/reactos/drivers/net/tcpip/include/tcp.h 2005-12-08 17:09:47 UTC (rev 19966) @@ -38,9 +38,6 @@ #define TCPOPTLEN_MAX_SEG_SIZE 0x4 -#define TCP_CANCEL_DISCONNECT 0 -#define TCP_CANCEL_CLOSE 1 - /* Data offset; 32-bit words (leftmost 4 bits); convert to bytes */ #define TCP_DATA_OFFSET(DataOffset)(((DataOffset) & 0xF0) >> (4-2)) @@ -60,13 +57,6 @@ KEVENT Event; } SLEEPING_THREAD, *PSLEEPING_THREAD; -typedef struct _CANCEL_REQUEST { - LIST_ENTRY Entry; - PVOID Context; - PIRP Irp; - UINT Flags, Type; -} CANCEL_REQUEST, *PCANCEL_REQUEST; - /* Retransmission timeout constants */ /* Lower bound for retransmission timeout in TCP timer ticks */ @@ -186,7 +176,4 @@ NTSTATUS TCPShutdown( VOID); -void TCPMarkForDisconnect( - PCONNECTION_ENDPOINT Connection, BOOLEAN Marked ); - #endif /* __TCP_H */ _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h --- trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-12-08 17:09:25 UTC (rev 19965) +++ trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-12-08 17:09:47 UTC (rev 19966) @@ -188,9 +188,6 @@ extern KSPIN_LOCK InterfaceListLock; extern LIST_ENTRY AddressFileListHead; extern KSPIN_LOCK AddressFileListLock; -extern LIST_ENTRY CancelQueue; -extern KSPIN_LOCK CancelQueueLock; -extern WORK_QUEUE_ITEM CancelQueueWork; extern NDIS_HANDLE GlobalPacketPool; extern NDIS_HANDLE GlobalBufferPool; extern KSPIN_LOCK EntityListLock; _____ Modified: trunk/reactos/drivers/net/tcpip/include/titypes.h --- trunk/reactos/drivers/net/tcpip/include/titypes.h 2005-12-08 17:09:25 UTC (rev 19965) +++ trunk/reactos/drivers/net/tcpip/include/titypes.h 2005-12-08 17:09:47 UTC (rev 19966) @@ -308,8 +308,6 @@ * notification service to the client */ UINT SignalState; /* Active signals from oskit */ BOOLEAN Signalled; /* Are we a member of the signal list */ - BOOLEAN Disconnecting; /* Cancelling an irp .. we need to leave it - * alone for now */ } CONNECTION_ENDPOINT, *PCONNECTION_ENDPOINT; _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-12-08 17:09:25 UTC (rev 19965) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-12-08 17:09:47 UTC (rev 19966) @@ -12,8 +12,6 @@ #include "precomp.h" #include <pseh/pseh.h> -extern VOID DeleteConnectionEndpoint( PCONNECTION_ENDPOINT Endpoint ); - NTSTATUS DispPrepareIrpForCancel( PTRANSPORT_CONTEXT Context, PIRP Irp, @@ -137,56 +135,7 @@ TI_DbgPrint(DEBUG_IRP, ("Done Completing IRP\n")); } -VOID DDKAPI CancelQueuePassiveHandler( PVOID CancelRequestVoid ) -{ - KIRQL OldIrql; - PCANCEL_REQUEST CancelReq; - PLIST_ENTRY CqEntry; - KeAcquireSpinLock( &CancelQueueLock, &OldIrql ); - - TI_DbgPrint(DEBUG_IRP,("CANCEL QUEUE: Starting\n")); - - for( CqEntry = CancelQueue.Flink; - CqEntry != &CancelQueue; - ) { - CancelReq = CONTAINING_RECORD(CqEntry, CANCEL_REQUEST, Entry); - ExInterlockedRemoveHeadList( &CancelQueue, &CancelQueueLock ); - CqEntry = CancelQueue.Flink; - - KeReleaseSpinLock( &CancelQueueLock, OldIrql ); - - TI_DbgPrint(DEBUG_IRP,("CANCEL QUEUE: Executing %x\n", CancelReq)); - - switch( CancelReq->Type ) { - case TCP_CANCEL_DISCONNECT: - TCPDisconnect - ( CancelReq->Context, - CancelReq->Flags, - NULL, - NULL, - DispDataRequestComplete, - CancelReq->Irp ); - break; - - case TCP_CANCEL_CLOSE: - TCPClose( CancelReq->Context ); - DeleteConnectionEndpoint( CancelReq->Context ); - break; - } - - TCPMarkForDisconnect( CancelReq->Context, FALSE ); - - ExFreePool( CancelReq ); - - KeAcquireSpinLock( &CancelQueueLock, &OldIrql ); - } - - TI_DbgPrint(DEBUG_IRP,("CANCEL QUEUE: Ending\n")); - - KeReleaseSpinLock( &CancelQueueLock, OldIrql ); -} - VOID DDKAPI DispCancelRequest( PDEVICE_OBJECT Device, PIRP Irp) @@ -201,7 +150,6 @@ PTRANSPORT_CONTEXT TranContext; PFILE_OBJECT FileObject; UCHAR MinorFunction; - PCANCEL_REQUEST CancelRequest; /*NTSTATUS Status = STATUS_SUCCESS;*/ TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -221,21 +169,23 @@ /* Try canceling the request */ switch(MinorFunction) { case TDI_SEND: + TCPDisconnect + ( TranContext->Handle.ConnectionContext, + TDI_DISCONNECT_RELEASE, + NULL, + NULL, + DispDataRequestComplete, + Irp ); + break; + case TDI_RECEIVE: - CancelRequest = ExAllocatePoolWithTag - ( sizeof(CANCEL_REQUEST), NonPagedPool, FOURCC('T','c','k','O') ); - TCPMarkForDisconnect( TranContext->Handle.ConnectionContext, TRUE ); - if( CancelRequest ) { - TI_DbgPrint(DEBUG_IRP,("CANCEL QUEUE:-> %x\n", CancelRequest)); - CancelRequest->Flags = TDI_DISCONNECT_RELEASE | - (MinorFunction == TDI_RECEIVE) ? TDI_DISCONNECT_ABORT : 0; - CancelRequest->Context = TranContext->Handle.ConnectionContext; - CancelRequest->Irp = Irp; - CancelRequest->Type = TCP_CANCEL_DISCONNECT; - ExInterlockedInsertTailList - ( &CancelQueue, &CancelRequest->Entry, &CancelQueueLock ); - ExQueueWorkItem( &CancelQueueWork, CriticalWorkQueue ); - } + TCPDisconnect + ( TranContext->Handle.ConnectionContext, + TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE, + NULL, + NULL, + DispDataRequestComplete, + Irp ); break; case TDI_SEND_DATAGRAM: _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c --- trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c 2005-12-08 17:09:25 UTC (rev 19965) +++ trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c 2005-12-08 17:09:47 UTC (rev 19966) @@ -10,6 +10,7 @@ #include "precomp.h" + /* List of all address file objects managed by this driver */ LIST_ENTRY AddressFileListHead; KSPIN_LOCK AddressFileListLock; @@ -351,7 +352,6 @@ KIRQL OldIrql; PADDRESS_FILE AddrFile; NTSTATUS Status = STATUS_SUCCESS; - PCANCEL_REQUEST CancelReq; TI_DbgPrint(MID_TRACE, ("Called.\n")); @@ -369,16 +369,8 @@ switch (AddrFile->Protocol) { case IPPROTO_TCP: TCPFreePort( AddrFile->Port ); - if( AddrFile->Listener ) { - CancelReq = ExAllocatePoolWithTag - ( sizeof(CANCEL_REQUEST), NonPagedPool, FOURCC('T','c','l','s') ); - if( CancelReq ) { - CancelReq->Type = TCP_CANCEL_CLOSE; - CancelReq->Context = AddrFile->Listener; - AddrFile->Listener = NULL; - ExQueueWorkItem( &CancelQueueWork, CriticalWorkQueue ); - } - } + if( AddrFile->Listener ) + TCPClose( AddrFile->Listener ); break; case IPPROTO_UDP: @@ -474,19 +466,15 @@ { PCONNECTION_ENDPOINT Connection; NTSTATUS Status = STATUS_SUCCESS; - PCANCEL_REQUEST CancelReq; TI_DbgPrint(MID_TRACE, ("Called.\n")); Connection = Request->Handle.ConnectionContext; - CancelReq = ExAllocatePoolWithTag - ( sizeof(CANCEL_REQUEST), NonPagedPool, FOURCC('T','c','l','s') ); - if( CancelReq ) { - CancelReq->Type = TCP_CANCEL_CLOSE; - CancelReq->Context = Connection; - ExQueueWorkItem( &CancelQueueWork, CriticalWorkQueue ); - } + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TCPClose(Connection); + DeleteConnectionEndpoint(Connection); + TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c --- trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-12-08 17:09:25 UTC (rev 19965) +++ trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-12-08 17:09:47 UTC (rev 19966) @@ -35,12 +35,6 @@ KSPIN_LOCK IpWorkLock; WORK_QUEUE_ITEM IpWorkItem; -/* Cancel Queue */ -LIST_ENTRY CancelQueue; -KSPIN_LOCK CancelQueueLock; -WORK_QUEUE_ITEM CancelQueueWork; -extern VOID DDKAPI CancelQueuePassiveHandler( PVOID Context ); - VOID TiWriteErrorLog( PDRIVER_OBJECT DriverContext, NTSTATUS ErrorCode, @@ -815,11 +809,6 @@ InitializeListHead(&InterfaceListHead); KeInitializeSpinLock(&InterfaceListLock); - /* Initialize cancellation queue */ - InitializeListHead(&CancelQueue); - KeInitializeSpinLock(&CancelQueueLock); - ExInitializeWorkItem( &CancelQueueWork, CancelQueuePassiveHandler, NULL ); - /* Initialize network level protocol subsystem */ IPStartup(RegistryPath);

18 years, 9 months

[amunger] 19965: Merge 19941, 19955, and 19956 to 0.2.9

by amunger＠svn.reactos.com

Merge 19941, 19955, and 19956 to 0.2.9 Modified: branches/ros-branch-0_2_9/reactos/lib/user32/misc/display.c Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/user32/misc/display.c --- branches/ros-branch-0_2_9/reactos/lib/user32/misc/display.c 2005-12-08 11:54:01 UTC (rev 19964) +++ branches/ros-branch-0_2_9/reactos/lib/user32/misc/display.c 2005-12-08 17:09:25 UTC (rev 19965) @@ -61,7 +61,7 @@ return FALSE; } - DisplayDeviceW.cb = lpDisplayDevice->cb; + DisplayDeviceW.cb = sizeof(DISPLAY_DEVICEW); rc = NtUserEnumDisplayDevices ( &Device, iDevNum, _____ Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c --- branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c 2005-12-08 11:54:01 UTC (rev 19964) +++ branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c 2005-12-08 17:09:25 UTC (rev 19965) @@ -987,7 +987,9 @@ } } - Ret = IntGdiCreateDC(&SafeDriver, &SafeDevice, NULL, &SafeInitData, FALSE); + Ret = IntGdiCreateDC(NULL == Driver ? NULL : &SafeDriver, + NULL == Device ? NULL : &SafeDevice, NULL, + NULL == InitData ? NULL : &SafeInitData, FALSE); return Ret; }

18 years, 9 months

[fireball] 19964: Respect the fact, that the driver can return NULL-pointer, instead of a string having 0 characters!

by fireball＠svn.reactos.com

Respect the fact, that the driver can return NULL-pointer, instead of a string having 0 characters! (makes third-party drivers compatibility better). This piece left from previous commit. Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-08 10:30:08 UTC (rev 19963) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-08 11:54:01 UTC (rev 19964) @@ -1857,7 +1857,7 @@ } else { - DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); + DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); DeviceNode->BootResources = NULL; } @@ -1868,14 +1868,14 @@ &IoStatusBlock, IRP_MN_QUERY_RESOURCE_REQUIREMENTS, NULL); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) && IoStatusBlock.Information) { DeviceNode->ResourceRequirements = (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information; } else { - DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); + DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); DeviceNode->ResourceRequirements = NULL; }

18 years, 9 months

[fireball] 19963: Respect the fact, that the driver can return NULL-pointer, instead of a string having 0 characters!

by fireball＠svn.reactos.com

Respect the fact, that the driver can return NULL-pointer, instead of a string having 0 characters! (makes third-party drivers compatibility better) Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-08 09:51:24 UTC (rev 19962) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-08 10:30:08 UTC (rev 19963) @@ -1586,10 +1586,11 @@ { /* Add information from parent bus device to InstancePath */ wcscat(InstancePath, ParentIdPrefix.Buffer); - if (*(PWSTR)IoStatusBlock.Information) + if (IoStatusBlock.Information && *(PWSTR)IoStatusBlock.Information) wcscat(InstancePath, L"&"); } - wcscat(InstancePath, (PWSTR)IoStatusBlock.Information); + if (IoStatusBlock.Information) + wcscat(InstancePath, (PWSTR)IoStatusBlock.Information); /* * FIXME: Check for valid characters, if there is invalid characters @@ -1701,7 +1702,7 @@ &IoStatusBlock, IRP_MN_QUERY_ID, &Stack); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) && IoStatusBlock.Information) { /* * FIXME: Check for valid characters, if there is invalid characters @@ -1730,7 +1731,7 @@ (TotalLength + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("ZwSetValueKey() failed (Status %lx) or no Compatible ID returned\n", Status); } } else @@ -1748,10 +1749,13 @@ &IoStatusBlock, IRP_MN_QUERY_DEVICE_TEXT, &Stack); - if (NT_SUCCESS(Status)) + /* This key is mandatory, so even if the Irp fails, we still write it */ + RtlInitUnicodeString(&ValueName, L"DeviceDesc"); + if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND) { - RtlInitUnicodeString(&ValueName, L"DeviceDesc"); - if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND) + if (NT_SUCCESS(IoStatusBlock.Status) && + IoStatusBlock.Information && + (*(PWSTR)IoStatusBlock.Information != 0)) { /* This key is overriden when a driver is installed. Don't write the * new description if another one already exists */ @@ -1762,15 +1766,26 @@ (PVOID)IoStatusBlock.Information, (wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR)); } - if (!NT_SUCCESS(Status)) + else { - DPRINT1("ZwSetValueKey() failed (Status 0x%lx)\n", Status); + UNICODE_STRING DeviceDesc; + RtlInitUnicodeString(&DeviceDesc, L"Unknown Device"); + DPRINT("Driver didn't return DeviceDesc (Status %x), so place unknown device there\n", Status); + + Status = ZwSetValueKey(InstanceKey, + &ValueName, + 0, + REG_SZ, + &DeviceDesc, + (wcslen((PWSTR)&DeviceDesc) + 1) * sizeof(WCHAR)); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwSetValueKey() failed (Status 0x%lx)\n", Status); + } + } } - else - { - DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); - } DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextLocation to device stack\n"); @@ -1781,7 +1796,7 @@ &IoStatusBlock, IRP_MN_QUERY_DEVICE_TEXT, &Stack); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) && IoStatusBlock.Information) { DPRINT("LocationInformation: %S\n", (PWSTR)IoStatusBlock.Information); RtlInitUnicodeString(&ValueName, L"LocationInformation"); @@ -1798,7 +1813,7 @@ } else { - DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); + DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); } DPRINT("Sending IRP_MN_QUERY_BUS_INFORMATION to device stack\n"); @@ -1808,7 +1823,7 @@ &IoStatusBlock, IRP_MN_QUERY_BUS_INFORMATION, NULL); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) && IoStatusBlock.Information) { PPNP_BUS_INFORMATION BusInformation = (PPNP_BUS_INFORMATION)IoStatusBlock.Information; @@ -1820,7 +1835,7 @@ } else { - DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); + DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); DeviceNode->ChildBusNumber = 0xFFFFFFF0; DeviceNode->ChildInterfaceType = InterfaceTypeUndefined; @@ -1834,7 +1849,7 @@ &IoStatusBlock, IRP_MN_QUERY_RESOURCES, NULL); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) && IoStatusBlock.Information) { DeviceNode->BootResources = (PCM_RESOURCE_LIST)IoStatusBlock.Information;

18 years, 9 months

[fireball] 19962: Add a little more DPRINTs, they will save some debuggin-time (silent quitting in case of error isn't a good thing to do).

by fireball＠svn.reactos.com

Add a little more DPRINTs, they will save some debuggin-time (silent quitting in case of error isn't a good thing to do). Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-08 01:54:43 UTC (rev 19961) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-12-08 09:51:24 UTC (rev 19962) @@ -449,6 +449,8 @@ PDEVICE_NODE DeviceNode = NULL; NTSTATUS Status; + DPRINT("IoOpenDeviceRegistryKey() called\n"); + if ((DevInstKeyType & (PLUGPLAY_REGKEY_DEVICE | PLUGPLAY_REGKEY_DRIVER)) == 0) return STATUS_INVALID_PARAMETER; @@ -539,7 +541,10 @@ */ if ((DevInstKeyType & PLUGPLAY_REGKEY_DRIVER) || !NT_SUCCESS(Status)) + { + DPRINT1("IoOpenDeviceRegistryKey(): Base key doesn't exist, exiting...\n"); return Status; + } /* * Let's go further. For device key we must open "Device Parameters"

18 years, 9 months

[cwittich] 19961: - changed some german translations to match website content

by cwittich＠svn.reactos.com

- changed some german translations to match website content - error 404 page is now partly localizable (untested) Modified: trunk/web/reactos.org/htdocs/roscms/inc/404.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/de.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/fr.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/ru.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/404.php --- trunk/web/reactos.org/htdocs/roscms/inc/404.php 2005-12-08 00:52:03 UTC (rev 19960) +++ trunk/web/reactos.org/htdocs/roscms/inc/404.php 2005-12-08 01:54:43 UTC (rev 19961) @@ -33,14 +33,14 @@ die("Hacking attempt"); } ?> -<h1>404 - Page not found</h1> -<h2>Page not found</h2> +<h1>404 - <?php echo $roscms_langres['Page_not_found'];?></h1> +<h2><?php echo $roscms_langres['Page_not_found'];?></h2> <p>Our Web server cannot find the page or file you asked for.</p> <p>The link you followed may be broken or expired. </p> <p>Please use one of the following links to find the information you are looking for:</p> <ul> - <li><a href="http://www.reactos.org/">www.reactos.org Homepage</a> </li> + <li><a href="http://www.reactos.org/">www.reactos.org <?php echo $roscms_langres['Mainmenu_label1'];?></a> </li> <li><a href="http://www.reactos.org/?page=sitemap">www.reactos.org Sitemap</a> </li> </ul> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/de.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/de.php 2005-12-08 00:52:03 UTC (rev 19960) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/de.php 2005-12-08 01:54:43 UTC (rev 19961) @@ -51,8 +51,8 @@ $roscms_langres['Navigation'] = 'Navigation'; $roscms_langres['Home'] = 'Startseite'; $roscms_langres['Dev'] = 'Entwicklung'; -$roscms_langres['Community'] = 'Gemeinschaft'; -$roscms_langres['Support'] = 'Unterst³tzung'; +$roscms_langres['Community'] = 'Community'; +$roscms_langres['Support'] = 'Support'; $roscms_langres['myReactOS'] = 'meinReactOS'; // Login bar: @@ -60,7 +60,7 @@ $roscms_langres['Login'] = 'Login'; $roscms_langres['Logout'] = 'Logout'; $roscms_langres['Global_Login_System'] = 'Login System'; -$roscms_langres['Register_Account'] = 'Account Registrieren'; +$roscms_langres['Register_Account'] = 'Registrieren'; $roscms_langres['Login_Nick'] = ' Nick: '; $roscms_langres['LoginPwd'] = ' Pwd: '; @@ -84,8 +84,10 @@ $roscms_langres['Account_Information_description'] = 'Eine Zusammenfassung ... <placeholder>'; // Right side bar: -$roscms_langres['Latest_Release'] = 'Neuste Ver÷ffentlichung'; +$roscms_langres['Latest_Release'] = 'Neueste Ver÷ffentlichung'; $roscms_langres['myReactOS_Developer_Quotes'] = 'Entwickler Zitat'; +// Error 404 +$roscms_langres['Page_not_found'] = 'Seite nicht gefunden'; ?> \ No newline at end of file _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php 2005-12-08 00:52:03 UTC (rev 19960) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php 2005-12-08 01:54:43 UTC (rev 19961) @@ -69,4 +69,8 @@ $roscms_langres['Latest_Release'] = 'Latest Release'; $roscms_langres['myReactOS_Developer_Quotes'] = 'Developer Quotes'; +// Error 404 +$roscms_langres['Page_not_found'] = 'Page not found'; + + ?> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php 2005-12-08 00:52:03 UTC (rev 19960) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php 2005-12-08 01:54:43 UTC (rev 19961) @@ -69,4 +69,8 @@ $roscms_langres['Latest_Release'] = 'Latest Release'; $roscms_langres['myReactOS_Developer_Quotes'] = 'Developer Quotes'; +// Error 404 +$roscms_langres['Page_not_found'] = 'Page not found'; + + ?> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/fr.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/fr.php 2005-12-08 00:52:03 UTC (rev 19960) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/fr.php 2005-12-08 01:54:43 UTC (rev 19961) @@ -69,4 +69,8 @@ $roscms_langres['Latest_Release'] = 'Latest Release'; $roscms_langres['myReactOS_Developer_Quotes'] = 'Developer Quotes'; +// Error 404 +$roscms_langres['Page_not_found'] = 'Page not found'; + + ?> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/ru.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/ru.php 2005-12-08 00:52:03 UTC (rev 19960) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/ru.php 2005-12-08 01:54:43 UTC (rev 19961) @@ -1,4 +1,4 @@ -<?php +´??<?php /* RosCMS - ReactOS Content Management System Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> @@ -69,4 +69,8 @@ $roscms_langres['Latest_Release'] = 'Latest Release'; $roscms_langres['myReactOS_Developer_Quotes'] = 'Developer Quotes'; +// Error 404 +$roscms_langres['Page_not_found'] = 'Page not found'; + + ?>

18 years, 9 months

[ion] 19960: - Temporary fix for making locale switches possible. Patch by zebasoftis. Fixes bug 481.

by ion＠svn.reactos.com

- Temporary fix for making locale switches possible. Patch by zebasoftis. Fixes bug 481. Modified: trunk/reactos/lib/cpl/intl/locale.c _____ Modified: trunk/reactos/lib/cpl/intl/locale.c --- trunk/reactos/lib/cpl/intl/locale.c 2005-12-08 00:38:57 UTC (rev 19959) +++ trunk/reactos/lib/cpl/intl/locale.c 2005-12-08 00:52:03 UTC (rev 19960) @@ -96,7 +96,23 @@ DWORD ret; TCHAR value[9]; DWORD valuesize; + WCHAR ACPPage[9]; + WCHAR OEMPage[9]; + ret = GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, (WORD*)OEMPage, sizeof(OEMPage)); + if (ret == 0) + { + MessageBoxW(NULL, L"Problem reading OEM code page", L"Big Problem", MB_OK); + return; + } + + GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, (WORD*)ACPPage, sizeof(ACPPage)); + if (ret == 0) + { + MessageBoxW(NULL, L"Problem reading ANSI code page", L"Big Problem", MB_OK); + return; + } + ret = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\International", &localeKey); if (ret != ERROR_SUCCESS) @@ -112,6 +128,21 @@ RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, valuesize); RegCloseKey(localeKey); + ret = RegOpenKeyW(HKEY_USERS, L".DEFAULT\\Control Panel\\International", &localeKey); + + if (ret != ERROR_SUCCESS) + { + // some serious error + MessageBoxW(NULL, L"Problem opening HKU\\.DEFAULT\\Control Panel\\International key", L"Big Problem", MB_OK); + return; + } + + wsprintf(value, L"%04X", (DWORD)lcid); + valuesize = (wcslen(value) + 1) * sizeof(WCHAR); + + RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, valuesize); + RegCloseKey(localeKey); + // Set language ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", &langKey); @@ -123,7 +154,24 @@ RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, valuesize ); RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, valuesize ); + RegCloseKey(langKey); + + + // Set language + ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage", &langKey); + + if (ret != ERROR_SUCCESS) + { + MessageBoxW(NULL, L"Problem opening HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage key", L"Big Problem", MB_OK); + return; + } + + RegSetValueExW(langKey, L"OEMCP", 0, REG_SZ, (BYTE *)OEMPage, (wcslen(OEMPage) +1 ) * sizeof(WCHAR) ); + RegSetValueExW(langKey, L"ACP", 0, REG_SZ, (BYTE *)ACPPage, (wcslen(ACPPage) +1 ) * sizeof(WCHAR) ); + + RegCloseKey(langKey); + } /* Property page dialog callback */

18 years, 9 months

[ion] 19959: - Allow TLS usage for 1088 TLS slots, fixes part of Bug 191. Patch by Filip Navara (navaraf@reactos.com)

by ion＠svn.reactos.com

- Allow TLS usage for 1088 TLS slots, fixes part of Bug 191. Patch by Filip Navara (navaraf(a)reactos.com) Modified: trunk/reactos/lib/kernel32/thread/tls.c _____ Modified: trunk/reactos/lib/kernel32/thread/tls.c --- trunk/reactos/lib/kernel32/thread/tls.c 2005-12-08 00:14:59 UTC (rev 19958) +++ trunk/reactos/lib/kernel32/thread/tls.c 2005-12-08 00:38:57 UTC (rev 19959) @@ -17,6 +17,7 @@ #define NDEBUG #include "../include/debug.h" +#define TLS_EXPANSION_SLOTS (8 * sizeof(((PPEB)NULL)->TlsExpansionBitmapBits)) /* FUNCTIONS *****************************************************************/ @@ -29,18 +30,49 @@ ULONG Index; RtlAcquirePebLock(); - Index = RtlFindClearBitsAndSet (NtCurrentPeb()->TlsBitmap, 1, 0); - if (Index == (ULONG)-1) - { - SetLastErrorByStatus(STATUS_NO_MEMORY); - } + + /* Try to get regular TEB slot. */ + Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsBitmap, 1, 0); + if (Index == ~0) + { + /* If it fails, try to find expansion TEB slot. */ + Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsExpansionBitmap, 1, 0); + if (Index != ~0) + { + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + NtCurrentTeb()->TlsExpansionSlots = HeapAlloc( + GetProcessHeap(), HEAP_ZERO_MEMORY, + TLS_EXPANSION_SLOTS * sizeof(PVOID)); + } + + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, Index, 1); + Index = ~0; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + /* Clear the value. */ + NtCurrentTeb()->TlsExpansionSlots[Index] = 0; + Index += TLS_MINIMUM_AVAILABLE; + } + } + else + { + SetLastError(ERROR_NO_MORE_ITEMS); + } + } else - { - NtCurrentTeb()->TlsSlots[Index] = 0; - } + { + /* Clear the value. */ + NtCurrentTeb()->TlsSlots[Index] = 0; + } + RtlReleasePebLock(); - return(Index); + return Index; } @@ -48,32 +80,47 @@ * @implemented */ BOOL STDCALL -TlsFree(DWORD dwTlsIndex) +TlsFree(DWORD Index) { - if (dwTlsIndex >= TLS_MINIMUM_AVAILABLE) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return(FALSE); - } + BOOL BitSet; + + if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return FALSE; + } RtlAcquirePebLock(); - if (RtlAreBitsSet(NtCurrentPeb()->TlsBitmap, dwTlsIndex, 1)) - { - /* - * clear the tls cells (slots) in all threads - * of the current process - */ - NtSetInformationThread(NtCurrentThread(), - ThreadZeroTlsCell, - &dwTlsIndex, - sizeof(DWORD)); - RtlClearBits(NtCurrentPeb()->TlsBitmap, - dwTlsIndex, - 1); - } + + if (Index >= TLS_MINIMUM_AVAILABLE) + { + BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsExpansionBitmap, + Index - TLS_MINIMUM_AVAILABLE, 1); + if (BitSet) + RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, + Index - TLS_MINIMUM_AVAILABLE, 1); + } + else + { + BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsBitmap, Index, 1); + if (BitSet) + RtlClearBits(NtCurrentPeb()->TlsBitmap, Index, 1); + } + + if (BitSet) + { + /* Clear the TLS cells (slots) in all threads of the current process. */ + NtSetInformationThread(NtCurrentThread(), ThreadZeroTlsCell, + &Index, sizeof(DWORD)); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } + RtlReleasePebLock(); - return(TRUE); + return BitSet; } @@ -81,22 +128,27 @@ * @implemented */ LPVOID STDCALL -TlsGetValue(DWORD dwTlsIndex) +TlsGetValue(DWORD Index) { - LPVOID Value; + if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return NULL; + } - if (dwTlsIndex >= TLS_MINIMUM_AVAILABLE) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return(NULL); - } + SetLastError(NO_ERROR); - Value = NtCurrentTeb()->TlsSlots[dwTlsIndex]; - if (Value == 0) + if (Index >= TLS_MINIMUM_AVAILABLE) { - SetLastError(NO_ERROR); + /* The expansion slots are allocated on demand, so check for it. */ + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + return NULL; + return NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE]; } - return Value; + else + { + return NtCurrentTeb()->TlsSlots[Index]; + } } @@ -104,15 +156,37 @@ * @implemented */ BOOL STDCALL -TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue) +TlsSetValue(DWORD Index, LPVOID Value) { - if (dwTlsIndex >= TLS_MINIMUM_AVAILABLE) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return(FALSE); - } - NtCurrentTeb()->TlsSlots[dwTlsIndex] = lpTlsValue; - return(TRUE); + if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return FALSE; + } + + if (Index >= TLS_MINIMUM_AVAILABLE) + { + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + NtCurrentTeb()->TlsExpansionSlots = HeapAlloc( + GetProcessHeap(), HEAP_ZERO_MEMORY, + TLS_EXPANSION_SLOTS * sizeof(PVOID)); + + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + + NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE] = Value; + } + else + { + NtCurrentTeb()->TlsSlots[Index] = Value; + } + + return TRUE; } /* EOF */

18 years, 9 months

[ion] 19958: - Add flags for NtCreateProcessEx for upcoming patch.

by ion＠svn.reactos.com

- Add flags for NtCreateProcessEx for upcoming patch. - Clear Tcb->Win32Thread during win32 cleanup. Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-12-08 00:13:11 UTC (rev 19957) +++ trunk/reactos/include/ndk/pstypes.h 2005-12-08 00:14:59 UTC (rev 19958) @@ -89,6 +89,18 @@ #define PROCESS_PRIORITY_CLASS_ABOVE_NORMAL 6 // +// NtCreateProcessEx flags +// +#define PS_REQUEST_BREAKAWAY 1 +#define PS_NO_DEBUG_INHERIT 2 +#define PS_INHERIT_HANDLES 4 +#define PS_UNKNOWN_VALUE 8 +#define PS_ALL_FLAGS (PS_REQUEST_BREAKAWAY | \ + PS_NO_DEBUG_INHERIT | \ + PS_INHERIT_HANDLES | \ + PS_UNKNOWN_VALUE) + +// // Process base priorities // #define PROCESS_PRIORITY_IDLE 3 _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-12-08 00:13:11 UTC (rev 19957) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-12-08 00:14:59 UTC (rev 19958) @@ -248,6 +248,7 @@ e = PopEntryList(&Win32Thread->ReferencesList); } + PsSetThreadWin32Thread(Thread, NULL); } RETURN( STATUS_SUCCESS);

18 years, 9 months

[ion] 19957: - Silence TCPIP.

by ion＠svn.reactos.com

- Silence TCPIP. Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c --- trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-12-07 22:19:46 UTC (rev 19956) +++ trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-12-08 00:13:11 UTC (rev 19957) @@ -14,7 +14,7 @@ #ifndef NDEBUG DWORD DebugTraceLevel = DEBUG_ULTRA & ~(DEBUG_LOCK | DEBUG_PBUFFER); #else -DWORD DebugTraceLevel = DEBUG_IRP; +DWORD DebugTraceLevel = 0; #endif /* NDEBUG */ PDEVICE_OBJECT TCPDeviceObject = NULL;

18 years, 9 months

← Newer
1
...
51
52
53
54
55
56
57
...
71
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 December 2005