Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[cgutman] 37249: - Don't hardcode the access mode

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Nov 7 21:13:30 2008 New Revision: 37249 URL: http://svn.reactos.org/svn/reactos?rev=37249&view=rev Log: - Don't hardcode the access mode Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Fri Nov 7 21:13:30 2008 @@ -25,7 +25,7 @@ NULL ); if( Irp->MdlAddress ) { _SEH_TRY { - MmProbeAndLockPages( Irp->MdlAddress, KernelMode, IoModifyAccess ); + MmProbeAndLockPages( Irp->MdlAddress, Irp->RequestorMode, IoModifyAccess ); } _SEH_HANDLE { LockFailed = TRUE; } _SEH_END; Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Nov 7 21:13:30 2008 @@ -853,7 +853,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -862,7 +862,7 @@ } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); @@ -934,7 +934,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -944,7 +944,7 @@ _SEH_TRY { AFD_DbgPrint(MIN_TRACE, ("probe and lock\n")); - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); AFD_DbgPrint(MIN_TRACE, ("probe and lock done\n")); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); @@ -1034,7 +1034,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -1043,7 +1043,7 @@ } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); @@ -1132,7 +1132,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1142,7 +1142,7 @@ } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl);

15 years, 10 months

[cgutman] 37248: - Check the status of IPSendDatagram - Validate the protocol - Use the hash value of the NCE address to get the lock - Simplify TCPAbortListenForSocket - Hardcode the length of the array

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Nov 7 14:31:34 2008 New Revision: 37248 URL: http://svn.reactos.org/svn/reactos?rev=37248&view=rev Log: - Check the status of IPSendDatagram - Validate the protocol - Use the hash value of the NCE address to get the lock - Simplify TCPAbortListenForSocket - Hardcode the length of the array Modified: branches/aicom-network-fixes/lib/drivers/ip/network/icmp.c branches/aicom-network-fixes/lib/drivers/ip/network/ip.c branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/icmp.c [iso-8859-1] Fri Nov 7 14:31:34 2008 @@ -181,6 +181,7 @@ */ { PNEIGHBOR_CACHE_ENTRY NCE; + NTSTATUS Status; TI_DbgPrint(DEBUG_ICMP, ("Called.\n")); @@ -191,7 +192,11 @@ /* Get a route to the destination address */ if ((NCE = RouteGetRouteToDestination(&IPPacket->DstAddr))) { /* Send the packet */ - IPSendDatagram(IPPacket, NCE, Complete, Context); + Status = IPSendDatagram(IPPacket, NCE, Complete, Context); + if (!NT_SUCCESS(Status)) + { + Complete(Context, IPPacket->NdisPacket, Status); + } } else { /* No route to destination (or no free resources) */ TI_DbgPrint(DEBUG_ICMP, ("No route to destination address 0x%X.\n", Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] Fri Nov 7 14:31:34 2008 @@ -150,12 +150,17 @@ Protocol = 0; } - /* Call the appropriate protocol handler */ - (*ProtocolTable[Protocol])(Interface, IPPacket); - /* Special case for ICMP -- ICMP can be caught by a SOCK_RAW but also - * must be handled here. */ - if( Protocol == IPPROTO_ICMP ) - ICMPReceive( Interface, IPPacket ); + if (Protocol < IP_PROTOCOL_TABLE_SIZE && + Protocol >= 0) + { + /* Call the appropriate protocol handler */ + (*ProtocolTable[Protocol])(Interface, IPPacket); + + /* Special case for ICMP -- ICMP can be caught by a SOCK_RAW but also + * must be handled here. */ + if( Protocol == IPPROTO_ICMP ) + ICMPReceive( Interface, IPPacket ); + } } Modified: branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c [iso-8859-1] Fri Nov 7 14:31:34 2008 @@ -28,13 +28,20 @@ VOID NBSendPackets( PNEIGHBOR_CACHE_ENTRY NCE ) { PLIST_ENTRY PacketEntry; PNEIGHBOR_PACKET Packet; + UINT HashValue; if(!(NCE->State & NUD_CONNECTED)) return; + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + /* Send any waiting packets */ PacketEntry = ExInterlockedRemoveHeadList(&NCE->PacketQueue, - &NCE->Table->Lock); + &NeighborCache[HashValue].Lock); if( PacketEntry != NULL ) { Packet = CONTAINING_RECORD( PacketEntry, NEIGHBOR_PACKET, Next ); @@ -333,15 +340,22 @@ */ { KIRQL OldIrql; + UINT HashValue; TI_DbgPrint(DEBUG_NCACHE, ("Called. NCE (0x%X) LinkAddress (0x%X) State (0x%X).\n", NCE, LinkAddress, State)); - TcpipAcquireSpinLock(&NCE->Table->Lock, &OldIrql); + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + + TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); RtlCopyMemory(NCE->LinkAddress, LinkAddress, NCE->LinkAddressLength); NCE->State = State; - TcpipReleaseSpinLock(&NCE->Table->Lock, OldIrql); + TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); if( NCE->State & NUD_CONNECTED ) NBSendPackets( NCE ); @@ -444,9 +458,9 @@ * TRUE if the packet was successfully queued, FALSE if not */ { - PKSPIN_LOCK Lock; KIRQL OldIrql; PNEIGHBOR_PACKET Packet; + UINT HashValue; TI_DbgPrint (DEBUG_NCACHE, @@ -457,16 +471,20 @@ /* FIXME: Should we limit the number of queued packets? */ - Lock = &NCE->Table->Lock; - - TcpipAcquireSpinLock(Lock, &OldIrql); + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + + TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); Packet->Complete = PacketComplete; Packet->Context = PacketContext; Packet->Packet = NdisPacket; InsertTailList( &NCE->PacketQueue, &Packet->Next ); - TcpipReleaseSpinLock(Lock, OldIrql); + TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); if( NCE->State & NUD_CONNECTED ) NBSendPackets( NCE ); Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Fri Nov 7 14:31:34 2008 @@ -112,13 +112,14 @@ ListEntry = Listener->ListenRequest.Flink; while ( ListEntry != &Listener->ListenRequest ) { Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); - ListEntry = ListEntry->Flink; if( Bucket->AssociatedEndpoint == Connection ) { - RemoveEntryList( ListEntry->Blink ); + RemoveEntryList( &Bucket->Entry ); ExFreePool( Bucket ); break; } + + ListEntry = ListEntry->Flink; } TcpipRecursiveMutexLeave( &TCPLock ); Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Fri Nov 7 14:31:34 2008 @@ -36,7 +36,6 @@ /* Things that can happen when we try the initial connection */ if( NewState & SEL_CONNECT ) { while( !IsListEmpty( &Connection->ConnectRequest ) ) { - Connection->State |= NewState; Entry = RemoveHeadList( &Connection->ConnectRequest ); TI_DbgPrint(DEBUG_TCP, ("Connect Event\n")); @@ -838,7 +837,7 @@ TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); - for( i = 0; i < sizeof( ListHead ) / sizeof( ListHead[0] ); i++ ) { + for( i = 0; i < 4; i++ ) { for( Entry = ListHead[i]->Flink; Entry != ListHead[i]; Entry = Entry->Flink ) {

15 years, 10 months

[cgutman] 37247: - Close the connection before freeing it

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Nov 7 13:12:26 2008 New Revision: 37247 URL: http://svn.reactos.org/svn/reactos?rev=37247&view=rev Log: - Close the connection before freeing it Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Fri Nov 7 13:12:26 2008 @@ -283,8 +283,7 @@ } VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) { - TI_DbgPrint(MAX_TRACE,("FIXME: Cancel all pending requests\n")); - /* XXX Cancel all pending requests */ + TCPClose( Connection ); ExFreePool( Connection ); }

15 years, 10 months

[mjmartin] 37246: - RSetServiceStatus: Don't return ERROR_INVALID_DATA when dwControlsAccepted = 0. Services can and will do this, for example when dwCurrentState is SERVICE_START_PENDING. See bug #3817 for more info.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri Nov 7 13:10:39 2008 New Revision: 37246 URL: http://svn.reactos.org/svn/reactos?rev=37246&view=rev Log: - RSetServiceStatus: Don't return ERROR_INVALID_DATA when dwControlsAccepted = 0. Services can and will do this, for example when dwCurrentState is SERVICE_START_PENDING. See bug #3817 for more info. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Nov 7 13:10:39 2008 @@ -1041,8 +1041,7 @@ } /* Check accepted controls */ - if (lpServiceStatus->dwControlsAccepted == 0 || - lpServiceStatus->dwControlsAccepted & ~0xFF) + if (lpServiceStatus->dwControlsAccepted & ~0xFF) { DPRINT1("Invalid controls accepted!\n"); return ERROR_INVALID_DATA;

15 years, 10 months

[fireball] 37245: - Fix build.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Nov 7 12:20:18 2008 New Revision: 37245 URL: http://svn.reactos.org/svn/reactos?rev=37245&view=rev Log: - Fix build. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Fri Nov 7 12:20:18 2008 @@ -9206,7 +9206,7 @@ * IN PDRIVER_CANCEL CancelRoutine) */ #define IoSetCancelRoutine( Irp, NewCancelRoutine ) ( \ - InterlockedExchange( (PLONG)&(Irp)->CancelRoutine, (LONG)(NewCancelRoutine) ) ) + (PDRIVER_CANCEL)InterlockedExchange( (PLONG)&(Irp)->CancelRoutine, (LONG)(NewCancelRoutine) ) ) /*

15 years, 10 months

[fireball] 37244: - Add missing definitions to headers. - Do not use "with tag" when freeing the system buffer, because drivers are allowed to re-allocate their own buffer, which may have a different tag.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Nov 7 11:40:44 2008 New Revision: 37244 URL: http://svn.reactos.org/svn/reactos?rev=37244&view=rev Log: - Add missing definitions to headers. - Do not use "with tag" when freeing the system buffer, because drivers are allowed to re-allocate their own buffer, which may have a different tag. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Nov 7 11:40:44 2008 @@ -1639,6 +1639,65 @@ PVOID TableContext; } RTL_GENERIC_TABLE, *PRTL_GENERIC_TABLE; +typedef struct _UNICODE_PREFIX_TABLE_ENTRY +{ + CSHORT NodeTypeCode; + CSHORT NameLength; + struct _UNICODE_PREFIX_TABLE_ENTRY *NextPrefixTree; + struct _UNICODE_PREFIX_TABLE_ENTRY *CaseMatch; + RTL_SPLAY_LINKS Links; + PUNICODE_STRING Prefix; +} UNICODE_PREFIX_TABLE_ENTRY, *PUNICODE_PREFIX_TABLE_ENTRY; + +typedef struct _UNICODE_PREFIX_TABLE +{ + CSHORT NodeTypeCode; + CSHORT NameLength; + PUNICODE_PREFIX_TABLE_ENTRY NextPrefixTree; + PUNICODE_PREFIX_TABLE_ENTRY LastNextEntry; +} UNICODE_PREFIX_TABLE, *PUNICODE_PREFIX_TABLE; + +NTSYSAPI +VOID +NTAPI +RtlInitializeUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable +); + +NTSYSAPI +BOOLEAN +NTAPI +RtlInsertUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN PUNICODE_STRING Prefix, + IN PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry +); + +NTSYSAPI +VOID +NTAPI +RtlRemoveUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry +); + +NTSYSAPI +PUNICODE_PREFIX_TABLE_ENTRY +NTAPI +RtlFindUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN PUNICODE_STRING FullName, + IN ULONG CaseInsensitiveIndex +); + +NTSYSAPI +PUNICODE_PREFIX_TABLE_ENTRY +NTAPI +RtlNextUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN BOOLEAN Restart +); + #undef PRTL_GENERIC_COMPARE_ROUTINE #undef PRTL_GENERIC_ALLOCATE_ROUTINE #undef PRTL_GENERIC_FREE_ROUTINE Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Fri Nov 7 11:40:44 2008 @@ -9205,12 +9205,11 @@ * IN PIRP Irp, * IN PDRIVER_CANCEL CancelRoutine) */ -#define IoSetCancelRoutine(_Irp, \ - _CancelRoutine) \ - ((PDRIVER_CANCEL) InterlockedExchangePointer( \ - (PVOID *) &(_Irp)->CancelRoutine, (PVOID) (_CancelRoutine))) - -/* +#define IoSetCancelRoutine( Irp, NewCancelRoutine ) ( \ + InterlockedExchange( (PLONG)&(Irp)->CancelRoutine, (LONG)(NewCancelRoutine) ) ) + + + /* * VOID * IoSetCompletionRoutine( * IN PIRP Irp, Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Fri Nov 7 11:40:44 2008 @@ -286,7 +286,7 @@ if (Irp->Flags & IRP_DEALLOCATE_BUFFER) { /* Deallocate it */ - ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); + ExFreePool(Irp->AssociatedIrp.SystemBuffer); } } @@ -976,7 +976,7 @@ Irp->Cancel = TRUE; /* Clear the cancel routine and get the old one */ - CancelRoutine = IoSetCancelRoutine(Irp, NULL); + CancelRoutine = (PVOID)IoSetCancelRoutine(Irp, NULL); if (CancelRoutine) { /* We had a routine, make sure the IRP isn't completed */

15 years, 10 months

[mjmartin] 37243: - Check for GetServiceConfig returning NULL, which occurs if entries for the service are not in registry.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri Nov 7 07:39:11 2008 New Revision: 37243 URL: http://svn.reactos.org/svn/reactos?rev=37243&view=rev Log: - Check for GetServiceConfig returning NULL, which occurs if entries for the service are not in registry. Modified: trunk/reactos/base/applications/mscutils/servman/listview.c Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] Fri Nov 7 07:39:11 2008 @@ -174,11 +174,14 @@ lpServiceConfig = GetServiceConfig(pService->lpServiceName); - switch (lpServiceConfig->dwStartType) + if (lpServiceConfig) { - case 2: StringId = IDS_SERVICES_AUTO; break; - case 3: StringId = IDS_SERVICES_MAN; break; - case 4: StringId = IDS_SERVICES_DIS; break; + switch (lpServiceConfig->dwStartType) + { + case 2: StringId = IDS_SERVICES_AUTO; break; + case 3: StringId = IDS_SERVICES_MAN; break; + case 4: StringId = IDS_SERVICES_DIS; break; + } } if (StringId)

15 years, 10 months

[gedmurphy] 37242: fix return logic typo

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Nov 7 06:58:33 2008 New Revision: 37242 URL: http://svn.reactos.org/svn/reactos?rev=37242&view=rev Log: fix return logic typo Modified: trunk/reactos/base/services/rpcss/service_main.c Modified: trunk/reactos/base/services/rpcss/service_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/servic… ============================================================================== --- trunk/reactos/base/services/rpcss/service_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/service_main.c [iso-8859-1] Fri Nov 7 06:58:33 2008 @@ -124,5 +124,5 @@ {NULL, NULL } }; - return (int)(StartServiceCtrlDispatcherW(ServiceTable) != 0); + return (int)(StartServiceCtrlDispatcherW(ServiceTable) != TRUE); }

15 years, 10 months

[gedmurphy] 37241: Convert rpcss back to a service

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Nov 7 06:49:51 2008 New Revision: 37241 URL: http://svn.reactos.org/svn/reactos?rev=37241&view=rev Log: Convert rpcss back to a service Added: trunk/reactos/base/services/rpcss/rpcss_ros.diff trunk/reactos/base/services/rpcss/service_main.c (with props) Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild trunk/reactos/base/services/rpcss/rpcss_main.c Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] Fri Nov 7 06:49:51 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe"> +<module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe" unicode="yes"> <include base="rpcss">.</include> <include base="rpcss" root="intermediate">.</include> <library>wine</library> @@ -9,9 +9,10 @@ <library>rpcrt4</library> <library>kernel32</library> <library>advapi32</library> - <file>rpcss_main.c</file> <file>epmp.c</file> <file>irotp.c</file> + <file>rpcss_main.c</file> + <file>service_main.c</file> <file>epm.idl</file> <file>irot.idl</file> <file>rpcss.rc</file> Modified: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Fri Nov 7 06:49:51 2008 @@ -62,7 +62,7 @@ //extern HANDLE __wine_make_process_system(void); -static BOOL RPCSS_Initialize(void) +BOOL RPCSS_Initialize(void) { static unsigned short irot_protseq[] = IROT_PROTSEQ; static unsigned short irot_endpoint[] = IROT_ENDPOINT; @@ -116,7 +116,7 @@ /* returns false if we discover at the last moment that we aren't ready to terminate */ -static BOOL RPCSS_Shutdown(void) +BOOL RPCSS_Shutdown(void) { RpcMgmtStopServerListening(NULL); RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); @@ -127,6 +127,7 @@ return TRUE; } +#if 0 int main( int argc, char **argv ) { /* @@ -142,3 +143,4 @@ return 0; } +#endif Added: trunk/reactos/base/services/rpcss/rpcss_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_ros.diff (added) +++ trunk/reactos/base/services/rpcss/rpcss_ros.diff [iso-8859-1] Fri Nov 7 06:49:51 2008 @@ -1,0 +1,35 @@ +Index: rpcss_main.c +=================================================================== +--- rpcss_main.c (revision 37240) ++++ rpcss_main.c (working copy) +@@ -62,7 +62,7 @@ + + //extern HANDLE __wine_make_process_system(void); + +-static BOOL RPCSS_Initialize(void) ++BOOL RPCSS_Initialize(void) + { + static unsigned short irot_protseq[] = IROT_PROTSEQ; + static unsigned short irot_endpoint[] = IROT_ENDPOINT; +@@ -116,7 +116,7 @@ + + /* returns false if we discover at the last moment that we + aren't ready to terminate */ +-static BOOL RPCSS_Shutdown(void) ++BOOL RPCSS_Shutdown(void) + { + RpcMgmtStopServerListening(NULL); + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); +@@ -127,6 +127,7 @@ + return TRUE; + } + ++#if 0 + int main( int argc, char **argv ) + { + /* +@@ -142,3 +143,4 @@ + + return 0; + } ++#endif Added: trunk/reactos/base/services/rpcss/service_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/servic… ============================================================================== --- trunk/reactos/base/services/rpcss/service_main.c (added) +++ trunk/reactos/base/services/rpcss/service_main.c [iso-8859-1] Fri Nov 7 06:49:51 2008 @@ -1,0 +1,128 @@ +/* + * PROJECT: ReactOS Remote Procedure Call service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: /base/services/rpcss/service_main.c + * PURPOSE: Service control code + * COPYRIGHT: Copyright 2008 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include "rpcss.h" + +BOOL RPCSS_Initialize(void); +BOOL RPCSS_Shutdown(void); + +static WCHAR ServiceName[] = L"RpcSs"; + +typedef struct _ServiceInfo +{ + SERVICE_STATUS servStatus; + SERVICE_STATUS_HANDLE hStatus; +} SERVICEINFO, *PSERVICEINFO; + + +static VOID +UpdateStatus(PSERVICEINFO pServInfo, + DWORD NewStatus, + DWORD Check) +{ + if (Check > 0) + { + pServInfo->servStatus.dwCheckPoint += Check; + } + else + { + pServInfo->servStatus.dwCheckPoint = Check; + } + + if (NewStatus > 0) + { + pServInfo->servStatus.dwCurrentState = NewStatus; + } + + SetServiceStatus(pServInfo->hStatus, &pServInfo->servStatus); +} + + +static BOOL +RunService(PSERVICEINFO pServInfo) +{ + return RPCSS_Initialize(); +} + +VOID WINAPI +ServerCtrlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + PSERVICEINFO pServInfo = (PSERVICEINFO)lpContext; + + switch (dwControl) + { + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + RPCSS_Shutdown(); + pServInfo->servStatus.dwWin32ExitCode = 0; + pServInfo->servStatus.dwWaitHint = 0; + UpdateStatus(pServInfo, SERVICE_STOP_PENDING, 1); + break; + + default: + break; + } +} + +VOID WINAPI +ServiceMain(DWORD argc, LPWSTR argv[]) +{ + SERVICEINFO servInfo; + HANDLE hThread; + DWORD dwThreadId; + + servInfo.servStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + servInfo.servStatus.dwCurrentState = SERVICE_STOPPED; + servInfo.servStatus.dwControlsAccepted = SERVICE_ACCEPT_SHUTDOWN; + servInfo.servStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; + servInfo.servStatus.dwServiceSpecificExitCode = 0; + servInfo.servStatus.dwCheckPoint = 0; + servInfo.servStatus.dwWaitHint = 1000; + + servInfo.hStatus = RegisterServiceCtrlHandlerExW(ServiceName, + (LPHANDLER_FUNCTION_EX)ServerCtrlHandler, + &servInfo); + if (!servInfo.hStatus) return; + + UpdateStatus(&servInfo, SERVICE_START_PENDING, 1); + + /* Create worker thread */ + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE)RunService, + &servInfo, + 0, + &dwThreadId); + if (!hThread) return; + + /* Set service status to running */ + UpdateStatus(&servInfo, SERVICE_RUNNING, 0); + + /* Wait until thread has terminated */ + WaitForSingleObject(hThread, INFINITE); + + CloseHandle(hThread); + + UpdateStatus(&servInfo, SERVICE_STOPPED, 0); +} + + +int wmain(int argc, LPWSTR argv []) +{ + SERVICE_TABLE_ENTRYW ServiceTable[] = + { + {ServiceName, ServiceMain}, + {NULL, NULL } + }; + + return (int)(StartServiceCtrlDispatcherW(ServiceTable) != 0); +} Propchange: trunk/reactos/base/services/rpcss/service_main.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 10 months

[fireball] 37240: - Sync ole32 to Wine-20081105 (matching rpcrt4 sync). Tested with two versions of FoxIt for bug #2361, it doesn't happen. Also tested with MS Office 2003 installation (which goes up to "Writing system registry values"). - Remove epm server building from rpcrt4, it belongs to rpcss.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Nov 7 05:00:30 2008 New Revision: 37240 URL: http://svn.reactos.org/svn/reactos?rev=37240&view=rev Log: - Sync ole32 to Wine-20081105 (matching rpcrt4 sync). Tested with two versions of FoxIt for bug #2361, it doesn't happen. Also tested with MS Office 2003 installation (which goes up to "Writing system registry values"). - Remove epm server building from rpcrt4, it belongs to rpcss. Added: trunk/reactos/dll/win32/ole32/comcat.c (with props) Modified: trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/dcom.idl trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/moniker.h trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole2nls.c trunk/reactos/dll/win32/ole32/ole2stubs.c trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/regsvr.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/usrmarshal.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… Added: trunk/reactos/dll/win32/ole32/comcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/comcat.c?r… Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… Modified: trunk/reactos/dll/win32/ole32/dcom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dcom.idl?r… Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Modified: trunk/reactos/dll/win32/ole32/moniker.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.h?… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Modified: trunk/reactos/dll/win32/ole32/ole2nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2nls.c?… Modified: trunk/reactos/dll/win32/ole32/ole2stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2stubs.… Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… Modified: trunk/reactos/dll/win32/ole32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/regsvr.c?r… Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb…

15 years, 10 months

← Newer
1
...
51
52
53
54
55
56
57
...
66
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 November 2008