Ros-dev

ros-dev@reactos.org

5790 discussions

09 Aug '09

On Sat, Aug 8, 2009 at 5:38 PM, Alex Ionescu<ionucu(a)videotron.ca> wrote: > Awe, Thomas's "Fuck Alex" code is gone... I think we should add it back with this discussion in comments so posterity is left to ponder. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: [ros-dev] [ros-diffs] [hyperion] 42530: modified base/setup/vmwinst/vmwinst.c modified base/setup/vmwinst/vmwinst.rbuild Implement VMWare detection for Visual C++ as well For cleaner code, use SEH instead of VEH, even if it means losing this pearl of ReactOS wisdom: /* Setup a vectored exception handler to protect the detection. Don't use SEH here so we notice the next time someone removes support for vectored exception handling from ros... */ (www.passiveaggressivecommits.com, brought to you by Arch Bl
by Alex Ionescu 08 Aug '09

08 Aug '09

Awe, Thomas's "Fuck Alex" code is gone... On 8-Aug-09, at 11:03 AM, hyperion(a)svn.reactos.org wrote: > For cleaner code, use SEH instead of VEH, even if it means losing > this pearl of ReactOS wisdom: > > /* Setup a vectored exception handler to protect the > detection. Don't use SEH > here so we notice the next time someone removes support for > vectored > exception handling from ros... */ Best regards, Alex Ionescu

1 0

Regression when installing drivers ("New Hardware Found" wizard) at 3rd stage
by Javier Agustìn Fernàndez Arroyo 08 Aug '09

08 Aug '09

Hi all, I have found a regression at 3rd stage, that prevents me to install my sound card drivers anymore, I have regtested it, and the range is 42150 - 42263 Unfortunately, there are no debug revisions between these 2 revs, so i cant regtest anymore. Since i was trying to install sound card drivers, i asked Janderwald about it, and he has led me to the ML This is the log im getting ( http://www.reactos.org/paste/index.php/5523/ ): fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({6994ad04-93ef-11d0-a3cc-00a0c9223196} L"FMSynth" L"WDM_P16X.Interface.DMus" 0) fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({65e8773e-8f56-11d0-a3b9-00a0c9223196} L"FMSynth" L"WDM_P16X.Interface.DMus" 0) fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({dff220f3-f70f-11d0-b917-00a0c9223196} L"FMSynth" L"WDM_P16X.Interface.DMus" 0) fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({6994ad04-93ef-11d0-a3cc-00a0c9223196} L"Wave" L"WDM_P16X.Interface.Wave" 0) fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({65e8773e-8f56-11d0-a3b9-00a0c9223196} L"Wave" L"WDM_P16X.Interface.Wave" 0) fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({65e8773d-8f56-11d0-a3b9-00a0c9223196} L"Wave" L"WDM_P16X.Interface.Wave" 0) fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({6994ad04-93ef-11d0-a3cc-00a0c9223196} L"Topology" L"WDM_P16X.Interface.Topology" 0) fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({dda54a40-1e4c-11d1-a050-405705c10000} L"Topology" L"WDM_P16X.Interface.Topology" 0) fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({6994ad04-93ef-11d0-a3cc-00a0c9223196} L"UART" L"WDM_P16X.Interface.UART" 0) fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({65e8773e-8f56-11d0-a3b9-00a0c9223196} L"UART" L"WDM_P16X.Interface.UART" 0) fixme:(dll/win32/setupapi/interface.c:307) Need to InstallOneInterface({65e8773d-8f56-11d0-a3b9-00a0c9223196} L"UART" L"WDM_P16X.Interface.UART" 0) err:(dll/win32/setupapi/queue.c:1659) copy error 2 L"C:\\ReactOS\\inf\\sysaudio.sys" -> L"C:\\ReactOS\\System32\\sysaudio.sys" err:(dll/win32/setupapi/queue.c:1659) copy error 2 L"C:\\ReactOS\\inf\\wdmaud.sys" -> L"C:\\ReactOS\\System32\\wdmaud.sys" err:(dll/win32/setupapi/queue.c:1659) copy error 2 L"C:\\ReactOS\\inf\\portcls.sys" -> L"C:\\ReactOS\\System32\\portcls.sys" err:(dll/win32/setupapi/queue.c:1659) copy error 2 L"C:\\ReactOS\\inf\\drmk.sys" -> L"C:\\ReactOS\\System32\\drmk.sys" err:(dll/win32/setupapi/queue.c:1659) copy error 2 L"C:\\ReactOS\\inf\\kmixer.sys" -> L"C:\\ReactOS\\System32\\kmixer.sys" err:(dll/win32/setupapi/queue.c:1659) copy error 2 L"C:\\ReactOS\\inf\\wdmaud.drv" -> L"C:\\ReactOS\\System32\\drivers\\wdmaud.drv" err:(dll/win32/setupapi/queue.c:1659) copy error 2 L"C:\\ReactOS\\inf\\ksuser.dll" -> L"C:\\ReactOS\\System32\\drivers\\ksuser.dll" err:(dll/win32/shell32/shellpath.c:1454) Failed to create directory L"%USERPROFILE%\\Configuraci\00f3n local\\Archivos temporales de Internet". err:(dll/win32/wininet/urlcache.c:554) Couldn't get path for default container 0 err:(dll/win32/shell32/shellpath.c:1454) Failed to create directory L"%USERPROFILE%\\Configuraci\00f3n local\\Historial". err:(dll/win32/wininet/urlcache.c:554) Couldn't get path for default container 1 err:(dll/win32/shell32/shellpath.c:1454) Failed to create directory L"%USERPROFILE%\\Cookies". err:(dll/win32/wininet/urlcache.c:554) Couldn't get path for default container 2 fixme:(dll/win32/setupapi/stubs.c:200) Stub 00638920 0132FF40 1 0132FF0C (drivers/wdm/audio/backpln/portcls/adapter.c:48) PcInitializeAdapterDriver (drivers/wdm/audio/backpln/portcls/adapter.c:52) Setting IRP handlers (drivers/wdm/audio/backpln/portcls/adapter.c:98) PcAddAdapterDevice called (drivers/wdm/audio/backpln/portcls/irp.c:142) unhandled function 15 (drivers/wdm/audio/backpln/portcls/irp.c:142) unhandled function 15 (drivers/wdm/audio/backpln/portcls/irp.c:142) unhandled function 15 (drivers/wdm/audio/backpln/portcls/irp.c:142) unhandled function 15 (drivers/wdm/audio/backpln/portcls/irp.c:142) unhandled function 15 Assertion 'PointerPte != NULL' failed at ARMÂ³::SYSPTE line 177 Entered debugger on embedded INT3 at 0x0008:0x808c06f6. kdb:> bt Eip: <NTOSKRNL.EXE:c06f7 (lib/rtl/i386/debug_asm.S:33 (DbgBreakPoint@0))> Frames: <NTOSKRNL.EXE:79d20 (ARMÂ³::SYSPTE:177 (MiReserveSystemPtes@8))> <NTOSKRNL.EXE:793dd (ARMÂ³::POOL:270 (MiAllocatePoolPages@8))> <NTOSKRNL.EXE:7666d (ARMÂ³::EXPOOL:118 (ExAllocateArmPoolWithTag@12))> <NTOSKRNL.EXE:8403c (ntoskrnl/mm/pool.c:87 (EiAllocatePool@16))> <NTOSKRNL.EXE:8415d (ntoskrnl/mm/pool.c:166 (ExAllocatePoolWithTag@12))> <FM801A.sys:6f4d> <FM801A.sys:bfb9> <NTOSKRNL.EXE:8415d (ntoskrnl/mm/pool.c:166 (ExAllocatePoolWithTag@12))> <portcls.sys:997c (drivers/wdm/audio/backpln/portcls/pool.c:18 (AllocateItem))> <portcls.sys:da36 (drivers/wdm/audio/backpln/portcls/registry.c:371 (PcNewRegistryKey@36))> <FM801A.sys:e6ba> <FM801A.sys:909> <portcls.sys:4c65 (drivers/wdm/audio/backpln/portcls/irp.c:97 (PortClsPnp@8))> <portcls.sys:4d31 (drivers/wdm/audio/backpln/portcls/irp.c:268 (PcDispatchIrp@8))> <FM801A.sys:656f> <FM801A.sys:63bb> <NTOSKRNL.EXE:5a90a (ntoskrnl/io/pnpmgr/pnpmgr.c:534 (IopInitiatePnpIrp))> <NTOSKRNL.EXE:5a3c3 (ntoskrnl/include/internal/ke_x.h:98 (IopStartDevice))> <NTOSKRNL.EXE:5bd75 (ntoskrnl/io/pnpmgr/pnpmgr.c:2055 (IopActionInitChildServices))> <NTOSKRNL.EXE:59e31 (ntoskrnl/io/pnpmgr/plugplay.c:577 (IopResetDevice))> <NTOSKRNL.EXE:5a0cc (ntoskrnl/io/pnpmgr/plugplay.c:837 (NtPlugPlayControl@12))>--- Press q to abort, any other key to continue --- <NTOSKRNL.EXE:b8cf0 (ntoskrnl/ke/i386/trap.s:244 (KiFastCallEntry))> <ntdll.dll:658d> <umpnpmgr.exe:9614> <rpcrt4.dll:1c0b3> <rpcrt4.dll:1c479> <rpcrt4.dll:1c54b> <kernel32.dll:27b4f> <ntdll.dll:179f2> <ntdll.dll:181e6> <00000000> kdb:>

1 2

Re: [ros-dev] [ros-diffs] [tkreuzer] 42353: asm version of DIB_32BPP_ColorFill: - Add frame pointer - Get rid of algin_draw, 32bpp surfaces must be DWORD aligned - Optimize the loop - Add comments
by WaxDragon 05 Aug '09

05 Aug '09

Your kung-fu is the best, Alex. On Aug 3, 2009 7:22 PM, "Alex Ionescu" <ionucu(a)videotron.ca> wrote: Just got back to San Francisco... I will take you up on the challenge. Your ass is grass, and I'm the lawnmower. Best regards, Alex Ionescu On Mon, Aug 3, 2009 at 11:15 AM, Timo Kreuzer <timo.kreuzer(a)web.de> wrote: > > yeah ;-) > > Dmitr... _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

7 21

[ros-diffs] [gschneider] 42402: asctime/ctime: Check for too low input time, fixes one msvcrt time winetest
by Gregor Schneider 05 Aug '09

05 Aug '09

Hi, I just checked: ctime and asctime have a different behaviour when it comes to parameter checks, although they work on the same buffer. I'll address this soon. Most param checks are missing indeed, but they'll be added one after another. I'm just starting on that. The only real life problem with the code that I could find is that mktime produces a time that is one or two hours off. Best regards Gregor Schneider

3 3

Re: [ros-dev] [ros-diffs] [dchapyshev] 42388: - Add "ReactOS Application Manager". This program is replacement "Download !" and appwiz.cpl.
by Steven Edwards 05 Aug '09

05 Aug '09

On Tue, Aug 4, 2009 at 3:02 PM, <dchapyshev(a)svn.reactos.org> wrote: > Author: dchapyshev > Date: Tue Aug 4 21:02:56 2009 > New Revision: 42388 > > URL: http://svn.reactos.org/svn/reactos?rev=42388&view=rev > Log: > - Add "ReactOS Application Manager". This program is replacement "Download !" and appwiz.cpl. > I don't have the time to do a build at the moment, are there screenshots of this guy anywhere? Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

4 4

Re: [ros-dev] [ros-diffs] [gschneider] 42402: asctime/ctime: Check for too low input time, fixes one msvcrt time winetest
by Alexander Potashev 05 Aug '09

05 Aug '09

Hi, First of all, are you sure that this code is mature enough to care about minor details? I would say, "@implemented" has been added by mistake. About this commit: I tried to call asctime from glibc-2.8 on Linux, but tm_year=9 works fine (resulting in 1909). I know, it is not msvcrt. But I don't see any good reason to not allow years before 1970. Furthermore, I'm sure, this function was once introduced to just transform a date to human-readable format, and it shouldn't care about the date. Btw, MSDN says nothing Another tricky question is: How is the UNIX epoch connected with Reactos (or Windows)? About 'asctime': it might be holy, but it's "holey". It doesn't even check the month and the day of week to fit the ranges 0..11 and 0..6 correspondingly. So, please, fix the security problems first, and then revert this commit ;) 2009/8/4 <gschneider(a)svn.reactos.org>: > Author: gschneider > Date: Wed Aug 5 04:06:25 2009 > New Revision: 42402 > > URL: http://svn.reactos.org/svn/reactos?rev=42402&view=rev > Log: > asctime/ctime: Check for too low input time, fixes one msvcrt time winetest > > Modified: > trunk/reactos/lib/sdk/crt/time/ctime.c > > Modified: trunk/reactos/lib/sdk/crt/time/ctime.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ctime.c?r… > ============================================================================== > --- trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] (original) > +++ trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] Wed Aug 5 04:06:25 2009 > @@ -1200,14 +1200,23 @@ > "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" > }; > static char result[26]; > - > - (void) sprintf(result, "%.3s %.3s%3d %02d:%02d:%02d %d\n", > - wday_name[timeptr->tm_wday], > - mon_name[timeptr->tm_mon], > - timeptr->tm_mday, timeptr->tm_hour, > - timeptr->tm_min, timeptr->tm_sec, > - TM_YEAR_BASE + timeptr->tm_year); > - return result; > + char* res = result; > + > + /* Check for invalid input time */ > + if (timeptr->tm_year <= 69) > + { > + res = NULL; > + } > + else > + { > + sprintf(res, "%.3s %.3s%3d %02d:%02d:%02d %d\n", > + wday_name[timeptr->tm_wday], > + mon_name[timeptr->tm_mon], > + timeptr->tm_mday, timeptr->tm_hour, > + timeptr->tm_min, timeptr->tm_sec, > + TM_YEAR_BASE + timeptr->tm_year); > + } > + return res; > } > > /* > > >

2 4

Re: [ros-dev] [ros-diffs] [cgutman] 42400: - Partial rewrite of recursive mutex code - Makes the recursive mutex faster and smaller - Fixes several unprotected accesses to recursive mutex
by Alex Ionescu 05 Aug '09

05 Aug '09

Mutexes are already recursive, while fast-mutexes are not so I still don't understand the point of this library. Just use a KMUTEX. On 4-Aug-09, at 4:51 PM, cgutman(a)svn.reactos.org wrote: > Author: cgutman > Date: Wed Aug 5 01:51:39 2009 > New Revision: 42400 > > URL: http://svn.reactos.org/svn/reactos?rev=42400&view=rev > Log: > - Partial rewrite of recursive mutex code > - Makes the recursive mutex faster and smaller > - Fixes several unprotected accesses to recursive mutex > > Modified: > trunk/reactos/drivers/network/tcpip/include/lock.h > trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c > trunk/reactos/drivers/network/tcpip/recmutex/recmutex.h > trunk/reactos/drivers/network/tcpip/tcpip/lock.c > > Modified: trunk/reactos/drivers/network/tcpip/include/lock.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/drivers/network/tcpip/include/lock.h [iso-8859-1] > (original) > +++ trunk/reactos/drivers/network/tcpip/include/lock.h [iso-8859-1] > Wed Aug 5 01:51:39 2009 > @@ -13,7 +13,7 @@ > extern VOID TcpipAcquireFastMutex( PFAST_MUTEX Mutex ); > extern VOID TcpipReleaseFastMutex( PFAST_MUTEX Mutex ); > extern VOID TcpipRecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ); > -extern UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, > +extern VOID TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, > BOOLEAN ToWrite ); > extern VOID TcpipRecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ); > > > Modified: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/recm… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c > [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c > [iso-8859-1] Wed Aug 5 01:51:39 2009 > @@ -3,7 +3,6 @@ > > VOID RecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ) { > RtlZeroMemory( RecMutex, sizeof(*RecMutex) ); > - KeInitializeSpinLock( &RecMutex->SpinLock ); > ExInitializeFastMutex( &RecMutex->Mutex ); > KeInitializeEvent( &RecMutex->StateLockedEvent, > NotificationEvent, FALSE ); > @@ -11,76 +10,53 @@ > > /* NOTE: When we leave, the FAST_MUTEX must have been released. The > result > * is that we always exit in the same irql as entering */ > -SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN > ToWrite ) { > +VOID RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex ) { > NTSTATUS Status = STATUS_SUCCESS; > PVOID CurrentThread = KeGetCurrentThread(); > - KIRQL CurrentIrql; > + KIRQL CurrentIrql = KeGetCurrentIrql(); > + > + ASSERT(RecMutex); > + ASSERT(CurrentIrql <= APC_LEVEL); > > /* Wait for the previous user to unlock the RecMutex state. > There might be > * multiple waiters waiting to change the state. We need to > check each > * time we get the event whether somebody still has the state > locked */ > > - if( !RecMutex ) return FALSE; > + ExAcquireFastMutex( &RecMutex->Mutex ); > > - if( CurrentThread == RecMutex->CurrentThread || > - (!ToWrite && !RecMutex->Writer) ) { > + if( CurrentThread == RecMutex->CurrentThread ) { > RecMutex->LockCount++; > - return TRUE; > + ExReleaseFastMutex( &RecMutex->Mutex ); > + return; > } > > - CurrentIrql = KeGetCurrentIrql(); > - > - ASSERT(CurrentIrql <= DISPATCH_LEVEL); > - > - if( CurrentIrql <= APC_LEVEL ) { > - ExAcquireFastMutex( &RecMutex->Mutex ); > - while( RecMutex->Locked ) { > - ExReleaseFastMutex( &RecMutex->Mutex ); > - Status = KeWaitForSingleObject( &RecMutex- > >StateLockedEvent, > - UserRequest, > - KernelMode, > - FALSE, > - NULL ); > - ExAcquireFastMutex( &RecMutex->Mutex ); > - } > - RecMutex->OldIrql = CurrentIrql; > - RecMutex->Locked = TRUE; > - RecMutex->Writer = ToWrite; > - RecMutex->CurrentThread = CurrentThread; > - RecMutex->LockCount++; > - ExReleaseFastMutex( &RecMutex->Mutex ); > - } else { > - KeAcquireSpinLockAtDpcLevel( &RecMutex->SpinLock ); > - RecMutex->OldIrql = DISPATCH_LEVEL; > - RecMutex->Locked = TRUE; > - RecMutex->Writer = ToWrite; > - RecMutex->CurrentThread = CurrentThread; > - RecMutex->LockCount++; > + while( RecMutex->LockCount != 0 ) { > + ExReleaseFastMutex( &RecMutex->Mutex ); > + Status = KeWaitForSingleObject( &RecMutex->StateLockedEvent, > + UserRequest, > + KernelMode, > + FALSE, > + NULL ); > + ExAcquireFastMutex( &RecMutex->Mutex ); > } > - > - return TRUE; > + RecMutex->CurrentThread = CurrentThread; > + RecMutex->LockCount++; > + ExReleaseFastMutex( &RecMutex->Mutex ); > } > > VOID RecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ) { > + ASSERT(RecMutex); > + > + ExAcquireFastMutex( &RecMutex->Mutex ); > > ASSERT(RecMutex->LockCount > 0); > RecMutex->LockCount--; > > if( !RecMutex->LockCount ) { > - RecMutex->CurrentThread = NULL; > - if( RecMutex->OldIrql <= APC_LEVEL ) { > - ExAcquireFastMutex( &RecMutex->Mutex ); > - RecMutex->Locked = FALSE; > - RecMutex->Writer = FALSE; > - ExReleaseFastMutex( &RecMutex->Mutex ); > - } else { > - RecMutex->Locked = FALSE; > - RecMutex->Writer = FALSE; > - KeReleaseSpinLockFromDpcLevel( &RecMutex->SpinLock ); > - } > - > KePulseEvent( &RecMutex->StateLockedEvent, > IO_NETWORK_INCREMENT, > FALSE ); > } > + > + ExReleaseFastMutex( &RecMutex->Mutex ); > } > > > Modified: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/recm… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/drivers/network/tcpip/recmutex/recmutex.h > [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/tcpip/recmutex/recmutex.h > [iso-8859-1] Wed Aug 5 01:51:39 2009 > @@ -10,20 +10,12 @@ > PVOID CurrentThread; > /* Notification event which signals that another thread can take > over */ > KEVENT StateLockedEvent; > - /* IRQL from spin lock */ > - KIRQL OldIrql; > - /* Is Locked */ > - BOOLEAN Locked; > - /* Is reader or writer phase */ > - BOOLEAN Writer; > - /* Spin lock needed for */ > - KSPIN_LOCK SpinLock; > } RECURSIVE_MUTEX, *PRECURSIVE_MUTEX; > > extern VOID RecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ); > -extern SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, > BOOLEAN ToRead ); > +extern VOID RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex ); > extern VOID RecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ); > > -#define ASSERT_LOCKED(x) ASSERT((x)->Locked) > +#define ASSERT_LOCKED(x) > > #endif/*_ROSRTL_RECMUTEX_H*/ > > Modified: trunk/reactos/drivers/network/tcpip/tcpip/lock.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] > (original) > +++ trunk/reactos/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] > Wed Aug 5 01:51:39 2009 > @@ -48,11 +48,9 @@ > RecursiveMutexInit( RecMutex ); > } > > -UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN > ToWrite ) { > - UINT Ret; > +VOID TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN > ToWrite ) { > //TI_DbgPrint(DEBUG_LOCK,("Locking\n")); > - Ret = RecursiveMutexEnter( RecMutex, ToWrite ); > - return Ret; > + RecursiveMutexEnter( RecMutex ); > } > > VOID TcpipRecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ) { > > Best regards, Alex Ionescu

1 0

04 Aug '09

The version that GCC 4.4 and CL 15 will generate would be way more optimized than this unportable/slower assembly code. This isn't 1994 anymore. You can't beat the compiler anymore. Best regards, Alex Ionescu On Sun, Aug 2, 2009 at 3:31 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Mon Aug 3 00:31:29 2009 > New Revision: 42353 > > URL: http://svn.reactos.org/svn/reactos?rev=42353&view=rev > Log: > asm version of DIB_32BPP_ColorFill: > - Add frame pointer > - Get rid of algin_draw, 32bpp surfaces must be DWORD aligned > - Optimize the loop > - Add comments > > Modified: > trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s > > Modified: > trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s > [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s > [iso-8859-1] Mon Aug 3 00:31:29 2009 > @@ -4,78 +4,62 @@ > * FILE: subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.c > * PURPOSE: ASM optimised 32bpp ColorFill > * PROGRAMMERS: Magnus Olsen > + * Timo Kreuzer (timo.kreuzer(a)rectos.org) > */ > > - .globl _DIB_32BPP_ColorFill > - .intel_syntax noprefix > +.intel_syntax noprefix > > - .def _DIB_32BPP_ColorFill; > - .scl 2; > - .type 32; > - .endef > - > - _DIB_32BPP_ColorFill: > - sub esp, 24 > - mov ecx, [esp+32] > - mov [esp+8], ebx > - mov ebx, [esp+28] > - mov [esp+20], ebp > - mov ebp, [esp+36] > - mov [esp+12], esi > - mov [esp+16], edi > - mov edi, [ecx] > - mov esi, [ecx+8] > - mov edx, [ebx+36] > - sub esi, edi > - mov edi, [ecx+4] > - mov eax, edi > - imul eax, edx > - add eax, [ebx+32] > - mov ebx, [ecx] > - lea eax, [eax+ebx*4] > - mov [esp+4], eax > - mov eax, [ecx+12] > - cmp eax, edi > - jbe end > - sub eax, edi > - mov [esp], eax > - lea esi, [esi+0] > +/* > + * BOOLEAN > + * _cdecl > + * DIB_32BPP_ColorFill(SURFOBJ* pso, RECTL* prcl, ULONG iColor); > +*/ > > - for_loop: > - mov eax, ebp > - cld > - mov ebx, esi > - mov edi, [esp+4] > - test edi, 3 > - jnz algin_draw > - mov ecx, esi > - rep stosd > - add [esp+4], edx > - dec dword ptr [esp] > - jnz for_loop > - end: > - mov ebx, [esp+8] > - mov eax, 1 > - mov esi, [esp+12] > - mov edi, [esp+16] > - mov ebp, [esp+20] > - add esp, 24 > - ret > +.globl _DIB_32BPP_ColorFill > +_DIB_32BPP_ColorFill: > + push ebp > + mov ebp, esp > + push ebx > + push esi > + push edi > + sub esp, 4 /* Space for lDelta */ > > - algin_draw: > - stosd > - dec ebx > - mov ecx, ebx > - rol eax, 16 > - stosd > - add [esp+4], edx > - dec dword ptr [esp] > - jnz for_loop > + mov edx, [ebp+12] /* edx = prcl */ > + mov ecx, [ebp+8] /* ecx = pso */ > > - mov ebx, [esp+8] > - mov eax, 1 > - mov esi, [esp+12] > - mov edi, [esp+16] > - mov ebp, [esp+20] > - add esp, 24 > - ret > + mov ebx, [ecx+0x24] /* ebx = pso->lDelta; */ > + mov [esp], ebx /* lDelta = pso->lDelta; */ > + mov edi, [edx+4] /* edi = prcl->top; */ > + mov eax, edi /* eax = prcl->top; */ > + imul eax, ebx /* eax = prcl->top * pso->lDelta; */ > + add eax, [ecx+0x20] /* eax += pso->pvScan0; */ > + mov ebx, [edx] /* ebx = prcl->left; */ > + lea esi, [eax+ebx*4] /* esi = pvLine0 = eax + 4 * prcl->left; > */ > + > + mov ebx, [edx+8] /* ebx = prcl->right; */ > + sub ebx, [edx] /* ebx = prcl->right - prcl->left; */ > + jbe end /* if (ebx <= 0) goto end; */ > + > + mov edx, [edx+12] /* edx = prcl->bottom; */ > + sub edx, edi /* edx -= prcl->top; */ > + jbe end /* if (eax <= 0) goto end; */ > + > + mov eax, [ebp+16] /* eax = iColor; */ > + cld > + > +for_loop: /* do { */ > + mov edi, esi /* edi = pvLine0; */ > + mov ecx, ebx /* ecx = cx; */ > + rep stosd /* memset(pvLine0, iColor, cx); */ > + add esi, [esp] /* pvLine0 += lDelta; */ > + dec edx /* cy--; */ > + jnz for_loop /* } while (cy > 0); */ > + > +end: > + mov eax, 1 > + add esp, 4 > + pop edi > + pop esi > + pop ebx > + pop ebp > + ret > > >

5 8

Re: [ros-dev] [ros-diffs] [sginsberg] 42369: - mingw: __builtin_return_address -> _ReturnAddress, __builtin_frame_address -> _AddressOfReturnAddress - ReactOS-generic.rbuild: Define __STDC__ for MSVC to fix some code depending on it (not using /Za as it breaks other code)
by Timo Kreuzer 03 Aug '09

03 Aug '09

We have _ReturnAddress() and _AddressOfReturnAddress defined in intrin_x86.h sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Mon Aug 3 20:02:07 2009 > New Revision: 42369 > > URL: http://svn.reactos.org/svn/reactos?rev=42369&view=rev > Log: > - mingw: __builtin_return_address -> _ReturnAddress, __builtin_frame_address -> _AddressOfReturnAddress > - ReactOS-generic.rbuild: Define __STDC__ for MSVC to fix some code depending on it (not using /Za as it breaks other code) > > Modified: > trunk/reactos/ReactOS-generic.rbuild > trunk/reactos/lib/3rdparty/mingw/gs_support.c > > Modified: trunk/reactos/ReactOS-generic.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… > ============================================================================== > --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) > +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Aug 3 20:02:07 2009 > @@ -95,6 +95,7 @@ > > <group compilerset="msc"> > <define name="inline" compiler="cc">__inline</define> > + <define name="__STDC__" compiler="cc">1</define> > <compilerflag>/Zl</compilerflag> > <compilerflag>/Zi</compilerflag> > <compilerflag>/W1</compilerflag> > > Modified: trunk/reactos/lib/3rdparty/mingw/gs_support.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gs_supp… > ============================================================================== > --- trunk/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] (original) > +++ trunk/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] Mon Aug 3 20:02:07 2009 > @@ -108,12 +108,22 @@ > else > #endif > { > +#ifdef __GNUC__ > #ifdef _WIN64 > GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0); > GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8; > #else > GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0); > GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4; > +#endif > +#else > +#ifdef _WIN64 > + GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress(); > + GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress(); > +#else > + GS_ContextRecord.Eip = (DWORD) _ReturnAddress(); > + GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress(); > +#endif > #endif > } > > > > >

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev