Ros-dev August 2008

ros-dev@reactos.org

20 participants
35 discussions

by Alexandru Lovin

Hello everyone, Aleksey suggested that I discuss this here, on the mailing list. First and foremost, these are enhancements to do for later, much later (what I would want for the next release is support for RAID / SCSI controllers). But I know that a developer doesn't actually keep something in his plans unless he's figured out a way to do it. I will paste and add additional comments to each of my suggestions. 1. Compatibility with every version of Windows, from Vista until Windows 3.1/ 3.11 That means applications written for 3.1 should work flawlessly on ReactOS, just like apps written for any other Windows. This is probably not hard, as at least XP does the same thing. However, drivers for Windows 3.1 most probably do not work. If the user actually has hardware that was left unsupported since 3.1, he should be able to use it. The same goes for the combination Vista-only driver / old Windows '95 or Windows 3.1 application. oiaohm said it's not really possible because VxD drivers are not well documented. So, maybe in the distant future, maybe when Linux devs will have reversed VxD's on their own. Just don't forget this. 2. Compatibility with DOS** This will probably not mean DOS drivers, as probably any hardware with DOS drivers also has some sort of Windows drivers. It would only mean application compatibility. However, applications with direct access to hardware will probably have to remain used from within DOS (e.g. BIOS update software). The major thing are games here. The ideal way to run DOS games is: - anything requested by the game is interpreted and passed on to the ROS API - Glide commands are interpreted and passed on to OpenGL or Direct3D, resulting in maybe a better image quality, via the use of features OpenGL has and Glide doesn't. - software rendering requested by games should be interpreted and passed on to OpenGL or Direct3D, again resulting in a better image quality. Of course, this will probably result in a compatibility layer, like you suggested. - redbook audio commands should be passed on to ReactOS, who will read in analog mode or digital mode, depending on what the ROS global settings are for that specific optical drive. My own thing about Descent, quickly: the game tries to access file " 1.midi" but ReactOS plays "1.mp3". I have all the mp3's and will provide them whenever needed in order to make this happen. This will transform the old Descent for DOS in the CD version, that had redbook audio tracks. Such enhancements were also created for Tomb Raider 1, by Paul that created Glidos ( www.glidos.net ). Please see http://www.glidos.net/retext.html?lang=en and http://www.glidos.net/audio.html?lang=en Whenever Tomb Raider 1 asked for certain textures / audio data, it was "hijacked" or "redirected" to the better textures or audio files. Certainly, this DOS compatibility layer would probably need a Glidos-like application to control various specific settings from various DOS applications. Another DOS related thing would be a command prompt (terminal?) in ReactOS that has drag'n'drop, copy and paste functionality. Still oiaohm: for the distant future. Got it, understood it, I just want to convince you to keep it in your plans. oiaohm even said a compatibility layer already exists. 3. Processors as a devices, in Device Manager * * For example, let's say a PC has a Pentium 4 at 3 GHz, with HyperThreading. Windows XP reports this processor as two identical ones in Device Manager. ReactOS should also do that. Apart from Windows, if the user does a right-click on a processor as a device, in the Device Manager tree, and chooses the Properties page of the processor device, that page should also mention the SPEED of the processor. More than that, it would be a blessing to also see the L1, L2 and L3 cache size, FSB and multiplier, like those SiSoft Sandra / Everest applications report. Maybe even further, the instruction sets supported - MMX, 3DNow!, SSE, etc. oiaohm again: can be done, but not right now. Stability and usability beat extra information. Got it, too. Bug 2644. 4. Clustering I discussed this with oiaohm and he said it's doable, as soon as ROS gets Active Directory Server. Only clustered in terms of processing power, the user has more machines in a cluster and he still sees ROS the normal way, it just works faster because there are more processors available. No hard drives in some sort of JBOD, and 3D data is only handled by the "master" machine(otherwise you need about 10 GB/sec between machines), the one the user actually interacts with. This is what he said would be the limitations. I have other details for this, but since it's very far away, it wouldn't make sense to bring them up right now. 5. Driver extraction tool I already got one, DoubleDriver, that backs up the drivers for devices in the device manager. I was thinking about the hardware that only gets drivers from Windows Publisher (like my MSI Starkey 2.0). Users would need one. Again, oiaohm said replicating a freeware tool is not high on the list. I'm fine with that. 6. A Windows Media Center equivalent **WMC doesn't do much. Just lists program schedules, can do scheduled recordings, is able to duplicate streams so that you may record whatever you're watching. It stops suddenly while doing a "record once" capture, when it should have waited for the user to say stop (it happened on Vista Home Premium, on a HP laptop). It has a "touchscreen" kind of interface, that would probably be great on an actual touchscreen, works ok when using a PC remote control, but is kind of stupid when using the mouse. It can record from one channel and let you watch another channel if you have at least two TV tuners in your computer. Naturally, ROS should do this with "n" TV tuners. It doesn't have composite or S-video capturing, like the vast majority of TV tuner software out there. It only captures in Microsoft's special "Microsoft recorded TV Show" format, extension .dvr-ms I think (no AVI capture, no mpg capture). It won't let you specify how the tuner provides sound from the antenna/cable signal to the sound card (PCI audio, internal cable, external cable, and if any of the last two, what sound card channel it is). While watching, it should be easier to find out what channel you're on, and what the time is, via some sort of OSD (on-screen display) that appears when you move the mouse or something, just like in WMC. The recording should not be affected by this (i.e. the OSD shouldn't show up on the recording if you moved the mouse, again just like in WMC). While watching, it's not possible (or at least not easy) to jump directly to a specific channel, it may only be used as a TV (next channel, next channel...). If the user tries to switch channels while recording, he gets "warning, you're recording, if you switch channels it's going to stop, you want that?" It should just stop, or at least let the user specify that he doesn't want to see that message again somehow. It doesn't let the user specify exactly the framerate, video size, video standard...just the country of origin. And, as an example, Romaniaofficially uses the PAL D standard on "air" broadcast, that you can get with an antenna. But cable providers use PAL B, which is the German official standard. So, in WMC a guy with cable from Romania must say he's from Germany or else he won't hear anything! All of these should be properly implemented in ReactOS Media Center. Apart from them, "ROSMC" should have all the deinterlacing options and deinterlacing-method autodetection routines from Dscaler. That program also offers a whole lot of other image improvement things, like a good enough TV station logo killer and image de-noising that actually works. Even better than Dscaler, REMEMBER the settings the next time the user runs the program. Maybe also provide the user with basic video editing functionality, meaning most of the features from VirtualDub (the one I find most important is the ability to edit a film with "direct stream copy", meaning it just copies the video and/or audio stream, it doesn't re-encode it. Edit as in cutting parts of the film. In this scenario, the ability to go frame by frame is also very useful). And since it's the Media Center and not the Media Player, this should be the application that rips audio cd's or audio dvd's. Most of all, it should be "cluster-aware." Regardless of ROS being cluster aware or not, this one should be. oiaohm said this is not your job, but a job for other projects. He pointed me to MediaPortal. I e-mailed all of them (Virtualdub, Dscaler and MediaPortal) but I doubt they'll combine the three projects. Still, that's why John User still buys Windows. Linux is all over the Internet (docs all over forums, drivers all over sites, applications all over sites as well). Instead, Linux has "cool" stuff like "mousespedometa" (measures the speed with which you move the mouse). Some people don't even have Internet to get what they need (X servers, for instance). To be a Windows alternative, it should contain a lot of things Windows has. 7. Running on 16-bit systems like 286/386/486 in a "ReactOS Essentials" (equivalent to a stripped-down XP) mode * * It should be the same operating system, but in 16-bit mode only. That's an ideal scenario and I'm sure it cannot be done no matter how good the programmers are. So, what can someone do on a 286 ? Listen to mp3's ? No way. Listen to audio CD's, yes, and hopefully digital playback, too. Watch TV ? Yes, if the user can find an ISA TV tuner (ATI made such tuners, but they required a PCI ATI video card, and if you have PCI why not get a better tuner?). Record TV shows ? Not on that kind of computer. Browse the internet ? That may be possible, with some really outdated, 16-bit browser, like the Internet Explorer for Windows 3.1. And I don't know how many sites will work on it. Play games ? Yes, either old DOS or Windows 3.1 ones or the ones that come with ReactOS, written in 16-bit especially for this mode. Join a hive as either master or slave ? Hopefully it will be possible, but probably in the year 2015 at least. Use office applications ? Sure, if the user can find that last Microsoft Office or maybe Microsoft Works version compatible with Windows 3.1. Run a web server ? I know a guy who had a server running on a 386 system, on Windows 3.11. So yes, it is possible, only I don't know what software he used to actually serve the data. Act as a router ? Again, hopefully. That is, if the entire network is on 10 megabit, because I don't think there are ISA 100 megabit network cards (ISA bandwith is not enough). 2D graphics ? It was possible in Windows 3.1, why not ? Maybe the first Photoshop versions actually were 16-bit. 3D graphics ? The first 3D Studio Max (that is, 3D Studio) was for DOS only. That probably means 16-bit right from the start, and that should mean yes, you can do it, with the DOS compatibility layer. Web design ? If you can find a 16-bit application, yes. A separate ReactOS for 16-bit only, or just all the 16-bit functionality included in the normal ReactOS ? Things look better when it works out of the box, but it's a waste of space to include applications written for 16-bit only. People that really need the 16-bit version will not mind paying extra attention to actually download this one and not the normal one. Besides that, ReactOS is free. And the presence of such a version would mean a selfless devotion to people. An act of charity for real. Allowing people to use their computers and do as many modern things as possible on them. An open source Windows 3.11 with better compatibility and adherence to standards. Compatible with all the 9x and ME. Has been tried in Free Win 95, oiaohm said "dead and staying that way" about it, but maybe VxD documentation and whatever else you would need will appear (or be reverse engineered by someone). Once a bigger effort will be done, the missing info is probably easier to uncover. Those are my suggestions. They are not for now, they are not easy to do, etc. Just don't discard them, please. Alex

16 years, 3 months

Re: [ros-dev] [ros-diffs] [sginsberg] 35819: - CACHE_DESCRIPTOR and PROCESSOR_CACHE_TYPE are public and defined in winnt.h, so no need to define them in the NDK (the NDK includes winnt.h through windef.h, so this breaks build)

by Stefan Ginsberg

err, sorry. that should be ntddk.h and not winddk.h ;0) >"Umtypes is only included for user-mode, not for drivers." > >ketypes.h imports umtypes.h -- > >#include <umtypes.h> >#ifndef NTOS_MODE_USER >#include <haltypes.h> >#include <potypes.h> >#include <ifssupp.h> >#endif > >"Drivers do not import winnt.h" >they (still) do in ros as winddk.h imports winnt.h... _________________________________________________________________ Explore the seven wonders of the world http://search.msn.com/results.aspx?q=7+wonders+world&mkt=en-US&form=QBRE

16 years, 3 months

by Alex Ionescu

Umtypes is only included for user-mode, not for drivers. My e-mail was about drivers. Drivers do not import winnt.h Drivers import ntifs, wdm and ntddk. Ntifs, wdm and ntddk are the headers that drivers import. Not winnt.h. My e-mail specifically listed those three headers and talked about drivers. You guys come back saying "it's in winnt.h so it's okay!" Are you blind, illiterate, or what? Best regards, Alex Ionescu On Sun, Aug 31, 2008 at 10:35 PM, Alex Ionescu <aionescu(a)gmail.com> wrote: > Umtypes is only included for user-mode, not for drivers. > > My e-mail was about drivers. > > Drivers do not import winnt.h > > Drivers import ntifs, wdm and ntddk. > > Ntifs, wdm and ntddk are the headers that drivers import. > > Not winnt.h. > > My e-mail specifically listed those three headers and talked about drivers. > > You guys come back saying "it's in winnt.h so it's okay!" > > Are you blind, illiterate, or what? > > Best regards, > Alex Ionescu > > > > 2008/8/31 Stefan Ginsberg <stefan__100__(a)hotmail.com>: >> The NDK includes winnt.h through umtypes.h -> windef.h -> winnt.h (MS PSDK's >> windef.h includes winnt.h too, so I assumed this was correct). >> If this is wrong then how should it be done? >> >>> Date: Sun, 31 Aug 2008 01:00:18 +0200 >>> From: ionucu(a)videotron.ca >>> To: ros-dev(a)reactos.org >>> Subject: Re: [ros-dev] [ros-diffs] [sginsberg] 35819: - CACHE_DESCRIPTOR >>> and PROCESSOR_CACHE_TYPE are public and defined in winnt.h, so no need to >>> define them in the NDK (the NDK includes winnt.h through windef.h, so this >>> breaks build) >>> >>> Please make sure that these types are available for DRIVERS as well -- >>> otherwise, they belong in the NDK. (Check with WDK >>> wdm.h/ntddk.h/ntifs.h -- if it's not there, and drivers can access >>> pointers/structures of this type, it must be in the NDK). >>> >>> Also, the NDK does not include winnt.h -- at least it's not supposed >>> to, unless someone broke it. >>> >>> For the future, please make suer to review NDK changes with me, since >>> I'm still its owner. >>> >>> Best regards, >>> Alex Ionescu >>> >>> >>> >>> On Sat, Aug 30, 2008 at 11:34 PM, <sginsberg(a)svn.reactos.org> wrote: >>> > Author: sginsberg >>> > Date: Sat Aug 30 16:34:56 2008 >>> > New Revision: 35819 >>> > >>> > URL: http://svn.reactos.org/svn/reactos?rev=35819&view=rev >>> > Log: >>> > - CACHE_DESCRIPTOR and PROCESSOR_CACHE_TYPE are public and defined in >>> > winnt.h, so no need to define them in the NDK (the NDK includes winnt.h >>> > through windef.h, so this breaks build) >>> > >>> > Modified: >>> > trunk/reactos/include/ndk/ketypes.h >>> > >>> > Modified: trunk/reactos/include/ndk/ketypes.h >>> > URL: >>> > http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… >>> > >>> > ============================================================================== >>> > --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) >>> > +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Sat Aug 30 16:34:56 >>> > 2008 >>> > @@ -542,17 +542,6 @@ >>> > } KAPC_ENVIRONMENT; >>> > >>> > // >>> > -// CPU Cache Types >>> > -// >>> > -typedef enum _PROCESSOR_CACHE_TYPE >>> > -{ >>> > - CacheUnified, >>> > - CacheInstruction, >>> > - CacheData, >>> > - CacheTrace, >>> > -} PROCESSOR_CACHE_TYPE; >>> > - >>> > -// >>> > // PRCB DPC Data >>> > // >>> > typedef struct _KDPC_DATA >>> > @@ -571,18 +560,6 @@ >>> > struct _GENERAL_LOOKASIDE *P; >>> > struct _GENERAL_LOOKASIDE *L; >>> > } PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; >>> > - >>> > -// >>> > -// CPU Cache Descriptor >>> > -// >>> > -typedef struct _CACHE_DESCRIPTOR >>> > -{ >>> > - UCHAR Level; >>> > - UCHAR Associativity; >>> > - USHORT LineSize; >>> > - ULONG Size; >>> > - PROCESSOR_CACHE_TYPE Type; >>> > -} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; >>> > >>> > // >>> > // Architectural Types >>> > >>> > >>> _______________________________________________ >>> Ros-dev mailing list >>> Ros-dev(a)reactos.org >>> http://www.reactos.org/mailman/listinfo/ros-dev >> >> ________________________________ >> Connect to the next generation of MSN Messenger Get it now! >> _______________________________________________ >> Ros-dev mailing list >> Ros-dev(a)reactos.org >> http://www.reactos.org/mailman/listinfo/ros-dev >> >> >

16 years, 3 months

Re: [ros-dev] [ros-diffs] [sginsberg] 35837: - "0xbadf00d" is not a valid tag. use "PcNt" instead

by Alex Ionescu

And AGAIN, another build break. Best regards, Alex Ionescu On Sun, Aug 31, 2008 at 7:56 PM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Sun Aug 31 12:56:13 2008 > New Revision: 35837 > > URL: http://svn.reactos.org/svn/reactos?rev=35837&view=rev > Log: > - "0xbadf00d" is not a valid tag. use "PcNt" instead > > Modified: > trunk/reactos/drivers/network/dd/pcnet/pcnet.h > > Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… > ============================================================================== > --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Sun Aug 31 12:56:13 2008 > @@ -146,7 +146,7 @@ > #endif > > /* memory pool tag */ > -#define PCNET_TAG 0xbaadf00d > +#define PCNET_TAG TAG('P', 'c', 'N', 't') > > #endif // _PCNET_H_ > > >

16 years, 3 months

by Alex Ionescu

Please make sure that these types are available for DRIVERS as well -- otherwise, they belong in the NDK. (Check with WDK wdm.h/ntddk.h/ntifs.h -- if it's not there, and drivers can access pointers/structures of this type, it must be in the NDK). Also, the NDK does not include winnt.h -- at least it's not supposed to, unless someone broke it. For the future, please make suer to review NDK changes with me, since I'm still its owner. Best regards, Alex Ionescu On Sat, Aug 30, 2008 at 11:34 PM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Sat Aug 30 16:34:56 2008 > New Revision: 35819 > > URL: http://svn.reactos.org/svn/reactos?rev=35819&view=rev > Log: > - CACHE_DESCRIPTOR and PROCESSOR_CACHE_TYPE are public and defined in winnt.h, so no need to define them in the NDK (the NDK includes winnt.h through windef.h, so this breaks build) > > Modified: > trunk/reactos/include/ndk/ketypes.h > > Modified: trunk/reactos/include/ndk/ketypes.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… > ============================================================================== > --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) > +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Sat Aug 30 16:34:56 2008 > @@ -542,17 +542,6 @@ > } KAPC_ENVIRONMENT; > > // > -// CPU Cache Types > -// > -typedef enum _PROCESSOR_CACHE_TYPE > -{ > - CacheUnified, > - CacheInstruction, > - CacheData, > - CacheTrace, > -} PROCESSOR_CACHE_TYPE; > - > -// > // PRCB DPC Data > // > typedef struct _KDPC_DATA > @@ -571,18 +560,6 @@ > struct _GENERAL_LOOKASIDE *P; > struct _GENERAL_LOOKASIDE *L; > } PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; > - > -// > -// CPU Cache Descriptor > -// > -typedef struct _CACHE_DESCRIPTOR > -{ > - UCHAR Level; > - UCHAR Associativity; > - USHORT LineSize; > - ULONG Size; > - PROCESSOR_CACHE_TYPE Type; > -} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; > > // > // Architectural Types > >

16 years, 3 months

Re: [ros-dev] [ros-diffs] [sginsberg] 35822: - Fix build...

by Alex Ionescu

Did you even TRY compiling your tree before committing? Clearly not... Best regards, Alex Ionescu On Sun, Aug 31, 2008 at 1:06 AM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Sat Aug 30 18:06:13 2008 > New Revision: 35822 > > URL: http://svn.reactos.org/svn/reactos?rev=35822&view=rev > Log: > - Fix build... > > Modified: > trunk/reactos/include/psdk/winnt.h > > Modified: trunk/reactos/include/psdk/winnt.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… > ============================================================================== > --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) > +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Aug 30 18:06:13 2008 > @@ -4695,10 +4695,7 @@ > MemoryBarrier(VOID) > { > LONG Barrier; > - __asm__ __volatile__ > - { > - xchg Barrier, eax > - } > + __asm__ __volatile__("xchgl %%eax, %[Barrier]" : : [Barrier] "m" (Barrier) : "memory"); > } > #elif defined (_M_AMD64) > #define MemoryBarrier() > >

16 years, 3 months

Re: [ros-dev] [ros-diffs] [sserapion] 35828: Minor WIN64 fixes.

by Alex Ionescu

Please use PtrToHandle/HandleToPtr instead of these hacks. Best regards, Alex Ionescu On Sun, Aug 31, 2008 at 5:18 AM, <sserapion(a)svn.reactos.org> wrote: > Author: sserapion > Date: Sat Aug 30 22:18:20 2008 > New Revision: 35828 > > URL: http://svn.reactos.org/svn/reactos?rev=35828&view=rev > Log: > Minor WIN64 fixes. > > Modified: > branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c > branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/lock.c > branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/main.c > branches/ros-amd64-bringup/reactos/drivers/network/dd/pcnet/pcnet.c > > Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… > ============================================================================== > --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 30 22:18:20 2008 > @@ -299,7 +299,7 @@ > RemoveEntryList( PendingConn ); > > Status = ObReferenceObjectByHandle > - ( (HANDLE)AcceptData->ListenHandle, > + ( (HANDLE)(ULONG_PTR)AcceptData->ListenHandle, > FILE_ALL_ACCESS, > NULL, > KernelMode, > > Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/lock.c > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… > ============================================================================== > --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Aug 30 22:18:20 2008 > @@ -140,7 +140,7 @@ > HandleArray[i].Events = HandleArray[i].Events; > FileObjects[i].Handle = 0; > Status = ObReferenceObjectByHandle > - ( (PVOID)HandleArray[i].Handle, > + ( (PVOID)(ULONG_PTR)HandleArray[i].Handle, > FILE_ALL_ACCESS, > NULL, > KernelMode, > @@ -156,7 +156,7 @@ > > for( i = 0; i < HandleCount; i++ ) { > if( HandleArray[i].Handle ) > - ObDereferenceObject( (PVOID)HandleArray[i].Handle ); > + ObDereferenceObject( (PVOID)(ULONG_PTR)HandleArray[i].Handle ); > } > > ExFreePool( HandleArray ); > > Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/main.c > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… > ============================================================================== > --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Aug 30 22:18:20 2008 > @@ -30,7 +30,7 @@ > > for( i = 0; i < Len; i++ ) { > if( i && !(i & 0xf) ) DbgPrint( "\n" ); > - if( !(i & 0xf) ) DbgPrint( "%08x: ", (UINT)(Data + i) ); > + if( !(i & 0xf) ) DbgPrint( "%08x: ", (UINT_PTR)(Data + i) ); > DbgPrint( " %02x", Data[i] & 0xff ); > } > DbgPrint("\n"); > > Modified: branches/ros-amd64-bringup/reactos/drivers/network/dd/pcnet/pcnet.c > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… > ============================================================================== > --- branches/ros-amd64-bringup/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Sat Aug 30 22:18:20 2008 > @@ -137,7 +137,7 @@ > > RtlZeroMemory(Descriptor, sizeof(RECEIVE_DESCRIPTOR)); > Descriptor->RBADR = > - (ULONG)(Adapter->ReceiveBufferPtrPhys + Adapter->CurrentReceiveDescriptorIndex * BUFFER_SIZE); > + (ULONG_PTR)(Adapter->ReceiveBufferPtrPhys + Adapter->CurrentReceiveDescriptorIndex * BUFFER_SIZE); > Descriptor->BCNT = (-BUFFER_SIZE) | 0xf000; > Descriptor->FLAGS |= RD_OWN; > > @@ -323,14 +323,14 @@ > return NDIS_STATUS_RESOURCES; > } > > - if(((ULONG)Adapter->InitializationBlockVirt & 0x00000003) != 0) > + if(((ULONG_PTR)Adapter->InitializationBlockVirt & 0x00000003) != 0) > { > DPRINT("address 0x%x not dword-aligned\n", Adapter->InitializationBlockVirt); > BREAKPOINT; > return NDIS_STATUS_RESOURCES; > } > > - Adapter->InitializationBlockPhys = (PINITIALIZATION_BLOCK)NdisGetPhysicalAddressLow(PhysicalAddress); > + Adapter->InitializationBlockPhys = (PINITIALIZATION_BLOCK)(ptrdiff_t)NdisGetPhysicalAddressLow(PhysicalAddress); > > /* allocate the transport descriptor ring */ > Adapter->TransmitDescriptorRingLength = sizeof(TRANSMIT_DESCRIPTOR) * NUMBER_OF_BUFFERS; > @@ -343,14 +343,14 @@ > return NDIS_STATUS_RESOURCES; > } > > - if(((ULONG)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0) > + if(((ULONG_PTR)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0) > { > DPRINT("address 0x%x not dword-aligned\n", Adapter->TransmitDescriptorRingVirt); > BREAKPOINT; > return NDIS_STATUS_RESOURCES; > } > > - Adapter->TransmitDescriptorRingPhys = (PTRANSMIT_DESCRIPTOR)NdisGetPhysicalAddressLow(PhysicalAddress); > + Adapter->TransmitDescriptorRingPhys = (PTRANSMIT_DESCRIPTOR)(ptrdiff_t)NdisGetPhysicalAddressLow(PhysicalAddress); > RtlZeroMemory(Adapter->TransmitDescriptorRingVirt, sizeof(TRANSMIT_DESCRIPTOR) * NUMBER_OF_BUFFERS); > > /* allocate the receive descriptor ring */ > @@ -364,14 +364,14 @@ > return NDIS_STATUS_RESOURCES; > } > > - if(((ULONG)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0) > + if(((ULONG_PTR)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0) > { > DPRINT("address 0x%x not dword-aligned\n", Adapter->ReceiveDescriptorRingVirt); > BREAKPOINT; > return NDIS_STATUS_RESOURCES; > } > > - Adapter->ReceiveDescriptorRingPhys = (PRECEIVE_DESCRIPTOR)NdisGetPhysicalAddressLow(PhysicalAddress); > + Adapter->ReceiveDescriptorRingPhys = (PRECEIVE_DESCRIPTOR)(ptrdiff_t)NdisGetPhysicalAddressLow(PhysicalAddress); > RtlZeroMemory(Adapter->ReceiveDescriptorRingVirt, sizeof(RECEIVE_DESCRIPTOR) * NUMBER_OF_BUFFERS); > > /* allocate transmit buffers */ > @@ -385,14 +385,14 @@ > return NDIS_STATUS_RESOURCES; > } > > - if(((ULONG)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0) > + if(((ULONG_PTR)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0) > { > DPRINT("address 0x%x not dword-aligned\n", Adapter->TransmitBufferPtrVirt); > BREAKPOINT; > return NDIS_STATUS_RESOURCES; > } > > - Adapter->TransmitBufferPtrPhys = (PCHAR)NdisGetPhysicalAddressLow(PhysicalAddress); > + Adapter->TransmitBufferPtrPhys = (PCHAR)(ULONG_PTR)NdisGetPhysicalAddressLow(PhysicalAddress); > RtlZeroMemory(Adapter->TransmitBufferPtrVirt, BUFFER_SIZE * NUMBER_OF_BUFFERS); > > /* allocate receive buffers */ > @@ -406,21 +406,21 @@ > return NDIS_STATUS_RESOURCES; > } > > - if(((ULONG)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0) > + if(((ULONG_PTR)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0) > { > DPRINT("address 0x%x not dword-aligned\n", Adapter->ReceiveBufferPtrVirt); > BREAKPOINT; > return NDIS_STATUS_RESOURCES; > } > > - Adapter->ReceiveBufferPtrPhys = (PCHAR)NdisGetPhysicalAddressLow(PhysicalAddress); > + Adapter->ReceiveBufferPtrPhys = (PCHAR)(ULONG_PTR)NdisGetPhysicalAddressLow(PhysicalAddress); > RtlZeroMemory(Adapter->ReceiveBufferPtrVirt, BUFFER_SIZE * NUMBER_OF_BUFFERS); > > /* initialize tx descriptors */ > TransmitDescriptor = Adapter->TransmitDescriptorRingVirt; > for(i = 0; i < NUMBER_OF_BUFFERS; i++) > { > - (TransmitDescriptor+i)->TBADR = (ULONG)Adapter->TransmitBufferPtrPhys + i * BUFFER_SIZE; > + (TransmitDescriptor+i)->TBADR = (ULONG_PTR)Adapter->TransmitBufferPtrPhys + i * BUFFER_SIZE; > (TransmitDescriptor+i)->BCNT = 0xf000 | -BUFFER_SIZE; /* 2's compliment + set top 4 bits */ > (TransmitDescriptor+i)->FLAGS = TD1_STP | TD1_ENP; > } > @@ -431,7 +431,7 @@ > ReceiveDescriptor = Adapter->ReceiveDescriptorRingVirt; > for(i = 0; i < NUMBER_OF_BUFFERS; i++) > { > - (ReceiveDescriptor+i)->RBADR = (ULONG)Adapter->ReceiveBufferPtrPhys + i * BUFFER_SIZE; > + (ReceiveDescriptor+i)->RBADR = (ULONG_PTR)Adapter->ReceiveBufferPtrPhys + i * BUFFER_SIZE; > (ReceiveDescriptor+i)->BCNT = 0xf000 | -BUFFER_SIZE; /* 2's compliment + set top 4 bits */ > (ReceiveDescriptor+i)->FLAGS = RD_OWN; > } > @@ -467,12 +467,12 @@ > > /* set up receive ring */ > DPRINT("Receive ring physical address: 0x%x\n", Adapter->ReceiveDescriptorRingPhys); > - Adapter->InitializationBlockVirt->RDRA = (ULONG)Adapter->ReceiveDescriptorRingPhys; > + Adapter->InitializationBlockVirt->RDRA = (ULONG_PTR)Adapter->ReceiveDescriptorRingPhys; > Adapter->InitializationBlockVirt->RLEN = (LOG_NUMBER_OF_BUFFERS << 4) & 0xf0; > > /* set up transmit ring */ > DPRINT("Transmit ring physical address: 0x%x\n", Adapter->TransmitDescriptorRingPhys); > - Adapter->InitializationBlockVirt->TDRA = (ULONG)Adapter->TransmitDescriptorRingPhys; > + Adapter->InitializationBlockVirt->TDRA = (ULONG_PTR)Adapter->TransmitDescriptorRingPhys; > Adapter->InitializationBlockVirt->TLEN = (LOG_NUMBER_OF_BUFFERS << 4) & 0xf0; > } > > @@ -491,35 +491,35 @@ > > if(Adapter->InitializationBlockVirt) > { > - PhysicalAddress.u.LowPart = (ULONG)Adapter->InitializationBlockPhys; > + PhysicalAddress.u.LowPart = (ULONG_PTR)Adapter->InitializationBlockPhys; > NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->InitializationBlockLength, > FALSE, Adapter->InitializationBlockVirt, PhysicalAddress); > } > > if(Adapter->TransmitDescriptorRingVirt) > { > - PhysicalAddress.u.LowPart = (ULONG)Adapter->TransmitDescriptorRingPhys; > + PhysicalAddress.u.LowPart = (ULONG_PTR)Adapter->TransmitDescriptorRingPhys; > NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitDescriptorRingLength, > FALSE, Adapter->TransmitDescriptorRingVirt, PhysicalAddress); > } > > if(Adapter->ReceiveDescriptorRingVirt) > { > - PhysicalAddress.u.LowPart = (ULONG)Adapter->ReceiveDescriptorRingPhys; > + PhysicalAddress.u.LowPart = (ULONG_PTR)Adapter->ReceiveDescriptorRingPhys; > NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveDescriptorRingLength, > FALSE, Adapter->ReceiveDescriptorRingVirt, PhysicalAddress); > } > > if(Adapter->TransmitBufferPtrVirt) > { > - PhysicalAddress.u.LowPart = (ULONG)Adapter->TransmitBufferPtrPhys; > + PhysicalAddress.u.LowPart = (ULONG_PTR)Adapter->TransmitBufferPtrPhys; > NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitBufferLength, > FALSE, Adapter->TransmitBufferPtrVirt, PhysicalAddress); > } > > if(Adapter->ReceiveBufferPtrVirt) > { > - PhysicalAddress.u.LowPart = (ULONG)Adapter->ReceiveBufferPtrPhys; > + PhysicalAddress.u.LowPart = (ULONG_PTR)Adapter->ReceiveBufferPtrPhys; > NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveBufferLength, > FALSE, Adapter->ReceiveBufferPtrVirt, PhysicalAddress); > } > @@ -693,9 +693,9 @@ > > /* set up csr1 and csr2 with init block */ > NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR1); > - NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG)Adapter->InitializationBlockPhys & 0xffff)); > + NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG_PTR)Adapter->InitializationBlockPhys & 0xffff)); > NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR2); > - NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG)Adapter->InitializationBlockPhys >> 16) & 0xffff); > + NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG_PTR)Adapter->InitializationBlockPhys >> 16) & 0xffff); > > DPRINT("programmed with init block\n"); > > >

16 years, 3 months

Re: [ros-dev] [ros-diffs] [pschweitzer] 35813: Primary implementation of sfc.dll. To have it "fully" working, sfc_os.dll is will be needed. It does nothing more. Don't shout, Fireball agreed for commit ; ).

by Thomas Bluemel

pschweitzer(a)svn.reactos.org wrote: > +DWORD WINAPI sfc_8() > I hope you guys realize that sfc_8 () compiled as C is different from what it'd be when compiled as C++. In C this means that it is a cdecl function with variable arguments (I guess WINAPI overrides cdecl, but still). If it is compiled as C++, it means the same as sfc_8 (void). So better have a void argument list. Thomas

16 years, 3 months

Re: [ros-dev] [ros-diffs] [sginsberg] 35806: - Remove the (now deprecated) ntoskrnl/internal/debug.h header and fix all its includers to use the global debug.h

by Alex Ionescu

I love you. Best regards, Alex Ionescu On Sat, Aug 30, 2008 at 6:31 PM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Sat Aug 30 11:31:06 2008 > New Revision: 35806 > > URL: http://svn.reactos.org/svn/reactos?rev=35806&view=rev > Log: > - Remove the (now deprecated) ntoskrnl/internal/debug.h header and fix all its includers to use the global debug.h > > Removed: > trunk/reactos/ntoskrnl/include/internal/debug.h > Modified: > trunk/reactos/ntoskrnl/cc/cacheman.c > trunk/reactos/ntoskrnl/cc/copy.c > trunk/reactos/ntoskrnl/cc/fs.c > trunk/reactos/ntoskrnl/cc/mdl.c > trunk/reactos/ntoskrnl/cc/pin.c > trunk/reactos/ntoskrnl/cc/view.c > trunk/reactos/ntoskrnl/dbgk/dbgkobj.c > trunk/reactos/ntoskrnl/ex/atom.c > trunk/reactos/ntoskrnl/ex/callback.c > trunk/reactos/ntoskrnl/ex/dbgctrl.c > trunk/reactos/ntoskrnl/ex/efi.c > trunk/reactos/ntoskrnl/ex/event.c > trunk/reactos/ntoskrnl/ex/evtpair.c > trunk/reactos/ntoskrnl/ex/harderr.c > trunk/reactos/ntoskrnl/ex/locale.c > trunk/reactos/ntoskrnl/ex/mutant.c > trunk/reactos/ntoskrnl/ex/profile.c > trunk/reactos/ntoskrnl/ex/rundown.c > trunk/reactos/ntoskrnl/ex/sem.c > trunk/reactos/ntoskrnl/ex/shutdown.c > trunk/reactos/ntoskrnl/ex/sysinfo.c > trunk/reactos/ntoskrnl/ex/time.c > trunk/reactos/ntoskrnl/ex/uuid.c > trunk/reactos/ntoskrnl/ex/win32k.c > trunk/reactos/ntoskrnl/ex/work.c > trunk/reactos/ntoskrnl/fstub/disksup.c > trunk/reactos/ntoskrnl/fstub/fstubex.c > trunk/reactos/ntoskrnl/fstub/halstub.c > trunk/reactos/ntoskrnl/io/iomgr/adapter.c > trunk/reactos/ntoskrnl/io/iomgr/bootlog.c > trunk/reactos/ntoskrnl/io/iomgr/controller.c > trunk/reactos/ntoskrnl/io/iomgr/device.c > trunk/reactos/ntoskrnl/io/iomgr/deviface.c > trunk/reactos/ntoskrnl/io/iomgr/driver.c > trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c > trunk/reactos/ntoskrnl/io/iomgr/error.c > trunk/reactos/ntoskrnl/io/iomgr/iocomp.c > trunk/reactos/ntoskrnl/io/iomgr/ioevent.c > trunk/reactos/ntoskrnl/io/iomgr/iomdl.c > trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c > trunk/reactos/ntoskrnl/io/iomgr/iotimer.c > trunk/reactos/ntoskrnl/io/iomgr/iowork.c > trunk/reactos/ntoskrnl/io/iomgr/irp.c > trunk/reactos/ntoskrnl/io/iomgr/irq.c > trunk/reactos/ntoskrnl/io/iomgr/remlock.c > trunk/reactos/ntoskrnl/io/iomgr/symlink.c > trunk/reactos/ntoskrnl/io/iomgr/util.c > trunk/reactos/ntoskrnl/io/iomgr/volume.c > trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c > trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c > trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c > trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c > trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c > trunk/reactos/ntoskrnl/kd/kdinit.c > trunk/reactos/ntoskrnl/kd/kdio.c > trunk/reactos/ntoskrnl/kd/kdmain.c > trunk/reactos/ntoskrnl/kd/wrappers/bochs.c > trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c > trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c > trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c > trunk/reactos/ntoskrnl/kdbg/kdb.c > trunk/reactos/ntoskrnl/kdbg/kdb_cli.c > trunk/reactos/ntoskrnl/kdbg/kdb_expr.c > trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c > trunk/reactos/ntoskrnl/ke/apc.c > trunk/reactos/ntoskrnl/ke/bug.c > trunk/reactos/ntoskrnl/ke/config.c > trunk/reactos/ntoskrnl/ke/devqueue.c > trunk/reactos/ntoskrnl/ke/eventobj.c > trunk/reactos/ntoskrnl/ke/except.c > trunk/reactos/ntoskrnl/ke/gate.c > trunk/reactos/ntoskrnl/ke/gmutex.c > trunk/reactos/ntoskrnl/ke/i386/ldt.c > trunk/reactos/ntoskrnl/ke/i386/usercall.c > trunk/reactos/ntoskrnl/ke/ipi.c > trunk/reactos/ntoskrnl/ke/mutex.c > trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c > trunk/reactos/ntoskrnl/ke/procobj.c > trunk/reactos/ntoskrnl/ke/profobj.c > trunk/reactos/ntoskrnl/ke/queue.c > trunk/reactos/ntoskrnl/ke/semphobj.c > trunk/reactos/ntoskrnl/ke/spinlock.c > trunk/reactos/ntoskrnl/ke/thrdobj.c > trunk/reactos/ntoskrnl/mm/anonmem.c > trunk/reactos/ntoskrnl/mm/balance.c > trunk/reactos/ntoskrnl/mm/cont.c > trunk/reactos/ntoskrnl/mm/drvlck.c > trunk/reactos/ntoskrnl/mm/elf.inc.h > trunk/reactos/ntoskrnl/mm/freelist.c > trunk/reactos/ntoskrnl/mm/i386/page.c > trunk/reactos/ntoskrnl/mm/i386/pagepae.c > trunk/reactos/ntoskrnl/mm/iospace.c > trunk/reactos/ntoskrnl/mm/kmap.c > trunk/reactos/ntoskrnl/mm/marea.c > trunk/reactos/ntoskrnl/mm/mdlsup.c > trunk/reactos/ntoskrnl/mm/mm.c > trunk/reactos/ntoskrnl/mm/mminit.c > trunk/reactos/ntoskrnl/mm/mpw.c > trunk/reactos/ntoskrnl/mm/ncache.c > trunk/reactos/ntoskrnl/mm/npool.c > trunk/reactos/ntoskrnl/mm/pagefile.c > trunk/reactos/ntoskrnl/mm/pageop.c > trunk/reactos/ntoskrnl/mm/pe.c > trunk/reactos/ntoskrnl/mm/pool.c > trunk/reactos/ntoskrnl/mm/powerpc/page.c > trunk/reactos/ntoskrnl/mm/powerpc/pfault.c > trunk/reactos/ntoskrnl/mm/ppool.c > trunk/reactos/ntoskrnl/mm/procsup.c > trunk/reactos/ntoskrnl/mm/region.c > trunk/reactos/ntoskrnl/mm/rmap.c > trunk/reactos/ntoskrnl/mm/section.c > trunk/reactos/ntoskrnl/mm/verifier.c > trunk/reactos/ntoskrnl/mm/wset.c > trunk/reactos/ntoskrnl/ob/oblife.c > trunk/reactos/ntoskrnl/ob/oblink.c > trunk/reactos/ntoskrnl/ob/obwait.c > trunk/reactos/ntoskrnl/po/events.c > trunk/reactos/ntoskrnl/po/power.c > trunk/reactos/ntoskrnl/ps/job.c > trunk/reactos/ntoskrnl/ps/kill.c > trunk/reactos/ntoskrnl/ps/process.c > trunk/reactos/ntoskrnl/ps/psmgr.c > trunk/reactos/ntoskrnl/ps/query.c > trunk/reactos/ntoskrnl/ps/quota.c > trunk/reactos/ntoskrnl/ps/security.c > trunk/reactos/ntoskrnl/ps/state.c > trunk/reactos/ntoskrnl/ps/thread.c > trunk/reactos/ntoskrnl/ps/win32.c > trunk/reactos/ntoskrnl/rtl/libsupp.c > trunk/reactos/ntoskrnl/rtl/misc.c > trunk/reactos/ntoskrnl/wmi/wmi.c > > Modified: trunk/reactos/ntoskrnl/cc/cacheman.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/cacheman.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > PFSN_PREFETCHER_GLOBALS CcPfGlobals; > > > Modified: trunk/reactos/ntoskrnl/cc/copy.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/cc/fs.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=35806… > ============================================================================== > --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #ifndef VACB_MAPPING_GRANULARITY > #define VACB_MAPPING_GRANULARITY (256 * 1024) > > Modified: trunk/reactos/ntoskrnl/cc/mdl.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/mdl.c?rev=3580… > ============================================================================== > --- trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/cc/pin.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=3580… > ============================================================================== > --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/cc/view.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -33,7 +33,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, CcInitView) > > Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > POBJECT_TYPE DbgkDebugObjectType; > FAST_MUTEX DbgkpProcessDebugPortMutex; > > Modified: trunk/reactos/ntoskrnl/ex/atom.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #define TAG_ATOM TAG('A', 't', 'o', 'm') > > > Modified: trunk/reactos/ntoskrnl/ex/callback.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* TYPES *********************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/dbgctrl.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ex/efi.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/efi.c?rev=3580… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/efi.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/efi.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ex/event.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, ExpInitializeEventImplementation) > > Modified: trunk/reactos/ntoskrnl/ex/evtpair.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, ExpInitializeEventPairImplementation) > > Modified: trunk/reactos/ntoskrnl/ex/harderr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #define TAG_ERR TAG('E', 'r', 'r', ' ') > > > Modified: trunk/reactos/ntoskrnl/ex/locale.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ex/mutant.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, ExpInitializeMutantImplementation) > > Modified: trunk/reactos/ntoskrnl/ex/profile.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, ExpInitializeProfileImplementation) > > Modified: trunk/reactos/ntoskrnl/ex/rundown.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/rundown.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/rundown.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/rundown.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ex/sem.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=3580… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, ExpInitializeSemaphoreImplementation) > > Modified: trunk/reactos/ntoskrnl/ex/shutdown.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > /* INCLUDES *****************************************************************/ > > #include <ntoskrnl.h> > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > VOID MmPrintMemoryStatistic(VOID); > > > Modified: trunk/reactos/ntoskrnl/ex/time.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #define TICKSPERMINUTE 600000000 > > > Modified: trunk/reactos/ntoskrnl/ex/uuid.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/uuid.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/uuid.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/uuid.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #define SEED_BUFFER_SIZE 6 > > > Modified: trunk/reactos/ntoskrnl/ex/win32k.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -8,7 +8,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, ExpWin32kInit) > > Modified: trunk/reactos/ntoskrnl/ex/work.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/work.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, ExpInitializeWorkerThreads) > > Modified: trunk/reactos/ntoskrnl/fstub/disksup.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… > ============================================================================== > --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > #include <internal/hal.h> > > /* DEPRECATED FUNCTIONS ******************************************************/ > > Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… > ============================================================================== > --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/fstub/halstub.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/halstub.c?r… > ============================================================================== > --- trunk/reactos/ntoskrnl/fstub/halstub.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/fstub/halstub.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Removed: trunk/reactos/ntoskrnl/include/internal/debug.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… > ============================================================================== > --- trunk/reactos/ntoskrnl/include/internal/debug.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/include/internal/debug.h (removed) > @@ -1,25 +1,0 @@ > -/* > - * COPYRIGHT: See COPYING in the top level directory > - * PROJECT: ReactOS kernel > - * FILE: include/internal/debug.h > - * PURPOSE: Useful debugging macros > - * PROGRAMMER: David Welch (welch(a)mcmail.com) > - * UPDATE HISTORY: > - * 28/05/98: Created > - */ > - > -/* > - * NOTES: Define DBG in configuration file for "checked" version > - * Define NDEBUG before including this header to disable debugging > - * macros > - * Define NASSERT before including this header to disable assertions > - */ > - > - > -#ifndef __NTOSKRNL_DEBUG > -#define __NTOSKRNL_DEBUG > - > -#include <reactos/debug.h> > - > - > -#endif /* __NTOSKRNL_DEBUG */ > > Modified: trunk/reactos/ntoskrnl/io/iomgr/adapter.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/adapter.… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/adapter.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/adapter.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* DATA **********************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/bootlog.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/bootlog.… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/bootlog.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/bootlog.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, IopInitBootLog) > > Modified: trunk/reactos/ntoskrnl/io/iomgr/controller.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/controll… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/controller.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/controller.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -9,7 +9,7 @@ > /* INCLUDES *****************************************************************/ > > #include <ntoskrnl.h> > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS ********************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -14,7 +14,7 @@ > #include <ntoskrnl.h> > > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS ********************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > typedef struct _SERVICE_GROUP > { > > Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* TYPES *********************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > POBJECT_TYPE IoCompletionType; > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/ioevent.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/ioevent.… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/ioevent.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/ioevent.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > /* INCLUDES *****************************************************************/ > > #include <ntoskrnl.h> > -#include <internal/debug.h> > +#include <debug.h> > > /* PRIVATE FUNCTIONS *********************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iomdl.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomdl.c?… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/iomdl.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iomdl.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > ULONG IopTraceLevel = 0; > BOOLEAN PnpSystemInit = FALSE; > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > /* INCLUDES *****************************************************************/ > > #include <ntoskrnl.h> > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iotimer.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iotimer.… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/iotimer.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iotimer.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iowork.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iowork.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/iowork.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iowork.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* PRIVATE FUNCTIONS *********************************************************/ > > > 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] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* Undefine some macros we implement here */ > #undef IoCallDriver > > Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irq.c?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/irq.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/irq.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/remlock.… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/symlink.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/symlink.… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/symlink.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/symlink.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS ****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > VOID > NTAPI > > Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, IoInitFileSystemImplementation) > > Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, IopInitPlugPlayEvents) > > Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > #include <wdmguid.h> > > /* PUBLIC FUNCTIONS **********************************************************/ > > Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > //#define ENABLE_ACPI > > > Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdmemsup.… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -9,7 +9,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #define HIGH_PHYS_MASK 0x80000000 > #define PAGE_TABLE_MASK 0x3ff > > Modified: trunk/reactos/ntoskrnl/kd/kdinit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -9,7 +9,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, KdInitSystem) > > Modified: trunk/reactos/ntoskrnl/kd/kdio.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > /* INCLUDES ******************************************************************/ > > #include <ntoskrnl.h> > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/kd/kdmain.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -9,7 +9,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* VARIABLES ***************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/bochs… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -9,7 +9,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* bochs debug output */ > #define BOCHS_LOGGER_PORT ((PVOID)0xe9) > > Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -85,7 +85,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /************************************************************************/ > /* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/ > > Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -85,7 +85,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /************************************************************************/ > /* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/ > > Modified: trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/kdbg.… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -9,7 +9,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > VOID NTAPI > KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase); > > Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* TYPES *********************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -31,7 +31,7 @@ > #include <ntoskrnl.h> > > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* DEFINES *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_expr.c?r… > ============================================================================== > --- trunk/reactos/ntoskrnl/kdbg/kdb_expr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kdbg/kdb_expr.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -35,7 +35,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* TYPES *********************************************************************/ > typedef enum _RPN_OP_TYPE > > Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… > ============================================================================== > --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > #include <ntoskrnl.h> > > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS ******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/apc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3580… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* PRIVATE FUNCTIONS *********************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/bug.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=3580… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, KiInitializeBugCheck) > > Modified: trunk/reactos/ntoskrnl/ke/config.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/config.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/devqueue.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/devqueue.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/devqueue.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/devqueue.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/eventobj.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/eventobj.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/eventobj.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/eventobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/except.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/except.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/gate.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gate.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/gate.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/gate.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS ****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/gmutex.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gmutex.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* PRIVATE FUNCTIONS *********************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > extern PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch; > > > Modified: trunk/reactos/ntoskrnl/ke/ipi.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=3580… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/ipi.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/ipi.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/mutex.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/mutex.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/mutex.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/mutex.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ppc_ir… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -21,7 +21,7 @@ > #include <ppcmmu/mmu.h> > > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > KDPC KiExpireTimerDpc; > extern ULONG KiMaximumDpcQueueDepth; > > Modified: trunk/reactos/ntoskrnl/ke/procobj.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/profobj.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/queue.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* PRIVATE FUNCTIONS *********************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/semphobj.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/semphobj.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/semphobj.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/semphobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/spinlock.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #define LQ_WAIT 1 > #define LQ_OWN 2 > > Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > extern EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue]; > extern LIST_ENTRY PspReaperListHead; > > Modified: trunk/reactos/ntoskrnl/mm/anonmem.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -41,7 +41,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/balance.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitializeBalancer) > > Modified: trunk/reactos/ntoskrnl/mm/cont.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/cont.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/cont.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/cont.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/drvlck.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/drvlck.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/drvlck.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/drvlck.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > /* INCLUDES *****************************************************************/ > > #include <ntoskrnl.h> > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf.inc.h?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/elf.inc.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/elf.inc.h [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -1,5 +1,5 @@ > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #include <reactos/exeformat.h> > > > Modified: trunk/reactos/ntoskrnl/mm/freelist.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitializePageList) > > Modified: trunk/reactos/ntoskrnl/mm/i386/page.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) > > Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) > > Modified: trunk/reactos/ntoskrnl/mm/iospace.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/iospace.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/kmap.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/kmap.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/marea.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -43,7 +43,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitMemoryAreas) > > Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitializeMdlImplementation) > > Modified: trunk/reactos/ntoskrnl/mm/mm.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=35806… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/mminit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/mpw.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mpw.c?rev=3580… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/ncache.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ncache.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/npool.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/npool.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -13,7 +13,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MiInitializeNonPagedPool) > > Modified: trunk/reactos/ntoskrnl/mm/pagefile.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -29,7 +29,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitPagingFile) > > Modified: trunk/reactos/ntoskrnl/mm/pageop.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitializePageOp) > > Modified: trunk/reactos/ntoskrnl/mm/pe.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev=35806… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > #include <ntoskrnl.h> > > //#define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #include <reactos/exeformat.h> > > > Modified: trunk/reactos/ntoskrnl/mm/pool.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > #include <ntoskrnl.h> > > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > extern ULONG MiNonPagedPoolLength; > extern ULONG MmTotalPagedPoolQuota; > > Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -13,7 +13,7 @@ > #include <ntoskrnl.h> > #include <ppcmmu/mmu.h> > //#define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) > > Modified: trunk/reactos/ntoskrnl/mm/powerpc/pfault.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/pfault… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/powerpc/pfault.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/powerpc/pfault.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > #include <ppcmmu/mmu.h> > > /* EXTERNS *******************************************************************/ > > Modified: trunk/reactos/ntoskrnl/mm/ppool.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitializePagedPool) > > Modified: trunk/reactos/ntoskrnl/mm/procsup.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > extern ULONG NtMajorVersion; > extern ULONG NtMinorVersion; > > Modified: trunk/reactos/ntoskrnl/mm/region.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/region.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/rmap.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > #if defined (ALLOC_PRAGMA) > #pragma alloc_text(INIT, MmInitializeRmapList) > > Modified: trunk/reactos/ntoskrnl/mm/section.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -46,7 +46,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > #include <reactos/exeformat.h> > > #if defined (ALLOC_PRAGMA) > > Modified: trunk/reactos/ntoskrnl/mm/verifier.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/verifier.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/verifier.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/verifier.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/mm/wset.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/wset.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/wset.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/wset.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ob/oblife.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -15,7 +15,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > extern ULONG NtGlobalFlag; > > > Modified: trunk/reactos/ntoskrnl/ob/oblink.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS ******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ob/obwait.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/po/events.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/po/power.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ps/job.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=3580… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > > /* GLOBALS *******************************************************************/ > > Modified: trunk/reactos/ntoskrnl/ps/kill.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ps/process.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ps/psmgr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > extern ULONG ExpInitializationPhase; > extern BOOLEAN SysThreadCreated; > > Modified: trunk/reactos/ntoskrnl/ps/query.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* Include Information Class Tables */ > #include "internal/ps_i.h" > > Modified: trunk/reactos/ntoskrnl/ps/quota.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; > > > Modified: trunk/reactos/ntoskrnl/ps/security.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -12,7 +12,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > PTOKEN PspBootAccessToken; > > > Modified: trunk/reactos/ntoskrnl/ps/state.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/state.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/state.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/state.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* PRIVATE FUNCTIONS *********************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ps/thread.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS ******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ps/win32.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > #include <ntoskrnl.h> > #include <winerror.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS ******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > extern ULONG NtGlobalFlag; > > > Modified: trunk/reactos/ntoskrnl/rtl/misc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=35… > ============================================================================== > --- trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -11,7 +11,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* GLOBALS *******************************************************************/ > > > Modified: trunk/reactos/ntoskrnl/wmi/wmi.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmi.c?rev=358… > ============================================================================== > --- trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] Sat Aug 30 11:31:06 2008 > @@ -10,7 +10,7 @@ > > #include <ntoskrnl.h> > #define NDEBUG > -#include <internal/debug.h> > +#include <debug.h> > > /* FUNCTIONS *****************************************************************/ > > >

16 years, 3 months

Re: [ros-dev] [ros-diffs] [arty] 35701: Convert to using a fast mutex.

by Alex Ionescu

Why? They're deprecated. Are you sure your branch has the KGM fixes from trunk? Best regards, Alex Ionescu On Wed, Aug 27, 2008 at 11:21 AM, <arty(a)svn.reactos.org> wrote: > Author: arty > Date: Wed Aug 27 10:21:39 2008 > New Revision: 35701 > > URL: http://svn.reactos.org/svn/reactos?rev=35701&view=rev > Log: > Convert to using a fast mutex. > > Modified: > branches/arty-newcc/ntoskrnl/cache/cachesub.c > branches/arty-newcc/ntoskrnl/cache/fssup.c > branches/arty-newcc/ntoskrnl/cache/pinsup.c > branches/arty-newcc/ntoskrnl/include/internal/cc.h > > Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c > URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… > ============================================================================== > --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) > +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Wed Aug 27 10:21:39 2008 > @@ -21,10 +21,6 @@ > NTAPI > MmGetDeviceObjectForFile(IN PFILE_OBJECT FileObject); > > -BOOLEAN > -NTAPI > -MmIsCOWAddress(PEPROCESS Process, PVOID Address); > - > NTSTATUS > NTAPI > CcpSimpleWrite > @@ -43,8 +39,7 @@ > > KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); > > - if (MmIsDirtyPage(PsInitialSystemProcess, Buffer) && > - !MmIsCOWAddress(PsInitialSystemProcess, Buffer)) > + if (MmIsDirtyPage(PsInitialSystemProcess, Buffer)) > { > DPRINT1 > ("PAGING WRITE (FLUSH) Offset %x Length %d\n", > @@ -100,7 +95,6 @@ > } > > ObDereferenceObject(FileObject); > - MmDeleteHyperspaceMapping(Buffer); > > DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); > } > > Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c > URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… > ============================================================================== > --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) > +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Wed Aug 27 10:21:39 2008 > @@ -44,7 +44,7 @@ > CcCacheBitmap->Buffer = ((PULONG)&CcCacheBitmap[1]); > CcCacheBitmap->SizeOfBitMap = ROUND_UP(CACHE_NUM_SECTIONS, 32); > DPRINT("Cache has %d entries\n", CcCacheBitmap->SizeOfBitMap); > - KeInitializeGuardedMutex(&CcMutex); > + ExInitializeFastMutex(&CcMutex); > Status = PsCreateSystemThread > (&CcUnmapThreadHandle, > THREAD_ALL_ACCESS, > > Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c > URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… > ============================================================================== > --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) > +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Wed Aug 27 10:21:39 2008 > @@ -22,7 +22,7 @@ > NOCC_BCB CcCacheSections[CACHE_NUM_SECTIONS]; > CHAR CcpBitmapBuffer[sizeof(RTL_BITMAP) + ROUND_UP((CACHE_NUM_SECTIONS), 32) / 8]; > PRTL_BITMAP CcCacheBitmap = (PRTL_BITMAP)&CcpBitmapBuffer; > -KGUARDED_MUTEX CcMutex; > +FAST_MUTEX CcMutex; > KEVENT CcDeleteEvent; > ULONG CcCacheClockHand; > LONG CcOutstandingDeletes; > @@ -55,7 +55,7 @@ > > VOID CcpLock() > { > - KeAcquireGuardedMutex(&CcMutex); > + ExAcquireFastMutex(&CcMutex); > //DPRINT("<<<---<<< CC In Mutex!\n"); > } > > @@ -75,14 +75,14 @@ > PCHAR BufStart, BufPage; > LARGE_INTEGER ToWrite; > > - KeAcquireGuardedMutex(&CcMutex); > + ExAcquireFastMutex(&CcMutex); > while (CcOutstandingDeletes > 0) > { > NumElements = InterlockedDecrement(&CcOutstandingDeletes); > DPRINT1("Unmapping %d ...\n", NumElements); > WorkingOn = CcUnmapChain[0]; > RtlMoveMemory(&CcUnmapChain[0], &CcUnmapChain[1], NumElements * sizeof(NOCC_UNMAP_CHAIN)); > - KeReleaseGuardedMutex(&CcMutex); > + ExReleaseFastMutex(&CcMutex); > > BufStart = (PCHAR)WorkingOn.Buffer; > ToWrite = WorkingOn.FileOffset; > @@ -98,15 +98,15 @@ > MmUnmapViewInSystemSpace(WorkingOn.Buffer); > ObDereferenceObject(WorkingOn.SectionObject); > DPRINT1("Done unmapping\n"); > - KeAcquireGuardedMutex(&CcMutex); > - } > - KeReleaseGuardedMutex(&CcMutex); > + ExAcquireFastMutex(&CcMutex); > + } > + ExReleaseFastMutex(&CcMutex); > } > > VOID CcpUnlock() > { > //DPRINT(">>>--->>> CC Exit Mutex!\n"); > - KeReleaseGuardedMutex(&CcMutex); > + ExReleaseFastMutex(&CcMutex); > } > > VOID STDCALL > > Modified: branches/arty-newcc/ntoskrnl/include/internal/cc.h > URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… > ============================================================================== > --- branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) > +++ branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] Wed Aug 27 10:21:39 2008 > @@ -202,7 +202,7 @@ > > extern NOCC_BCB CcCacheSections[CACHE_NUM_SECTIONS]; > extern PRTL_BITMAP CcCacheBitmap; > -extern KGUARDED_MUTEX CcMutex; > +extern FAST_MUTEX CcMutex; > extern KEVENT CcDeleteEvent; > extern ULONG CcCacheClockHand; > extern LIST_ENTRY CcPendingUnmap; > >

16 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev August 2008