- Ros-dev - ReactOS.org

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 >

17 years, 2 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.

17 years, 2 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> > >

17 years, 2 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

17 years, 2 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

17 years, 2 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

17 years, 2 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

17 years, 2 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

17 years, 2 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

17 years, 2 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 > >

17 years, 2 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é

17 years, 2 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.

17 years, 2 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> > >

17 years, 2 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

17 years, 2 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

17 years, 2 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...

17 years, 2 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.

17 years, 3 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, 3 months

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

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

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 months

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

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

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

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 months

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev