- Ros-dev - ReactOS.org

Re: [ros-dev] [ros-diffs] [janderwald] 36295: - Update Status Icon when there is activity - Also update the Taskbar Notification Icon

by gedmurphy

Our LoadIcon is broken and can result in badly drawn / ugly icons. You should use LoadImage instead. LoadIcon is deprecated anyway, no one should be using it anymore. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of janderwald(a)svn.reactos.org Sent: 17 September 2008 22:59 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [janderwald] 36295: - Update Status Icon when there is activity - Also update the Taskbar Notification Icon + hIcon = NULL; + if (pContext->dwInOctets == IfEntry.dwInOctets && pContext->dwOutOctets == IfEntry.dwOutOctets && pContext->Status != 0) + { + hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE)); + pContext->Status = 0; + } + else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->dwOutOctets !=

16 years, 9 months

1
0
0 0

On the use of stabs

by Samuel serapion

In my recent endeavors into porting ReactOS to the amd64 architecture I have discovered that the the x86_64-pc-mingw32 target uses DWARF debugging symbols by default. The reason for this change was very simple, stabs are strictly 32bit. A stabs record only has 32 bits to represent an address, it represents less information, was never properly standardized, so gdb is pretty much the only debugger which can handle gcc stabs in their full glory, and it is larger to boot. DWARF is better in every aspect. There is no reason to use stabs these days. encoded • does i386-mingw32 support DWARF2 ? NightStrike • the plan is that gcc4.3 will NightStrike • more specifically, it will also drop support for sjlj Dwarf 2 Unwind frames for mingw32/cygwin patch<http://gcc.gnu.org/ml/gcc-patches/2006-12/msg00133.html> mingw32-gcc4.3 packages are so patched afaics: http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=241304 Right now ReactOS has a tool called rsym that parses stabs and coff symbol data. arty • rsym was made to keep compact line number info Ask yourself: Could we eliminate an entire build step that is imposed on all ros binaries? How hard would it be to teach the kernel about DWARF? (If we really wanted to) sedwards • wine dbghelp supports pdb too sedwards • CV, PDB, Stabs and Dwarf sedwards • as far as I know Reading Material: http://dwarfstd.org/dwarf-2.0.0.pdf http://dwarfstd.org/Dwarf3.pdf

16 years, 9 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [cgutman] 36275: - Add ADDRINFOW

by gedmurphy

All these recent umode network commits need to be reverted. Public definitions don't belong in a private header. As I said in my original commit " It won't build yet as it will rely on a rewrite of the network headers". When the header rewrites are committed (maybe a week from now) everything will build. It's at this point that people can get involved in getting the new umode architecture working in ros. Cheers, Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cgutman(a)svn.reactos.org Sent: 17 September 2008 04:07 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cgutman] 36275: - Add ADDRINFOW Author: cgutman Date: Tue Sep 16 22:07:15 2008 New Revision: 36275 URL: http://svn.reactos.org/svn/reactos?rev=36275&view=rev Log: - Add ADDRINFOW Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… ============================================================================== --- branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] (original) +++ branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] Tue Sep 16 22:07:15 2008 @@ -21,6 +21,18 @@ WsAsyncGetServByPort, WsAsyncTerminate, } WSASYNCOPS; + +typedef struct _ADDRINFOW +{ + INT ai_flags; + INT ai_family; + INT ai_socktype; + INT ai_protocol; + SIZE_T ai_addrlen; + PWSTR ai_canonname; + struct SOCKADDR *ai_addr; + struct ADDRINFOW *ai_next; +} ADDRINFOW, *PADDRINFOW; typedef struct _WSASYNCBLOCK {

16 years, 9 months

1
0
0 0

test, please ignore

by Aleksey Bragin

Test of mailing list system operability.

16 years, 9 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 36188: sync most of rpcrt4 to wine 1.1.4

by Aleksey Bragin

I would prefer to have a log message saying what was NOT synced too. On Sep 13, 2008, at 7:52 PM, cwittich(a)svn.reactos.org wrote: > Author: cwittich > Date: Sat Sep 13 10:52:50 2008 > New Revision: 36188 > > URL: http://svn.reactos.org/svn/reactos?rev=36188&view=rev > Log: > sync most of rpcrt4 to wine 1.1.4

16 years, 9 months

1
0
0 0

Comment about r36137

by Pierre SCHWEITZER

Hi, the change done in r36137 on cdfs/fsctl.c appears to me to be wrong. For CDFS, IoCreateDevice should have its 4th parameter set to FILE_DEVICE_CD_ROM_FILE_SYSTEM and not to FILE_DEVICE_DISK_FILE_SYSTEM. For fastfat driver, it's OK. WBR, P. Schweitzer _________________________________________________________________ Installez gratuitement les 20 émôticones Windows Live Messenger les plus fous ! Cliquez ici ! http://www.emoticones-messenger.fr/

16 years, 9 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 36054: - Import pstorec from wine head

by Steven Edwards

On Mon, Sep 8, 2008 at 9:48 AM, <dchapyshev(a)svn.reactos.org> wrote: > Author: dchapyshev > Date: Mon Sep 8 08:48:25 2008 > New Revision: 36054 > > URL: http://svn.reactos.org/svn/reactos?rev=36054&view=rev > Log: > - Import pstorec from wine head Here is a patch from the CrossOver wine that are not in the Winehq tree. Feel free to fork for a while as no one in winehq has touched this dll for a while. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 9 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 36065: forgot to add these files

by Aleksey Bragin

This wouldn't happen if you used winesync script by hpoussin. On Sep 8, 2008, at 8:58 PM, cwittich(a)svn.reactos.org wrote: > Author: cwittich > Date: Mon Sep 8 11:58:34 2008 > New Revision: 36065 > > URL: http://svn.reactos.org/svn/reactos?rev=36065&view=rev > Log: > forgot to add these files > > Added: > trunk/reactos/dll/win32/msxml3/bsc.c (with props) > trunk/reactos/dll/win32/msxml3/cdata.c (with props) > trunk/reactos/dll/win32/msxml3/dispex.c (with props) > trunk/reactos/dll/win32/msxml3/docfrag.c (with props) > trunk/reactos/dll/win32/msxml3/domimpl.c (with props) > trunk/reactos/dll/win32/msxml3/entityref.c (with props) > trunk/reactos/dll/win32/msxml3/msxml3_v1.idl (with props) > trunk/reactos/dll/win32/msxml3/saxreader.c (with props)

16 years, 9 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 36005: - Make sure we get a Subkey in RegDeleteKeyA/W. Fixes Winetests causing a system crash, but (for now) hides a bug in CM.

by Steven Edwards

On Sat, Sep 6, 2008 at 5:02 PM, <sginsberg(a)svn.reactos.org> wrote: > - Make sure we get a Subkey in RegDeleteKeyA/W. Fixes Winetests causing a system crash, but (for now) hides a bug in CM. Maybe we should throw a DPRINT1 here so we are reminded that the bug is still there. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 9 months

3
2
0 0

Re : [ros-diffs] [cwittich] 35960: change parameter back to DWORD as it is in our headers

by Sylvain Petreolle

lets use the more recent version then. Kind regards, Sylvain Petreolle ----- Message d'origine ---- > De : Christoph von Wittich <Christoph(a)apiviewer.de> > À : ReactOS Development List <ros-dev(a)reactos.org> > Envoyé le : Samedi, 6 Septembre 2008, 11h11mn 40s > Objet : Re: [ros-dev] [ros-diffs] [cwittich] 35960: change parameter back to DWORD as it is in our headers > > depends on the version > MS is using both > > Timo Kreuzer schrieb: > > That it's DWORD in our headers, doesn't mean it's correct. Actually it > > means that our headers are wrong. > > > > cwittich(a)svn.reactos.org schrieb: > > > >> Author: cwittich > >> Date: Fri Sep 5 08:28:12 2008 > >> New Revision: 35960 > >> > >> URL: http://svn.reactos.org/svn/reactos?rev=35960&view=rev > >> Log: > >> change parameter back to DWORD as it is in our headers > >> > >> Modified: > >> trunk/reactos/dll/win32/advapi32/crypt/crypt.c > >> > >> Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c > >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… > >> > ============================================================================== > >> --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) > >> +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Fri Sep 5 > 08:28:12 2008 > >> @@ -626,7 +626,7 @@ > >> * Success: TRUE > >> * Failure: FALSE > >> */ > >> -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) > >> +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) > >> { > >> PCRYPTPROV pProv = (PCRYPTPROV)hProv; > >> BOOL ret = TRUE; > >> > >> > >> > >> > > > > _______________________________________________ > > Ros-dev mailing list > > Ros-dev(a)reactos.org > > http://www.reactos.org/mailman/listinfo/ros-dev > > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev

16 years, 9 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 35960: change parameter back to DWORD as it is in our headers

by Timo Kreuzer

That it's DWORD in our headers, doesn't mean it's correct. Actually it means that our headers are wrong. cwittich(a)svn.reactos.org schrieb: > Author: cwittich > Date: Fri Sep 5 08:28:12 2008 > New Revision: 35960 > > URL: http://svn.reactos.org/svn/reactos?rev=35960&view=rev > Log: > change parameter back to DWORD as it is in our headers > > Modified: > trunk/reactos/dll/win32/advapi32/crypt/crypt.c > > Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… > ============================================================================== > --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Fri Sep 5 08:28:12 2008 > @@ -626,7 +626,7 @@ > * Success: TRUE > * Failure: FALSE > */ > -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) > +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) > { > PCRYPTPROV pProv = (PCRYPTPROV)hProv; > BOOL ret = TRUE; > > >

16 years, 9 months

2
1
0 0

Invitation to Southern California Linux Expo 7x

by Gareth J. Greenaway

Greetings, I would like to formerly invite the ReactOS community to participate at the Southern California Linux Expo. The show will be taking place February 20th - 22nd, 2009 at the Westin LAX in Los Angeles, CA. I am including both a link to our "Call For dotORG Exhibitors" as well as our "Call for Papers" if anyone from the ReactOS community is interested in submitting a talk for consideration. More information about the show can be found at http://www.socallinuxexpo.org Thanks! Gareth http://scale7x.socallinuxexpo.org/s7x_cfp http://scale7x.socallinuxexpo.org/s7x_call_for_dotOrg_exhibitors -- Gareth J. Greenaway <g(a)socallinuxexpo.org> Voice - 877-831-2569 x130 Southern California Linux Expo http://www.socallinuxexpo.org

16 years, 9 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [janderwald] 35839: - Remove old unused enumeration code - Implement displaying network component properties

by Steven Edwards

On Sun, Aug 31, 2008 at 2:07 PM, <janderwald(a)svn.reactos.org> wrote: > #define REACTOS_STR_ORIGINAL_FILENAME "netshell.dll\0" > #define REACTOS_STR_PRODUCT_VERSION "5.1.2600.3264\0" > #define REACTOS_STR_FILE_VERSION "5.1.2600.3264\0" > +#define REACTOS_STR_COMPANY_NAME "Microsoft Corporation" Is there an application that actually depends on the string "Microsoft Corporation" here? If not then you need to remove it otherwise someone will think your ripping Microsoft's code. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 9 months

1
0
0 0

anyone seeing this?

by Steven Edwards

ntoskrnl/io/iomgr/file.c: In function 'IopCloseFile': ntoskrnl/io/iomgr/file.c:1407: error: expected expression before '<<' token ntoskrnl/io/iomgr/file.c:1410: error: expected expression before '==' token ntoskrnl/io/iomgr/file.c:1413: error: expected expression before '>>' token mingw32-make: *** [obj-i386/ntoskrnl/io/iomgr/file_ntoskrnl.o] Error 1 -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 9 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 35846: Reverted r35812 because of unwanted triple fault bug. See issue #3704, 3706 for more details.

by Aleksey Bragin

But, this was reported to me as working: abiword & firefox install, vmwinst (which exposes vectored handler test) works. I experienced triple fault on a clean build too, so it's not a random problem. How so? People demand explanations about testing techniques Stefan uses. WBR, Aleksey Bragin. On Sep 1, 2008, at 1:58 AM, pschweitzer(a)svn.reactos.org wrote: > Author: pschweitzer > Date: Sun Aug 31 16:58:44 2008 > New Revision: 35846 > > URL: http://svn.reactos.org/svn/reactos?rev=35846&view=rev > Log: > Reverted r35812 because of unwanted triple fault bug. > See issue #3704,3706 for more details. > > Modified: > trunk/reactos/dll/ntdll/dispatch/ (props changed) > trunk/reactos/dll/ntdll/dispatch/dispatch.c > trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S > trunk/reactos/lib/rtl/i386/except.c > trunk/reactos/lib/rtl/rtlp.h > trunk/reactos/lib/rtl/vectoreh.c >

16 years, 9 months

2
2
0 0

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, 9 months

1
0
0 0

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 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, 9 months

2
1
0 0

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, 9 months

1
0
0 0

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 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, 9 months

3
3
0 0

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, 9 months

2
1
0 0

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, 9 months

1
0
0 0

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, 9 months

1
0
0 0

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, 9 months

1
0
0 0

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, 9 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 35600: - Remove KEBUGCHECK and KEBUGCHECKEX macros - Replace "KeBugCheck(0)" by ASSERT(FALSE) - Replace deprecated "CPRINT" by DRINT1

by Hervé Poussineau

sginsberg(a)svn.reactos.org a écrit : > Author: sginsberg > Date: Sun Aug 24 10:48:05 2008 > New Revision: 35600 > > URL: http://svn.reactos.org/svn/reactos?rev=35600&view=rev > Log: > - Remove KEBUGCHECK and KEBUGCHECKEX macros > - Replace "KeBugCheck(0)" by ASSERT(FALSE) > - Replace deprecated "CPRINT" by DRINT1 > You probably understand that KEBUGCHECK(0) is *NOT* the same as ASSERT(FALSE) ASSERT(FALSE) is valid only in debug mode, and lets the code continue in release mode. KEBUGCHECK stops the execution also in release mode. For example, in ntoskrnl/dbgk/dbgkobj.c, code now continues even if DbgkpQueueMessage failed. Are you sure it is safe to continue in that case? (same question applies for other locations) Hervé

16 years, 9 months

2
1
0 0

- In IoAcquire/ReleaseCancelSpinLock, use the queued "IopCancelSpinLock" instead of a ros-specific "CancelSpinLock" standard spinlock - Misc fixes

by Stefan Ginsberg

In the kernel, stdcall IoCallDriver is macroed to the fastcall IofCallDriver. However, for clarification I think that IoCallDriver should be used, and this is what we do everywhere else. >Why this? >> ====================================================================== >> --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) >> +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Aug 23 >> 11:30:14 2008 >> @@ -682,7 +682,7 @@ >> StackPtr->FileObject = FileObject; >> >> /* Call the Driver */ >> - return IofCallDriver(DeviceObject, Irp); >> + return IoCallDriver(DeviceObject, Irp); >> } >> >> /* >> @@ -732,7 +732,7 @@ >> StackPtr->FileObject = FileObject; >> >> /* Call the Driver */ >> - return IofCallDriver(DeviceObject, Irp); >> + return IoCallDriver(DeviceObject, Irp); >> } >> >> _________________________________________________________________ Discover the new Windows Vista http://search.msn.com/results.aspx?q=windows+vista&mkt=en-US&form=QBRE

16 years, 9 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [arty] 35581: Catch failure to release the cancel spinlock. Would've spotted my error in tcpip.sys.

by Alex Ionescu

--- Please, please, don't think I'm trying to say "revert this!" --- There are dozens (if not more) places in the kernel where such checks could/should be made. I believe the more correct approach instead of adding them to every function, is to use a similar framework to Microsoft's Driver Verifier, where such functions are hooked and wrapped through similar verifications. I'm not saying this particular assert should be removed, I'm just letting people know that if there's going to be major work on this -- there's a better way. Just my 2c. On 23-Aug-08, at 4:04 PM, arty(a)svn.reactos.org wrote: > Author: arty > Date: Sat Aug 23 18:04:15 2008 > New Revision: 35581 > > URL: http://svn.reactos.org/svn/reactos?rev=35581&view=rev > Log: > Catch failure to release the cancel spinlock. Would've spotted my > error in > tcpip.sys. > > Modified: > trunk/reactos/ntoskrnl/io/iomgr/irp.c > > 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 23 > 18:04:15 2008 > @@ -970,12 +970,14 @@ > IoCancelIrp(IN PIRP Irp) > { > KIRQL OldIrql; > + KIRQL IrqlAtEntry; > PDRIVER_CANCEL CancelRoutine; > IOTRACE(IO_IRP_DEBUG, > "%s - Canceling IRP %p\n", > __FUNCTION__, > Irp); > ASSERT(Irp->Type == IO_TYPE_IRP); > + IrqlAtEntry = KeGetCurrentIrql(); > > /* Acquire the cancel lock and cancel the IRP */ > IoAcquireCancelSpinLock(&OldIrql); > @@ -999,6 +1001,7 @@ > /* Set the cancel IRQL And call the routine */ > Irp->CancelIrql = OldIrql; > CancelRoutine(IoGetCurrentIrpStackLocation(Irp)- > >DeviceObject, Irp); > + ASSERT(IrqlAtEntry == KeGetCurrentIrql()); > return TRUE; > } > > Best regards, Alex Ionescu

16 years, 9 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 35565: - In IoAcquire/ReleaseCancelSpinLock, use the queued "IopCancelSpinLock" instead of a ros-specific "CancelSpinLock" standard spinlock - Misc fixes

by Alex Ionescu

Please don't write formatting fixes as "Misc Fixes". It's a pain for reviewers who expect actual functionality fixes, and also for changelog writers, which will try to understand what exactly you fixed. Furthermore, such formatting patches should have [FORMATTING] attached to them. And finally, formatting patches should not be mixed with code patches. I know you're new to trunk, but perhaps you should read over the rules first. I appreciate your patches, but you have a bit of a cowboy attitude with your commits, which is bound to hurt someone in the end. On 23-Aug-08, at 9:30 AM, sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Sat Aug 23 11:30:14 2008 > New Revision: 35565 > > URL: http://svn.reactos.org/svn/reactos?rev=35565&view=rev > Log: > - In IoAcquire/ReleaseCancelSpinLock, use the queued > "IopCancelSpinLock" instead of a ros-specific "CancelSpinLock" > standard spinlock > - Misc fixes > > Modified: > trunk/reactos/ntoskrnl/io/iomgr/error.c > trunk/reactos/ntoskrnl/io/iomgr/iofunc.c > trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > trunk/reactos/ntoskrnl/io/iomgr/irp.c > trunk/reactos/ntoskrnl/io/iomgr/util.c > > 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 23 > 11:30:14 2008 > @@ -122,7 +122,7 @@ > NULL); > if (NT_SUCCESS(Status)) > { > - /* Remmeber we're connected */ > + /* Remember we're connected */ > IopLogPortConnected = TRUE; > return TRUE; > } > @@ -583,7 +583,7 @@ > KeAcquireSpinLock(&IopLogListLock, &Irql); > InsertHeadList(&IopErrorLogListHead, &LogEntry->ListEntry); > > - /* Check if the worker is runnign */ > + /* Check if the worker is running */ > if (!IopLogWorkerRunning) > { > #if 0 > @@ -648,7 +648,7 @@ > IN PKTHREAD Thread) > { > UNIMPLEMENTED; > - return(FALSE); > + return FALSE; > } > > /* > @@ -659,14 +659,12 @@ > IoSetThreadHardErrorMode(IN BOOLEAN HardErrorEnabled) > { > PETHREAD Thread = PsGetCurrentThread(); > - BOOLEAN Old; > + BOOLEAN OldMode; > > /* Get the current value */ > - Old = !Thread->HardErrorsAreDisabled; > + OldMode = !Thread->HardErrorsAreDisabled; > > /* Set the new one and return the old */ > Thread->HardErrorsAreDisabled = !HardErrorEnabled; > - return Old; > -} > - > -/* EOF */ > + return OldMode; > +} > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Aug 23 > 11:30:14 2008 > @@ -682,7 +682,7 @@ > StackPtr->FileObject = FileObject; > > /* Call the Driver */ > - return IofCallDriver(DeviceObject, Irp); > + return IoCallDriver(DeviceObject, Irp); > } > > /* > @@ -732,7 +732,7 @@ > StackPtr->FileObject = FileObject; > > /* Call the Driver */ > - return IofCallDriver(DeviceObject, Irp); > + return IoCallDriver(DeviceObject, Irp); > } > > /* > @@ -776,7 +776,7 @@ > } > > /* > - * @unimplemented > + * @implemented > */ > NTSTATUS > NTAPI > @@ -2045,7 +2045,7 @@ > CapturedByteOffset = FileObject->CurrentByteOffset; > } > > - /* Rememer we are sync */ > + /* Remember we are sync */ > Synchronous = TRUE; > } > else if (!(ByteOffset) && > @@ -2904,7 +2904,7 @@ > CapturedByteOffset = FileObject->CurrentByteOffset; > } > > - /* Rememer we are sync */ > + /* Remember we are sync */ > Synchronous = TRUE; > } > else if (!(ByteOffset) && > > 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 23 > 11:30:14 2008 > @@ -68,7 +68,6 @@ > extern LIST_ENTRY IopTimerQueueHead; > extern KDPC IopTimerDpc; > extern KTIMER IopTimer; > -extern KSPIN_LOCK CancelSpinLock; > extern KSPIN_LOCK IoVpbLock; > extern KSPIN_LOCK IoStatisticsLock; > extern KSPIN_LOCK DriverReinitListLock; > @@ -463,7 +462,6 @@ > InitializeListHead(&LastChanceShutdownListHead); > InitializeListHead(&FsChangeNotifyListHead); > InitializeListHead(&IopErrorLogListHead); > - KeInitializeSpinLock(&CancelSpinLock); > KeInitializeSpinLock(&IoVpbLock); > KeInitializeSpinLock(&IoStatisticsLock); > KeInitializeSpinLock(&DriverReinitListLock); > > 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 23 > 11:30:14 2008 > @@ -1,8 +1,7 @@ > - > /* > * PROJECT: ReactOS Kernel > * LICENSE: GPL - See COPYING in the top level directory > - * FILE: ntoskrnl/io/irp.c > + * FILE: ntoskrnl/io/iomgr/irp.c > * PURPOSE: IRP Handling Functions > * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) > * Gunnar Dalsnes > @@ -627,7 +626,7 @@ > > /* Allocate IRP */ > Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); > - if (!Irp) return Irp; > + if (!Irp) return NULL; > > /* Get the Stack */ > StackPtr = IoGetNextIrpStackLocation(Irp); > @@ -731,7 +730,7 @@ > Irp->UserIosb = IoStatusBlock; > Irp->Tail.Overlay.Thread = PsGetCurrentThread(); > > - /* Set the Status Block after all is done */ > + /* Return the IRP */ > IOTRACE(IO_IRP_DEBUG, > "%s - Built IRP %p with Major, Buffer, DO %lx %p %p\n", > __FUNCTION__, > @@ -763,7 +762,7 @@ > > /* Allocate IRP */ > Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); > - if (!Irp) return Irp; > + if (!Irp) return NULL; > > /* Get the Stack */ > StackPtr = IoGetNextIrpStackLocation(Irp); > @@ -857,6 +856,7 @@ > } > else > { > + /* Clear the flags */ > Irp->Flags = 0; > } > > @@ -1058,7 +1058,12 @@ > * Don't stay here forever if some broken driver doesn't > complete > * the IRP. > */ > - if (!(Retries--)) IopRemoveThreadIrp(); > + if (!(Retries--)) > + { > + /* Print out a message and remove the IRP */ > + DPRINT1("Broken driver did not complete!\n"); > + IopRemoveThreadIrp(); > + } > > /* Raise the IRQL Again */ > KeRaiseIrql(APC_LEVEL, &OldIrql); > @@ -1076,7 +1081,7 @@ > IoCallDriver(IN PDEVICE_OBJECT DeviceObject, > IN PIRP Irp) > { > - /* Call fast call */ > + /* Call fastcall */ > return IofCallDriver(DeviceObject, Irp); > } > > @@ -1112,7 +1117,7 @@ > IN PIRP Irp) > { > PDRIVER_OBJECT DriverObject; > - PIO_STACK_LOCATION Param; > + PIO_STACK_LOCATION StackPtr; > > /* Get the Driver Object */ > DriverObject = DeviceObject->DriverObject; > @@ -1126,15 +1131,15 @@ > } > > /* Now update the stack location */ > - Param = IoGetNextIrpStackLocation(Irp); > - Irp->Tail.Overlay.CurrentStackLocation = Param; > + StackPtr = IoGetNextIrpStackLocation(Irp); > + Irp->Tail.Overlay.CurrentStackLocation = StackPtr; > > /* Get the Device Object */ > - Param->DeviceObject = DeviceObject; > + StackPtr->DeviceObject = DeviceObject; > > /* Call it */ > - return DriverObject->MajorFunction[Param->MajorFunction] > (DeviceObject, > - Irp); > + return DriverObject->MajorFunction[StackPtr->MajorFunction] > (DeviceObject, > + Irp); > } > > FORCEINLINE > @@ -1417,10 +1422,9 @@ > > NTSTATUS > NTAPI > -IopSynchronousCompletion( > - IN PDEVICE_OBJECT DeviceObject, > - IN PIRP Irp, > - IN PVOID Context) > +IopSynchronousCompletion(IN PDEVICE_OBJECT DeviceObject, > + IN PIRP Irp, > + IN PVOID Context) > { > if (Irp->PendingReturned) > KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); > @@ -1464,6 +1468,7 @@ > KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, > NULL); > } > > + /* Return success */ > return TRUE; > } > > @@ -1550,10 +1555,12 @@ > /* > * @implemented > */ > -PEPROCESS NTAPI > +PEPROCESS > +NTAPI > IoGetRequestorProcess(IN PIRP Irp) > { > - return(Irp->Tail.Overlay.Thread->ThreadsProcess); > + /* Return the requestor process */ > + return Irp->Tail.Overlay.Thread->ThreadsProcess; > } > > /* > @@ -1563,6 +1570,7 @@ > NTAPI > IoGetRequestorProcessId(IN PIRP Irp) > { > + /* Return the requestor process' id */ > return (ULONG)(IoGetRequestorProcess(Irp)->UniqueProcessId); > } > > @@ -1586,6 +1594,7 @@ > NTAPI > IoGetTopLevelIrp(VOID) > { > + /* Return the IRP */ > return (PIRP)PsGetCurrentThread()->TopLevelIrp; > } > > @@ -1736,5 +1745,3 @@ > /* Set the IRP */ > PsGetCurrentThread()->TopLevelIrp = (ULONG)Irp; > } > - > -/* EOF */ > > 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 23 > 11:30:14 2008 > @@ -1,9 +1,11 @@ > /* > * PROJECT: ReactOS Kernel > * LICENSE: GPL - See COPYING in the top level directory > - * FILE: ntoskrnl/io/util.c > + * FILE: ntoskrnl/io/iomgr/util.c > * PURPOSE: I/O Utility Functions > - * PROGRAMMERS: <UNKNOWN> > + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) > + * Aleksey Bragin (aleksey(a)reactos.org) > + * Daniel Zimmerman (netzimme(a)aim.com) > */ > > /* INCLUDES > *****************************************************************/ > @@ -17,10 +19,6 @@ > RtlpGetStackLimits(PULONG_PTR StackBase, > PULONG_PTR StackLimit); > > -/* DATA > **********************************************************************/ > - > -KSPIN_LOCK CancelSpinLock; > - > /* FUNCTIONS > *****************************************************************/ > > /* > @@ -28,10 +26,10 @@ > */ > VOID > NTAPI > -IoAcquireCancelSpinLock(PKIRQL Irql) > +IoAcquireCancelSpinLock(OUT PKIRQL Irql) > { > /* Just acquire the internal lock */ > - KeAcquireSpinLock(&CancelSpinLock,Irql); > + *Irql = KeAcquireQueuedSpinLock(LockQueueIoCancelLock); > } > > /* > @@ -113,6 +111,7 @@ > NTAPI > IoGetCurrentProcess(VOID) > { > + /* Return the current thread's process */ > return (PEPROCESS)PsGetCurrentThread()->Tcb.ApcState.Process; > } > > @@ -121,10 +120,10 @@ > */ > VOID > NTAPI > -IoReleaseCancelSpinLock(KIRQL Irql) > +IoReleaseCancelSpinLock(IN KIRQL Irql) > { > /* Release the internal lock */ > - KeReleaseSpinLock(&CancelSpinLock,Irql); > + KeReleaseQueuedSpinLock(LockQueueIoCancelLock, Irql); > } > > /* > @@ -315,4 +314,3 @@ > UNIMPLEMENTED; > return STATUS_NOT_IMPLEMENTED; > } > -/* EOF */ > Best regards, Alex Ionescu

16 years, 9 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 35518: Implement KiSystemStartup in C instead of asm, implement KiSwapStack intrinsic, get rid of KiSetupStackandInitializeKernel, instead do the work in KiSystemStartupReal in C. Move Stack definitions into trap.S and get rid of the whole boot.S file. Comment out the sync loop for the moment and add a comment why it doesn't work (InterlockedBitTestAndSet64 doesn't work correctly).

by Thomas Bluemel

Calling from KiSwapStack from C seems quite scary. C doesn't know anything about you messing with the stack, so any subsequent code may still refer to a now invalid stack. There's a reason this was implemented in asm... tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Thu Aug 21 16:16:57 2008 > New Revision: 35518 > > URL: http://svn.reactos.org/svn/reactos?rev=35518&view=rev > Log: > Implement KiSystemStartup in C instead of asm, implement KiSwapStack intrinsic, get rid of KiSetupStackandInitializeKernel, instead do the work in KiSystemStartupReal in C. Move Stack definitions into trap.S and get rid of the whole boot.S file. Comment out the sync loop for the moment and add a comment why it doesn't work (InterlockedBitTestAndSet64 doesn't work correctly). > > Removed: > branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S > Modified: > branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h > branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c > branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S > branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild > > Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… > ============================================================================== > --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Thu Aug 21 16:16:57 2008 > @@ -10,6 +10,17 @@ > #define KeSetCurrentIrql(x) __writecr8(x) > > #if defined(__GNUC__) > + > +ULONG64 > +FORCEINLINE > +KiSwapStack(ULONG64 NewStack) > +{ > + ULONG64 OldStack; > + asm volatile ("movq %%rsp, %[oldstack]\n movq %[newstack], %%rsp\n" > + : [oldstack] "=rm" (OldStack) > + : [newstack] "rm" (NewStack)); > + return OldStack; > +} > > #define Ke386SetInterruptDescriptorTable(X) \ > __asm__("lidt %0\n\t" \ > > Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… > ============================================================================== > --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S (removed) > @@ -1,86 +1,0 @@ > -/* > - * FILE: ntoskrnl/ke/i386/boot.S > - * COPYRIGHT: See COPYING in the top level directory > - * PURPOSE: FreeLDR Wrapper Bootstrap Code and Bootstrap Trampoline > - * PROGRAMMERs: Alex Ionescu (alex(a)relsoft.net) > - * Thomas Weidenmueller <w3seek(a)reactos.org> > - */ > - > -/* INCLUDES ******************************************************************/ > - > -#include <asm.h> > -.intel_syntax noprefix > -.code64 > - > -/* GLOBALS *******************************************************************/ > - > -.bss > -.align 16 > - > -/* Kernel Boot Stack */ > -.globl _P0BootStack > -.space KERNEL_STACK_SIZE > -_P0BootStack: > - > -/* Kernel Double-Fault and Temporary DPC Stack */ > -.globl _KiDoubleFaultStack > -.space KERNEL_STACK_SIZE > -_KiDoubleFaultStack: > - > -/* FUNCTIONS *****************************************************************/ > -.global _KiSystemStartup > -.text > -.func KiSystemStartup > -_KiSystemStartup: > - > - /* NTLDR Boot: Call the main kernel initialization */ > - test rcx, 0x80000000 > - jnz _KiSystemStartupReal > - > - /* FREELDR Boot: Cal the FreeLDR wrapper */ > - jmp _KiRosPrepareForSystemStartup > -.endfunc > - > -/** > - * VOID > - * KiSetupStackAndInitializeKernel( > - * esp+4 = ? -> rcx > - * esp+8 = ? -> rdx > - * PVOID pNewstack // esp+12 = new stack -> r8 > - * esp+16 -> r9 > - * esp+20 -> rsp + 8 > - * esp+24 -> rsp + 16? > - */ > -.globl _KiSetupStackAndInitializeKernel > -.func KiSetupStackAndInitializeKernel > -_KiSetupStackAndInitializeKernel: > - > - /* Save current stack */ > - mov rsi, rsp > - > - /* Setup the new stack */ > - mov rsp, r8 > - sub rsp, NPX_FRAME_LENGTH + KTRAP_FRAME_ALIGN + KTRAP_FRAME_LENGTH > - push CR0_EM + CR0_TS + CR0_MP > - > - /* Copy stack parameters to the new stack */ > - push [rsi + 16] > - push [rsi + 8] > - xor rbp, rbp > - call _KiInitializeKernel > - > - /* Set the priority of this thread to 0 */ > - mov rbx, PCR[KPCR_CURRENT_THREAD] > - mov byte ptr [rbx+KTHREAD_PRIORITY], 0 > - > - /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ > - sti > - mov rcx, DISPATCH_LEVEL > - mov cr8, rcx > - > - /* Set the right wait IRQL */ > - mov byte ptr [rbx+KTHREAD_WAIT_IRQL], DISPATCH_LEVEL; > - > - /* Jump into the idle loop */ > - jmp _KiIdleLoop > -.endfunc > > Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… > ============================================================================== > --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Thu Aug 21 16:16:57 2008 > @@ -366,6 +366,7 @@ > > /* Start us out at PASSIVE_LEVEL */ > // Pcr->Irql = PASSIVE_LEVEL; > + KeSetCurrentIrql(PASSIVE_LEVEL); > > /* Set the GDI, IDT, TSS and DPC Stack */ > Pcr->GdtBase = (PVOID)Gdt; > @@ -386,6 +387,7 @@ > IN CCHAR Number, > IN PLOADER_PARAMETER_BLOCK LoaderBlock) > { > + FrLdrDbgPrint("Enter KiInitializeKernel\n"); > #if 0 > BOOLEAN NpxPresent; > ULONG FeatureBits; > @@ -642,6 +644,17 @@ > (ULONG64)TssSelector.BaseUpper << 32); > } > > +// Hack > +VOID KiRosPrepareForSystemStartup(ULONG, PROS_LOADER_PARAMETER_BLOCK); > + > +VOID > +NTAPI > +KiSystemStartup(IN ULONG_PTR Dummy, > + IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) > +{ > + KiRosPrepareForSystemStartup(Dummy, LoaderBlock); > +} > + > VOID > NTAPI > KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock) > @@ -740,13 +753,15 @@ > // RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); > } > > - > +#if 0 // FIXME: InterlockedBitTestAndSet64 is broken! It needs to be specified > + // that it should reference an absolute address! > /* Loop until we can release the freeze lock */ > do > { > /* Loop until execution can continue */ > while (*(volatile PKSPIN_LOCK*)&KiFreezeExecutionLock == (PVOID)1); > - } while(InterlockedBitTestAndSet((PLONG)&KiFreezeExecutionLock, 0)); > + } while(InterlockedBitTestAndSet64((PLONG64)&KiFreezeExecutionLock, 0)); > +#endif > > /* Setup CPU-related fields */ > Pcr->Prcb.Number = Cpu; > @@ -773,16 +788,29 @@ > KfRaiseIrql(HIGH_LEVEL); > > /* Align stack and make space for the trap frame and NPX frame */ > - InitialStack &= ~(KTRAP_FRAME_ALIGN - 1); > - > -FrLdrDbgPrint("Before KiSetupStackAndInitializeKernel\n"); > -for(;;); > - > - /* Switch to new kernel stack and start kernel bootstrapping */ > - KiSetupStackAndInitializeKernel(&KiInitialProcess.Pcb, > - InitialThread, > - (PVOID)InitialStack, > - &Pcr->Prcb, > - (CCHAR)Cpu, > - KeLoaderBlock); > + InitialStack &= ~(16 - 1); > + > + /* Switch to new kernel Stack */ > + KiSwapStack(InitialStack); > + > + /* Initialize kernel */ > + KiInitializeKernel(&KiInitialProcess.Pcb, > + InitialThread, > + (PVOID)InitialStack, > + &Pcr->Prcb, > + (CCHAR)Cpu, > + KeLoaderBlock); > + > + /* Set the priority of this thread to 0 */ > + InitialThread->Priority = 0; > + > + /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ > + _enable(); > + KeLowerIrql(DISPATCH_LEVEL); > + > + /* Set the right wait IRQL */ > + InitialThread->WaitIrql = DISPATCH_LEVEL; > + > + /* Jump into the idle loop */ > + KiIdleLoop(); > } > > Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… > ============================================================================== > --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Thu Aug 21 16:16:57 2008 > @@ -13,7 +13,22 @@ > .intel_syntax noprefix > .code64 > > +#define KERNEL_STACK_SIZE 0x6000 > + > /* GLOBALS *******************************************************************/ > + > +.bss > +.align 16 > + > +/* Kernel Boot Stack */ > +.globl _P0BootStack > +.space KERNEL_STACK_SIZE > +_P0BootStack: > + > +/* Kernel Double-Fault and Temporary DPC Stack */ > +.globl _KiDoubleFaultStack > +.space KERNEL_STACK_SIZE > +_KiDoubleFaultStack: > > .data > > > Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… > ============================================================================== > --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] Thu Aug 21 16:16:57 2008 > @@ -90,7 +90,6 @@ > </if> > <if property="ARCH" value="amd64"> > <directory name="amd64"> > - <file first="true">boot.S</file> > <file>cpu.c</file> > <file>except.c</file> > <file>irql.c</file> > >

16 years, 9 months

2
1
0 0

Re : Ros-dev Digest, Vol 48, Issue 14

by Sylvain Petreolle

Feel free to open a bug. ----- Message d'origine ---- De : Olaf Siejka <caemyr(a)gmail.com> À : ros-dev(a)reactos.org Envoyé le : Jeudi, 21 Août 2008, 22h47mn 20s Objet : Re: [ros-dev] Ros-dev Digest, Vol 48, Issue 14 Not to mention that makex is not 100% functional, for example i cannot perform makex depends or even makex bootcd on a clean tree. I have to first do make depends, then makex bootcd. 2008/8/21 <ros-dev-request(a)reactos.org> Send Ros-dev mailing list submissions to ros-dev(a)reactos.org To subscribe or unsubscribe via the World Wide Web, visit http://www.reactos.org/mailman/listinfo/ros-dev or, via email, send a message with subject or body 'help' to ros-dev-request(a)reactos.org You can reach the person managing the list at ros-dev-owner(a)reactos.org When replying, please edit your Subject line so it is more specific than "Re: Contents of Ros-dev digest..." Today's Topics: 1. Re: [ros-diffs] [dreimer] 35473: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible. (gedmurphy) 2. Re: [ros-diffs] [dreimer] 35473: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible. (Timo Kreuzer) 3. Re: [ros-diffs] [dreimer] 35473: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible. (Colin Finck) 4. Has anyone given any thought to coding so that the OS can use the GPU (Matthew Therault) 5. Re: Has anyone given any thought to coding so that the OS can use the GPU (Steven Edwards) 6. Re: [ros-diffs] [dreimer] 35473: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible. (Aleksey Bragin) ---------------------------------------------------------------------- Message: 1 Date: Wed, 20 Aug 2008 12:59:42 +0100 From: "gedmurphy" <gedmurphy(a)gmail.com> Subject: Re: [ros-dev] [ros-diffs] [dreimer] 35473: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible. To: <ros-dev(a)reactos.org> Message-ID: <000f01c902bc$3ea137f0$bbe3a7d0$@com> Content-Type: text/plain; charset="utf-8" I don't want make to consume both CPU's. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dreimer(a)svn.reactos.org Sent: 20 August 2008 10:10 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dreimer] 35473: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible. Author: dreimer Date: Wed Aug 20 04:10:07 2008 New Revision: 35473 URL: http://svn.reactos.org/svn/reactos?rev=35473&view=rev Log: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac

16 years, 9 months

1
0
0 0

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

by Olaf Siejka

Not to mention that makex is not 100% functional, for example i cannot perform makex depends or even makex bootcd on a clean tree. I have to first do make depends, then makex bootcd. 2008/8/21 <ros-dev-request(a)reactos.org> > Send Ros-dev mailing list submissions to > ros-dev(a)reactos.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://www.reactos.org/mailman/listinfo/ros-dev > or, via email, send a message with subject or body 'help' to > ros-dev-request(a)reactos.org > > You can reach the person managing the list at > ros-dev-owner(a)reactos.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Ros-dev digest..." > > > Today's Topics: > > 1. Re: [ros-diffs] [dreimer] 35473: make automatically behaves > like makex when there is more then one CPU Core now. makex kept > for now to keep compatible. (gedmurphy) > 2. Re: [ros-diffs] [dreimer] 35473: make automatically behaves > like makex when there is more then one CPU Core now. makex kept > for now to keep compatible. (Timo Kreuzer) > 3. Re: [ros-diffs] [dreimer] 35473: make automatically behaves > like makex when there is more then one CPU Core now. makex kept > for now to keep compatible. (Colin Finck) > 4. Has anyone given any thought to coding so that the OS can use > the GPU (Matthew Therault) > 5. Re: Has anyone given any thought to coding so that the OS can > use the GPU (Steven Edwards) > 6. Re: [ros-diffs] [dreimer] 35473: make automatically behaves > like makex when there is more then one CPU Core now. makex kept > for now to keep compatible. (Aleksey Bragin) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Wed, 20 Aug 2008 12:59:42 +0100 > From: "gedmurphy" <gedmurphy(a)gmail.com> > Subject: Re: [ros-dev] [ros-diffs] [dreimer] 35473: make automatically > behaves like makex when there is more then one CPU Core now. > makex > kept for now to keep compatible. > To: <ros-dev(a)reactos.org> > Message-ID: <000f01c902bc$3ea137f0$bbe3a7d0$@com> > Content-Type: text/plain; charset="utf-8" > > I don't want make to consume both CPU's. > > Ged. > > -----Original Message----- > From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] > On Behalf Of dreimer(a)svn.reactos.org > Sent: 20 August 2008 10:10 > To: ros-diffs(a)reactos.org > Subject: [ros-diffs] [dreimer] 35473: make automatically behaves like makex > when there is more then one CPU Core now. makex kept for now to keep > compatible. > > Author: dreimer > Date: Wed Aug 20 04:10:07 2008 > New Revision: 35473 > > URL: http://svn.reactos.org/svn/reactos?rev=35473&view=rev > Log: > make automatically behaves like makex when there is more then one CPU Core > now. makex kept for now to keep compatible. > > Modified: > trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd > trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac

16 years, 9 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [dreimer] 35473: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible.

by gedmurphy

I don't want make to consume both CPU's. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dreimer(a)svn.reactos.org Sent: 20 August 2008 10:10 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dreimer] 35473: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible. Author: dreimer Date: Wed Aug 20 04:10:07 2008 New Revision: 35473 URL: http://svn.reactos.org/svn/reactos?rev=35473&view=rev Log: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Wed Aug 20 04:10:07 2008 @@ -103,11 +103,20 @@ ) :: +:: Get the number of CPUs in the system so we know how many jobs to execute. +:: To modify the number used alter the options used with cpucount: +:: No Option - Number of CPUs. +:: -x1 - Number of CPUs, plus 1. +:: -x2 - Number of CPUs, doubled. +:: -a - Determine the cpu count based on the inherited process affinity mask. +:: +for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i +:: :: Check if we are using -j or not. :: -if "%1" == "multi" ( - if not "%2" == "" ( - title 'makex %2' parallel build started: %TIMERAW% +if %CPUCOUNT% GTR 2 ( + if not "%1" == "" ( + title 'makex %1' parallel build started: %TIMERAW% ) else ( title 'makex' parallel build started: %TIMERAW% ) @@ -139,27 +148,17 @@ goto :EOF :BUILDMULTI - :: - :: Get the number of CPUs in the system so we know how many jobs to execute. - :: To modify the number used alter the options used with cpucount: - :: No Option - Number of CPUs. - :: -x1 - Number of CPUs, plus 1. - :: -x2 - Number of CPUs, doubled. - :: -a - Determine the cpu count based on the inherited process affinity mask. - :: - for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i - if %_ROSBE_SHOWTIME% == 1 ( if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* ) ) else ( if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* ) ) goto :EOF Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] Wed Aug 20 04:10:07 2008 @@ -7,7 +7,7 @@ ENV = set HELP = "%_ROSBE_BASEDIR%\Help.cmd" $* MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $* -MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" multi $* +MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" $* RADDR2LINE = "%_ROSBE_BASEDIR%\reladdr2line.cmd" $* RENV = for /f "usebackq tokens=*" %i in (`set _ROSBE_`) do @echo %i SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $*

16 years, 9 months

4
3
0 0

Has anyone given any thought to coding so that the OS can use the GPU

by Matthew Therault

Just a random thought wondering if anyone else has thought about it. They are making great strides into how the GPU can now be used as a processor. -- Two men walk into a bar....... Third one ducks.... Think about it, it will come to you. :P

16 years, 10 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 35458: Move some architecture specific code from KiRosPrepareForSystemStartup into KiArchInitSystem, defined for each architecture. Enable KiRosBuildReservedMemoryMap for _M_AMD64

by Alex Ionescu

Please rename the function to KiFreeLdrHackKiArchHackHack or something like that, and move it away from cpu.c, somewhere like i386/freeldr.c to make clear that this function has NOTHING TO DO with how NT should boot and is a hack because FreeLDR is a piece of shit that nobody seems to want to fix. On 19-Aug-08, at 12:07 PM, tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Tue Aug 19 14:07:13 2008 > New Revision: 35458 > > URL: http://svn.reactos.org/svn/reactos?rev=35458&view=rev > Log: > Move some architecture specific code from > KiRosPrepareForSystemStartup into KiArchInitSystem, defined for each > architecture. Enable KiRosBuildReservedMemoryMap for _M_AMD64 > > Modified: > branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c > branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c > branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c > > Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… > = > = > = > = > = > = > = > = > ====================================================================== > --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c > [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c > [iso-8859-1] Tue Aug 19 14:07:13 2008 > @@ -949,7 +949,7 @@ > /* Build entries for ReactOS memory ranges, which uses ARC > Descriptors */ > KiRosBuildOsMemoryMap(); > > -#ifdef _M_IX86 > +#if defined(_M_IX86) || defined(_M_AMD64) > /* Build entries for the reserved map, which uses ARC > Descriptors */ > KiRosBuildReservedMemoryMap(); > #endif > @@ -1266,42 +1266,15 @@ > { > PLOADER_PARAMETER_BLOCK NtLoaderBlock; > ULONG size, i = 0, *ent; > -#if defined(_M_IX86) > - PKTSS Tss; > - PKGDTENTRY TssEntry; > - > - /* Load the GDT and IDT */ > - > Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); > - > Ke386SetInterruptDescriptorTable > (*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); > - > - /* Initialize the boot TSS */ > - Tss = &KiBootTss; > - TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; > - TssEntry->HighWord.Bits.Type = I386_TSS; > - TssEntry->HighWord.Bits.Pres = 1; > - TssEntry->HighWord.Bits.Dpl = 0; > - TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); > - TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); > - TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); > -#endif > - > -#if defined(_M_PPC) > - // Zero bats. We might have residual bats set that will > interfere with > - // our mapping of ofwldr. > - for (i = 0; i < 4; i++) > - { > - SetBat(i, 0, 0, 0); SetBat(i, 1, 0, 0); > - } > - KiSetupSyscallHandler(); > - DbgPrint("Kernel Power (%08x)\n", LoaderBlock); > - DbgPrint("ArchExtra (%08x)!\n", LoaderBlock->ArchExtra); > -#endif > > /* Save pointer to ROS Block */ > KeRosLoaderBlock = LoaderBlock; > > /* Get debugging function */ > FrLdrDbgPrint = LoaderBlock->FrLdrDbgPrint; > + > + /* Per architecture initialisazion code */ > + KiArchInitSystem(); > > /* Save memory manager data */ > KeMemoryMapRangeCount = 0; > > Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… > = > = > = > = > = > = > = > = > ====================================================================== > --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c > [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c > [iso-8859-1] Tue Aug 19 14:07:13 2008 > @@ -1036,3 +1036,24 @@ > /* Capture the control state */ > KiSaveProcessorControlState(State); > } > + > +VOID > +KiArchInitSystem() > +{ > + PKTSS Tss; > + PKGDTENTRY TssEntry; > + > + /* Load the GDT and IDT */ > + > Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); > + > Ke386SetInterruptDescriptorTable > (*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); > + > + /* Initialize the boot TSS */ > + Tss = &KiBootTss; > + TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; > + TssEntry->HighWord.Bits.Type = I386_TSS; > + TssEntry->HighWord.Bits.Pres = 1; > + TssEntry->HighWord.Bits.Dpl = 0; > + TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); > + TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); > + TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); > +} > > Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… > = > = > = > = > = > = > = > = > ====================================================================== > --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c > [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c > [iso-8859-1] Tue Aug 19 14:07:13 2008 > @@ -275,3 +275,19 @@ > /* Capture the control state */ > KiSaveProcessorControlState(State); > } > + > +VOID > +KiArchInitSystem() > +{ > + ULONG i; > + > + // Zero bats. We might have residual bats set that will > interfere with > + // our mapping of ofwldr. > + for (i = 0; i < 4; i++) > + { > + SetBat(i, 0, 0, 0); SetBat(i, 1, 0, 0); > + } > + KiSetupSyscallHandler(); > + DbgPrint("Kernel Power (%08x)\n", KeRosLoaderBlock); > + DbgPrint("ArchExtra (%08x)!\n", KeRosLoaderBlock->ArchExtra); > +} > Best regards, Alex Ionescu

16 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 34290: Remove the strsafe library, it was imported from a dubious source, which is incompatible with the LGPL

by Gregor Gullwi

I know this is an old changelist, but do we have any plans on re-implementing this lib by hand? -Gregor cfinck(a)svn.reactos.org wrote: > Author: cfinck > Date: Fri Jul 4 03:24:37 2008 > New Revision: 34290 > > URL: http://svn.reactos.org/svn/reactos?rev=34290&view=rev > Log: > Remove the strsafe library, it was imported from a dubious source, which is incompatible with the LGPL > > Removed: > trunk/reactos/include/psdk/strsafe.h > trunk/reactos/lib/sdk/strsafe/ > Modified: > trunk/reactos/lib/sdk/sdk.rbuild > > Removed: trunk/reactos/include/psdk/strsafe.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/strsafe.h?rev… > ============================================================================== > --- trunk/reactos/include/psdk/strsafe.h [iso-8859-1] (original) > +++ trunk/reactos/include/psdk/strsafe.h (removed) > @@ -1,454 +1,0 @@ > -/* > - * STRSAFE > - * > - * Copyright 2007 Dmitry Chapyshev <dmitry(a)reactos.org> > - * > - * This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2.1 of the License, or (at your option) any later version. > - * > - * This library is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this library; if not, write to the Free Software > - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > -#ifndef _STRSAFE_H_INCLUDED_ > -#define _STRSAFE_H_INCLUDED_ > - > -#ifdef __cplusplus > -#define _STRSAFE_EXTERN_C extern "C" > -extern "C" { > -#else > -#define _STRSAFE_EXTERN_C extern > -#endif > - > -#include <string.h> > -#include <stdarg.h> > -#include <stdio.h> > -#include <windows.h> > - > -#define STRSAFE_INLINE_API __inline HRESULT __stdcall > -#define STRSAFEAPI _STRSAFE_EXTERN_C HRESULT __stdcall > - > -#ifndef _NTSTRSAFE_H_INCLUDED_ > - > -#define STRSAFE_MAX_CCH 2147483647 > - > -#define STRSAFE_FILL_BEHIND_NULL 0x00000200 > -#define STRSAFE_IGNORE_NULLS 0x00000100 > -#define STRSAFE_FILL_ON_FAILURE 0x00000400 > -#define STRSAFE_NULL_ON_FAILURE 0x00000800 > -#define STRSAFE_NO_TRUNCATION 0x00001000 > -#define STRSAFE_IGNORE_NULL_UNICODE_STRINGS 0x00010000 > -#define STRSAFE_UNICODE_STRING_DEST_NULL_TERMINATED 0x00020000 > - > -#define STRSAFE_VALID_FLAGS (0x000000FF | STRSAFE_IGNORE_NULLS | STRSAFE_FILL_BEHIND_NULL | STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION) > -#define STRSAFE_UNICODE_STRING_VALID_FLAGS (STRSAFE_VALID_FLAGS | STRSAFE_IGNORE_NULL_UNICODE_STRINGS | STRSAFE_UNICODE_STRING_DEST_NULL_TERMINATED) > -#define STRSAFE_FILL_BYTE(x) ((unsigned long)((x & 0x000000FF) | STRSAFE_FILL_BEHIND_NULL)) > -#define STRSAFE_FAILURE_BYTE(x) ((unsigned long)((x & 0x000000FF) | STRSAFE_FILL_ON_FAILURE)) > -#define STRSAFE_GET_FILL_PATTERN(dwFlags) ((int)(dwFlags & 0x000000FF)) > - > -#endif /* _NTSTRSAFE_H_INCLUDED_ */ > - > -#define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) > -#define STRSAFE_E_INVALID_PARAMETER ((HRESULT)0x80070057L) > -#define STRSAFE_E_END_OF_FILE ((HRESULT)0x80070026L) > - > -#ifndef STRSAFE_NO_CCH_FUNCTIONS > -STRSAFEAPI > -StringCchCatA(LPTSTR pszDest, > - size_t cchDest, > - LPCTSTR pszSrc); > - > -STRSAFEAPI > -StringCchCatW(LPWSTR pszDest, > - size_t cchDest, > - LPCWSTR pszSrc); > - > -STRSAFEAPI > -StringCchCatExA(LPTSTR pszDest, > - size_t cchDest, > - LPCTSTR pszSrc, > - LPTSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCchCatExW(LPWSTR pszDest, > - size_t cchDest, > - LPCWSTR pszSrc, > - LPWSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCchCatNA(LPTSTR pszDest, > - size_t cchDest, > - LPCTSTR pszSrc, > - size_t cchMaxAppend); > - > -STRSAFEAPI > -StringCchCatNW(LPWSTR pszDest, > - size_t cchDest, > - LPCWSTR pszSrc, > - size_t cchMaxAppend); > - > -STRSAFEAPI > -StringCchCatNExA(LPTSTR pszDest, > - size_t cchDest, > - LPCTSTR pszSrc, > - size_t cchMaxAppend, > - LPTSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCchCatNExW(LPWSTR pszDest, > - size_t cchDest, > - LPCWSTR pszSrc, > - size_t cchMaxAppend, > - LPWSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCchCopyA(LPTSTR pszDest, > - size_t cchDest, > - LPCTSTR pszSrc); > - > -STRSAFEAPI > -StringCchCopyW(LPWSTR pszDest, > - size_t cchDest, > - LPCWSTR pszSrc); > - > -STRSAFEAPI > -StringCchCopyExA(LPTSTR pszDest, > - size_t cchDest, > - LPCTSTR pszSrc, > - LPTSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCchCopyExW(LPWSTR pszDest, > - size_t cchDest, > - LPCWSTR pszSrc, > - LPWSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCchCopyNA(LPTSTR pszDest, > - size_t cchDest, > - LPCTSTR pszSrc, > - size_t cchSrc); > - > -STRSAFEAPI > -StringCchCopyNW(LPWSTR pszDest, > - size_t cchDest, > - LPCWSTR pszSrc, > - size_t cchSrc); > - > -STRSAFEAPI > -StringCchCopyNExA(LPTSTR pszDest, > - size_t cchDest, > - LPCTSTR pszSrc, > - size_t cchSrc, > - LPTSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCchCopyNExW(LPWSTR pszDest, > - size_t cchDest, > - LPCWSTR pszSrc, > - size_t cchSrc, > - LPWSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags); > - > -STRSAFE_INLINE_API > -StringCchGetsA(LPTSTR pszDest, > - size_t cchDest); > - > -STRSAFE_INLINE_API > -StringCchGetsW(LPWSTR pszDest, > - size_t cchDest); > - > -STRSAFE_INLINE_API > -StringCchGetsExA(LPTSTR pszDest, > - size_t cchDest, > - LPTSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags); > - > -STRSAFE_INLINE_API > -StringCchGetsExW(LPWSTR pszDest, > - size_t cchDest, > - LPWSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCchVPrintfA(LPTSTR pszDest, > - size_t cchDest, > - LPCTSTR pszFormat, > - va_list argList); > - > -STRSAFEAPI > -StringCchVPrintfW(LPWSTR pszDest, > - size_t cchDest, > - LPCWSTR pszFormat, > - va_list argList); > - > -STRSAFEAPI > -StringCchVPrintfExA(LPTSTR pszDest, > - size_t cchDest, > - LPTSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags, > - LPCTSTR pszFormat, > - va_list argList); > - > -STRSAFEAPI > -StringCchVPrintfExW(LPWSTR pszDest, > - size_t cchDest, > - LPWSTR *ppszDestEnd, > - size_t* pcchRemaining, > - unsigned long dwFlags, > - LPCWSTR pszFormat, > - va_list argList); > - > -STRSAFEAPI > -StringCchLengthA(LPCTSTR psz, > - size_t cchMax, > - size_t* pcch); > - > -STRSAFEAPI > -StringCchLengthW(LPCWSTR psz, > - size_t cchMax, > - size_t* pcch); > -#endif /* STRSAFE_NO_CCH_FUNCTIONS */ > - > -/* CB */ > -#ifndef STRSAFE_NO_CB_FUNCTIONS > -STRSAFEAPI > -StringCbCatA(LPTSTR pszDest, > - size_t cbDest, > - LPCTSTR pszSrc); > - > -STRSAFEAPI > -StringCbCatW(LPWSTR pszDest, > - size_t cbDest, > - LPCWSTR pszSrc); > - > -STRSAFEAPI > -StringCbCatExA(LPTSTR pszDest, > - size_t cbDest, > - LPCTSTR pszSrc, > - LPTSTR *ppszDestEnd, > - size_t* pcbRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCbCatExW(LPWSTR pszDest, > - size_t cbDest, > - LPCWSTR pszSrc, > - LPWSTR *ppszDestEnd, > - size_t* pcbRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCbCopyA(LPTSTR pszDest, > - size_t cbDest, > - LPCTSTR pszSrc); > - > -STRSAFEAPI > -StringCbCopyW(LPWSTR pszDest, > - size_t cbDest, > - LPCWSTR pszSrc); > - > -STRSAFEAPI > -StringCbCopyExA(LPTSTR pszDest, > - size_t cbDest, > - LPCTSTR pszSrc, > - LPTSTR *ppszDestEnd, > - size_t* pcbRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCbCopyExW(LPWSTR pszDest, > - size_t cbDest, > - LPCWSTR pszSrc, > - LPWSTR *ppszDestEnd, > - size_t* pcbRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCbCopyNA(LPTSTR pszDest, > - size_t cbDest, > - LPCTSTR pszSrc, > - size_t cbSrc); > - > -STRSAFEAPI > -StringCbCopyNW(LPWSTR pszDest, > - size_t cbDest, > - LPCWSTR pszSrc, > - size_t cbSrc); > - > -STRSAFEAPI > -StringCbCopyNExA(LPTSTR pszDest, > - size_t cbDest, > - LPCTSTR pszSrc, > - size_t cbSrc, > - LPTSTR *ppszDestEnd, > - size_t* pcbRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCbCopyNExW(LPWSTR pszDest, > - size_t cbDest, > - LPCWSTR pszSrc, > - size_t cbSrc, > - LPWSTR *ppszDestEnd, > - size_t* pcbRemaining, > - unsigned long dwFlags); > - > -STRSAFE_INLINE_API > -StringCbGetsA(LPTSTR pszDest, > - size_t cbDest); > - > -STRSAFE_INLINE_API > -StringCbGetsW(LPWSTR pszDest, > - size_t cbDest); > - > -STRSAFE_INLINE_API > -StringCbGetsExA(LPTSTR pszDest, > - size_t cbDest, > - LPTSTR *ppszDestEnd, > - size_t* pbRemaining, > - unsigned long dwFlags); > - > -STRSAFE_INLINE_API > -StringCbGetsExW(LPWSTR pszDest, > - size_t cbDest, > - LPWSTR *ppszDestEnd, > - size_t* pcbRemaining, > - unsigned long dwFlags); > - > -STRSAFEAPI > -StringCbPrintfA(LPTSTR pszDest, > - size_t cbDest, > - LPCTSTR pszFormat, > - ...); > - > -STRSAFEAPI > -StringCbPrintfW(LPWSTR pszDest, > - size_t cbDest, > - LPCWSTR pszFormat, > - ...); > - > -STRSAFEAPI > -StringCbPrintfExA(LPTSTR pszDest, > - size_t cbDest, > - LPTSTR *ppszDestEnd, > - size_t* pcbRemaining, > - unsigned long dwFlags, > - LPCTSTR pszFormat, > - ...); > - > -STRSAFEAPI > -StringCbPrintfExW(LPWSTR pszDest, > - size_t cbDest, > - LPWSTR *ppszDestEnd, > - size_t* pcbRemaining, > - unsigned long dwFlags, > - LPCWSTR pszFormat, > - ...); > -#endif /* STRSAFE_NO_CB_FUNCTIONS */ > - > -#ifdef UNICODE > -#ifndef STRSAFE_NO_CCH_FUNCTIONS > -#define StringCchCat StringCchCatW > -#define StringCchCatEx StringCchCatExW > -#define StringCchCatN StringCchCatNW > -#define StringCchCatNEx StringCchCatNExW > -#define StringCchCopy StringCchCopyW > -#define StringCchCopyEx StringCchCopyExW > -#define StringCchCopyN StringCchCopyNW > -#define StringCchCopyNEx StringCchCopyNExW > -#define StringCchGets StringCchGetsW > -#define StringCchGetsEx StringCchGetsExW > -#define StringCchPrintf StringCchPrintfW > -#define StringCchPrintfEx StringCchPrintfExW > -#define StringCchVPrintf StringCchVPrintfW > -#define StringCchVPrintfEx StringCchVPrintfExW > -#define StringCchLength StringCchLengthW > -#endif /* STRSAFE_NO_CCH_FUNCTIONS */ > - > -#ifndef STRSAFE_NO_CB_FUNCTIONS > -#define StringCbCat StringCbCatW > -#define StringCbCatEx StringCbCatExW > -#define StringCbCatN StringCbCatNW > -#define StringCbCatNEx StringCbCatNExW > -#define StringCbCopy StringCbCopyW > -#define StringCbCopyEx StringCbCopyExW > -#define StringCbCopyN StringCbCopyNW > -#define StringCbCopyNEx StringCbCopyNExW > -#define StringCbGets StringCbGetsW > -#define StringCbGetsEx StringCbGetsExW > -#define StringCbPrintf StringCbPrintfW > -#define StringCbPrintfEx StringCbPrintfExW > -#define StringCbVPrintf StringCbVPrintfW > -#define StringCbVPrintfEx StringCbVPrintfExW > -#define StringCbLenght StringCbLenghtW > -#endif /* STRSAFE_NO_CB_FUNCTIONS */ > - > -#else > -#ifndef STRSAFE_NO_CCH_FUNCTIONS > -#define StringCchCat StringCchCatA > -#define StringCchCatEx StringCchCatExA > -#define StringCchCatN StringCchCatNA > -#define StringCchCatNEx StringCchCatNExA > -#define StringCchCopy StringCchCopyA > -#define StringCchCopyEx StringCchCopyExA > -#define StringCchCopyN StringCchCopyNA > -#define StringCchCopyNEx StringCchCopyNExA > -#define StringCchGets StringCchGetsA > -#define StringCchGetsEx StringCchGetsExA > -#define StringCchPrintf StringCchPrintfA > -#define StringCchPrintfEx StringCchPrintfExA > -#define StringCchVPrintf StringCchVPrintfA > -#define StringCchVPrintfEx StringCchVPrintfExA > -#define StringCchLength StringCchLengthA > -#endif /* STRSAFE_NO_CCH_FUNCTIONS */ > - > -#ifndef STRSAFE_NO_CB_FUNCTIONS > -#define StringCbCat StringCbCatA > -#define StringCbCatEx StringCbCatExA > -#define StringCbCatN StringCbCatNA > -#define StringCbCatNEx StringCbCatNExA > -#define StringCbCopy StringCbCopyA > -#define StringCbCopyEx StringCbCopyExA > -#define StringCbCopyN StringCbCopyNA > -#define StringCbCopyNEx StringCbCopyNExA > -#define StringCbGets StringCbGetsA > -#define StringCbGetsEx StringCbGetsExA > -#define StringCbPrintf StringCbPrintfA > -#define StringCbPrintfEx StringCbPrintfExA > -#define StringCbVPrintf StringCbVPrintfA > -#define StringCbVPrintfEx StringCbVPrintfExA > -#define StringCbLenght StringCbLenghtA > -#endif /* STRSAFE_NO_CB_FUNCTIONS */ > -#endif /* UNICODE */ > - > -#ifdef __cplusplus > -} > -#endif /* cplusplus */ > - > -#endif /* _STRSAFE_H_INCLUDED_ */ > > Modified: trunk/reactos/lib/sdk/sdk.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/sdk.rbuild?rev=342… > ============================================================================== > --- trunk/reactos/lib/sdk/sdk.rbuild [iso-8859-1] (original) > +++ trunk/reactos/lib/sdk/sdk.rbuild [iso-8859-1] Fri Jul 4 03:24:37 2008 > @@ -23,7 +23,4 @@ > <directory name="scrnsave"> > <xi:include href="scrnsave/scrnsave.rbuild" /> > </directory> > - <directory name="strsafe"> > - <xi:include href="strsafe/strsafe.rbuild" /> > - </directory> > </group> > >

16 years, 10 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 35346: PE symbol dumper. It's not finished, functions don't work and the type output doesn't always look 100% correct. But it does it's job. You need dbghelp.dll and symsrv.dll from windbg.

by Steven Edwards

On Thu, Aug 14, 2008 at 5:35 PM, <tkreuzer(a)svn.reactos.org> wrote: > URL: http://svn.reactos.org/svn/reactos?rev=35346&view=rev > Log: > PE symbol dumper. It's not finished, functions don't work and the type output doesn't always look 100% correct. But it does it's job. You need dbghelp.dll and symsrv.dll from windbg. You could also import winedump. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 10 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 35359: The TEB member is called ClientID not Cid on all Windows versions I could check (XP, 2k3, vista).

by Aleksey Bragin

Please merge this change to trunk too, if NDK author does not object. WBR, Aleksey Bragin. On Aug 16, 2008, at 3:40 AM, tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Fri Aug 15 18:40:42 2008 > New Revision: 35359 > > URL: http://svn.reactos.org/svn/reactos?rev=35359&view=rev > Log: > The TEB member is called ClientID not Cid on all Windows versions I > could check (XP, 2k3, vista).

16 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-web] Developer blog

by Zachary Gorden

I'd rather pester you to finish work on your SEH paper and translation of parts of your thesis. On Fri, Aug 15, 2008 at 12:31 AM, KJK::Hyperion <hackbunny(a)reactos.org>wrote: > Zachary Gorden ha scritto: > > However, there may be developers who do not wish to maintain > > their own blog or want to keep their ROS bloggings separate and want to > > make use of the system integrated in the CMS. Any thoughts? > > Do both (aggregator AND blog platform). Then pester me to blog > _______________________________________________ > Ros-web mailing list > Ros-web(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-web >

16 years, 10 months

3
3
0 0

Developer blog

by Zachary Gorden

Sending this to both mailing lists as I don't know how many developers are actually subscribed to the web list. For some time now, the blog on the ReactOS site hasn't been used. When I asked if Aleksey was against putting up a "preview" of sorts on the front page in an attempt to revive it, some of the developers such as Ged pointed out no one really used it anymore and a few already had their own blogs and didn't want to maintain two. Ged has already moved to remove the link in the quick menu, though no formal decision has been made yet (the link is still there until a refresh occurs, though we might end up restoring it anyways). I personally believe the blog could be quite useful, even if its current form changes. An alternative would be an aggregation of the RSS feeds from the blogs maintained by each ROS developer, assuming they have a blog. However, there may be developers who do not wish to maintain their own blog or want to keep their ROS bloggings separate and want to make use of the system integrated in the CMS. Any thoughts?

16 years, 10 months

4
4
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 35299: - Reapply the PsTerminateSystemThread typo fix. We do boot fine with this fix. - Note to self: Don't commit after midnight and always test your patches yourself

by Alex Ionescu

Some credit would've been nice ;-) On 13-Aug-08, at 12:56 AM, sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Wed Aug 13 02:55:59 2008 > New Revision: 35299 > > URL: http://svn.reactos.org/svn/reactos?rev=35299&view=rev > Log: > - Reapply the PsTerminateSystemThread typo fix. We do boot fine with > this fix. > - Note to self: Don't commit after midnight and always test your > patches yourself > > Modified: > trunk/reactos/ntoskrnl/ps/kill.c > > Modified: trunk/reactos/ntoskrnl/ps/kill.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=352… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Wed Aug 13 > 02:55:59 2008 > @@ -1086,7 +1086,7 @@ > PETHREAD Thread = PsGetCurrentThread(); > > /* Make sure this is a system thread */ > - if (Thread->SystemThread) return STATUS_INVALID_PARAMETER; > + if (!Thread->SystemThread) return STATUS_INVALID_PARAMETER; > > /* Terminate it for real */ > return PspTerminateThreadByPointer(Thread, ExitStatus, TRUE); > Best regards, Alex Ionescu

16 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 35294: - Temporarily revert my last change. We don't set the SystemThread flag appropriately and it is always zero

by Alex Ionescu

else { /* System Thread */ Thread->StartAddress = StartRoutine; PspSetCrossThreadFlag(Thread, CT_SYSTEM_THREAD_BIT); Looks good to me. And CT_SYSTEM_THREAD_BIT is defined to 0x10 which is correct: union { struct { ULONG Terminated:1; #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG ThreadInserted:1; #else ULONG DeadThread:1; #endif ULONG HideFromDebugger:1; ULONG ActiveImpersonationInfo:1; ULONG SystemThread:1; so your patch was correct and should be re-applied. On 12-Aug-08, at 3:22 PM, sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Tue Aug 12 17:22:51 2008 > New Revision: 35294 > > URL: http://svn.reactos.org/svn/reactos?rev=35294&view=rev > Log: > - Temporarily revert my last change. We don't set the SystemThread > flag appropriately and it is always zero > > Modified: > trunk/reactos/ntoskrnl/ps/kill.c > > Modified: trunk/reactos/ntoskrnl/ps/kill.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=352… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Tue Aug 12 > 17:22:51 2008 > @@ -1086,7 +1086,7 @@ > PETHREAD Thread = PsGetCurrentThread(); > > /* Make sure this is a system thread */ > - if (!Thread->SystemThread) return STATUS_INVALID_PARAMETER; > + if (Thread->SystemThread) return STATUS_INVALID_PARAMETER; > > /* Terminate it for real */ > return PspTerminateThreadByPointer(Thread, ExitStatus, TRUE); > Best regards, Alex Ionescu

16 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-priv] ROS information policy...

by Thomas Bluemel

Timo Kreuzer wrote: > And when I have already started moaning about this kind of stuff... what > about the arm guys? They are so secret they can't even make their > changelog themselfs? Why that? And why are they so secret that noone > knows? I mean we keep demanding real name and email from everyone > creating a patch, yet a bunch of people have direct commit access and > they keep hiding their names? What reasons are there I thought it was common knowledge already that Alex is the (only) arm "guys". Isn't it more than obvious? Very same coding style, knowledge, comments, rants, ... How stupid does one have to be not to realize the connection? Prove me otherwise... And since you're complaining about not being open, why do you only post this to the private list? Thomas

16 years, 10 months

2
1
0 0

[ros-diffs] [fireball] 35140: - Add more intrinsic defines. - SVN maintenance.

by Timo Kreuzer

MS defines most of those in the wdk, if NO_INTERLOCKED_INTRINSICS is not defined > +#define InterlockedDecrement _InterlockedDecrement > +#define InterlockedDecrement16 _InterlockedDecrement16 > +#define InterlockedIncrement _InterlockedIncrement > +#define InterlockedIncrement16 _InterlockedIncrement16 > +#define InterlockedCompareExchange _InterlockedCompareExchange > +#define InterlockedCompareExchange16 _InterlockedCompareExchange16 > +#define InterlockedCompareExchange64 _InterlockedCompareExchange64 > +#define InterlockedExchange _InterlockedExchange > +#define InterlockedExchangeAdd _InterlockedExchangeAdd >

16 years, 10 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 35127: - Add cred.c from Wine

by Steven Edwards

On Tue, Aug 5, 2008 at 10:45 AM, <dchapyshev(a)svn.reactos.org> wrote: > +#include "../crypt/crypt.h" Minor nitpicking, Do you mind fixing this? Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [mkupfer] 35050: revert to 35046, sorry for mistake

by Steven Edwards

On Sat, Aug 2, 2008 at 6:33 PM, <mkupfer(a)svn.reactos.org> wrote: > Author: mkupfer > Date: Sat Aug 2 17:33:58 2008 > New Revision: 35050 > > URL: http://svn.reactos.org/svn/reactos?rev=35050&view=rev > Log: > revert to 35046, sorry for mistake Ignore my message, I did not see where you fixed it. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [mkupfer] 35047: Reorganize shdocvw: - Moved and renamed language resource files into created 'lang' directory. - Outdated shdocvw_ros.diff removed.

by Steven Edwards

On Sat, Aug 2, 2008 at 5:57 PM, <mkupfer(a)svn.reactos.org> wrote: > Author: mkupfer > Date: Sat Aug 2 16:57:53 2008 > New Revision: 35047 > > URL: http://svn.reactos.org/svn/reactos?rev=35047&view=rev > Log: > Reorganize shdocvw: > - Moved and renamed language resource files into created 'lang' directory. > - Outdated shdocvw_ros.diff removed. This is wrong, shdocvw will keep being synced as soon as the widl bug is fixed so the resources should stay in the dll root to save whoever is doing the sync the trouble of having to move resources around. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 10 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [sginsberg] 35042: - ExpLookupHandleTableEntry: Apply same changes as was done for ExpFreeHandleTable and ExpAllocateHandleTableEntrySlow in 34467 - ExpAllocateHandleTableEntry: Fail if we don't find a handle table entry

by Alex Ionescu

This is broken. Best regards, Alex Ionescu On Sat, Aug 2, 2008 at 11:25 AM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Sat Aug 2 13:25:53 2008 > New Revision: 35042 > > URL: http://svn.reactos.org/svn/reactos?rev=35042&view=rev > Log: > - ExpLookupHandleTableEntry: Apply same changes as was done for ExpFreeHandleTable and ExpAllocateHandleTableEntrySlow in 34467 > - ExpAllocateHandleTableEntry: Fail if we don't find a handle table entry > > Modified: > trunk/reactos/ntoskrnl/ex/handle.c > > Modified: trunk/reactos/ntoskrnl/ex/handle.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Sat Aug 2 13:25:53 2008 > @@ -35,8 +35,10 @@ > ExpLookupHandleTableEntry(IN PHANDLE_TABLE HandleTable, > IN EXHANDLE LookupHandle) > { > - ULONG i, j, k, TableLevel, NextHandle; > - ULONG_PTR TableBase; > + ULONG i, j, k, NextHandle; > + ULONG_PTR TableCode = HandleTable->TableCode; > + ULONG_PTR TableBase = TableCode & ~3; > + ULONG TableLevel = (ULONG)(TableCode & 3); > PHANDLE_TABLE_ENTRY Entry = NULL; > EXHANDLE Handle = LookupHandle; > PUCHAR Level1, Level2, Level3; > @@ -45,13 +47,6 @@ > Handle.TagBits = 0; > NextHandle = *(volatile ULONG*)&HandleTable->NextHandleNeedingPool; > if (Handle.Value >= NextHandle) return NULL; > - > - /* Get the table code */ > - TableBase = *(volatile ULONG_PTR*)&HandleTable->TableCode; > - > - /* Extract the table level and actual table base */ > - TableLevel = (ULONG)(TableBase & 3); > - TableBase = TableBase - TableLevel; > > /* Check what level we're running at */ > switch (TableLevel) > @@ -210,8 +205,8 @@ > PEPROCESS Process = HandleTable->QuotaProcess; > ULONG i, j; > ULONG_PTR TableCode = HandleTable->TableCode; > - ULONG TableLevel = TableCode & 3; > ULONG_PTR TableBase = TableCode & ~3; > + ULONG TableLevel = (ULONG)(TableCode & 3); > PHANDLE_TABLE_ENTRY Level1, *Level2, **Level3; > PAGED_CODE(); > > @@ -733,6 +728,13 @@ > > /* Lookup the entry for this handle */ > Entry = ExpLookupHandleTableEntry(HandleTable, Handle); > + > + /* Make sure that we found an entry */ > + if (!Entry) > + { > + /* We didn't, fail */ > + return NULL; > + } > > /* Get an available lock and acquire it */ > i = ((OldValue & FREE_HANDLE_MASK) >> 2) % 4; > >

16 years, 10 months

1
0
0 0

Call for participation: ReactOSDbg

by art yerkes

I've written a shell to use with ReactOS' KDBG that gives a more accurate view of what's going on than other methods available to us (it automatically grabs the module list and loads source files as appropriate, shows locals etc) It's not complete yet, and I'm hoping that others will want to participate in working on it. Therefore, I'm asking those with C# experience on windows who want to get involved to lend a hand in adding the remaining features: - abstract pipe implementation for serial ports and windows named pipes - managing breakpoints - type decoding and struct display using the info available from dbghelp - thread and process listing and focus - a 'watch' window and watchpoints - clipboard interaction - annontated disassembly - general features (bugzilla reporting, automatic interaction with rospaste) To work on this, you don't need to be a wizard, just familiar with windows forms development in C# and willing to learn a thing or two along the way, along with a vm to intstall reactos in and beat up on :-) Some day we'll have everything working with windows style kernel debugging, but until then I feel that a superior stopgap is valuable. -- art yerkes <ayerkes(a)speakeasy.net>

16 years, 10 months

3
4
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 34970: - update KPCR and KIPCR - add KeGetPcr() and update KeGetCurrentProcessorNumber

by Alex Ionescu

Kinda curious why you have "unknowns" in a documented structure. On 30-Jul-08, at 7:17 PM, tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Wed Jul 30 21:16:59 2008 > New Revision: 34970 > > URL: http://svn.reactos.org/svn/reactos?rev=34970&view=rev > Log: > - update KPCR and KIPCR > - add KeGetPcr() and update KeGetCurrentProcessorNumber > > Modified: > branches/ros-amd64-bringup/reactos/include/ddk/winddk.h > branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h > > Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… > = > = > = > = > = > = > = > = > ====================================================================== > --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h > [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h > [iso-8859-1] Wed Jul 30 21:16:59 2008 > @@ -5516,23 +5516,38 @@ > > typedef struct _KPCR > { > - NT_TIB NtTib; > - struct _KPRCB *CurrentPrcb; > - ULONG64 SavedRcx; > - ULONG64 SavedR11; > + union > + { > + NT_TIB NtTib; > + struct > + { > + union _KGDTENTRY64 *GdtBase; > + struct _KTSS64 *TssBase; > + ULONG64 UserRsp; > + struct _KPCR *Self; > + struct _KPRCB *CurrentPrcb; > + PKSPIN_LOCK_QUEUE LockArray; > + PVOID Used_Self; > + }; > + }; > + union _KIDTENTRY64 *IdtBase; > + ULONG64 Unused[2]; > KIRQL Irql; > UCHAR SecondLevelCacheAssociativity; > - UCHAR Number; > + UCHAR ObsoleteNumber; > UCHAR Fill0; > - ULONG Irr; > - ULONG IrrActive; > - ULONG Idr; > + ULONG Unused0[3]; > USHORT MajorVersion; > USHORT MinorVersion; > ULONG StallScaleFactor; > - union _KIDTENTRY64 *IdtBase; > - union _KGDTENTRY64 *GdtBase; > - struct _KTSS64 *TssBase; > + PVOID Unused1[3]; > + ULONG KernelReserved[15]; > + ULONG SecondLevelCacheSize; > + ULONG HalReserved[16]; > + ULONG Unused2; > + PVOID KdVersionBlock; > + PVOID Unused3; > + ULONG PcrAlign1[24]; > } KPCR, *PKPCR; > > typedef struct _KFLOATING_SAVE { > @@ -5552,10 +5567,17 @@ > VOID); > > FORCEINLINE > +PKPCR > +KeGetPcr(VOID) > +{ > + return (PKPCR)__readgsqword(FIELD_OFFSET(KPCR, Self)); > +} > + > +FORCEINLINE > ULONG > KeGetCurrentProcessorNumber(VOID) > { > - return (ULONG)__readgsbyte(FIELD_OFFSET(KPCR, Number)); > + return (ULONG)__readgsword(0x184); > } > > #elif defined(__PowerPC__) > > Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ > ketypes.h > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… > = > = > = > = > = > = > = > = > ====================================================================== > --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h > [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h > [iso-8859-1] Wed Jul 30 21:16:59 2008 > @@ -635,41 +635,42 @@ > NT_TIB NtTib; > struct > { > - struct _EXCEPTION_REGISTRATION_RECORD > *Used_ExceptionList; > - PVOID Used_StackBase; > - PVOID PerfGlobalGroupMask; > - PVOID TssCopy; > - ULONG ContextSwitches; > - KAFFINITY SetMemberCopy; > + union _KGDTENTRY64 *GdtBase; > + struct _KTSS64 *TssBase; > + ULONG64 UserRsp; > + struct _KPCR *Self; > + struct _KPRCB *CurrentPrcb; > + PKSPIN_LOCK_QUEUE LockArray; > PVOID Used_Self; > }; > }; > - struct _KPCR *Self; > - struct _KPRCB *Prcb; > + union _KIDTENTRY64 *IdtBase; > + ULONG64 Unused[2]; > KIRQL Irql; > - ULONG IRR; > - ULONG IrrActive; > - ULONG IDR; > - PVOID KdVersionBlock; > - PKIDTENTRY IDT; > - PKGDTENTRY GDT; > - struct _KTSS *TSS; > + UCHAR SecondLevelCacheAssociativity; > + UCHAR ObsoleteNumber; > + UCHAR Fill0; > + ULONG Unused0[3]; > USHORT MajorVersion; > USHORT MinorVersion; > - KAFFINITY SetMember; > ULONG StallScaleFactor; > - UCHAR SparedUnused; > - UCHAR Number; > - UCHAR Reserved; > - UCHAR L2CacheAssociativity; > - ULONG VdmAlert; > - ULONG KernelReserved[14]; > + PVOID Unused1[3]; > + ULONG KernelReserved[15]; > ULONG SecondLevelCacheSize; > ULONG HalReserved[16]; > - ULONG InterruptMode; > - UCHAR Spare1; > - ULONG KernelReserved2[17]; > - KPRCB PrcbData; > + ULONG Unused2; > + ULONG Fill1; > + PVOID KdVersionBlock; // 0x108 > + PVOID Unused3; > + ULONG PcrAlign1[24]; > + > + ULONG Unknown1; // 0x178 > + ULONG Unknown2; > + ULONG Unknown3; > + USHORT CpuNumber; // 0x184 > + // hack: > + ULONG ContextSwitches; > + > } KIPCR, *PKIPCR; > #pragma pack(pop) > > Best regards, Alex Ionescu

16 years, 10 months

2
3
0 0

Re: [ros-dev] ARM Guy Broke BOOT on Real Hardware

by tamlin＠algonet.se

Alex wrote: >It looks like a guarded mutex is being acquired at DPC level. That's >pretty bad. Well, at least it's redundant and useless. :-) >Pushlocks shouldn't be acquired at DPC level either Indeed. If "you" are at DPC level, you have but one synchronization to care about - SMP (i.e. CPU<->CPU). >, but there's no >ASSERTs in the pushlock code that check for that. An oversight that should be fixed, I'm sure (even if it happened to slow down the system by a whole order of magnitude, which it won't). >MMProbeAndLockPages should never be called for paged pool addreses >while at DPC level, Should MmProbeAndLock ever be called at IRQL above APC level? I mean, what if the probing fails? Should the paging executive somehow preempt this call and page in the missing pages (or should it simply throw a "page not present" exception - not too great to do at DPC level I'd say)? >which means the driver probably called it for a >non-paged pool address. If my previous suspicion is correct, I build on that and suspect this is an error in itself. The ProbeAndLock call should be done at APC level (though I may be completely wrong, but do read my finishing line). >In that case, the whole loop about checking if the page is present and >then faulting it in is irrelevant, and won't happen. Right. Page fault at DPC level == Bad Move(tm). -- Mike

16 years, 10 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [hpoussin] 34856: Revert r34848 and r34850, and replace them by a real fix (hinted by Colin Finck)

by Alex Ionescu

This breaks compiling on Mac OS X... I haven't been able to build since this patch, because now it tries to include windows.h. On 27-Jul-08, at 12:39 PM, hpoussin(a)svn.reactos.org wrote: > Author: hpoussin > Date: Sun Jul 27 14:39:05 2008 > New Revision: 34856 > > URL: http://svn.reactos.org/svn/reactos?rev=34856&view=rev > Log: > Revert r34848 and r34850, and replace them by a real fix (hinted by > Colin Finck) > > Modified: > trunk/reactos/Makefile > trunk/reactos/tools/sysreg/namedpipe_reader.cpp > trunk/reactos/tools/sysreg/os_support.cpp > trunk/reactos/tools/sysreg/os_support.h > trunk/reactos/tools/sysreg/rosboot_test.cpp > trunk/reactos/tools/sysreg/rosboot_test.h > trunk/reactos/tools/sysreg/user_types.h > > Modified: trunk/reactos/Makefile > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=34856&r1=3485… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/Makefile [iso-8859-1] (original) > +++ trunk/reactos/Makefile [iso-8859-1] Sun Jul 27 14:39:05 2008 > @@ -182,8 +182,8 @@ > endif > else > HOST=mingw32-linux > -HOST_CFLAGS+=-fshort-wchar -D__LINUX__ > -HOST_CPPFLAGS+=-fshort-wchar -D__LINUX__ > +HOST_CFLAGS+=-fshort-wchar > +HOST_CPPFLAGS+=-fshort-wchar > endif > endif > > > Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp [iso-8859-1] > (original) > +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp [iso-8859-1] Sun > Jul 27 14:39:05 2008 > @@ -14,7 +14,7 @@ > { > #define MIN(a, b) (((a) < (b)) ? (a) : (b)) > > -#ifdef __LINUX__ > +#ifdef __linux__ > const char * NamedPipeReader::s_LineBreak = "\x0A\0"; > #else > const char * NamedPipeReader::s_LineBreak = "\x0D\x0A\0"; > @@ -46,7 +46,7 @@ > cerr << "NamedPipeReader::openPipe> pipe already open" > << endl; > return false; > } > -#ifndef __LINUX__ > +#ifndef __linux__ > h_Pipe = CreateFile(PipeCmd.c_str(), > GENERIC_WRITE | GENERIC_READ, > 0, > @@ -105,7 +105,7 @@ > cerr << "NamedPipeReader::closePipe> pipe is not open" > << endl; > return false; > } > -#ifdef __LINUX__ > +#ifdef __linux__ > close(h_Pipe); > #else > DisconnectNamedPipe(h_Pipe); > @@ -274,7 +274,7 @@ > bool NamedPipeReader::readPipe(char * buffer, int bufferlength, > long & bytesread) > { > > -#ifdef __LINUX__ > +#ifdef __linux__ > long cbRead = read(h_Pipe, > buffer, > (bufferlength-1) * sizeof(char)); > > Modified: trunk/reactos/tools/sysreg/os_support.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/tools/sysreg/os_support.cpp [iso-8859-1] (original) > +++ trunk/reactos/tools/sysreg/os_support.cpp [iso-8859-1] Sun Jul > 27 14:39:05 2008 > @@ -38,7 +38,7 @@ > } > } > > -#ifdef __LINUX__ > +#ifdef __linux__ > if (s_Entries.size()) > { > long secs = s_Entries[i]->tm.tv_sec - tm.tv_sec; > @@ -54,7 +54,7 @@ > void OsSupport::cancelAlarms() > { > > -#ifndef __LINUX__ > +#ifndef __linux__ > if (s_hThread) > { > TerminateThread(s_hThread, 0); > @@ -73,7 +73,7 @@ > } > > > -#ifndef __LINUX__ > +#ifndef __linux__ > > HANDLE OsSupport::s_hThread = 0; > static HANDLE hTimer; > > Modified: trunk/reactos/tools/sysreg/os_support.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/tools/sysreg/os_support.h [iso-8859-1] (original) > +++ trunk/reactos/tools/sysreg/os_support.h [iso-8859-1] Sun Jul 27 > 14:39:05 2008 > @@ -10,7 +10,7 @@ > * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox > tugraz at) > */ > > -#ifndef __LINUX__ > +#ifndef __linux__ > #include <windows.h> > #else > #include <unistd.h> > @@ -140,7 +140,7 @@ > OsSupport() > {} > > -#ifdef __LINUX__ > +#ifdef __linux__ > static struct sigaction s_sact; > #else > static HANDLE s_hThread; > > Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] > (original) > +++ trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] Sun Jul > 27 14:39:05 2008 > @@ -46,7 +46,7 @@ > string RosBootTest::XEN_CONFIG_FILE = "XEN_CONFIG_FILE"; > string RosBootTest::XEN_CONFIG_NAME = "XEN_CONFIG_NAME"; > > -#ifdef __LINUX__ > +#ifdef __linux__ > string RosBootTest::ROS_EMU_PATH = "ROS_EMU_PATH_LIN"; > #else > string RosBootTest::ROS_EMU_PATH = "ROS_EMU_PATH_WIN"; > @@ -117,7 +117,7 @@ > img = "output-i386"; > > EnvironmentVariable::getValue("ROS_OUTPUT", img); > -#ifdef __LINUX__ > +#ifdef __linux__ > img += "/ros.hd"; > #else > img += "\\ros.hd"; > @@ -159,7 +159,7 @@ > } > > > -#ifdef __LINUX__ > +#ifdef __linux__ > qemuimgdir += "/qemu-img"; > > #else > @@ -176,7 +176,7 @@ > const char * options[] = {NULL, > "create", > "-f", > -#ifdef __LINUX__ > +#ifdef __linux__ > "raw", > #else > "vmdk", > @@ -241,7 +241,7 @@ > { > string::size_type pos; > > -#ifdef __LINUX__ > +#ifdef __linux__ > pos = m_EmuPath.find_last_of("/"); > #else > pos = m_EmuPath.find_last_of("\\"); > @@ -266,7 +266,7 @@ > m_MaxMem = "64"; > } > > -#ifdef __LINUX__ > +#ifdef __linux__ > > if (mktemp(pipename)) > { > @@ -332,7 +332,7 @@ > return false; > } > > -#ifdef __LINUX__ > +#ifdef __linux__ > /* on linux we need get pid in order to be able > * to terminate the emulator in case of errors > * on windows we can get pid as return of > CreateProcess > @@ -369,7 +369,7 @@ > { > pipe = pipe.substr(0, pos); > } > -#ifdef __LINUX__ > +#ifdef __linux__ > m_Src = pipe; > #else > m_Src = "\\\\.\\pipe\\" + pipe.substr(0, pos); > @@ -577,7 +577,7 @@ > return false; > } > } > -#ifdef __LINUX__ > +#ifdef __linux__ > if (mkfifo(m_Src.c_str(), 400)) > { > /* > @@ -802,7 +802,7 @@ > cleanup(conf_parser); > return false; > } > -#ifdef __LINUX__ > +#ifdef __linux__ > /* > * For linux systems we can only > * check if the emulator runs by > @@ -832,7 +832,7 @@ > } > #endif > OsSupport::cancelAlarms(); > -#ifdef __LINUX__ > +#ifdef __linux__ > // OsSupport::setAlarm (m_MaxTime, m_Pid); > // OsSupport::setAlarm(m_MaxTime, getpid()); > #else > > Modified: trunk/reactos/tools/sysreg/rosboot_test.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] (original) > +++ trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] Sun Jul > 27 14:39:05 2008 > @@ -30,12 +30,12 @@ > #include <cstdlib> > #include <cstring> > #include <ctime> > -#ifndef __LINUX__ > +#ifndef __linux__ > #include <io.h> > #include <errno.h> > #endif > > -#ifdef __LINUX__ > +#ifdef __linux__ > #include <unistd.h> > #include <sys/types.h> > #if defined(__FreeBSD__) || defined(__APPLE__) > > Modified: trunk/reactos/tools/sysreg/user_types.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/user_types.h?… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/tools/sysreg/user_types.h [iso-8859-1] (original) > +++ trunk/reactos/tools/sysreg/user_types.h [iso-8859-1] Sun Jul 27 > 14:39:05 2008 > @@ -13,7 +13,7 @@ > #include <string> > #include <iostream> > > -#ifndef __LINUX__ > +#ifndef __linux__ > #define popen _popen > #define pclose _pclose > #endif > Best regards, Alex Ionescu

16 years, 10 months

2
3
0 0

ARM Guy Broke BOOT on Real Hardware

by James Tabor

Hi ARMs, Doing a good job BTW~ Thanks, James (ntoskrnl/kd/kdio.c:191) ----------------------------------------------------- (ntoskrnl/kd/kdio.c:192) ReactOS 0.4-SVN (Build 20080728-r34871) (ntoskrnl/kd/kdio.c:193) Command Line: DEBUG DEBUGPORT=COM1 BUADRATE=115200 SOS (ntoskrnl/kd/kdio.c:194) ARC Paths: multi(0)disk(0)rdisk(0)partition(1) \ multi(0)disk(0)rdisk(0)parti tion(1) \ReactOS\ Used memory 1015348Kb (ntoskrnl/mm/mminit.c:295) Start End Type (ntoskrnl/mm/mminit.c:296) 0x80000000 - 0x80800000 Undefined region (ntoskrnl/mm/mminit.c:299) 0x80800000 - 0x80E00000 FreeLDR Kernel mapping region (ntoskrnl/mm/mminit.c:302) 0x80E00000 - 0x815C0000 PFN Database region (ntoskrnl/mm/mminit.c:309) 0x815C0000 - 0x879C0000 Non paged pool region (ntoskrnl/mm/mminit.c:312) 0x879C0000 - 0x8DDC0000 Paged pool region (ntoskrnl/ke/i386/kiinit.c:47) Large Page support detected but not yet taken advantage of! WARNING: KdDebuggerInitialize1 at drivers/base/kdcom/i386/kdbg.c:489 is UNIMPLEMENTED! WARNING: IoReportResourceUsage at ntoskrnl/io/iomgr/iorsrce.c:700 is UNIMPLEMENTED! WARNING: IoReportResourceUsage at ntoskrnl/io/iomgr/iorsrce.c:700 is UNIMPLEMENTED! (ntoskrnl/io/iomgr/driver.c:1356) '\Driver\BUSLOGIC' initialization failed, status (0xc00000c0) (ntoskrnl/io/iomgr/driver.c:1356) '\Driver\Floppy' initialization failed, status (0xc000000e) Assertion 'KeGetCurrentIrql()<=(1)' failed at ntoskrnl/ke/gmutex.c line 201 Entered debugger on embedded INT3 at 0x0008:0x808a8262. kdb:> bt Eip: <NTOSKRNL.EXE:a8263 (lib/rtl/i386/debug_asm.S:33 (DbgBreakPoint@0))> Frames: <NTOSKRNL.EXE:a027 (ntoskrnl/ke/gmutex.c:201 (@KeAcquireGuardedMutex@4))> <NTOSKRNL.EXE:6d3a2 (ntoskrnl/include/internal/mm.h:1556 (MmProbeAndLockPages@12))> <NTOSKRNL.EXE:4f079 (ntoskrnl/io/iomgr/irp.c:694 (IoBuildAsynchronousFsdRequest@24))> <SCSIPORT.SYS:4671 (drivers/storage/scsiport/scsiport.c:3959 (ScsiPortDpcForIsr@16))> <NTOSKRNL.EXE:823a (ntoskrnl/ke/dpc.c:474 (@KiRetireDpcList@4))> <NTOSKRNL.EXE:9fc59 (ntoskrnl/ke/i386/ctxswitch.S:691 (@KiIdleLoop@0))> <00000000> kdb:>

16 years, 10 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 34860: Fixed some kernel exports

by Alex Ionescu

I would've hoped the ARM guys made it painfully clear by now that ARM functions do not have @xx appended to their names... Author: ros-arm-bringup Date: Sun Jul 27 00:37:54 2008 New Revision: 34820 URL: http://svn.reactos.org/svn/reactos?rev=34820&view=rev Log: - Stop adding those damn @ decorations to ARM builds. Among many others... On 27-Jul-08, at 2:19 PM, pschweitzer(a)svn.reactos.org wrote: > Author: pschweitzer > Date: Sun Jul 27 16:19:15 2008 > New Revision: 34860 > > URL: http://svn.reactos.org/svn/reactos?rev=34860&view=rev > Log: > Fixed some kernel exports > > Modified: > branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def > branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def > > Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def > URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_ar… > = > = > = > = > = > = > = > = > ====================================================================== > --- branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] > (original) > +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] Sun > Jul 27 16:19:15 2008 > @@ -187,10 +187,10 @@ > FsRtlDeleteKeyFromTunnelCache > FsRtlDeleteTunnelCache > FsRtlDeregisterUncProvider > -FsRtlDissectDbcs > -FsRtlDissectName > -FsRtlDoesDbcsContainWildCards > -FsRtlDoesNameContainWildCards > +FsRtlDissectDbcs@16 > +FsRtlDissectName@16 > +FsRtlDoesDbcsContainWildCards@4 > +FsRtlDoesNameContainWildCards@4 > FsRtlFastCheckLockForRead > FsRtlFastCheckLockForWrite > FsRtlFastUnlockAll > > Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def > URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_i3… > = > = > = > = > = > = > = > = > ====================================================================== > --- branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] > (original) > +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Sun > Jul 27 16:19:15 2008 > @@ -204,9 +204,9 @@ > FsRtlDeleteKeyFromTunnelCache > FsRtlDeleteTunnelCache > FsRtlDeregisterUncProvider > -FsRtlDissectDbcs > +FsRtlDissectDbcs@16 > FsRtlDissectName@16 > -FsRtlDoesDbcsContainWildCards > +FsRtlDoesDbcsContainWildCards@4 > FsRtlDoesNameContainWildCards@4 > FsRtlFastCheckLockForRead > FsRtlFastCheckLockForWrite > Best regards, Alex Ionescu

16 years, 10 months

1
0
0 0

[ros-diffs] [jimtabor] 34807: - Attempt to initiate hook set from kernel space.

by James Tabor

Hi, Here is a test program to play with, tell me what is wrong. 8^D James Ref info and download the program: http://www.klenotic.com/pl/null_hhook/ http://www.klenotic.com/pl/null_hhook/HookChainTest100.zip

16 years, 10 months

1
0
0 0

widl problem importing stdole2.tlb

by Steven Edwards

Hi, I've been attempting to sync some of the Wine dlls, namely the IE support dlls and have run in to a bit of a problem which I think is a bug in ReactOS widl. It seems that the import keyword is not working. When trying to build shdocvw.dll it creates a shdocvw_v1.tlb based on shdocvw_v1.idl which imports exdisp.idl from the SDK which in turn does an import ("stdole2.tlb") As you can see from the output below sedwards@mini-gimli:~/source/reactos$ make shdocvw [WIDL] obj-i386/dll/win32/shdocvw/shdocvw_v1.tlb error: Could not open importlib stdole2.tlb. mingw32-make: *** [obj-i386/dll/win32/shdocvw/shdocvw_v1.tlb] Error 2 Total Build Time: 00:00:02 Notice the . at the end of stdole2.tlb? I've tried just renaming the typelib and putting it in several intermediate folders to no effect. If any WIDL Guru can help please find the attached patch which contains an updated shdocvw.rbuild Thanks Steven -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 10 months

1
0
0 0

kernel32

by gedmurphy

Yesterday I was playing around with the test suite in HEAD when I moved onto kernel32. It was, without wanting to sound too harsh, a bit of a disgrace, with large failures throughout the whole test range. I suggest a hacking day on it using the test suite, a joint effort to bring this core lib back into line. Perhaps with some emphasis on trying to make it fun. Whoever gets the most fixes is crowned 'king ding-a-ling' and holds the title until the next one, opening the road up to days on ntdll, user32, gdi32 and crt? Ged.

16 years, 10 months

2
2
0 0

Java Install

by James Tabor

Hi, When installing Java or anything with java it hangs and just sit there running. It could be OOo 2.4 or installing java, does not mater, I just left the box running all night and just sits there, still installing.. This bug fault right after I restarted. Is it waiting on a lock? Assertion 'WaitBlock->Signaled' failed at ntoskrnl/ex/pushlock.c line 599 Entered debugger on embedded INT3 at 0x0008:0x808ad242. kdb:> bt Eip: <NTOSKRNL.EXE:ad243 (lib/rtl/i386/debug_asm.S:33 (DbgBreakPoint@0))> Frames: <NTOSKRNL.EXE:2da24 (ntoskrnl/ex/pushlock.c:599 (@ExfAcquirePushLockExclusive@4))> <NTOSKRNL.EXE:6eb00 (ntoskrnl/include/internal/ex.h:715 (MiProtectVirtualMemory@20))> <NTOSKRNL.EXE:6fdbf (ntoskrnl/mm/virtual.c:927 (NtProtectVirtualMemory@20))> <NTOSKRNL.EXE:979ca (ntoskrnl/ke/i386/trap.s:244 (KiFastCallEntry))> <ntdll.dll:5e1a> ntdll/main/i386/dispatch.S:297 (KiFastSystemCallRet@0) <kernel32.dll:e0ce> kernel32/mem/virtual.c:127 (VirtualProtect@16) <jvm.dll:149b27> kdb:>

16 years, 10 months

2
1
0 0

Request for Comment / Setup

by Matthias Kupfer

Hi all, I'm working on first stage gui setup. During the development i reviewed the base/setup directory and the different modules. I suggest following changes: Now: reactos.exe: atm greeting only with disabled first stage setup dialogs setup.exe: switcher for 2nd stage setup (syssetup) or livecd usetup.exe: textmode 1st stage setup vmwinst.exe: don't know exactly, vm-ware driver installation welcome.exe: nice welcome dialog without real functions Future: setup.exe: switcher for 1st stage gui setup, 2nd stage setup, livecd and welcome dialog switched by command line arguments "setup.exe" -> welcome dialog "setup.exe -mini" -> livecd "setup.exe -newsetup1" -> 1st stage gui setup "setup.exe -newsetup2" -> 2nd stage (gui) setup usetup.exe: textmode 1st-stage-setup vmwinst.exe: keeps unchangend reactos.exe, welcome.exe: removed Are there any objections to go this way? If not, so i will change this soon. Matthias -- Matthias Kupfer Telefon +49 (0) 371 236 46 52 Wilhelm-Firl-Straße 21 Mobil +49 (0) 160 859 43 54 09122 Chemnitz

16 years, 10 months

2
1
0 0

Re: [ros-dev] Re : [ros-diffs] [ros-arm-bringup] 34655: - Build vfatfs instead of CDFS. - Load vfatfs instead of CDFS. - Implement code in the ramdisk driver to handle both ISO and FAT ramdisks. Don't know what the big deal with support ISO ramdisks

by Steven Edwards

On Tue, Jul 22, 2008 at 9:56 AM, Sylvain Petreolle <spetreolle(a)yahoo.fr> wrote: > It'sToo bad the header is not in an include directory... Maybe it should go in the NDK then. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 10 months

1
0
0 0

Re : [ros-diffs] [ros-arm-bringup] 34655: - Build vfatfs instead of CDFS. - Load vfatfs instead of CDFS. - Implement code in the ramdisk driver to handle both ISO and FAT ramdisks. Don't know what the big deal with support ISO ramdisks was supposed to

by Sylvain Petreolle

> De : Steven Edwards <winehacker(a)gmail.com> > À : ros-dev(a)reactos.org > Envoyé le : Mardi, 22 Juillet 2008, 11h49mn 04s > Objet : Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 34655: - Build vfatfs instead of CDFS. - Load vfatfs instead of CDFS. - Implement code in the ramdisk driver to handle both ISO and FAT ramdisks. Don't know what the big deal with support ISO ramdisks was supposed to > > On Tue, Jul 22, 2008 at 5:42 AM, Steven Edwards wrote: > > On Tue, Jul 22, 2008 at 1:31 AM, wrote: > >> #include > >> +#include "../../../filesystems/fs_rec/fs_rec.h" > > > > This can cause problems with parallel makes. > > This is what I get for commenting at 5 am...I thought you were > including another .c file directly. ignore the part about parallel > makes. But do try to avoid referencing the header like this. Just set > an include path in the rbuild file and spare my eyes the horror of the > directory traversal. > > -- > Steven Edwards > It'sToo bad the header is not in an include directory... Kind regards, Sylvain Petreolle (aka Usurp) Support artists, not multinationals - http://Iwouldntsteal.net Supportez les artistes, pas les multinationales - http://Iwouldntsteal.net

16 years, 10 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 34655: - Build vfatfs instead of CDFS. - Load vfatfs instead of CDFS. - Implement code in the ramdisk driver to handle both ISO and FAT ramdisks. Don't know what the big deal with support ISO ramdisks was supposed to

by Steven Edwards

On Tue, Jul 22, 2008 at 1:31 AM, <ros-arm-bringup(a)svn.reactos.org> wrote: > #include <reactos/drivers/ntddrdsk.h> > +#include "../../../filesystems/fs_rec/fs_rec.h" This can cause problems with parallel makes. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 10 months

1
1
0 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 34615: - Add new CDFSdriver. - Does not compile.

by Heis Spiter

Indeed, that's not conform to EULA that says: "You may not distribute Distributable Code to run on a platform other than the Windows platform;". Moreover, CDFS driver ISN'T listed as a "Distributable Code". Please revert to avoid any problems. P. Schweitzer -------------------------------------------------- From: "Steven Edwards" <winehacker(a)gmail.com> Sent: Monday, July 21, 2008 12:21 AM To: <ros-dev(a)reactos.org> Subject: Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 34615: - Add new CDFSdriver. - Does not compile. > On Sun, Jul 20, 2008 at 3:52 PM, <ros-arm-bringup(a)svn.reactos.org> wrote: >> URL: http://svn.reactos.org/svn/reactos?rev=34615&view=rev >> Log: >> - Add new CDFS driver. >> - Does not compile. > > Ehem...as far as I understand the EULA (unless its changed) you cannot > use the WDK references drivers for a non-windows OS. Please revert > this and write you own. > > -- > Steven Edwards > > "There is one thing stronger than all the armies in the world, and > that is an idea whose time has come." - Victor Hugo > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

16 years, 11 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 34615: - Add new CDFS driver. - Does not compile.

by Steven Edwards

On Sun, Jul 20, 2008 at 3:52 PM, <ros-arm-bringup(a)svn.reactos.org> wrote: > URL: http://svn.reactos.org/svn/reactos?rev=34615&view=rev > Log: > - Add new CDFS driver. > - Does not compile. Ehem...as far as I understand the EULA (unless its changed) you cannot use the WDK references drivers for a non-windows OS. Please revert this and write you own. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 11 months

1
0
0 0

Changes of inf-files in media/inf

by Matthias Kupfer

Hello, after several commits that leads in broken inf-files (last one 34598 by spetreolle), I invite to take care about following things: 1. The inf files are in UTF-16LE a.k.a. UCS-2LE. 2. All lines ends with CRLF (a single one, no other combination). 3. The files have to start with a bom (byte order mark). 4. There are no more boms allowed anywhere in the file. Please modify that files _very_ carefully, because we can't check changes via diff, due to the lack of utf-16 support in svn. Matthias -- Matthias Kupfer Telefon +49 (0) 371 236 46 52 Wilhelm-Firl-Straße 21 Mobil +49 (0) 160 859 43 54 09122 Chemnitz

16 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 34603: - Ramdisk doesn't seem to work yet, we're not getting properly initialized yet. - We end up crashing in CcRosTryToInitialzeFileCache because there is no SectionObjectPointer, and it is assumed this always exis

by Steven Edwards

On Sun, Jul 20, 2008 at 12:40 AM, <ros-arm-bringup(a)svn.reactos.org> wrote: > - We end up crashing in CcRosTryToInitialzeFileCache because there is no SectionObjectPointer, and it is assumed this always exists. Ninjas! I don't know if this is related but would it be possible to switch to doing development on NoCC in case you guys run in to more problems like these? I don't know if it would help but I assume your going to run in to more problems with the current Cc and you might be able to save a lot of trouble later on. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [mkupfer] 34572: - gui template for 1st stage setup, english only - implemented, but still disabled - it's work in progress

by Marc Piulachs

Shouldn't this code be part of syssetup instead of reactos.exe? IMO reactos.exe should be only a very simple stub application which calls setup.exe with the appropiate parameters (which in turn use syssetup) or show a messagebox in case of any error. In MS Windows second stage setup does most of the install process , even install the files to the hard drive (the files copied during 1st stage setup are uncompressed and copied into a temporal location) . First stage setup does the minimal required steps (load drivers , setup partition and copy files) to be able to start the second stage setup which does most of the job. Installing reactos to a hard drive from a bootcd or installing it form a live cd (in the future) should not make any difference but the second stage wizard should shown the appropiate additional steps to emulate the first stage setup. Regards, /Marc -------------------------------------------------- From: <mkupfer(a)svn.reactos.org> Sent: Friday, July 18, 2008 11:07 AM To: <ros-diffs(a)reactos.org> Subject: [ros-diffs] [mkupfer] 34572: - gui template for 1st stage setup, english only - implemented, but still disabled - it's work in progress > Author: mkupfer > Date: Fri Jul 18 04:07:54 2008 > New Revision: 34572 > > URL: http://svn.reactos.org/svn/reactos?rev=34572&view=rev > Log: > - gui template for 1st stage setup, english only > - implemented, but still disabled - it's work in progress > > Modified: > trunk/reactos/base/setup/reactos/lang/en-US.rc > trunk/reactos/base/setup/reactos/reactos.c > trunk/reactos/base/setup/reactos/reactos.rbuild > trunk/reactos/base/setup/reactos/res/header.bmp > trunk/reactos/base/setup/reactos/resource.h > > Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… > ============================================================================== > --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) > +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Fri Jul 18 > 04:07:54 2008 > @@ -14,4 +14,109 @@ > LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 > END > > +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 > +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | > WS_SYSMENU > +CAPTION "ReactOS Setup" > +FONT 8, "MS Shell Dlg" > +BEGIN > + LTEXT "Please choose the language used for the installation process." > + , IDC_STATIC, 10, 0, 297, 10 > + LTEXT "The selected language will be the default language for the > final system.", IDC_STATIC, 10, 13, 297, 10 > + LISTBOX IDC_LANGUAGES, 10,28,297,142,LBS_HASSTRINGS | WS_VSCROLL > + LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 > ,297, 10 > +END > + > +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 > +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | > WS_SYSMENU > +CAPTION "ReactOS Setup" > +FONT 8, "MS Shell Dlg" > +BEGIN > + CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, > 10,0,297,172 > + CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON > | WS_TABSTOP, 20, 15, 277, 10 > + CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", > BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 > + LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, > 10 > +END > + > +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 > +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | > WS_SYSMENU > +CAPTION "ReactOS Setup" > +FONT 8, "MS Shell Dlg" > +BEGIN > + CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, > 10,0,297,172 > + LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 > + CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , > 100, 15, 150, 80 > + LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 > + CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , > 100, 35, 150, 80 > + LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 > + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , > 100, 55, 150, 80 > + LTEXT "Keyboard layout:", IDC_STATIC, 20,75, 80, 10 > + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST > , 100, 75, 150, 80 > + LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, > 180 ,277, 20 > +END > + > +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 > +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | > WS_SYSMENU > +CAPTION "ReactOS Setup" > +FONT 8, "MS Shell Dlg" > +BEGIN > + CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", > BS_GROUPBOX, 10,0,297,102 > + LISTBOX IDC_PARTITION, 20,13,277,70,LBS_HASSTRINGS | WS_VSCROLL > + PUSHBUTTON "&Create" ,IDC_PARTCREATE, 20,83,50,15 > + PUSHBUTTON "&Delete" ,IDC_PARTDELETE, 75,83,50,15 > + > + CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, > 10,103,297,30 > + EDITTEXT IDC_PATH, 20,113,277,12, WS_VISIBLE > + > + CONTROL "Boot loader installation", IDC_STATIC, "Button", > BS_GROUPBOX, 10,136,297,40 > + > + CONTROL "Install boot loader on the hard disk (MBR)", > IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 147, 277, > 10 > + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", > BS_AUTORADIOBUTTON | WS_TABSTOP /* | WS_DISABLED*/ , 20, 159, 277, 10 > + LTEXT "Click Next to start the installation process.", IDC_STATIC, > 10, 180 ,277, 20 > +END > + > +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 > +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | > WS_SYSMENU > +CAPTION "ReactOS Setup" > +FONT 8, "MS Shell Dlg" > +BEGIN > + CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, > 10,0,297,172 > + LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 > + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 > + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", > + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, > 8 > +END > + > + > +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 > +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | > WS_SYSMENU > +CAPTION "Completing ReactOS Setup" > +FONT 8, "MS Shell Dlg" > +BEGIN > + CONTROL "Completing the first stage of ReactOS Setup", > IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 > + LTEXT "You have successfully completed the first stage of ReactOS > Setup.", IDC_STATIC, 20, 50, 277, 10 > + > + LTEXT "When you click Finish, your computer will restart.", > IDC_STATIC, 20, 80, 277, 10 > + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | > WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 > + LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ > + "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 > +END > + > + > +STRINGTABLE > +BEGIN > + IDS_LANGTITLE "Language Selection" > + IDS_LANGSUBTITLE "Choose language for setup and final system." > + IDS_TYPETITLE "Welcome to ReactOS Setup" > + IDS_TYPESUBTITLE "Choose setup type." > + IDS_DEVICETITLE "Setup the basic devices" > + IDS_DEVICESUBTITLE "Set the settings of display and keyboard." > + IDS_DRIVETITLE "Setup the installation partition and system folder" > + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and > boot loader." > + IDS_PROCESSTITLE "Prepare partition, copy files and setup system" > + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install > and setup boot loader" > + IDS_RESTARTTITLE "First stage of setup finished" > + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, > restart to continue with second stage" > + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If > you quit Setup now, you will need to run Setup again to install Reactos. > Really quit?" > + IDS_ABORTSETUP2 "Abort installation?" > +END > /* EOF */ > > Modified: trunk/reactos/base/setup/reactos/reactos.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… > ============================================================================== > --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) > +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Fri Jul 18 > 04:07:54 2008 > @@ -21,18 +21,38 @@ > * COPYRIGHT: See COPYING in the top level directory > * PROJECT: ReactOS GUI first stage setup application > * FILE: subsys/system/reactos/reactos.c > - * PROGRAMMERS: Eric Kohl, Matthias Kupfer > + * PROGRAMMERS: Eric Kohl > + * Matthias Kupfer > */ > > #include <windows.h> > #include <commctrl.h> > #include <tchar.h> > +#include <setupapi.h> > > #include "resource.h" > > /* GLOBALS > ******************************************************************/ > > HFONT hTitleFont; > + > +struct > +{ > + LONG DestDiskNumber; // physical disk > + LONG DestPartNumber; // partition on disk > + LONG DestPartSize; // if partition doesn't exist, size of partition > + LONG FSType; // file system type on partition > + LONG MBRInstallType; // install bootloader > + LONG FormatPart; // type of format the partition > + WCHAR SelectedLangId[4]; // selected language > + WCHAR InstallationDirectory[MAX_PATH]; // installation directory on hdd > + WCHAR DefaultLang[20]; // default language > + WCHAR DefaultKBLayout[20]; // default keyboard layout > + BOOLEAN RepairUpdateFlag; // flag for update/repair an installed reactos > +} SetupData; > + > +TCHAR abort_msg[512],abort_title[64]; > +BOOL isUnattend; > > /* FUNCTIONS > ****************************************************************/ > > @@ -106,7 +126,7 @@ > SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); > > /* Hide and disable the 'Cancel' button at the moment, > - * later we use this button to cancel the setup process > + * we use this button to cancel the setup process > * like F3 in usetup > */ > hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); > @@ -129,6 +149,7 @@ > { > case PSN_SETACTIVE: // Only "Finish" for closing the App > PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); > + //PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); > break; > default: > break; > @@ -140,6 +161,384 @@ > > } > return FALSE; > +} > + > +static INT_PTR CALLBACK > +LangSelDlgProc(HWND hwndDlg, > + UINT uMsg, > + WPARAM wParam, > + LPARAM lParam) > +{ > + switch (uMsg) > + { > + case WM_INITDIALOG: > + { > + HWND hwndControl; > + DWORD dwStyle; > + > + hwndControl = GetParent(hwndDlg); > + > + /* Center the wizard window */ > + CenterWindow (hwndControl); > + > + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); > + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); > + > + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); > + ShowWindow (hwndControl, SW_SHOW); > + EnableWindow (hwndControl, TRUE); > + > + /* Set title font */ > + /*SendDlgItemMessage(hwndDlg, > + IDC_STARTTITLE, > + WM_SETFONT, > + (WPARAM)hTitleFont, > + (LPARAM)TRUE);*/ > +} > + break; > + case WM_NOTIFY: > + { > + LPNMHDR lpnm = (LPNMHDR)lParam; > + > + switch (lpnm->code) > + { > + case PSN_SETACTIVE: > + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); > + break; > + case PSN_QUERYCANCEL: > + SetWindowLong(hwndDlg, > DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, > MB_YESNO | MB_ICONQUESTION) != IDYES); > + return TRUE; > + default: > + break; > + } > + break; > + default: > + break; > + } > + > + } > + return FALSE; > +} > + > +static INT_PTR CALLBACK > +TypeDlgProc(HWND hwndDlg, > + UINT uMsg, > + WPARAM wParam, > + LPARAM lParam) > +{ > + switch (uMsg) > + { > + case WM_INITDIALOG: > + { > + HWND hwndControl; > + DWORD dwStyle; > + > + hwndControl = GetParent(hwndDlg); > + > + /* Center the wizard window */ > + CenterWindow (hwndControl); > + > + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); > + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); > + > + CheckDlgButton(hwndDlg, IDC_INSTALL, BST_CHECKED); > + > + /* Set title font */ > + /*SendDlgItemMessage(hwndDlg, > + IDC_STARTTITLE, > + WM_SETFONT, > + (WPARAM)hTitleFont, > + (LPARAM)TRUE);*/ > +} > + break; > + case WM_NOTIFY: > + { > + LPNMHDR lpnm = (LPNMHDR)lParam; > + > + switch (lpnm->code) > + { > + case PSN_SETACTIVE: > + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); > + break; > + case PSN_QUERYCANCEL: > + SetWindowLong(hwndDlg, > DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, > MB_YESNO | MB_ICONQUESTION) != IDYES); > + return TRUE; > + default: > + break; > + } > + break; > + default: > + break; > + } > + > + } > + return FALSE; > +} > + > +static INT_PTR CALLBACK > +DeviceDlgProc(HWND hwndDlg, > + UINT uMsg, > + WPARAM wParam, > + LPARAM lParam) > +{ > + switch (uMsg) > + { > + case WM_INITDIALOG: > + { > + HWND hwndControl; > + DWORD dwStyle; > + > + hwndControl = GetParent(hwndDlg); > + > + /* Center the wizard window */ > + CenterWindow (hwndControl); > + > + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); > + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); > + > + /* Set title font */ > + /*SendDlgItemMessage(hwndDlg, > + IDC_STARTTITLE, > + WM_SETFONT, > + (WPARAM)hTitleFont, > + (LPARAM)TRUE);*/ > +} > + break; > + case WM_NOTIFY: > + { > + LPNMHDR lpnm = (LPNMHDR)lParam; > + > + switch (lpnm->code) > + { > + case PSN_SETACTIVE: > + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); > + break; > + case PSN_QUERYCANCEL: > + SetWindowLong(hwndDlg, > DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, > MB_YESNO | MB_ICONQUESTION) != IDYES); > + return TRUE; > + default: > + break; > + } > + break; > + default: > + break; > + } > + > + } > + return FALSE; > +} > + > +static INT_PTR CALLBACK > +DriveDlgProc(HWND hwndDlg, > + UINT uMsg, > + WPARAM wParam, > + LPARAM lParam) > +{ > + switch (uMsg) > + { > + case WM_INITDIALOG: > + { > + HWND hwndControl; > + DWORD dwStyle; > + > + hwndControl = GetParent(hwndDlg); > + > + /* Center the wizard window */ > + CenterWindow (hwndControl); > + > + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); > + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); > + > + CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED); > + /* Set title font */ > + /*SendDlgItemMessage(hwndDlg, > + IDC_STARTTITLE, > + WM_SETFONT, > + (WPARAM)hTitleFont, > + (LPARAM)TRUE);*/ > +} > + break; > + case WM_NOTIFY: > + { > + LPNMHDR lpnm = (LPNMHDR)lParam; > + > + switch (lpnm->code) > + { > + case PSN_SETACTIVE: > + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); > + break; > + case PSN_QUERYCANCEL: > + SetWindowLong(hwndDlg, > DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, > MB_YESNO | MB_ICONQUESTION) != IDYES); > + return TRUE; > + default: > + break; > + } > + break; > + default: > + break; > + } > + > + } > + return FALSE; > +} > + > +static INT_PTR CALLBACK > +ProcessDlgProc(HWND hwndDlg, > + UINT uMsg, > + WPARAM wParam, > + LPARAM lParam) > +{ > + switch (uMsg) > + { > + case WM_INITDIALOG: > + { > + HWND hwndControl; > + DWORD dwStyle; > + > + hwndControl = GetParent(hwndDlg); > + > + /* Center the wizard window */ > + CenterWindow (hwndControl); > + > + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); > + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); > + > + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); > + ShowWindow (hwndControl, SW_HIDE); > + EnableWindow (hwndControl, FALSE); > + > + /* Set title font */ > + /*SendDlgItemMessage(hwndDlg, > + IDC_STARTTITLE, > + WM_SETFONT, > + (WPARAM)hTitleFont, > + (LPARAM)TRUE);*/ > +} > + break; > + case WM_NOTIFY: > + { > + LPNMHDR lpnm = (LPNMHDR)lParam; > + > + switch (lpnm->code) > + { > + case PSN_SETACTIVE: > + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT ); > + break; > + default: > + break; > + } > + break; > + default: > + break; > + } > + > + } > + return FALSE; > +} > + > +static INT_PTR CALLBACK > +RestartDlgProc(HWND hwndDlg, > + UINT uMsg, > + WPARAM wParam, > + LPARAM lParam) > +{ > + switch (uMsg) > + { > + case WM_INITDIALOG: > + { > + HWND hwndControl; > + DWORD dwStyle; > + > + hwndControl = GetParent(hwndDlg); > + > + /* Center the wizard window */ > + CenterWindow (hwndControl); > + > + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); > + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); > + > + /* Set title font */ > + /*SendDlgItemMessage(hwndDlg, > + IDC_STARTTITLE, > + WM_SETFONT, > + (WPARAM)hTitleFont, > + (LPARAM)TRUE);*/ > + } > + break; > + case WM_TIMER: > + { > + INT Position; > + HWND hWndProgress; > + > + hWndProgress = GetDlgItem(hwndDlg, IDC_RESTART_PROGRESS); > + Position = SendMessage(hWndProgress, PBM_GETPOS, 0, 0); > + if (Position == 300) > + { > + KillTimer(hwndDlg, 1); > + PropSheet_PressButton(GetParent(hwndDlg), PSBTN_FINISH); > + } > + else > + { > + SendMessage(hWndProgress, PBM_SETPOS, Position + 1, 0); > + } > + return TRUE; > + } > + case WM_DESTROY: > + return TRUE; > + case WM_NOTIFY: > + { > + LPNMHDR lpnm = (LPNMHDR)lParam; > + > + switch (lpnm->code) > + { > + case PSN_SETACTIVE: // Only "Finish" for closing the App > + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); > + SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, > PBM_SETRANGE, 0, MAKELPARAM(0, 300)); > + SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, > PBM_SETPOS, 0, 0); > + SetTimer(hwndDlg, 1, 50, NULL); > + break; > + default: > + break; > + } > + break; > + default: > + break; > + } > + > + } > + return FALSE; > +} > + > +BOOL isUnattendSetup() > +{ > + WCHAR szPath[MAX_PATH]; > + HINF hUnattendedInf; > + INFCONTEXT InfContext; > + TCHAR szValue[MAX_PATH]; > + DWORD LineLength; > + //HKEY hKey; > + BOOL result = 0; > + > + GetCurrentDirectoryW(MAX_PATH, szPath); // FIXME > + > + wcscat(szPath, L"\\unattend.inf"); > + hUnattendedInf = SetupOpenInfFileW(szPath, NULL, INF_STYLE_OLDNT, NULL); > + if (hUnattendedInf != INVALID_HANDLE_VALUE) > + { > + if (SetupFindFirstLine(hUnattendedInf, _T("Unattend"), > + _T("UnattendSetupEnabled"),&InfContext)) > + { > + if (SetupGetStringField(&InfContext, 1, szValue, > + sizeof(szValue) / sizeof(TCHAR), &LineLength) && > + (_tcsicmp(szValue, _T("yes"))==0)) > + { > + result = 1; // unattendSetup enabled > + // read values and store in SetupData > + } > + } > + SetupCloseInfFile(hUnattendedInf); > + } > + return result; > } > > int WINAPI > @@ -149,11 +548,18 @@ > int nCmdShow) > { > PROPSHEETHEADER psh; > - HPROPSHEETPAGE ahpsp[1]; > + HPROPSHEETPAGE ahpsp[7]; > PROPSHEETPAGE psp = {0}; > UINT nPages = 0; > - > - /* Create the Start page */ > + isUnattend = isUnattendSetup(); > + > + if (!isUnattend) > + { > + > + LoadString(hInst,IDS_ABORTSETUP, abort_msg, > sizeof(abort_msg)/sizeof(TCHAR)); > + LoadString(hInst,IDS_ABORTSETUP2, > abort_title,sizeof(abort_title)/sizeof(TCHAR)); > + > + /* Create the Start page, until setup is working */ > psp.dwSize = sizeof(PROPSHEETPAGE); > psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; > psp.hInstance = hInst; > @@ -162,7 +568,77 @@ > psp.pszTemplate = MAKEINTRESOURCE(IDD_STARTPAGE); > ahpsp[nPages++] = CreatePropertySheetPage(&psp); > > - // Here we can add the next pages and switch on later > + /* Create language selection page */ > + psp.dwSize = sizeof(PROPSHEETPAGE); > + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; > + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_LANGTITLE); > + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_LANGSUBTITLE); > + psp.hInstance = hInst; > + psp.lParam = 0; > + psp.pfnDlgProc = LangSelDlgProc; > + psp.pszTemplate = MAKEINTRESOURCE(IDD_LANGSELPAGE); > + ahpsp[nPages++] = CreatePropertySheetPage(&psp); > + // Change language with "SetThreadLocale(langid)" > + > + /* Create install type selection page */ > + psp.dwSize = sizeof(PROPSHEETPAGE); > + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; > + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_TYPETITLE); > + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_TYPESUBTITLE); > + psp.hInstance = hInst; > + psp.lParam = 0; > + psp.pfnDlgProc = TypeDlgProc; > + psp.pszTemplate = MAKEINTRESOURCE(IDD_TYPEPAGE); > + ahpsp[nPages++] = CreatePropertySheetPage(&psp); > + > + /* Create device settings page */ > + psp.dwSize = sizeof(PROPSHEETPAGE); > + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; > + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DEVICETITLE); > + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_DEVICESUBTITLE); > + psp.hInstance = hInst; > + psp.lParam = 0; > + psp.pfnDlgProc = DeviceDlgProc; > + psp.pszTemplate = MAKEINTRESOURCE(IDD_DEVICEPAGE); > + ahpsp[nPages++] = CreatePropertySheetPage(&psp); > + > + /* Create install device settings page / boot method / install > directory*/ > + psp.dwSize = sizeof(PROPSHEETPAGE); > + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; > + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DRIVETITLE); > + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_DRIVESUBTITLE); > + psp.hInstance = hInst; > + psp.lParam = 0; > + psp.pfnDlgProc = DriveDlgProc; > + psp.pszTemplate = MAKEINTRESOURCE(IDD_DRIVEPAGE); > + ahpsp[nPages++] = CreatePropertySheetPage(&psp); > + > + } > + > + /* Create installation progress page */ > + psp.dwSize = sizeof(PROPSHEETPAGE); > + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; > + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_PROCESSTITLE); > + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_PROCESSSUBTITLE); > + psp.hInstance = hInst; > + psp.lParam = 0; > + psp.pfnDlgProc = ProcessDlgProc; > + psp.pszTemplate = MAKEINTRESOURCE(IDD_PROCESSPAGE); > + ahpsp[nPages++] = CreatePropertySheetPage(&psp); > + > + if (!isUnattend) > + { > + /* Create finish to reboot page */ > + psp.dwSize = sizeof(PROPSHEETPAGE); > + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; > + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_RESTARTTITLE); > + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_RESTARTSUBTITLE); > + psp.hInstance = hInst; > + psp.lParam = 0; > + psp.pfnDlgProc = RestartDlgProc; > + psp.pszTemplate = MAKEINTRESOURCE(IDD_RESTARTPAGE); > + ahpsp[nPages++] = CreatePropertySheetPage(&psp); > + } > > /* Create the property sheet */ > psh.dwSize = sizeof(PROPSHEETHEADER); > > Modified: trunk/reactos/base/setup/reactos/reactos.rbuild > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… > ============================================================================== > --- trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] > (original) > +++ trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] Fri Jul > 18 04:07:54 2008 > @@ -9,6 +9,7 @@ > <library>gdi32</library> > <library>user32</library> > <library>comctl32</library> > + <library>setupapi</library> > <file>reactos.c</file> > <file>reactos.rc</file> > </module> > > Modified: trunk/reactos/base/setup/reactos/res/header.bmp > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/hea… > ============================================================================== > Binary files - no diff available. > > Modified: trunk/reactos/base/setup/reactos/resource.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… > ============================================================================== > --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) > +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Fri Jul 18 > 04:07:54 2008 > @@ -7,8 +7,47 @@ > > #define IDC_STATIC -1 > > -#define IDD_STARTPAGE 2000 > -#define IDC_STARTTITLE 2001 > +#define IDD_STARTPAGE 2000 > +#define IDC_STARTTITLE 2001 > +#define IDD_LANGSELPAGE 2002 > +#define IDS_LANGTITLE 2003 > +#define IDS_LANGSUBTITLE 2004 > +#define IDC_LANGUAGES 2005 > +#define IDD_TYPEPAGE 2006 > +#define IDS_TYPETITLE 2007 > +#define IDS_TYPESUBTITLE 2008 > +#define IDC_INSTALL 2009 > +#define IDC_SETUP 2010 > +#define IDD_DEVICEPAGE 2011 > +#define IDS_DEVICETITLE 2012 > +#define IDS_DEVICESUBTITLE 2013 > +#define IDC_COMPUTER 2014 > +#define IDC_DISPLAY 2015 > +#define IDC_KEYBOARD 2016 > +#define IDC_KEYLAYOUT 2017 > +#define IDD_DRIVEPAGE 2018 > +#define IDS_DRIVETITLE 2019 > +#define IDS_DRIVESUBTITLE 2020 > +#define IDC_PARTITION 2021 > +#define IDC_PARTCREATE 2022 > +#define IDC_PARTDELETE 2023 > +#define IDC_INSTFREELDR 2024 > +#define IDC_NOINSTFREELDR 2025 > +#define IDC_PATH 2026 > +#define IDD_PROCESSPAGE 2027 > +#define IDS_PROCESSTITLE 2028 > +#define IDS_PROCESSSUBTITLE 2029 > +#define IDC_ACTIVITY 2030 > +#define IDC_ITEM 2031 > +#define IDC_PROCESSPROGRESS 2032 > +#define IDD_RESTARTPAGE 2033 > +#define IDS_RESTARTTITLE 2034 > +#define IDS_RESTARTSUBTITLE 2035 > +#define IDC_FINISHTITLE 2036 > +#define IDC_RESTART_PROGRESS 2037 > +#define IDS_ABORTSETUP 2038 > +#define IDS_ABORTSETUP2 2039 > +#define IDC_ACTION 2040 > > #define IDI_MAIN 3000 > > >

16 years, 11 months

1
0
0 0

Haiku and ReactOS "Pair Up" at LinuxWorld Expo 08

by James Tabor

Hi! A show is coming up and we need to look good. Haiku looks good and it has networtking and draws objects very well. Please check our drawing with test apps and look at networking and see where we are on hardware support. I know there are bugs maybe by August 4th we can get back some basic networking with hardware. PCI n2k? or FET? KPANIC! James

16 years, 11 months

6
9
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 34558: Commit my test suite I used for verifying the behaviours of wctomb, wcstombs and WideCharToMultiByte and writing the reimplementations for ReactOS on request of Stefan

by Aleksey Bragin

Maybe it's worth adding these tests to msvcrt test suite and submit to Wine? WBR, Aleksey Bragin. On Jul 17, 2008, at 2:08 AM, cfinck(a)svn.reactos.org wrote: > Author: cfinck > Date: Wed Jul 16 17:08:58 2008 > New Revision: 34558 > > URL: http://svn.reactos.org/svn/reactos?rev=34558&view=rev > Log: > Commit my test suite I used for verifying the behaviours of wctomb, > wcstombs and WideCharToMultiByte and writing the reimplementations > for ReactOS on request of Stefan

16 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 34524: Updated kernel exports to match with r34517

by Alex Ionescu

Please remember to fix exports for other architectures as well. We really need a spec file for the kernel... Best regards, Alex Ionescu On Tue, Jul 15, 2008 at 6:56 AM, <pschweitzer(a)svn.reactos.org> wrote: > Author: pschweitzer > Date: Tue Jul 15 08:56:54 2008 > New Revision: 34524 > > URL: http://svn.reactos.org/svn/reactos?rev=34524&view=rev > Log: > Updated kernel exports to match with r34517 > > Modified: > branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def > > Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def > URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_i3… > ============================================================================== > --- branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) > +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Tue Jul 15 08:56:54 2008 > @@ -182,7 +182,7 @@ > @ExiReleaseFastMutex@4=@ExReleaseFastMutex@4 > @ExiTryToAcquireFastMutex@4=@ExTryToAcquireFastMutex@4 > FsRtlAcquireFileExclusive > -;FsRtlAddBaseMcbEntry > +FsRtlAddBaseMcbEntry > FsRtlAddLargeMcbEntry > FsRtlAddMcbEntry > FsRtlAddToTunnelCache > @@ -216,7 +216,7 @@ > FsRtlFindInTunnelCache > FsRtlFreeFileLock > FsRtlGetFileSize > -;FsRtlGetNextBaseMcbEntry > +FsRtlGetNextBaseMcbEntry > FsRtlGetNextFileLock > FsRtlGetNextLargeMcbEntry > FsRtlGetNextMcbEntry > @@ -224,7 +224,7 @@ > FsRtlIncrementCcFastReadNotPossible > FsRtlIncrementCcFastReadResourceMiss > FsRtlIncrementCcFastReadWait > -;FsRtlInitializeBaseMcb > +FsRtlInitializeBaseMcb > FsRtlInitializeFileLock@12 > FsRtlInitializeLargeMcb > FsRtlInitializeMcb > @@ -240,10 +240,10 @@ > FsRtlIsPagingFile > FsRtlIsTotalDeviceFailure > FsRtlLegalAnsiCharacterArray=_FsRtlLegalAnsiCharacterArray > -;FsRtlLookupBaseMcbEntry > +FsRtlLookupBaseMcbEntry > FsRtlLookupLargeMcbEntry > -;FsRtlLookupLastBaseMcbEntry > -;FsRtlLookupLastBaseMcbEntryAndIndex > +FsRtlLookupLastBaseMcbEntry > +FsRtlLookupLastBaseMcbEntryAndIndex > FsRtlLookupLastLargeMcbEntry > FsRtlLookupLastLargeMcbEntryAndIndex > FsRtlLookupLastMcbEntry > @@ -267,7 +267,7 @@ > FsRtlNotifyReportChange > FsRtlNotifyUninitializeSync > FsRtlNotifyVolumeEvent > -;FsRtlNumberOfRunsInBaseMcb > +FsRtlNumberOfRunsInBaseMcb > FsRtlNumberOfRunsInLargeMcb > FsRtlNumberOfRunsInMcb > FsRtlOplockFsctrl > @@ -281,21 +281,21 @@ > FsRtlRegisterFileSystemFilterCallbacks > FsRtlRegisterUncProvider > FsRtlReleaseFile > -;FsRtlRemoveBaseMcbEntry > +FsRtlRemoveBaseMcbEntry > FsRtlRemoveLargeMcbEntry > FsRtlRemoveMcbEntry > FsRtlRemovePerFileObjectContext > FsRtlRemovePerStreamContext > -;FsRtlResetBaseMcb > +FsRtlResetBaseMcb > FsRtlResetLargeMcb > -;FsRtlSplitBaseMcb > +FsRtlSplitBaseMcb > FsRtlSplitLargeMcb > FsRtlSyncVolumes > FsRtlTeardownPerStreamContexts > -;FsRtlTruncateBaseMcb > +FsRtlTruncateBaseMcb > FsRtlTruncateLargeMcb > FsRtlTruncateMcb > -;FsRtlUninitializeBaseMcb > +FsRtlUninitializeBaseMcb > FsRtlUninitializeFileLock@4 > FsRtlUninitializeLargeMcb > FsRtlUninitializeMcb > >

16 years, 11 months

1
0
0 0

[ros-diffs] [mpiulachs] 34223: - hackfix unbootable image (part 1/2)

by James Tabor

Hi, Does "make install" work for you by any chance? I get this: bash-3.1# make install mingw32-make: *** No rule to make target `boot/bootdata/i386/hivecls.inf', needed by `reactos/system32/config/default'. Stop.

16 years, 11 months

1
1
0 0

Re: [ros-dev] when will I return Magnus Olsen aka GreatLord (gedmurphy)

by Cameron Gutman

I tested some of GreatLord's regressions and I can see how Aleksey would get angry about all the fixes he has to do to GreatLord's code, but GreatLord has fixed a whole lot more than he has broken and Fireball chasing around 'if (Foo == FALSE)' and changing it to 'if (!Foo)' seems pointless. We've got plenty of code formatted as 'if (Foo == FALSE)' in the kernel that works great. Aleksey is making more work for himself by making needless changes to GreatLord's code. All that is needed is someone with commit access that is willing to correct GreatLord's comments. I don't have a problem with finding a regression of GL's here or there. Sure he should test his code before committing but as far as breakages, but his code usually correct and all coders create breakages one time or another.

16 years, 11 months

7
10
0 0

The ABCs of DCEs

by James Tabor

Hi, I did some research and found something very interesting. I kept thinking about the last DCE commit (34289). I had a guess and modified the user32 test for wine. The results are very clear. Apparently windows does not care for which dc is returned if it is Cached or a bug since hWnd is the same. When DCX_NORESETATTRS is set when calling GetDCEx; "Does not reset the attributes of this DC to the default attributes when this DC is released." We do this correctly in ReleaseDC. So the next GetDCEx should keep the original DC data for the next set of tests. Wine test is completely incorrect. So all of our DCE attributes code is good to go. Windows did not pass the modified "Same hDC" check and we still fail the "ROP" check. See the windows results at the end of this message. //////// Changes to user32/tests/dce.c: ReleaseDC( hwnd_cache, hdc ); hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS ); <------ DCX_NORESETATTRS rop = GetROP2( hdc ); ok( rop == def_rop || rop == R2_WHITE, "wrong ROP2 %d after release\n", rop ); ReleaseDC( hwnd_cache, hdc ); + old_hdc = hdc; hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE ); rop = GetROP2( hdc ); + ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc ); ok( rop == def_rop, "wrong ROP2 %d after release\n", rop ); ReleaseDC( hwnd_cache, hdc ); /* test own DC */ //////// //////// Results from XP: Microsoft Windows XP [Version 5.1.2600] (C) Copyright 1985-2001 Microsoft Corp. Z:\>e: E:\>user32_crosstest dce dce.c:79: Test failed: didn't get same DC F5010866/FC0107E0 dce: 77 tests executed (0 marked as todo, 1 failure), 0 skipped. E:\> /////////

16 years, 11 months

1
1
0 0

Re: [ros-dev] [ros-diffs] [jimtabor] 34276: GetLastActivePopup is still unimplemented, we return the current window handle if it is valid.

by Aleksey Bragin

It would make sense to add a WARN there or something like that, so it could be seen that it is halfplemented only. WBR, Aleksey. On Jul 3, 2008, at 11:17 AM, jimtabor(a)svn.reactos.org wrote: > Author: jimtabor > Date: Thu Jul 3 02:17:32 2008 > New Revision: 34276 > > URL: http://svn.reactos.org/svn/reactos?rev=34276&view=rev > Log: > GetLastActivePopup is still unimplemented, we return the current > window handle if it is valid. > > Modified: > trunk/reactos/dll/win32/user32/windows/window.c > > Modified: trunk/reactos/dll/win32/user32/windows/window.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ > user32/windows/window.c?rev=34276&r1=34275&r2=34276&view=diff > ====================================================================== > ======== > --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] > Thu Jul 3 02:17:32 2008 > @@ -921,8 +921,24 @@ > HWND STDCALL > GetLastActivePopup(HWND hWnd) > { > - UNIMPLEMENTED; > - return 0; > + PWINDOW Wnd, WndParent; > + HWND Ret = NULL; > + > + Wnd = ValidateHwnd(hWnd); > + if (Wnd != NULL) > + { > + _SEH_TRY > + { > + WndParent = NULL; > + Ret = hWnd; > + } > + _SEH_HANDLE > + { > + /* Do nothing */ > + } > + _SEH_END; > + } > + return Ret; > } > > >

16 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 34135: - Add fontext.dll

by Heis Spiter

I also agree. About the last point, in Ged's mail, I'm afraid to say I've real difficulties to code with such build time. I'm obliged to work on outdated revisons, and on partial builds. That's really insane. P. Schweitzer -------------------------------------------------- From: "gedmurphy" <gedmurphy(a)gmail.com> Sent: Wednesday, July 02, 2008 5:49 PM To: "'ReactOS Development List'" <ros-dev(a)reactos.org> Subject: Re: [ros-dev] [ros-diffs] [dchapyshev] 34135: - Add fontext.dll > I completely agree, this needs to be clamped down on. Do we really need 78 > different keyboard layouts at this point? > It's fine for the people with mega fast systems and time on their hands, > but > most people don't fall into this category. > > I now try to avoid building as much as possible and I suspect more people > will be following suit if the build time continues to increase. > > Ged > >

16 years, 11 months

5
4
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 34135: - Add fontext.dll

by Heis Spiter

Once again I agree, and I'd like to add my 2 cents, perhaps it will help. We need two solutions right now. A short term one, and a long term one. The short one, purposed by Ged seems, IMO, to be a nice alternative before more important work, and seems to be quite easy to realize. The long one could be a work on rbuild (and makefile) with the hierarchy purposed by Ged. And instead of typing make bootcd, we would have to type make bootcd X where X would be the additionnal components with hierarchy. P. Schweitzer -------------------------------------------------- From: "gedmurphy" <gedmurphy(a)gmail.com> Sent: Thursday, July 03, 2008 9:19 AM To: "'ReactOS Development List'" <ros-dev(a)reactos.org> Subject: Re: [ros-dev] [ros-diffs] [dchapyshev] 34135: - Add fontext.dll > I'm certainly not asking him to stop. But I do think we need a rethink of > our tree structure. > The rosapps thing has never been ideal either, so moving stuff into there > isn't a good solution. > > Perhaps we need a hierarchy of components listed for importance. Let's say > the list ranges from 1 to 10. 1 being core components required to boot the > OS, 2 being additional components to get to the GUI, etc, with 10 being > things like these keyboard dlls I used as an earlier example. > > However, such a solution isn't a 5 minute job so we do need a quick fix in > the meantime. Maybe something similar to how rosapps works, with an > addition > to the /modules rbuild file? > > Ged. > > -----Original Message----- > From: ros-dev-bounces(a)reactos.org [mailto:ros-dev-bounces@reactos.org] On > Behalf Of Aleksey Bragin > Sent: 02 July 2008 22:34 > To: ReactOS Development List > Subject: Re: [ros-dev] [ros-diffs] [dchapyshev] 34135: - Add fontext.dll > > Asking Dmitry to abstain from work would be considered "a hack", not > "a proper solution". > > WBR, > Aleksey. > > On Jul 3, 2008, at 12:45 AM, Heis Spiter wrote: > >> I also agree. >> About the last point, in Ged's mail, I'm afraid to say I've real >> difficulties to code with such build time. I'm obliged to work on >> outdated >> revisons, and on partial builds. That's really insane. >> >> P. Schweitzer > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

16 years, 11 months

2
1
0 0

Re: [ros-dev] Prevent boolean flags from being optimized away by compiler

by Dmitry Gorbachev

Hi, Something else: there are two FORCEINLINE functions in ntoskrnl/include/internal/ntoskrnl.h, DefaultSetInfoBufferCheck() and DefaultQueryInfoBufferCheck(), but they cannot be inlined because of SEH (i.e. setjmp/longjmp). Timo Kreuzer wrote: > What about wrapping the _SEH_TRY part in a local inline function? In my > tests this successfully prevented the variables from being optimized away. > At least under normal optimisation settings.

16 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 34135: - Add fontext.dll

by Marc Piulachs

What's the point of adding all those useless stubbed dlls? It only contributes to increase build time -------------------------------------------------- From: <dchapyshev(a)svn.reactos.org> Sent: Friday, June 27, 2008 7:34 PM To: <ros-diffs(a)reactos.org> Subject: [ros-diffs] [dchapyshev] 34135: - Add fontext.dll > Author: dchapyshev > Date: Fri Jun 27 12:34:08 2008 > New Revision: 34135 > > URL: http://svn.reactos.org/svn/reactos?rev=34135&view=rev > Log: > - Add fontext.dll > > Added: > trunk/reactos/dll/shellext/fontext/ > trunk/reactos/dll/shellext/fontext/fontext.c (with props) > trunk/reactos/dll/shellext/fontext/fontext.def (with props) > trunk/reactos/dll/shellext/fontext/fontext.h (with props) > trunk/reactos/dll/shellext/fontext/fontext.rbuild (with props) > trunk/reactos/dll/shellext/fontext/fontext.rc (with props) > trunk/reactos/dll/shellext/fontext/lang/ > trunk/reactos/dll/shellext/fontext/lang/en-US.rc (with props) > trunk/reactos/dll/shellext/fontext/regsvr.c (with props) > trunk/reactos/dll/shellext/fontext/resource.h (with props) > trunk/reactos/dll/shellext/fontext/rsrc.rc (with props) > Modified: > trunk/reactos/dll/shellext/shellext.rbuild > > Added: trunk/reactos/dll/shellext/fontext/fontext.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte… > ============================================================================== > --- trunk/reactos/dll/shellext/fontext/fontext.c (added) > +++ trunk/reactos/dll/shellext/fontext/fontext.c [iso-8859-1] Fri Jun 27 > 12:34:08 2008 > @@ -1,0 +1,45 @@ > +/* > + * > + * PROJECT: fontext.dll > + * FILE: dll/shellext/fontext/fontext.c > + * PURPOSE: fontext.dll > + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) > + * UPDATE HISTORY: > + * 10-06-2008 Created > + */ > + > +#include "fontext.h" > + > +static HINSTANCE hInstance; > + > +HRESULT WINAPI > +DllCanUnloadNow(VOID) > +{ > + DPRINT1("DllCanUnloadNow() stubs\n"); > + return S_OK; > +} > + > +HRESULT WINAPI > +DllGetClassObject(REFCLSID rclsid, > + REFIID riid, > + LPVOID *ppv) > +{ > + DPRINT1("DllGetClassObject() stubs\n"); > + return S_OK; > +} > + > +BOOL STDCALL > +DllMain(HINSTANCE hinstDLL, > + DWORD dwReason, > + LPVOID lpvReserved) > +{ > + switch (dwReason) > + { > + case DLL_PROCESS_ATTACH: > + hInstance = hinstDLL; > + DisableThreadLibraryCalls(hInstance); > + break; > + } > + > + return TRUE; > +} > > Propchange: trunk/reactos/dll/shellext/fontext/fontext.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/dll/shellext/fontext/fontext.def > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte… > ============================================================================== > --- trunk/reactos/dll/shellext/fontext/fontext.def (added) > +++ trunk/reactos/dll/shellext/fontext/fontext.def [iso-8859-1] Fri Jun 27 > 12:34:08 2008 > @@ -1,0 +1,6 @@ > +LIBRARY fontext.dll > +EXPORTS > +DllCanUnloadNow > +DllGetClassObject > +DllRegisterServer > +DllUnregisterServer > > Propchange: trunk/reactos/dll/shellext/fontext/fontext.def > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/dll/shellext/fontext/fontext.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte… > ============================================================================== > --- trunk/reactos/dll/shellext/fontext/fontext.h (added) > +++ trunk/reactos/dll/shellext/fontext/fontext.h [iso-8859-1] Fri Jun 27 > 12:34:08 2008 > @@ -1,0 +1,12 @@ > +#ifndef __FONTEXT__H > +#define __FONTEXT__H > + > +#define COBJMACROS > +#include <windows.h> > +#include <tchar.h> > +#include <stdio.h> > +#include <shlobj.h> > + > +#include <debug.h> > + > +#endif /* __FONTEXT__H */ > > Propchange: trunk/reactos/dll/shellext/fontext/fontext.h > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/dll/shellext/fontext/fontext.rbuild > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte… > ============================================================================== > --- trunk/reactos/dll/shellext/fontext/fontext.rbuild (added) > +++ trunk/reactos/dll/shellext/fontext/fontext.rbuild [iso-8859-1] Fri Jun > 27 12:34:08 2008 > @@ -1,0 +1,21 @@ > +<module name="fontext" type="win32dll" > baseaddress="${BASEADDRESS_FONTEXT}" installbase="system32" > installname="fontext.dll" unicode="yes"> > + <importlibrary definition="fontext.def" /> > + <include base="fontext">.</include> > + <define name="_WIN32_IE">0x0500</define> > + <define name="_WIN32_WINNT">0x0600</define> > + <define name="WINVER">0x0600</define> > + <library>ntdll</library> > + <library>kernel32</library> > + <library>user32</library> > + <library>gdi32</library> > + <library>ole32</library> > + <library>uuid</library> > + <library>msvcrt</library> > + <library>shlwapi</library> > + <library>lz32</library> > + <library>advapi32</library> > + <library>setupapi</library> > + <file>fontext.c</file> > + <file>regsvr.c</file> > + <file>fontext.rc</file> > +</module> > > Propchange: trunk/reactos/dll/shellext/fontext/fontext.rbuild > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/dll/shellext/fontext/fontext.rc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte… > ============================================================================== > --- trunk/reactos/dll/shellext/fontext/fontext.rc (added) > +++ trunk/reactos/dll/shellext/fontext/fontext.rc [iso-8859-1] Fri Jun 27 > 12:34:08 2008 > @@ -1,0 +1,10 @@ > +#include <windows.h> > +#include "resource.h" > + > +#define REACTOS_VERSION_DLL > +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Font Folder\0" > +#define REACTOS_STR_INTERNAL_NAME "fontext\0" > +#define REACTOS_STR_ORIGINAL_FILENAME "fontext.dll\0" > +#include <reactos/version.rc> > + > +#include "rsrc.rc" > > Propchange: trunk/reactos/dll/shellext/fontext/fontext.rc > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/dll/shellext/fontext/lang/en-US.rc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/lang/… > ============================================================================== > --- trunk/reactos/dll/shellext/fontext/lang/en-US.rc (added) > +++ trunk/reactos/dll/shellext/fontext/lang/en-US.rc [iso-8859-1] Fri Jun > 27 12:34:08 2008 > @@ -1,0 +1,9 @@ > +// Don't translate this file at current time > + > +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US > + > +STRINGTABLE > +BEGIN > + IDS_REACTOS_FONTS_FOLDER "ReactOS Font Folder" > +END > + > > Propchange: trunk/reactos/dll/shellext/fontext/lang/en-US.rc > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/dll/shellext/fontext/regsvr.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/regsv… > ============================================================================== > --- trunk/reactos/dll/shellext/fontext/regsvr.c (added) > +++ trunk/reactos/dll/shellext/fontext/regsvr.c [iso-8859-1] Fri Jun 27 > 12:34:08 2008 > @@ -1,0 +1,38 @@ > +/* > + * > + * PROJECT: fontext.dll > + * FILE: dll/shellext/fontext/regsvr.c > + * PURPOSE: fontext.dll > + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) > + * UPDATE HISTORY: > + * 10-06-2008 Created > + */ > + > +#include <windows.h> > +#include <ole2.h> > + > +#include <fontext.h> > + > +static HRESULT > +REGSVR_RegisterServer() > +{ > + return S_OK; > +} > + > +static HRESULT > +REGSVR_UnregisterServer() > +{ > + return S_OK; > +} > + > +HRESULT WINAPI > +DllRegisterServer(VOID) > +{ > + return REGSVR_RegisterServer(); > +} > + > +HRESULT WINAPI > +DllUnregisterServer(VOID) > +{ > + return REGSVR_UnregisterServer(); > +} > > Propchange: trunk/reactos/dll/shellext/fontext/regsvr.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/dll/shellext/fontext/resource.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/resou… > ============================================================================== > --- trunk/reactos/dll/shellext/fontext/resource.h (added) > +++ trunk/reactos/dll/shellext/fontext/resource.h [iso-8859-1] Fri Jun 27 > 12:34:08 2008 > @@ -1,0 +1,6 @@ > +#ifndef __RESOURCE__H > +#define __RESOURCE__H > + > +#define IDS_REACTOS_FONTS_FOLDER 151 > + > +#endif /* __RESOURCE__H */ > > Propchange: trunk/reactos/dll/shellext/fontext/resource.h > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/dll/shellext/fontext/rsrc.rc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/rsrc.… > ============================================================================== > --- trunk/reactos/dll/shellext/fontext/rsrc.rc (added) > +++ trunk/reactos/dll/shellext/fontext/rsrc.rc [iso-8859-1] Fri Jun 27 > 12:34:08 2008 > @@ -1,0 +1,4 @@ > +#include <windows.h> > +#include "resource.h" > + > +#include "lang/en-US.rc" > > Propchange: trunk/reactos/dll/shellext/fontext/rsrc.rc > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: trunk/reactos/dll/shellext/shellext.rbuild > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellext.rbui… > ============================================================================== > --- trunk/reactos/dll/shellext/shellext.rbuild [iso-8859-1] (original) > +++ trunk/reactos/dll/shellext/shellext.rbuild [iso-8859-1] Fri Jun 27 > 12:34:08 2008 > @@ -10,6 +10,9 @@ > <directory name="devcpux"> > <xi:include href="devcpux/devcpux.rbuild" /> > </directory> > + <directory name="fontext"> > + <xi:include href="fontext/fontext.rbuild" /> > + </directory> > <directory name="slayer"> > <xi:include href="slayer/slayer.rbuild" /> > </directory> > >

16 years, 11 months

5
4
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 34135: - Add fontext.dll

by Marc Piulachs

>> I now try to avoid building as much as possible and I suspect more people >> will be following suit if the build time continues to increase. > > We could develop a lean target that only builds the bare apps and > libraries required. That's one of the things I experimented with while working on my C# rbuild implementation http://www.marcpiulachs.com/reactos/designer.html . My intention is to end up adding that kind of Platform Builder like feature to our C++ implementation Regards, /Marc

16 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [fireball] 34232: Yuri Sidorov <jura@cp-lab.com> - Prevent boolean flags from being optimized away by compiler (due to PSEH usage) by making them volatile. See issue #3408 for more details.

by Alex Ionescu

What? Why would the compiler optimize these away? This doesn't make any sense. If something is happening to these flags, PSEH should be fixed -- not making every flag in the source base a volatile. On 1-Jul-08, at 3:48 AM, fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Tue Jul 1 05:48:50 2008 > New Revision: 34232 > > URL: http://svn.reactos.org/svn/reactos?rev=34232&view=rev > Log: > Yuri Sidorov <jura(a)cp-lab.com> > - Prevent boolean flags from being optimized away by compiler (due > to PSEH usage) by making them volatile. > See issue #3408 for more details. > > Modified: > trunk/reactos/ntoskrnl/mm/virtual.c > > Modified: trunk/reactos/ntoskrnl/mm/virtual.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Tue Jul 1 > 05:48:50 2008 > @@ -70,7 +70,7 @@ > PFN_NUMBER MdlBuffer[(sizeof(MDL) / sizeof(PFN_NUMBER)) + > MI_MAPPED_COPY_PAGES + 1]; > PMDL Mdl = (PMDL)MdlBuffer; > ULONG TotalSize, CurrentSize, RemainingSize; > - BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, > FailedInMoving; > + volatile BOOLEAN FailedInProbe = FALSE, FailedInMapping = > FALSE, FailedInMoving; > BOOLEAN PagesLocked; > PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = > TargetAddress; > PVOID MdlAddress; > @@ -225,7 +225,7 @@ > { > UCHAR StackBuffer[MI_POOL_COPY_BYTES]; > ULONG TotalSize, CurrentSize, RemainingSize; > - BOOLEAN FailedInProbe = FALSE, FailedInMoving, HavePoolAddress > = FALSE; > + volatile BOOLEAN FailedInProbe = FALSE, FailedInMoving, > HavePoolAddress = FALSE; > PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = > TargetAddress; > PVOID PoolAddress; > KAPC_STATE ApcState; > Best regards, Alex Ionescu

16 years, 11 months

4
5
0 0

Re: [ros-dev] [ros-diffs] [fireball] 34230: - Fix a problem with normal and special APCs being inserted in the wrong order, spotted by Jury Sidorov. Now Borland Turbo Debugger should be able to debug applications, also it can fix hangs in other applications. - When delivering kernel APC, set the pending flag to false (by analogy with delivering user APC and clearing its pending flag). See issue #3426 for more details.

by Alex Ionescu

Um... KiDeliverApc already sets KernelApcPending = FALSE; Now you're setting it twice...please revert. On 1-Jul-08, at 3:08 AM, fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Tue Jul 1 05:08:14 2008 > New Revision: 34230 > > URL: http://svn.reactos.org/svn/reactos?rev=34230&view=rev > Log: > - Fix a problem with normal and special APCs being inserted in the > wrong order, spotted by Jury Sidorov. Now Borland Turbo Debugger > should be able to debug applications, also it can fix hangs in other > applications. > - When delivering kernel APC, set the pending flag to false (by > analogy with delivering user APC and clearing its pending flag). > See issue #3426 for more details. > > Modified: > trunk/reactos/ntoskrnl/ke/apc.c (contents, props changed) > > Modified: trunk/reactos/ntoskrnl/ke/apc.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3423… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Tue Jul 1 05:08:14 > 2008 > @@ -145,8 +145,8 @@ > /* Get the APC */ > QueuedApc = CONTAINING_RECORD(NextEntry, KAPC, > ApcListEntry); > > - /* Is this a Normal APC? If so, break */ > - if (QueuedApc->NormalRoutine) break; > + /* Is this a No-Normal APC? If so, break */ > + if (!QueuedApc->NormalRoutine) break; > > /* Move to the next APC in the Queue */ > NextEntry = NextEntry->Blink; > @@ -320,6 +320,9 @@ > break; > } > > + /* It's not pending anymore */ > + Thread->ApcState.KernelApcPending = FALSE; > + > /* Get the next Entry */ > ApcListEntry = Thread->ApcState.ApcListHead[KernelMode].Flink; > Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry); > > Propchange: trunk/reactos/ntoskrnl/ke/apc.c > ------------------------------------------------------------------------------ > --- svn:needs-lock (original) > +++ svn:needs-lock (removed) > @@ -1,1 +1,0 @@ > -* > Best regards, Alex Ionescu

16 years, 11 months

1
0
0 0

"the input line is too long" bug caused by hpoussin's changes

by Colin Finck

Hello everyone, As most devs including me noticed this "the input line is too long" bug after hpoussin's changes in r34187 to r34191, I did some research on it. Unfortunately, it looks like it's unfixable if we keep on directly using ld for linking (as introduced in these revisions) instead of calling the gcc frontend. First of all, the "length" of the cmd input line under Windows seems to be highly affected by quotation marks. If you add a quotation mark to the working linker command line before hpoussin's commits, it will also be reported as being too long. Previously, we didn't use quotation marks in the command line when linking the binaries. Now we have to do this because of the changed PROJECT_LFLAGS and PROJECT_LPPFLAGS variables: They contain the path to i.e. libgcc and as this path can contain spaces, it has to be put in quotation marks. Just passing "libgcc.a" without a path doesn't work. Passing "-lgcc" also doesn't work, because mingw32-ld only seems to search for libraries in "mingw32/lib", not "lib/gcc/mingw32/4.1.3" as gcc does. I see no other solution than partly reverting hpoussin's changes and using gcc for linking again. If anyone sees another option, please comment or directly commit a fix. Best regards, Colin

16 years, 11 months

5
4
0 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 34170: - Implement beginnings of Ramdisk Port Driver. Planning compatibility with ISO, SDI and WIM files and full Windows support. - New license for our code.

by Steven Edwards

On Sat, Jun 28, 2008 at 10:58 PM, <ros-arm-bringup(a)svn.reactos.org> wrote: > +The views and conclusions contained in the software and documentation are those of the authors and > +should not be interpreted as representing official policies, either expressed or implied, of the ReactOS > +Project. Sounds like the Ninja's don't want a libel lawsuit. =) I don't see anything in this clause that is not GPL compatible, its just funny. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [mpiulachs] 34106: - remove no longerrequired bootsect.mak

by Marc Piulachs

Hi, Generate? fat.h and fat32.h are already included in the code base , installfreeldr will compile without problems Regards, /Marc -------------------------------------------------- From: "Hervé Poussineau" <hpoussin(a)reactos.org> Sent: Thursday, June 26, 2008 7:43 PM To: <ros-dev(a)reactos.org> Subject: Re: [ros-dev] [ros-diffs] [mpiulachs] 34106: - remove no longerrequired bootsect.mak > Hi, > > mpiulachs(a)svn.reactos.org a écrit : >> Author: mpiulachs >> Date: Thu Jun 26 10:58:56 2008 >> New Revision: 34106 >> >> URL: http://svn.reactos.org/svn/reactos?rev=34106&view=rev >> Log: >> - remove no longer required bootsect.mak >> >> Removed: >> trunk/reactos/boot/freeldr/bootsect/bootsect.mak >> > > Which rbuild file tells how to generate the files > reactos/boot/freeldr/bootsect/fat.h and fat32.h? > They are required by reactos/boot/freeldr/install/install.c. > > The inclusion of install/installfreeldr.rbuild has been removed in > r34055. I don't know if it is an error or not. > > Hervé > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev

16 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [mkupfer] 34109: - fix for missing letter in "DISPLAYSETTINGSUPDATE" - initial version of i18n hives (translatable registry entries)

by Marc Piulachs

Hi, IMHO it's the wrong way to do it. A part from not being a standard procedure (Windows hasn't got such HiveLocaleInfs.Install directive in txtsetup.sif) It should be done during second stage setup using a localized .inf file. setupapi already has support for managing multiple translatable strings in one single inf file. for example: [LangAddReg] HKR,,"LocalizedString",0x00010000,%one% [Strings] ; Default, US English one = "One" two = "Two" [Strings.040c] French (Standard) one = "Un" two = "Deux" [Strings.080a] ; Spanish (Mexico) one = "Uno" two = "Dos" The other reason is that 1st stage setup should perform the minimal indispensable steps to configure a given system to run the GUI based setup. In the future when reactos is able to install form a livecd no 1st stage setup will be run at all. Regards, /Marc -------------------------------------------------- From: <mkupfer(a)svn.reactos.org> Sent: Thursday, June 26, 2008 6:53 PM To: <ros-diffs(a)reactos.org> Subject: [ros-diffs] [mkupfer] 34109: - fix for missing letter in "DISPLAYSETTINGSUPDATE" - initial version of i18n hives (translatable registry entries) > Author: mkupfer > Date: Thu Jun 26 11:53:26 2008 > New Revision: 34109 > > URL: http://svn.reactos.org/svn/reactos?rev=34109&view=rev > Log: > - fix for missing letter in "DISPLAYSETTINGSUPDATE" > - initial version of i18n hives (translatable registry entries) > > Added: > branches/matthias-i18n/boot/bootdata/de_DE.inf (with props) > Modified: > branches/matthias-i18n/base/setup/usetup/interface/usetup.c > branches/matthias-i18n/base/setup/usetup/lang/bg-BG.h > branches/matthias-i18n/base/setup/usetup/lang/cs-CZ.h > branches/matthias-i18n/base/setup/usetup/lang/de-DE.h > branches/matthias-i18n/base/setup/usetup/lang/el-GR.h > branches/matthias-i18n/base/setup/usetup/lang/en-US.h > branches/matthias-i18n/base/setup/usetup/lang/es-ES.h > branches/matthias-i18n/base/setup/usetup/lang/fr-FR.h > branches/matthias-i18n/base/setup/usetup/lang/it-IT.h > branches/matthias-i18n/base/setup/usetup/lang/lt-LT.h > branches/matthias-i18n/base/setup/usetup/lang/pl-PL.h > branches/matthias-i18n/base/setup/usetup/lang/ru-RU.h > branches/matthias-i18n/base/setup/usetup/lang/sk-SK.h > branches/matthias-i18n/base/setup/usetup/lang/sv-SE.h > branches/matthias-i18n/base/setup/usetup/lang/uk-UA.h > branches/matthias-i18n/base/setup/usetup/mui.h > branches/matthias-i18n/boot/bootdata/bootdata.rbuild > branches/matthias-i18n/boot/bootdata/txtsetup.sif > > Modified: branches/matthias-i18n/base/setup/usetup/interface/usetup.c > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/interface/usetup.c > [iso-8859-1] (original) > +++ branches/matthias-i18n/base/setup/usetup/interface/usetup.c > [iso-8859-1] Thu Jun 26 11:53:26 2008 > @@ -3135,6 +3135,7 @@ > PWSTR Action; > PWSTR File; > PWSTR Section; > + PWSTR LangId; > BOOLEAN Delete; > NTSTATUS Status; > > @@ -3207,8 +3208,54 @@ > } > } while (SetupFindNextLine (&InfContext, &InfContext)); > > + /* Localize registry entries by applying of language updates */ > + > + if (!SetupFindFirstLineW(SetupInf, L"HiveLocaleInfs.Install", NULL, > &InfContext)) > + { > + DPRINT1("SetupFindFirstLine() failed\n"); > + MUIDisplayError(ERROR_FIND_REGISTRY, Ir, POPUP_WAIT_ENTER); > + return QUIT_PAGE; > + } > + > + do > + { > + INF_GetDataField (&InfContext, 0, &Action); > + INF_GetDataField (&InfContext, 1, &File); > + INF_GetDataField (&InfContext, 2, &Section); > + INF_GetDataField (&InfContext, 3, &LangId); > + > + DPRINT("Action: %S File: %S Section %S LangId %S\n", Action, > File, Section, LangId); > + > + if (!_wcsicmp (Action, L"AddReg")) > + { > + Delete = FALSE; > + } > + else if (!_wcsicmp (Action, L"DelReg")) > + { > + Delete = TRUE; > + } > + else > + { > + continue; > + } > + > + if (_wcsicmp(SelectedLanguageId, LangId)) /* language id doesn't > match or exist */ > + continue; > + > + CONSOLE_SetStatusText(MUIGetString(STRING_IMPORTFILE), File); > + > + if (!ImportRegistryFile(File, Section, Delete)) > + { > + DPRINT("Importing %S failed\n", File); > + > + MUIDisplayError(ERROR_IMPORT_HIVE, Ir, POPUP_WAIT_ENTER); > + return QUIT_PAGE; > + } > + } while (SetupFindNextLine (&InfContext, &InfContext)); > + > + > /* Update display registry settings */ > - CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYETTINGSUPDATE)); > + CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYSETTINGSUPDATE)); > if (!ProcessDisplayRegistry(SetupInf, DisplayList)) > { > MUIDisplayError(ERROR_UPDATE_DISPLAY_SETTINGS, Ir, > POPUP_WAIT_ENTER); > > Modified: branches/matthias-i18n/base/setup/usetup/lang/bg-BG.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/bg-BG.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1633,7 +1633,7 @@ > " áê¢à¥¬¥ï¢ ¥ à¥£¨áâêà¨â¥ à®¥¢¥..."}, > {STRING_IMPORTFILE, > " áï¥ %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " áê¢à¥¬¥ï¢ ¥ à¥£¨áâà®¢¨â¥ áâà®©ª¨ ¥ªà ..."}, > {STRING_LOCALESETTINGSUPDATE, > " áê¢à¥¬¥ï¢ ¥ ¬¥áâ¨â¥ áâà®©ª¨..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/cs-CZ.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1630,7 +1630,7 @@ > " Aktualizuji registr..."}, > {STRING_IMPORTFILE, > " Importuji %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Aktualizuji nastaven¡ zobrazen¡ registru..."}, //display registry > settings > {STRING_LOCALESETTINGSUPDATE, > " Aktualizuji m¡stn¡ nastaven¡..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/de-DE.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/de-DE.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/de-DE.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1624,7 +1624,7 @@ > " Registry hives werden aktualisiert..."}, > {STRING_IMPORTFILE, > " Importiere %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Bildschirm-Registryeinstellungen werden aktualisiert..."}, > {STRING_LOCALESETTINGSUPDATE, > " Lokalisierungseinstellungen werden aktualisiert..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/el-GR.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/el-GR.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/el-GR.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1653,7 +1653,7 @@ > " Updating registry hives..."}, > {STRING_IMPORTFILE, > " Importing %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Updating display registry settings..."}, > {STRING_LOCALESETTINGSUPDATE, > " Updating locale settings..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/en-US.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/en-US.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/en-US.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1623,7 +1623,7 @@ > " Updating registry hives..."}, > {STRING_IMPORTFILE, > " Importing %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Updating display registry settings..."}, > {STRING_LOCALESETTINGSUPDATE, > " Updating locale settings..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/es-ES.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/es-ES.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/es-ES.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1623,7 +1623,7 @@ > " Actualizando el rbol del registro..."}, > {STRING_IMPORTFILE, > " Importando %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Actualizando configuraci¢n del tipo de pantalla..."}, > {STRING_LOCALESETTINGSUPDATE, > " Actualizando configuraci¢n regional..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/fr-FR.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/fr-FR.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1636,7 +1636,7 @@ > " Mise jour de la base de registre..."}, > {STRING_IMPORTFILE, > " Importe %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Mise jour des paramtres du registre pour l'cran..."}, > {STRING_LOCALESETTINGSUPDATE, > " Mise jour des paramtres rgionaux..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/it-IT.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/it-IT.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/it-IT.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1624,7 +1624,7 @@ > " Aggiornamento degli hives del registro..."}, > {STRING_IMPORTFILE, > " Importazione di %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Aggiornamento delle impostazioni dello schermo nel registro..."}, > {STRING_LOCALESETTINGSUPDATE, > " Aggiornamento delle impostazioni di regionalizzazione..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/lt-LT.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/lt-LT.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1633,7 +1633,7 @@ > " Updating registry hives..."}, > {STRING_IMPORTFILE, > " Importing %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Updating display registry settings..."}, > {STRING_LOCALESETTINGSUPDATE, > " Updating locale settings..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/pl-PL.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/pl-PL.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1632,7 +1632,7 @@ > " Uaktualnianie..."}, > {STRING_IMPORTFILE, > " Importowanie %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Zmiana ustawieä ekranu w rejestrze..."}, > {STRING_LOCALESETTINGSUPDATE, > " Zmiana wersji j©zykowej..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/ru-RU.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/ru-RU.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1624,7 +1624,7 @@ > " ¡®¢«¥¨¥ ªãáâ®¢ à¥¥áâà ..."}, > {STRING_IMPORTFILE, > " ¬¯®àâ¨à®¢ ¨¥ %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ íªà ¢ à¥¥áâà¥..."}, > {STRING_LOCALESETTINGSUPDATE, > " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ «®ª «¨..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/sk-SK.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/sk-SK.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1631,7 +1631,7 @@ > " Aktualizujem polo§ky registrov..."}, > {STRING_IMPORTFILE, > " Importujem %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Aktualizujem nastavenia obrazovky v registrov..."}, //display > registry settings > {STRING_LOCALESETTINGSUPDATE, > " Aktualizujem miestne nastavenia..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/sv-SE.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/sv-SE.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1623,7 +1623,7 @@ > " Updating registry hives..."}, > {STRING_IMPORTFILE, > " Importing %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Updating display registry settings..."}, > {STRING_LOCALESETTINGSUPDATE, > " Updating locale settings..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/lang/uk-UA.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/lang/uk-UA.h [iso-8859-1] > (original) > +++ branches/matthias-i18n/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -1624,7 +1624,7 @@ > " Updating registry hives..."}, > {STRING_IMPORTFILE, > " Importing %S..."}, > - {STRING_DISPLAYETTINGSUPDATE, > + {STRING_DISPLAYSETTINGSUPDATE, > " Updating display registry settings..."}, > {STRING_LOCALESETTINGSUPDATE, > " Updating locale settings..."}, > > Modified: branches/matthias-i18n/base/setup/usetup/mui.h > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/base/setup/usetup… > ============================================================================== > --- branches/matthias-i18n/base/setup/usetup/mui.h [iso-8859-1] (original) > +++ branches/matthias-i18n/base/setup/usetup/mui.h [iso-8859-1] Thu Jun 26 > 11:53:26 2008 > @@ -101,7 +101,7 @@ > #define STRING_FREEMEM 19 > #define STRING_REGHIVEUPDATE 20 > #define STRING_IMPORTFILE 21 > -#define STRING_DISPLAYETTINGSUPDATE 22 > +#define STRING_DISPLAYSETTINGSUPDATE 22 > #define STRING_LOCALESETTINGSUPDATE 23 > #define STRING_KEYBOARDSETTINGSUPDATE 24 > #define STRING_CODEPAGEINFOUPDATE 25 > > Modified: branches/matthias-i18n/boot/bootdata/bootdata.rbuild > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/boot/bootdata/boo… > ============================================================================== > --- branches/matthias-i18n/boot/bootdata/bootdata.rbuild [iso-8859-1] > (original) > +++ branches/matthias-i18n/boot/bootdata/bootdata.rbuild [iso-8859-1] Thu > Jun 26 11:53:26 2008 > @@ -8,6 +8,7 @@ > <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile> > <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile> > <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile> > + <cdfile installbase="$(CDOUTPUT)">de_DE.inf</cdfile> > <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> > <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> > <directory name="bootcd"> > > Added: branches/matthias-i18n/boot/bootdata/de_DE.inf > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/boot/bootdata/de_… > ============================================================================== > --- branches/matthias-i18n/boot/bootdata/de_DE.inf (added) > +++ branches/matthias-i18n/boot/bootdata/de_DE.inf [iso-8859-1] Thu Jun 26 > 11:53:26 2008 > @@ -1,0 +1,88 @@ > +[Version] > +Signature="$ReactOS$ > + > +[AddReg] > + > +; Country Codes > + > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\1","Name",0x00000000,"Vereinigte Staten von Amerika" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\106","Name",0x00000000,"Britische Jungferninseln" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\107","Name",0x00000000,"Kanada" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\109","Name",0x00000000,"Dominica" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\110","Name",0x00000000,"Dominikanische Republik" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\20","Name",0x00000000,"Ägypten" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\268","Name",0x00000000,"Swasiland" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\27","Name",0x00000000,"Südafrika" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\30","Name",0x00000000,"Griechenland" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\31","Name",0x00000000,"Niederlande" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\32","Name",0x00000000,"Belgien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\33","Name",0x00000000,"Frankreich" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\34","Name",0x00000000,"Spanien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\351","Name",0x00000000,"Portugal" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\352","Name",0x00000000,"Luxemburg" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\353","Name",0x00000000,"Irland" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\354","Name",0x00000000,"Island" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\355","Name",0x00000000,"Albanien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\358","Name",0x00000000,"Finnland" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\359","Name",0x00000000,"Bulgarien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\36","Name",0x00000000,"Ungarn" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\370","Name",0x00000000,"Litauen" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\371","Name",0x00000000,"Lettland" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\372","Name",0x00000000,"Estland" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\373","Name",0x00000000,"Moldawien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\374","Name",0x00000000,"Armenien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\380","Name",0x00000000,"Ukraine" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\381","Name",0x00000000,"Jugoslavien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\385","Name",0x00000000,"Kroatien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\386","Name",0x00000000,"Slowenien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\387","Name",0x00000000,"Bosnien und Herzegowina" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\39","Name",0x00000000,"Italien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\40","Name",0x00000000,"Romänien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\41","Name",0x00000000,"Schweiz" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\420","Name",0x00000000,"Tschechische Republik" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\421","Name",0x00000000,"Slowakei" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\423","Name",0x00000000,"Liechtenstein" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\43","Name",0x00000000,"Österreich" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\44","Name",0x00000000,"Großbritannien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\46","Name",0x00000000,"Schweden" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\47","Name",0x00000000,"Norwegen" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\48","Name",0x00000000,"Polen" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\49","Name",0x00000000,"Deutschland" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\52","Name",0x00000000,"Mexico" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\54","Name",0x00000000,"Argentinien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\55","Name",0x00000000,"Brasilien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\56","Name",0x00000000,"Chile" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\57","Name",0x00000000,"Kolombien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\58","Name",0x00000000,"Venezuela" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\60","Name",0x00000000,"Malaysia" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\61","Name",0x00000000,"Australien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\62","Name",0x00000000,"Indonesien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\63","Name",0x00000000,"Philippinen" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\64","Name",0x00000000,"Neuseeland" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\7","Name",0x00000000,"Russland" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\705","Name",0x00000000,"Kasachstan" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\708","Name",0x00000000,"Tadschikistan" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\81","Name",0x00000000,"Japan" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\82","Name",0x00000000,"Republik Korea" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\850","Name",0x00000000,"Demokratische Volksrepublik Korea" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\86","Name",0x00000000,"China" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\886","Name",0x00000000,"Taiwan" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\90","Name",0x00000000,"Türkei" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\91","Name",0x00000000,"Indien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\93","Name",0x00000000,"Afghanistan" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\960","Name",0x00000000,"Malediven" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\964","Name",0x00000000,"Irak" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\966","Name",0x00000000,"Saudi Arabien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\971","Name",0x00000000,"Vereinigte Arabische Emirate" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\972","Name",0x00000000,"Israel" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\974","Name",0x00000000,"Katar" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\976","Name",0x00000000,"Mongolei" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\977","Name",0x00000000,"Nepal" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\98","Name",0x00000000,"Iran" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\993","Name",0x00000000,"Turkmenistan" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\994","Name",0x00000000,"Aserbaidschan" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\995","Name",0x00000000,"Georgien" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\996","Name",0x00000000,"Kirgistan" > +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country > List\998","Name",0x00000000,"Usbekistan" > + > +; EOF > > Propchange: branches/matthias-i18n/boot/bootdata/de_DE.inf > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: branches/matthias-i18n/boot/bootdata/txtsetup.sif > URL: > http://svn.reactos.org/svn/reactos/branches/matthias-i18n/boot/bootdata/txt… > ============================================================================== > --- branches/matthias-i18n/boot/bootdata/txtsetup.sif [iso-8859-1] > (original) > +++ branches/matthias-i18n/boot/bootdata/txtsetup.sif [iso-8859-1] Thu Jun > 26 11:53:26 2008 > @@ -397,4 +397,7 @@ > AddReg=hivesft.inf,AddReg > AddReg=hivesys.inf,AddReg > > +[HiveLocaleInfs.Install] > +AddReg=de_DE.inf,AddReg,00000407 > + > ; EOF > >

16 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [mpiulachs] 34106: - remove no longer required bootsect.mak

by Hervé Poussineau

Hi, mpiulachs(a)svn.reactos.org a écrit : > Author: mpiulachs > Date: Thu Jun 26 10:58:56 2008 > New Revision: 34106 > > URL: http://svn.reactos.org/svn/reactos?rev=34106&view=rev > Log: > - remove no longer required bootsect.mak > > Removed: > trunk/reactos/boot/freeldr/bootsect/bootsect.mak > Which rbuild file tells how to generate the files reactos/boot/freeldr/bootsect/fat.h and fat32.h? They are required by reactos/boot/freeldr/install/install.c. The inclusion of install/installfreeldr.rbuild has been removed in r34055. I don't know if it is an error or not. Hervé

16 years, 11 months

1
0
0 0

Grievance

by James Tabor

Grievance: Cease and Desist Request: Standard Resolution Procedure: 1) The Project Coordinator Should attempt to make decisions according to the consensus of the Project Members. Mr. Bragin is making procedural changes with out the full consensus of all Project Members. 2) The Repository Coordinator Should make decisions which are fair and reasonable, and preferably consistent with the consensus of the Project Members. Due to the unfilled Repository Coordinator position, Mr. Bragin has assumed full control of that position and making decisions with out the full consensus of all Project Members. 3) General rules: a) Violation of first rule: Project Coordinator issued change orders, Project Members began working on the changes. These changes are against the general consensus among the Project Members. Reference: http://www.reactos.org/archives/public/ros-dev/2008-June/010394.html b) Violation of second rule: Project Coordinator banned Project Member with out the ability to rejoin the Project at any time. c) Violation of third rule: Project Coordinator assumed full control of Repository Coordinator position and used that position to remove access to a Project Member. Adhering to: Standard Resolution Procedure: The procedure: The procedure begins when a draft General Resolution is announced on a public Project mailing list. Which no other rule can apply, I hereby request a Cease and Desist until this Grievance is heard by all Project Members. Project Members have a contractual agreement and must abide by it. PS: This is a very serious mater and not at all a joke. If this project has any merit, it needs to resolve these issues in the open.

16 years, 11 months

3
4
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 34051: Build host_wcsfuncs as a host static library, not a target static library Fixes build for all non-Win32 hosts

by Marc Piulachs

We have two different ways to do the same thing. Modules have a "host" attribute to indicate if the module has to be build by host compiler rather than target compiler but we also have the "hoststaticlibrary" module type , I don't know if "host" property is broken but someone with time should test/fix it as it's the more appropiate way. Marc, -------------------------------------------------- From: <cfinck(a)svn.reactos.org> Sent: Sunday, June 22, 2008 11:41 PM To: <ros-diffs(a)reactos.org> Subject: [ros-diffs] [cfinck] 34051: Build host_wcsfuncs as a host static library, not a target static library Fixes build for all non-Win32 hosts > Author: cfinck > Date: Sun Jun 22 16:41:25 2008 > New Revision: 34051 > > URL: http://svn.reactos.org/svn/reactos?rev=34051&view=rev > Log: > Build host_wcsfuncs as a host static library, not a target static library > Fixes build for all non-Win32 hosts > > Modified: > trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild > > Modified: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/lib/host/wcsfuncs/wcsfuncs… > ============================================================================== > --- trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild [iso-8859-1] > (original) > +++ trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild [iso-8859-1] Sun Jun > 22 16:41:25 2008 > @@ -1,6 +1,6 @@ > <?xml version="1.0"?> > <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> > -<module name="host_wcsfuncs" type="staticlibrary"> > +<module name="host_wcsfuncs" type="hoststaticlibrary"> > <include base="ReactOS">include</include> > <file>wcsfuncs.c</file> > </module> > >

16 years, 11 months

1
0
0 0

[ros-diffs] [fireball] 34047: - Extend SEH to cover writing result to output arguments. Noticed by Stefan Ginsberg.

by Timo Kreuzer

NtOpenKey ObOpenObjectByName TempBuffer = ExAllocatePoolWithTag(..) Status = ObpCaptureObjectCreateInformation(ObjectAttributes,...) -> crash -> SEH / return to NtOpenKey ... ExFreePool(TempBuffer); return ... Author: fireball Date: Sun Jun 22 11:24:15 2008 New Revision: 34047 URL: http://svn.reactos.org/svn/reactos?rev=34047&view=rev <http://svn.reactos.org/svn/reactos?rev=34047&view=rev> Log: - Extend SEH to cover writing result to output arguments. Noticed by Stefan Ginsberg. Modified: trunk/reactos/ntoskrnl/config/ntapi.c

16 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [fireball] 34047: - Extend SEH to cover writing result to output arguments. Noticed by Stefan Ginsberg.

by Alex Ionescu

Do you even realize the consequences of running the entire Object Manager code paths, the parse routine, and the other ~2500 lines of code associated with these APIs under SEH? I'd guess not. On 22-Jun-08, at 9:24 AM, fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Sun Jun 22 11:24:15 2008 > New Revision: 34047 > > URL: http://svn.reactos.org/svn/reactos?rev=34047&view=rev > Log: > - Extend SEH to cover writing result to output arguments. Noticed by > Stefan Ginsberg. > > Modified: > trunk/reactos/ntoskrnl/config/ntapi.c > > Modified: trunk/reactos/ntoskrnl/config/ntapi.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sun Jun 22 > 11:24:15 2008 > @@ -63,6 +63,23 @@ > /* Save the class directly */ > if (Class) ParseContext.Class = *Class; > } > + > + /* Setup the parse context */ > + ParseContext.CreateOperation = TRUE; > + ParseContext.CreateOptions = CreateOptions; > + > + /* Do the create */ > + Status = ObOpenObjectByName(ObjectAttributes, > + CmpKeyObjectType, > + PreviousMode, > + NULL, > + DesiredAccess, > + &ParseContext, > + &Handle); > + if (NT_SUCCESS(Status)) *KeyHandle = Handle; > + > + /* Return data to user */ > + if (Disposition) *Disposition = ParseContext.Disposition; > } > _SEH_HANDLE > { > @@ -70,24 +87,8 @@ > Status = _SEH_GetExceptionCode(); > } > _SEH_END; > - if (!NT_SUCCESS(Status)) return Status; > - > - /* Setup the parse context */ > - ParseContext.CreateOperation = TRUE; > - ParseContext.CreateOptions = CreateOptions; > - > - /* Do the create */ > - Status = ObOpenObjectByName(ObjectAttributes, > - CmpKeyObjectType, > - PreviousMode, > - NULL, > - DesiredAccess, > - &ParseContext, > - &Handle); > - if (NT_SUCCESS(Status)) *KeyHandle = Handle; > - > - /* Return data to user */ > - if (Disposition) *Disposition = ParseContext.Disposition; > + > + /* Return status */ > return Status; > } > > @@ -109,14 +110,24 @@ > { > /* Check for user-mode caller */ > if (PreviousMode == UserMode) > - { > + { > /* Probe the key handle */ > ProbeForWriteHandle(KeyHandle); > *KeyHandle = NULL; > - > + > /* Probe object attributes */ > ProbeForRead(ObjectAttributes, > sizeof(OBJECT_ATTRIBUTES), 4); > } > + > + /* Just let the object manager handle this */ > + Status = ObOpenObjectByName(ObjectAttributes, > + CmpKeyObjectType, > + ExGetPreviousMode(), > + NULL, > + DesiredAccess, > + &ParseContext, > + &Handle); > + if (NT_SUCCESS(Status)) *KeyHandle = Handle; > } > _SEH_HANDLE > { > @@ -124,18 +135,7 @@ > Status = _SEH_GetExceptionCode(); > } > _SEH_END; > - if (!NT_SUCCESS(Status)) return Status; > - > - /* Just let the object manager handle this */ > - Status = ObOpenObjectByName(ObjectAttributes, > - CmpKeyObjectType, > - ExGetPreviousMode(), > - NULL, > - DesiredAccess, > - &ParseContext, > - &Handle); > - if (NT_SUCCESS(Status)) *KeyHandle = Handle; > - > + > /* Return status */ > return Status; > } > Best regards, Alex Ionescu

16 years, 11 months

1
0
0 0

Re: [ros-dev] Ros-dev Digest, Vol 46, Issue 23

by Olaf Siejka

@Jimtabor: do you have a better candidate for ROS project coordinator post than Fireball? Not that i see many likely candidates. For some time i prefered to stay silent, not to take part in this outcry... But this forced me to do otherwise: > MY final word: >I deleted all code I have been working on so do not ask for it, This >is final word from me and bye from my part from this project you have >great thanks to fireball why I quitting. Great... i thought you were older and a bit more mature. This is not better than a 13y old boy, crying, offended by the whole world, wanting to avenge himself. Childish, childish, childish... >One thing more do not forget that steven is starting paying some of the devs >in ReactOS , he and fireball are trying to go Commercial so they trying >shutdown ReactOS and make it into project codename unros. This info is not >public and only few devs known of it, and of cures he will deny this. One more thing, it is a secret, that Magnus Olsen has been bought off by Microsoft, to leave ReactOS and, in the process to stirr and agitate ROS team. He has been already paid a hefty sum in advance. This info is not public and only handfull of people know it. Magnus will, of course, deny all of this. Seriously, in my country, we have a saying: "If God wishes to punish someone, he starts with stripping one of his brain". Nuff said...

16 years, 12 months

3
2
0 0

when will I return Magnus Olsen aka GreatLord

by Magnus Olsen

Hi I am not returning anytime soon to reactos until everthing has been restored by fireball. He has removed my commit access to reactos for the reason he dislikes my spelling and code style. He demands every thing I code, must be approve by him. So I am not coming back until this has all changed. With full restored commit access.

16 years, 12 months

11
15
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 33986: - Fork powrprof.dll - Replace .spec with .def - Implement EnumPwrSchemes - Implement GetActivePwrScheme - Implement DeletePwrScheme

by gedmurphy

Why have you forked this? -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 16 June 2008 07:00 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 33986: - Fork powrprof.dll - Replace .spec with .def - Implement EnumPwrSchemes - Implement GetActivePwrScheme - Implement DeletePwrScheme Author: dchapyshev Date: Mon Jun 16 01:00:22 2008 New Revision: 33986 URL: http://svn.reactos.org/svn/reactos?rev=33986&view=rev Log: - Fork powrprof.dll - Replace .spec with .def - Implement EnumPwrSchemes - Implement GetActivePwrScheme - Implement DeletePwrScheme Added: trunk/reactos/dll/win32/powrprof/powrprof.def (with props) trunk/reactos/dll/win32/powrprof/powrprof.rc (with props) Removed: trunk/reactos/dll/win32/powrprof/powrprof.spec trunk/reactos/dll/win32/powrprof/powrprof_ros.diff Modified: trunk/reactos/dll/win32/powrprof/powrprof.c trunk/reactos/dll/win32/powrprof/powrprof.rbuild Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Mon Jun 16 01:00:22 2008 @@ -1,5 +1,6 @@ /* * Copyright (C) 2005 Benjamin Cutler + * Copyright (C) 2008 Dmitry Chapyshev * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,335 +20,563 @@ #include <stdarg.h> -#include "ntstatus.h" +#include <ntstatus.h> #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winreg.h" -#include "winternl.h" -#include "powrprof.h" +#include <windows.h> +#include <winternl.h> +#include <powrprof.h> +#include <wchar.h> +#include <stdio.h> + #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(powrprof); -/* Notes to implementors: - * #1: The native implementation of these functions attempted to read in - * registry entries that I was unable to locate on any of the Windows - * machines I checked, but I only had desktops available, so maybe - * laptop users will have better luck. They return FNF errors because - * that's what the native DLL was returning during my tests. - * #2: These functions call NtPowerInformation but I don't know what they - * do with the results, and NtPowerInformation doesn't do much in WINE yet - * anyway. - * #3: Since I can't get several other functions working (see note #1), - * implementing these functions is going to have to wait until somebody can - * cobble together some sane test input. */ - -static const WCHAR szPowerCfgSubKey[] = { 'S', 'o', 'f', 't', 'w', 'a', 'r', 'e', - '\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', - 'n', 'd', 'o', 'w', 's', '\\', 'C', 'u', 'r', 'r', 'e', 'n', 't', - 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'C', 'o', 'n', 't', 'r', - 'o', 'l', 's', ' ', 'F', 'o', 'l', 'd', 'e', 'r', '\\', 'P', 'o', - 'w', 'e', 'r', 'C', 'f', 'g', 0 }; -static const WCHAR szSemaphoreName[] = { 'P', 'o', 'w', 'e', 'r', 'P', 'r', 'o', - 'f', 'i', 'l', 'e', 'R', 'e', 'g', 'i', 's', 't', 'r', 'y', 'S', - 'e', 'm', 'a', 'p', 'h', 'o', 'r', 'e', 0 }; -static const WCHAR szDiskMax[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'a', 'x', 0 }; -static const WCHAR szDiskMin[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'i', 'n', 0 }; -static const WCHAR szLastID[] = { 'L', 'a', 's', 't', 'I', 'D', 0 }; -static HANDLE PPRegSemaphore = NULL; - -NTSTATUS WINAPI CallNtPowerInformation( - POWER_INFORMATION_LEVEL InformationLevel, - PVOID lpInputBuffer, ULONG nInputBufferSize, - PVOID lpOutputBuffer, ULONG nOutputBufferSize) -{ - return NtPowerInformation(InformationLevel, lpInputBuffer, - nInputBufferSize, lpOutputBuffer, nOutputBufferSize); -} - -BOOLEAN WINAPI CanUserWritePwrScheme(VOID) -{ - HKEY hKey = NULL; - LONG r; - BOOLEAN bSuccess = TRUE; - - TRACE("()\n"); - - r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); - - if (r != ERROR_SUCCESS) { - TRACE("RegOpenKeyEx failed: %d\n", r); - bSuccess = FALSE; - } - - SetLastError(r); - RegCloseKey(hKey); - return bSuccess; -} - -BOOLEAN WINAPI DeletePwrScheme(UINT uiIndex) -{ - /* FIXME: See note #1 */ - FIXME("(%d) stub!\n", uiIndex); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; -} - -BOOLEAN WINAPI EnumPwrSchemes(PWRSCHEMESENUMPROC lpfnPwrSchemesEnumProc, - LPARAM lParam) -{ - /* FIXME: See note #1 */ - FIXME("(%p, %ld) stub!\n", lpfnPwrSchemesEnumProc, lParam); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; -} - -BOOLEAN WINAPI GetActivePwrScheme(PUINT puiID) -{ - /* FIXME: See note #1 */ - FIXME("(%p) stub!\n", puiID); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; -} - -BOOLEAN WINAPI GetCurrentPowerPolicies( - PGLOBAL_POWER_POLICY pGlobalPowerPolicy, - PPOWER_POLICY pPowerPolicy) -{ - /* FIXME: See note #2 */ - SYSTEM_POWER_POLICY ACPower, DCPower; - - FIXME("(%p, %p) stub!\n", pGlobalPowerPolicy, pPowerPolicy); - - NtPowerInformation(SystemPowerPolicyAc, 0, 0, &ACPower, sizeof(SYSTEM_POWER_POLICY)); - NtPowerInformation(SystemPowerPolicyDc, 0, 0, &DCPower, sizeof(SYSTEM_POWER_POLICY)); - - return FALSE; -} - -BOOLEAN WINAPI GetPwrCapabilities( - PSYSTEM_POWER_CAPABILITIES lpSystemPowerCapabilities) -{ - NTSTATUS r; - - TRACE("(%p)\n", lpSystemPowerCapabilities); - - r = NtPowerInformation(SystemPowerCapabilities, 0, 0, lpSystemPowerCapabilities, sizeof(SYSTEM_POWER_CAPABILITIES)); - - SetLastError(RtlNtStatusToDosError(r)); - - return r == STATUS_SUCCESS; -} - -BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) -{ - HKEY hKey; - BYTE lpValue[40]; - LONG r; - DWORD cbValue = sizeof(lpValue); - - TRACE("(%p, %p)\n", RangeMax, RangeMin); - - if (RangeMax == NULL || RangeMin == NULL) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - SetLastError(ERROR_SUCCESS); - - WaitForSingleObject(PPRegSemaphore, INFINITE); - - r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ, &hKey); - if (r != ERROR_SUCCESS) { - TRACE("RegOpenKeyEx failed: %d\n", r); - TRACE("Using defaults: 3600, 3\n"); - *RangeMax = 3600; - *RangeMin = 3; - ReleaseSemaphore(PPRegSemaphore, 1, NULL); - return TRUE; - } - - r = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue); - if (r != ERROR_SUCCESS) { - TRACE("Couldn't open DiskSpinDownMax: %d\n", r); - TRACE("Using default: 3600\n"); - *RangeMax = 3600; - } else { - *RangeMax = atoiW((LPCWSTR)lpValue); - } - - cbValue = sizeof(lpValue); - - r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue); - if (r != ERROR_SUCCESS) { - TRACE("Couldn't open DiskSpinDownMin: %d\n", r); - TRACE("Using default: 3\n"); - *RangeMin = 3; - } else { - *RangeMin = atoiW((LPCWSTR)lpValue); - } - - RegCloseKey(hKey); - - ReleaseSemaphore(PPRegSemaphore, 1, NULL); - - return TRUE; -} - -BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY p) -{ - FIXME("( %p) stub!\n", p); - return FALSE; -} - -BOOLEAN WINAPI IsPwrHibernateAllowed(VOID) -{ - /* FIXME: See note #2 */ - SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); - NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; -} - -BOOLEAN WINAPI IsPwrShutdownAllowed(VOID) -{ - /* FIXME: See note #2 */ - SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); - NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; -} - -BOOLEAN WINAPI IsPwrSuspendAllowed(VOID) -{ - /* FIXME: See note #2 */ - SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); - NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; -} - -BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy) -{ - /* FIXME: See note #1 */ - FIXME("(%p) stub!\n", pGlobalPowerPolicy); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; -} - -BOOLEAN WINAPI ReadProcessorPwrScheme(UINT uiID, - PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) -{ - /* FIXME: See note #1 */ - FIXME("(%d, %p) stub!\n", uiID, pMachineProcessorPowerPolicy); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; -} - -BOOLEAN WINAPI ReadPwrScheme(UINT uiID, - PPOWER_POLICY pPowerPolicy) -{ - /* FIXME: See note #1 */ - FIXME("(%d, %p) stub!\n", uiID, pPowerPolicy); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; -} - -BOOLEAN WINAPI SetActivePwrScheme(UINT uiID, - PGLOBAL_POWER_POLICY lpGlobalPowerPolicy, - PPOWER_POLICY lpPowerPolicy) -{ - /* FIXME: See note #1 */ - FIXME("(%d, %p, %p) stub!\n", uiID, lpGlobalPowerPolicy, lpPowerPolicy); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; -} - -BOOLEAN WINAPI SetSuspendState(BOOLEAN Hibernate, BOOLEAN ForceCritical, - BOOLEAN DisableWakeEvent) -{ - /* FIXME: I have NO idea how you're supposed to call NtInitiatePowerAction - * here, because it's not a documented function that I can find */ - FIXME("(%d, %d, %d) stub!\n", Hibernate, ForceCritical, DisableWakeEvent); - return TRUE; -} - -BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy) -{ - /* FIXME: See note #3 */ - FIXME("(%p) stub!\n", pGlobalPowerPolicy); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -BOOLEAN WINAPI WriteProcessorPwrScheme(UINT ID, - PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) -{ - /* FIXME: See note #3 */ - FIXME("(%d, %p) stub!\n", ID, pMachineProcessorPowerPolicy); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -BOOLEAN WINAPI WritePwrScheme(PUINT puiID, LPWSTR lpszName, LPWSTR lpszDescription, - PPOWER_POLICY pPowerPolicy) -{ - /* FIXME: See note #3 */ - FIXME("(%p, %s, %s, %p) stub!\n", puiID, debugstr_w(lpszName), debugstr_w(lpszDescription), pPowerPolicy); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -BOOLEAN WINAPI ValidatePowerPolicies(PGLOBAL_POWER_POLICY pGPP, PPOWER_POLICY pPP) -{ - /* FIXME: See note #3 */ - FIXME("(%p, %p) stub!\n", pGPP, pPP); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return TRUE; - -} - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - FIXME("(%p, %d, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved); - - switch(fdwReason) { - case DLL_PROCESS_ATTACH: { - - HKEY hKey; - LONG r; - - DisableThreadLibraryCalls(hinstDLL); - - r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); - - if (r != ERROR_SUCCESS) { - TRACE("Couldn't open registry key HKLM\\%s, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); - } else { - BYTE lpValue[40]; - DWORD cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); - if (r != ERROR_SUCCESS) { - TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); + +static const WCHAR szPowerCfgSubKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg"; +static const WCHAR szSemaphoreName[] = L"PowerProfileRegistrySemaphore"; +static const WCHAR szDiskMax[] = L"DiskSpindownMax"; +static const WCHAR szDiskMin[] = L"DiskSpindownMin"; +static const WCHAR szLastID[] = L"LastID"; + +HANDLE PPRegSemaphore = NULL; + +NTSTATUS WINAPI +CallNtPowerInformation(POWER_INFORMATION_LEVEL InformationLevel, + PVOID lpInputBuffer, + ULONG nInputBufferSize, + PVOID lpOutputBuffer, + ULONG nOutputBufferSize) +{ + return NtPowerInformation(InformationLevel, + lpInputBuffer, + nInputBufferSize, + lpOutputBuffer, + nOutputBufferSize); +} + + +BOOLEAN WINAPI +CanUserWritePwrScheme(VOID) +{ + HKEY hKey = NULL; + LONG Ret; + BOOLEAN bSuccess = TRUE; + + TRACE("()\n"); + + Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); + + if (Ret != ERROR_SUCCESS) + { + TRACE("RegOpenKeyEx failed: %d\n", Ret); + bSuccess = FALSE; + } + + SetLastError(Ret); + RegCloseKey(hKey); + return bSuccess; +} + + +BOOLEAN WINAPI +DeletePwrScheme(UINT uiIndex) +{ + WCHAR Buf[MAX_PATH]; + UINT Current; + LONG Err; + + swprintf(Buf, L"Control Panel\\PowerCfg\\PowerPolicies\\%u", uiIndex); + + if (GetActivePwrScheme(&Current)) + { + if (Current == uiIndex) + { + SetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + else + { + Err = RegDeleteKey(HKEY_CURRENT_USER, (LPCTSTR) Buf); + if (Err != ERROR_SUCCESS) + { + TRACE("RegDeleteKey failed: %d\n", Err); + SetLastError(Err); + return FALSE; } + else + { + SetLastError(ERROR_SUCCESS); + return TRUE; + } + } + } + + return FALSE; +} + + +static BOOLEAN +POWRPROF_GetUserPowerPolicy(HKEY hKey, LPWSTR szNum, + USER_POWER_POLICY userPwrPolicy, + DWORD *dwName, LPWSTR szName, + DWORD *dwDesc, LPWSTR szDesc) +{ + HKEY hSubKey; + DWORD dwSize; + LONG Err; + + Err = RegOpenKeyW(hKey, szNum, &hSubKey); + if (Err != ERROR_SUCCESS) + { + ERR("RegOpenKeyW failed: %d\n", Err); + SetLastError(Err); + return FALSE; + } + + *dwName = MAX_PATH * sizeof(WCHAR); + Err = RegQueryValueExW(hSubKey, L"Name", NULL, NULL, (LPBYTE)szName, dwName); + if (Err != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed: %d\n", Err); + SetLastError(Err); + return FALSE; + } + + *dwDesc = MAX_PATH * sizeof(WCHAR); + Err = RegQueryValueExW(hSubKey, L"Description", NULL, NULL, (LPBYTE)szDesc, dwDesc); + if (Err != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed: %d\n", Err); + SetLastError(Err); + return FALSE; + } + + dwSize = sizeof(USER_POWER_POLICY); + Err = RegQueryValueExW(hSubKey, L"Policies", NULL, NULL, (LPBYTE)&userPwrPolicy, &dwSize); + if (Err != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed: %d\n", Err); + SetLastError(Err); + return FALSE; + } + + return TRUE; +} + +static BOOLEAN +POWRPROF_GetMachinePowerPolicy(LPWSTR szNum, MACHINE_POWER_POLICY machinePwrPolicy) +{ + HKEY hKey; + LONG Err; + WCHAR szPath[MAX_PATH]; + DWORD dwSize; + + swprintf(szPath, L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\PowerPolicies\\%s", szNum); + + Err = RegOpenKeyW(HKEY_LOCAL_MACHINE, szPath, &hKey); + if (Err != ERROR_SUCCESS) + { + ERR("RegOpenKeyW failed: %d\n", Err); + SetLastError(Err); + return FALSE; + } + + dwSize = sizeof(MACHINE_POWER_POLICY); + Err = RegQueryValueExW(hKey, L"Policies", NULL, NULL, (LPBYTE)&machinePwrPolicy, &dwSize); + if (Err != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed: %d\n", Err); + SetLastError(Err); + return FALSE; + } + + return TRUE; +} + +BOOLEAN WINAPI +EnumPwrSchemes(PWRSCHEMESENUMPROC lpfnPwrSchemesEnumProc, + LPARAM lParam) +{ + HKEY hKey; + LONG Err; + DWORD dwSize, dwNameSize, dwDescSize, dwIndex = 0; + WCHAR szNum[3 + 1], szName[MAX_PATH], szDesc[MAX_PATH]; + PPOWER_POLICY pPwrPolicy; + USER_POWER_POLICY userPwrPolicy; + MACHINE_POWER_POLICY machinePwrPolicy; + + if (!lpfnPwrSchemesEnumProc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Err = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\PowerCfg\\PowerPolicies", &hKey); + if (Err != ERROR_SUCCESS) + { + ERR("RegOpenKeyW failed: %d\n", Err); + SetLastError(Err); + return FALSE; + } + + ReleaseSemaphore(PPRegSemaphore, 1, NULL); + + dwSize = sizeof(szNum) / sizeof(WCHAR); + + while (RegEnumKeyExW(hKey, dwIndex, szNum, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + if (!POWRPROF_GetUserPowerPolicy(hKey, szNum, userPwrPolicy, + &dwNameSize, szName, + &dwDescSize, szDesc)) + { RegCloseKey(hKey); - } - - PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName); - if (PPRegSemaphore == NULL) { - ERR("Couldn't create Semaphore: %d\n", GetLastError()); + ReleaseSemaphore(PPRegSemaphore, 1, NULL); return FALSE; - } - break; - } - case DLL_PROCESS_DETACH: - CloseHandle(PPRegSemaphore); - break; - } - return TRUE; -} + } + + if (!POWRPROF_GetMachinePowerPolicy(szNum, machinePwrPolicy)) + { + RegCloseKey(hKey); + ReleaseSemaphore(PPRegSemaphore, 1, NULL); + return FALSE; + } + + ZeroMemory(&pPwrPolicy, sizeof(PPOWER_POLICY)); + pPwrPolicy->user = userPwrPolicy; + pPwrPolicy->mach = machinePwrPolicy; + + if (!lpfnPwrSchemesEnumProc(_wtoi(szNum), dwNameSize, szName, dwDescSize, szDesc, pPwrPolicy, lParam)) + break; + + dwSize = sizeof(szNum) / sizeof(WCHAR); + dwIndex++; + } + + RegCloseKey(hKey); + ReleaseSemaphore(PPRegSemaphore, 1, NULL); + SetLastError(ERROR_SUCCESS); + + return TRUE; +} + + +BOOLEAN WINAPI +GetActivePwrScheme(PUINT puiID) +{ + HKEY hKey; + WCHAR szBuf[MAX_PATH]; + DWORD dwSize; + LONG Err; + + TRACE("GetActivePwrScheme(%u)", puiID); + + Err = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\PowerCfg", &hKey); + if (Err != ERROR_SUCCESS) + { + ERR("RegOpenKey failed: %d\n", Err); + SetLastError(Err); + return FALSE; + } + + dwSize = MAX_PATH; + Err = RegQueryValueExW(hKey, L"CurrentPowerPolicy", + NULL, NULL, + (LPBYTE)&szBuf, &dwSize); + if (Err != ERROR_SUCCESS) + { + ERR("RegQueryValueEx failed: %d\n", Err); + RegCloseKey(hKey); + SetLastError(Err); + return FALSE; + } + + *puiID = _wtoi(szBuf); + + RegCloseKey(hKey); + SetLastError(ERROR_SUCCESS); + return TRUE; +} + + +BOOLEAN WINAPI +GetCurrentPowerPolicies(PGLOBAL_POWER_POLICY pGlobalPowerPolicy, + PPOWER_POLICY pPowerPolicy) +{ + SYSTEM_POWER_POLICY ACPower, DCPower; + + FIXME("(%p, %p) stub!\n", pGlobalPowerPolicy, pPowerPolicy); + + NtPowerInformation(SystemPowerPolicyAc, 0, 0, &ACPower, sizeof(SYSTEM_POWER_POLICY)); + NtPowerInformation(SystemPowerPolicyDc, 0, 0, &DCPower, sizeof(SYSTEM_POWER_POLICY)); + + return FALSE; +} + + +BOOLEAN WINAPI +GetPwrCapabilities(PSYSTEM_POWER_CAPABILITIES lpSystemPowerCapabilities) +{ + NTSTATUS Ret; + + TRACE("(%p)\n", lpSystemPowerCapabilities); + + if (!lpSystemPowerCapabilities) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Ret = NtPowerInformation(SystemPowerCapabilities, 0, 0, lpSystemPowerCapabilities, sizeof(SYSTEM_POWER_CAPABILITIES)); + + SetLastError(RtlNtStatusToDosError(Ret)); + + if (Ret == STATUS_SUCCESS) + return TRUE; + else + return FALSE; +} + + +BOOLEAN WINAPI +GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) +{ + HKEY hKey; + BYTE lpValue[40]; + LONG Ret; + DWORD cbValue = sizeof(lpValue); + + TRACE("(%p, %p)\n", RangeMax, RangeMin); + + if (RangeMax == NULL || RangeMin == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SetLastError(ERROR_SUCCESS); + + WaitForSingleObject(PPRegSemaphore, INFINITE); + + Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ, &hKey); + if (Ret != ERROR_SUCCESS) + { + TRACE("RegOpenKeyEx failed: %d\n", Ret); + TRACE("Using defaults: 3600, 3\n"); + *RangeMax = 3600; + *RangeMin = 3; + ReleaseSemaphore(PPRegSemaphore, 1, NULL); + return TRUE; + } + + Ret = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue); + if (Ret != ERROR_SUCCESS) + { + TRACE("Couldn't open DiskSpinDownMax: %d\n", Ret); + TRACE("Using default: 3600\n"); + *RangeMax = 3600; + } + else + { + *RangeMax = _wtoi((LPCWSTR)lpValue); + } + + cbValue = sizeof(lpValue); + + Ret = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue); + if (Ret != ERROR_SUCCESS) + { + TRACE("Couldn't open DiskSpinDownMin: %d\n", Ret); + TRACE("Using default: 3\n"); + *RangeMin = 3; + } + else + { + *RangeMin = _wtoi((LPCWSTR)lpValue); + } + + RegCloseKey(hKey); + + ReleaseSemaphore(PPRegSemaphore, 1, NULL); + SetLastError(ERROR_SUCCESS); + + return TRUE; +} + + +BOOLEAN WINAPI +IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY p) +{ + FIXME("( %p) stub!\n", p); + return FALSE; +} + + +BOOLEAN WINAPI +IsPwrHibernateAllowed(VOID) +{ + SYSTEM_POWER_CAPABILITIES PowerCaps; + FIXME("() stub!\n"); + NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + return FALSE; +} + + +BOOLEAN WINAPI +IsPwrShutdownAllowed(VOID) +{ + SYSTEM_POWER_CAPABILITIES PowerCaps; + FIXME("() stub!\n"); + NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + return FALSE; +} + + +BOOLEAN WINAPI +IsPwrSuspendAllowed(VOID) +{ + SYSTEM_POWER_CAPABILITIES PowerCaps; + FIXME("() stub!\n"); + NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + return FALSE; +} + + +BOOLEAN WINAPI +ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy) +{ + FIXME("(%p) stub!\n", pGlobalPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + + +BOOLEAN WINAPI +ReadProcessorPwrScheme(UINT uiID, + PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) +{ + FIXME("(%d, %p) stub!\n", uiID, pMachineProcessorPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + + +BOOLEAN WINAPI +ReadPwrScheme(UINT uiID, + PPOWER_POLICY pPowerPolicy) +{ + FIXME("(%d, %p) stub!\n", uiID, pPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + + +BOOLEAN WINAPI +SetActivePwrScheme(UINT uiID, + PGLOBAL_POWER_POLICY lpGlobalPowerPolicy, + PPOWER_POLICY lpPowerPolicy) +{ + FIXME("(%d, %p, %p) stub!\n", uiID, lpGlobalPowerPolicy, lpPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + + +BOOLEAN WINAPI +SetSuspendState(BOOLEAN Hibernate, + BOOLEAN ForceCritical, + BOOLEAN DisableWakeEvent) +{ + FIXME("(%d, %d, %d) stub!\n", Hibernate, ForceCritical, DisableWakeEvent); + return TRUE; +} + + +BOOLEAN WINAPI +WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy) +{ + FIXME("(%p) stub!\n", pGlobalPowerPolicy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +BOOLEAN WINAPI +WriteProcessorPwrScheme(UINT ID, + PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) +{ + FIXME("(%d, %p) stub!\n", ID, pMachineProcessorPowerPolicy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +BOOLEAN WINAPI +WritePwrScheme(PUINT puiID, + LPWSTR lpszName, + LPWSTR lpszDescription, + PPOWER_POLICY pPowerPolicy) +{ + FIXME("(%p, %s, %s, %p) stub!\n", puiID, debugstr_w(lpszName), debugstr_w(lpszDescription), pPowerPolicy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +BOOLEAN WINAPI +ValidatePowerPolicies(PGLOBAL_POWER_POLICY pGPP, PPOWER_POLICY pPP) +{ + FIXME("(%p, %p) stub!\n", pGPP, pPP); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return TRUE; +} + + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + FIXME("(%p, %d, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + { + + HKEY hKey; + LONG r; + + DisableThreadLibraryCalls(hinstDLL); + + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); + + if (r != ERROR_SUCCESS) + { + TRACE("Couldn't open registry key HKLM\\%s, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); + } + else + { + BYTE lpValue[40]; + DWORD cbValue = sizeof(lpValue); + r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); + if (r != ERROR_SUCCESS) + { + TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); + } + RegCloseKey(hKey); + } + + PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName); + if (PPRegSemaphore == NULL) + { + ERR("Couldn't create Semaphore: %d\n", GetLastError()); + return FALSE; + } + break; + } + case DLL_PROCESS_DETACH: + CloseHandle(PPRegSemaphore); + break; + } + return TRUE; +} Added: trunk/reactos/dll/win32/powrprof/powrprof.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.def (added) +++ trunk/reactos/dll/win32/powrprof/powrprof.def [iso-8859-1] Mon Jun 16 01:00:22 2008 @@ -1,0 +1,23 @@ +LIBRARY powrprof.dll +EXPORTS +CallNtPowerInformation@20 +CanUserWritePwrScheme@0 +DeletePwrScheme@4 +EnumPwrSchemes@8 +GetActivePwrScheme@4 +GetCurrentPowerPolicies@8 +GetPwrCapabilities@4 +GetPwrDiskSpindownRange +IsAdminOverrideActive +IsPwrHibernateAllowed +IsPwrShutdownAllowed +IsPwrSuspendAllowed +ReadGlobalPwrPolicy@4 +ReadProcessorPwrScheme +ReadPwrScheme@8 +SetActivePwrScheme@12 +SetSuspendState +WriteGlobalPwrPolicy@4 +WriteProcessorPwrScheme +WritePwrScheme +ValidatePowerPolicies@8 Propchange: trunk/reactos/dll/win32/powrprof/powrprof.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/powrprof/powrprof.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.rbuild [iso-8859-1] Mon Jun 16 01:00:22 2008 @@ -1,16 +1,16 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="powrprof" type="win32dll" baseaddress="${BASEADDRESS_POWRPROF}" installbase="system32" installname="powrprof.dll" allowwarnings="true"> - <importlibrary definition="powrprof.spec.def" /> +<module name="powrprof" type="win32dll" baseaddress="${BASEADDRESS_POWRPROF}" installbase="system32" installname="powrprof.dll" unicode="yes"> + <importlibrary definition="powrprof.def" /> <include base="powrprof">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>advapi32</library> <library>kernel32</library> <library>ntdll</library> + <library>user32</library> + <library>comctl32</library> <file>powrprof.c</file> - <file>powrprof.spec</file> + <file>powrprof.rc</file> </module> Added: trunk/reactos/dll/win32/powrprof/powrprof.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.rc (added) +++ trunk/reactos/dll/win32/powrprof/powrprof.rc [iso-8859-1] Mon Jun 16 01:00:22 2008 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Power Profile Helper DLL\0" +#define REACTOS_STR_INTERNAL_NAME "powrprof\0" +#define REACTOS_STR_ORIGINAL_FILENAME "powrprof.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/powrprof/powrprof.rc ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/powrprof/powrprof.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.spec (removed) @@ -1,21 +1,0 @@ -@ stdcall CallNtPowerInformation (long ptr long ptr long) -@ stdcall CanUserWritePwrScheme () -@ stdcall DeletePwrScheme (long) -@ stdcall EnumPwrSchemes (ptr long) -@ stdcall GetActivePwrScheme (ptr) -@ stdcall GetCurrentPowerPolicies (ptr ptr) -@ stdcall GetPwrCapabilities (ptr) -@ stdcall GetPwrDiskSpindownRange (ptr ptr) -@ stdcall IsAdminOverrideActive (ptr) -@ stdcall IsPwrHibernateAllowed () -@ stdcall IsPwrShutdownAllowed () -@ stdcall IsPwrSuspendAllowed () -@ stdcall ReadGlobalPwrPolicy (ptr) -@ stdcall ReadProcessorPwrScheme (long ptr) -@ stdcall ReadPwrScheme (long ptr) -@ stdcall SetActivePwrScheme (long ptr ptr) -@ stdcall SetSuspendState (long long long) -@ stdcall WriteGlobalPwrPolicy (ptr) -@ stdcall WriteProcessorPwrScheme (long ptr) -@ stdcall WritePwrScheme (ptr str str ptr) -@ stdcall ValidatePowerPolicies (ptr ptr) Removed: trunk/reactos/dll/win32/powrprof/powrprof_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof_ros.diff (removed) @@ -1,30 +1,0 @@ -Index: powrprof.c -=================================================================== ---- powrprof.c (revision 26779) -+++ powrprof.c (working copy) -@@ -303,6 +303,15 @@ - return FALSE; - } - -+BOOLEAN WINAPI ValidatePowerPolicies(PGLOBAL_POWER_POLICY pGPP, PPOWER_POLICY pPP) -+{ -+ /* FIXME: See note #3 */ -+ FIXME("(%p, %p) stub!\n", pGPP, pPP); -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return TRUE; -+ -+} -+ - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) - { - FIXME("(%p, %d, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved); -Index: powrprof.spec -=================================================================== ---- powrprof.spec (revision 26779) -+++ powrprof.spec (working copy) -@@ -18,3 +18,4 @@ - @ stdcall WriteGlobalPwrPolicy (ptr) - @ stdcall WriteProcessorPwrScheme (long ptr) - @ stdcall WritePwrScheme (ptr str str ptr) -+@ stdcall ValidatePowerPolicies (ptr ptr) -\ No newline at end of file

17 years

2
1
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 33985: Use a ClipRegion when collapsing, so that the TreeView works correctly. This patch has already been submitted to Wine, but as they don't care currently, I applied it manually here and updated "comctl32_ros.diff" accord

by Steven Edwards

On Sun, Jun 15, 2008 at 12:05 PM, <cfinck(a)svn.reactos.org> wrote: > This patch has already been submitted to Wine, but as they don't care currently, I applied it manually here and updated "comctl32_ros.diff" accordingly. You might resend after next week. 1.0 should be tagged Monday or sometime shortly there after and so Alexandre should start ignoring patches as normal rather than blaming it on the late hour of the code freeze. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [jimtabor] 33965: Patch by carlo bramix at libero dot it: Bug 3336 statusbar in the wrong place.

by gedmurphy

Did this glitch appear in windows too? I don't remember seeing this, and I have a feeling this patch is hiding an underlying bug. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of jimtabor(a)svn.reactos.org Sent: 14 June 2008 18:11 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [jimtabor] 33965: Patch by carlo bramix at libero dot it: Bug 3336 statusbar in the wrong place. Author: jimtabor Date: Sat Jun 14 12:10:55 2008 New Revision: 33965 URL: http://svn.reactos.org/svn/reactos?rev=33965&view=rev Log: Patch by carlo bramix at libero dot it: Bug 3336 statusbar in the wrong place. Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sat Jun 14 12:10:55 2008 @@ -496,6 +496,7 @@ { MoveWindow(SolWnd, 0, 0, nWidth, nHeight - nStatusHeight, TRUE); MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nHeight, TRUE); + SendMessage(hwndStatus, WM_SIZE, wParam, lParam); } else {

17 years

2
2
0 0

[legal] eligibility for contributing code to ReactOS for students / graduates of a course derived from the Microsoft Windows Acadamic Program

by Mark Farnell

If a student is currently taking, or has previously taken a course derived from the Microsoft Windows Academic Program http://www.microsoft.com/resources/sharedsource/windowsacademic/default.mspx which contains the curriculum resource kit, Windows Research Kernel (containing Windows XP x64 amd Server 2003 SP1 kernel sources) and Project OZ, will they become *ineligible* to contribute code to the ReactOS project in the future? Thanks! Mark

17 years

3
3
0 0

Re: [ros-dev] Alternate shell?

by Martin Fuchs

Hello, would it be possible to get a dump or a copy of the ReactOS SVN repository, so I can move the code and history of Explorer and IBrowser (may be also Winefile) into my own repository - as you seem to want removing it? May be the simplest way would be to give me temporary shell access to svn.reactos.org, so I can dump and filter it myself. Regards, Martin 2008/5/23 Steven Edwards <winehacker(a)gmail.com>: > On Thu, May 22, 2008 at 8:59 PM, Dan Kegel <dank(a)kegel.com> wrote: >> The menus are messed up (they contain garbage text), and >> as I said earlier, there's no start menu. > > You should look at explorer-new. Its in the ReactOS source tree and > being developed by Thomas Weidenmuller as a real Windows compatible > shell replacement. Unfortunately it does not work on Windows or > ReactOS at this time. The old ReactOS explorer will be removed when > explorer-new is ready. > > > -- > Steven Edwards > > "There is one thing stronger than all the armies in the world, and > that is an idea whose time has come." - Victor Hugo -- Martin Fuchs martin-fuchs(a)gmx.net

17 years

8
8
0 0

[ros-diffs] [jimtabor] 33765: Modified GDIOBJ_Copy and Set owner to return bool. Start the use of server info for metrics data. Tested with Qemu on Linux.

by James Tabor

Hi, Thanks Goplat for fixing this,,,, pleas let me know via Developer mail list if I fubar a patch... I can not get access via my work network to the web site. They blocked it, 8^( Google works~ Thanks, James

17 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [gbrunmar] 33689: * Changed to correct signature of NtUserGetClassName() * Implemented correct behaviour in GetRealWindowClass(), but in reality just shifted the todo parts to NtUserGetClassName() instead.

by Alex Ionescu

This change breaks mIRC. By the way: 1) Congratulations on the fact it took two weeks for someone to report this on BZ And 2) Even more congratulations on the fact that it's been another week since then, and nobody has: 2.1) Emailed the ros-dev about this yet 2.2) And/or reverted this change. Let's try to ignore this until 0.3.6, to make sure that we ship with a broken release. On 25-May-08, at 1:36 AM, gbrunmar(a)svn.reactos.org wrote: > Author: gbrunmar > Date: Sun May 25 03:36:30 2008 > New Revision: 33689 > > URL: http://svn.reactos.org/svn/reactos?rev=33689&view=rev > Log: > * Changed to correct signature of NtUserGetClassName() > * Implemented correct behaviour in GetRealWindowClass(), but in > reality just shifted the todo parts to NtUserGetClassName() instead. > > Modified: > trunk/reactos/dll/win32/user32/windows/class.c > trunk/reactos/include/reactos/win32k/ntuser.h > trunk/reactos/subsystems/win32/win32k/ntuser/class.c > > Modified: trunk/reactos/dll/win32/user32/windows/class.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Sun > May 25 03:36:30 2008 > @@ -421,15 +421,22 @@ > LPSTR lpClassName, > int nMaxCount) > { > - ANSI_STRING ClassName; > - int Result; > - > - ClassName.MaximumLength = nMaxCount; > - ClassName.Buffer = lpClassName; > - > - Result = NtUserGetClassName(hWnd, > - (PUNICODE_STRING)&ClassName, > - TRUE); > + UNICODE_STRING ClassName; > + INT Result; > + > + ClassName.MaximumLength = nMaxCount * sizeof(WCHAR); > + ClassName.Buffer = LocalAlloc(LMEM_FIXED, > ClassName.MaximumLength); > + if (ClassName.Buffer == NULL) > + { > + SetLastError(ERROR_NOT_ENOUGH_MEMORY); > + return 0; > + } > + > + Result = NtUserGetClassName(hWnd, FALSE, &ClassName); > + > + WideCharToMultiByte(CP_ACP, 0, ClassName.Buffer, Result, > lpClassName, nMaxCount - 1, NULL, NULL); > + lpClassName[nMaxCount - 1] = '\0'; > + LocalFree(ClassName.Buffer); > > TRACE("%p class/atom: %s/%04x %x\n", hWnd, > IS_ATOM(lpClassName) ? NULL : lpClassName, > @@ -456,9 +463,7 @@ > ClassName.MaximumLength = nMaxCount * sizeof(WCHAR); > ClassName.Buffer = lpClassName; > > - Result = NtUserGetClassName(hWnd, > - &ClassName, > - FALSE); > + Result = NtUserGetClassName(hWnd, FALSE, &ClassName); > > TRACE("%p class/atom: %S/%04x %x\n", hWnd, > IS_ATOM(lpClassName) ? NULL : lpClassName, > @@ -629,12 +634,24 @@ > UINT > STDCALL > RealGetWindowClassW( > - HWND hwnd, > + HWND hWnd, > LPWSTR pszType, > UINT cchType) > { > - /* FIXME: Implement correct functionality of RealGetWindowClass */ > - return GetClassNameW(hwnd,pszType,cchType); > + UNICODE_STRING ClassName; > + UINT Length; > + > + ClassName.MaximumLength = cchType * sizeof(WCHAR); > + ClassName.Buffer = pszType; > + > + Length = NtUserGetClassName(hWnd, TRUE, &ClassName); > + > + TRACE("%p class/atom: %S/%04x %x\n", hWnd, > + IS_ATOM(pszType) ? NULL : pszType, > + IS_ATOM(pszType) ? pszType : 0, > + cchType); > + > + return Length; > } > > > @@ -644,12 +661,33 @@ > UINT > STDCALL > RealGetWindowClassA( > - HWND hwnd, > + HWND hWnd, > LPSTR pszType, > UINT cchType) > { > - /* FIXME: Implement correct functionality of RealGetWindowClass */ > - return GetClassNameA(hwnd,pszType,cchType); > + UNICODE_STRING ClassName; > + UINT Length; > + > + ClassName.MaximumLength = cchType * sizeof(WCHAR); > + ClassName.Buffer = LocalAlloc(LMEM_FIXED, > ClassName.MaximumLength); > + if (ClassName.Buffer == NULL) > + { > + SetLastError(ERROR_NOT_ENOUGH_MEMORY); > + return 0; > + } > + > + Length = NtUserGetClassName(hWnd, TRUE, &ClassName); > + > + WideCharToMultiByte(CP_ACP, 0, ClassName.Buffer, Length, > pszType, cchType - 1, NULL, NULL); > + pszType[cchType - 1] = '\0'; > + LocalFree(ClassName.Buffer); > + > + TRACE("%p class/atom: %s/%04x %x\n", hWnd, > + IS_ATOM(pszType) ? NULL : pszType, > + IS_ATOM(pszType) ? pszType : 0, > + cchType); > + > + return Length; > } > > /* > > Modified: trunk/reactos/include/reactos/win32k/ntuser.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] > (original) > +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun > May 25 03:36:30 2008 > @@ -1160,18 +1160,11 @@ > LPWSTR *ppszMenuName, > BOOL Ansi); > > -INT > +UINT > NTAPI > NtUserGetClassName(HWND hWnd, > - PUNICODE_STRING ClassName, > - BOOL Ansi); > -#if 0 // Real NtUserGetClassName > -INT > -NTAPI > -NtUserGetClassName(HWND hWnd, > - BOOL Unknown, // 0 GetClassNameW, 1 > RealGetWindowClassA/W > + BOOL bGetRealClass, // 0 GetClassNameA/W, 1 > RealGetWindowClassA/W > PUNICODE_STRING ClassName); > -#endif > > HANDLE > NTAPI > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c > [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c > [iso-8859-1] Sun May 25 03:36:30 2008 > @@ -1255,118 +1255,39 @@ > > INT > UserGetClassName(IN PWINDOWCLASS Class, > - IN OUT PUNICODE_STRING ClassName, > - IN BOOL Ansi) > + IN OUT PUNICODE_STRING ClassName) > { > NTSTATUS Status = STATUS_SUCCESS; > - WCHAR szStaticTemp[32]; > - PWSTR szTemp = NULL; > - ULONG BufLen = sizeof(szStaticTemp); > + ULONG BufLen; > INT Ret = 0; > > /* Note: Accessing the buffer in ClassName may raise an > exception! */ > > _SEH_TRY > { > - if (Ansi) > - { > - PANSI_STRING AnsiClassName = (PANSI_STRING)ClassName; > - UNICODE_STRING UnicodeClassName; > - > - /* limit the size of the static buffer on the stack to > the > - size of the buffer provided by the caller */ > - if (BufLen / sizeof(WCHAR) > AnsiClassName- > >MaximumLength) > - { > - BufLen = AnsiClassName->MaximumLength * > sizeof(WCHAR); > - } > - > - /* find out how big the buffer needs to be */ > - Status = RtlQueryAtomInAtomTable(gAtomTable, > - Class->Atom, > - NULL, > - NULL, > - szStaticTemp, > - &BufLen); > - if (Status == STATUS_BUFFER_TOO_SMALL) > - { > - if (BufLen / sizeof(WCHAR) > AnsiClassName- > >MaximumLength) > - { > - /* the buffer required exceeds the ansi buffer > provided, > - pretend like we're using the ansi buffer and > limit the > - size to the buffer size provided */ > - BufLen = AnsiClassName->MaximumLength * > sizeof(WCHAR); > - } > - > - /* allocate a temporary buffer that can hold the > unicode class name */ > - szTemp = ExAllocatePool(PagedPool, > - BufLen); > - if (szTemp == NULL) > - { > - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); > - _SEH_LEAVE; > - } > - > - /* query the class name */ > - Status = RtlQueryAtomInAtomTable(gAtomTable, > - Class->Atom, > - NULL, > - NULL, > - szTemp, > - &BufLen); > - } > - else > - szTemp = szStaticTemp; > - > - if (NT_SUCCESS(Status)) > - { > - /* convert the atom name to ansi */ > - > - RtlInitUnicodeString(&UnicodeClassName, > - szTemp); > - > - Status = RtlUnicodeStringToAnsiString(AnsiClassName, > - > &UnicodeClassName, > - FALSE); > - if (!NT_SUCCESS(Status)) > - { > - SetLastNtError(Status); > - _SEH_LEAVE; > - } > - } > - > - Ret = BufLen / sizeof(WCHAR); > - } > - else /* !Ansi */ > - { > - BufLen = ClassName->MaximumLength; > - > - /* query the atom name */ > - Status = RtlQueryAtomInAtomTable(gAtomTable, > - Class->Atom, > - NULL, > - NULL, > - ClassName->Buffer, > - &BufLen); > - > - if (!NT_SUCCESS(Status)) > - { > - SetLastNtError(Status); > - _SEH_LEAVE; > - } > - > - Ret = BufLen / sizeof(WCHAR); > - } > + BufLen = ClassName->MaximumLength; > + > + /* query the atom name */ > + Status = RtlQueryAtomInAtomTable(gAtomTable, > + Class->Atom, > + NULL, > + NULL, > + ClassName->Buffer, > + &BufLen); > + > + if (!NT_SUCCESS(Status)) > + { > + SetLastNtError(Status); > + _SEH_LEAVE; > + } > + > + Ret = BufLen / sizeof(WCHAR); > } > _SEH_HANDLE > { > SetLastNtError(_SEH_GetExceptionCode()); > } > _SEH_END; > - > - if (Ansi && szTemp != NULL && szTemp != szStaticTemp) > - { > - ExFreePool(szTemp); > - } > > return Ret; > } > @@ -2265,10 +2186,10 @@ > > > > -INT NTAPI > -NtUserGetClassName (IN HWND hWnd, > - OUT PUNICODE_STRING ClassName, > - IN BOOL Ansi) > +UINT NTAPI > +NtUserGetClassName(IN HWND hWnd, > + IN BOOL bGetRealClass, // 0 GetClassNameA/W, 1 > RealGetWindowClassA/W > + OUT PUNICODE_STRING ClassName) > { > PWINDOW_OBJECT Window; > UNICODE_STRING CapturedClassName; > @@ -2284,10 +2205,11 @@ > ProbeForWriteUnicodeString(ClassName); > CapturedClassName = *ClassName; > > + /* TODO: Get real class name here if bGetRealClass == > TRUE */ > + > /* get the class name */ > Ret = UserGetClassName(Window->Wnd->Class, > - &CapturedClassName, > - Ansi); > + &CapturedClassName); > > if (Ret != 0) > { > Best regards, Alex Ionescu

17 years

2
1
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 33912: fix an endless loop bug See issue #2142 for more details.

by Steven Edwards

On Mon, Jun 9, 2008 at 4:57 PM, <tkreuzer(a)svn.reactos.org> wrote: > See issue #2142 for more details. Is there anyway we can add a macro so that when the commit message see's "See issue #### for more details." It will auto magically link to bugzilla? I would look at more bugs as the patches come in but I am too lazy to manually open another tab and copy/paste the bug number. I could set a macro in firefox where I do "bug ####' but that means I still have to manually open a new tab and copy and paste, like I said I am lazy. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years

3
2
0 0

comctl32 treeview

by Timo Kreuzer

Hi, The bug in comctl32 that makes treeviews get messed up on collapsing nodes... ROS: http://www.reactos.org/bugzilla/show_bug.cgi?id=2843 WINE: http://bugs.winehq.org/show_bug.cgi?id=10544 Could someone having wine sources / GIT, please create a patch and send it to the wine-patches mailing list. Thanks, Timo

17 years

2
1
0 0

rethinking over some thing in ReactOS

by Magnus Olsen

HI I am been rethinking over some thing in ReactOS mean while I will not be avail coding on ReactOS at all or do any commit or helping people as I use to. I am still piss over some matter betwin me and Alesky this matter is betwin us two. What happen betwin us is betwin us. That is all I have say for now. about that matter. And I am rethinking over a sugestions I got from a old freind maybe start working for him. I do not known if I do i can not be coding on any opensource project the contract is for long terms contract and will need all skill I have. I got this offer for long time ago and I did say no to it, but it still stand, reason I did say no to it was I did not want coding behine dorrs or come up new ideas that being use behine dorrs and u are not avail to talk about them. I see allot of my life works are being using of all people that own a laptop or cellphone today. But one can backtrace the techlogic to me. what I done. That is how I did want thing be when I was younger. it is some background info what I did before 2003 after I join ReactOS most people I known ask me if I can quit from ReactOS and start working for them. One video card manufactor did contact me when I join ReactOS I can not tell which one. I solv the main issue I and the manufactor did have. it was how to open directx hal for the graphic card. next issue I solv was how to create a surface and access all other part of directx hal. Next issue we got was DirectX DdBlt it did not work direcly it took me and the manufactor around 2 days figout how to use DdBlt so it was avail to blit and see it on the screen. This informations did not exstis at all in MSDN. after I told open how it was done and start implemeted it in reactos MS did update the doc how to optain DirectX HAL. See GdiEntry1-16 This does not mean I am leving ReactOS it mean I need rethink what I want todo the options I got is very good one. I like the offer I got. and I do not known if I will say yes or no I am not a person say direcly no to money but none can buy me for money. I choice what I want todo. even it is bad payment. I have say no to many good deal and work in pass. Steven what I told u before, I stand with my word, and waiting on you mail about the details. To reash me is not via irc any longer it is on icq / skype or my mail address. Bestregards Magnus Olsen

17 years

1
0
0 0

Development process - once again

by Aleksey Bragin

Hi, this question seems to arise periodically, so let's have a constructive discussion again about the issue once again. The issue is being that a lot of people have direct commit access to the repository, and sooner or later some of them commit patches which introduce a regress in functionality. I will use Magnus (GreatLord) again as an example. He was doing a good thing (as usual), but then somehow lost focus, and along with good fixes committed a breakage for FF2.0 installer (and all other apps using PatBlt functions). I had to (as usual!) spend the whole morning reviewing all his diffs, then regress-testing by bisection to find the guilty revision, then work out a better solution with him, and then come to agreement that the guilty commit could be just reverted for now, since it partly works anyway. This takes up significant amount of my time, which could go into something more productive than just testing patches, finding way to unregress, and so on. Especially I'm angry about this happening right when approaching 0.3.5 release. Ideally (as I explained in #reactos today to blight_), I want the trunk itself be directly committable only by a very limited number of persons, and all developers should be committing to "some other place" at first, and then their patches merged by reviewers/testers (yes, manually, sometimes just reviewing may be enough to commit/ reject the patch, sometimes a thorough testing must be involved, maybe additional devs asked for a review). blight_ called this as a "linux development model" with an intermediate branch - yes, maybe, why not?. What I definately don't want to do is to scare developers away and make their life more complicated by need of sending text patches (this is just not convinient, and as seen on the example of Wine makes a lot of possible contributors going away). I remember what Alex proposed (those who don't, may look up ros-dev ML archives with a similar topic). Would there be any new prepositions? Maybe someone discovered a new CIS for SVN, or a decentralized VCS for patch submission and usual SVN for maintaining HEAD? With time, developers number is only going to increase, so this problem will become more and more annoying. With the best regards, Aleksey Bragin.

17 years

6
6
0 0

[ros-diffs] [jimtabor] 33830: Move xform data from W structure into DcLevel within unions.

by James Tabor

Hi, I'm going to explain this ONCE: 1st: The move was to conserve and reduce space and size of the current structure. Writing a floating point package could be hard to do or just copyleft one off the net.... Problem is if we do the later it will most likely not be compatible with M$ SFPP. BTW, M$ did patent their strange and unusual floating point package. Which means I can not write one! Just writing the storage emulation is almost a problem too... But due to US patent law I can just do what I did, to "Talk to the Interface" with the storage emulation. Keeping the current state of ReactOS FP is my first choice. We use the speed of the FPU which is part of the main processor and reduce the size of the source. (Two pluses so far, Speed and Small Size.) The storage emulation for gdi32 is important for compatibility and with ReactOS concept of drop in replacement and play. Thanks, my 1EU References: Fast floating-point truncation to integer form - US Patent 6535898: http://v3.espacenet.com/textdoc?DB=EPODOC&IDX=US6535898&F=0 Use of indices for queries with comparisons based on a function: http://v3.espacenet.com/textdoc?DB=EPODOC&IDX=EP1193619&F=0 System and method for fast and smooth rendering of lit, textured spheres: http://v3.espacenet.com/textdoc?DB=EPODOC&IDX=EP1227443&F=0 John R. Hauser SoftFloat package : http://www.jhauser.us/arithmetic/SoftFloat.html IEEE 754 floating-point test software: http://www.math.utah.edu/~beebe/software/ieee/

17 years

2
1
0 0

Firefox 1.5 installation regressed

by Aleksey Bragin

Hi, I experience a hang of FF 1.5 installation app at "0% Extracting". Sometimes hangs completely (even mouse doesn't move), sometimes I'm able to click "X" and choose yes to cancel. It started happening at least since yesterday. WBR, Aleksey Bragin.

17 years

4
4
0 0

VIA 6103 Rhine II Net Driver Install Crash

by James Tabor

Hi, I like to start testing FF again on hardware but this bug is still open. http://www.reactos.org/bugzilla/show_bug.cgi?id=2987 I've copied most of the netamd.inf from Ros to match with the inf for the driver. But still the same crash. Please let me know, James

17 years

1
0
0 0

[ros-diffs] [tkreuzer] 33856: - fix mem leak when failing to create an extpen with penstyles

by James Tabor

Hi! There was a reason for doing what I commit'ed,,,, since you are looking at it can you please fix this. 8^) James gdi32_winetest pen ExFreePool of already freed address 80e8ba78 KeBugCheck at ntoskrnl/mm/npool.c:1566 *** Fatal System Error: 0x00000000 (0x00000000,0x00000000,0x00000000,0x00000000) Entered debugger on embedded INT3 at 0x0008:0x808ac7d8. kdb:> bt Eip: <NTOSKRNL.EXE:ac7d9 (lib/rtl/i386/debug_asm.S:42 (RtlpBreakWithStatusInstruction))> Frames: <NTOSKRNL.EXE:29a2 (ntoskrnl/ke/bug.c:1100 (KeBugCheckWithTf@24))> <NTOSKRNL.EXE:2aac (ntoskrnl/ke/bug.c:1364 (KeBugCheck@4))> <NTOSKRNL.EXE:5f00c (ntoskrnl/mm/npool.c:1567 (ExFreeNonPagedPool@4))> <NTOSKRNL.EXE:61e64 (ntoskrnl/mm/pool.c:238 (ExFreePool@4))> <win32k.sys:967ff (subsystems/win32/win32k/objects/pen.c:344 (NtGdiExtCreatePen@44))> <NTOSKRNL.EXE:96eda (ntoskrnl/ke/i386/trap.s:244 (KiFastCallEntry))> <ntdll.dll:5dda> <gdi32_winetest.EXE:3b497> <gdi32_winetest.EXE:3d605> <gdi32_winetest.EXE:3d78d> <gdi32_winetest.EXE:3dc3d> <gdi32_winetest.EXE:3dc6a> <kernel32.dll:21610> <00000000>

17 years

2
2
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 33824: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second tim

by gedmurphy

Should this not be in the wine tests framework? The API tests framework is quite a specialized model more suited for subsystem testing. Putting the ws2_32 stuff here just makes it more inconvenient to test. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cfinck(a)svn.reactos.org Sent: 01 June 2008 23:09 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cfinck] 33824: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second time qu Author: cfinck Date: Sun Jun 1 17:08:45 2008 New Revision: 33824 URL: http://svn.reactos.org/svn/reactos?rev=33824&view=rev Log: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second time quickly after the first time (timing problem in the network code?). - Fix the behaviour on an ioctlsocket FIONREAD call: The output buffer is not touched, when we have no socket, but when we have no connection, it is set to 0. - Forward the socket call to WSASocketW instead of WSASocketA, minimal performance improvement Added: trunk/rostests/apitests/ws2_32/ (with props) trunk/rostests/apitests/ws2_32/helpers.c (with props) trunk/rostests/apitests/ws2_32/testlist.c (with props) trunk/rostests/apitests/ws2_32/tests/ trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c (with props) trunk/rostests/apitests/ws2_32/tests/recv.c (with props) trunk/rostests/apitests/ws2_32/ws2_32.c (with props) trunk/rostests/apitests/ws2_32/ws2_32.h (with props) trunk/rostests/apitests/ws2_32/ws2_32.rbuild (with props) Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c trunk/reactos/drivers/network/afd/afd/info.c trunk/rostests/apitests/directory.rbuild Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -166,7 +166,7 @@ IN INT type, IN INT protocol) { - return WSASocketA(af, + return WSASocketW(af, type, protocol, NULL, Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -49,9 +49,9 @@ break; case AFD_INFO_RECEIVE_CONTENT_SIZE: - /* Only touch InfoReq if we actually have a valid connection. + /* Only touch InfoReq if a socket has been set up. Behaviour was verified under WinXP SP2. */ - if(FCB->Connection.Handle) + if(FCB->AddressFile.Object) InfoReq->Information.Ulong = FCB->Recv.Content - FCB->Recv.BytesUsed; break; Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/directory.rbuild [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -23,4 +23,8 @@ <directory name="w32knapi"> <xi:include href="w32knapi/w32knapi.rbuild" /> </directory> + + <directory name="ws2_32"> + <xi:include href="ws2_32/ws2_32.rbuild" /> + </directory> </group> Propchange: trunk/rostests/apitests/ws2_32/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jun 1 17:08:45 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/rostests/apitests/ws2_32/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/helpers.c… ============================================================================== --- trunk/rostests/apitests/ws2_32/helpers.c (added) +++ trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,65 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/helpers.c + * PURPOSE: Helper functions for the socket tests + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "ws2_32.h" + +int CreateSocket(PTESTINFO pti, SOCKET* psck) +{ + /* Create the socket */ + *psck = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + TEST(*psck != INVALID_SOCKET); + + if(*psck == INVALID_SOCKET) + { + printf("Winsock error code is %u\n", WSAGetLastError()); + WSACleanup(); + return APISTATUS_ASSERTION_FAILED; + } + + return APISTATUS_NORMAL; +} + +int ConnectToReactOSWebsite(PTESTINFO pti, SOCKET sck) +{ + int iResult; + struct hostent* host; + struct sockaddr_in sa; + + /* Connect to "www.reactos.org" */ + host = gethostbyname("www.reactos.org"); + + sa.sin_family = AF_INET; + sa.sin_addr.s_addr = *(u_long*)host->h_addr_list[0]; + sa.sin_port = htons(80); + + SCKTEST(connect(sck, (struct sockaddr *)&sa, sizeof(sa))); + + return APISTATUS_NORMAL; +} + +int GetRequestAndWait(PTESTINFO pti, SOCKET sck) +{ + const char szGetRequest[] = "GET / HTTP/1.0\r\n\r\n"; + int iResult; + struct fd_set readable; + + /* Send the GET request */ + SCKTEST(send(sck, szGetRequest, strlen(szGetRequest), 0)); + TEST(iResult == strlen(szGetRequest)); + + /* Shutdown the SEND connection */ + SCKTEST(shutdown(sck, SD_SEND)); + + /* Wait until we're ready to read */ + FD_ZERO(&readable); + FD_SET(sck, &readable); + + SCKTEST(select(0, &readable, NULL, NULL, NULL)); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/helpers.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c (added) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,33 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/testlist.c + * PURPOSE: Test list file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#ifndef _WS2_32_TESTLIST_H +#define _WS2_32_TESTLIST_H + +#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) + +#include "ws2_32.h" + +/* include the tests */ +#include "tests/ioctlsocket.c" +#include "tests/recv.c" + +/* The List of tests */ +TESTENTRY TestList[] = +{ + { L"ioctlsocket", Test_ioctlsocket }, + { L"recv", Test_recv } +}; + +/* The function that gives us the number of tests */ +INT NumTests(void) +{ + return ARRAY_SIZE(TestList); +} + +#endif Propchange: trunk/rostests/apitests/ws2_32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/tests/ioc… ============================================================================== --- trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c (added) +++ trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,83 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/tests/ioctlsocket.c + * PURPOSE: Tests for the ioctlsocket function + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "../ws2_32.h" + +/* For valid test results, the ReactOS Website needs to return at least 2 bytes on a "GET / HTTP/1.0" request. */ +INT +Test_ioctlsocket(PTESTINFO pti) +{ + LPSTR pszBuf; + int iResult; + SOCKET sck; + ULONG BytesAvailable; + ULONG BytesToRead; + WSADATA wdata; + + /* Start up Winsock */ + TEST(WSAStartup(MAKEWORD(2, 2), &wdata) == 0); + + /* If we call ioctlsocket without a socket, it should return with an error and do nothing. */ + BytesAvailable = 0xdeadbeef; + TEST(ioctlsocket(0, FIONREAD, &BytesAvailable) == SOCKET_ERROR); + TEST(BytesAvailable == 0xdeadbeef); + + /* Create the socket */ + iResult = CreateSocket(pti, &sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Now we can pass at least a socket, but we have no connection yet. The function should return 0. */ + BytesAvailable = 0xdeadbeef; + TEST(ioctlsocket(sck, FIONREAD, &BytesAvailable) == 0); + TEST(BytesAvailable == 0); + + /* Connect to "www.reactos.org" */ + iResult = ConnectToReactOSWebsite(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Even with a connection, there shouldn't be any bytes available. */ + TEST(ioctlsocket(sck, FIONREAD, &BytesAvailable) == 0); + TEST(BytesAvailable == 0); + + /* Send the GET request */ + iResult = GetRequestAndWait(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Try ioctlsocket with FIONREAD. There should be bytes available now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable != 0); + + /* Get half of the data */ + BytesToRead = BytesAvailable / 2; + pszBuf = (LPSTR) HeapAlloc(g_hHeap, 0, BytesToRead); + SCKTEST(recv(sck, pszBuf, BytesToRead, 0)); + HeapFree(g_hHeap, 0, pszBuf); + + BytesToRead = BytesAvailable - BytesToRead; + + /* Now try ioctlsocket again. BytesAvailable should be at the value saved in BytesToRead now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable == BytesToRead); + + /* Read those bytes */ + pszBuf = (LPSTR) HeapAlloc(g_hHeap, 0, BytesToRead); + SCKTEST(recv(sck, pszBuf, BytesToRead, 0)); + HeapFree(g_hHeap, 0, pszBuf); + + /* Try it for the last time. BytesAvailable should be at 0 now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable == 0); + + closesocket(sck); + WSACleanup(); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/tests/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/tests/rec… ============================================================================== --- trunk/rostests/apitests/ws2_32/tests/recv.c (added) +++ trunk/rostests/apitests/ws2_32/tests/recv.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,69 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/tests/recv.c + * PURPOSE: Tests for the recv function + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "../ws2_32.h" + +#define RECV_BUF 4 + +/* For valid test results, the ReactOS Website needs to return at least 8 bytes on a "GET / HTTP/1.0" request. + Also the first 4 bytes and the last 4 bytes need to be different. + Both factors usually apply on standard HTTP responses. */ +INT +Test_recv(PTESTINFO pti) +{ + const char szDummyBytes[RECV_BUF] = {0xFF, 0x00, 0xFF, 0x00}; + + char szBuf1[RECV_BUF]; + char szBuf2[RECV_BUF]; + int iResult; + SOCKET sck; + WSADATA wdata; + + /* Start up Winsock */ + TEST(WSAStartup(MAKEWORD(2, 2), &wdata) == 0); + + /* If we call recv without a socket, it should return with an error and do nothing. */ + memcpy(szBuf1, szDummyBytes, RECV_BUF); + TEST(recv(0, szBuf1, RECV_BUF, 0) == SOCKET_ERROR); + TEST(!memcmp(szBuf1, szDummyBytes, RECV_BUF)); + + /* Create the socket */ + iResult = CreateSocket(pti, &sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Now we can pass at least a socket, but we have no connection yet. Should return with an error and do nothing. */ + memcpy(szBuf1, szDummyBytes, RECV_BUF); + TEST(recv(sck, szBuf1, RECV_BUF, 0) == SOCKET_ERROR); + TEST(!memcmp(szBuf1, szDummyBytes, RECV_BUF)); + + /* Connect to "www.reactos.org" */ + iResult = ConnectToReactOSWebsite(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Send the GET request */ + iResult = GetRequestAndWait(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Receive the data. + MSG_PEEK will not change the internal number of bytes read, so that a subsequent request should return the same bytes again. */ + SCKTEST(recv(sck, szBuf1, RECV_BUF, MSG_PEEK)); + SCKTEST(recv(sck, szBuf2, RECV_BUF, 0)); + TEST(!memcmp(szBuf1, szBuf2, RECV_BUF)); + + /* The last recv() call moved the internal file pointer, so that the next request should return different data. */ + SCKTEST(recv(sck, szBuf1, RECV_BUF, 0)); + TEST(memcmp(szBuf1, szBuf2, RECV_BUF)); + + closesocket(sck); + WSACleanup(); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/tests/recv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.c?… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.c (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,24 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/ws2_32.c + * PURPOSE: Program entry point + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "ws2_32.h" + +HANDLE g_hHeap; + +BOOL +IsFunctionPresent(LPWSTR lpszFunction) +{ + return TRUE; +} + +int wmain() +{ + g_hHeap = GetProcessHeap(); + + return TestMain(L"ws2_32_apitests", L"ws2_32.dll"); +} Propchange: trunk/rostests/apitests/ws2_32/ws2_32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.h?… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.h (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.h [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,36 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/ws2_32.h + * PURPOSE: Main header file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#ifndef _WS2_32_APITESTS_H +#define _WS2_32_APITESTS_H + +#include <winsock2.h> + +#include "../apitest.h" + +/* Simple macro for executing a socket command and doing cleanup operations in case of a failure */ +#define SCKTEST(_cmd_) \ + iResult = _cmd_; \ + TEST(iResult != SOCKET_ERROR); \ + if(iResult == SOCKET_ERROR) \ + { \ + printf("Winsock error code is %u\n", WSAGetLastError()); \ + closesocket(sck); \ + WSACleanup(); \ + return APISTATUS_ASSERTION_FAILED; \ + } + +/* helpers.c */ +int CreateSocket(PTESTINFO pti, SOCKET* sck); +int ConnectToReactOSWebsite(PTESTINFO pti, SOCKET sck); +int GetRequestAndWait(PTESTINFO pti, SOCKET sck); + +/* ws2_32.c */ +extern HANDLE g_hHeap; + +#endif Propchange: trunk/rostests/apitests/ws2_32/ws2_32.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.rb… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.rbuild (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.rbuild [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,11 @@ +<module name="ws2_32_apitests" type="win32cui" unicode="yes"> + <define name="_WIN32_WINNT">0x0501</define> + <library>apitest</library> + <library>kernel32</library> + <library>user32</library> + <library>shell32</library> + <library>ws2_32</library> + <file>helpers.c</file> + <file>testlist.c</file> + <file>ws2_32.c</file> +</module> Propchange: trunk/rostests/apitests/ws2_32/ws2_32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

17 years

2
2
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 33824: - Add a test suite forws2_32.dll It currently tests the features I needed toadjust/implement when fixing the wininet problem. ReactOScurrently passes all tests, but fails one if you launch the test app for th

by Steven Edwards

On Tue, Jun 3, 2008 at 5:08 PM, Colin Finck <mail(a)colinfinck.de> wrote: > The Wine test framework is currently only used by tests imported from Wine, > so an own test suite for ws2_32.dll might get lost there. You could have written the tests for the wine test suite and submitted them. > Also Timo's testing framework offers some interesting features like HTML > output not offered by the Wine one. Sure, but given the size of the wine test suite verses Timo's I think the effort is better spent adding this to winetest > Additionally, we have a free hand here and can play with it as we want, > while we can only import and maybe make little changes to the Wine test > framework if we want to avoid a big merging mess. Your always free to fork. As I said given the large number of unit tests in the Wine framework it seems to make more sense to me to extend that rather than develop a new one. Besides you can add the features you need to the Winetest gui and have it be independent of the framework as a whole. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [greatlrd] 33807: add Test for EngDeleteSemaphore, it only test if it been create or not

by Alex Ionescu

I'm getting *quite* annoyed with seeing these kinds of tests: ret = SomeFunc(); ASSERT(ret == success); How exactly is this a test anyway? It proves in NO way that the function *worked*, only that it returned success. Furthermore, there are *plenty* of cases where a function could legitimately fail -- it is simply stupid to assume that a failure means a regression. What if the system is out of memory? On Sun, Jun 1, 2008 at 10:38 PM, <greatlrd(a)svn.reactos.org> wrote: > Author: greatlrd > Date: Sun Jun 1 09:38:02 2008 > New Revision: 33807 > > URL: http://svn.reactos.org/svn/reactos?rev=33807&view=rev > Log: > add Test for EngDeleteSemaphore, it only test if it been create or not > > Added: > trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c (with props) > Modified: > trunk/rostests/apitests/gdi32api/testlist.c > > Modified: trunk/rostests/apitests/gdi32api/testlist.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… > ============================================================================== > --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) > +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sun Jun 1 09:38:02 2008 > @@ -11,6 +11,7 @@ > #include "tests/CreateFont.c" > #include "tests/CreatePen.c" > #include "tests/CreateRectRgn.c" > +#include "tests/EngCreateSemaphore.c" > #include "tests/ExtCreatePen.c" > #include "tests/GdiConvertBitmap.c" > #include "tests/GdiConvertBrush.c" > @@ -51,6 +52,7 @@ > { L"CreateCompatibleDC", Test_CreateCompatibleDC }, > { L"CreateFont", Test_CreateFont }, > { L"CreatePen", Test_CreatePen }, > + { L"EngCreateSemaphore", Test_EngCreateSemaphore }, > { L"CreateRectRgn", Test_CreateRectRgn }, > { L"ExtCreatePen", Test_ExtCreatePen }, > { L"GdiConvertBitmap", Test_GdiConvertBitmap }, > > Added: trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/E… > ============================================================================== > --- trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c (added) > +++ trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c [iso-8859-1] Sun Jun 1 09:38:02 2008 > @@ -1,0 +1,15 @@ > +/* Simple test of EngAcquireSemaphore only check if we got a lock or not */ > +INT > +Test_EngCreateSemaphore(PTESTINFO pti) > +{ > + > + HSEMAPHORE hsem; > + hsem = EngCreateSemaphore(); > + > + RTEST ( hsem != NULL ); > + > + EngDeleteSemaphore(hsem); > + > + return APISTATUS_NORMAL; > +} > + > > Propchange: trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > -- Best regards, Alex Ionescu

17 years

2
1
0 0

[ros-diffs] [greatlrd] 33783: revert my last change

by James Tabor

Hi! I checked this and it is all wrong,,,,, I reverted part of revision 19267: Replacing the code with the original wine code that behaves like "Windows code" but should be called inside EngCreateBitmap if (pvBits) Width = DIB_GetDIBWidthBytes( lWidth, iFormat); . As it should be: INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth) { // return ((width * depth + 31) & ~31) >> 3; int words; switch(depth) { case 1: words = (width + 31) / 32; break; case 4: words = (width + 7) / 8; break; case 8: words = (width + 3) / 4; break; case 15: case 16: words = (width + 1) / 2; break; case 24: words = (width * 3 + 3)/4; break; default: DPRINT1("(%d): Unsupported depth\n", depth ); /* fall through */ case 32: words = width; } return 4 * words; }

17 years

2
2
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 33792: preserve code for NtGdiCreateEnhMetaFile from win32k (where it's going to be removed later) in gdi32 (where it's going to be implemented later)

by Steven Edwards

On Sat, May 31, 2008 at 7:15 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Sat May 31 18:15:34 2008 > New Revision: 33792 > > URL: http://svn.reactos.org/svn/reactos?rev=33792&view=rev > Log: > preserve code for NtGdiCreateEnhMetaFile from win32k (where it's going to be removed later) in gdi32 (where it's going to be implemented later) if your going to implement it all in usermode are you going to try to just rip the Wine metafile and enhanced metefile drivers? Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years

2
1
0 0

[ros-diffs] [hyperion] 33703: added nls added nls/3rdparty added nls/3rdparty/icu

by Timo Kreuzer

I hope everyone is clear in his mind about the fact that this makes up 20 % of the complete reactos source or in other words increases the size of the code by 25% ... > [ros-diffs] [hyperion] 33703: added nls added nls/3rdparty added nls/3rdparty/icu We > officially welcome IBM's excellent ICU4C library for Unicode support to > our humble source tree. May our marriage be long, happy and fertile. > >

17 years

6
9
0 0

Abiword 2.4.1 Menu Drawing

by James Tabor

Hi, Owner Menu Drawing if I remember right, which allows application to draw their own menus. Yes that is right! Not all applications use MDI. Well, it is now all broken (It was in a state of NEAR DO WELL). I understand the reason for wine testing but please understand What You See Is What You Get. >From the debug output: IntSetMenuItemInfo: Invalid combination of fMask bits used It draws a small little box with the line separators. 8^' looks cute~ I need to stay focus on the issues I'm working on,, please help me by fixing this new issue, please don't send me patches, 8^) James

17 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [greatlrd] 33764: 1. do not use wine def for reactos 2. this is almost 100% correct list of windows 2003 export list of msvcrt.def and it will make abiword working again for it was missing api wfreopen and allot more api from msvcrt 3

by Steven Edwards

On Thu, May 29, 2008 at 9:27 PM, <greatlrd(a)svn.reactos.org> wrote: > Author: greatlrd > Date: Thu May 29 20:27:29 2008 > New Revision: 33764 > > URL: http://svn.reactos.org/svn/reactos?rev=33764&view=rev > Log: > 1. do not use wine def for reactos > 2. this is almost 100% correct list of windows 2003 export list of msvcrt.def and it will make abiword working again for it was missing api wfreopen and allot more api from msvcrt > 3. this add back api that was remove api they exists in windows 2003 export list > 4. List was provide from colin f > > See issue #3293 for more details. I'd suggest putting a comment at the top of the def so that in the future someone won't make this mistake again. Any idea why it works on Wine with the missing exports but not ReactOS? -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years

2
1
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 33741: - Start implementing shimgvw.dll

by gedmurphy

I wish you'd at least make the effort to talk to people before you do things like this. This is meant to be a COM shell extension, and your implementation is completely wrong. It's therefore incompatible with the XP version of the lib and won't integrate with shell32. I already have the outline for the COM lib sketched out if you wanted to think about rewriting it? Your definitions for the exports are also wrong. I've listed these below for you in case you want to change them. VOID ImageView_Fullscreen(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow); VOID ImageView_FullscreenA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow); VOID ImageView_FullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow); VOID ImageView_PrintTo(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow); VOID ImageView_PrintToA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow); VOID ImageView_PrintToW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow); VOID ImageView_fullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow); Regards, Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 28 May 2008 20:53 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 33741: - Start implementing shimgvw.dll Author: dchapyshev Date: Wed May 28 14:52:46 2008 New Revision: 33741 URL: http://svn.reactos.org/svn/reactos?rev=33741&view=rev Log: - Start implementing shimgvw.dll Added: trunk/reactos/dll/win32/shimgvw/ trunk/reactos/dll/win32/shimgvw/lang/ trunk/reactos/dll/win32/shimgvw/lang/en-US.rc (with props) trunk/reactos/dll/win32/shimgvw/res/ trunk/reactos/dll/win32/shimgvw/res/main.ico (with props) trunk/reactos/dll/win32/shimgvw/res/next.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/prev.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/print.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/rot1.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/rot2.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/save.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/zoomm.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/zoomp.bmp (with props) trunk/reactos/dll/win32/shimgvw/resource.h (with props) trunk/reactos/dll/win32/shimgvw/rsrc.rc (with props) trunk/reactos/dll/win32/shimgvw/shimgvw.c (with props) trunk/reactos/dll/win32/shimgvw/shimgvw.h (with props) trunk/reactos/dll/win32/shimgvw/shimgvw.rbuild (with props) trunk/reactos/dll/win32/shimgvw/shimgvw.rc (with props) trunk/reactos/dll/win32/shimgvw/shimgvw.spec (with props) Modified: trunk/reactos/dll/win32/win32.rbuild Added: trunk/reactos/dll/win32/shimgvw/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/en-US.rc [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,17 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_APPTITLE "ReactOS Picture and Fax Viewer" + IDS_SETASDESKBG "Set as Desktop Background" + + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "Next Picture" + IDS_TOOLTIP_PREV_PIC "Previous Picture" + IDS_TOOLTIP_ZOOM_IN "Zoom In (+)" + IDS_TOOLTIP_ZOOM_OUT "Zoom Out (-)" + IDS_TOOLTIP_ROT_CLOCKW "Rotate Clockwise (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "Rotate Counterclockwise (Ctrl+L)" + IDS_TOOLTIP_PRINT "Print (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Save As... (Ctrl+S)" +END Propchange: trunk/reactos/dll/win32/shimgvw/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/res/main.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/main… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/main.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/next.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/next… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/next.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/prev.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/prev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/prev.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/print.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/prin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/print.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/rot1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/rot1… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/rot1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/rot2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/rot2… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/rot2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/save.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/save… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/save.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/zoomm.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/zoom… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/zoomm.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/zoomp.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/zoom… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/zoomp.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/resource… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/resource.h (added) +++ trunk/reactos/dll/win32/shimgvw/resource.h [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,53 @@ +#ifndef __SHIMGVW_RESOURCE_H +#define __SHIMGVW_RESOURCE_H + +/* Icons */ +#define IDI_APPICON 1 +#define IDI_BMP_ICON 2 +#define IDI_GIF_ICON 3 +#define IDI_JPG_ICON 4 +#define IDI_PNG_ICON 5 + +#define IDB_PREVICON 50 +#define IDB_NEXTICON 51 +#define IDB_ZOOMPICON 52 +#define IDB_ZOOMMICON 53 +#define IDB_SAVEICON 54 +#define IDB_PRINTICON 55 +#define IDB_ROT1ICON 56 +#define IDB_ROT2ICON 57 + +/* ToolBar buttons */ +#define IDC_PREV 500 +#define IDC_NEXT 501 +#define IDC_ZOOMP 502 +#define IDC_ZOOMM 503 +#define IDC_SAVE 504 +#define IDC_PRINT 505 +#define IDC_ROT1 506 +#define IDC_ROT2 507 + +#define TBICON_PREV 0 +#define TBICON_NEXT 1 +#define TBICON_ZOOMP 2 +#define TBICON_ZOOMM 3 +#define TBICON_SAVE 4 +#define TBICON_PRINT 5 +#define TBICON_ROT1 6 +#define TBICON_ROT2 7 + +/* Strings */ +#define IDS_APPTITLE 100 +#define IDS_SETASDESKBG 101 + +/* Tooltips strings */ +#define IDS_TOOLTIP_NEXT_PIC 300 +#define IDS_TOOLTIP_PREV_PIC 301 +#define IDS_TOOLTIP_ZOOM_IN 302 +#define IDS_TOOLTIP_ZOOM_OUT 304 +#define IDS_TOOLTIP_ROT_CLOCKW 305 +#define IDS_TOOLTIP_ROT_COUNCW 306 +#define IDS_TOOLTIP_PRINT 307 +#define IDS_TOOLTIP_SAVEAS 308 + +#endif /* __SHIMGVW_RESOURCE_H */ Propchange: trunk/reactos/dll/win32/shimgvw/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/rsrc.rc (added) +++ trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,4 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/en-US.rc" Propchange: trunk/reactos/dll/win32/shimgvw/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c (added) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,496 @@ +/* + * + * PROJECT: ReactOS Picture and Fax Viewer + * FILE: dll/win32/shimgvw/shimgvw.c + * PURPOSE: shimgvw.dll + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + * + * UPDATE HISTORY: + * 28/05/2008 Created + */ + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> + +#include <windows.h> +#include <commctrl.h> +#include <gdiplus.h> +#include <tchar.h> + +#include "shimgvw.h" + + +HINSTANCE hInstance; +SHIMGVW_SETTINGS shiSettings; +WCHAR szOpenFileName[MAX_PATH]; + +HWND hDispWnd, hToolBar; + +/* ToolBar Buttons */ +static const TBBUTTON Buttons [] = +{ /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + {TBICON_PREV, IDC_PREV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {TBICON_NEXT, IDC_NEXT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, + {TBICON_ZOOMP, IDC_ZOOMP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {TBICON_ZOOMM, IDC_ZOOMM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, + {TBICON_ROT1, IDC_ROT1, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {TBICON_ROT2, IDC_ROT2, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, + {TBICON_SAVE, IDC_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {TBICON_PRINT, IDC_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, +}; + +static VOID +ImageView_DrawImage(HWND hwnd) +{ + GpGraphics *graphics; + GpImage *image; + UINT uImgWidth, uImgHeight; + UINT height = 0, width = 0, x = 0, y = 0; + PAINTSTRUCT ps; + RECT rect; + HDC hdc; + + if (GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) + return; + + hdc = BeginPaint(hwnd, &ps); + + GdipCreateFromHDC(hdc, &graphics); + GdipLoadImageFromFile(szOpenFileName, &image); + GdipGetImageWidth(image, &uImgWidth); + GdipGetImageHeight(image, &uImgHeight); + + if (GetClientRect(hwnd, &rect)) + { + FillRect(hdc, &rect, (HBRUSH)COLOR_WINDOW); + + if ((rect.right == uImgWidth)&&(rect.bottom == uImgHeight)) + { + x = 0, y = 0, width = rect.right, height = rect.bottom; + } + else if ((rect.right >= uImgWidth)&&(rect.bottom >= uImgHeight)) + { + x = (rect.right/2)-(uImgWidth/2); + y = (rect.bottom/2)-(uImgHeight/2); + width = uImgWidth; + height = uImgHeight; + } + else if ((rect.right < uImgWidth)||(rect.bottom < uImgHeight)) + { + if (rect.bottom < uImgHeight) + { + height = rect.bottom; + width = uImgWidth*(UINT)rect.bottom/uImgHeight; + x = (rect.right/2)-(width/2); + y = (rect.bottom/2)-(height/2); + } + if (rect.right < uImgWidth) + { + width = rect.right; + height = uImgHeight*(UINT)rect.right/uImgWidth; + x = (rect.right/2)-(width/2); + y = (rect.bottom/2)-(height/2); + } + if ((height > rect.bottom)||(width > rect.right)) + { + for (;;) + { + if (((int)width - 1 < 0)||((int)height - 1 < 0)) break; + width -= 1; + height -= 1; + y = (rect.bottom/2)-(height/2); + x = (rect.right/2)-(width/2); + if ((height < rect.bottom)&&(width < rect.right)) break; + } + } + } + else if ((rect.right <= uImgWidth)&&(rect.bottom <= uImgHeight)) + { + height = uImgHeight*(UINT)rect.right/uImgWidth; + y = (rect.bottom/2)-(height/2); + width = rect.right; + + if ((height > rect.bottom)||(width > rect.right)) + { + for (;;) + { + if (((int)width - 1 < 0)||((int)height - 1 < 0)) break; + width -= 1; + height -= 1; + y = (rect.bottom/2)-(height/2); + x = (rect.right/2)-(width/2); + if ((height < rect.bottom)&&(width < rect.right)) break; + } + } + } + + //TCHAR szBuf[MAX_PATH]; + //wsprintf(szBuf, _T("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d"), x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); + //MessageBox(0, szBuf, NULL, MB_OK); + GdipDrawImageRect(graphics, image, x, y, width, height); + } + + DeleteDC(hdc); + EndPaint(hwnd, &ps); +} + +static BOOL +ImageView_LoadSettings() +{ + HKEY hKey; + DWORD dwSize; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\ReactOS\\shimgvw"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + dwSize = sizeof(SHIMGVW_SETTINGS); + if (RegQueryValueEx(hKey, _T("Settings"), NULL, NULL, (LPBYTE)&shiSettings, &dwSize) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + + RegCloseKey(hKey); + } + + return FALSE; +} + +static VOID +ImageView_SaveSettings(HWND hwnd) +{ + WINDOWPLACEMENT wp; + HKEY hKey; + + ShowWindow(hwnd, SW_HIDE); + wp.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(hwnd, &wp); + + shiSettings.Left = wp.rcNormalPosition.left; + shiSettings.Top = wp.rcNormalPosition.top; + shiSettings.Right = wp.rcNormalPosition.right; + shiSettings.Bottom = wp.rcNormalPosition.bottom; + shiSettings.Maximized = (IsZoomed(hwnd) || (wp.flags & WPF_RESTORETOMAXIMIZED)); + + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\ReactOS\\shimgvw"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) + { + RegSetValueEx(hKey, _T("Settings"), 0, REG_BINARY, (LPBYTE)&shiSettings, sizeof(SHIMGVW_SETTINGS)); + RegCloseKey(hKey); + } +} + +static BOOL +ImageView_CreateToolBar(HWND hwnd) +{ + INT numButtons = sizeof(Buttons) / sizeof(Buttons[0]); + + hToolBar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS, + 0, 0, 0, 0, hwnd, + 0, hInstance, NULL); + if(hToolBar != NULL) + { + HIMAGELIST hImageList; + + SendMessage(hToolBar, TB_SETEXTENDEDSTYLE, + 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); + + SendMessage(hToolBar, TB_BUTTONSTRUCTSIZE, + sizeof(Buttons[0]), 0); + + hImageList = ImageList_Create(TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, ILC_MASK | ILC_COLOR24, 1, 1); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_PREVICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_NEXTICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ZOOMPICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ZOOMMICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_SAVEICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_PRINTICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ROT1ICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ROT2ICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + if (hImageList == NULL) return FALSE; + + ImageList_Destroy((HIMAGELIST)SendMessage(hToolBar, TB_SETIMAGELIST, + 0, (LPARAM)hImageList)); + + SendMessage(hToolBar, TB_ADDBUTTONS, + numButtons, (LPARAM)Buttons); + + return TRUE; + } + + return FALSE; +} + +static VOID +ImageView_InitControls(HWND hwnd) +{ + MoveWindow(hwnd, shiSettings.Left, shiSettings.Top, + shiSettings.Right - shiSettings.Left, + shiSettings.Bottom - shiSettings.Top, TRUE); + + if (shiSettings.Maximized) ShowWindow(hwnd, SW_MAXIMIZE); + + hDispWnd = CreateWindowEx(WS_EX_TRANSPARENT, _T("STATIC"), _T(""), + WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); + + ImageView_CreateToolBar(hwnd); +} + +LRESULT CALLBACK +ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch (Message) + { + case WM_CREATE: + { + ImageView_InitControls(hwnd); + } + break; + + case WM_COMMAND: + { + switch (wParam) + { + case IDC_PREV: + + break; + case IDC_NEXT: + + break; + case IDC_ZOOMP: + + break; + case IDC_ZOOMM: + + break; + case IDC_SAVE: + + break; + case IDC_PRINT: + + break; + case IDC_ROT1: + + break; + case IDC_ROT2: + + break; + } + } + break; + + case WM_NOTIFY: + { + LPNMHDR pnmhdr = (LPNMHDR)lParam; + + switch (pnmhdr->code) + { + case TTN_GETDISPINFO: + { + LPTOOLTIPTEXT lpttt; + UINT idButton; + + lpttt = (LPTOOLTIPTEXT)lParam; + idButton = (UINT)lpttt->hdr.idFrom; + + switch (idButton) + { + case IDC_PREV: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PREV_PIC); + break; + case IDC_NEXT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_NEXT_PIC); + break; + case IDC_ZOOMP: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ZOOM_IN); + break; + case IDC_ZOOMM: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ZOOM_OUT); + break; + case IDC_SAVE: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SAVEAS); + break; + case IDC_PRINT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PRINT); + break; + case IDC_ROT1: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ROT_COUNCW); + break; + case IDC_ROT2: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ROT_CLOCKW); + break; + } + } + } + } + break; + + case WM_PAINT: + { + ImageView_DrawImage(hDispWnd); + } + break; + + case WM_SIZING: + { + LPRECT pRect = (LPRECT)lParam; + if (pRect->right-pRect->left < 350) + pRect->right = pRect->left + 350; + + if (pRect->bottom-pRect->top < 290) + pRect->bottom = pRect->top + 290; + } + break; + + case WM_SIZE: + { + MoveWindow(hDispWnd, 1, 1, LOWORD(lParam)-1, HIWORD(lParam)-35, TRUE); + SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); + } + break; + + case WM_DESTROY: + { + ImageView_SaveSettings(hwnd); + PostQuitMessage(0); + } + break; + } + + return DefWindowProc(hwnd, Message, wParam, lParam); +} + +LONG +ImageView_CreateWindow(HWND hwnd, LPWSTR szFileName) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + WNDCLASS WndClass = {0}; + TCHAR szBuf[512]; + HWND hMainWnd; + MSG msg; + + wcscpy(szOpenFileName, szFileName); + + if (!ImageView_LoadSettings()) + { + shiSettings.Maximized = FALSE; + shiSettings.Left = 0; + shiSettings.Top = 0; + shiSettings.Right = 520; + shiSettings.Bottom = 400; + } + + // Initialize GDI+ + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + // Create the window + WndClass.lpszClassName = _T("shimgvw_window"); + WndClass.lpfnWndProc = (WNDPROC)ImageView_WndProc; + WndClass.hInstance = hInstance; + WndClass.style = CS_HREDRAW | CS_VREDRAW; + WndClass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_APPICON)); + WndClass.hCursor = LoadCursor(hInstance, IDC_ARROW); + WndClass.hbrBackground = (HBRUSH)COLOR_WINDOW; + + if (!RegisterClass(&WndClass)) return -1; + + LoadString(hInstance, IDS_APPTITLE, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + hMainWnd = CreateWindow(_T("shimgvw_window"), szBuf, + WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_VISIBLE | WS_CAPTION, + CW_USEDEFAULT, CW_USEDEFAULT, + 0, 0, NULL, NULL, hInstance, NULL); + + // Show it + ShowWindow(hMainWnd, SW_SHOW); + UpdateWindow(hMainWnd); + + // Message Loop + while(GetMessage(&msg,NULL,0,0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + GdiplusShutdown(gdiplusToken); + return -1; +} + +LONG +CALLBACK +ImageView_FullscreenW(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + return ImageView_CreateWindow(hwnd, (LPWSTR)lParam1); +} + +LONG +CALLBACK +ImageView_Fullscreen(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + WCHAR szFile[MAX_PATH]; + + if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) + { + return ImageView_CreateWindow(hwnd, (LPWSTR)szFile); + } + + return -1; +} + +LONG +CALLBACK +ImageView_FullscreenA(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + WCHAR szFile[MAX_PATH]; + + if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) + { + return ImageView_CreateWindow(hwnd, (LPWSTR)szFile); + } + + return -1; +} + +BOOL WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hInstance = hinstDLL; + break; + } + + return TRUE; +} + Propchange: trunk/reactos/dll/win32/shimgvw/shimgvw.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/shimgvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.h (added) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.h [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,17 @@ +#include <windows.h> + +#include "resource.h" + +#define TB_IMAGE_WIDTH 16 +#define TB_IMAGE_HEIGHT 16 + +extern HINSTANCE hInstance; + +typedef struct +{ + BOOL Maximized; + INT Left; + INT Top; + INT Right; + INT Bottom; +} SHIMGVW_SETTINGS; Propchange: trunk/reactos/dll/win32/shimgvw/shimgvw.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/shimgvw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.rbuild (added) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.rbuild [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,15 @@ +<module name="shimgvw" type="win32dll" baseaddress="${BASEADDRESS_SHIMGVW}" installbase="system32" installname="shimgvw.dll"> + <importlibrary definition="shimgvw.spec.def" /> + <include base="shimgvw">.</include> + <define name="_DISABLE_TIDENTS" /> + <library>kernel32</library> + <library>advapi32</library> + <library>comctl32</library> + <library>ntdll</library> + <library>user32</library> + <library>gdi32</library> + <library>gdiplus</library> + <file>shimgvw.c</file> + <file>shimgvw.rc</file> + <file>shimgvw.spec</file> +</module> Propchange: trunk/reactos/dll/win32/shimgvw/shimgvw.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/shimgvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.rc (added) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.rc [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,21 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Picture and Fax Viewer\0" +#define REACTOS_STR_INTERNAL_NAME "shimgvw\0" +#define REACTOS_STR_ORIGINAL_FILENAME "shimgvw.dll\0" +#include <reactos/version.rc> + +IDI_APPICON ICON "res/main.ico" + +IDB_PREVICON BITMAP "res/prev.bmp" +IDB_NEXTICON BITMAP "res/next.bmp" +IDB_ZOOMPICON BITMAP "res/zoomp.bmp" +IDB_ZOOMMICON BITMAP "res/zoomm.bmp" +IDB_SAVEICON BITMAP "res/save.bmp" +IDB_PRINTICON BITMAP "res/print.bmp" +IDB_ROT1ICON BITMAP "res/rot1.bmp" +IDB_ROT2ICON BITMAP "res/rot2.bmp" + +#include "rsrc.rc" Propchange: trunk/reactos/dll/win32/shimgvw/shimgvw.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/shimgvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.spec (added) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,14 @@ +@ stub ImageView_COMServer +@ stdcall ImageView_Fullscreen(ptr long ptr ptr) +@ stdcall ImageView_FullscreenA(ptr long ptr ptr) +@ stdcall ImageView_FullscreenW(ptr long ptr ptr) +@ stub ImageView_PrintTo +@ stub ImageView_PrintToA +@ stub ImageView_PrintToW +@ stub imageview_fullscreenW +@ stub ConvertDIBSECTIONToThumbnail +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllInstall +@ stub DllRegisterServer +@ stub DllUnregisterServer Propchange: trunk/reactos/dll/win32/shimgvw/shimgvw.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed May 28 14:52:46 2008 @@ -292,6 +292,9 @@ <directory name="shfolder"> <xi:include href="shfolder/shfolder.rbuild" /> </directory> +<directory name="shimgvw"> + <xi:include href="shimgvw/shimgvw.rbuild" /> +</directory> <directory name="shlwapi"> <xi:include href="shlwapi/shlwapi.rbuild" /> </directory>

17 years

1
0
0 0

[ros-diffs] [tkreuzer] 33752: fix palette implementation

by James Tabor

Hi, Could it be easier to just: static GDIDEVICE PrimarySurface; PGDIDEVICE pPrimarySurface = &PrimarySurface; then use pPrimarySurface through out? I will have to rewrite everything later to support the new HDEV code. IDEA~! Stefan100 theres a good patch! ;^D Thanks, James

17 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 33732: exception.h: merge changes from wine. Revision 1.37 fixes the exception in ole32 when opening a file with FoxitReader. Also fixes some warnings and hopefully some usermode crashes. 1.28: Jonathan Ernst <jonathan@ernstfamily.ch> Update the address of the Free Software Foundation. 1.29: Alexandre Julliard <julliard@winehq.org> include: Exception filters should return LONG, not DWORD. Also move UnhandledExceptionFilter definitions to winbase.h since they are there in

by Aleksey Bragin

On May 28, 2008, at 4:41 AM, tkreuzer(a)svn.reactos.org wrote: > 1.28: Jonathan Ernst <jonathan(a)ernstfamily.ch> > Update the address of the Free Software Foundation. This should fix a lot of crashes, since many apps would try to dereference FSF's address, but it would be invalid! :-) WBR, Aleksey Bragin.

17 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [fireball] 33662: - msiexec is GUI app, not CUI.

by Steven Edwards

On Fri, May 23, 2008 at 1:55 PM, <fireball(a)svn.reactos.org> wrote: > - msiexec is GUI app, not CUI. Is this a Wine bug then? It has it listed as a console based application. When you run msiexec directly on Windows I know it does not start a console window so I guess this would imply it is a GUI with a hidden window right? -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years

3
2
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 33607: - Added kbsdll to install hooks (does not work on ReactOS). To switch layouts temporarily used keys Left Alt + F10

by Steven Edwards

On Tue, May 20, 2008 at 8:53 AM, <dchapyshev(a)svn.reactos.org> wrote: > +#include "../kbswitch.h" Could you set an include path and remove the ../ from the source? gnumake throws a fit with parallel makes and relative paths. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 33571: Check if the GetWindowsDirectory call succeeded and use PathAppend to prevent a buffer overflow, when WinDir + "\regedit.exe" > MAX_PATH

by Alex Ionescu

If GetWindowsDirectory fails, you have much worse issues to worry about than executable redirection. Also note that regedt32.exe is usually in the system32 directory, so how is this a security/redirection issue exactly? This implies someone would have to: 1) Give you a malware regedit.exe in directory foo 2) Give you the legitimate regedt32.exe in directory foo 3) Somehow convince you to: 3.1) Use regedt32 instead of regedit (few people even know this tool) 3.2) Launch regedt32 from this "foo" directory instead of using start/run regedt32 The issue you're looking for just doesn't exist. 2008/5/19 FENG Yu Ning <fengyuning1984(a)gmail.com>: > On Sun, May 18, 2008 at 7:28 PM, Alex Ionescu <ionucu(a)videotron.ca> wrote: >> >> Last nitpick: if you can't get the windows directory, just >> ShellExecute "regedit.exe" directly, as the code originally did -- >> this is the behavior on Windows, fyi. >> > > Though it is the behavior on Windows, it is a bad thing, IMHO. There are > already too many little viruses who pretend to be a system executable, say, > explorer.exe, and they are placed in a (sub)directory of the windows > directory to be shell executed. If we can't get the windows direcoty, we > should let the user know, and give them the chance to fix it, instead of > blindly execute anything. > I used to suffer from those, and they were really annoying. Please consider > being different from Windows in this and similar issues. > MHO. > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > -- Best regards, Alex Ionescu -- Best regards, Alex Ionescu

17 years

2
2
0 0

Re: [ros-dev] [ros-diffs] [greatlrd] 33593: adding 1 new syscall from vista : NtGdiCreateOPMProtectedOutputs Adding 62 new syscall from vista, they are known as D3DKMT for the graphic drv and gdi32.dll, I have not fix the protype for I do not known if it same

by Alex Ionescu

Why the hell are you putting function headers in a header called "types"? On Mon, May 19, 2008 at 2:33 AM, <greatlrd(a)svn.reactos.org> wrote: > Author: greatlrd > Date: Sun May 18 13:33:27 2008 > New Revision: 33593 > > URL: http://svn.reactos.org/svn/reactos?rev=33593&view=rev > Log: > adding 1 new syscall from vista : NtGdiCreateOPMProtectedOutputs > Adding 62 new syscall from vista, they are known as D3DKMT for the graphic drv and gdi32.dll, I have not fix the protype for I do not known if it same as the drv prototype or not, yet. > NtGdiDdDDICheckExclusiveOwnership,NtGdiDdDDICheckMonitorPowerState,NtGdiDdDDICheckOcclusion,NtGdiDdDDICloseAdapter, NtGdiDdDDICreateAllocation, NtGdiDdDDICreateContext, NtGdiDdDDICreateDCFromMemory, NtGdiDdDDICreateDevice, NtGdiDdDDICreateOverlay, NtGdiDdDDICreateSynchronizationObject, NtGdiDdDDIDestroyAllocation, NtGdiDdDDIDestroyContext, NtGdiDdDDIDestroyDCFromMemory, NtGdiDdDDIDestroyDevice, NtGdiDdDDIDestroyOverlay, NtGdiDdDDIDestroySynchronizationObject, NtGdiDdDDIEscape, NtGdiDdDDIFlipOverlay, NtGdiDdDDIGetContextSchedulingPriority, NtGdiDdDDIGetDeviceState, NtGdiDdDDIGetDisplayModeList, NtGdiDdDDIGetMultisampleMethodList, NtGdiDdDDIGetPresentHistory, NtGdiDdDDIGetProcessSchedulingPriorityClass, NtGdiDdDDIGetRuntimeData, NtGdiDdDDIGetScanLine, NtGdiDdDDIGetSharedPrimaryHandle, NtGdiDdDDIInvalidateActiveVidPn, NtGdiDdDDILock, NtGdiDdDDIOpenAdapterFromDeviceName, NtGdiDdDDIOpenAdapterFromHdc, NtGdiDdDDIOpenResource, NtGdiDdDDIPollDisplayChildren, NtGdiDdDDIPresent, > NtGdiDdDDIQueryAdapterInfo, NtGdiDdDDIQueryAllocationResidency, NtGdiDdDDIQueryResourceInfo, NtGdiDdDDIQueryStatistics, NtGdiDdDDIReleaseProcessVidPnSourceOwners, NtGdiDdDDIRender, NtGdiDdDDISetAllocationPriority, NtGdiDdDDISetContextSchedulingPriority, NtGdiDdDDISetDisplayMode, NtGdiDdDDISetDisplayPrivateDriverFormat, NtGdiDdDDISetGammaRamp, NtGdiDdDDISetProcessSchedulingPriorityClass, NtGdiDdDDISetQueuedLimit, NtGdiDdDDISetVidPnSourceOwner, NtGdiDdDDISharedPrimaryLockNotification, NtGdiDdDDISharedPrimaryUnLockNotification, NtGdiDdDDISignalSynchronizationObject, NtGdiDdDDIUnlock, NtGdiDdDDIUpdateOverlay, NtGdiDdDDIWaitForIdle, NtGdiDdDDIWaitForSynchronizationObject, NtGdiDdDDIWaitForVerticalBlankEvent, NtGdiDDCCIGetCapabilitiesString, NtGdiDDCCIGetCapabilitiesStringLength, NtGdiDDCCIGetTimingReport, NtGdiDDCCIGetVCPFeature, NtGdiDDCCISaveCurrentSettings, NtGdiDDCCISetVCPFeature, > > Added: > branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c (with props) > Modified: > branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h > branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c > branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db > > Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h > URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/include/reactos/w… > ============================================================================== > --- branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) > +++ branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun May 18 13:33:27 2008 > @@ -1,667 +1,738 @@ > -/* > - * COPYRIGHT: See COPYING in the top level directory > - * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) > - * FILE: include/win32k/ntgdityp.h > - * PURPOSE: Win32 Shared GDI Types for NtGdi* > - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) > - */ > - > -/* INCLUDES ******************************************************************/ > - > -#ifndef _NTGDITYP_ > -#define _NTGDITYP_ > - > -/* ENUMERATIONS **************************************************************/ > - > -typedef enum _ARCTYPE > -{ > - GdiTypeArc, > - GdiTypeArcTo, > - GdiTypeChord, > - GdiTypePie, > -} ARCTYPE, *PARCTYPE; > - > -typedef enum _PALFUNCTYPE > -{ > - GdiPalAnimate, > - GdiPalSetEntries, > - GdiPalGetEntries, > - GdiPalGetSystemEntries, > - GdiPalSetColorTable, > - GdiPalGetColorTable, > -} PALFUNCTYPE, *PPALFUNCTYPE; > - > -typedef enum _POLYFUNCTYPE > -{ > - GdiPolyPolygon = 1, > - GdiPolyPolyLine, > - GdiPolyBezier, > - GdiPolyLineTo, > - GdiPolyBezierTo, > - GdiPolyPolyRgn, > -} POLYFUNCTYPE, *PPOLYFUNCTYPE; > - > -typedef enum _GETDCDWORD > -{ > - GdiGetJournal, > - GdiGetRelAbs, > - GdiGetBreakExtra, > - GdiGerCharBreak, > - GdiGetArcDirection, > - GdiGetEMFRestorDc, > - GdiGetFontLanguageInfo, > - GdiGetIsMemDc, > - GdiGetMapMode, > - GdiGetTextCharExtra, > -} GETDCDWORD, *PGETDCDWORD; > - > -typedef enum _GETSETDCDWORD > -{ > - GdiGetSetCopyCount = 2, > - GdiGetSetTextAlign, > - GdiGetSetRelAbs, > - GdiGetSetTextCharExtra, > - GdiGetSetSelectFont, > - GdiGetSetMapperFlagsInternal, > - GdiGetSetMapMode, > - GdiGetSetArcDirection, > -} GETSETDCDWORD, *PGETSETDCDWORD; > - > -typedef enum _GETDCPOINT > -{ > - GdiGetViewPortExt = 1, > - GdiGetWindowExt, > - GdiGetViewPortOrg, > - GdiGetWindowOrg, > - GdiGetAspectRatioFilter, > - GdiGetDCOrg = 6, > -} GETDCPOINT, *PGETDCPOINT; > - > - > -typedef enum _GDIBATCHCMD > -{ > - GdiBCPatBlt, > - GdiBCPolyPatBlt, > - GdiBCTextOut, > - GdiBCExtTextOut, > - GdiBCSetBrushOrg, > - GdiBCExtSelClipRgn, > - GdiBCSelObj, > - GdiBCDelObj, > - GdiBCDelRgn, > -} GDIBATCHCMD, *PGDIBATCHCMD; > - > -typedef enum _TRANSFORMTYPE > -{ > - GdiDpToLp, > - GdiLpToDp, > -} TRANSFORMTYPE, *PTRANSFORMTYPE; > - > -typedef enum GDIObjType > -{ > - GDIObjType_DEF_TYPE = 0x00, > - GDIObjType_DC_TYPE = 0x01, > - GDIObjType_UNUSED1_TYPE = 0x02, > - GDIObjType_UNUSED2_TYPE = 0x03, > - GDIObjType_RGN_TYPE = 0x04, > - GDIObjType_SURF_TYPE = 0x05, > - GDIObjType_CLIENTOBJ_TYPE = 0x06, > - GDIObjType_PATH_TYPE = 0x07, > - GDIObjType_PAL_TYPE = 0x08, > - GDIObjType_ICMLCS_TYPE = 0x09, > - GDIObjType_LFONT_TYPE = 0x0a, > - GDIObjType_RFONT_TYPE = 0x0b, > - GDIObjType_PFE_TYPE = 0x0c, > - GDIObjType_PFT_TYPE = 0x0d, > - GDIObjType_ICMCXF_TYPE = 0x0e, > - GDIObjType_SPRITE_TYPE = 0x0f, > - GDIObjType_BRUSH_TYPE = 0x10, > - GDIObjType_UMPD_TYPE = 0x11, > - GDIObjType_UNUSED4_TYPE = 0x12, > - GDIObjType_SPACE_TYPE = 0x13, > - GDIObjType_UNUSED5_TYPE = 0x14, > - GDIObjType_META_TYPE = 0x15, > - GDIObjType_EFSTATE_TYPE = 0x16, > - GDIObjType_BMFD_TYPE = 0x17, > - GDIObjType_VTFD_TYPE = 0x18, > - GDIObjType_TTFD_TYPE = 0x19, > - GDIObjType_RC_TYPE = 0x1a, > - GDIObjType_TEMP_TYPE = 0x1b, > - GDIObjType_DRVOBJ_TYPE = 0x1c, > - GDIObjType_DCIOBJ_TYPE = 0x1d, > - GDIObjType_SPOOL_TYPE = 0x1e, > - GDIObjType_MAX_TYPE = 0x1e, > - GDIObjTypeTotal = 0x1f, > -} GDIOBJTYPE, *PGDIOBJTYPE; > - > -typedef enum GDILoObjType > -{ > - GDILoObjType_LO_BRUSH_TYPE = 0x100000, > - GDILoObjType_LO_DC_TYPE = 0x10000, > - GDILoObjType_LO_BITMAP_TYPE = 0x50000, > - GDILoObjType_LO_PALETTE_TYPE = 0x80000, > - GDILoObjType_LO_FONT_TYPE = 0xa0000, > - GDILoObjType_LO_REGION_TYPE = 0x40000, > - GDILoObjType_LO_ICMLCS_TYPE = 0x90000, > - GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, > - GDILoObjType_LO_ALTDC_TYPE = 0x210000, > - GDILoObjType_LO_PEN_TYPE = 0x300000, > - GDILoObjType_LO_EXTPEN_TYPE = 0x500000, > - GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, > - GDILoObjType_LO_METAFILE16_TYPE = 0x260000, > - GDILoObjType_LO_METAFILE_TYPE = 0x460000, > - GDILoObjType_LO_METADC16_TYPE = 0x660000 > -} GDILOOBJTYPE, *PGDILOOBJTYPE; > - > -#define GdiWorldSpaceToPageSpace 0x203 > - > -/* FIXME: Unknown */ > -typedef DWORD FULLSCREENCONTROL; > -typedef DWORD LFTYPE; > - > -/* Public LAST_STOCK = 19, plus 2 more internal entries */ > -#define NB_STOCK_OBJECTS 22 > - > -/* extra stock object: default 1x1 bitmap for memory DCs */ > -#define DEFAULT_BITMAP (21) > - > - > -/* DEFINES *******************************************************************/ > - > -#define GDIBATCHBUFSIZE 0x136*4 > -#define GDI_BATCH_LIMIT 20 > - > -// NtGdiGetCharWidthW Flags > -#define GCW_WIN32 0x0001 > -#define GCW_NOFLOAT 0x0002 > -#define GCW_INDICES 0x0008 > - > -// NtGdiGetCharABCWidthW Flags > -#define GCABCW_NOFLOAT 0x0001 > -#define GCABCW_INDICES 0x0002 > - > -/* CAPS1 support */ > -//#define C1_TRANSPARENT 0x0001 > -#define TC_TT_ABLE 0x0002 > -#define C1_TT_CR_ANY 0x0004 > -#define C1_EMF_COMPLIANT 0x0008 > -#define C1_DIBENGINE 0x0010 > -#define C1_GAMMA_RAMP 0x0040 > -#define C1_REINIT_ABLE 0x0080 > -#define C1_GLYPH_INDEX 0x0100 > -#define C1_BIT_PACKED 0x0200 > -#define C1_BYTE_PACKED 0x0400 > -#define C1_COLORCURSOR 0x0800 > -#define C1_CMYK_ABLE 0x1000 > -#define C1_SLOW_CARD 0x2000 > - > -/* TYPES *********************************************************************/ > - > -typedef PVOID KERNEL_PVOID; > -typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; > -typedef LONG FIX; > - > -typedef struct _CHWIDTHINFO > -{ > - LONG lMaxNegA; > - LONG lMaxNegC; > - LONG lMinWidthD; > -} CHWIDTHINFO, *PCHWIDTHINFO; > - > -typedef struct _UNIVERSAL_FONT_ID > -{ > - DWORD dwUfid[2]; > -} UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; > - > -typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE > -{ > - DWORD dwCsbDefault[2]; > - DWORD dwCsbSupported0; > -} REALIZATION_INFO, *PREALIZATION_INFO; > - > -typedef struct _WIDTHDATA > -{ > - USHORT sOverhang; > - USHORT sHeight; > - USHORT sCharInc; > - USHORT sBreak; > - BYTE jFirst; > - BYTE jLast; > - BYTE jBreak; > - BYTE jDefault; > - USHORT sDBCSInc; > - USHORT sDefaultInc; > -} WIDTHDATA, *PWIDTHDATA; > - > -typedef struct _DEVCAPS // Very similar to GDIINFO > -{ > - ULONG ulVersion; > - ULONG ulTechnology; > - ULONG ulHorzSizeM; > - ULONG ulVertSizeM; > - ULONG ulHorzSize; > - ULONG ulVertSize; > - ULONG ulHorzRes; > - ULONG ulVertRes; > - ULONG ulBitsPixel; > - ULONG ulPlanes; > - ULONG ulNumPens; > - ULONG ulNumFonts; > - ULONG ulNumColors; > - ULONG ulRasterCaps; > - ULONG ulAspectX; > - ULONG ulAspectY; > - ULONG ulAspectXY; > - ULONG ulLogPixelsX; > - ULONG ulLogPixelsY; > - ULONG ulSizePalette; > - ULONG ulColorRes; > - ULONG ulPhysicalWidth; > - ULONG ulPhysicalHeight; > - ULONG ulPhysicalOffsetX; > - ULONG ulPhysicalOffsetY; > - ULONG ulTextCaps; > - ULONG ulVRefresh; > - ULONG ulDesktopHorzRes; > - ULONG ulDesktopVertRes; > - ULONG ulBltAlignment; > - ULONG ulReserved[4]; > - ULONG ulShadeBlend; > - ULONG ulColorMgmtCaps; > -} DEVCAPS, *PDEVCAPS; > - > -/* Gdi Handle Cache Types and Structures */ > -#define GDI_CACHED_HADNLE_TYPES 4 > -#define CACHE_BRUSH_ENTRIES 10 > -#define CACHE_PEN_ENTRIES 8 > -#define CACHE_REGION_ENTRIES 8 > -#define CACHE_LFONT_ENTRIES 1 > - > -typedef enum _HANDLECACHETYPE > -{ > - hctBrushHandle, > - hctPenHandle, > - hctRegionHandle, > - hctLFontHandle > -} HANDLECACHETYPE,*PHANDLECACHETYPE; > - > -typedef struct _GDIHANDLECACHE > -{ > - ULONG ulLock; > - ULONG ulNumHandles[GDI_CACHED_HADNLE_TYPES]; > - HANDLE Handle[CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES+CACHE_REGION_ENTRIES+CACHE_LFONT_ENTRIES]; > -} GDIHANDLECACHE, *PGDIHANDLECACHE; > - > -/* Font Structures */ > -typedef struct _TMDIFF > -{ > - ULONG cjotma; > - CHAR chFirst; > - CHAR chLast; > - CHAR ChDefault; > - CHAR ChBreak; > -} TMDIFF, *PTMDIFF; > - > -typedef struct _TMW_INTERNAL > -{ > - TEXTMETRICW TextMetric; > - TMDIFF Diff; > -} TMW_INTERNAL, *PTMW_INTERNAL; > - > -typedef struct _NTMW_INTERNAL > -{ > - TMDIFF tmd; > - NEWTEXTMETRICEXW ntmw; > -} NTMW_INTERNAL, *PNTMW_INTERNAL; > - > -typedef struct _ENUMFONTDATAW > -{ > - ULONG cbSize; > - ULONG ulNtmwiOffset; > - DWORD dwFontType; > - ENUMLOGFONTEXDVW elfexdv; /* variable size! */ > - /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ > -} ENUMFONTDATAW, *PENUMFONTDATAW; > - > -/* Number Representation */ > -typedef struct _EFLOAT_S > -{ > - LONG lMant; > - LONG lExp; > -} EFLOAT_S; > - > -/* XFORM Structures */ > -typedef struct _MATRIX_S > -{ > - EFLOAT_S efM11; > - EFLOAT_S efM12; > - EFLOAT_S efM21; > - EFLOAT_S efM22; > - EFLOAT_S efDx; > - EFLOAT_S efDy; > - FIX fxDx; > - FIX fxDy; > - FLONG flAccel; > -} MATRIX_S; > - > -/* Gdi XForm storage union */ > -typedef union > -{ > - FLOAT f; > - ULONG l; > -} gxf_long; > - > -typedef struct _CFONT > -{ > - struct _CFONT *pcfNext; > - HFONT hf; > - ULONG cRef; // Count of all pointers to this CFONT. > - FLONG fl; > - LONG lHeight; // Precomputed logical height. > - HDC hdc; // HDC of realization. 0 for display. > - EFLOAT_S efM11; // efM11 of WtoD of DC of realization > - EFLOAT_S efM22; // efM22 of WtoD of DC of realization > - EFLOAT_S efDtoWBaseline; // Precomputed back transform. (FXtoL) > - EFLOAT_S efDtoWAscent; // Precomputed back transform. (FXtoL) > - WIDTHDATA wd; > - FLONG flInfo; > - USHORT sWidth[256]; // Widths in pels. > - ULONG ulAveWidth; // bogus average used by USER > - TMW_INTERNAL tmw; // cached metrics > - LOCALESIGNATURE lsLocSig; // font signature information > -} CFONT, *PCFONT; > - > -// > -// GDI Batch structures. > -// > -typedef struct _GDIBATCHHDR > -{ > - SHORT Size; > - SHORT Cmd; > -} GDIBATCHHDR, *PGDIBATCHHDR; > - > -typedef struct _GDIBSPATBLT > -{ > - GDIBATCHHDR gbHdr; > - int nXLeft; > - int nYLeft; > - int nWidth; > - int nHeight; > - HANDLE hbrush; > - DWORD dwRop; > - COLORREF crForegroundClr; > - COLORREF crBackgroundClr; > - COLORREF crBrushClr; > - INT IcmBrushColor; > - POINTL ptlViewportOrg; > - ULONG ulForegroundClr; > - ULONG ulBackgroundClr; > - ULONG ulBrushClr; > -} GDIBSPATBLT, *PGDIBSPATBLT; > - > -#ifndef _NTUSRTYP_ > -typedef struct _PATRECT > -{ > - RECT r; > - HBRUSH hBrush; > -} PATRECT, * PPATRECT; > - > -typedef struct _W32CLIENTINFO > -{ > - ULONG CI_flags; > - ULONG cSpins; > - ULONG ulWindowsVersion; > - ULONG ulAppCompatFlags; > - ULONG ulAppCompatFlags2; > - ULONG W32ClientInfo[57]; > -} W32CLIENTINFO, *PW32CLIENTINFO; > -#endif > - > -typedef struct _GDIBSPPATBLT > -{ > - GDIBATCHHDR gbHdr; > - DWORD rop4; > - DWORD Mode; > - DWORD Count; > - COLORREF crForegroundClr; > - COLORREF crBackgroundClr; > - COLORREF crBrushClr; > - ULONG ulForegroundClr; > - ULONG ulBackgroundClr; > - ULONG ulBrushClr; > - POINTL ptlViewportOrg; > - PATRECT pRect[1]; // POLYPATBLT > -} GDIBSPPATBLT, *PGDIBSPPATBLT; > - > -typedef struct _GDIBSTEXTOUT > -{ > - GDIBATCHHDR gbHdr; > - COLORREF crForegroundClr; > - COLORREF crBackgroundClr; > - LONG lmBkMode; > - ULONG ulForegroundClr; > - ULONG ulBackgroundClr; > - int x; > - int y; > - UINT Options; > - RECT Rect; > - DWORD iCS_CP; > - UINT cbCount; > - UINT Size; > - HANDLE hlfntNew; > - FLONG flTextAlign; > - POINTL ptlViewportOrg; > - WCHAR String[2]; > -} GDIBSTEXTOUT, *PGDIBSTEXTOUT; > - > -typedef struct _GDIBSEXTTEXTOUT > -{ > - GDIBATCHHDR gbHdr; > - UINT Count; > - UINT Options; > - RECT Rect; > - POINTL ptlViewportOrg; > - ULONG ulBackgroundClr; > -} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT; > - > -typedef struct _GDIBSSETBRHORG > -{ > - GDIBATCHHDR gbHdr; > - POINTL ptlBrushOrigin; > -} GDIBSSETBRHORG, *PGDIBSSETBRHORG; > - > -typedef struct _GDIBSEXTSELCLPRGN > -{ > - GDIBATCHHDR gbHdr; > - int fnMode; > - LONG right; > - LONG bottom; > - LONG left; > - LONG top; > -} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; > -// > -// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. > -typedef struct _GDIBSOBJECT > -{ > - GDIBATCHHDR gbHdr; > - HGDIOBJ hgdiobj; > -} GDIBSOBJECT, *PGDIBSOBJECT; > - > -// > -// Driver Functions > -// > -typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); > -typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *, ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); > -typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); > -typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); > -typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); > -typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); > -typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); > -typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); > -typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); > -typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); > -typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); > -typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); > -typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); > -typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); > -typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); > -typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); > -typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX, ULONG); > -typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); > -typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); > -typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); > -typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); > -typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*); > -typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); > -typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG, BRUSHOBJ*, DWORD); > -typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); > -typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); > -typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); > -typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); > -typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); > -typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); > -typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); > -typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); > -typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); > -typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, LONG, RECTL*, MIX); > -typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); > -typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); > -typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG); > -typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); > -typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); > -typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*); > -typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); > -typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); > -typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG); > -typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*); > -typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG); > -typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); > -typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG); > -typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); > -typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); > -typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, GLYPHDATA*, ULONG, TTPOLYGONHEADER*); > -typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG); > -typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); > -typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); > -typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); > -typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); > -typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); > -typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*); > -typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*); > -typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); > -typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); > -typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV); > -typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR); > -typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); > -typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); > - > -// > -// Most of these are definded in ddk/winddi.h > -// > -typedef struct _DRIVER_FUNCTIONS > -{ > - PGD_ENABLEPDEV EnablePDEV; > - PGD_COMPLETEPDEV CompletePDEV; > - PGD_DISABLEPDEV DisablePDEV; > - PGD_ENABLESURFACE EnableSurface; > - PGD_DISABLESURFACE DisableSurface; > - PGD_ASSERTMODE AssertMode; > - PGD_OFFSET Offset; > - PGD_RESETPDEV ResetPDEV; > - PGD_DISABLEDRIVER DisableDriver; > - PVOID Unknown1; > - PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; > - PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; > - PGD_REALIZEBRUSH RealizeBrush; > - PGD_DITHERCOLOR DitherColor; > - PGD_STROKEPATH StrokePath; > - PGD_FILLPATH FillPath; > - PGD_STROKEANDFILLPATH StrokeAndFillPath; > - PGD_PAINT Paint; > - PGD_BITBLT BitBlt; > - PGD_COPYBITS CopyBits; > - PGD_STRETCHBLT StretchBlt; > - PVOID Unknown2; > - PGD_SETPALETTE SetPalette; > - PGD_TEXTOUT TextOut; > - PGD_ESCAPE Escape; > - PGD_DRAWESCAPE DrawEscape; > - PGD_QUERYFONT QueryFont; > - PGD_QUERYFONTTREE QueryFontTree; > - PGD_QUERYFONTDATA QueryFontData; > - PGD_SETPOINTERSHAPE SetPointerShape; > - PGD_MOVEPOINTER MovePointer; > - PGD_LINETO LineTo; > - PGD_SENDPAGE SendPage; > - PGD_STARTPAGE StartPage; > - PGD_ENDDOC EndDoc; > - PGD_STARTDOC StartDoc; > - PVOID Unknown3; > - PGD_GETGLYPHMODE GetGlyphMode; > - PGD_SYNCHRONIZE Synchronize; > - PVOID Unknown4; > - PGD_SAVESCREENBITS SaveScreenBits; > - PGD_GETMODES GetModes; > - PGD_FREE Free; > - PGD_DESTROYFONT DestroyFont; > - PGD_QUERYFONTCAPS QueryFontCaps; > - PGD_LOADFONTFILE LoadFontFile; > - PGD_UNLOADFONTFILE UnloadFontFile; > - PGD_FONTMANAGEMENT FontManagement; > - PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; > - PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; > - PGD_GETTRUETYPEFILE GetTrueTypeFile; > - PGD_QUERYFONTFILE QueryFontFile; > - PFN_DrvMovePanning MovePanning; > - PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; > - PGD_SETPIXELFORMAT SetPixelFormat; > - PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; > - PGD_SWAPBUFFERS SwapBuffers; > - PGD_STARTBANDING StartBanding; > - PGD_NEXTBAND NextBand; > - PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; > - PGD_ENABLEDIRECTDRAW EnableDirectDraw; > - PGD_DISABLEDIRECTDRAW DisableDirectDraw; > - PGD_QUERYSPOOLTYPE QuerySpoolType; > - PVOID Unknown5; > - PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; > - PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; > - PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; > - PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; > - PGD_GRADIENTFILL GradientFill; > - PGD_STRETCHBLTROP StretchBltROP; > - PFN_DrvPlgBlt PlgBlt; > - PGD_ALPHABLEND AlphaBlend; > - PVOID SynthesizeFont; > - PVOID GetSynthesizedFontFiles; > - PGD_TRANSPARENTBLT TransparentBlt; > - PFN_DrvQueryPerBandInfo QueryPerBandInfo; > - PFN_DrvQueryDeviceSupport QueryDeviceSupport; > - PVOID Reserved1; > - PVOID Reserved2; > - PVOID Reserved3; > - PVOID Reserved4; > - PVOID Reserved5; > - PVOID Reserved6; > - PVOID Reserved7; > - PVOID Reserved8; > - PFN_DrvDeriveSurface DeriveSurface; > - PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; > - PFN_DrvNotify Notify; > - PGD_SYNCHRONIZESURFACE SynchronizeSurface; > - PFN_DrvResetDevice ResetDevice; > - PVOID Reserved9; > - PVOID Reserved10; > - PVOID Reserved11; /* 92 */ > - > - /* ReactOS specify */ > - PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra > -} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; > - > -/* FIXME move to more proper place, Vista syscall */ > -DWORD > -STDCALL > -NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4); > - > - > -#endif > +/* > + * COPYRIGHT: See COPYING in the top level directory > + * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) > + * FILE: include/win32k/ntgdityp.h > + * PURPOSE: Win32 Shared GDI Types for NtGdi* > + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) > + */ > + > +/* INCLUDES ******************************************************************/ > + > +#ifndef _NTGDITYP_ > +#define _NTGDITYP_ > + > +/* ENUMERATIONS **************************************************************/ > + > +typedef enum _ARCTYPE > +{ > + GdiTypeArc, > + GdiTypeArcTo, > + GdiTypeChord, > + GdiTypePie, > +} ARCTYPE, *PARCTYPE; > + > +typedef enum _PALFUNCTYPE > +{ > + GdiPalAnimate, > + GdiPalSetEntries, > + GdiPalGetEntries, > + GdiPalGetSystemEntries, > + GdiPalSetColorTable, > + GdiPalGetColorTable, > +} PALFUNCTYPE, *PPALFUNCTYPE; > + > +typedef enum _POLYFUNCTYPE > +{ > + GdiPolyPolygon = 1, > + GdiPolyPolyLine, > + GdiPolyBezier, > + GdiPolyLineTo, > + GdiPolyBezierTo, > + GdiPolyPolyRgn, > +} POLYFUNCTYPE, *PPOLYFUNCTYPE; > + > +typedef enum _GETDCDWORD > +{ > + GdiGetJournal, > + GdiGetRelAbs, > + GdiGetBreakExtra, > + GdiGerCharBreak, > + GdiGetArcDirection, > + GdiGetEMFRestorDc, > + GdiGetFontLanguageInfo, > + GdiGetIsMemDc, > + GdiGetMapMode, > + GdiGetTextCharExtra, > +} GETDCDWORD, *PGETDCDWORD; > + > +typedef enum _GETSETDCDWORD > +{ > + GdiGetSetCopyCount = 2, > + GdiGetSetTextAlign, > + GdiGetSetRelAbs, > + GdiGetSetTextCharExtra, > + GdiGetSetSelectFont, > + GdiGetSetMapperFlagsInternal, > + GdiGetSetMapMode, > + GdiGetSetArcDirection, > +} GETSETDCDWORD, *PGETSETDCDWORD; > + > +typedef enum _GETDCPOINT > +{ > + GdiGetViewPortExt = 1, > + GdiGetWindowExt, > + GdiGetViewPortOrg, > + GdiGetWindowOrg, > + GdiGetAspectRatioFilter, > + GdiGetDCOrg = 6, > +} GETDCPOINT, *PGETDCPOINT; > + > + > +typedef enum _GDIBATCHCMD > +{ > + GdiBCPatBlt, > + GdiBCPolyPatBlt, > + GdiBCTextOut, > + GdiBCExtTextOut, > + GdiBCSetBrushOrg, > + GdiBCExtSelClipRgn, > + GdiBCSelObj, > + GdiBCDelObj, > + GdiBCDelRgn, > +} GDIBATCHCMD, *PGDIBATCHCMD; > + > +typedef enum _TRANSFORMTYPE > +{ > + GdiDpToLp, > + GdiLpToDp, > +} TRANSFORMTYPE, *PTRANSFORMTYPE; > + > +typedef enum GDIObjType > +{ > + GDIObjType_DEF_TYPE = 0x00, > + GDIObjType_DC_TYPE = 0x01, > + GDIObjType_UNUSED1_TYPE = 0x02, > + GDIObjType_UNUSED2_TYPE = 0x03, > + GDIObjType_RGN_TYPE = 0x04, > + GDIObjType_SURF_TYPE = 0x05, > + GDIObjType_CLIENTOBJ_TYPE = 0x06, > + GDIObjType_PATH_TYPE = 0x07, > + GDIObjType_PAL_TYPE = 0x08, > + GDIObjType_ICMLCS_TYPE = 0x09, > + GDIObjType_LFONT_TYPE = 0x0a, > + GDIObjType_RFONT_TYPE = 0x0b, > + GDIObjType_PFE_TYPE = 0x0c, > + GDIObjType_PFT_TYPE = 0x0d, > + GDIObjType_ICMCXF_TYPE = 0x0e, > + GDIObjType_SPRITE_TYPE = 0x0f, > + GDIObjType_BRUSH_TYPE = 0x10, > + GDIObjType_UMPD_TYPE = 0x11, > + GDIObjType_UNUSED4_TYPE = 0x12, > + GDIObjType_SPACE_TYPE = 0x13, > + GDIObjType_UNUSED5_TYPE = 0x14, > + GDIObjType_META_TYPE = 0x15, > + GDIObjType_EFSTATE_TYPE = 0x16, > + GDIObjType_BMFD_TYPE = 0x17, > + GDIObjType_VTFD_TYPE = 0x18, > + GDIObjType_TTFD_TYPE = 0x19, > + GDIObjType_RC_TYPE = 0x1a, > + GDIObjType_TEMP_TYPE = 0x1b, > + GDIObjType_DRVOBJ_TYPE = 0x1c, > + GDIObjType_DCIOBJ_TYPE = 0x1d, > + GDIObjType_SPOOL_TYPE = 0x1e, > + GDIObjType_MAX_TYPE = 0x1e, > + GDIObjTypeTotal = 0x1f, > +} GDIOBJTYPE, *PGDIOBJTYPE; > + > +typedef enum GDILoObjType > +{ > + GDILoObjType_LO_BRUSH_TYPE = 0x100000, > + GDILoObjType_LO_DC_TYPE = 0x10000, > + GDILoObjType_LO_BITMAP_TYPE = 0x50000, > + GDILoObjType_LO_PALETTE_TYPE = 0x80000, > + GDILoObjType_LO_FONT_TYPE = 0xa0000, > + GDILoObjType_LO_REGION_TYPE = 0x40000, > + GDILoObjType_LO_ICMLCS_TYPE = 0x90000, > + GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, > + GDILoObjType_LO_ALTDC_TYPE = 0x210000, > + GDILoObjType_LO_PEN_TYPE = 0x300000, > + GDILoObjType_LO_EXTPEN_TYPE = 0x500000, > + GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, > + GDILoObjType_LO_METAFILE16_TYPE = 0x260000, > + GDILoObjType_LO_METAFILE_TYPE = 0x460000, > + GDILoObjType_LO_METADC16_TYPE = 0x660000 > +} GDILOOBJTYPE, *PGDILOOBJTYPE; > + > +#define GdiWorldSpaceToPageSpace 0x203 > + > +/* FIXME: Unknown */ > +typedef DWORD FULLSCREENCONTROL; > +typedef DWORD LFTYPE; > + > +/* Public LAST_STOCK = 19, plus 2 more internal entries */ > +#define NB_STOCK_OBJECTS 22 > + > +/* extra stock object: default 1x1 bitmap for memory DCs */ > +#define DEFAULT_BITMAP (21) > + > + > +/* DEFINES *******************************************************************/ > + > +#define GDIBATCHBUFSIZE 0x136*4 > +#define GDI_BATCH_LIMIT 20 > + > +// NtGdiGetCharWidthW Flags > +#define GCW_WIN32 0x0001 > +#define GCW_NOFLOAT 0x0002 > +#define GCW_INDICES 0x0008 > + > +// NtGdiGetCharABCWidthW Flags > +#define GCABCW_NOFLOAT 0x0001 > +#define GCABCW_INDICES 0x0002 > + > +/* CAPS1 support */ > +//#define C1_TRANSPARENT 0x0001 > +#define TC_TT_ABLE 0x0002 > +#define C1_TT_CR_ANY 0x0004 > +#define C1_EMF_COMPLIANT 0x0008 > +#define C1_DIBENGINE 0x0010 > +#define C1_GAMMA_RAMP 0x0040 > +#define C1_REINIT_ABLE 0x0080 > +#define C1_GLYPH_INDEX 0x0100 > +#define C1_BIT_PACKED 0x0200 > +#define C1_BYTE_PACKED 0x0400 > +#define C1_COLORCURSOR 0x0800 > +#define C1_CMYK_ABLE 0x1000 > +#define C1_SLOW_CARD 0x2000 > + > +/* TYPES *********************************************************************/ > + > +typedef PVOID KERNEL_PVOID; > +typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; > +typedef LONG FIX; > + > +typedef struct _CHWIDTHINFO > +{ > + LONG lMaxNegA; > + LONG lMaxNegC; > + LONG lMinWidthD; > +} CHWIDTHINFO, *PCHWIDTHINFO; > + > +typedef struct _UNIVERSAL_FONT_ID > +{ > + DWORD dwUfid[2]; > +} UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; > + > +typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE > +{ > + DWORD dwCsbDefault[2]; > + DWORD dwCsbSupported0; > +} REALIZATION_INFO, *PREALIZATION_INFO; > + > +typedef struct _WIDTHDATA > +{ > + USHORT sOverhang; > + USHORT sHeight; > + USHORT sCharInc; > + USHORT sBreak; > + BYTE jFirst; > + BYTE jLast; > + BYTE jBreak; > + BYTE jDefault; > + USHORT sDBCSInc; > + USHORT sDefaultInc; > +} WIDTHDATA, *PWIDTHDATA; > + > +typedef struct _DEVCAPS // Very similar to GDIINFO > +{ > + ULONG ulVersion; > + ULONG ulTechnology; > + ULONG ulHorzSizeM; > + ULONG ulVertSizeM; > + ULONG ulHorzSize; > + ULONG ulVertSize; > + ULONG ulHorzRes; > + ULONG ulVertRes; > + ULONG ulBitsPixel; > + ULONG ulPlanes; > + ULONG ulNumPens; > + ULONG ulNumFonts; > + ULONG ulNumColors; > + ULONG ulRasterCaps; > + ULONG ulAspectX; > + ULONG ulAspectY; > + ULONG ulAspectXY; > + ULONG ulLogPixelsX; > + ULONG ulLogPixelsY; > + ULONG ulSizePalette; > + ULONG ulColorRes; > + ULONG ulPhysicalWidth; > + ULONG ulPhysicalHeight; > + ULONG ulPhysicalOffsetX; > + ULONG ulPhysicalOffsetY; > + ULONG ulTextCaps; > + ULONG ulVRefresh; > + ULONG ulDesktopHorzRes; > + ULONG ulDesktopVertRes; > + ULONG ulBltAlignment; > + ULONG ulReserved[4]; > + ULONG ulShadeBlend; > + ULONG ulColorMgmtCaps; > +} DEVCAPS, *PDEVCAPS; > + > +/* Gdi Handle Cache Types and Structures */ > +#define GDI_CACHED_HADNLE_TYPES 4 > +#define CACHE_BRUSH_ENTRIES 10 > +#define CACHE_PEN_ENTRIES 8 > +#define CACHE_REGION_ENTRIES 8 > +#define CACHE_LFONT_ENTRIES 1 > + > +typedef enum _HANDLECACHETYPE > +{ > + hctBrushHandle, > + hctPenHandle, > + hctRegionHandle, > + hctLFontHandle > +} HANDLECACHETYPE,*PHANDLECACHETYPE; > + > +typedef struct _GDIHANDLECACHE > +{ > + ULONG ulLock; > + ULONG ulNumHandles[GDI_CACHED_HADNLE_TYPES]; > + HANDLE Handle[CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES+CACHE_REGION_ENTRIES+CACHE_LFONT_ENTRIES]; > +} GDIHANDLECACHE, *PGDIHANDLECACHE; > + > +/* Font Structures */ > +typedef struct _TMDIFF > +{ > + ULONG cjotma; > + CHAR chFirst; > + CHAR chLast; > + CHAR ChDefault; > + CHAR ChBreak; > +} TMDIFF, *PTMDIFF; > + > +typedef struct _TMW_INTERNAL > +{ > + TEXTMETRICW TextMetric; > + TMDIFF Diff; > +} TMW_INTERNAL, *PTMW_INTERNAL; > + > +typedef struct _NTMW_INTERNAL > +{ > + TMDIFF tmd; > + NEWTEXTMETRICEXW ntmw; > +} NTMW_INTERNAL, *PNTMW_INTERNAL; > + > +typedef struct _ENUMFONTDATAW > +{ > + ULONG cbSize; > + ULONG ulNtmwiOffset; > + DWORD dwFontType; > + ENUMLOGFONTEXDVW elfexdv; /* variable size! */ > + /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ > +} ENUMFONTDATAW, *PENUMFONTDATAW; > + > +/* Number Representation */ > +typedef struct _EFLOAT_S > +{ > + LONG lMant; > + LONG lExp; > +} EFLOAT_S; > + > +/* XFORM Structures */ > +typedef struct _MATRIX_S > +{ > + EFLOAT_S efM11; > + EFLOAT_S efM12; > + EFLOAT_S efM21; > + EFLOAT_S efM22; > + EFLOAT_S efDx; > + EFLOAT_S efDy; > + FIX fxDx; > + FIX fxDy; > + FLONG flAccel; > +} MATRIX_S; > + > +/* Gdi XForm storage union */ > +typedef union > +{ > + FLOAT f; > + ULONG l; > +} gxf_long; > + > +typedef struct _CFONT > +{ > + struct _CFONT *pcfNext; > + HFONT hf; > + ULONG cRef; // Count of all pointers to this CFONT. > + FLONG fl; > + LONG lHeight; // Precomputed logical height. > + HDC hdc; // HDC of realization. 0 for display. > + EFLOAT_S efM11; // efM11 of WtoD of DC of realization > + EFLOAT_S efM22; // efM22 of WtoD of DC of realization > + EFLOAT_S efDtoWBaseline; // Precomputed back transform. (FXtoL) > + EFLOAT_S efDtoWAscent; // Precomputed back transform. (FXtoL) > + WIDTHDATA wd; > + FLONG flInfo; > + USHORT sWidth[256]; // Widths in pels. > + ULONG ulAveWidth; // bogus average used by USER > + TMW_INTERNAL tmw; // cached metrics > + LOCALESIGNATURE lsLocSig; // font signature information > +} CFONT, *PCFONT; > + > +// > +// GDI Batch structures. > +// > +typedef struct _GDIBATCHHDR > +{ > + SHORT Size; > + SHORT Cmd; > +} GDIBATCHHDR, *PGDIBATCHHDR; > + > +typedef struct _GDIBSPATBLT > +{ > + GDIBATCHHDR gbHdr; > + int nXLeft; > + int nYLeft; > + int nWidth; > + int nHeight; > + HANDLE hbrush; > + DWORD dwRop; > + COLORREF crForegroundClr; > + COLORREF crBackgroundClr; > + COLORREF crBrushClr; > + INT IcmBrushColor; > + POINTL ptlViewportOrg; > + ULONG ulForegroundClr; > + ULONG ulBackgroundClr; > + ULONG ulBrushClr; > +} GDIBSPATBLT, *PGDIBSPATBLT; > + > +#ifndef _NTUSRTYP_ > +typedef struct _PATRECT > +{ > + RECT r; > + HBRUSH hBrush; > +} PATRECT, * PPATRECT; > + > +typedef struct _W32CLIENTINFO > +{ > + ULONG CI_flags; > + ULONG cSpins; > + ULONG ulWindowsVersion; > + ULONG ulAppCompatFlags; > + ULONG ulAppCompatFlags2; > + ULONG W32ClientInfo[57]; > +} W32CLIENTINFO, *PW32CLIENTINFO; > +#endif > + > +typedef struct _GDIBSPPATBLT > +{ > + GDIBATCHHDR gbHdr; > + DWORD rop4; > + DWORD Mode; > + DWORD Count; > + COLORREF crForegroundClr; > + COLORREF crBackgroundClr; > + COLORREF crBrushClr; > + ULONG ulForegroundClr; > + ULONG ulBackgroundClr; > + ULONG ulBrushClr; > + POINTL ptlViewportOrg; > + PATRECT pRect[1]; // POLYPATBLT > +} GDIBSPPATBLT, *PGDIBSPPATBLT; > + > +typedef struct _GDIBSTEXTOUT > +{ > + GDIBATCHHDR gbHdr; > + COLORREF crForegroundClr; > + COLORREF crBackgroundClr; > + LONG lmBkMode; > + ULONG ulForegroundClr; > + ULONG ulBackgroundClr; > + int x; > + int y; > + UINT Options; > + RECT Rect; > + DWORD iCS_CP; > + UINT cbCount; > + UINT Size; > + HANDLE hlfntNew; > + FLONG flTextAlign; > + POINTL ptlViewportOrg; > + WCHAR String[2]; > +} GDIBSTEXTOUT, *PGDIBSTEXTOUT; > + > +typedef struct _GDIBSEXTTEXTOUT > +{ > + GDIBATCHHDR gbHdr; > + UINT Count; > + UINT Options; > + RECT Rect; > + POINTL ptlViewportOrg; > + ULONG ulBackgroundClr; > +} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT; > + > +typedef struct _GDIBSSETBRHORG > +{ > + GDIBATCHHDR gbHdr; > + POINTL ptlBrushOrigin; > +} GDIBSSETBRHORG, *PGDIBSSETBRHORG; > + > +typedef struct _GDIBSEXTSELCLPRGN > +{ > + GDIBATCHHDR gbHdr; > + int fnMode; > + LONG right; > + LONG bottom; > + LONG left; > + LONG top; > +} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; > +// > +// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. > +typedef struct _GDIBSOBJECT > +{ > + GDIBATCHHDR gbHdr; > + HGDIOBJ hgdiobj; > +} GDIBSOBJECT, *PGDIBSOBJECT; > + > +// > +// Driver Functions > +// > +typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); > +typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *, ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); > +typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); > +typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); > +typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); > +typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); > +typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); > +typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); > +typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); > +typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); > +typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); > +typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); > +typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); > +typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); > +typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); > +typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); > +typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX, ULONG); > +typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); > +typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); > +typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); > +typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); > +typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*); > +typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); > +typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG, BRUSHOBJ*, DWORD); > +typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); > +typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); > +typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); > +typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); > +typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); > +typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); > +typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); > +typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); > +typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); > +typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, LONG, RECTL*, MIX); > +typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); > +typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); > +typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG); > +typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); > +typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); > +typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*); > +typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); > +typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); > +typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG); > +typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*); > +typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG); > +typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); > +typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG); > +typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); > +typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); > +typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, GLYPHDATA*, ULONG, TTPOLYGONHEADER*); > +typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG); > +typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); > +typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); > +typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); > +typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); > +typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); > +typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*); > +typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*); > +typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); > +typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); > +typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV); > +typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR); > +typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); > +typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); > + > +// > +// Most of these are definded in ddk/winddi.h > +// > +typedef struct _DRIVER_FUNCTIONS > +{ > + PGD_ENABLEPDEV EnablePDEV; > + PGD_COMPLETEPDEV CompletePDEV; > + PGD_DISABLEPDEV DisablePDEV; > + PGD_ENABLESURFACE EnableSurface; > + PGD_DISABLESURFACE DisableSurface; > + PGD_ASSERTMODE AssertMode; > + PGD_OFFSET Offset; > + PGD_RESETPDEV ResetPDEV; > + PGD_DISABLEDRIVER DisableDriver; > + PVOID Unknown1; > + PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; > + PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; > + PGD_REALIZEBRUSH RealizeBrush; > + PGD_DITHERCOLOR DitherColor; > + PGD_STROKEPATH StrokePath; > + PGD_FILLPATH FillPath; > + PGD_STROKEANDFILLPATH StrokeAndFillPath; > + PGD_PAINT Paint; > + PGD_BITBLT BitBlt; > + PGD_COPYBITS CopyBits; > + PGD_STRETCHBLT StretchBlt; > + PVOID Unknown2; > + PGD_SETPALETTE SetPalette; > + PGD_TEXTOUT TextOut; > + PGD_ESCAPE Escape; > + PGD_DRAWESCAPE DrawEscape; > + PGD_QUERYFONT QueryFont; > + PGD_QUERYFONTTREE QueryFontTree; > + PGD_QUERYFONTDATA QueryFontData; > + PGD_SETPOINTERSHAPE SetPointerShape; > + PGD_MOVEPOINTER MovePointer; > + PGD_LINETO LineTo; > + PGD_SENDPAGE SendPage; > + PGD_STARTPAGE StartPage; > + PGD_ENDDOC EndDoc; > + PGD_STARTDOC StartDoc; > + PVOID Unknown3; > + PGD_GETGLYPHMODE GetGlyphMode; > + PGD_SYNCHRONIZE Synchronize; > + PVOID Unknown4; > + PGD_SAVESCREENBITS SaveScreenBits; > + PGD_GETMODES GetModes; > + PGD_FREE Free; > + PGD_DESTROYFONT DestroyFont; > + PGD_QUERYFONTCAPS QueryFontCaps; > + PGD_LOADFONTFILE LoadFontFile; > + PGD_UNLOADFONTFILE UnloadFontFile; > + PGD_FONTMANAGEMENT FontManagement; > + PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; > + PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; > + PGD_GETTRUETYPEFILE GetTrueTypeFile; > + PGD_QUERYFONTFILE QueryFontFile; > + PFN_DrvMovePanning MovePanning; > + PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; > + PGD_SETPIXELFORMAT SetPixelFormat; > + PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; > + PGD_SWAPBUFFERS SwapBuffers; > + PGD_STARTBANDING StartBanding; > + PGD_NEXTBAND NextBand; > + PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; > + PGD_ENABLEDIRECTDRAW EnableDirectDraw; > + PGD_DISABLEDIRECTDRAW DisableDirectDraw; > + PGD_QUERYSPOOLTYPE QuerySpoolType; > + PVOID Unknown5; > + PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; > + PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; > + PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; > + PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; > + PGD_GRADIENTFILL GradientFill; > + PGD_STRETCHBLTROP StretchBltROP; > + PFN_DrvPlgBlt PlgBlt; > + PGD_ALPHABLEND AlphaBlend; > + PVOID SynthesizeFont; > + PVOID GetSynthesizedFontFiles; > + PGD_TRANSPARENTBLT TransparentBlt; > + PFN_DrvQueryPerBandInfo QueryPerBandInfo; > + PFN_DrvQueryDeviceSupport QueryDeviceSupport; > + PVOID Reserved1; > + PVOID Reserved2; > + PVOID Reserved3; > + PVOID Reserved4; > + PVOID Reserved5; > + PVOID Reserved6; > + PVOID Reserved7; > + PVOID Reserved8; > + PFN_DrvDeriveSurface DeriveSurface; > + PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; > + PFN_DrvNotify Notify; > + PGD_SYNCHRONIZESURFACE SynchronizeSurface; > + PFN_DrvResetDevice ResetDevice; > + PVOID Reserved9; > + PVOID Reserved10; > + PVOID Reserved11; /* 92 */ > + > + /* ReactOS specify */ > + PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra > +} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; > + > +/* FIXME move to more proper place, Vista syscall */ > +DWORD STDCALL NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4); > +DWORD STDCALL NtGdiCreateOPMProtectedOutputs(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); > + > +/* Doc exists in msdn see ReactOS def file which D3DKMT* it is, rember I have not check if the doc are correct, > + * it is for the drv, which api it should export. > + * comucate way > + * gdi32.dll -- Direcly syscall --> win33k.sys > + * win33k.sys -- doing direct call to -->dxkrnl.sys (note dxkrnl doing allot work here) > + * dxkrnl.sys (note dxkrnl doing allot work here) -- the drv export function --> graphic drv, > + * this api should move to more proper place later. > + */ > +DWORD STDCALL NtGdiDdDDICheckExclusiveOwnership(); > +DWORD STDCALL NtGdiDdDDICheckMonitorPowerState(DWORD x1); > +DWORD STDCALL NtGdiDdDDICheckOcclusion(DWORD x1); > +DWORD STDCALL NtGdiDdDDICloseAdapter(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateAllocation(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateContext(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateDCFromMemory(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateDevice(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateOverlay(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateSynchronizationObject(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroyAllocation(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroyContext(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroyDCFromMemory(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroyDevice(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroyOverlay(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroySynchronizationObject(DWORD x1); > +DWORD STDCALL NtGdiDdDDIEscape(DWORD x1); > +DWORD STDCALL NtGdiDdDDIFlipOverlay(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetContextSchedulingPriority(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetDeviceState(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetDisplayModeList(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetMultisampleMethodList(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetPresentHistory(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetProcessSchedulingPriorityClass(DWORD x1, DWORD x2); > +DWORD STDCALL NtGdiDdDDIGetRuntimeData(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetScanLine(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetSharedPrimaryHandle(DWORD x1); > +DWORD STDCALL NtGdiDdDDIInvalidateActiveVidPn(DWORD x1); > +DWORD STDCALL NtGdiDdDDILock(DWORD x1); > +DWORD STDCALL NtGdiDdDDIOpenAdapterFromDeviceName(DWORD x1); > +DWORD STDCALL NtGdiDdDDIOpenAdapterFromHdc(DWORD x1); > +DWORD STDCALL NtGdiDdDDIOpenResource(DWORD x1); > +DWORD STDCALL NtGdiDdDDIPollDisplayChildren(DWORD x1); > +DWORD STDCALL NtGdiDdDDIPresent(DWORD x1); > +DWORD STDCALL NtGdiDdDDIQueryAdapterInfo(DWORD x1); > +DWORD STDCALL NtGdiDdDDIQueryAllocationResidency(DWORD x1); > +DWORD STDCALL NtGdiDdDDIQueryResourceInfo(DWORD x1); > +DWORD STDCALL NtGdiDdDDIQueryStatistics(DWORD x1); > +DWORD STDCALL NtGdiDdDDIReleaseProcessVidPnSourceOwners(DWORD x1); > +DWORD STDCALL NtGdiDdDDIRender(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetAllocationPriority(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetContextSchedulingPriority(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetDisplayMode(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetDisplayPrivateDriverFormat(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetGammaRamp(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, x2); > +DWORD STDCALL NtGdiDdDDISetQueuedLimit(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetVidPnSourceOwner(DWORD x1); > +DWORD STDCALL NtGdiDdDDISharedPrimaryLockNotification(DWORD x1); > +DWORD STDCALL NtGdiDdDDISharedPrimaryUnLockNotification(DWORD x1); > +DWORD STDCALL NtGdiDdDDISignalSynchronizationObject(DWORD x1); > +DWORD STDCALL NtGdiDdDDIUnlock(DWORD x1); > +DWORD STDCALL NtGdiDdDDIUpdateOverlay(DWORD x1); > +DWORD STDCALL NtGdiDdDDIWaitForIdle(DWORD x1); > +DWORD STDCALL NtGdiDdDDIWaitForSynchronizationObject(DWORD x1); > +DWORD STDCALL NtGdiDdDDIWaitForVerticalBlankEvent(DWORD x1); > +DWORD STDCALL NtGdiDDCCIGetCapabilitiesString(DWORD x1, DWORD x2, DWORD x3); > +DWORD STDCALL NtGdiDDCCIGetCapabilitiesStringLength(DWORD x1, DWORD x2); > +DWORD STDCALL NtGdiDDCCIGetTimingReport(DWORD x1, DWORD x2); > +DWORD STDCALL NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4); > +DWORD STDCALL NtGdiDDCCISaveCurrentSettings(DWORD x1); > +DWORD STDCALL NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3); > + > + > + > +#endif > > Added: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c > URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… > ============================================================================== > --- branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c (added) > +++ branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c [iso-8859-1] Sun May 18 13:33:27 2008 > @@ -1,0 +1,507 @@ > +/* > + * COPYRIGHT: See COPYING in the top level directory > + * PROJECT: ReactOS kernel > + * PURPOSE: Native DirectDraw implementation > + * FILE: subsys/win32k/ntddraw/d3d.c > + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) > + * REVISION HISTORY: > + * 18/5-2008 Magnus Olsen > + */ > + > + > +#include <w32k.h> > +#include <debug.h> > + > +DWORD > +STDCALL > +NtGdiDdDDICheckExclusiveOwnership() > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICheckMonitorPowerState(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICheckOcclusion(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICloseAdapter(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateAllocation(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateContext(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateDCFromMemory(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateDevice(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateOverlay(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateSynchronizationObject(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIDestroyAllocation(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +NtGdiDdDDIDestroyContext(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIDestroyDCFromMemory(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIDestroyDevice(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIDestroyOverlay(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIDestroySynchronizationObject(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIEscape(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIFlipOverlay(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetContextSchedulingPriority(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetDeviceState(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetDisplayModeList(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetMultisampleMethodList(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetPresentHistory(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetProcessSchedulingPriorityClass > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetRuntimeData(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetScanLine(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetSharedPrimaryHandle(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIInvalidateActiveVidPn(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDILock(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIOpenAdapterFromDeviceName(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIOpenAdapterFromHdc(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIOpenResource(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIPollDisplayChildren(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIPresent(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIQueryAdapterInfo(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIQueryAllocationResidency(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIQueryResourceInfo(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIQueryStatistics(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIReleaseProcessVidPnSourceOwners(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIRender(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetAllocationPriority(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetContextSchedulingPriority(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetDisplayMode(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetDisplayPrivateDriverFormat(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetGammaRamp(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, x2) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetQueuedLimit(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetVidPnSourceOwner(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISharedPrimaryLockNotification(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISharedPrimaryUnLockNotification(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISignalSynchronizationObject(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIUnlock(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIUpdateOverlay(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIWaitForIdle(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIWaitForSynchronizationObject(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIWaitForVerticalBlankEvent(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCIGetCapabilitiesString(DWORD x1, DWORD x2, DWORD x3) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCIGetCapabilitiesStringLength(DWORD x1, DWORD x2) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCIGetTimingReport(DWORD x1, DWORD x2) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCISaveCurrentSettings(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3) > +{ > + UNIMPLEMENTED; > + return 0 > +} > > Propchange: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c > URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… > ============================================================================== > --- branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) > +++ branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun May 18 13:33:27 2008 > @@ -2974,3 +2974,11 @@ > UNIMPLEMENTED; > return 0 > } > + > +DWORD > +STDCALL > +NtGdiCreateOPMProtectedOutputs(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) > +{ > + UNIMPLEMENTED; > + return 0 > +} > > Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db > URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… > ============================================================================== > --- branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) > +++ branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun May 18 13:33:27 2008 > @@ -674,7 +674,70 @@ > # > # > # Vista Syscall add on > -NtGdiConfigureOPMProtectedOutput 4 > +NtGdiConfigureOPMProtectedOutput 4 > +NtGdiCreateOPMProtectedOutputs 5 > +NtGdiDdDDICheckExclusiveOwnership 0 > +NtGdiDdDDICheckMonitorPowerState 1 > +NtGdiDdDDICheckOcclusion 1 > +NtGdiDdDDICloseAdapter 1 > +NtGdiDdDDICreateAllocation 1 > +NtGdiDdDDICreateContext 1 > +NtGdiDdDDICreateDCFromMemory 1 > +NtGdiDdDDICreateDevice 1 > +NtGdiDdDDICreateOverlay 1 > +NtGdiDdDDICreateSynchronizationObject 1 > +NtGdiDdDDIDestroyAllocation 1 > +NtGdiDdDDIDestroyContext 1 > +NtGdiDdDDIDestroyDCFromMemory 1 > +NtGdiDdDDIDestroyDevice 1 > +NtGdiDdDDIDestroyOverlay 1 > +NtGdiDdDDIDestroySynchronizationObject 1 > +NtGdiDdDDIEscape 1 > +NtGdiDdDDIFlipOverlay 1 > +NtGdiDdDDIGetContextSchedulingPriority 1 > +NtGdiDdDDIGetDeviceState 1 > +NtGdiDdDDIGetDisplayModeList 1 > +NtGdiDdDDIGetMultisampleMethodList 1 > +NtGdiDdDDIGetPresentHistory 1 > +NtGdiDdDDIGetProcessSchedulingPriorityClass 2 > +NtGdiDdDDIGetRuntimeData 1 > +NtGdiDdDDIGetScanLine 1 > +NtGdiDdDDIGetSharedPrimaryHandle 1 > +NtGdiDdDDIInvalidateActiveVidPn 1 > +NtGdiDdDDILock 1 > +NtGdiDdDDIOpenAdapterFromDeviceName 1 > +NtGdiDdDDIOpenAdapterFromHdc 1 > +NtGdiDdDDIOpenResource 1 > +NtGdiDdDDIPollDisplayChildren 1 > +NtGdiDdDDIPresent 1 > +NtGdiDdDDIQueryAdapterInfo 1 > +NtGdiDdDDIQueryAllocationResidency 1 > +NtGdiDdDDIQueryResourceInfo 1 > +NtGdiDdDDIQueryStatistics 1 > +NtGdiDdDDIReleaseProcessVidPnSourceOwners 1 > +NtGdiDdDDIRender 1 > +NtGdiDdDDISetAllocationPriority 1 > +NtGdiDdDDISetContextSchedulingPriority 1 > +NtGdiDdDDISetDisplayMode 1 > +NtGdiDdDDISetDisplayPrivateDriverFormat 1 > +NtGdiDdDDISetGammaRamp 1 > +NtGdiDdDDISetProcessSchedulingPriorityClass 1 > +NtGdiDdDDISetQueuedLimit 1 > +NtGdiDdDDISetVidPnSourceOwner 1 > +NtGdiDdDDISharedPrimaryLockNotification 1 > +NtGdiDdDDISharedPrimaryUnLockNotification 1 > +NtGdiDdDDISignalSynchronizationObject 1 > +NtGdiDdDDIUnlock 1 > +NtGdiDdDDIUpdateOverlay 1 > +NtGdiDdDDIWaitForIdle 1 > +NtGdiDdDDIWaitForSynchronizationObject 1 > +NtGdiDdDDIWaitForVerticalBlankEvent 1 > +NtGdiDDCCIGetCapabilitiesString 3 > +NtGdiDDCCIGetCapabilitiesStringLength 2 > +NtGdiDDCCIGetTimingReport 2 > +NtGdiDDCCIGetVCPFeature 4 > +NtGdiDDCCISaveCurrentSettings 1 > +NtGdiDDCCISetVCPFeature 3 > # > # > #ReactOS specific syscalls > > -- Best regards, Alex Ionescu

17 years

2
1
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 33571: Check if the GetWindowsDirectory call succeeded and use PathAppend to prevent a buffer overflow, when WinDir + "\regedit.exe" > MAX_PATH

by Alex Ionescu

Last nitpick: if you can't get the windows directory, just ShellExecute "regedit.exe" directly, as the code originally did -- this is the behavior on Windows, fyi. On Sun, May 18, 2008 at 6:56 PM, <cfinck(a)svn.reactos.org> wrote: > Author: cfinck > Date: Sun May 18 05:56:31 2008 > New Revision: 33571 > > URL: http://svn.reactos.org/svn/reactos?rev=33571&view=rev > Log: > Check if the GetWindowsDirectory call succeeded and use PathAppend to prevent a buffer overflow, when WinDir + "\regedit.exe" > MAX_PATH > > Modified: > trunk/reactos/base/applications/regedt32/regedt32.c > > Modified: trunk/reactos/base/applications/regedt32/regedt32.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… > ============================================================================== > --- trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] (original) > +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Sun May 18 05:56:31 2008 > @@ -1,16 +1,18 @@ > #include <windows.h> > #include <tchar.h> > #include <shellapi.h> > +#include <shlwapi.h> > > int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, > LPTSTR lpsCmdLine, int nCmdShow) > { > TCHAR szPath[MAX_PATH]; > > - GetWindowsDirectory(szPath, MAX_PATH); > - _tcscat(szPath, _T("\\regedit.exe")); > - > - ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); > + if(GetWindowsDirectory(szPath, MAX_PATH)) > + { > + PathAppend(szPath, _T("regedit.exe")); > + ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); > + } > > return 0; > } > > -- Best regards, Alex Ionescu

17 years

2
1
0 0

User32 Menu

by James Tabor

Hi, I warn you guys about the menu code, so far everything looks okay. Fireball: "guys, dlls/win32k/user32/menu.c" "line 240" "it HeapFrees ItemInfo->dwTypeData" "but who HEapAllocates it?!", Answer the Q. MenuGetRosMenuItemInfo does.... Please understand I worked my ass off back on 0.3.0? to fix the mess in user32 menu. Please Think before you Code. Have a list of test apps to make sure it does work like YOU think it should. Wine is not enough!. Thanks, James

17 years

1
0
0 0

Some thoughts

by theUser BL

As a ReactOS-User I thoght sometimes, which is better: ReactOS or Linux with WINE. WINE is much more mature and can also run Windows 3.11 programs. But ReactOS - on the other side - is more Windows-like. It is a complete Operating System like Windows. And the applications for ReactOS can also be running in binary form on Windows and are not Linux-/Unix-native applications which are additional compiled against a winelib.dll. On the ReactOS-side stand the everyone known text "ReactOS aims to achieve complete binary compatibility with both applications and device drivers meant for NT and XP operating systems, by using a similar architecture and providing a complete and equivalent public interface." That is one of the differences to WINE: Being also driver-compatibe to XP. But thats also a point, where I ask myself, how much sense this make. Windows NT could run a lot of Windows 95/98 programs. Windows XP could run most Windows NT, Windows 9x and Windows 3.x programs. Windows Vista runs not all but some of the Windows XP and Windows NT programs. But on the driver side, Windows XP could only some Windows NT driver (like printer-driver). As I read for some time, for Windows Vista existing lesser driver then for Linux. So, it seems not, that Vista could use some of the plenty of Windows XP driver. Also Vista existing as 32bit and 64bit. And the 64bit system can not use 32bit driver. Follower of Vista (for example Windows 7) will only be existing as 64bit system. So, you want to be driver-compatibe to Windows. But Windows will itself not be drivercompatibe to older or newer versions. I have read anywhere in the Internet, that it is planned, that in newer Windows-versions only driver can be used and installed, which are trustable. And only Microsoft dicide, which drivers are trustable and which not. And driver-creator have ro pay on Microsoft that they make the drivers authorized/trustable. This makes it also more senseless to be driver-compatibe to Windows. But ReactOS have the advantage, that it looks and feels in all areas like Windows. And you can run Windows-programs on it. That is really an advantage of ReactOS. Possible ReactOS would be anytime cooperate with DeviceVM ( the company behind SplashTop http://www.splashtop.com/index.php ) . Because it is possible, that there are people who would prefer an Windows/ReactOS system which starts fast on an RAM instead of an Linux-System. In the new Newsletter (#41) of ReactOS stands, that Steven Edwards comes back to interact again between ReactOS and WINE. Thats a very good news. Hopefully all the WINE-developers see ReactOS in some time as legal and use again ReactOS-code for WINE, so that ReactOS and WINE could again more cooperate. There are still some developer (like GvG and others) who have left ReactOS and thought, that ReactOS isn't legal in USA-laws. I still think, that it is a big problem, that there are some ex-developer of ReactOS and some WINE-developer, who beliefs, that ReactOS is illegal. A more intensive dialog with this people is needed I think. Greatings theuserbl _________________________________________________________________ Die aktuelle Frühjahrsmode - Preise vergleichen bei MSN Shopping http://shopping.msn.de/category/damenbekleidung/bcatid66/forsale?text=categ…

17 years, 1 month

4
3
0 0

Re : [ros-diffs] [cfinck] 33547: Make 100% sure that the correct "regedit.exe" is launched by using GetWindowsDirectory and appending "\regedit.exe" as suggested by Alex on ros-dev.

by Sylvain Petreolle

Maybe _tcscat_s should be used instead ? Kind regards, Sylvain Petreolle (aka Usurp) Support artists, not multinationals - http://Iwouldntsteal.net Supportez les artistes, pas les multinationales - http://Iwouldntsteal.net ----- Message d'origine ---- > De : Alex Ionescu <ionucu(a)videotron.ca> > À : ros-dev(a)reactos.org > Envoyé le : Samedi, 17 Mai 2008, 16h00mn 00s > Objet : Re: [ros-dev] [ros-diffs] [cfinck] 33547: Make 100% sure that the correct "regedit.exe" is launched by using GetWindowsDirectory and appending "\regedit.exe" as suggested by Alex on ros-dev. > > This is still wrong. Tcscat is completely unsafe and can result in you > overwriting the path as soon as the user has a windows path longer > than MAX_PATH - sizeof("regedit.exe"). > > Please use the PathAppend API for this. > > On Sat, May 17, 2008 at 5:39 PM, wrote: > > Author: cfinck > > Date: Sat May 17 04:39:36 2008 > > New Revision: 33547 > > > > URL: http://svn.reactos.org/svn/reactos?rev=33547&view=rev > > Log: > > Make 100% sure that the correct "regedit.exe" is launched by using > GetWindowsDirectory and appending "\regedit.exe" as suggested by Alex on > ros-dev. > > > > Modified: > > trunk/reactos/base/applications/regedt32/regedt32.c > > > > Modified: trunk/reactos/base/applications/regedt32/regedt32.c > > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… > > ============================================================================== > > --- trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] > (original) > > +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Sat May > 17 04:39:36 2008 > > @@ -5,7 +5,12 @@ > > int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, > > LPTSTR lpsCmdLine, int nCmdShow) > > { > > - ShellExecute(NULL, NULL, _T("regedit.exe"), lpsCmdLine, NULL, nCmdShow); > > + TCHAR szPath[MAX_PATH]; > > + > > + GetWindowsDirectory(szPath, MAX_PATH); > > + _tcscat(szPath, _T("\\regedit.exe")); > > + > > + ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); > > > > return 0; > > } > > > > > > > > -- > Best regards, > Alex Ionescu > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev

17 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 33547: Make 100% sure that the correct "regedit.exe" is launched by using GetWindowsDirectory and appending "\regedit.exe" as suggested by Alex on ros-dev.

by Alex Ionescu

This is still wrong. Tcscat is completely unsafe and can result in you overwriting the path as soon as the user has a windows path longer than MAX_PATH - sizeof("regedit.exe"). Please use the PathAppend API for this. On Sat, May 17, 2008 at 5:39 PM, <cfinck(a)svn.reactos.org> wrote: > Author: cfinck > Date: Sat May 17 04:39:36 2008 > New Revision: 33547 > > URL: http://svn.reactos.org/svn/reactos?rev=33547&view=rev > Log: > Make 100% sure that the correct "regedit.exe" is launched by using GetWindowsDirectory and appending "\regedit.exe" as suggested by Alex on ros-dev. > > Modified: > trunk/reactos/base/applications/regedt32/regedt32.c > > Modified: trunk/reactos/base/applications/regedt32/regedt32.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… > ============================================================================== > --- trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] (original) > +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Sat May 17 04:39:36 2008 > @@ -5,7 +5,12 @@ > int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, > LPTSTR lpsCmdLine, int nCmdShow) > { > - ShellExecute(NULL, NULL, _T("regedit.exe"), lpsCmdLine, NULL, nCmdShow); > + TCHAR szPath[MAX_PATH]; > + > + GetWindowsDirectory(szPath, MAX_PATH); > + _tcscat(szPath, _T("\\regedit.exe")); > + > + ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); > > return 0; > } > > -- Best regards, Alex Ionescu

17 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 33541: Carlo Bramini (carlo DOT bramix AT libero DOT it): - Implemented "regedt32", which just calls "regedit" See issue #3248 for more details.

by Alex Ionescu

I suggest using GetWindowsDirectory and PathAppend'ing "regedit.exe" instead. On Sat, May 17, 2008 at 12:53 AM, <cfinck(a)svn.reactos.org> wrote: > Author: cfinck > Date: Fri May 16 11:53:36 2008 > New Revision: 33541 > > URL: http://svn.reactos.org/svn/reactos?rev=33541&view=rev > Log: > Carlo Bramini (carlo DOT bramix AT libero DOT it): > - Implemented "regedt32", which just calls "regedit" > See issue #3248 for more details. > > Added: > trunk/reactos/base/applications/regedt32/ (with props) > trunk/reactos/base/applications/regedt32/regedt32.c (with props) > trunk/reactos/base/applications/regedt32/regedt32.rbuild (with props) > trunk/reactos/base/applications/regedt32/res/ > trunk/reactos/base/applications/regedt32/res/regedt32.ico (with props) > trunk/reactos/base/applications/regedt32/resource.h (with props) > trunk/reactos/base/applications/regedt32/resource.rc (with props) > Modified: > trunk/reactos/base/applications/applications.rbuild > > Modified: trunk/reactos/base/applications/applications.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… > ============================================================================== > --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) > +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Fri May 16 11:53:36 2008 > @@ -26,9 +26,9 @@ > <xi:include href="hh/hh.rbuild" /> > </directory> >  > <directory name="kbswitch"> > <xi:include href="kbswitch/kbswitch.rbuild" /> > @@ -54,6 +54,9 @@ > <directory name="regedit"> > <xi:include href="regedit/regedit.rbuild" /> > </directory> > + <directory name="regedt32"> > + <xi:include href="regedt32/regedt32.rbuild" /> > + </directory> > <directory name="sc"> > <xi:include href="sc/sc.rbuild" /> > </directory> > > Propchange: trunk/reactos/base/applications/regedt32/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Fri May 16 11:53:36 2008 > @@ -1,0 +1,7 @@ > +GNUmakefile > +*.vcproj > +*.user > +*.cbp > +*.ncb > +*.suo > +*.sln > > Added: trunk/reactos/base/applications/regedt32/regedt32.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… > ============================================================================== > --- trunk/reactos/base/applications/regedt32/regedt32.c (added) > +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Fri May 16 11:53:36 2008 > @@ -1,0 +1,11 @@ > +#include <windows.h> > +#include <tchar.h> > +#include <shellapi.h> > + > +int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, > + LPTSTR lpsCmdLine, int nCmdShow) > +{ > + ShellExecute(NULL, NULL, _T("regedit.exe"), lpsCmdLine, NULL, nCmdShow); > + > + return 0; > +} > > Propchange: trunk/reactos/base/applications/regedt32/regedt32.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/base/applications/regedt32/regedt32.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… > ============================================================================== > --- trunk/reactos/base/applications/regedt32/regedt32.rbuild (added) > +++ trunk/reactos/base/applications/regedt32/regedt32.rbuild [iso-8859-1] Fri May 16 11:53:36 2008 > @@ -1,0 +1,9 @@ > +<?xml version="1.0"?> > +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> > +<module name="regedt32" type="win32gui" installbase="system32" installname="regedt32.exe" unicode="yes"> > + <include base="regedt32">.</include> > + <library>kernel32</library> > + <library>shell32</library> > + <file>regedt32.c</file> > + <file>resource.rc</file> > +</module> > > Propchange: trunk/reactos/base/applications/regedt32/regedt32.rbuild > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/base/applications/regedt32/res/regedt32.ico > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… > ============================================================================== > Binary file - no diff available. > > Propchange: trunk/reactos/base/applications/regedt32/res/regedt32.ico > ------------------------------------------------------------------------------ > svn:mime-type = application/octet-stream > > Added: trunk/reactos/base/applications/regedt32/resource.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… > ============================================================================== > --- trunk/reactos/base/applications/regedt32/resource.h (added) > +++ trunk/reactos/base/applications/regedt32/resource.h [iso-8859-1] Fri May 16 11:53:36 2008 > @@ -1,0 +1,1 @@ > +#define IDI_REGEDIT 101 > > Propchange: trunk/reactos/base/applications/regedt32/resource.h > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/base/applications/regedt32/resource.rc > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… > ============================================================================== > --- trunk/reactos/base/applications/regedt32/resource.rc (added) > +++ trunk/reactos/base/applications/regedt32/resource.rc [iso-8859-1] Fri May 16 11:53:36 2008 > @@ -1,0 +1,33 @@ > +/* > + * Regedit-32 resources > + * > + * Copyright 2008 Carlo Bramini > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > + */ > + > +#include <windows.h> > +#include "resource.h" > + > +// Common resources > + > +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL > + > +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Registry Explorer\0" > +#define REACTOS_STR_INTERNAL_NAME "regedt32\0" > +#define REACTOS_STR_ORIGINAL_FILENAME "regedt32.exe\0" > +#include <reactos/version.rc> > + > +IDI_REGEDIT ICON DISCARDABLE res/regedt32.ico > > Propchange: trunk/reactos/base/applications/regedt32/resource.rc > ------------------------------------------------------------------------------ > svn:eol-style = native > > -- Best regards, Alex Ionescu

17 years, 1 month

1
0
0 0

DCE problem

by James Tabor

Hi, I thought it was a handle management problem but it seems to be just a GetDC one. I found out when a pOWNED dc or dc owned by a window or window class after the first GetDC the DCX_CACHE bit become set. This is wrong behavior. Our UserGetDCEx code is a hodgepodge of wine and poorly RE, coded by the original authors and does not comply with known semantics. Sorry I guess? Well~ still rewriting it has become a headache for me and I guess I'm asking for help. I have attempted more than twice to rewrite it with porting wine code, etc. All ended in major crashes, thus validating my claim, if you write code based on bad code you end up with more bad code. Using wine testing, Use32 dce test, everything works upto line 93. hdc = GetDC( hwnd_owndc ); <----------------- first GetDC call SetROP2( hdc, R2_WHITE ); rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); old_hdc = hdc; ReleaseDC( hwnd_owndc, hdc ); <---------------------- first ReleaseDC hdc = GetDC( hwnd_owndc ); <---------------------------2nd GetDC ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc ); rop = GetROP2( hdc ); -> ok( rop == R2_WHITE, "wrong ROP2 %d after release\n", rop ); ReleaseDC( hwnd_owndc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d after second release\n", rop ); After the first GetDC the DC is cached by setting bit DCX_CACHE and this is wrong (BUG) since this DC is owned by a window. The second GetDC is called and the DC is now a DCX_CACHE. The original data is now lost due to the first ReleaseDC freeing DC_ATTR, thus normal behavior for this type of DC with DCX_CACHE set. This results in the failure at line 93 with the data in the DC_ATTR is set to a CleanDC state. This is correct for DCX_CACHE'ed DC but not for DCX_WINDOW DC. DCX_WINDOW DCs keep the original DC_ATTR data and it is not freed after a ReleaseDC call. The same goes on with class DC tests. The BUG is in UserGetDCEx, the freeing and allocating DC_ATTR is correct but somewhere the DCX_CACHE bit get set and that should not happen for window/class owned DCs. I hope this clears it up. I need someone with fresh eyes to help us fix this. Thanks, James

17 years, 1 month

4
4
0 0

Rbuild sucks, let's rew... improve it

by KJK::Hyperion

I've had enough of dealing with the suckiness of rbuild. The time has come for action. Or, missing that, a wiki page: <URL: http://www.reactos.org/wiki/index.php/Rbuild_sucks> Add your own favourite issue with rbuild. Let's debate the more controversial points in the wiki page's discussion page. We are now in the "whining" phase, so sky's the limit, add any feature you find useful or even just kind of "cool". We will sort them out in the upcoming "procrastinating" phase

17 years, 1 month

5
4
0 0

Time has come, a call to developers

by Aleksey Bragin

Hello, this message is inspired by a lot of thinking, and yesterdays talk in #reactos, when Magnus Olsen's proposition to add support for more than one graphic adapter was a last drop into my cup of tolerancy. Thus I want to say, one very important idea. But what I want even more, for our developers to understand it. The key idea is that our work on the project now MUST be aimed at bugfixing, not at adding even more nice features. There are already quite enough of them (features)! As I said 1000 times, our general "users" don't care about ability to insert 3 graphic cards into their PC, and get ReactOS using them! They care about ReactOS crashing after closing regedit. Or during Office 2003 installation. And if it continues to crash this way, I'm sorry, but noone could feel the pleasure of multiple graphic cards support, or any other feature which is useless for 99% of potential users. Moreover, I don't understand why noone ever bothered to work through the winetests for reactos-specific parts of the system, like GDI, user32/win32k testing, kernel32 testing. There are lots of failures, and wine test results show APIs which are used for REAL, and by REAL applications, not some historic APIs implemented by Magnus (no offence, I'm just using him as an example, please excuse me if I sound harsh anywhere) which are unused by any real application nowadays. I clearly want to stress, that there is a strong misconcept in ReactOS way of development of its Win32 subsystem. There were a lot of positive events happening (win32k native tests library, great work by Timo at fixing various small issues, handles, memory leaks, etc). But it must be continued! Ged Murphy said very right about the problem: small problems prevent big apps from working. Wine already supports Office 2003 for years, and noone except me was trying to make support it better. The same applies to everywhere, there is no need to have some special skills to improve ReactOS. You know, there are not that many people who *really* worked on win32k in Microsoft, and they obviously can't code for us anyway, so everyone had to learn how to develop one or another part of the system. Look at Stefan Ginsberg - a guy who didn't know anything about C development 3 months ago, but learnt just by reading ros-diffs (well, and constant private messaging me in IRC asking questions, but that doesn't count), and yesterday spotted a couple of important real problems. Especially that counts for Win32-subsystem (the kernel must stay as strict NT-alike as legally possible, so it takes time to read all available literature), but for Win32-subsystem, just maintaining its code would result in a hundred less crashes now! I don't even say about rewriting bad written parts. Or just simply, very-very simply, syncing Wine's changes back into ReactOS! But nobody cares to do that. I especially delay the 0.3.5 release, because I want people to concentrate more on bugfixes. We could easily release in the beginning of may, there are enough of good changes for a usual reactos release. But I want this particular release to be *unusual*. If ReactOS wants to hit beta this year, developers must concentrate on a boring work first, believe me, there will be lots more fun when amount of people trying out reactos increases at least 100x. And if no beta this year, I'm sorry to say, but it may be too late. Thanks for thorough reading. Comments are welcome. With the best regards, Aleksey Bragin.

17 years, 1 month

8
14
0 0

Re: [ros-dev] [ros-diffs] [navaraf] 33449: Fix incorrect parameters to IoSetDeviceToVerify/IoVerifyVolume. Spotted by R.T.Sivakumar <rtshiva@gmail.com>.

by Filip Navara

Actually this change may not be enough to fix the underlying issue. I believe there are some cases when straight calling of IoVerifyVolume could lead to deadlock. Maybe someone can lend a helping hand here and verify if the code is actually correct? If not I will probably get to it myself, but it may take a few days or even weeks. Thanks, Filip On Sun, May 11, 2008 at 10:04 PM, <navaraf(a)svn.reactos.org> wrote: > Author: navaraf > Date: Sun May 11 15:04:47 2008 > New Revision: 33449 > > URL: http://svn.reactos.org/svn/reactos?rev=33449&view=rev > Log: > Fix incorrect parameters to IoSetDeviceToVerify/IoVerifyVolume. Spotted by R.T.Sivakumar <rtshiva(a)gmail.com>. > > Modified: > trunk/reactos/drivers/filesystems/fastfat/create.c > > Modified: trunk/reactos/drivers/filesystems/fastfat/create.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… > ============================================================================== > --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun May 11 15:04:47 2008 > @@ -382,11 +382,10 @@ > DPRINT ("Media change detected!\n"); > DPRINT ("Device %p\n", DeviceExt->StorageDevice); > > + /* Find the device to verify and reset the thread field to empty value again. */ > DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); > - > - IoSetDeviceToVerify (PsGetCurrentThread (), > - NULL); > - Status = IoVerifyVolume (DeviceExt->StorageDevice, > + IoSetDeviceToVerify (PsGetCurrentThread (), NULL); > + Status = IoVerifyVolume (DeviceToVerify, > FALSE); > } > if (!NT_SUCCESS(Status)) > >

17 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [fireball] 33435: Creating a branch for Magnus Olsen's work in win32k, GDI and DirectX area. Finished parts will be merged back to trunk.

by Aleksey Bragin

This was created for all win32k/gdi32 work which is done without any particular goal, or for directx-related work (dxeng is allowed to go into trunk directly). WBR, Aleksey Bragin. On May 11, 2008, at 3:03 PM, fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Sun May 11 06:03:57 2008 > New Revision: 33435 > > URL: http://svn.reactos.org/svn/reactos?rev=33435&view=rev > Log: > Creating a branch for Magnus Olsen's work in win32k, GDI and > DirectX area. Finished parts will be merged back to trunk. > > Added: > branches/win32k-gdi-dx/ > - copied from r33434, / >

17 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [greatlrd] 33411: adding a new define DC_BITMAP for GetStockObject

by Filip Navara

"DC_BITMAP or the value are not documented in MSDN or ms header" ... and that's precisely why the definition belongs to another (internal) header file and not here. F. On Sat, May 10, 2008 at 7:37 PM, <greatlrd(a)svn.reactos.org> wrote: > Author: greatlrd > Date: Sat May 10 12:37:43 2008 > New Revision: 33411 > > URL: http://svn.reactos.org/svn/reactos?rev=33411&view=rev > Log: > adding a new define DC_BITMAP for GetStockObject > > Modified: > trunk/reactos/include/psdk/wingdi.h > > Modified: trunk/reactos/include/psdk/wingdi.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… > ============================================================================== > --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) > +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat May 10 12:37:43 2008 > @@ -813,6 +813,12 @@ > #define SYSTEM_FONT 13 > #define SYSTEM_FIXED_FONT 16 > #define DEFAULT_PALETTE 15 > + > +/* NOTE DC_BITMAP or the value are not documented in MSDN or ms header > + * it return a 1x1 1Bpp Bitmap in all case from GetStockObject > + */ > +#define DC_BITMAP 21 > + > #if (_WIN32_WINNT >= 0x0500) > #define DC_BRUSH 18 > #define DC_PEN 19 > >

17 years, 1 month

2
1
0 0

FW: [ros-bugs] [Bug 644] directional keys problem with Explorer

by Gabriel ilardi

Hi devs, I don't think this patch should be refused, what about "Shell32 improvements" in: http://www.reactos.org/en/newsletter_34.html? And all the commits made recently by johannes (also in shlview.c)? After almost a year we close the bug saying it's not our code? WBR Gabriel ilardi. > Date: Fri, 9 May 2008 18:13:49 +0200> From: ReactOS.Bugzilla(a)www.reactos.org> To: ros-bugs(a)reactos.org> Subject: [ros-bugs] [Bug 644] directional keys problem with Explorer> > http://www.reactos.org/bugzilla/show_bug.cgi?id=644> > > amine48rz <amine48rz(a)gmail.com> changed:> > What |Removed |Added> ----------------------------------------------------------------------------> Status|NEW |ASSIGNED> Status|ASSIGNED |NEW> CC| |amine48rz(a)gmail.com> AssignedTo|info(a)w3seek.de |johannes.anderwald(a)student.t> | |ugraz.at> > w3seek <w3seek(a)reactos.com> changed:> > What |Removed |Added> ----------------------------------------------------------------------------> CC| |w3seek(a)reactos.com> Status|NEW |RESOLVED> Resolution| |WONTFIX> > > > > --- Comment #3 from w3seek <w3seek(a)reactos.com> 2008-05-09 18:13:48 CET ---> (In reply to comment #2)> > Created an attachment (id=1341)> --> (http://www.reactos.org/bugzilla/attachment.cgi?id=1341) [details]> > LISTVIEW_GetNextItem Patch> > Here's a new patch for which i rewrote the LISTVIEW_GetNextItem routine, so> > that the ListView itself is aware of whether LVS_ALIGNTOP or LVS_ALIGNLEFT is> > set and returns the correct next item.> > But I still like the other patch just because I dislike scrolling horizontal in> > a list :).> > This patch should not be accepted for ReactOS. This is code shared with WINE> and needs to be submitted to winehq.> > > -- > Configure bugmail: http://www.reactos.org/bugzilla/userprefs.cgi?tab=email> ------- You are receiving this mail because: -------> You are the QA contact for the bug.> _______________________________________________> Ros-bugs mailing list> Ros-bugs(a)reactos.org> http://www.reactos.org/mailman/listinfo/ros-bugs _________________________________________________________________ Crea il tuo blog su Spaces, condividi le tue esperienze con il mondo! http://home.services.spaces.live.com/

17 years, 1 month

2
1
0 0

Explorer startup crash since r33366

by Colin Finck

Hi everybody, I tracked down the Explorer startup crash we experience since r33366 and came to some weird results. First of all, this crash also occurs when testing under Windows. Also Explorer runs well when it's compiled with MSVC using the supplied "explorer.sln" file. Then I put MessageBoxes to some code pathes to track down, where the crash occurs. The weird thing is: It fails in the IconCache code (which doesn't even handle strings, so shouldn't be affected by Unicode at all). Just put a MessageBox at explorer.cpp:389 and then after _icons[ICID_NONE] was assigned. You will see that the second message box won't appear. You can also put a MessageBox in the Icon constructor, it won't be shown either. So what's going wrong here? Bug in our mingw startup routine, memory corruption, bug in gcc, ...? I'm out of ideas. Best regards, Colin

17 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [mpiulachs] 33344: - code refactoring - made more and more easily extensible: * commands automatically loaded from plugins dlls * declarative and automatic command parameter parsing * common code moved to base classes - other fixes

by Filip Navara

This commit actually broke TechBot badly. Not only the commands don't work anymore because the parameter parsing fails somewhere in ParametersParser.HandleSwitches (for eg. !rosbug 333 or !ntstatus 2307), but also some of the commands (!ntstatus, !wm and probably !winerror) aren't guarded for the case when no parameters are passed and crash horribly with NullReferenceException. I am not going to fix it since I don't like digging into regular expressions, but I would be glad if someone could look at it. I'll bring MyTechBot back online once the bugs are fixed. Best regards, Filip Navara On Wed, May 7, 2008 at 4:59 PM, <mpiulachs(a)svn.reactos.org> wrote: > Author: mpiulachs > Date: Wed May 7 09:59:28 2008 > New Revision: 33344 > > URL: http://svn.reactos.org/svn/reactos?rev=33344&view=rev > Log: > - code refactoring > - made more and more easily extensible: > * commands automatically loaded from plugins dlls > * declarative and automatic command parameter parsing > * common code moved to base classes > - other fixes > > Added: > trunk/irc/TechBot/TechBot.Console/ConsoleTechBotService.cs (with props) > trunk/irc/TechBot/TechBot.Library/Attributes/ > trunk/irc/TechBot/TechBot.Library/Attributes/CommandAttribute.cs (with props) > trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAliasAttribute.cs (with props) > trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAttribute.cs (with props) > trunk/irc/TechBot/TechBot.Library/Collections/ > trunk/irc/TechBot/TechBot.Library/Collections/CommandBuilderCollection.cs (with props) > trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs (contents, props changed) > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/ApiCommand.cs > trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/Command.cs > trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs (with props) > trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs (contents, props changed) > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/BugCommand.cs > trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs (contents, props changed) > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs > trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs (contents, props changed) > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/HelpCommand.cs > trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs (contents, props changed) > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/HresultCommand.cs > trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs (contents, props changed) > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs > trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs > trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs > trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs (contents, props changed) > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/SvnCommand.cs > trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs > trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs (contents, props changed) > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs > trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs (contents, props changed) > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/WmCommand.cs > trunk/irc/TechBot/TechBot.Library/Factory/ > trunk/irc/TechBot/TechBot.Library/Factory/CommandBuilder.cs (with props) > trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs (with props) > trunk/irc/TechBot/TechBot.Library/ParametersParser.cs (with props) > trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs (contents, props changed) > - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/IrcService.cs > trunk/irc/TechBot/TechBot/ProjectInstaller.cs (with props) > Removed: > trunk/irc/TechBot/Default.build > trunk/irc/TechBot/TechBot.Library/ApiCommand.cs > trunk/irc/TechBot/TechBot.Library/BugCommand.cs > trunk/irc/TechBot/TechBot.Library/Command.cs > trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs > trunk/irc/TechBot/TechBot.Library/HelpCommand.cs > trunk/irc/TechBot/TechBot.Library/HresultCommand.cs > trunk/irc/TechBot/TechBot.Library/IrcService.cs > trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs > trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs > trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs > trunk/irc/TechBot/TechBot.Library/SvnCommand.cs > trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs > trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs > trunk/irc/TechBot/TechBot.Library/WmCommand.cs > trunk/irc/TechBot/TechBot.cmbx > Modified: > trunk/irc/TechBot/TechBot.Console/Main.cs > trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj > trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlCommand.cs > trunk/irc/TechBot/TechBot.Library/MessageContext.cs > trunk/irc/TechBot/TechBot.Library/ServiceOutput.cs > trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj > trunk/irc/TechBot/TechBot.Library/TechBotService.cs > trunk/irc/TechBot/TechBot/ServiceThread.cs > trunk/irc/TechBot/TechBot/TechBot.csproj > trunk/irc/TechBot/TechBot/TechBotService.cs > > [This mail would be too long, it was shortened to contain the URLs only.] > > Removed: trunk/irc/TechBot/Default.build > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/Default.build?rev=3334… > > Added: trunk/irc/TechBot/TechBot.Console/ConsoleTechBotService.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Consol… > > Modified: trunk/irc/TechBot/TechBot.Console/Main.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Main.c… > > Modified: trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/TechBo… > > Removed: trunk/irc/TechBot/TechBot.Library/ApiCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/ApiCom… > > Added: trunk/irc/TechBot/TechBot.Library/Attributes/CommandAttribute.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Attrib… > > Added: trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAliasAttribute.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Attrib… > > Added: trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAttribute.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Attrib… > > Removed: trunk/irc/TechBot/TechBot.Library/BugCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/BugCom… > > Added: trunk/irc/TechBot/TechBot.Library/Collections/CommandBuilderCollection.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Collec… > > Removed: trunk/irc/TechBot/TechBot.Library/Command.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/ApiCommand.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs (from r31130, trunk/irc/TechBot/TechBot.Library/Command.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Modified: trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Added: trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/BugCommand.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/HelpCommand.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/HresultCommand.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs (from r31130, trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs (from r31130, trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/SvnCommand.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs (from r31130, trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Copied: trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/WmCommand.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… > > Removed: trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/ErrorC… > > Added: trunk/irc/TechBot/TechBot.Library/Factory/CommandBuilder.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Factor… > > Added: trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Factor… > > Removed: trunk/irc/TechBot/TechBot.Library/HelpCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/HelpCo… > > Removed: trunk/irc/TechBot/TechBot.Library/HresultCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Hresul… > > Removed: trunk/irc/TechBot/TechBot.Library/IrcService.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/IrcSer… > > Modified: trunk/irc/TechBot/TechBot.Library/MessageContext.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Messag… > > Removed: trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/NtStat… > > Added: trunk/irc/TechBot/TechBot.Library/ParametersParser.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Parame… > > Removed: trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/ReactO… > > Removed: trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/SambaB… > > Modified: trunk/irc/TechBot/TechBot.Library/ServiceOutput.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Servic… > > Removed: trunk/irc/TechBot/TechBot.Library/SvnCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/SvnCom… > > Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… > > Copied: trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs (from r31130, trunk/irc/TechBot/TechBot.Library/IrcService.cs) > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… > > Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… > > Removed: trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/WineBu… > > Removed: trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Winerr… > > Removed: trunk/irc/TechBot/TechBot.Library/WmCommand.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/WmComm… > > Removed: trunk/irc/TechBot/TechBot.cmbx > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.cmbx?rev=33343… > > Added: trunk/irc/TechBot/TechBot/ProjectInstaller.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/ProjectInstall… > > Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/ServiceThread.… > > Modified: trunk/irc/TechBot/TechBot/TechBot.csproj > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/TechBot.csproj… > > Modified: trunk/irc/TechBot/TechBot/TechBotService.cs > URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/TechBotService… > >

17 years, 1 month

2
1
0 0

XEN

by Enrico Weigelt

Hi folks, I'd like to try Reactos in Xen. Is there any image available ? thx -- --------------------------------------------------------------------- Enrico Weigelt == metux IT service - http://www.metux.de/ --------------------------------------------------------------------- Please visit the OpenSource QM Taskforce: http://wiki.metux.de/public/OpenSource_QM_Taskforce Patches / Fixes for a lot dozens of packages in dozens of versions: http://patches.metux.de/ ---------------------------------------------------------------------

17 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [gbrunmar] 33326: Implemented IDirect3DDevice9::GetDisplayMode()

by Steven Edwards

On Tue, May 6, 2008 at 12:15 PM, <gbrunmar(a)svn.reactos.org> wrote: > + if (IsBadWritePtr(pMode, sizeof(D3DDISPLAYMODE*))) Is this really a good idea? -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 33106: - Keyboard layout switching works now in ReactOS!

by gedmurphy

Just to clarify to anyone following this thread, the change from SystemParametersInfo to sending a message isn't incorrect. kbswitch is meant to be a sort of makeshift ctfmon.exe, and isn't meant for switching keyboards system-wide as intl.cpl does. The buffer overflow problems still stand though. Ged. > -----Original Message----- > From: gedmurphy [mailto:gedmurphy@gmail.com] > Sent: 22 April 2008 21:03 > To: 'ros-dev(a)reactos.org' > Subject: RE: [ros-diffs] [dchapyshev] 33106: - Keyboard layout > switching works now in ReactOS! > > dchapyshev(a)svn.reactos.org wrote: > > > > Author: dchapyshev > > Date: Tue Apr 22 14:01:56 2008 > > New Revision: 33106 > > > > URL: http://svn.reactos.org/svn/reactos?rev=33106&view=rev > > Log: > > - Keyboard layout switching works now in ReactOS! > > > Hi, just a few points about this patch. > > > > + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard > > Layout\\Substitutes"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) > > + { > > + dwBufLen = MAX_PATH; > > + > > + if (RegQueryValueEx(hKey, szTempLCID, NULL, NULL, > > (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) > > > Firstly, Reg functions work on bytes, so you introduced a potential > buffer overflow here. > But this is irrelevant due to the next point ;) > > > > - Ret = SystemParametersInfo(SPI_SETDEFAULTINPUTLANG, 0, &hKl, > > SPIF_SENDWININICHANGE); > > + EnumWindows(EnumWindowsProc, (LPARAM) hKl); > > > This looks like a hack. The original method was correct, it just need > implementing in win32k. > Have a look in NtUserSystemParametersInfo. > > Thirdly, what is this kbswitch app? It's not a standard windows tool, > yet it's included in our base. > Keyboard switching is done in intl.cpl, or via ctfmon (which we don't > yet have) on a per app basis. > > Regards, > Ged.

17 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 33106: - Keyboard layout switching works now in ReactOS!

by gedmurphy

dchapyshev(a)svn.reactos.org wrote: > > Author: dchapyshev > Date: Tue Apr 22 14:01:56 2008 > New Revision: 33106 > > URL: http://svn.reactos.org/svn/reactos?rev=33106&view=rev > Log: > - Keyboard layout switching works now in ReactOS! Hi, just a few points about this patch. > + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard > Layout\\Substitutes"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) > + { > + dwBufLen = MAX_PATH; > + > + if (RegQueryValueEx(hKey, szTempLCID, NULL, NULL, > (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) Firstly, Reg functions work on bytes, so you introduced a potential buffer overflow here. But this is irrelevant due to the next point ;) > - Ret = SystemParametersInfo(SPI_SETDEFAULTINPUTLANG, 0, &hKl, > SPIF_SENDWININICHANGE); > + EnumWindows(EnumWindowsProc, (LPARAM) hKl); This looks like a hack. The original method was correct, it just need implementing in win32k. Have a look in NtUserSystemParametersInfo. Thirdly, what is this kbswitch app? It's not a standard windows tool, yet it's included in our base. Keyboard switching is done in intl.cpl, or via ctfmon (which we don't yet have) on a per app basis. Regards, Ged.

17 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [greatlrd] 33014: fixed pipe working again from cmd more investigate are need it to figout who to really solv bat and pipe and gui apps issue so none regress and working fine in all case. rember gui apps can resive pipe from cmd or send to

by Aleksey

Any real explanation in the commit message about what was done in this commit? Short, real and clean, so every developer reading the commit messages could understand what was done and why. I'm suspicious that it "fixes" one bug, and reopens another. The same note applies to "start kill the bad macro DXG_GET_INDEX_FUNCTION that is instable" (rev. 33012). Macro is a preprocessor definition, it can't be stable or not, it's being performed before the actual compile stage. Better to explain while enumerating through all functions to find the best one is worse than just getting a pointer by indexing. Or why it was done so in the beginning. With the best regards, Aleksey Bragin. ----- Original Message ----- From: <greatlrd(a)svn.reactos.org> To: <ros-diffs(a)reactos.org> Sent: Friday, April 18, 2008 4:56 AM Subject: [ros-diffs] [greatlrd] 33014: fixed pipe working again from cmd more investigate are need it to figout who to really solv bat and pipe and gui apps issue so none regress and working fine in all case. rember gui apps can resive pipe from cmd or send to cmd > Author: greatlrd > Date: Thu Apr 17 19:56:01 2008 > New Revision: 33014 > > URL: http://svn.reactos.org/svn/reactos?rev=33014&view=rev > Log: > fixed pipe working again from cmd > more investigate are need it to figout who to really solv bat and pipe and > gui apps issue > so none regress and working fine in all case. rember gui apps can resive > pipe from cmd or send to cmd

17 years, 1 month

1
0
0 0

ReactOS gdt limit

by Henning Schild

Hello ROS dev-team, i am currently working on qemu/kqemu and found that ROS sets the gdt limit to 0x800. At least this is what i see in qemu, i did not check ROS source. http://www.intel.com/design/processor/manuals/253668.pdf (3.5.1 p. 3-21) >> the GDT limit should always be one less than an integral multiple of >> eight (that is, 8N – 1) This may or may not be a problem. For all i can say ROS was the only of many different OSs that triggered the check in my setup. I may be wrong and wont investigate this any further. Just wanted to let you know. I used this version: http://prdownloads.sourceforge.net/reactos/ReactOS-0.3.4-REL-qemu.zip and that are the values i saw: base = 0x808bdac0 limit = 0x00000800 regards, Henning

17 years, 2 months

3
2
0 0

Ntifs.h

by Gabriel ilardi

Hi Team, I came across this site: http://www.acc.umu.se/~bosse/ which has some windows drivers examples, and talks about filesystem drivers, it has a gnu version of ntifs.h (http://www.acc.umu.se/~bosse/ntifs.h), I've taken a look at it, and noticed that ours misses some defines and some definitions use other types instead of ours. I thought perhaps someone from the team would want to take a look at it, perhaps we could use it. Thanks. Best regards, Gabriel ilardi. PS: If you already knew about it please ignore this email. _________________________________________________________________ Racconta le tue emozioni sul blog! http://home.services.spaces.live.com/

17 years, 2 months

3
2
0 0

Re : [ros-bugs] [Bug 3177] New: I try ReactOS-0.3.4-QEMU. When i try screensaver it gives bluescreen

by Sylvain Petreolle

Fireball, could you commit the bug writing guidelignes change to avoid this, please ? *saying Pleaase ... Help as Milla Jovovitch in the Fifth Element* Kind regards,Sylvain Petreolle (aka Usurp) Support artists, not multinationals - http://Iwouldntsteal.net Supportez les artistes, pas les multinationales - http://Iwouldntsteal.net ----- Message d'origine ---- > De : "ReactOS.Bugzilla(a)www.reactos.org" <ReactOS.Bugzilla(a)www.reactos.org> > À : ros-bugs(a)reactos.org > Envoyé le : Samedi, 12 Avril 2008, 22h08mn 14s > Objet : [ros-bugs] [Bug 3177] New: I try ReactOS-0.3.4-QEMU. When i try screensaver it gives bluescreen > > http://www.reactos.org/bugzilla/show_bug.cgi?id=3177 > > Summary: I try ReactOS-0.3.4-QEMU. When i try screensaver it > gives bluescreen > Product: ReactOS > Version: 0.3.4 > Platform: QEmu > OS/Version: Microsoft Windows XP > Status: UNCONFIRMED > Severity: normal > Priority: P3 > Component: Win32 > AssignedTo: ros-bugs(a)reactos.org > ReportedBy: maviates(a)gmail.com > QAContact: ros-bugs(a)reactos.org > > > Created an attachment (id=2431) > --> (http://www.reactos.org/bugzilla/attachment.cgi?id=2431) > BlueScreen > > I try ReactOS-0.3.4-QEMU. When i try screensaver it gives bluescreen > > > -- > Configure bugmail: http://www.reactos.org/bugzilla/userprefs.cgi?tab=email > ------- You are receiving this mail because: ------- > You are the QA contact for the bug. > You are the assignee for the bug. > _______________________________________________ > Ros-bugs mailing list > Ros-bugs(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-bugs >

17 years, 2 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 32909: Manually sync "comctl32" and "comdlg32" on request of Apostolos Alexiadis. Just translation updates

by Aleksey

I thought those are on auto-winesync, aren't they? If you come to agreement with Herve, I don't mind. But anyway, Apostolos should submit those translation updates to Wine project. WBR, Aleksey Bragin. ----- Original Message ----- From: <cfinck(a)svn.reactos.org> To: <ros-diffs(a)reactos.org> Sent: Friday, April 11, 2008 1:00 AM Subject: [ros-diffs] [cfinck] 32909: Manually sync "comctl32" and "comdlg32" on request of Apostolos Alexiadis. Just translation updates > Author: cfinck > Date: Thu Apr 10 16:00:16 2008 > New Revision: 32909 > > URL: http://svn.reactos.org/svn/reactos?rev=32909&view=rev > Log: > Manually sync "comctl32" and "comdlg32" on request of Apostolos Alexiadis. > Just translation updates > > Modified: > trunk/reactos/dll/win32/comctl32/comctl_El.rc > trunk/reactos/dll/win32/comctl32/comctl_Si.rc > trunk/reactos/dll/win32/comdlg32/cdlg_El.rc > trunk/reactos/dll/win32/comdlg32/cdlg_No.rc > trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc

17 years, 2 months

2
2
0 0

About ext2 driver installer

by King InuYasha

I looked at the ReactOS website and noticed that you guys are having problems getting an installer written for an ext2 driver for Windows XP? I would be happy to write an NSIS-based installer for the ext2 driver, if either someone could compile the driver for me, or tell me where the driver is in the ReactOS tree so I can build it myself and create an installer for it. I have written NSIS installers before, some that have advanced functionalities using Component Manager and ExperienceUI. Please let me know if you guys would like me to make this installer....

17 years, 2 months

7
7
0 0

win32k public headers

by Timo Kreuzer

I am currently trying to clean up our win32k headers. The situation so far: - ntgdi.h in psdk which should be compatible to ms version of ntgdi.h from the sdk - ntgdytyp.h containing a bunch of gdi related types in include/reactos/win32k - ntgdihdl.h containing handle related types and macros in include/reactos/win32k - ntgdibad.h containing private and ms incompatible functions and structures in include/reactos/win32k - ntuser.h containing ntuser functions and types in include/reactos/win32k - ntusertyp.h containing ntuser related types in include/reactos/win32k - W32CLIENTINFO is defined in both ntusertyp.h and ntgdityp.h (less complete). - there is the PATRECT structure in ntuser.h, and if ntuser.h is not included, also in ntgdityp.h, this should be named POLYPATBLT as defined in ntgdi.h, but there is only an incomplete type without the structure definition. (IMO ms should have put this structure into wingdi.h together with PolyPatBlt, but they don't seem to want anyone use that gdi32 exported function.) I wonder why ms put ntgdi.h into the sdk at all, as it's completely useless to user mode application writers, but well, ncie to have the prototypes ;-) So how do we clean up this mess? Suggestions: - when ms puts ntgdi.h into the sdk, we could also put ntuser.h there. - if we want to stay 100% compatible with sdk headers, we can add a define, like #ifdef USE_NON_SDK // put non sdk compatible but still windows compatible definitions here #endif - use a version definition, like I did with the simplecall definitions in ntuser.h to make it compatible to different windows versions - keep ntgdibad.h and create ntuserbad.h for incompatible definitions - ntgdihdl.h is used by win32k and gdi32, both also import ntgdityp.h. So I'd suggest merging that stuff into ntgdityp.h - maybe merge types into ntgdi.h and ntuser.h? Some definitions are already in there. - create win32ktypes.h and put ntuser/ntgdi shared stuff there, like W32CLIENTINFO - maybe add POLYPATBLT and PolyPatBlt() (others?) to wingdi.h inside USE_NON_SDK ifdef plus a POLYPATBLT_DEFINED I don't think it's a problem to make our sdk headers more complete than ms ones. This might help if we don't want a header mess or extra definitions inside the .c files. Comments appreciated. Thanks, Timo

17 years, 2 months

2
3
0 0

[ros-diffs] [tkreuzer] 32743: - make Simplecall definitions (NtUserCallXxx) compatible to different Win versions

by James Tabor

Hi! Thank you Timo, I can not believe I missed this one.... This fixes a commit back at rev 14041. With out starting a review in real world history,, once an enemy gains control the first thing they do is erase history. New eras evolve and build on top of old ones. Our old world ruins are a good example. Look at Cuzco, Greece and Rome. You see them now uncovering the past. Thanks again! James

17 years, 2 months

1
0
0 0

A question about SepCreateSystemProcessToken

by Xiaoming Gao

SepCreateSystemProcessToken calls ObCreateObject like this: Status = ObCreateObject(KernelMode, SepTokenObjectType, NULL, KernelMode, NULL, sizeof(TOKEN), 0, 0, (PVOID*)&AccessToken); the ObjectAttributes parameter is set to NULL,and ObCreateObject passes ObjectAttributes to call ObpCaptureObjectAttributes like this: Status = ObpCaptureObjectAttributes(ObjectAttributes, ProbeMode, FALSE, ObjectCreateInfo, &ObjectName); and in ObpCaptureObjectAttributes ,there's a check condition that checks if ObjectAttributes is NULL, if ObjectAttributes is NULL,it will cause ObpCaptureObjectAttributes fail,and then cause ObCreateObject fail,then cause SepCreateSystemProcessToken fail,and the return value of SepCreateSystemProcessToken will ever be NULL. Could someone explain why???am i wrong??

17 years, 2 months

1
0
0 0

ReactOS 0.34 (Installation CD) issues

by Bernd Blaauw

While installing and using ReactOS 0.34 (on Windows XP Professional with VmWare Workstation 6.03) I'm experiencing a couple of issues. - Are there any new requirements to install ReactOS? 586+ with 64MB for example instead of earlier 486+/16MB ? - Are there any new requirements to bootup ReactOS? 586+ with 64MB? would/should swapfile work with lower amount of system memory installed on the machine? - Are there any new requirements to use ReactOS? 586+ with 64MB? Does swapfile work? - Is commandline-only supported on machines with not enough memory installed? Ofcourse booting from CD has to be supported on the target machine, either natively or through tricks like Smart Boot Manager or GRUB(-4-DOS) (or FreeLDR even?). The actual trouble I'm having is completing 0.34's installation process with Dutch language and USA keyboard layout (which isn't default, you seem to prefer Belgium keyboard layout by default, which might be just as strange as a Dutch keyboard layout by default. Those keyboards hardly exist at all). It seems to hang on this machine at a random moment of time during the file copy phase. In the end, I cannot install FreeLDR to diskette (empty WinImage 1.44MB diskette image), nor can I return to previous screen to select "install to harddisk". My goal was having a FreeLDR bootdisk in case I mess up the partition bootsector. Anyway, using English as installation language and its defaults, I can complete SETUP properly. While in ReactOS booted from harddisk, opening a simple console window (CMD) and doing DIR A: results in a blue screen (instead of a message like "no floppydrive installed") Same issue as known earlier I guess - non-working floppydrive(r). My old FreeLoader diskette is based on a FreeLDR bootdisk that Casper Hornstrup(?) had available at the time. It's available from http://odin.fdos.org/odin2005/ Booting the diskette, pressing CTRL-C, then doing a simple COPY /Y C:\FREELDR.SYS A:\FREELDR.SYS does the trick for updating FreeLDR from 2.xx to 3.xx, resulting in being able to boot ReactOS 0.34 from a diskette. Strangely enough no single DOS tool/command can handle FREELDR.INI (copy, ren, del, edit, all fail) - any idea why? Last of all, SHUTDOWN doesn't shut off the computer (guess you want to be sure everything in cache is flushed?), and LOGOFF won't allow me to get out of entering my username and password. Looking forward to a ReactOS with OpenOffice and FireFox 3.xx in a while, Any help, ideas or recommendations much appreciated (as well as pointing me to the correct mailinglist if it shouldn't be ros-dev) Bernd Blaauw

17 years, 2 months

1
0
0 0

Reactos booting to CLI

by Marc Piulachs

As we know Windows (at least till Windows 7) was designed to be a GUI based operating system. All applications can safely assume that the windowing subsystem is running. Windows/Reactos can run native applications without starting the windowing subsystem like usetup during 1st stage setup but of course without having access to Win32 apis as Win32k is not loaded. AFAIK win32k is designed to be the main subsystem and is the responsible of starting the windowing subsystem so my question is . Would be technically possible to have a striped win32k version without the GUI code? + command line enabled winlogon, syssetup etc.. so you can boot and run cli based applications like cmd.exe ? what other parts of the boot process relay on having the GUI running? It's more of a design curiosity question rather than a real request Regards, Marc

17 years, 2 months

5
5
0 0

Regarding Tsonic OS (2)

by David Eckert

whoops, -fairview, i meant the FBI lol :P -- -David W. Eckert

17 years, 3 months

1
0
0 0

Regarding Tsonic OS

by David Eckert

With regards to Tsonic OS, It would be very advisable at this point to get all DNS information and ISP information and report this individual(s) to either their ISP or Fairview, or perhaps both. -- -David W. Eckert

17 years, 3 months

1
0
0 0

Re: [ros-dev] Hello , we are searching for people with programing skills for the operating system Tsonic OS.

by Mark Tempel

Two things: 1) Please take me off your list. I know that you pulled my email address from the reactos mailing list. Since your project is not reactos, I'm not interested in hearing about it. 2) Posting links to leaked Microsoft source code in any forum related to reactos shows a complete lack of good judgment, and a lack of knowledge of recent reactos history. I certainly hope that you don't intend to try to check a derivative of leaked Windows source into the reactos tree. That would taint reactos and make it vulnerable to legal action (at least here in the US). Further, since you are acting as a spokesperson for TonicOs, and are passing around links to stolen Microsoft intellectual property, I would consider TonicOs already tainted. Please take conversations about leaked Windows source to some other venue. --mark On Wed, 12 Mar 2008 12:44:18 -0800 "Tsvetan Banchev" <tsvetanmail(a)gmail.com> wrote: > http://[cut]/Windows_2000_source_code > http://[cut]/Windows_XP_Source_Code > obtained from a friend inside ms ;) > > rar password needs cracking, working on it now. could >take a few days. if > anyone's got a high end machine it'd be appreciated if >they could use a RAR > password recovery app to get it.

17 years, 3 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [fireball] 32667: - Fix build.

by Steven Edwards

Hi, On Wed, Mar 12, 2008 at 2:07 PM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Wed Mar 12 14:07:32 2008 > New Revision: 32667 > > URL: http://svn.reactos.org/svn/reactos?rev=3D32667&view=3Drev > Log: > - Fix build. > > Modified: > trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild > > Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-gen= > eric.rbuild?rev=3D32667&r1=3D32666&r2=3D32667&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D Diffs have been broken since the recent email problems. Is there any estimate on when/if this is going to be fixed? Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years, 3 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [greatlrd] 32652: part 2/2 for implement GetAppCompatFlags left todo implemented set AppCompatFlags

by Aleksey Bragin

Why did that big chunk of MS's support database text got into our codebase? Even not edited, so that I can read up about "tax form 1040 would not print correctly" in ReactOS Source code? What is the use from it? If you wanted SO MUCH, you could at least edit it, or ask someone to edit it for you (we have quite a few people in our team). But then, I could insert half of WDK docs into the kernel source code and drivers source code (which in fact would violate copyrights, since it would not even be fair use). Providing URL is quite enough, though, if I don't mistake (I'm not up to date with their position), Wine is already removing URLs from source code because they should be kept somewhere else. Source code is source code, not a collector to store everything. There is no point in sticking various garbage into reactos source code with a note "so it doesn't get lost", we've come over that point quite a few years ago. With the best regards, Aleksey Bragin. On Mar 11, 2008, at 3:09 AM, greatlrd(a)svn.reactos.org wrote: > Author: greatlrd > Date: Mon Mar 10 19:09:23 2008 > New Revision: 32652 > > URL: http://svn.reactos.org/svn/reactos?rev=3D32652&view=3Drev > Log: > part 2/2 for implement GetAppCompatFlags > left todo implemented set AppCompatFlags = > > > Modified: > trunk/reactos/dll/win32/user32/misc/stubs.c > > + /* NOTE : GetAppCompatFlags retuns which compatible flags should > be send= > back = > > + * the return value is any of http://support.microsoft.com/kb/82860 > + * This text are direcly copy from the MSDN URL, so it does not > get lost > + > *--------------------------------------------------------------------- > -= > -------- > + * Bit: 1 Lots of text here > + = > > + return ti->dwAppsCompatibleFlags; > } > = > > /*

17 years, 3 months

2
1
0 0

Small suggestion

by Heis Spiter

Hi, after r32615 and r32623, I send you this mail in order to find some volunteers to remove all remaining $id from files and also to update FSF address in files hearders. Thanks in advance to the volunteers. Best regards, P. Schweitzer

17 years, 3 months

2
1
0 0

WDF support

by Andy Grover

Hiya, I have a GPLed driver using the WDF. I'm not clear on the legal status of redistributing GPLed source compiled with the Windows DDK so I'd like to try MinGW. After Googling, I see a couple of mentions back in 2004 that "WDF will have to be supported eventually" but nothing since then? Am I correct in assuming if I want to use MinGW, WDF cannot be used? Thanks -- Andy

17 years, 3 months

2
1
0 0

All servers down

by Aleksey Bragin

Hello, today all servers (web, svn, mailing lists, etc) will most probably be unavailable for an undetermined amount of time, due to IP addresses change by the hosting company. They beg their pardon for the unconvinience. With the best regards, Aleksey Bragin.

17 years, 3 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [fireball] 32521: - Fix leaking an entry in some cases during ObpFreeCapturedAttributes call. For more details: http://www.reactos.org/forum/viewtopic.php?t=5311.

by Alex Ionescu

IopFreeIoCompletionPacket has the opposite bug -- there is an interlocked push (free) even in the ExFreePool case. There should be a return following the ExFreePool, otherwise we're corrupting memory. On Thu, Feb 28, 2008 at 11:37 AM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Thu Feb 28 14:37:14 2008 > New Revision: 32521 > > URL: http://svn.reactos.org/svn/reactos?rev=32521&view=rev > Log: > - Fix leaking an entry in some cases during ObpFreeCapturedAttributes call. For more details: http://www.reactos.org/forum/viewtopic.php?t=5311. > > Modified: > trunk/reactos/ntoskrnl/include/internal/ob_x.h > > Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… > ============================================================================== > --- trunk/reactos/ntoskrnl/include/internal/ob_x.h (original) > +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h Thu Feb 28 14:37:14 2008 > @@ -290,6 +290,12 @@ > List->L.FreeMisses++; > List->L.Free(Buffer); > } > + else > + { > + /* The free was within the Depth */ > + InterlockedPushEntrySList(&List->L.ListHead, > + (PSINGLE_LIST_ENTRY)Buffer); > + } > } > else > { > > > -- Best regards, Alex Ionescu

17 years, 3 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [mpiulachs] 32449: Add support for multiple architectures to autorun.inf

by Steven Edwards

On Fri, Feb 22, 2008 at 7:14 AM, <mpiulachs(a)svn.reactos.org> wrote: > Author: mpiulachs > Date: Fri Feb 22 15:14:08 2008 > New Revision: 32449 > > URL: http://svn.reactos.org/svn/reactos?rev=32449&view=rev > Log: > Add support for multiple architectures to autorun.inf > > Modified: > branches/rbuild/reactos/boot/bootdata/autorun.inf > > Modified: branches/rbuild/reactos/boot/bootdata/autorun.inf > URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/boot/bootdata/au… > ============================================================================== > --- branches/rbuild/reactos/boot/bootdata/autorun.inf (original) > +++ branches/rbuild/reactos/boot/bootdata/autorun.inf Fri Feb 22 15:14:08 2008 > +[autorun.mips] > + > +open=mips\welcome.exe > +icon=icon.ico > + > +[autorun.alpha] > + > +open=alpha\welcome.exe > +icon=icon.ico This is really unneeded. Alpha is one nail away from the coffin being closed and nobody is even remotely interested in doing a mips port right now. Please remove them and add a an arm entry. Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years, 3 months

3
2
0 0

make livecd failure

by Steven Edwards

Hi, This should be a simple one to fix. I can build the rest of the tree and make bootcd works CC] lib/cmlib/cminit.c lib/cmlib/cminit.c:22:15: error: attempt to use poisoned "wcslen" lib/cmlib/cminit.c: In function 'CmpPrepareIndexOfKeys': lib/cmlib/cminit.c:98: warning: implicit declaration of function 'DbgPrint' mingw32-make: *** [obj-i386/lib/cmlib_host/cminit.o] Error 1 -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years, 4 months

1
0
0 0

boot regressions

by Steven Edwards

Hi, I've not had a chance to dig in and see which changeset caused the issue but since the recent bringup changes I can no longer use the bootcd on Parallels. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years, 4 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 32371: Fixed several off-by-one errors when playing with the PFN database array size. Among other things, certain valid pages would be considered invalid, and also the PFN database wouldn't be properly erased on startup (which would result in a crash after a warm reboot or restarting the emulator).

by Pablo Menichini

The off-by-one errors are because MmPageArraySize is: MmPageArraySize = MmHighestPhysicalPage; and not MmPageArraySize = MmHighestPhysicalPage + 1; Just my 2 cents, Pablo On Fri, 15 Feb 2008, ros-arm-bringup(a)svn.reactos.org wrote: > Author: ros-arm-bringup > Date: Fri Feb 15 04:04:22 2008 > New Revision: 32371 > > URL: http://svn.reactos.org/svn/reactos?rev=32371&view=rev > Log: > Fixed several off-by-one errors when playing with the PFN database array size. Among other things, certain valid pages would be considered invalid, and also the PFN database wouldn't be properly erased on startup (which would result in a crash after a warm reboot or restarting the emulator). > > Modified: > trunk/reactos/ntoskrnl/mm/freelist.c

17 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 32333: Added cache sweeping code into the HAL, for ARM926EJ-S and ARM1026EJ-S CPUs. Finished implementation of KiSystemStartup. Copied KiInitializeKernel from x86 to ARM, removing irrelevant parts. This is our curren

by Steven Edwards

On Feb 12, 2008 3:32 PM, <ros-arm-bringup(a)svn.reactos.org> wrote: > Author: ros-arm-bringup > Date: Tue Feb 12 23:32:23 2008 > New Revision: 32333 > > URL: http://svn.reactos.org/svn/reactos?rev=32333&view=rev > Log: > Added cache sweeping code into the HAL, for ARM926EJ-S and ARM1026EJ-S CPUs. > Finished implementation of KiSystemStartup. > Copied KiInitializeKernel from x86 to ARM, removing irrelevant parts. This is our current checkpoint. Is there an offical bringup toolchain posted somewhere or steps on how to build one from the RosBE sources? -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years, 4 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 32333: Added cache sweeping code into the HAL, for ARM926EJ-S and ARM1026EJ-S CPUs. Finished implementation of KiSystemStartup. Copied KiInitializeKernel from x86 to ARM, removing irrelevant parts. This is

by James Tabor

Hi! My best guess is http://gnuarm.org/ I have no idea of anything else. Thanks, James On Feb 12, 2008 5:30 PM, Steven Edwards <winehacker(a)gmail.com> wrote: > On Feb 12, 2008 3:32 PM, <ros-arm-bringup(a)svn.reactos.org> wrote: > > Author: ros-arm-bringup > > Date: Tue Feb 12 23:32:23 2008 > > New Revision: 32333 > > > > URL: http://svn.reactos.org/svn/reactos?rev=32333&view=rev > > Log: > > Added cache sweeping code into the HAL, for ARM926EJ-S and ARM1026EJ-S CPUs. > > Finished implementation of KiSystemStartup. > > Copied KiInitializeKernel from x86 to ARM, removing irrelevant parts. This is our current checkpoint. > > Is there an offical bringup toolchain posted somewhere or steps on how > to build one from the RosBE sources? > > -- > Steven Edwards > > "There is one thing stronger than all the armies in the world, and > that is an idea whose time has come." - Victor Hugo > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

17 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 32303: New ReactOS People Map based on Google Maps API (not yet on the Web server) The map integrates into the existing website and is linked with the RosCMS accounts. You can add a group of users (like Translators,

by Klemens Friedl

2008/2/12, Gregor Brunmar <gbrunmar.ros(a)gmail.com>: > Sounds like a cool feature, I'm waiting for it eagerly :) The new ReactOS People Map can be found there: http://www.reactos.org/peoplemap/ Klemens

17 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [cfinck] 32303: New ReactOS People Map based on Google Maps API (not yet on the Web server) The map integrates into the existing website and is linked with the RosCMS accounts. You can add a group of users (like Translators, Developers, Administrators, etc.) to the map or search for people and add them individually. I made tests with 500 random users on one map and it was still usable :-) Also there are easy features for setting your own position. I successfully tested the People M

by Gregor Brunmar

Sounds like a cool feature, I'm waiting for it eagerly :) -Gregor cfinck(a)svn.reactos.org wrote: > Author: cfinck > Date: Mon Feb 11 21:43:40 2008 > New Revision: 32303 > > URL: http://svn.reactos.org/svn/reactos?rev=32303&view=rev > Log: > New ReactOS People Map based on Google Maps API (not yet on the Web server) > > The map integrates into the existing website and is linked with the RosCMS accounts. > You can add a group of users (like Translators, Developers, Administrators, etc.) to the map or search for people and add them individually. I made tests with 500 random users on one map and it was still usable :-) > Also there are easy features for setting your own position. > > I successfully tested the People Map with Firefox 2.0, Opera 9.21, Safari 3 Beta, Konqueror 3.5.6 and IE6/7. > The marker graphics were done myself with Inkscape and the other graphics were composed out of icons from the Tango Icon Project or taken from other ReactOS web apps. > The PNGs with alpha transparency are also shown correctly under IE6 using a trick in "ie6-fixes.css". > >

17 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [fireball] 32321: - Kernel's entrypoint is called NtProcessStartup right now, for ReactOS. If this is to be changed, it should be changed for all archs, not only for ARM.

by Aleksey Bragin

Even more, I think it was you who implemented this entrypoint in the ReactOS kernel :-). I'll discuss with PPC and ARM ports, and then we could make a switch alltogether. WBR, Aleksey Bragin. On Feb 12, 2008, at 5:56 PM, Alex Ionescu wrote: > Actually, I've never heard of the entrypoint being called > NtProcessStartup for the kernel... > > Why not fix the name in the x86 sources?

17 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [fireball] 32321: - Kernel's entrypoint is called NtProcessStartup right now, for ReactOS. If this is to be changed, it should be changed for all archs, not only for ARM.

by Alex Ionescu

Actually, I've never heard of the entrypoint being called NtProcessStartup for the kernel... Why not fix the name in the x86 sources? On 12-Feb-08, at 8:34 AM, fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Tue Feb 12 16:34:33 2008 > New Revision: 32321 > > URL: http://svn.reactos.org/svn/reactos?rev=32321&view=rev > Log: > - Kernel's entrypoint is called NtProcessStartup right now, for > ReactOS. If this is to be changed, it should be changed for all > archs, not only for ARM. > > Modified: > trunk/reactos/tools/rbuild/module.cpp > > Modified: trunk/reactos/tools/rbuild/module.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/tools/rbuild/module.cpp (original) > +++ trunk/reactos/tools/rbuild/module.cpp Tue Feb 12 16:34:33 2008 > @@ -1033,7 +1033,7 @@ > switch ( type ) > { > case Kernel: > - return "KiSystemStartup"; > + return "NtProcessStartup"; > case KernelModeDLL: > case KernelModeDriver: > return "DriverEntry@8"; > > Best regards, Alex Ionescu

17 years, 4 months

1
0
0 0

misc.c: LengthOfStrResource, AllocAndLoadString

by Timo Kreuzer

I wonder why those functions spread around that much (cacls, sndvol, aclui, servman, etc...), since windows has already the needed function: LoadString will store a pointer to the string resource in *lpBuffer, if nBufferMax is set to 0, so allocating additional memory is not neccessary in most cases. And it also returns the full length. http://msdn2.microsoft.com/en-us/library/ms647486(VS.85).aspx > > Author: cfinck > Date: Sat Feb 2 00:40:18 2008 > New Revision: 32079 > > URL: http://svn.reactos.org/svn/reactos?rev=32079&view=rev <http://svn.reactos.org/svn/reactos?rev=32079&view=rev> > Log: > Wrote a Win32 Font Editor for our VGA Fonts used in blue.sys. > > It has a MDI user interface, imports binary fonts (.bin) and PC Screen Fonts (.psf) and exports .bin fonts. > Compiles without any warnings with GCC and MSVC (at /W3). > > The "misc.c" file was taken from devmgmt (thanks Ged!) and modified. > >

17 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 32215: - Start implement Advanced General page - Update Russian translation

by gedmurphy

Please stop mixing tchar and unicode. You're creating the potential for a whole host of problems. If you're unsure, ask someone. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 08 February 2008 13:08 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 32215: - Start implement Advanced General page - Update Russian translation Author: dchapyshev Date: Fri Feb 8 16:07:37 2008 New Revision: 32215 URL: http://svn.reactos.org/svn/reactos?rev=32215&view=rev Log: - Start implement Advanced General page - Update Russian translation

17 years, 4 months

1
0
0 0

[ros-diffs] [tkreuzer] 32203: remove obsolete syscalls

by James Tabor

Hi! Somehow NtUserGetWindowThreadProcessId was moved to the main list. This is wrong! With in the next six months NtUserGetWindowThreadProcessId (unless it was added in Vista) and friends will no longer be in ReactOS. Please do not create more work than it is necessary to accomplish this rewrite. -# ReactOS only system calls -NtUserAcquireOrReleaseInputOwnership 1 -NtUserGetWindowThreadProcessId 2 -NtUserGetQueueStatus 1 Thanks, James

17 years, 4 months

2
1
0 0

right way form shared modules

by netzimme＠aim.com

Hello I want port some function from wine kernel32.dll to ReactOS kernel32.dll but have some problems. First i have two modules and the question is where is the right place to put them. I need /tools/unicode/wctype.c also here /dll/win32/kernel32/misc/ to compile. 1.) Is it better to leave this module in /tools/unicode/ ? -> What must i write in kernel32.rbuild to build this module with kernel32.dll 2.) or copy this file to /dll/win32/kernel32/misc/ the second solution is a bit ugly because we have tow files whit the same contents. 3.) ??? thanks Daniel ________________________________________________________________________ More new features than ever. Check out the new AIM(R) Mail ! - http://webmail.aim.com

17 years, 4 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 32137: - Add Russian translation - Move application title to resources

by gedmurphy

dchapyshev(a)svn.reactos.org wrote: > > + LoadString(hInstance, IDS_APPTITLE, szAppName, MAX_STRING); > + > hMainWnd = CreateWindowExW(0, > szMainWndClass, > szAppName, Stick with the current mapping, you've just introduced a potential overflow. Ged.

17 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 32018: compilerflags can be set for compiler {ALL|CC|CPP} now (ALL is default)

by tamlin＠algonet.se

Alex wrote: >On 26-Jan-08, at 2:34 PM, Marc Piulachs wrote: > >> Hi, >> >> I'm not very sure about r32018-r32022. >> >> Some compiler warnings are stupid and useless, some others not. > >This one is stupid. Actually, I'd say the stupidity is in using a runtime assert, when a compile-time assert will do the trick (not using CPU at runtime, while enforcing the condition). Unless memory fails me, in C++ you can implement ct_assert(x) like: typedef char[x!=0] foo; as an array of size zero is an error. How does current C compilers react to typedefs of zero-sized arrays? Sure, one can't use it exactly as in C++, but it could still be useful to at least know about this idiom. Problems should be trapped as early as possible. -- Mike

17 years, 4 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 32018: compilerflags can be set for compiler {ALL|CC|CPP} now (ALL is default)

by Marc Piulachs

Hi, I'm not very sure about r32018-r32022. Some compiler warnings are stupid and useless, some others not. I think we should solve the underlying problem when possible. Yes, I know it's easier to say than to do but silent them in an indiscriminate way just because clean builds are cooler is not the solution. Warnings are there for something... Also, we should work to actually remove <compilerflags> and <linkerflags> elements and express that information in a compiler/linker agnostic language now that we want to support at least an additional compiler and linker(MSVC) Regards, /Marc > -----Original Message----- > From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] > On Behalf Of cwittich(a)svn.reactos.org > Sent: Saturday, January 26, 2008 7:28 PM > To: ros-diffs(a)reactos.org > Subject: [ros-diffs] [cwittich] 32018: compilerflags can be set for > compiler {ALL|CC|CPP} now (ALL is default) > > Author: cwittich > Date: Sat Jan 26 21:27:37 2008 > New Revision: 32018 > > URL: http://svn.reactos.org/svn/reactos?rev=32018&view=rev > Log: > compilerflags can be set for compiler {ALL|CC|CPP} now (ALL is default) > > Modified: > trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp > trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp > trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h > trunk/reactos/tools/rbuild/compilerflag.cpp > trunk/reactos/tools/rbuild/rbuild.h > > Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/ming > w/mingw.cpp?rev=32018&r1=32017&r2=32018&view=diff > ========================================================================== > ==== > --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) > +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sat Jan 26 21:27:37 > 2008 > @@ -448,10 +448,13 @@ > > for ( i = 0; i < data.compilerFlags.size(); i++ ) > { > - fprintf ( > - fMakefile, > - " %s", > - data.compilerFlags[i]->flag.c_str() ); > + if ( data.compilerFlags[i]->compiler == CompilerTypeDontCare ) > + { > + fprintf ( > + fMakefile, > + " %s", > + data.compilerFlags[i]->flag.c_str() ); > + } > } > > fprintf ( fMakefile, "\n" ); > > Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/ming > w/modulehandler.cpp?rev=32018&r1=32017&r2=32018&view=diff > ========================================================================== > ==== > --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) > +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Jan 26 > 21:27:37 2008 > @@ -764,15 +764,18 @@ > } > > string > -MingwModuleHandler::GenerateCompilerParametersFromVector ( const > vector<CompilerFlag*>& compilerFlags ) const > +MingwModuleHandler::GenerateCompilerParametersFromVector ( const > vector<CompilerFlag*>& compilerFlags, const CompilerType type ) const > { > string parameters; > for ( size_t i = 0; i < compilerFlags.size (); i++ ) > { > CompilerFlag& compilerFlag = *compilerFlags[i]; > - if ( parameters.length () > 0 ) > - parameters += " "; > - parameters += compilerFlag.flag; > + if ( compilerFlag.compiler == type ) > + { > + if ( parameters.length () > 0 ) > + parameters += " "; > + parameters += compilerFlag.flag; > + } > } > return parameters; > } > @@ -848,7 +851,7 @@ > > if ( generatingCompilerMacro ) > { > - string compilerParameters = > GenerateCompilerParametersFromVector ( data.compilerFlags ); > + string compilerParameters = > GenerateCompilerParametersFromVector ( data.compilerFlags , > CompilerTypeDontCare ); > if ( compilerParameters.size () > 0 ) > { > fprintf ( > @@ -1719,21 +1722,25 @@ > { > const FileLocation& sourceFile = compilationUnit.GetFilename (); > string extension = GetExtension ( sourceFile ); > + string flags = cflagsMacro; > + flags += " "; > if ( extension == ".c" || extension == ".C" ) > { > + flags += GenerateCompilerParametersFromVector ( > module.non_if_data.compilerFlags , CompilerTypeCC ); > GenerateGccCommand ( &sourceFile, > GetCompilationUnitDependencies ( > compilationUnit ) + extraDependencies, > cc, > - cflagsMacro ); > + flags ); > } > else if ( extension == ".cc" || extension == ".CC" || > extension == ".cpp" || extension == ".CPP" || > extension == ".cxx" || extension == ".CXX" ) > { > + flags += GenerateCompilerParametersFromVector ( > module.non_if_data.compilerFlags , CompilerTypeCPP ); > GenerateGccCommand ( &sourceFile, > GetCompilationUnitDependencies ( > compilationUnit ) + extraDependencies, > cppc, > - cflagsMacro ); > + flags ); > } > else if ( extension == ".s" || extension == ".S" ) > { > > Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/ming > w/modulehandler.h?rev=32018&r1=32017&r2=32018&view=diff > ========================================================================== > ==== > --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) > +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Sat Jan 26 > 21:27:37 2008 > @@ -130,7 +130,7 @@ > std::string ConcatenatePaths ( const std::string& path1, > const std::string& path2 ) const; > std::string GenerateGccDefineParameters () const; > - std::string GenerateCompilerParametersFromVector ( const > std::vector<CompilerFlag*>& compilerFlags ) const; > + std::string GenerateCompilerParametersFromVector ( const > std::vector<CompilerFlag*>& compilerFlags, const CompilerType type ) > const; > std::string GenerateLinkerParametersFromVector ( const > std::vector<LinkerFlag*>& linkerFlags ) const; > std::string GenerateImportLibraryDependenciesFromVector ( const > std::vector<Library*>& libraries ); > std::string GenerateLinkerParameters () const; > > Modified: trunk/reactos/tools/rbuild/compilerflag.cpp > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilerflag > .cpp?rev=32018&r1=32017&r2=32018&view=diff > ========================================================================== > ==== > --- trunk/reactos/tools/rbuild/compilerflag.cpp (original) > +++ trunk/reactos/tools/rbuild/compilerflag.cpp Sat Jan 26 21:27:37 2008 > @@ -55,7 +55,25 @@ > node.location, > "<compilerflag> is empty." ); > } > + > flag = node.value; > + compiler = CompilerTypeDontCare; > + > + const XMLAttribute* att = node.GetAttribute ( "compiler", false ); > + if ( att != NULL) > + { > + if ( att->value == "cpp" ) > + compiler = CompilerTypeCPP; > + else if ( att->value == "cc" ) > + compiler = CompilerTypeCC; > + else > + { > + throw InvalidAttributeValueException ( > + node.location, > + "compiler", > + att->value ); > + } > + } > } > > void > > Modified: trunk/reactos/tools/rbuild/rbuild.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev > =32018&r1=32017&r2=32018&view=diff > ========================================================================== > ==== > --- trunk/reactos/tools/rbuild/rbuild.h (original) > +++ trunk/reactos/tools/rbuild/rbuild.h Sat Jan 26 21:27:37 2008 > @@ -309,6 +309,13 @@ > HostDefault, > HostTrue, > HostDontCare, > +}; > + > +enum CompilerType > +{ > + CompilerTypeDontCare, > + CompilerTypeCC, > + CompilerTypeCPP, > }; > > class FileLocation > @@ -592,6 +599,7 @@ > const Module* module; > const XMLElement& node; > std::string flag; > + CompilerType compiler; > > CompilerFlag ( const Project& project, > const XMLElement& compilerFlagNode ); >

17 years, 4 months

4
3
0 0

Re: [ros-dev] [ros-diffs] [arty] 32007: Fix termination of process under debug.

by Alex Ionescu

This is incorrect behavior, the terminate should be instant. This will likely cause bugs in the user-mode debugging framework. On 26-Jan-08, at 4:20 AM, arty(a)svn.reactos.org wrote: > Author: arty > Date: Sat Jan 26 12:20:56 2008 > New Revision: 32007 > > URL: http://svn.reactos.org/svn/reactos?rev=32007&view=rev > Log: > Fix termination of process under debug. > > Modified: > trunk/reactos/ntoskrnl/dbgk/dbgkobj.c > > 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 (original) > +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Sat Jan 26 12:20:56 2008 > @@ -1065,6 +1065,17 @@ > > VOID > NTAPI > +DbgkpDelayedTerminateProcess(PVOID Arg) > +{ > + PWORK_QUEUE_ITEM WorkItem = (PWORK_QUEUE_ITEM)Arg; > + PEPROCESS OwnerProcess = *((PEPROCESS *)&WorkItem[1]); > + ExFreePool(WorkItem); > + /* Terminate the process */ > + PsTerminateProcess(OwnerProcess, STATUS_DEBUGGER_INACTIVE); > +} > + > +VOID > +NTAPI > DbgkpCloseObject(IN PEPROCESS OwnerProcess OPTIONAL, > IN PVOID ObjectBody, > IN ACCESS_MASK GrantedAccess, > @@ -1079,6 +1090,8 @@ > DBGKTRACE(DBGK_OBJECT_DEBUG, "OwnerProcess: %p DebugObject: %p\n", > OwnerProcess, DebugObject); > > + DPRINT("APC DISABLE: %d\n", ((PETHREAD)KeGetCurrentThread())- > >Tcb.CombinedApcDisable); > + > /* If this isn't the last handle, do nothing */ > if (SystemHandleCount > 1) return; > > @@ -1127,8 +1140,16 @@ > /* Check if we terminate on exit */ > if (DebugObject->KillProcessOnExit) > { > - /* Terminate the process */ > - PsTerminateProcess(OwnerProcess, > STATUS_DEBUGGER_INACTIVE); > + PWORK_QUEUE_ITEM WorkItem = > + ExAllocatePool > + (NonPagedPool, > + sizeof(WORK_QUEUE_ITEM) + sizeof(PVOID)); > + ExInitializeWorkItem > + (WorkItem, > + DbgkpDelayedTerminateProcess, > + WorkItem); > + *((PEPROCESS *)&WorkItem[1]) = OwnerProcess; > + ExQueueWorkItem(WorkItem, CriticalWorkQueue); > } > > /* Dereference the debug object */ > > Best regards, Alex Ionescu

17 years, 4 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [cwittich] 31978: remove statement with no effect

by Alex Ionescu

Um, this statement is useful. Try to understand compiler warnings, not just obey them :) On 24-Jan-08, at 3:47 PM, cwittich(a)svn.reactos.org wrote: > Author: cwittich > Date: Thu Jan 24 23:47:56 2008 > New Revision: 31978 > > URL: http://svn.reactos.org/svn/reactos?rev=31978&view=rev > Log: > remove statement with no effect > > Modified: > trunk/reactos/dll/win32/kernel32/mem/local.c > > Modified: trunk/reactos/dll/win32/kernel32/mem/local.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/dll/win32/kernel32/mem/local.c (original) > +++ trunk/reactos/dll/win32/kernel32/mem/local.c Thu Jan 24 23:47:56 > 2008 > @@ -254,8 +254,6 @@ > NTAPI > LocalLock(HLOCAL hMem) > { > - /* This is the same as a GlobalLock, assuming these never > change */ > - ASSERT(LMEM_LOCKCOUNT == GMEM_LOCKCOUNT); > return GlobalLock(hMem); > } > > >

17 years, 4 months

2
1
0 0

How to get the permission to commit code?

by Xiaoming Gao

HI guys, Would someone tell me how to get the permission to commit code?

17 years, 4 months

2
2
0 0

no need to fix apic ldr configure

by Xiaoming Gao

> > I think the "fixme" in halx86/mp/apic.c line 583 is no need to fix,i have > > read the linux source code ,which just configure like reactos.So still > > need to fix? > > >

17 years, 4 months

1
0
0 0

may it is a problem(about Completion port)

by Yee Jacky

when we use iocp,first,we should create a port like this --- CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);--- But in the implementation of CreateIoCompletionPort,the beginning of the fuction is : if ( ExistingCompletionPort == NULL && FileHandle == INVALID_HANDLE_VALUE ) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } so ,all the application running well on MS Windows will not run correct in ReactOS,Because they will always get the ERROR_INVALID_PARAMETER error code when they call CreateIoCompletionPort like --CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);-- I think this is a problem,But I'm not sure!

17 years, 4 months

2
2
0 0

Re: [ros-dev] Hi, does ReactOS support x86 multiprocessor completely for now?

by Aleksey Bragin

Hello, it's not really completely supported now. As for the label, it was a typo, and I fixed it in revision 31882. WBR, Aleksey Bragin. On Jan 19, 2008, at 12:48 PM, Xiaoming Gao wrote: > Hello everyone > I'm a new comer,i'm reading the kernel source ,but i found that > "jz NotBusy " in ctxswitch.S (line 351),the NotBusy label is not > defined.I have searched the whole source code,but not found it. So, > would someone tell me some information about this?

17 years, 4 months

2
1
0 0

Hi, does ReactOS support x86 multiprocessor completely for now?

by Xiaoming Gao

Hello everyone I'm a new comer,i'm reading the kernel source ,but i found that "jz NotBusy " in ctxswitch.S (line 351),the NotBusy label is not defined.I have searched the whole source code,but not found it. So, would someone tell me some information about this?

17 years, 4 months

1
0
0 0

delay loading dlls

by Timo Kreuzer

Hi, I have recently played around a little with delay loading stuff. I have written a __delayLoadHelper2 and the neccessary asm stubs to do delay loading of a dll. It works and is implemented as documented on msdn / Under The Hood. The stubs are done by hand, but it shouldn't be too hard to write a tool to autocreate them the same way as dlltool does it. There will be no entry in the pe header, but that is optional anyway. Are there any plans on how to handle that? The best way would probably be, if dlltool could handle that, but ... So I thought about a dlitool.exe that creates the stubs. Any ideas? For the ones interested: I have attached the sources. They allow to delay import StrToIntA from shlwapi.dll Timo #include <windows.h> #include "delayimp.h" inline unsigned IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase) { return pData - pBase; } extern const IMAGE_DOS_HEADER _image_base__; inline PVOID PFromRva(RVA rva) { return (PVOID)(((ULONG_PTR)(rva)) + ((ULONG_PTR)&_image_base__)); } /**** load helper ****/ FARPROC WINAPI __delayLoadHelper2(PCImgDelayDescr pidd, PImgThunkData pIATEntry) { DelayLoadInfo dli; int index; PImgThunkData pIAT; PImgThunkData pINT; HMODULE *phMod; FARPROC pProc; pIAT = PFromRva(pidd->rvaIAT); pINT = PFromRva(pidd->rvaINT); phMod = PFromRva(pidd->rvaHmod); index = IndexFromPImgThunkData(pIATEntry, pIAT); dli.cb = sizeof(dli); dli.pidd = pidd; dli.ppfn = (FARPROC*)pIATEntry->u1.Function; dli.szDll = PFromRva(pidd->rvaDLLName); dli.dlp.fImportByName = !(pINT[index].u1.Ordinal & IMAGE_ORDINAL_FLAG); if (dli.dlp.fImportByName) { /* u1.AdressOfData points to a IMAGE_IMPORT_BY_NAME struct */ PIMAGE_IMPORT_BY_NAME piibn = PFromRva((RVA)pINT[index].u1.AddressOfData); dli.dlp.szProcName = (LPCSTR)&piibn->Name; } else { dli.dlp.dwOrdinal = pINT[index].u1.Ordinal & ~IMAGE_ORDINAL_FLAG; } dli.hmodCur = *phMod; dli.pfnCur = (FARPROC)pIAT[index].u1.Function; dli.dwLastError = GetLastError(); pProc = __pfnDliNotifyHook2(dliStartProcessing, &dli); if (pProc) { pIAT[index].u1.Function = (DWORD)pProc; return pProc; } if (dli.hmodCur == NULL) { dli.hmodCur = LoadLibraryA(dli.szDll); if (!dli.hmodCur) { dli.dwLastError = GetLastError(); __pfnDliFailureHook2(dliFailLoadLib, &dli); // if (ret) // { // } // FIXME: raise exception; return NULL; } *phMod = dli.hmodCur; } /* dli.dlp.szProcName might also contain the ordinal */ pProc = GetProcAddress(dli.hmodCur, dli.dlp.szProcName); if (!pProc) { dli.dwLastError = GetLastError(); __pfnDliFailureHook2(dliFailGetProc, &dli); // FIXME: handle return value & raise exception return NULL; } pIAT[index].u1.Function = (DWORD)pProc; return pProc; } /*** The default hooks ***/ FARPROC WINAPI DefaultDliNotifyHook2(unsigned dliNotify, PDelayLoadInfo pdli) { return NULL; } FARPROC WINAPI DefaultDliFailureHook2(unsigned dliNotify, PDelayLoadInfo pdli) { return NULL; } PfnDliHook __pfnDliNotifyHook2 = DefaultDliNotifyHook2; PfnDliHook __pfnDliFailureHook2 = DefaultDliFailureHook2; #ifndef _DELAYIMP_H_ #define _DELAYIMP_H_ typedef void *RVA; typedef IMAGE_THUNK_DATA *PImgThunkData; typedef const IMAGE_THUNK_DATA *PCImgThunkData; enum { dlattrRva }; /* Notification codes */ enum { dliStartProcessing, dliNotePreLoadLibrary, dliNotePreGetProcAddress, dliFailLoadLib, dliFailGetProc, dliNoteEndProcessing, }; typedef struct ImgDelayDescr { DWORD grAttrs; RVA rvaDLLName; RVA rvaHmod; RVA rvaIAT; RVA rvaINT; RVA rvaBoundIAT; RVA rvaUnloadIAT; DWORD dwTimeStamp; } ImgDelayDescr, *PImgDelayDescr; typedef const ImgDelayDescr *PCImgDelayDescr; typedef struct DelayLoadProc { BOOL fImportByName; union { LPCSTR szProcName; DWORD dwOrdinal; }; } DelayLoadProc; typedef struct DelayLoadInfo { DWORD cb; PCImgDelayDescr pidd; FARPROC *ppfn; LPCSTR szDll; DelayLoadProc dlp; HMODULE hmodCur; FARPROC pfnCur; DWORD dwLastError; } DelayLoadInfo, *PDelayLoadInfo; typedef FARPROC (WINAPI *PfnDliHook)(unsigned, PDelayLoadInfo); extern PfnDliHook __pfnDliNotifyHook2; extern PfnDliHook __pfnDliFailureHook2; #endif /* not _DELAYIMP_H_ */ .intel_syntax noprefix .section .text .global __tailMerge__shlwapi __tailMerge__shlwapi: push ecx push edx push eax push offset __DELAY_IMPORT_DESCRIPTOR_SHLWAPI call ___delayLoadHelper2@8 pop edx pop ecx jmp eax # DELAY_IMPORT_DESCRIPTOR .section .text$2 .global __DELAY_IMPORT_DESCRIPTOR_SHLWAPI __DELAY_IMPORT_DESCRIPTOR_SHLWAPI: .long 1 # grAttrs .rva shlwapi_dll_iname # rvaDLLName .rva shlwapi_dll_handle # rvaHmod .rva shlwapi_dll_diat # rvaIAT .rva shlwapi_dll_dint # rvaINT .long 0 # rvaBoundIAT .long 0 # rvaUnloadIAT .long 0 # dwTimeStamp .section .data shlwapi_dll_handle: .long 0 #Stuff for compatibility .section .idata$5 .long 0 shlwapi_dll_diat: .section .idata$4 .long 0 .section .idata$4 shlwapi_dll_dint: .intel_syntax noprefix .section .text .global _StrToIntA@4 _StrToIntA@4: jmp dword ptr [.idata$5] __imp__load_StrToIntA@4: mov eax, offset __imp__StrToIntA@4 jmp __tailMerge__shlwapi # The INT .section .idata$4 .rva .idata$6 # The IAT .section .idata$5 __imp__StrToIntA@4: .long __imp__load_StrToIntA@4 # The name .section .idata$6 .byte 0x00, 0x00 .asciz "StrToIntA" #.section .idata$7 # .rva __DELAY_IMPORT_DESCRIPTOR_SHLWAPI .intel_syntax noprefix # Terminate the INT .section .idata$4 .long 0 # Terminate the IAT .section .idata$5 .long 0 # The dll name .section .idata$7 .global shlwapi_dll_iname shlwapi_dll_iname: .asciz "shlwapi.dll"

17 years, 5 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [peterw] 31817: Big polish translation patch by Olaf Siejka (caemyr AT gmail DOT com) See issue #2944 for more details. - Polish translation for 0.3.4 is now complete... almost :) One thing left is kernel32 error codes. As it requires inte

by Marc Piulachs

> trunk/reactos/dll/win32/kernel32/lang/pl-PL.mc (with props) IMO is not a good idea to use different mc files for every language. MC file format is specially designed to hold all the languages in the same file, also our current WMC implementation does not support splitting translation across multiple mc files. AFAIK Physcious was working on implementing that feature to our WMC but even in that case there is no easy way to support them at rbuild level without introducing a hack, also MS's WMC does not support it so I think we should keep it to the lowest common denominator and avoid future compiler compatibility problems as there isn't any significant advantage on it. /Marc

17 years, 5 months

2
1
0 0

Re: [ros-dev] Crash caused by Sysinternals FileMon 7.04 found by Christoph

by tamlin＠algonet.se

jimtabor wrote: >when WindowObject->Wnd is NULL and WindowObject is not NULL > it crashes in vis.c line 89. [...] >Since this crash is started in GetDCEx with a NULL "Window" >call leaves me with a bad taste. The code was written prior to >having Desktop support, later hax. So having null window >associated with DCE is okay then, not now. > >Any Ideas? Isn't this the case where it in Windows originally got the meaning "use the desktop window", that later became a compatibility hack where "NULL isn't a cool HWND, but due to the many programs using it, we'll automatically give the user the DC for the (currently visible) screen" (or possibly the desktop associated with the thread)? -- Mike

17 years, 5 months

1
0
0 0

Re: [ros-dev] heap.c

by Aleksey Bragin

Hi, please provide a patch in a unified diff format (preferably submit it to www.reactos.org/bugzilla for faster reviewing/commit process). WBR, Aleksey Bragin. On Jan 13, 2008, at 6:11 PM, Oriol wrote: > here's the implementation and some corrections of some unimplemented > functions at lib/rtl/heap.c > > NTSTATUS NTAPI > RtlEnumProcessHeaps(PHEAP_ENUMERATION_ROUTINE HeapEnumerationRoutine, > PVOID lParam) > { > > #if 1 > NTSTATUS Status = STATUS_SUCCESS; > > struct list *ptr=NULL; > RtlEnterHeapLock(&processHeap->critSection); > Status=HeapEnumerationRoutine(processHeap,lParam); > LIST_FOR_EACH( ptr, &processHeap->entry ) > { > if (!NT_SUCCESS(Status)) > break; > Status = HeapEnumerationRoutine(ptr,lParam); > > } > > > RtlLeaveHeapLock(&processHeap->critSection); > > return Status; > #endif > } > > > /* > * @implemented > */ > ULONG NTAPI > RtlGetProcessHeaps(ULONG count, > HANDLE *heaps ) > { > ULONG total = 1; /* main heap */ > struct list *ptr; > ULONG i=0; > RtlEnterHeapLock( &processHeap->critSection ); > LIST_FOR_EACH( ptr, &processHeap->entry ) total++; > //if (total <= count) > { > *(heaps++) = processHeap; > i++; > LIST_FOR_EACH( ptr, &processHeap->entry ) > { > if(i>=count) > { > break; > } > i++; > *(heaps++) = LIST_ENTRY( ptr, HEAP, entry ); > > } > } > RtlLeaveHeapLock( &processHeap->critSection ); > return i; > } > > > /* > * @implemented > */ > BOOLEAN NTAPI > RtlValidateProcessHeaps(VOID) > { > > #if 1 > BOOLEAN Result = TRUE; > HEAP ** pptr; > > > RtlEnterHeapLock( &processHeap->critSection ); > > for (pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; *pptr; pptr++) > { > if (!RtlValidateHeap(*pptr, 0, NULL)) > { > Result = FALSE; > break; > } > } > > > RtlLeaveHeapLock( &processHeap->critSection ); > return Result; > #endif > } > > is it correct? > > > > ______________________________________________ > LLama Gratis a cualquier PC del Mundo. > Llamadas a fijos y móviles desde 1 céntimo por minuto. > http://es.voice.yahoo.com > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev

17 years, 5 months

1
0
0 0

heap.c

by Oriol

here's the implementation and some corrections of some unimplemented functions at lib/rtl/heap.c NTSTATUS NTAPI RtlEnumProcessHeaps(PHEAP_ENUMERATION_ROUTINE HeapEnumerationRoutine, PVOID lParam) { #if 1 NTSTATUS Status = STATUS_SUCCESS; struct list *ptr=NULL; RtlEnterHeapLock(&processHeap->critSection); Status=HeapEnumerationRoutine(processHeap,lParam); LIST_FOR_EACH( ptr, &processHeap->entry ) { if (!NT_SUCCESS(Status)) break; Status = HeapEnumerationRoutine(ptr,lParam); } RtlLeaveHeapLock(&processHeap->critSection); return Status; #endif } /* * @implemented */ ULONG NTAPI RtlGetProcessHeaps(ULONG count, HANDLE *heaps ) { ULONG total = 1; /* main heap */ struct list *ptr; ULONG i=0; RtlEnterHeapLock( &processHeap->critSection ); LIST_FOR_EACH( ptr, &processHeap->entry ) total++; //if (total <= count) { *(heaps++) = processHeap; i++; LIST_FOR_EACH( ptr, &processHeap->entry ) { if(i>=count) { break; } i++; *(heaps++) = LIST_ENTRY( ptr, HEAP, entry ); } } RtlLeaveHeapLock( &processHeap->critSection ); return i; } /* * @implemented */ BOOLEAN NTAPI RtlValidateProcessHeaps(VOID) { #if 1 BOOLEAN Result = TRUE; HEAP ** pptr; RtlEnterHeapLock( &processHeap->critSection ); for (pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; *pptr; pptr++) { if (!RtlValidateHeap(*pptr, 0, NULL)) { Result = FALSE; break; } } RtlLeaveHeapLock( &processHeap->critSection ); return Result; #endif } is it correct? ______________________________________________ LLama Gratis a cualquier PC del Mundo. Llamadas a fijos y móviles desde 1 céntimo por minuto. http://es.voice.yahoo.com

17 years, 5 months

1
0
0 0

Crash caused by Sysinternals FileMon 7.04 found by Christoph

by James Tabor

Hi, >From this patch http://svn.reactos.org/svn/reactos?view=rev&revision=30477, I found when WindowObject->Wnd is NULL and WindowObject is not NULL it crashes in vis.c line 89. This patch is okay. My best guess, when Wnd is null that means the window is on the way of removal. Luck of the thread? I can patch and protect the while loops in vis.c but the crash moves to another place based on the same null Wnd problem. Since this crash is started in GetDCEx with a NULL "Window" call leaves me with a bad taste. The code was written prior to having Desktop support, later hax. So having null window associated with DCE is okay then, not now. Any Ideas? Thanks, James

17 years, 5 months

1
0
0 0

advapi32 crypt update from wine

by Christoph Brill

Hi list, attached is a patch to update the crypt-related part of advapi from wine. Hope this patch is useful. It's less intrusive than earlier patches from me. Please use it, Christoph (aka egore on IRC)

17 years, 5 months

3
2
0 0

Patch for misc cleanups from Wine

by Christoph Brill

Hi list, on my way on comparing wine with reactos I found several differences which were cleanups in wine. Attached is a patch to merge over theses changes. Regards, Christoph Brill

17 years, 5 months

2
2
0 0

Update shdocvw from wine

by Christoph Brill

Hi list, I tried to sync shdocvw today. Our version is quite different from what I found in wine. Both seem to have started from a similar point but both got some development done. I'm not sure I'm doing anything correct here, but to outline my changes (and later on the issues): - Import the new "class hierarchie" (ConnectionPointContainer->DocHost->WebBrowser) - stuff like IPersistMemory, IOleCommandTarget, IHlinkFrame, IDispatch, IServiceProvider - URL-History and Navigation (Forward, Backward) Issues: - I commented out regsvr.c because factory.c had similar functions. I'm not sure which one is better, but whichever we choose it should be put in regserv.c and merged back to wine. - DllGetClassObject in shdocvw_main.c commented out in favour of factory.c. Same as above. - I removed "extern const GUID CLSID_InternetShortcut;" from include/psdk/isguids.h. We needed CLSID_InternetShortcut to be static in factory.c. You see: factory.c causes me a major headache. I'll see if I can fix these issues but I really like one with knowledge(!) to look over the patches and at least tell me: Hey, what you are doing is (more or less) right/wrong. Feedback please! Thanks, Christoph Brill

17 years, 5 months

1
0
0 0

Patch for msvcrt20

by Christoph Brill

Hi list, attached is a patch to update msvcrt20 against wine. It changes: - use the .spec file from wine to generate the .def - Add some CDECL's That's it, Christoph Brill

17 years, 5 months

1
0
0 0

[PATCH] Sync msiexec againt wine

by Christoph Brill

Hi list, attached is a patch that updates our msiexec from the wine sources. From what I can tell it has 2 major changes: - option handling is now much more sane (no "if (!xyz)" but "if (xyz)") - addition of argument "/regserver" I also added the icon from wine for msiexec. Not sure if it's ok. Tell me if I should create another (if someone tells me how the icon should look like I would do a better one). Regards, Christoph Brill

17 years, 5 months

1
0
0 0

dll/cpl/usrmgr translation status

by Olaf Siejka

I would like to ask if usrmgr is open for translation. As Eric Kohl left the following message inside en-US.rc: * Attention Translators: * DO NOT TRANSLATE THESE RESOURCES YET! it should be quite evident, its not ready yet. Alas, a russian translation exists, commited by Fireball himself. Regards Olaf Siejka aka Caemyr aka Haos

17 years, 5 months

1
0
0 0

bug in vfatfs.sys?

by Oriol

I get an error while trying to install Firefox 2.0 on a bootcd compilation, finally i found the possibly bug is in vfatfs.sys i modified some lines but is not my code.....it seems to install Firefox. Also, testing firefox i found problems with gdi and also done some modifications, still testing them.. Here is my patch..NO WARRANTY he he..

17 years, 5 months

3
4
0 0

Re: [ros-dev] bug in vfatfs.sys?

by Aleksey Bragin

Basically, Oriol just uncommented your #if0-ed code, and substituted SEH-wrapped pointer operation with a worse "if not null" check. And that's filtering a number of unrelated debug-messages hacks. But, Oriol, you're giving good signs you're improving! :-) The VFAT problem of not clearing the delete pending flag is a good thing (Christoph discovered that, however there are still problems if you clear the flag). With the best regards, Aleksey Bragin. On Jan 4, 2008, at 10:46 AM, James Tabor wrote: > Hi, > I can only write about the gdi code changes. > > 1st dll/win32/gdi32/misc/misc.c looks good! > 2nd the dc.c changes,,, ATM the support code for dirty bit sets is not > inplace, but the patch is good. > > I will apply your patch ASAP for the GDI changes, it does look good. > > Thanks, > James > > On Jan 3, 2008 3:41 PM, Oriol <oripipa(a)yahoo.es> wrote: >> I get an error while trying to install Firefox 2.0 on a bootcd >> compilation, finally i found the possibly bug is in vfatfs.sys i >> modified some lines but is not my code.....it seems to install >> Firefox. >> Also, testing firefox i found problems with gdi and also done some >> modifications, still testing them.. >> Here is my patch..NO WARRANTY he he..

17 years, 5 months

1
0
0 0

Re : bug in vfatfs.sys?

by Sylvain Petreolle

Hi Oriol, now you can send the vfatfs.sys patch ;) Kind regards, Sylvain Petreolle (aka Usurp) Je ne suis pas d'accord avec ce que vous dites, mais je me battrai jusqu'à la mort pour que vous ayez le droit de le dire.I may disagree with what you have to say, but I shall defend, to the death, your right to say it. - VoltaireRun your favorite Windows apps with free ReactOS : http://www.reactos.orgListen to non-DRMised Music: http://www.jamendo.com ----- Message d'origine ---- De : Oriol <oripipa(a)yahoo.es> À : ros-dev(a)reactos.org Envoyé le : Jeudi, 3 Janvier 2008, 22h41mn 57s Objet : [ros-dev] bug in vfatfs.sys? I get an error while trying to install Firefox 2.0 on a bootcd compilation, finally i found the possibly bug is in vfatfs.sys i modified some lines but is not my code.....it seems to install Firefox. Also, testing firefox i found problems with gdi and also done some modifications, still testing them.. Here is my patch..NO WARRANTY he he..

17 years, 5 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [mpiulachs] 31563: - Show localized error messages

by Ged Murphy

Can you fill the headers out correctly please? See any other the other reactos sources as to how this is done. There's also a wiki page detailing this. Thanks, Ged. +/* + * ReactOS kernel + * Copyright (C) 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: registry.h 21704 2006-04-22 13:55:01Z tretiakov $ + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: subsys/system/usetup/errcode.h + * PURPOSE: + * PROGRAMMER: + */

17 years, 5 months

1
0
0 0