Ros-dev October 2008

ros-dev@reactos.org

38 participants
47 discussions

Re : [ros-diffs] [pschweitzer] 36771: Apply fix at the right place.......

by Sylvain Petreolle

Good old patch seems ok to me. Kind regards, Sylvain Petreolle Support artists, not multinationals - http://Iwouldntsteal.net Supportez les artistes, pas les multinationales - http://Iwouldntsteal.net ----- Message d'origine ---- > De : Pierre SCHWEITZER <heis_spiter(a)hotmail.com> > À : ReactOS Development List <ros-dev(a)reactos.org> > Envoyé le : Vendredi, 17 Octobre 2008, 14h37mn 51s > Objet : Re: [ros-dev] [ros-diffs] [pschweitzer] 36771: Apply fix at the right place....... > > > Shamefully, yes. > I didn't find good programme to do it under Linux. Speaking of that, if someone > using Linux could give me some pieces of advice about GUI svn clients under > Linux, I would be glad :). > TIA, > Pierre > ---------------------------------------- > > From: aleksey(a)reactos.org > > Date: Fri, 17 Oct 2008 10:44:46 +0400 > > To: ros-dev(a)reactos.org > > Subject: Re: [ros-dev] [ros-diffs] [pschweitzer] 36771: Apply fix at the > right place....... > > > > Are you merging manually? > > > > On Oct 16, 2008, at 10:21 PM, pschweitzer(a)svn.reactos.org wrote: > > > >> Author: pschweitzer > >> Date: Thu Oct 16 13:21:05 2008 > >> New Revision: 36771 > >> > >> URL: http://svn.reactos.org/svn/reactos?rev=36771&view=rev > >> Log: > >> Apply fix at the right place....... > > > > _______________________________________________ > > Ros-dev mailing list > > Ros-dev(a)reactos.org > > http://www.reactos.org/mailman/listinfo/ros-dev > > _________________________________________________________________ > Inédit ! Des Emoticônes Déjantées! Installez les dans votre Messenger ! > http://www.ilovemessenger.fr/Emoticones/EmoticonesDejantees.aspx > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev

16 years, 2 months

Re: [ros-dev] [ros-diffs] [pschweitzer] 36771: Apply fix at the right place.......

by Aleksey Bragin

Are you merging manually? On Oct 16, 2008, at 10:21 PM, pschweitzer(a)svn.reactos.org wrote: > Author: pschweitzer > Date: Thu Oct 16 13:21:05 2008 > New Revision: 36771 > > URL: http://svn.reactos.org/svn/reactos?rev=36771&view=rev > Log: > Apply fix at the right place.......

16 years, 2 months

Re: [ros-dev] [ros-diffs] [sginsberg] 36773: - Unbreak GetTextFaceA/W, broken since 28730 by GreatLord

by gedmurphy

Why do you need to publically state it was broken and who broke it? Does it make you feel more important and help to boost your ego? -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of sginsberg(a)svn.reactos.org Sent: 16 October 2008 21:02 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [sginsberg] 36773: - Unbreak GetTextFaceA/W, broken since 28730 by GreatLord Author: sginsberg Date: Thu Oct 16 15:02:22 2008 New Revision: 36773 URL: http://svn.reactos.org/svn/reactos?rev=36773&view=rev Log: - Unbreak GetTextFaceA/W, broken since 28730 by GreatLord Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Thu Oct 16 15:02:22 2008 @@ -358,20 +358,24 @@ * @implemented */ INT -STDCALL +WINAPI GetTextFaceW(HDC hDC, - int nCount, - LPWSTR lpFaceName) -{ - INT retValue = 0; - if ((!lpFaceName) || (nCount)) - { - retValue = NtGdiGetTextFaceW(hDC,nCount,lpFaceName,0); + INT nCount, + PWSTR pFaceName) +{ + INT retValue; + + if ((pFaceName && nCount) || + !(pFaceName && nCount)) + { + retValue = NtGdiGetTextFaceW(hDC, nCount, pFaceName, 0); } else { SetLastError(ERROR_INVALID_PARAMETER); - } + retValue = 0; + } + return retValue; }

16 years, 2 months

36773: - Unbreak GetTextFaceA/W, broken since 28730 by GreatLord

by Sylvain Petreolle

Isnt that condition always true ? + if ((pFaceName && nCount) || + !(pFaceName && nCount)) Kind regards, Sylvain Petreolle Support artists, not multinationals - http://Iwouldntsteal.net Supportez les artistes, pas les multinationales - http://Iwouldntsteal.net

16 years, 2 months

Re: [ros-dev] [ros-diffs] [janderwald] 36762: - Implement Advanced Status IP Information Dialog - Import language strings from netcfgx - Add icon group (32x32) - ncpa is now a candidate for deletion

by gedmurphy

Well, we can't actually delete ncpa, it just needs to be rewritten to use the netshell library instead. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of janderwald(a)svn.reactos.org Sent: 15 October 2008 18:21 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [janderwald] 36762: - Implement Advanced Status IP Information Dialog - Import language strings from netcfgx - Add icon group (32x32) - ncpa is now a candidate for deletion - ncpa is now a candidate for deletion

16 years, 2 months

Re: [ros-dev] [ros-diffs] [hyperion] 36761: added lib/rtl/rtl-common.rbuild modified lib/rtl/rtl.rbuild Compile rtl twice, as rtl_umode and rtl_kmode. Allows conditional compilation of RTL (finally!), instead of necessitating hacks like RtlpGetMode() "rtl" mod

by Alex Ionescu

Well, you just removed the one thing ReactOS did different from NT and that I thought was really revolutionary and innovative, because it saves on compile time. It's funny, because I've been trying to sell this as a better approach to building RTL (It's built at least 4 times in the real NT tree, I think -- loader, user-mode tools/testing, kernel, user-mode). Best regards, Alex Ionescu On Wed, Oct 15, 2008 at 11:45 AM, <hyperion(a)svn.reactos.org> wrote: > Author: hyperion > Date: Wed Oct 15 10:45:11 2008 > New Revision: 36761 > > URL: http://svn.reactos.org/svn/reactos?rev=36761&view=rev > Log: > added lib/rtl/rtl-common.rbuild > modified lib/rtl/rtl.rbuild > Compile rtl twice, as rtl_umode and rtl_kmode. Allows conditional compilation of RTL (finally!), instead of necessitating hacks like RtlpGetMode() > "rtl" module now a dummy static library for things like <include base="rtl"> > > modified boot/freeldr/freeldr/freeldr.rbuild > modified boot/freeldr/freeldr/setupldr.rbuild > modified ntoskrnl/ntoskrnl-generic.rbuild > rtl -> rtl_kmode > > modified dll/ntdll/ntdll.rbuild > rtl -> rtl_umode > > This commit dedicated to Fireball and Stefan100 (now get to work! >:3) > > Added: > trunk/reactos/lib/rtl/rtl-common.rbuild (with props) > Modified: > trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild > trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild > trunk/reactos/dll/ntdll/ntdll.rbuild > trunk/reactos/lib/rtl/rtl.rbuild > trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild > > Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Wed Oct 15 10:45:11 2008 > @@ -11,7 +11,7 @@ > <library>freeldr_main</library> > <library>rossym</library> > <library>cmlib</library> > - <library>rtl</library> > + <library>rtl_kmode</library> > <library>libcntpr</library> > <linkerflag>-static</linkerflag> > <linkerflag>-lgcc</linkerflag> > > Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Wed Oct 15 10:45:11 2008 > @@ -9,7 +9,7 @@ > <library>setupldr_main</library> > <library>rossym</library> > <library>cmlib</library> > - <library>rtl</library> > + <library>rtl_kmode</library> > <library>libcntpr</library> > <linkerflag>-nostartfiles</linkerflag> > <linkerflag>-nostdlib</linkerflag> > > Modified: trunk/reactos/dll/ntdll/ntdll.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… > ============================================================================== > --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) > +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Wed Oct 15 10:45:11 2008 > @@ -12,7 +12,7 @@ > <define name="_WIN32_WINNT">0x0502</define> > <define name="_NTOSKRNL_" /> > <define name="__NO_CTYPE_INLINES" /> > - <library>rtl</library> > + <library>rtl_umode</library> > <library>ntdllsys</library> > <library>libcntpr</library> > <library>pseh</library> > > Added: trunk/reactos/lib/rtl/rtl-common.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl-common.rbuild?… > ============================================================================== > --- trunk/reactos/lib/rtl/rtl-common.rbuild (added) > +++ trunk/reactos/lib/rtl/rtl-common.rbuild [iso-8859-1] Wed Oct 15 10:45:11 2008 > @@ -1,0 +1,98 @@ > +<?xml version="1.0"?> > + > +<include base="rtl">.</include> > +<define name="_NTOSKRNL_" /> > +<define name="__NO_CTYPE_INLINES" /> > +<define name="NO_RTL_INLINES" /> > +<define name="_NTSYSTEM_" /> > +<define name="_NTDLLBUILD_" /> > +<if property="ARCH" value="i386"> > + <directory name="i386"> > + <file>debug_asm.S</file> > + <file>except_asm.s</file> > + <file>except.c</file> > + <file>random_asm.S</file> > + <file>rtlswap.S</file> > + <file>rtlmem.s</file> > + <file>res_asm.s</file> > + <file>thread.c</file> > + </directory> > +</if> > +<if property="ARCH" value="powerpc"> > +<directory name="powerpc"> > + <file>debug.c</file> > + <file>except.c</file> > + <file>interlocked.c</file> > + <file>rtlmem.s</file> > + <file>rtlswap.s</file> > + <file>thread.c</file> > +</directory> > +</if> > +<if property="ARCH" value="arm"> > + <directory name="arm"> > + <file>debug_asm.S</file> > + </directory> > + <file>mem.c</file> > + <file>memgen.c</file> > +</if> > +<directory name="austin"> > + <file>avl.c</file> > + <file>tree.c</file> > +</directory> > + > +<file>access.c</file> > +<file>acl.c</file> > +<file>actctx.c</file> > +<file>atom.c</file> > +<file>bitmap.c</file> > +<file>bootdata.c</file> > +<file>compress.c</file> > +<file>condvar.c</file> > +<file>crc32.c</file> > +<file>critical.c</file> > +<file>dbgbuffer.c</file> > +<file>debug.c</file> > +<file>dos8dot3.c</file> > +<file>encode.c</file> > +<file>env.c</file> > +<file>error.c</file> > +<file>exception.c</file> > +<file>generictable.c</file> > +<file>handle.c</file> > +<file>heap.c</file> > +<file>image.c</file> > +<file>interlck.c</file> > +<file>message.c</file> > +<file>largeint.c</file> > +<file>luid.c</file> > +<file>network.c</file> > +<file>nls.c</file> > +<file>path.c</file> > +<file>ppb.c</file> > +<file>process.c</file> > +<file>propvar.c</file> > +<file>qsort.c</file> > +<file>random.c</file> > +<file>rangelist.c</file> > +<file>registry.c</file> > +<file>res.c</file> > +<file>resource.c</file> > +<file>sd.c</file> > +<file>security.c</file> > +<file>slist.c</file> > +<file>sid.c</file> > +<file>sprintf.c</file> > +<file>srw.c</file> > +<file>swprintf.c</file> > +<file>splaytree.c</file> > +<file>thread.c</file> > +<file>time.c</file> > +<file>timezone.c</file> > +<file>timerqueue.c</file> > +<file>unicode.c</file> > +<file>unicodeprefix.c</file> > +<file>vectoreh.c</file> > +<file>version.c</file> > +<file>wait.c</file> > +<file>workitem.c</file> > +<pch>rtl.h</pch> > > Propchange: trunk/reactos/lib/rtl/rtl-common.rbuild > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: trunk/reactos/lib/rtl/rtl.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=367… > ============================================================================== > --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) > +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Wed Oct 15 10:45:11 2008 > @@ -1,100 +1,15 @@ > <?xml version="1.0"?> > <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> > -<module name="rtl" type="staticlibrary"> > - <define name="_NTOSKRNL_" /> > - <define name="__NO_CTYPE_INLINES" /> > - <define name="NO_RTL_INLINES" /> > - <define name="_NTSYSTEM_" /> > - <define name="_NTDLLBUILD_" /> > - <include base="rtl">.</include> > - <if property="ARCH" value="i386"> > - <directory name="i386"> > - <file>debug_asm.S</file> > - <file>except_asm.s</file> > - <file>except.c</file> > - <file>random_asm.S</file> > - <file>rtlswap.S</file> > - <file>rtlmem.s</file> > - <file>res_asm.s</file> > - <file>thread.c</file> > - </directory> > - </if> > - <if property="ARCH" value="powerpc"> > - <directory name="powerpc"> > - <file>debug.c</file> > - <file>except.c</file> > - <file>interlocked.c</file> > - <file>rtlmem.s</file> > - <file>rtlswap.s</file> > - <file>thread.c</file> > - </directory> > - </if> > - <if property="ARCH" value="arm"> > - <directory name="arm"> > - <file>debug_asm.S</file> > - </directory> > - <file>mem.c</file> > - <file>memgen.c</file> > - </if> > - <directory name="austin"> > - <file>avl.c</file> > - <file>tree.c</file> > - </directory> > > - <file>access.c</file> > - <file>acl.c</file> > - <file>actctx.c</file> > - <file>atom.c</file> > - <file>bitmap.c</file> > - <file>bootdata.c</file> > - <file>compress.c</file> > - <file>condvar.c</file> > - <file>crc32.c</file> > - <file>critical.c</file> > - <file>dbgbuffer.c</file> > - <file>debug.c</file> > - <file>dos8dot3.c</file> > - <file>encode.c</file> > - <file>env.c</file> > - <file>error.c</file> > - <file>exception.c</file> > - <file>generictable.c</file> > - <file>handle.c</file> > - <file>heap.c</file> > - <file>image.c</file> > - <file>interlck.c</file> > - <file>message.c</file> > - <file>largeint.c</file> > - <file>luid.c</file> > - <file>network.c</file> > - <file>nls.c</file> > - <file>path.c</file> > - <file>ppb.c</file> > - <file>process.c</file> > - <file>propvar.c</file> > - <file>qsort.c</file> > - <file>random.c</file> > - <file>rangelist.c</file> > - <file>registry.c</file> > - <file>res.c</file> > - <file>resource.c</file> > - <file>sd.c</file> > - <file>security.c</file> > - <file>slist.c</file> > - <file>sid.c</file> > - <file>sprintf.c</file> > - <file>srw.c</file> > - <file>swprintf.c</file> > - <file>splaytree.c</file> > - <file>thread.c</file> > - <file>time.c</file> > - <file>timezone.c</file> > - <file>timerqueue.c</file> > - <file>unicode.c</file> > - <file>unicodeprefix.c</file> > - <file>vectoreh.c</file> > - <file>version.c</file> > - <file>wait.c</file> > - <file>workitem.c</file> > - <pch>rtl.h</pch> > -</module> > +<group xmlns:xi="http://www.w3.org/2001/XInclude"> > + <module name="rtl_umode" type="staticlibrary"> > + <xi:include href="rtl-common.rbuild" /> > + </module> > + > + <module name="rtl_kmode" type="staticlibrary"> > + <xi:include href="rtl-common.rbuild" /> > + </module> > + > +  > + <module name="rtl" type="staticlibrary" /> > +</group> > > Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… > ============================================================================== > --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Oct 15 10:45:11 2008 > @@ -26,7 +26,7 @@ > <library>hal</library> > <library>pseh</library> > <library>cmlib</library> > - <library>rtl</library> > + <library>rtl_kmode</library> > <library>rossym</library> > <library>libcntpr</library> > <library>kdcom</library> > >

16 years, 2 months

Re: [ros-dev] [ros-diffs] [cgutman] 36754: - Fix a crash that happens when DriverEntry doesn't complete successfully - Return the correct status when LoopRegisterAdapter fails

by gedmurphy

I know I'm being pedantic here, but this patch is pretty ugly. A prime case for a goto IMO. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cgutman(a)svn.reactos.org Sent: 15 October 2008 00:15 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cgutman] 36754: - Fix a crash that happens when DriverEntry doesn't complete successfully - Return the correct status when LoopRegisterAdapter fails Author: cgutman Date: Tue Oct 14 18:15:22 2008 New Revision: 36754 URL: http://svn.reactos.org/svn/reactos?rev=36754&view=rev Log: - Fix a crash that happens when DriverEntry doesn't complete successfully - Return the correct status when LoopRegisterAdapter fails Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Oct 14 18:15:22 2008 @@ -686,7 +686,8 @@ FILE_DEVICE_NETWORK, 0, FALSE, &RawIPDeviceObject); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create RawIP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); return Status; } @@ -695,7 +696,9 @@ FILE_DEVICE_NETWORK, 0, FALSE, &UDPDeviceObject); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create UDP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); return Status; } @@ -704,7 +707,10 @@ FILE_DEVICE_NETWORK, 0, FALSE, &TCPDeviceObject); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create TCP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); return Status; } @@ -713,7 +719,11 @@ EntityList = ExAllocatePool(NonPagedPool, sizeof(TDIEntityID) * MAX_TDI_ENTITIES ); if (!EntityList) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -733,14 +743,25 @@ /* Allocate NDIS packet descriptors */ NdisAllocatePacketPool(&NdisStatus, &GlobalPacketPool, 100, sizeof(PACKET_CONTEXT)); if (NdisStatus != NDIS_STATUS_SUCCESS) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); return STATUS_INSUFFICIENT_RESOURCES; } /* Allocate NDIS buffer descriptors */ NdisAllocateBufferPool(&NdisStatus, &GlobalBufferPool, 100); if (NdisStatus != NDIS_STATUS_SUCCESS) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); return STATUS_INSUFFICIENT_RESOURCES; } @@ -762,19 +783,46 @@ /* Initialize transport level protocol subsystems */ Status = RawIPStartup(); if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); return Status; } Status = UDPStartup(); if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); return Status; } Status = TCPStartup(); if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); + UDPShutdown(); return Status; } @@ -794,15 +842,41 @@ NULL, 0, NULL); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); + UDPShutdown(); + TCPShutdown(); + LANShutdown(); return Status; } /* Open loopback adapter */ - if (!NT_SUCCESS(LoopRegisterAdapter(NULL, NULL))) { + Status = LoopRegisterAdapter(NULL, NULL); + if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); - TiUnload(DriverObject); - return STATUS_INSUFFICIENT_RESOURCES; + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); + UDPShutdown(); + TCPShutdown(); + LANShutdown(); + LANUnregisterProtocol(); + return Status; } /* Use direct I/O */

16 years, 2 months

Re: [ros-dev] Ros-dev Digest, Vol 50, Issue 14

by Olaf Siejka

If i may say anything, I dont think its a good idea to force NET 3.5 dependency. It`ll reduce the software usability range as not everyone is willing to upgrade from NET 2.0 Date: Mon, 13 Oct 2008 11:11:16 +0100 From: "gedmurphy" <gedmurphy(a)gmail.com> Subject: Re: [ros-dev] [ros-diffs] [gschneider] 36737: RosDbg Part 3/3: - Named pipe implementation based on .net namespace IO.Pipes with support of threads - Previous win32 test version would strip random characters from debug messages and crash on entering kdbg (related t To: <ros-dev(a)reactos.org> Message-ID: <001901c92d1c$083d7770$18b86650$@com> Content-Type: text/plain; charset="utf-8" I'd originally refrained from doing it this way, using pinvoke instead to keep .net 2.0 compatibility. Using classes such as NamedPipeServerStream forces a .net 3.5 dependency. Is this ok with everyone? Ged.

16 years, 2 months

Re: [ros-dev] [ros-diffs] [gschneider] 36737: RosDbg Part 3/3: - Named pipe implementation based on .net namespace IO.Pipes with support of threads - Previous win32 test version would strip random characters from debug messages and crash on entering kdbg (related t

by gedmurphy

I'd originally refrained from doing it this way, using pinvoke instead to keep .net 2.0 compatibility. Using classes such as NamedPipeServerStream forces a .net 3.5 dependency. Is this ok with everyone? Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of gschneider(a)svn.reactos.org Sent: 12 October 2008 22:56 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [gschneider] 36737: RosDbg Part 3/3: - Named pipe implementation based on .net namespace IO.Pipes with support of threads - Previous win32 test version would strip random characters from debug messages and crash on entering kdbg (related to .n Author: gschneider Date: Sun Oct 12 16:55:50 2008 New Revision: 36737 URL: http://svn.reactos.org/svn/reactos?rev=36737&view=rev Log: RosDbg Part 3/3: - Named pipe implementation based on .net namespace IO.Pipes with support of threads - Previous win32 test version would strip random characters from debug messages and crash on entering kdbg (related to .net ReadFile approach) - Works with QEMU (Client mode), VirtualBox (Client and Server), VMware Server (Client and Server) - Usually faster than pure serial connection mode Known bugs: - Input to kdbg using /KDSERIAL is not displayed until enter pressed (but input works) - Reconnect issues, depending on virtual machine behaviour Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/Pipe/serialpipe.cs Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Sun Oct 12 16:55:50 2008 @@ -1,227 +1,205 @@ ï»¿using System; +using System.Collections.Generic; +using System.ComponentModel; using System.IO; -using System.ComponentModel; +using System.IO.Pipes; using System.Runtime.InteropServices; - +using System.Text; +using System.Threading; namespace AbstractPipe { - class Kernel32 + public enum ConnectionMode { - [DllImport("kernel32.dll", SetLastError = true)] - public static extern IntPtr CreateNamedPipe( - String lpName, - OpenMode dwOpenMode, - uint dwPipeMode, - uint nMaxInstances, - uint nOutBufferSize, - uint nInBufferSize, - DefaultTimeout nDefaultTimeOut, - IntPtr pipeSecurityDescriptor - ); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool ConnectNamedPipe( - IntPtr hHandle, - IntPtr lpOverlapped - ); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool ReadFile( - IntPtr hHandle, - byte[] lpBuffer, - uint nNumberOfBytesToRead, - ref uint lpNumberOfBytesRead, - IntPtr lpOverlapped - ); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool WriteFile( - IntPtr hHandle, - byte[] lpBuffer, - uint nNumberOfBytesToWrite, - ref uint lpNumberOfBytesWritten, - IntPtr lpOverlapped - ); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool CloseHandle( - IntPtr hHandle); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern uint GetLastError(); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool DisconnectNamedPipe( - IntPtr hHandle); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool FlushFileBuffers(IntPtr handle); + MODE_CLIENT = 0x00000000, + MODE_SERVER = 0x00000001, + MODE_AUTO = 0x00000002 } - [StructLayout(LayoutKind.Sequential)] - public class Overlapped + public class NamedPipe : Pipe { - } - - public enum OpenMode : uint - { - PIPE_ACCESS_INBOUND = 0x00000001, - PIPE_ACCESS_OUTBOUND = 0x00000002, - PIPE_ACCESS_DUPLEX = 0x00000003, - FILE_FLAG_FIRST_PIPE_INSTANCE = 0x00080000, - FILE_FLAG_OVERLAPPED = 0x40000000, - FILE_FLAG_WRITE_THROUGH = 0x80000000 - } - - public enum DefaultTimeout : uint - { - NMPWAIT_USE_DEFAULT_WAIT = 0x00000000, - NMPWAIT_NOWAIT = 0x00000001, - NMPWAIT_WAIT_FOREVER = 0xffffffff - } - - [StructLayout(LayoutKind.Sequential)] - public struct SECURITY_ATTRIBUTES - { - public int nLength; - public IntPtr lpSecurityDescriptor; - public int bInheritHandle; - } - - public class NamedPipe// : Pipe - { - private const Int32 INVALID_HANDLE_VALUE = -1; - private const ulong ERROR_PIPE_CONNECTED = 535; - - private IntPtr handle; - //FileAccess mode; + public const int PIPE_SIZE = 1024; + + private PipeStream ioStream; /* stream for io operations */ + private String wCommand; /* buffer of a single command line */ + private List<String> cmdList; /*list of commands pending to be written */ + + public event PipeReceiveEventHandler PipeReceiveEvent; + public event PipeErrorEventHandler PipeErrorEvent; + + private static ManualResetEvent newWriteData = new ManualResetEvent(false); public NamedPipe() { - handle = IntPtr.Zero; - } - - public IntPtr Create(string name) - { - handle = Kernel32.CreateNamedPipe(name, - OpenMode.PIPE_ACCESS_DUPLEX | OpenMode.FILE_FLAG_OVERLAPPED, - 0, - 1, - 100, - 100, - DefaultTimeout.NMPWAIT_WAIT_FOREVER, - IntPtr.Zero); - if (handle.ToInt32() == INVALID_HANDLE_VALUE) - { - throw new Win32Exception("Error creating named pipe " + name + " . Internal error: " + Marshal.GetLastWin32Error().ToString()); - } - - return handle; - } - - public void Disconnect() - { - Kernel32.DisconnectNamedPipe(handle); + cmdList = new List<string>(); + } + + public bool CreateServerPipe(string name) + { + /* create a pipe and wait for a client */ + NamedPipeServerStream sStream = new NamedPipeServerStream(name, PipeDirection.InOut, 1, + PipeTransmissionMode.Byte, PipeOptions.Asynchronous, PIPE_SIZE, PIPE_SIZE); + sStream.WaitForConnection(); + + if (sStream.IsConnected) + { + ioStream = sStream; + return true; + } + else + { + return false; + } + } + + public bool CreateClientPipe(string name) + { + /* try to connect as a client */ + /* (QEMU -serial pipe or VMware in pipe server mode) */ + try + { + NamedPipeClientStream cStream = new NamedPipeClientStream(".", name, PipeDirection.InOut, PipeOptions.Asynchronous); + cStream.Connect(100); + + if (cStream.IsConnected) + { + ioStream = cStream; + return true; + } + else + { + return false; + } + } + catch (Exception) + { + return false; + } + } + + public bool CreatePipe(string name, ConnectionMode mode) + { + if (name == "" || name == null) + { + return false; + } + switch (mode) + { + case ConnectionMode.MODE_AUTO: + //check if pipe exists, if not create server pipe, wait certain time, check if pipe... + //TODO: server-client lookup should time out + while (true) + { + if (CreateClientPipe(name)) + { + break; + } + if (CreateServerPipe(name)) + { + break; + } + } + return true; + + case ConnectionMode.MODE_CLIENT: + while (!CreateClientPipe(name)) ; + + /* pipe open, everything fine */ + return true; + + case ConnectionMode.MODE_SERVER: + if (CreateServerPipe(name)) + { + /* wait for a client*/ + + return true; + } + break; + } + return false; } public void Close() { - Kernel32.CloseHandle(handle); - handle = IntPtr.Zero; - } - - public void Flush() - { - if (handle == IntPtr.Zero) - throw new ObjectDisposedException("NamedPipeStream", "The stream has already been closed"); - Kernel32.FlushFileBuffers(handle); - } - - public bool Listen() - { - Disconnect(); - if (Kernel32.ConnectNamedPipe(handle, IntPtr.Zero) != true) - { - uint lastErr = (uint)Marshal.GetLastWin32Error(); - if (lastErr == ERROR_PIPE_CONNECTED) - return true; - return false; + if (ioStream != null) + ioStream.Close(); + } + + public void WriteLoop() + { + try + { + while (true) + { + if (cmdList.Count > 0) + { + byte[] wBuf = new byte[cmdList[0].Length]; + UTF8Encoding.UTF8.GetBytes(cmdList[0], 0, cmdList[0].Length, wBuf, 0); + + ioStream.Write(wBuf, 0, cmdList[0].Length); + + /* remove written data from commandlist */ + cmdList.RemoveAt(0); + } + else if (cmdList.Count == 0) + { + /* wait until new data is signaled */ + newWriteData.Reset(); + newWriteData.WaitOne(); + } + } + } + catch (Exception e) + { + if (PipeErrorEvent != null) + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); + } + + } + + public void ReadLoop() + { + byte[] buf = new byte[PIPE_SIZE]; + int read = 0; + + try + { + while(true) + { + read = ioStream.Read(buf, 0, PIPE_SIZE); + if (read > 0) + { + if (PipeReceiveEvent != null) + PipeReceiveEvent.Invoke(this, new PipeReceiveEventArgs(UTF8Encoding.UTF8.GetString(buf, 0, read))); + } + else + { + /* connecion closed */ + break; + } + } + } + catch (Exception e) + { + if (PipeErrorEvent != null) + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); + } + } + + public bool Write(string str) + { + /* only forward a complete line */ + wCommand += str; + + if (str[str.Length-1] == '\r') + { + cmdList.Add(wCommand); + wCommand = null; + + /* wake up the write thread */ + newWriteData.Set(); } return true; - } - - public int Read(byte[] buffer, int offset, int count) - { - if (buffer == null) - throw new ArgumentNullException("buffer", "The buffer to read into cannot be null"); - if (buffer.Length < (offset + count)) - throw new ArgumentException("Buffer is not large enough to hold requested data", "buffer"); - if (offset < 0) - throw new ArgumentOutOfRangeException("offset", offset, "Offset cannot be negative"); - if (count < 0) - throw new ArgumentOutOfRangeException("count", count, "Count cannot be negative"); - if (handle == IntPtr.Zero) - throw new ObjectDisposedException("NamedPipeStream", "The stream has already been closed"); - - // first read the data into an internal buffer since ReadFile cannot read into a buf at - // a specified offset - uint read = 0; - - byte[] buf = buffer; - if (offset != 0) - { - buf = new byte[count]; - } - bool f = Kernel32.ReadFile(handle, buf, (uint)count, ref read, IntPtr.Zero); - if (!f) - { - throw new Win32Exception(Marshal.GetLastWin32Error(), "ReadFile failed"); - } - if (offset != 0) - { - for (int x = 0; x < read; x++) - { - buffer[offset + x] = buf[x]; - } - - } - return (int)read; - } - - public void Write(byte[] buffer, int offset, int count) - { - if (buffer == null) - throw new ArgumentNullException("buffer", "The buffer to write into cannot be null"); - if (buffer.Length < (offset + count)) - throw new ArgumentException("Buffer does not contain amount of requested data", "buffer"); - if (offset < 0) - throw new ArgumentOutOfRangeException("offset", offset, "Offset cannot be negative"); - if (count < 0) - throw new ArgumentOutOfRangeException("count", count, "Count cannot be negative"); - if (handle == IntPtr.Zero) - throw new ObjectDisposedException("NamedPipeStream", "The stream has already been closed"); - - // copy data to internal buffer to allow writing from a specified offset - if (offset != 0) - { - byte[] buf = new Byte[count]; - for (int x = 0; x < count; x++) - { - buf[x] = buffer[offset + x]; - } - buffer = buf; - } - uint written = 0; - bool result = Kernel32.WriteFile(handle, buffer, (uint)count, ref written, IntPtr.Zero); - - if (!result) - { - int err = (int)Marshal.GetLastWin32Error(); - throw new Win32Exception(err, "Writing to the stream failed"); - } - if (written < count) - throw new IOException("Unable to write entire buffer to stream"); } } } Modified: trunk/tools/reactosdbg/Pipe/serialpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/serialpipe.c… ============================================================================== --- trunk/tools/reactosdbg/Pipe/serialpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/serialpipe.cs [iso-8859-1] Sun Oct 12 16:55:50 2008 @@ -80,7 +80,7 @@ public void SerialPortErrorReceived(object sender, SerialErrorReceivedEventArgs args) { - mSerialPort.Close(); + /* port will be closed by debug connection */ if (PipeErrorEvent != null) PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(args.EventType.ToString())); }

16 years, 2 months

Re: [ros-dev] [ros-diffs] [mjmartin] 36732: - Implement REnumServicesStatusExA - REnumServicesStatusA/W: Fixed returned param values to match Windows - REnumServicesStatusExW: Dont try to access lpResumeIndex if it is NULL. Fixed returned param values to match wind

by gedmurphy

You're duplicating code here. REnumServicesStatusExA should call REnumServicesStatusExW to do the work. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mjmartin(a)svn.reactos.org Sent: 12 October 2008 14:10 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mjmartin] 36732: - Implement REnumServicesStatusExA - REnumServicesStatusA/W: Fixed returned param values to match Windows - REnumServicesStatusExW: Dont try to access lpResumeIndex if it is NULL. Fixed returned param values to match windows. Author: mjmartin Date: Sun Oct 12 08:10:05 2008 New Revision: 36732 URL: http://svn.reactos.org/svn/reactos?rev=36732&view=rev Log: - Implement REnumServicesStatusExA - REnumServicesStatusA/W: Fixed returned param values to match Windows - REnumServicesStatusExW: Dont try to access lpResumeIndex if it is NULL. Fixed returned param values to match windows. 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] Sun Oct 12 08:10:05 2008 @@ -2371,6 +2371,12 @@ dwRequiredSize += dwSize; } + if (dwError != ERROR_MORE_DATA) + { + *pcbBytesNeeded = 0; + if (lpResumeHandle) *lpResumeHandle = 0; + } + Done:; /* FIXME: Unlock the service list */ @@ -3451,8 +3457,8 @@ continue; dwSize = sizeof(ENUM_SERVICE_STATUSA) + - ((wcslen(CurrentService->lpServiceName) + 1)) + - ((wcslen(CurrentService->lpDisplayName) + 1)); + wcslen(CurrentService->lpServiceName) + 1 + + wcslen(CurrentService->lpDisplayName) + 1; if (dwRequiredSize + dwSize > dwBufSize) { @@ -3487,9 +3493,9 @@ if ((dwState & dwServiceState) == 0) continue; - dwRequiredSize += (sizeof(ENUM_SERVICE_STATUSA) + - ((wcslen(CurrentService->lpServiceName) + 1)) + - ((wcslen(CurrentService->lpDisplayName) + 1))); + dwRequiredSize += sizeof(ENUM_SERVICE_STATUSA) + + wcslen(CurrentService->lpServiceName) + 1 + + wcslen(CurrentService->lpDisplayName) + 1; dwError = ERROR_MORE_DATA; } @@ -3524,8 +3530,8 @@ continue; dwSize = sizeof(ENUM_SERVICE_STATUSA) + - ((wcslen(CurrentService->lpServiceName) + 1)) + - ((wcslen(CurrentService->lpDisplayName) + 1)); + wcslen(CurrentService->lpServiceName) + 1 + + wcslen(CurrentService->lpDisplayName) + 1; if (dwRequiredSize + dwSize > dwBufSize) break; @@ -3561,6 +3567,12 @@ lpStatusPtr++; dwRequiredSize += dwSize; + } + + if (dwError != ERROR_MORE_DATA) + { + *pcbBytesNeeded = 0; + if (lpResumeHandle) *lpResumeHandle = 0; } Done:; @@ -4509,10 +4521,295 @@ LPBOUNDED_DWORD_256K lpResumeIndex, LPCSTR pszGroupName) { - UNIMPLEMENTED; + PMANAGER_HANDLE hManager; + PSERVICE lpService; + DWORD dwError = ERROR_SUCCESS; + PLIST_ENTRY ServiceEntry; + PSERVICE CurrentService; + DWORD dwState; + DWORD dwRequiredSize; + DWORD dwServiceCount; + DWORD dwSize; + DWORD dwLastResumeCount = 0; + LPENUM_SERVICE_STATUS_PROCESSA lpStatusPtr; + LPSTR lpStringPtr; + LPWSTR pszGroupNameW = NULL; + + DPRINT("REnumServicesStatusExA() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + if (InfoLevel != SC_ENUM_PROCESS_INFO) + return ERROR_INVALID_LEVEL; + + hManager = (PMANAGER_HANDLE)hSCManager; + if (!hManager || hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT1("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } + *pcbBytesNeeded = 0; *lpServicesReturned = 0; - return ERROR_CALL_NOT_IMPLEMENTED; + + if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) + { + DPRINT1("Not a valid Service Type!\n"); + return ERROR_INVALID_PARAMETER; + } + + if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) + { + DPRINT1("Not a valid Service State!\n"); + return ERROR_INVALID_PARAMETER; + } + + /* Check access rights */ + if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, + SC_MANAGER_ENUMERATE_SERVICE)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", + hManager->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + if (lpResumeIndex) dwLastResumeCount = *lpResumeIndex; + + /* FIXME: Lock the service list shared */ + + lpService = ScmGetServiceEntryByResumeCount(dwLastResumeCount); + if (lpService == NULL) + { + dwError = ERROR_SUCCESS; + goto Done; + } + + dwRequiredSize = 0; + dwServiceCount = 0; + + if (pszGroupName) + { + pszGroupNameW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (strlen(pszGroupName) + 1) * sizeof(WCHAR)); + if (!pszGroupNameW) + { + DPRINT1("Failed to allocate buffer!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + MultiByteToWideChar(CP_ACP, + 0, + pszGroupName, + -1, + pszGroupNameW, + strlen(pszGroupName) + 1); + } + + for (ServiceEntry = &lpService->ServiceListEntry; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + if (pszGroupNameW) + { + if (*pszGroupNameW == 0) + { + if (CurrentService->lpGroup != NULL) + continue; + } + else + { + if ((CurrentService->lpGroup == NULL) || + _wcsicmp(pszGroupNameW, CurrentService->lpGroup->lpGroupName)) + continue; + } + } + + dwSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW) + + (wcslen(CurrentService->lpServiceName) + 1) + + (wcslen(CurrentService->lpDisplayName) + 1); + + if (dwRequiredSize + dwSize <= cbBufSize) + { + DPRINT("Service name: %S fit\n", CurrentService->lpServiceName); + dwRequiredSize += dwSize; + dwServiceCount++; + dwLastResumeCount = CurrentService->dwResumeCount; + } + else + { + DPRINT("Service name: %S no fit\n", CurrentService->lpServiceName); + break; + } + + } + + DPRINT("dwRequiredSize: %lu\n", dwRequiredSize); + DPRINT("dwServiceCount: %lu\n", dwServiceCount); + + for (; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + if (pszGroupNameW) + { + if (*pszGroupNameW == 0) + { + if (CurrentService->lpGroup != NULL) + continue; + } + else + { + if ((CurrentService->lpGroup == NULL) || + _wcsicmp(pszGroupNameW, CurrentService->lpGroup->lpGroupName)) + continue; + } + } + + dwRequiredSize += (sizeof(ENUM_SERVICE_STATUS_PROCESSW) + + (wcslen(CurrentService->lpServiceName) + 1) + + (wcslen(CurrentService->lpDisplayName) + 1)); + + dwError = ERROR_MORE_DATA; + } + + DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); + + if (lpResumeIndex) *lpResumeIndex = dwLastResumeCount; + *lpServicesReturned = dwServiceCount; + *pcbBytesNeeded = dwRequiredSize; + + /* If there was no services that matched */ + if (!dwServiceCount) + { + dwError = ERROR_SERVICE_DOES_NOT_EXIST; + goto Done; + } + + lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSA)lpBuffer; + lpStringPtr = (LPSTR)((ULONG_PTR)lpBuffer + + dwServiceCount * sizeof(ENUM_SERVICE_STATUS_PROCESSA)); + + dwRequiredSize = 0; + for (ServiceEntry = &lpService->ServiceListEntry; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + if (pszGroupNameW) + { + if (*pszGroupNameW == 0) + { + if (CurrentService->lpGroup != NULL) + continue; + } + else + { + if ((CurrentService->lpGroup == NULL) || + _wcsicmp(pszGroupNameW, CurrentService->lpGroup->lpGroupName)) + continue; + } + } + + dwSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW) + + ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + + ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); + + if (dwRequiredSize + dwSize <= cbBufSize) + { + /* Copy the service name */ + WideCharToMultiByte(CP_ACP, + 0, + CurrentService->lpServiceName, + -1, + lpStringPtr, + wcslen(CurrentService->lpServiceName), + 0, + 0); + lpStatusPtr->lpServiceName = (LPSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); + lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1); + + /* Copy the display name */ + WideCharToMultiByte(CP_ACP, + 0, + CurrentService->lpDisplayName, + -1, + lpStringPtr, + wcslen(CurrentService->lpDisplayName), + 0, + 0); + lpStatusPtr->lpDisplayName = (LPSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); + lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1); + + /* Copy the status information */ + memcpy(&lpStatusPtr->ServiceStatusProcess, + &CurrentService->Status, + sizeof(SERVICE_STATUS)); + lpStatusPtr->ServiceStatusProcess.dwProcessId = CurrentService->ProcessId; /* FIXME */ + lpStatusPtr->ServiceStatusProcess.dwServiceFlags = 0; /* FIXME */ + + lpStatusPtr++; + dwRequiredSize += dwSize; + } + else + { + break; + } + } + + if (dwError != ERROR_MORE_DATA) + { + *pcbBytesNeeded = 0; + if (lpResumeIndex) *lpResumeIndex = 0; + } + +Done:; + /* Unlock the service list */ + + if (pszGroupNameW) HeapFree(GetProcessHeap(),0,pszGroupNameW); + + DPRINT("REnumServicesStatusExA() done (Error %lu)\n", dwError); + + return dwError; } @@ -4539,7 +4836,7 @@ DWORD dwRequiredSize; DWORD dwServiceCount; DWORD dwSize; - DWORD dwLastResumeCount; + DWORD dwLastResumeCount = 0; LPENUM_SERVICE_STATUS_PROCESSW lpStatusPtr; LPWSTR lpStringPtr; @@ -4556,6 +4853,21 @@ { DPRINT1("Invalid manager handle!\n"); return ERROR_INVALID_HANDLE; + } + + *pcbBytesNeeded = 0; + *lpServicesReturned = 0; + + if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) + { + DPRINT1("Not a valid Service Type!\n"); + return ERROR_INVALID_PARAMETER; + } + + if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) + { + DPRINT1("Not a valid Service State!\n"); + return ERROR_INVALID_PARAMETER; } /* Check access rights */ @@ -4567,10 +4879,7 @@ return ERROR_ACCESS_DENIED; } - *pcbBytesNeeded = 0; - *lpServicesReturned = 0; - - dwLastResumeCount = *lpResumeIndex; + if (lpResumeIndex) dwLastResumeCount = *lpResumeIndex; /* Lock the service list shared */ @@ -4681,9 +4990,16 @@ DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); - *lpResumeIndex = dwLastResumeCount; + if (lpResumeIndex) *lpResumeIndex = dwLastResumeCount; *lpServicesReturned = dwServiceCount; *pcbBytesNeeded = dwRequiredSize; + + /* If there was no services that matched */ + if (!dwServiceCount) + { + dwError = ERROR_SERVICE_DOES_NOT_EXIST; + goto Done; + } lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSW)lpBuffer; lpStringPtr = (LPWSTR)((ULONG_PTR)lpBuffer + @@ -4755,7 +5071,12 @@ { break; } - + } + + if (dwError != ERROR_MORE_DATA) + { + *pcbBytesNeeded = 0; + if (lpResumeIndex) *lpResumeIndex = 0; } Done:;

16 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev October 2008