Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 19666: - Add DDK alignment macros and move/rename the ones in the NDK for user-mode only (since kernel-mode should use the DDK ones).
by ion＠svn.reactos.com 27 Nov '05

27 Nov '05

- Add DDK alignment macros and move/rename the ones in the NDK for user-mode only (since kernel-mode should use the DDK ones). - Fix helper.h's alignment macros to protect properly and also use a faster implementation. - Update NDK readme. Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/drivers/fs/vfat/vfat.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/lpctypes.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/readme.txt Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/reactos/helper.h Modified: trunk/reactos/lib/crt/precomp.h Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-11-27 02:55:13 UTC (rev 19666) @@ -70,6 +70,7 @@ /* Externals */ #include <reactos/rossym.h> #include <reactos/buildno.h> +#include <reactos/helper.h> /* Needed if debuging is enabled */ #include <comm.h> _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-11-27 02:55:13 UTC (rev 19666) @@ -1,6 +1,7 @@ #include <debug.h> #include <ntifs.h> #include <ntdddisk.h> +#include <reactos/helper.h> #ifdef __GNUC__ #include <ndk/ntndk.h> _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/include/ndk/extypes.h 2005-11-27 02:55:13 UTC (rev 19666) @@ -178,7 +178,7 @@ SystemPrioritySeperation, SystemPlugPlayBusInformation, SystemDockInformation, - _SystemPowerInformation, // FIXME + SystemPowerInformationNative, SystemProcessorSpeedInformation, SystemCurrentTimeZoneInformation, SystemLookasideInformation, @@ -988,8 +988,7 @@ } SYSTEM_DOCK_INFORMATION, *PSYSTEM_DOCK_INFORMATION; // Class 42 -// FIXME: Conflict with WINNT.H -typedef struct __SYSTEM_POWER_INFORMATION +typedef struct _SYSTEM_POWER_INFORMATION_NATIVE { BOOLEAN SystemSuspendSupported; BOOLEAN SystemHibernateSupported; @@ -1001,7 +1000,7 @@ BOOLEAN SystemAcOrDc; BOOLEAN PowerDownDisabled; LARGE_INTEGER SpindownDrives; -} _SYSTEM_POWER_INFORMATION, *P_SYSTEM_POWER_INFORMATION; +} SYSTEM_POWER_INFORMATION_NATIVE, *PSYSTEM_POWER_INFORMATION_NATIVE; // Class 43 typedef struct _SYSTEM_LEGACY_DRIVER_INFORMATION _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/include/ndk/fixmes.txt 2005-11-27 02:55:13 UTC (rev 19666) @@ -17,12 +17,8 @@ |rtltypes.h - PPF_ Defines don't seem to be the real names (try to find them). |rtltypes.h - _RTL_PROCESS_BACKTRACE_INFORMATION isn't done. |haltypes.h - Multi-Boot flags are ReactOS Only. -|extypes.h - SystemPowerInformation in SYSTEM_INFORMATION_CLASS causes conflict. |extypes.h - _RUNDOWN_DESCRIPTOR is possibly incorrect/unofficial. -|asm.h - Selector names are not official. -|extypes.h - Class 42 (SYSTEM_POWER_INFORMATION causes conflict). |extypes.h - Classes 13, 20, 30, 31, 49, 51, 52, 54+ are undefined. -|ntndk.h - Incorrect rounding macro names |_______________________________________________________________________ ______________ @@ -113,4 +109,4 @@ subsys\system\cmd\precomp.h: #include <ndk/ntndk.h> subsys\system\services\services.h: #include <ndk/ntndk.h> subsys\system\taskmgr\precomp.h: #include <ndk/ntndk.h> -subsys\system\usetup\usetup.h: #include <ndk/ntndk.h> \ No newline at end of file +subsys\system\usetup\usetup.h: #include <ndk/ntndk.h> _____ Modified: trunk/reactos/include/ndk/lpctypes.h --- trunk/reactos/include/ndk/lpctypes.h 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/include/ndk/lpctypes.h 2005-11-27 02:55:13 UTC (rev 19666) @@ -234,9 +234,9 @@ // Maximum total Kernel-Mode LPC Message Structure Size // #define LPCP_MAX_MESSAGE_SIZE \ - ROUND_UP(PORT_MAXIMUM_MESSAGE_LENGTH + \ + ALIGN_UP(PORT_MAXIMUM_MESSAGE_LENGTH + \ sizeof(LPCP_MESSAGE) + \ - sizeof(LPCP_CONNECTION_MESSAGE), 16) + sizeof(LPCP_CONNECTION_MESSAGE), sizeof(ULONGLONG) * 2) // // Maximum actual LPC Message Length _____ Modified: trunk/reactos/include/ndk/ntndk.h --- trunk/reactos/include/ndk/ntndk.h 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/include/ndk/ntndk.h 2005-11-27 02:55:13 UTC (rev 19666) @@ -19,14 +19,6 @@ #ifndef _NTNDK_ #define _NTNDK_ -// -// FIXME: Rounding Macros -// -#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) -#define ROUNDDOWN(a,b) (((a)/(b))*(b)) -#define ROUND_UP ROUNDUP -#define ROUND_DOWN ROUNDDOWN - #include <stdarg.h> // C Standard Header #include <umtypes.h> // General Definitions _____ Modified: trunk/reactos/include/ndk/readme.txt --- trunk/reactos/include/ndk/readme.txt 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/include/ndk/readme.txt 2005-11-27 02:55:13 UTC (rev 19666) @@ -116,6 +116,55 @@ 3. USAGE -3.1 TODO (COPY FROM WIKI) +3.1 ORGANIZATION -... TODO ... (COPY FROM WIKI) + * The NDK is organized in a main folder (include/ndk) with arch-specific subfolders (ex: include/ndk/i386). + * The NDK is structured by NT Subsystem Component (ex: ex, ps, rtl, etc). + * The NDK can either be included on-demand (#include <ndk/xxxxx.h>) or globally (#include <ndk/ntndk.h>). + The former is recommended to reduce compile time. + * The NDK is structured by function and type. Every Subsystem Component has an associated "xxfuncs.h" and + "xxtypes.h" header, where "xx" is the Subsystem (ex: iofuncs.h, iotypes.h) + * The NDK has a special file called "umtypes.h" which exports to User-Mode or Native-Mode Applications the + basic NT types which are present in ntdef.h. This file cannot be included since it would conflict with + winnt.h and/or windef.h. Thus, umtypes.h provides the missing types. This file is automatically included + in a User-Mode NDK project. + * The NDK also includes a file called "umfuncs.h" which exports to User-Mode or Native-Mode Applications + undocumented functions which can only be accessed from ntdll.dll. + * The NDK has another special file called "ifssupp.h", which exports to Kernel-Mode drivers a few types which + are only documented in the IFS kit, and are part of some native definitions. It will be deprecated next year + with the release of the WDK. + +3.2 USING IN YOUR PROJECT + + * User Mode Application requiring Native Types: + + #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s from NDK */ + #include <windows.h> /* Declare Windows Headers like you normally would */ + #include <ntndk.h> /* Declare the NDK Headers */ + + * Native Mode Application: + + #include <windows.h> /* Declare Windows Headers for basic types. NEEDED UNTIL NDK 1.5 */ + #include <ntndk.h> /* Declare the NDK Headers */ + + * Kernel Mode Driver: + + #include <ntddk.h> /* Declare DDK Headers like you normally would */ + #include <ntndk.h> /* Declare the NDK Headers */ + + * You may also include only the files you need (example for User-Mode application): + + #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s from NDK */ + #include <windows.h> /* Declare Windows Headers like you normally would */ + #include <rtlfuncs.h> /* Declare the Rtl* Functions */ + +3.3 CAVEATS + + * winternl.h: This header, part of the PSDK, was released by Microsoft as part of one of the governmen + lawsuits against it, and documents a certain (minimal) part of the Native API and/or types. Unforunately, + Microsoft decided to hack the Native Types and to define them incorrectly, replacing real members by "reserved" + ones. As such, you 'cannot include winternl.h in any project that uses the NDK. Note however, that the NDK fully + replaces it and retains compatibility with any project that used it. + * Native programs: Native programs must include "windows.h" until the next release of the NDK (1.5). The upcoming + version will automatically detect the lack of missing types and include them. Note however that you will still need + to have the PSDK installed. _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/include/ndk/umtypes.h 2005-11-27 02:55:13 UTC (rev 19666) @@ -61,6 +61,21 @@ #endif // +// Alignment Macros +// +#define ALIGN_DOWN(s, t) \ + ((ULONG)(s) & ~(sizeof(t) - 1)) + +#define ALIGN_UP(s, t) \ + (ALIGN_DOWN(((ULONG)(s) + sizeof(t) - 1), t)) + +#define ALIGN_DOWN_POINTER(p, t) \ + ((PVOID)((ULONG_PTR)(p) & ~((ULONG_PTR)sizeof(t) - 1))) + +#define ALIGN_UP_POINTER(p, t) \ + (ALIGN_DOWN_POINTER(((ULONG_PTR)(p) + sizeof(t) - 1), t)) + +// // Native API Return Value Macros // #define NT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0) _____ Modified: trunk/reactos/include/reactos/helper.h --- trunk/reactos/include/reactos/helper.h 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/include/reactos/helper.h 2005-11-27 02:55:13 UTC (rev 19666) @@ -1,20 +1,22 @@ #ifndef _HELPER_H #define _HELPER_H -#ifndef ROUNDUP -#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) +#ifndef ROUND_UP +#define ROUND_UP(n, align) \ + ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) #endif -#ifndef ROUNDUP -#define ROUNDDOWN(a,b) (((a)/(b))*(b)) +#ifndef ROUND_DOWN +#define ROUND_DOWN(n, align) \ + (((ULONG)n) & ~((align) - 1l)) #endif -#ifndef ROUND_UP -#define ROUND_UP ROUNDUP +#ifndef ROUNDUP +#define ROUNDUP ROUND_UP #endif -#ifndef ROUND_DOWN -#define ROUND_DOWN ROUNDDOWN +#ifndef ROUNDDOWN +#define ROUNDDOWN ROUND_DOWN #endif #ifndef PAGE_ROUND_DOWN _____ Modified: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/lib/crt/precomp.h 2005-11-27 02:55:13 UTC (rev 19666) @@ -16,10 +16,11 @@ #include <math.h> #include <limits.h> +/* PSDK/NDK Headers */ #define WIN32_NO_STATUS #include <windows.h> -#define NTOS_MODE_USER #include <ndk/ntndk.h> +#include <reactos/helper.h> #if !defined(_MSC_VER) #include <stdint.h> _____ Modified: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/lib/rtl/rtl.h 2005-11-27 02:55:13 UTC (rev 19666) @@ -23,6 +23,7 @@ #include <ndk/ntndk.h> /* Internal RTL header */ +#include <reactos/helper.h> #include "rtlp.h" /* EOF */ _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-11-26 23:26:04 UTC (rev 19665) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-11-27 02:55:13 UTC (rev 19666) @@ -98,6 +98,21 @@ #endif /* + * Alignment Macros + */ +#define ALIGN_DOWN(s, t) \ + ((ULONG)(s) & ~(sizeof(t) - 1)) + +#define ALIGN_UP(s, t) \ + (ALIGN_DOWN(((ULONG)(s) + sizeof(t) - 1), t)) + +#define ALIGN_DOWN_POINTER(p, t) \ + ((PVOID)((ULONG_PTR)(p) & ~((ULONG_PTR)sizeof(t) - 1))) + +#define ALIGN_UP_POINTER(p, t) \ + (ALIGN_DOWN_POINTER(((ULONG_PTR)(p) + sizeof(t) - 1), t)) + +/* ** Forward declarations */

1 0

[gvg] 19665: Use correct prototype for DbgPrint. Thanks to Hartmut for pointing this out.
by gvg＠svn.reactos.com 27 Nov '05

27 Nov '05

Use correct prototype for DbgPrint. Thanks to Hartmut for pointing this out. Modified: trunk/reactos/lib/inflib/builddep.h Modified: trunk/reactos/lib/inflib/infhostglue.c Modified: trunk/reactos/lib/inflib/inflib.mak _____ Modified: trunk/reactos/lib/inflib/builddep.h --- trunk/reactos/lib/inflib/builddep.h 2005-11-26 23:17:32 UTC (rev 19664) +++ trunk/reactos/lib/inflib/builddep.h 2005-11-26 23:26:04 UTC (rev 19665) @@ -44,7 +44,7 @@ #define _tcstol strtol #define STRFMT "%s" -extern void DbgPrint(const char *Fmt, ...); +extern unsigned long DbgPrint(char *Fmt, ...); #else /* ! defined(INFLIB_HOST) */ _____ Modified: trunk/reactos/lib/inflib/infhostglue.c --- trunk/reactos/lib/inflib/infhostglue.c 2005-11-26 23:17:32 UTC (rev 19664) +++ trunk/reactos/lib/inflib/infhostglue.c 2005-11-26 23:26:04 UTC (rev 19665) @@ -11,14 +11,16 @@ #define NDEBUG #include <debug.h> -void -DbgPrint(const char *Fmt, ...) +unsigned long +DbgPrint(char *Fmt, ...) { va_list Args; va_start(Args, Fmt); vfprintf(stderr, Fmt, Args); va_end(Args); + + return 0; } /* EOF */ _____ Modified: trunk/reactos/lib/inflib/inflib.mak --- trunk/reactos/lib/inflib/inflib.mak 2005-11-26 23:17:32 UTC (rev 19664) +++ trunk/reactos/lib/inflib/inflib.mak 2005-11-26 23:26:04 UTC (rev 19665) @@ -31,7 +31,7 @@ INFLIB_HOST_OBJECTS = \ $(subst $(INFLIB_BASE), $(INFLIB_INT), $(INFLIB_HOST_SOURCES:.c=.o)) -INFLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ +INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST -D_M_IX86 \ -I$(INFLIB_BASE) -Iinclude/reactos -DDBG

1 0

[sgasiorek] 19664: fixed resource id for performance button
by sgasiorek＠svn.reactos.com 27 Nov '05

27 Nov '05

fixed resource id for performance button Modified: trunk/reactos/lib/cpl/sysdm/Ja.rc Modified: trunk/reactos/lib/cpl/sysdm/cz.rc Modified: trunk/reactos/lib/cpl/sysdm/de.rc Modified: trunk/reactos/lib/cpl/sysdm/dk.rc Modified: trunk/reactos/lib/cpl/sysdm/en.rc Modified: trunk/reactos/lib/cpl/sysdm/fr.rc Modified: trunk/reactos/lib/cpl/sysdm/nl.rc Modified: trunk/reactos/lib/cpl/sysdm/resource.h Modified: trunk/reactos/lib/cpl/sysdm/sv.rc _____ Modified: trunk/reactos/lib/cpl/sysdm/Ja.rc --- trunk/reactos/lib/cpl/sysdm/Ja.rc 2005-11-26 23:14:06 UTC (rev 19663) +++ trunk/reactos/lib/cpl/sysdm/Ja.rc 2005-11-26 23:17:32 UTC (rev 19664) @@ -82,7 +82,7 @@ GROUPBOX "âpâtâHü[â}âôâX",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON LTEXT "âpâtâHü[â}âôâX âIâvâVâçâôé?üAâAâvâèâPü[âVâçâôé¬éÃé?éµéñé? âüâéâèéÄgéñé®éèÃùØéÁé?éÀüBâüâéâèé?Ägéóò¹é?âRâôâsâàü[â^é?ÅêùØæ¼ôxé?ëeï? éÁé?éÀüB",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "âpâtâHü[â}âôâX âIâvâVâçâô(&P)...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABEL LINE(5)+2,(18*PROPSHEETPADDING),14 + PUSHBUTTON "âpâtâHü[â}âôâX âIâvâVâçâô(&P)...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABEL LINE(5)+2,(18*PROPSHEETPADDING),14 GROUPBOX "è?ï½ò¤Éö",-1,PROPSHEETPADDING,LABELLINE(8) +2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "è?ï½ò¤Éöé?üAô?ÆÞé?ÄÝùÌé?Å¯ò±é?îfì§ÉµéÄwÆÞéÁé? éÀüB",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-(6 *PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) _____ Modified: trunk/reactos/lib/cpl/sysdm/cz.rc --- trunk/reactos/lib/cpl/sysdm/cz.rc 2005-11-26 23:14:06 UTC (rev 19663) +++ trunk/reactos/lib/cpl/sysdm/cz.rc 2005-11-26 23:17:32 UTC (rev 19664) @@ -82,7 +82,7 @@ GROUPBOX "V²kon",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADD ING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON LTEXT "Volby v²konu nastavujÝ, jak aplikace pou×ÝvajÝ pamýØ. NastavenÝ týchto hodnot zßsadný ovliv?uje v²kon systÚmu.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Volby v²konu...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(5)+ 2,(18*PROPSHEETPADDING),14 + PUSHBUTTON "&Volby v²konu...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(5)+ 2,(18*PROPSHEETPADDING),14 GROUPBOX "PromýnnÚ prost°edÝ",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "PromýnnÚ prost°edÝ uchovßvajÝ cesty k urÞit²m systÚmov²m informacÝm.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETW IDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) _____ Modified: trunk/reactos/lib/cpl/sysdm/de.rc --- trunk/reactos/lib/cpl/sysdm/de.rc 2005-11-26 23:14:06 UTC (rev 19663) +++ trunk/reactos/lib/cpl/sysdm/de.rc 2005-11-26 23:17:32 UTC (rev 19664) @@ -80,7 +80,7 @@ GROUPBOX "Systemleistung",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON LTEXT "Die Systemleistungseinstellungen steuern wie Anwendungen den Arbeitsspeicher nutzen, was die Computergeschwindigkeit beeinflusst.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Systemleistungseinstellungen...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHE ETPADDING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 + PUSHBUTTON "&Systemleistungseinstellungen...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHE ETPADDING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 GROUPBOX "Umgebungsvariablen",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-( 2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "?ber Umgebungvariablen wird festgelegt, wo bestimmte Informationen zu finden sind.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) _____ Modified: trunk/reactos/lib/cpl/sysdm/dk.rc --- trunk/reactos/lib/cpl/sysdm/dk.rc 2005-11-26 23:14:06 UTC (rev 19663) +++ trunk/reactos/lib/cpl/sysdm/dk.rc 2005-11-26 23:17:32 UTC (rev 19664) @@ -80,7 +80,7 @@ GROUPBOX "Hukommelses Indstillinger",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSH EETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON LTEXT "Hukommelses indstillingerne styrer programmers brug af hukommelse, hvilket pÕvirker hastigheden af din computer.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Hukommelses indstillinger...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELL INE(5)+2,(18*PROPSHEETPADDING),14 + PUSHBUTTON "&Hukommelses indstillinger...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELL INE(5)+2,(18*PROPSHEETPADDING),14 GROUPBOX "Milj° Variabler",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "Milj° Variabler fortµller din computer hvor den kan finde forskellige typer af informationer.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHE ETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(11) _____ Modified: trunk/reactos/lib/cpl/sysdm/en.rc --- trunk/reactos/lib/cpl/sysdm/en.rc 2005-11-26 23:14:06 UTC (rev 19663) +++ trunk/reactos/lib/cpl/sysdm/en.rc 2005-11-26 23:17:32 UTC (rev 19664) @@ -82,7 +82,7 @@ GROUPBOX "Performance",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHE ETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON LTEXT "Performance options control how applications use memory, which affects the speed of your computer.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Performance Options...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(5) +2,(18*PROPSHEETPADDING),14 + PUSHBUTTON "&Performance Options...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(5) +2,(18*PROPSHEETPADDING),14 GROUPBOX "Environment Variables",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "Environment variables tell your computer where to find certain types of information.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEET WIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) _____ Modified: trunk/reactos/lib/cpl/sysdm/fr.rc --- trunk/reactos/lib/cpl/sysdm/fr.rc 2005-11-26 23:14:06 UTC (rev 19663) +++ trunk/reactos/lib/cpl/sysdm/fr.rc 2005-11-26 23:17:32 UTC (rev 19664) @@ -84,7 +84,7 @@ GROUPBOX "Performances",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSH EETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON LTEXT "Les options de performance controlent comment les applications utilisent la mÚmoire, ce qui affecte la vitesse de votre ordinateur.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Options Performances...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLI NE(5)+2,(18*PROPSHEETPADDING),14 + PUSHBUTTON "&Options Performances...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLI NE(5)+2,(18*PROPSHEETPADDING),14 GROUPBOX "Variables d'environnement",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PR OPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "Les Variables d'environnement indiquent Ó votre ordinateur o¨ trouver certains types d'informations.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSH EETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) _____ Modified: trunk/reactos/lib/cpl/sysdm/nl.rc --- trunk/reactos/lib/cpl/sysdm/nl.rc 2005-11-26 23:14:06 UTC (rev 19663) +++ trunk/reactos/lib/cpl/sysdm/nl.rc 2005-11-26 23:17:32 UTC (rev 19664) @@ -82,7 +82,7 @@ GROUPBOX "Prestaties",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON LTEXT "Met de instellingen voor prestaties regelt u hoe toepassingen het geheugen gebruiken, hetgeen van invloed is op de snelheid van de computer.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Instellingen voor prestaties...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE (5)+2,(18*PROPSHEETPADDING),14 + PUSHBUTTON "&Instellingen voor prestaties...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE (5)+2,(18*PROPSHEETPADDING),14 GROUPBOX "Omgevingsvariabelen",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH- (2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "Omgevingsvariabelen bepalen waar de cmoputer bepaalde soorten gegevens kan vinden.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) _____ Modified: trunk/reactos/lib/cpl/sysdm/resource.h --- trunk/reactos/lib/cpl/sysdm/resource.h 2005-11-26 23:14:06 UTC (rev 19663) +++ trunk/reactos/lib/cpl/sysdm/resource.h 2005-11-26 23:17:32 UTC (rev 19664) @@ -34,6 +34,7 @@ #define IDC_DEVMGR 106 #define IDC_ENVVAR 107 #define IDC_STAREC 108 +#define IDC_PERFOR 109 #define IDC_ICON1 201 #define IDC_COMPUTERNAME 202 _____ Modified: trunk/reactos/lib/cpl/sysdm/sv.rc --- trunk/reactos/lib/cpl/sysdm/sv.rc 2005-11-26 23:14:06 UTC (rev 19663) +++ trunk/reactos/lib/cpl/sysdm/sv.rc 2005-11-26 23:17:32 UTC (rev 19664) @@ -84,7 +84,7 @@ GROUPBOX "Prestanda",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON LTEXT "Prestandainstõllningar kontrollerar hur program anvõnder minne, vilket pÕverkar din dators hastighet.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Prestandainstõllningar...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADD ING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 + PUSHBUTTON "&Prestandainstõllningar...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADD ING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 GROUPBOX "Milj÷variabler",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PR OPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON LTEXT "Milj÷variabler anger var din dator ska hõmta viss typ av information.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEET WIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(11)

1 0

[chorns] 19663: Ignore syssetup.inf
by chorns＠svn.reactos.com 27 Nov '05

27 Nov '05

Ignore syssetup.inf Property changes on: trunk/reactos/media/inf ___________________________________________________________________ Name: svn:ignore + syssetup.inf

1 0

[ion] 19662: - Fix/take decisions on the minor NDK FIXMEs.
by ion＠svn.reactos.com 27 Nov '05

27 Nov '05

- Fix/take decisions on the minor NDK FIXMEs. Modified: trunk/reactos/include/ndk/arch/ketypes.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/lpctypes.h _____ Modified: trunk/reactos/include/ndk/arch/ketypes.h --- trunk/reactos/include/ndk/arch/ketypes.h 2005-11-26 22:12:15 UTC (rev 19661) +++ trunk/reactos/include/ndk/arch/ketypes.h 2005-11-26 22:51:59 UTC (rev 19662) @@ -20,23 +20,6 @@ #define _ARCH_KETYPES_H // -// FIXME: Find a solution to take these out of here! -// -typedef struct _KDPC_DATA -{ - LIST_ENTRY DpcListHead; - ULONG DpcLock; - ULONG DpcQueueDepth; - ULONG DpcCount; -} KDPC_DATA, *PKDPC_DATA; - -typedef struct _PP_LOOKASIDE_LIST -{ - struct _GENERAL_LOOKASIDE *P; - struct _GENERAL_LOOKASIDE *L; -} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; - -// // Include the right file for this architecture. // #ifdef _M_IX86 _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-11-26 22:12:15 UTC (rev 19661) +++ trunk/reactos/include/ndk/extypes.h 2005-11-26 22:51:59 UTC (rev 19662) @@ -48,6 +48,11 @@ extern POBJECT_TYPE NTSYSAPI ExTimerType; // +// Exported NT Build Number +// +extern ULONG NTSYSAPI NtBuildNumber; + +// // Invalid Handle Value Constant // #define INVALID_HANDLE_VALUE (HANDLE)-1 @@ -80,11 +85,6 @@ #endif // -// Port Object Access Masks (FIXME: lpctypes.h?) -// -#define PORT_ALL_ACCESS 0x1 - -// // Event Pair Access Masks // #define EVENT_PAIR_ALL_ACCESS 0x1F0000L _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-11-26 22:12:15 UTC (rev 19661) +++ trunk/reactos/include/ndk/fixmes.txt 2005-11-26 22:51:59 UTC (rev 19662) @@ -23,14 +23,6 @@ |extypes.h - Class 42 (SYSTEM_POWER_INFORMATION causes conflict). |extypes.h - Classes 13, 20, 30, 31, 49, 51, 52, 54+ are undefined. |ntndk.h - Incorrect rounding macro names -| -[MINOR] - Related to location of functions, comments, etc. -|arch/ketypes.h - _KDPC_DATA, PP_LOOKASIDE_LIST shouldn't be there. -|pstypes.h - Check if _PAGEFAULT_HISTORY shouldn't go in mmtypes.h instead. -|lpctypes.h - Consider moving _CLIENT_DIED_MSG to pstypes.h? -|ketypes.h - Consider moving KNODE to mmtypes.h? -|ketypes.h - Consider moving NtBuildNumber to extypes.h? -|extypes.h - consider moving PORT_ALL_ACCESS to lpctypes.h |_______________________________________________________________________ ______________ _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-11-26 22:12:15 UTC (rev 19661) +++ trunk/reactos/include/ndk/ketypes.h 2005-11-26 22:51:59 UTC (rev 19662) @@ -28,7 +28,6 @@ #include <haltypes.h> #include <potypes.h> #include <ifssupp.h> -#include <arch/ketypes.h> #endif // @@ -305,6 +304,41 @@ #else // +// APC Environment Types +// +typedef enum _KAPC_ENVIRONMENT +{ + OriginalApcEnvironment, + AttachedApcEnvironment, + CurrentApcEnvironment +} KAPC_ENVIRONMENT; + +// +// PRCB DPC Data +// +typedef struct _KDPC_DATA +{ + LIST_ENTRY DpcListHead; + ULONG DpcLock; + ULONG DpcQueueDepth; + ULONG DpcCount; +} KDPC_DATA, *PKDPC_DATA; + +// +// Per-Processor Lookaside List +// +typedef struct _PP_LOOKASIDE_LIST +{ + struct _GENERAL_LOOKASIDE *P; + struct _GENERAL_LOOKASIDE *L; +} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; + +// +// Architectural Types +// +#include <arch/ketypes.h> + +// // ARC Component Data // typedef struct _CONFIGURATION_COMPONENT_DATA @@ -316,16 +350,6 @@ } CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA; // -// APC Environment Types -// -typedef enum _KAPC_ENVIRONMENT -{ - OriginalApcEnvironment, - AttachedApcEnvironment, - CurrentApcEnvironment -} KAPC_ENVIRONMENT; - -// // Kernel Memory Node (FIXME: mmtypes? // typedef struct _KNODE @@ -704,11 +728,6 @@ extern ULONG NTSYSAPI KeIcacheFlushCount; // -// Exported NT Build Number (FIXME: move?) -// -extern ULONG NTSYSAPI NtBuildNumber; - -// // Exported System Service Descriptor Tables // extern KSERVICE_TABLE_DESCRIPTOR NTSYSAPI KeServiceDescriptorTable[SSDT_MAX_ENTRIES]; _____ Modified: trunk/reactos/include/ndk/lpctypes.h --- trunk/reactos/include/ndk/lpctypes.h 2005-11-26 22:12:15 UTC (rev 19661) +++ trunk/reactos/include/ndk/lpctypes.h 2005-11-26 22:51:59 UTC (rev 19662) @@ -31,6 +31,11 @@ #define PORT_MAXIMUM_MESSAGE_LENGTH 256 // +// Port Object Access Masks +// +#define PORT_ALL_ACCESS 0x1 + +// // LPC Message Types // typedef enum _LPC_TYPE

1 0

[chorns] 19661: Fix dependencies that cause trouble
by chorns＠svn.reactos.com 27 Nov '05

27 Nov '05

Fix dependencies that cause trouble Modified: trunk/reactos/tools/rbuild/rbuild.mak _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-11-26 21:15:35 UTC (rev 19660) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-11-26 22:12:15 UTC (rev 19661) @@ -258,9 +258,9 @@ .PHONY: rbuild rbuild: $(RBUILD_TARGET) -$(RBUILD_TARGET): $(RBUILD_OBJECTS) $(INFLIB_HOST_TARGET) | $(RBUILD_OUT) +$(RBUILD_TARGET): $(RBUILD_OBJECTS) $(INFLIB_HOST_OBJECTS) | $(RBUILD_OUT) $(ECHO_LD) - ${host_gpp} $(RBUILD_OBJECTS) $(INFLIB_HOST_TARGET) $(RBUILD_HOST_LFLAGS) -o $@ + ${host_gpp} $(RBUILD_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ $(RBUILD_INT_)global.o: $(RBUILD_BASE_)global.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) @@ -398,9 +398,9 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_TARGET) $(RBUILD_HEADERS) | $(RBUILD_OUT) +$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HEADERS) | $(RBUILD_OUT) $(ECHO_LD) - ${host_gpp} $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_TARGET) $(RBUILD_HOST_LFLAGS) -o $@ + ${host_gpp} $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ $(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC)

1 0

[weiden] 19660: fixed difference in signedness warning
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

fixed difference in signedness warning Modified: trunk/reactos/lib/inflib/infhostget.c _____ Modified: trunk/reactos/lib/inflib/infhostget.c --- trunk/reactos/lib/inflib/infhostget.c 2005-11-26 20:22:45 UTC (rev 19659) +++ trunk/reactos/lib/inflib/infhostget.c 2005-11-26 21:15:35 UTC (rev 19660) @@ -142,7 +142,7 @@ { INFSTATUS Status; - Status = InfpGetIntField(Context, FieldIndex, IntegerValue); + Status = InfpGetIntField(Context, FieldIndex, (PLONG)IntegerValue); if (INF_SUCCESS(Status)) { return 0;

1 0

[sgasiorek] 19659: - fixed removing keys from menu
by sgasiorek＠svn.reactos.com 26 Nov '05

26 Nov '05

- fixed removing keys from menu - changed RegDeleteKeyRecursive to SHDeleteKey (based on wine regedit code) Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/edit.c Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/regedit.xml Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/resource.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-11-26 20:22:45 UTC (rev 19659) @@ -282,6 +282,7 @@ BEGIN IDS_ERROR "Error" IDS_WARNING "Warning" + IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" IDS_TOO_BIG_VALUE "Value is too big (%ld)" _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-26 20:22:45 UTC (rev 19659) @@ -108,8 +108,6 @@ HTREEITEM hSelection; HKEY hRootKey; LPCTSTR keyPath, s; - TCHAR szConfirmTitle[256]; - TCHAR szConfirmText[256]; WORD wID = LOWORD(wParam); switch (wID) { @@ -134,16 +132,12 @@ hSelection = TreeView_GetSelection(pChildWnd->hTreeWnd); keyPath = GetItemPath(pChildWnd->hTreeWnd, hSelection, &hRootKey); - LoadString(hInst, IDS_QUERY_DELETE_KEY_CONFIRM, szConfirmTitle, sizeof(szConfirmTitle) / sizeof(szConfirmTitle[0])); - LoadString(hInst, IDS_QUERY_DELETE_KEY_ONE, szConfirmText, sizeof(szConfirmText) / sizeof(szConfirmText[0])); - - if (MessageBox(pChildWnd->hWnd, szConfirmText, szConfirmTitle, MB_YESNO) == IDYES) + if (keyPath == 0 || *keyPath == 0) { - if (RegDeleteKeyRecursive(hRootKey, keyPath) == ERROR_SUCCESS) - TreeView_DeleteItem(pChildWnd->hTreeWnd, hSelection); - else - RefreshTreeItem(pChildWnd->hTreeWnd, hSelection); /* If delete failed; refresh to see partial results */ - } + MessageBeep(MB_ICONHAND); + } else + if (DeleteKey(hWnd, hRootKey, keyPath)) + DeleteNode(g_pChildWnd->hTreeWnd, 0); break; case ID_TREE_EXPORT: ExportRegistryFile(pChildWnd->hTreeWnd); _____ Modified: trunk/reactos/subsys/system/regedit/edit.c --- trunk/reactos/subsys/system/regedit/edit.c 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/edit.c 2005-11-26 20:22:45 UTC (rev 19659) @@ -29,6 +29,7 @@ #include <stdio.h> #include <shellapi.h> #include <ctype.h> +#include <shlwapi.h> #include "main.h" #include "regproc.h" @@ -50,7 +51,6 @@ static DWORD valueDataLen; static EDIT_MODE dwordEditMode = EDIT_MODE_HEX; - void error(HWND hwnd, INT resId, ...) { va_list ap; @@ -74,6 +74,23 @@ MessageBox(hwnd, errstr, title, MB_OK | MB_ICONERROR); } +static void error_code_messagebox(HWND hwnd, DWORD error_code) +{ + LPTSTR lpMsgBuf; + DWORD status; + TCHAR title[256]; + static const TCHAR fallback[] = TEXT("Error displaying error message.\n"); + if (!LoadString(hInst, IDS_ERROR, title, COUNT_OF(title))) + lstrcpy(title, TEXT("Error")); + status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, error_code, 0, (LPTSTR)&lpMsgBuf, 0, NULL); + if (!status) + lpMsgBuf = (LPTSTR)fallback; + MessageBox(hwnd, lpMsgBuf, title, MB_OK | MB_ICONERROR); + if (lpMsgBuf != fallback) + LocalFree(lpMsgBuf); +} + void warning(HWND hwnd, INT resId, ...) { va_list ap; @@ -697,3 +714,34 @@ return result; } + +BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath) +{ + TCHAR msg[128], caption[128]; + BOOL result = FALSE; + LONG lRet; + HKEY hKey; + + lRet = RegOpenKeyEx(hKeyRoot, keyPath, 0, KEY_READ|KEY_SET_VALUE, &hKey); + if (lRet != ERROR_SUCCESS) { + error_code_messagebox(hwnd, lRet); + return FALSE; + } + + LoadString(hInst, IDS_QUERY_DELETE_KEY_CONFIRM, caption, sizeof(caption)/sizeof(TCHAR)); + LoadString(hInst, IDS_QUERY_DELETE_KEY_ONE, msg, sizeof(msg)/sizeof(TCHAR)); + + if (MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONQUESTION | MB_YESNO) != IDYES) + goto done; + + lRet = SHDeleteKey(hKeyRoot, keyPath); + if (lRet != ERROR_SUCCESS) { + error(hwnd, IDS_BAD_KEY, keyPath); + goto done; + } + result = TRUE; + +done: + RegCloseKey(hKey); + return result; +} _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-26 20:22:45 UTC (rev 19659) @@ -905,36 +905,48 @@ break; case ID_EDIT_DELETE: { - UINT nSelected = ListView_GetSelectedCount(g_pChildWnd->hListWnd); - if(nSelected >= 1) + if (GetFocus() == g_pChildWnd->hListWnd) { - TCHAR msg[128], caption[128]; - LoadString(hInst, IDS_QUERY_DELETE_CONFIRM, caption, sizeof(caption)/sizeof(TCHAR)); - LoadString(hInst, (nSelected == 1 ? IDS_QUERY_DELETE_ONE : IDS_QUERY_DELETE_MORE), msg, sizeof(msg)/sizeof(TCHAR)); - if(MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONQUESTION | MB_YESNO) == IDYES) + UINT nSelected = ListView_GetSelectedCount(g_pChildWnd->hListWnd); + if(nSelected >= 1) { - int ni, errs; + TCHAR msg[128], caption[128]; + LoadString(hInst, IDS_QUERY_DELETE_CONFIRM, caption, sizeof(caption)/sizeof(TCHAR)); + LoadString(hInst, (nSelected == 1 ? IDS_QUERY_DELETE_ONE : IDS_QUERY_DELETE_MORE), msg, sizeof(msg)/sizeof(TCHAR)); + if(MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONQUESTION | MB_YESNO) == IDYES) + { + int ni, errs; - item = -1; - errs = 0; - while((ni = ListView_GetNextItem(g_pChildWnd->hListWnd, item, LVNI_SELECTED)) > -1) - { - valueName = GetValueName(g_pChildWnd->hListWnd, item); - if(RegDeleteValue(hKey, valueName) != ERROR_SUCCESS) + item = -1; + errs = 0; + while((ni = ListView_GetNextItem(g_pChildWnd->hListWnd, item, LVNI_SELECTED)) > -1) { - errs++; + valueName = GetValueName(g_pChildWnd->hListWnd, item); + if(RegDeleteValue(hKey, valueName) != ERROR_SUCCESS) + { + errs++; + } + item = ni; } - item = ni; - } - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); - if(errs > 0) - { - LoadString(hInst, IDS_ERR_DELVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); - LoadString(hInst, IDS_ERR_DELETEVALUE, msg, sizeof(msg)/sizeof(TCHAR)); - MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONSTOP); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); + if(errs > 0) + { + LoadString(hInst, IDS_ERR_DELVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); + LoadString(hInst, IDS_ERR_DELETEVALUE, msg, sizeof(msg)/sizeof(TCHAR)); + MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONSTOP); + } } } + } else + if (GetFocus() == g_pChildWnd->hTreeWnd) + { + if (keyPath == 0 || *keyPath == 0) + { + MessageBeep(MB_ICONHAND); + } else + if (DeleteKey(hWnd, hKeyRoot, keyPath)) + DeleteNode(g_pChildWnd->hTreeWnd, 0); } break; case ID_EDIT_NEW_STRINGVALUE: _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/main.h 2005-11-26 20:22:45 UTC (rev 19659) @@ -105,6 +105,7 @@ extern BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem); extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); extern LPCTSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); +extern BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPTSTR name); extern HWND StartKeyRename(HWND hwndTV); extern BOOL CreateNewKey(HWND hwndTV, HTREEITEM hItem); @@ -115,5 +116,6 @@ /* edit.c */ extern BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName, BOOL EditBin); +extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath); #endif /* __MAIN_H__ */ _____ Modified: trunk/reactos/subsys/system/regedit/regedit.xml --- trunk/reactos/subsys/system/regedit/regedit.xml 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/regedit.xml 2005-11-26 20:22:45 UTC (rev 19659) @@ -15,6 +15,7 @@ <library>shell32</library> <library>comctl32</library> <library>comdlg32</library> + <library>shlwapi</library> <file>about.c</file> <file>childwnd.c</file> <file>edit.c</file> _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-11-26 20:22:45 UTC (rev 19659) @@ -30,6 +30,7 @@ #include <assert.h> #include <tchar.h> #include <malloc.h> +#include <shlwapi.h> #include "regproc.h" #define REG_VAL_BUF_SIZE 4096 @@ -1503,33 +1504,6 @@ return app_name; } -LONG RegDeleteKeyRecursive(HKEY hKey, LPCTSTR lpSubKey) -{ - LONG lResult; - HKEY hSubKey = NULL; - DWORD dwIndex, cbName; - TCHAR szSubKey[256]; - FILETIME ft; - - lResult = RegOpenKeyEx(hKey, lpSubKey, 0, KEY_ALL_ACCESS, &hSubKey); - if (lResult == ERROR_SUCCESS) - { - dwIndex = 0; - do - { - cbName = sizeof(szSubKey) / sizeof(szSubKey[0]); - lResult = RegEnumKeyEx(hSubKey, dwIndex++, szSubKey, &cbName, NULL, NULL, NULL, &ft); - if (lResult == ERROR_SUCCESS) - RegDeleteKeyRecursive(hSubKey, szSubKey); - } - while(lResult == ERROR_SUCCESS); - - RegCloseKey(hSubKey); - } - - return RegDeleteKey(hKey, lpSubKey); -} - LONG RegCopyKey(HKEY hDestKey, LPCTSTR lpDestSubKey, HKEY hSrcKey, LPCTSTR lpSrcSubKey) { LONG lResult; @@ -1597,7 +1571,7 @@ if (hDestSubKey) RegCloseKey(hDestSubKey); if (lResult != ERROR_SUCCESS) - RegDeleteKeyRecursive(hDestKey, lpDestSubKey); + SHDeleteKey(hDestKey, lpDestSubKey); return lResult; } @@ -1611,7 +1585,7 @@ lResult = RegCopyKey(hDestKey, lpDestSubKey, hSrcKey, lpSrcSubKey); if (lResult == ERROR_SUCCESS) - RegDeleteKeyRecursive(hSrcKey, lpSrcSubKey); + SHDeleteKey(hSrcKey, lpSrcSubKey); return lResult; } _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-11-26 20:22:45 UTC (rev 19659) @@ -129,6 +129,7 @@ #define IDS_ERR_DELETEVALUE 32855 #define IDS_ERR_RENVAL_CAPTION 32856 #define IDS_ERR_RENVAL_TOEMPTY 32857 +#define IDS_BAD_KEY 32858 #define ID_EDIT_NEW_MULTISTRINGVALUE 32860 #define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32861 _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-11-26 20:22:45 UTC (rev 19659) @@ -107,6 +107,13 @@ return pathBuffer; } +BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem) +{ + if (!hItem) hItem = TreeView_GetSelection(hwndTV); + if (!hItem) return FALSE; + return TreeView_DeleteItem(hwndTV, hItem); +} + /* Add an entry to the tree. Only give hKey for root nodes (HKEY_ constants) */ static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPTSTR label, HKEY hKey, DWORD dwChildren) {

1 0

[chorns] 19658: Speed up compilation of win32k (again)
by chorns＠svn.reactos.com 26 Nov '05

26 Nov '05

Speed up compilation of win32k (again) Modified: trunk/reactos/subsys/win32k/include/win32k.h _____ Modified: trunk/reactos/subsys/win32k/include/win32k.h --- trunk/reactos/subsys/win32k/include/win32k.h 2005-11-26 20:05:14 UTC (rev 19657) +++ trunk/reactos/subsys/win32k/include/win32k.h 2005-11-26 20:18:49 UTC (rev 19658) @@ -7,7 +7,8 @@ */ /* INCLUDES ******************************************************************/ - +#ifndef __WIN32K_H +#define __WIN32K_H /* Internal Win32k Headers */ #include <include/ntuser.h> #include <include/win32.h> @@ -61,4 +62,4 @@ #include <eng/objects.h> #include <eng/misc.h> #include <dib/dib.h> -/* EOF */ +#endif /* __WIN32K_H */

1 0

[chorns] 19657: Speed up compilation of taskmgr
by chorns＠svn.reactos.com 26 Nov '05

26 Nov '05

Speed up compilation of taskmgr Modified: trunk/reactos/subsys/system/taskmgr/precomp.h Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.xml _____ Modified: trunk/reactos/subsys/system/taskmgr/precomp.h --- trunk/reactos/subsys/system/taskmgr/precomp.h 2005-11-26 19:53:55 UTC (rev 19656) +++ trunk/reactos/subsys/system/taskmgr/precomp.h 2005-11-26 20:05:14 UTC (rev 19657) @@ -1,3 +1,5 @@ +#ifndef __PRECOMP_H +#define __PRECOMP_H #define _CRT_SECURE_NO_DEPRECATE #define WIN32_NO_STATUS @@ -31,3 +33,4 @@ #include "priority.h" #include "run.h" #include "trayicon.h" +#endif /* __PRECOMP_H */ _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.xml --- trunk/reactos/subsys/system/taskmgr/taskmgr.xml 2005-11-26 19:53:55 UTC (rev 19656) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.xml 2005-11-26 20:05:14 UTC (rev 19657) @@ -9,24 +9,26 @@ <library>gdi32</library> <library>comctl32</library> <pch>precomp.h</pch> - <file>about.c</file> - <file>affinity.c</file> - <file>applpage.c</file> - <file>column.c</file> - <file>dbgchnl.c</file> - <file>debug.c</file> - <file>endproc.c</file> - <file>font.c</file> - <file>graph.c</file> - <file>optnmenu.c</file> - <file>perfdata.c</file> - <file>perfpage.c</file> - <file>priority.c</file> - <file>procpage.c</file> - <file>proclist.c</file> - <file>run.c</file> - <file>trayicon.c</file> - <file>taskmgr.c</file> - <file>graphctl.c</file> + <compilationunit name="unit.c"> + <file>about.c</file> + <file>affinity.c</file> + <file>applpage.c</file> + <file>column.c</file> + <file>dbgchnl.c</file> + <file>debug.c</file> + <file>endproc.c</file> + <file>font.c</file> + <file>graph.c</file> + <file>optnmenu.c</file> + <file>perfdata.c</file> + <file>perfpage.c</file> + <file>priority.c</file> + <file>procpage.c</file> + <file>proclist.c</file> + <file>run.c</file> + <file>trayicon.c</file> + <file>taskmgr.c</file> + <file>graphctl.c</file> + </compilationunit> <file>taskmgr.rc</file> </module>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs