Ros-diffs January 2013

ros-diffs@reactos.org

11 participants
185 discussions

[hbelusca] 58137: [REACTOS] I hope this solution will work *sigh*

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 6 23:50:52 2013 New Revision: 58137 URL: http://svn.reactos.org/svn/reactos?rev=58137&view=rev Log: [REACTOS] I hope this solution will work *sigh* Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Sun Jan 6 23:50:52 2013 @@ -51,16 +51,18 @@ PCHAR Message ); -#ifndef _NTDEF_ /* Guard against redefinition from ntdef.h */ - #define __BCRYPT_H__ /* Hack for NDK - umtypes.h */ - typedef _Return_type_success_(return >= 0) LONG NTSTATUS, *PNTSTATUS; -#endif +/* + * This is the definition of NTSTATUS, but renamed + * in order not to conflict with other ones. + */ +typedef _Return_type_success_(return >= 0) LONG DEBUG_NTSTATUS; + __analysis_noreturn NTSYSAPI VOID NTAPI RtlRaiseStatus( - _In_ NTSTATUS Status + _In_ DEBUG_NTSTATUS Status ); #endif /* !defined(_RTLFUNCS_H) && !defined(_NTDDK_) */

11 years, 11 months

[hbelusca] 58136: [REACTOS] Attempt to fix compilation by lying at NDK.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 6 23:42:25 2013 New Revision: 58136 URL: http://svn.reactos.org/svn/reactos?rev=58136&view=rev Log: [REACTOS] Attempt to fix compilation by lying at NDK. Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Sun Jan 6 23:42:25 2013 @@ -52,7 +52,8 @@ ); #ifndef _NTDEF_ /* Guard against redefinition from ntdef.h */ - typedef _Return_type_success_(return >= 0) LONG NTSTATUS; + #define __BCRYPT_H__ /* Hack for NDK - umtypes.h */ + typedef _Return_type_success_(return >= 0) LONG NTSTATUS, *PNTSTATUS; #endif __analysis_noreturn NTSYSAPI

11 years, 11 months

[hbelusca] 58135: [REACTOS] - Fix the debugging macros I've introduced in r58132; in particular do not use while(true); for forbidding the user to continue execution, but instead raise an exception...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 6 23:29:05 2013 New Revision: 58135 URL: http://svn.reactos.org/svn/reactos?rev=58135&view=rev Log: [REACTOS] - Fix the debugging macros I've introduced in r58132; in particular do not use while(true); for forbidding the user to continue execution, but instead raise an exception with EXCEPTION_NONCONTINUABLE flag (included when called RtlRaiseStatus). - Adjust the definition of RtlRaiseStatus (in kernel-mode it is ExRaiseStatus which is used). Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Sun Jan 6 23:29:05 2013 @@ -15,7 +15,7 @@ #ifndef __INTERNAL_DEBUG #define __INTERNAL_DEBUG -/* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */ +/* Define DbgPrint/DbgPrintEx/RtlAssert/RtlRaiseStatus unless the NDK is used */ #if !defined(_RTLFUNCS_H) && !defined(_NTDDK_) /* Make sure we have basic types (some people include us *before* SDK)... */ @@ -51,7 +51,27 @@ PCHAR Message ); +#ifndef _NTDEF_ /* Guard against redefinition from ntdef.h */ + typedef _Return_type_success_(return >= 0) LONG NTSTATUS; +#endif +__analysis_noreturn +NTSYSAPI +VOID +NTAPI +RtlRaiseStatus( + _In_ NTSTATUS Status +); + #endif /* !defined(_RTLFUNCS_H) && !defined(_NTDDK_) */ + + +/* Fix usage of RtlRaiseStatus */ +#if !defined(_RTLFUNCS_H) && defined(_NTDDK_) + #define RaiseStatus ExRaiseStatus +#else + #define RaiseStatus RtlRaiseStatus +#endif /* !defined(_RTLFUNCS_H) && defined(_NTDDK_) */ + #ifndef assert #ifndef NASSERT @@ -136,11 +156,7 @@ #endif /* not DBG */ -/* - * These macros are designed to display an optional printf-like - * user-defined message and to break into the debugger. - * After that they allow to continue the program execution. - */ +/******************************************************************************/ /* For internal purposes only */ #define __ERROR_DBGBREAK(...) \ do { \ @@ -148,6 +164,18 @@ DbgBreakPoint(); \ } while (0) +/* For internal purposes only */ +#define __ERROR_FATAL(Status, ...) \ +do { \ + DbgPrint("" __VA_ARGS__); \ + RaiseStatus((Status)); \ +} while (0) + +/* + * These macros are designed to display an optional printf-like + * user-defined message and to break into the debugger. + * After that they allow to continue the program execution. + */ #define ERROR_DBGBREAK(...) \ do { \ __NOTICE(ERROR, "\n"); \ @@ -165,19 +193,18 @@ * user-defined message and to break into the debugger. * After that they halt the execution of the current thread. */ -#define ERROR_FATAL(...) \ -do { \ - __NOTICE(UNRECOVERABLE ERROR, "\n"); \ - __ERROR_DBGBREAK(__VA_ARGS__); \ - while (TRUE); \ +#define ERROR_FATAL(...) \ +do { \ + __NOTICE(UNRECOVERABLE ERROR, "\n"); \ + __ERROR_FATAL(STATUS_ASSERTION_FAILURE, __VA_ARGS__); \ } while (0) #define UNIMPLEMENTED_FATAL(...) \ do { \ __NOTICE(UNRECOVERABLE ERROR, "is UNIMPLEMENTED!\n"); \ - __ERROR_DBGBREAK(__VA_ARGS__); \ - while (TRUE); \ -} while (0) + __ERROR_FATAL(STATUS_NOT_IMPLEMENTED, __VA_ARGS__); \ +} while (0) +/******************************************************************************/ #define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x)) #define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql()==(x))

11 years, 11 months

[osiejka] 58134: [TRANSLATION] - romanian translation update by Stefan Fulea; CORE-6718 - fix for japaneese cmd translation by Tomoya Kitagawa; CORE-6820 - polish translation update of desk and input;

by osiejka＠svn.reactos.org

Author: osiejka Date: Sun Jan 6 22:38:20 2013 New Revision: 58134 URL: http://svn.reactos.org/svn/reactos?rev=58134&view=rev Log: [TRANSLATION] - romanian translation update by Stefan Fulea; CORE-6718 - fix for japaneese cmd translation by Tomoya Kitagawa; CORE-6820 - polish translation update of desk and input; Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/abiword28x.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/audiograbber.txt trunk/reactos/base/applications/rapps/rapps/bittorrent.txt trunk/reactos/base/applications/rapps/rapps/cnt.txt trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosblaster.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/fap.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt trunk/reactos/base/applications/rapps/rapps/lgeneral.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/lmarbles.txt trunk/reactos/base/applications/rapps/rapps/mfc40.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mirc6.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/msxml3.txt trunk/reactos/base/applications/rapps/rapps/net11.txt trunk/reactos/base/applications/rapps/rapps/net20.txt trunk/reactos/base/applications/rapps/rapps/net20sp2.txt trunk/reactos/base/applications/rapps/rapps/offbyone.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/opera9.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/python3.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt trunk/reactos/base/applications/rapps/rapps/rosbearm.txt trunk/reactos/base/applications/rapps/rapps/sambatng.txt trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/steam.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/superfinder.txt trunk/reactos/base/applications/rapps/rapps/tahoma.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/tileworld.txt trunk/reactos/base/applications/rapps/rapps/totalcommander.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt trunk/reactos/base/applications/rapps/rapps/wme9.txt trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abiword28x.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/python3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r…

11 years, 11 months

[tfaber] 58133: [RTL] - Use correct registry value names for time zone information

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jan 6 20:52:02 2013 New Revision: 58133 URL: http://svn.reactos.org/svn/reactos?rev=58133&view=rev Log: [RTL] - Use correct registry value names for time zone information Modified: trunk/reactos/lib/rtl/timezone.c Modified: trunk/reactos/lib/rtl/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timezone.c?rev=581… ============================================================================== --- trunk/reactos/lib/rtl/timezone.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timezone.c [iso-8859-1] Sun Jan 6 20:52:02 2013 @@ -46,27 +46,27 @@ QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[0].EntryContext = &TimeZoneInformation->Bias; - QueryTable[1].Name = L"Standard Name"; + QueryTable[1].Name = L"StandardName"; QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[1].EntryContext = &StandardName; - QueryTable[2].Name = L"Standard Bias"; + QueryTable[2].Name = L"StandardBias"; QueryTable[2].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[2].EntryContext = &TimeZoneInformation->StandardBias; - QueryTable[3].Name = L"Standard Start"; + QueryTable[3].Name = L"StandardStart"; QueryTable[3].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[3].EntryContext = &TimeZoneInformation->StandardDate; - QueryTable[4].Name = L"Daylight Name"; + QueryTable[4].Name = L"DaylightName"; QueryTable[4].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[4].EntryContext = &DaylightName; - QueryTable[5].Name = L"Daylight Bias"; + QueryTable[5].Name = L"DaylightBias"; QueryTable[5].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[5].EntryContext = &TimeZoneInformation->DaylightBias; - QueryTable[6].Name = L"Daylight Start"; + QueryTable[6].Name = L"DaylightStart"; QueryTable[6].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[6].EntryContext = &TimeZoneInformation->DaylightDate; @@ -108,7 +108,7 @@ Length = (wcslen(TimeZoneInformation->StandardName) + 1) * sizeof(WCHAR); Status = RtlWriteRegistryValue(RTL_REGISTRY_CONTROL, L"TimeZoneInformation", - L"Standard Name", + L"StandardName", REG_SZ, TimeZoneInformation->StandardName, (ULONG)Length); @@ -119,7 +119,7 @@ Status = RtlWriteRegistryValue(RTL_REGISTRY_CONTROL, L"TimeZoneInformation", - L"Standard Bias", + L"StandardBias", REG_DWORD, &TimeZoneInformation->StandardBias, sizeof(LONG)); @@ -130,7 +130,7 @@ Status = RtlWriteRegistryValue(RTL_REGISTRY_CONTROL, L"TimeZoneInformation", - L"Standard Start", + L"StandardStart", REG_BINARY, &TimeZoneInformation->StandardDate, sizeof(SYSTEMTIME)); @@ -142,7 +142,7 @@ Length = (wcslen(TimeZoneInformation->DaylightName) + 1) * sizeof(WCHAR); Status = RtlWriteRegistryValue(RTL_REGISTRY_CONTROL, L"TimeZoneInformation", - L"Daylight Name", + L"DaylightName", REG_SZ, TimeZoneInformation->DaylightName, (ULONG)Length); @@ -153,7 +153,7 @@ Status = RtlWriteRegistryValue(RTL_REGISTRY_CONTROL, L"TimeZoneInformation", - L"Daylight Bias", + L"DaylightBias", REG_DWORD, &TimeZoneInformation->DaylightBias, sizeof(LONG)); @@ -164,7 +164,7 @@ Status = RtlWriteRegistryValue(RTL_REGISTRY_CONTROL, L"TimeZoneInformation", - L"Daylight Start", + L"DaylightStart", REG_BINARY, &TimeZoneInformation->DaylightDate, sizeof(SYSTEMTIME));

11 years, 11 months

[hbelusca] 58132: [REACTOS] Introduce four new debugging macros, ERROR_DBGBREAK, ERROR_FATAL, UNIMPLEMENTED_DBGBREAK, UNIMPLEMENTED_FATAL (and two helpers, __NOTICE and __ERROR_DBGBREAK). They are ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 6 18:47:39 2013 New Revision: 58132 URL: http://svn.reactos.org/svn/reactos?rev=58132&view=rev Log: [REACTOS] Introduce four new debugging macros, ERROR_DBGBREAK, ERROR_FATAL, UNIMPLEMENTED_DBGBREAK, UNIMPLEMENTED_FATAL (and two helpers, __NOTICE and __ERROR_DBGBREAK). They are designed to display on the debug-log a printf-like user-defined message and to break into the debugger. - The *_DBGBREAK macros break only into the debugger and allow to continue (they don't hang). - The *_FATAL macros break into the debugger and then halt the execution. (Based on an idea of Aleksey Bragin, see the ros-dev mailing list about the while(true) --> assert(false); changes). [NTOSKRNL] Use these macros instead of ASSERT(FALSE); introduced in revisions r58110, r58111 and r58112 to replace while(TRUE); halts. Part 1/3 Modified: trunk/reactos/include/reactos/debug.h trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c trunk/reactos/ntoskrnl/mm/ARM3/largepag.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/mm/arm/stubs.c Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Sun Jan 6 18:47:39 2013 @@ -3,14 +3,13 @@ * PROJECT: ReactOS kernel * FILE: include/internal/debug.h * PURPOSE: Useful debugging macros - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * UPDATE HISTORY: - * 28/05/98: Created + * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* - * NOTE: Define NDEBUG before including this header to disable debugging - * macros + * NOTE: Define NDEBUG before including this header + * to disable debugging macros. */ #ifndef __INTERNAL_DEBUG @@ -19,7 +18,7 @@ /* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */ #if !defined(_RTLFUNCS_H) && !defined(_NTDDK_) -/* Make sure we have basic types (some people include us *before* SDK... */ +/* Make sure we have basic types (some people include us *before* SDK)... */ #if !defined(_NTDEF_) && !defined(_NTDEF_H) && !defined(_WINDEF_) && !defined(_WINDEF_H) #error Please include SDK first. #endif @@ -56,7 +55,7 @@ #ifndef assert #ifndef NASSERT -#define assert(x) if (!(x)) {RtlAssert((PVOID)#x,(PVOID)__FILE__,__LINE__, ""); } +#define assert(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__FILE__, __LINE__, ""); } #else #define assert(x) #endif @@ -64,7 +63,7 @@ #ifndef ASSERT #ifndef NASSERT -#define ASSERT(x) if (!(x)) {RtlAssert((PVOID)#x,(PVOID)__FILE__,__LINE__, ""); } +#define ASSERT(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__FILE__, __LINE__, ""); } #else #define ASSERT(x) #endif @@ -72,11 +71,14 @@ #ifndef ASSERTMSG #ifndef NASSERT -#define ASSERTMSG(x,m) if (!(x)) {RtlAssert((PVOID)#x,__FILE__,__LINE__, m); } +#define ASSERTMSG(x,m) if (!(x)) { RtlAssert((PVOID)#x, __FILE__, __LINE__, m); } #else #define ASSERTMSG(x) #endif #endif + +/* For internal purposes only */ +#define __NOTICE(level, fmt, ...) DbgPrint(#level ": %s at %s:%d " fmt, __FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__) /* Print stuff only on Debug Builds*/ #define DPFLTR_DEFAULT_ID -1 @@ -102,7 +104,7 @@ #endif - #define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); + #define UNIMPLEMENTED __NOTICE(WARNING, "is UNIMPLEMENTED!\n"); #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) @@ -113,6 +115,7 @@ #define WARN__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define TRACE__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define INFO__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #else /* not DBG */ /* On non-debug builds, we never show these */ @@ -130,7 +133,51 @@ #define WARN__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define TRACE__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define INFO__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #endif /* not DBG */ + +/* + * These macros are designed to display an optional printf-like + * user-defined message and to break into the debugger. + * After that they allow to continue the program execution. + */ +/* For internal purposes only */ +#define __ERROR_DBGBREAK(...) \ +do { \ + DbgPrint("" __VA_ARGS__); \ + DbgBreakPoint(); \ +} while (0) + +#define ERROR_DBGBREAK(...) \ +do { \ + __NOTICE(ERROR, "\n"); \ + __ERROR_DBGBREAK(__VA_ARGS__); \ +} while (0) + +#define UNIMPLEMENTED_DBGBREAK(...) \ +do { \ + __NOTICE(ERROR, "is UNIMPLEMENTED!\n"); \ + __ERROR_DBGBREAK(__VA_ARGS__); \ +} while (0) + +/* + * These macros are designed to display an optional printf-like + * user-defined message and to break into the debugger. + * After that they halt the execution of the current thread. + */ +#define ERROR_FATAL(...) \ +do { \ + __NOTICE(UNRECOVERABLE ERROR, "\n"); \ + __ERROR_DBGBREAK(__VA_ARGS__); \ + while (TRUE); \ +} while (0) + +#define UNIMPLEMENTED_FATAL(...) \ +do { \ + __NOTICE(UNRECOVERABLE ERROR, "is UNIMPLEMENTED!\n"); \ + __ERROR_DBGBREAK(__VA_ARGS__); \ + while (TRUE); \ +} while (0) #define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x)) #define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql()==(x)) Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Sun Jan 6 18:47:39 2013 @@ -65,8 +65,7 @@ // // Always return success for now // - DPRINT1("NEVER TELL ME THE ODDS!\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_FATAL("NEVER TELL ME THE ODDS!\n"); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/largepag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/largepag.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/largepag.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/largepag.c [iso-8859-1] Sun Jan 6 18:47:39 2013 @@ -58,8 +58,7 @@ /* Scan every range */ for (i = 0; i < MiLargePageRangeIndex; i++) { - DPRINT1("No support for large pages\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("No support for large pages\n"); } } Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sun Jan 6 18:47:39 2013 @@ -105,8 +105,7 @@ if (SessionLoad) { /* Fail */ - DPRINT1("Session loading not yet supported!\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("Session loading not yet supported!\n"); return STATUS_NOT_IMPLEMENTED; } @@ -1217,8 +1216,7 @@ { /* We failed, unload the image */ MmUnloadSystemImage(DllEntry); - DPRINT1("MmCallDllInitialize failed with status 0x%x\n", Status); - ASSERT(FALSE); // while (TRUE); + ERROR_DBGBREAK("MmCallDllInitialize failed with status 0x%x\n", Status); Loaded = FALSE; } } @@ -1720,8 +1718,7 @@ if (!PointerPte) { /* Shouldn't happen */ - DPRINT1("[Mm0]: Couldn't allocate driver section!\n"); - ASSERT(FALSE); // while (TRUE); + ERROR_FATAL("[Mm0]: Couldn't allocate driver section!\n"); return; } @@ -1774,8 +1771,7 @@ if (!NT_SUCCESS(Status)) { /* This shouldn't happen */ - DPRINT1("Relocations failed!\n"); - ASSERT(FALSE); // while (TRUE); + ERROR_FATAL("Relocations failed!\n"); return; } } @@ -1973,9 +1969,8 @@ if (*ImageThunk) { /* Should not be happening */ - DPRINT1("Broken IAT entry for %p at %p (%lx)\n", - LdrEntry, ImageThunk, *ImageThunk); - ASSERT(FALSE); + ERROR_FATAL("Broken IAT entry for %p at %p (%lx)\n", + LdrEntry, ImageThunk, *ImageThunk); } /* Reset if we hit this */ @@ -2363,8 +2358,7 @@ else { /* Not supported */ - DPRINT1("Session drivers not supported\n"); - ASSERT(FALSE); + UNIMPLEMENTED_DBGBREAK("Session drivers not supported\n"); } /* These are the only protection masks we care about */ @@ -2924,8 +2918,7 @@ else { /* We don't support session loading yet */ - DPRINT1("Unsupported Session-Load!\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("Unsupported Session-Load!\n"); Status = STATUS_NOT_IMPLEMENTED; } @@ -3026,8 +3019,7 @@ if (Flags) { /* We don't support session loading yet */ - DPRINT1("Unsupported Session-Load!\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("Unsupported Session-Load!\n"); goto Quickie; } Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Sun Jan 6 18:47:39 2013 @@ -124,8 +124,7 @@ MiFlushTlb(IN PMMPTE PointerPte, IN PVOID Address) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } BOOLEAN @@ -134,8 +133,7 @@ IN PEPROCESS Process, IN PULONG DirectoryTableBase) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return FALSE; } @@ -164,8 +162,7 @@ OUT PBOOLEAN WasDirty, OUT PPFN_NUMBER Page) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -173,8 +170,7 @@ MmEnableVirtualMapping(IN PEPROCESS Process, IN PVOID Address) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } NTSTATUS @@ -185,8 +181,7 @@ IN PPFN_NUMBER Pages, IN ULONG PageCount) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_SUCCESS; } @@ -198,8 +193,7 @@ IN PPFN_NUMBER Pages, IN ULONG PageCount) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_SUCCESS; } @@ -207,8 +201,7 @@ NTAPI MmRawDeleteVirtualMapping(IN PVOID Address) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -219,8 +212,7 @@ OUT PBOOLEAN WasDirty, OUT PPFN_NUMBER Page) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -229,8 +221,7 @@ IN PVOID Address, IN SWAPENTRY *SwapEntry) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } NTSTATUS @@ -239,8 +230,7 @@ IN PVOID Address, IN SWAPENTRY SwapEntry) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } @@ -249,8 +239,7 @@ MmGetPfnForProcess(IN PEPROCESS Process, IN PVOID Address) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return 0; } @@ -259,8 +248,7 @@ MmIsDirtyPage(IN PEPROCESS Process, IN PVOID Address) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return FALSE; } @@ -269,8 +257,7 @@ MmSetCleanPage(IN PEPROCESS Process, IN PVOID Address) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -278,8 +265,7 @@ MmSetDirtyPage(IN PEPROCESS Process, IN PVOID Address) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } BOOLEAN @@ -287,8 +273,7 @@ MmIsPagePresent(IN PEPROCESS Process, IN PVOID Address) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return FALSE; } @@ -297,8 +282,7 @@ MmIsPageSwapEntry(IN PEPROCESS Process, IN PVOID Address) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return FALSE; } @@ -327,7 +311,6 @@ { ULONG i; PULONG CurrentPageDirectory = (PULONG)PDE_BASE; - /* Loop the 2GB of address space which belong to the kernel */ for (i = MiGetPdeOffset(MmSystemRangeStart); i < 2048; i++) @@ -356,8 +339,7 @@ PHYSICAL_ADDRESS PhysicalAddress; PhysicalAddress.QuadPart = 0; - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return PhysicalAddress; } Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sun Jan 6 18:47:39 2013 @@ -39,7 +39,7 @@ // // FIXME-USER: Shouldn't get here yet // - ASSERT(FALSE); + ERROR_FATAL(); return FALSE; } @@ -399,8 +399,7 @@ // // TODO // - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -411,8 +410,7 @@ // // TODO // - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } NTSTATUS @@ -658,8 +656,7 @@ // // TODO // - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } NTSTATUS @@ -671,8 +668,7 @@ // // TODO // - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } @@ -703,8 +699,7 @@ // // TODO // - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return FALSE; } @@ -716,8 +711,7 @@ // // TODO // - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -728,8 +722,7 @@ // // TODO // - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } BOOLEAN

11 years, 11 months

[tfaber] 58131: [RPCRT4][SHDOCVW] - Add missing __WINESRC__ definitions. Fixes some warnings. CORE-6784 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jan 6 14:32:46 2013 New Revision: 58131 URL: http://svn.reactos.org/svn/reactos?rev=58131&view=rev Log: [RPCRT4][SHDOCVW] - Add missing __WINESRC__ definitions. Fixes some warnings. CORE-6784 #resolve Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/CMakeLists.txt Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Sun Jan 6 14:32:46 2013 @@ -35,6 +35,7 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions( + -D__WINESRC__ -D_RPCRT4_ -DCOM_NO_WINDOWS_H -DMSWMSG) Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Sun Jan 6 14:32:46 2013 @@ -1,7 +1,9 @@ add_typelib(shdocvw_v1.idl) -add_definitions(-D_SHDOCVW_) +add_definitions( + -D__WINESRC__ + -D_SHDOCVW_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB)

11 years, 11 months

[ekohl] 58130: [NETAPI32] - NetUserGetInfo: Add Support for info level 23. - Convert UserAccountControl flags to user info flags and convert last logon, last logoff and account expires time.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 6 14:24:40 2013 New Revision: 58130 URL: http://svn.reactos.org/svn/reactos?rev=58130&view=rev Log: [NETAPI32] - NetUserGetInfo: Add Support for info level 23. - Convert UserAccountControl flags to user info flags and convert last logon, last logoff and account expires time. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sun Jan 6 14:24:40 2013 @@ -160,6 +160,68 @@ static +ULONG +GetAccountFlags(ULONG AccountControl) +{ + ULONG Flags = UF_SCRIPT; + + if (AccountControl & USER_ACCOUNT_DISABLED) + Flags |= UF_ACCOUNTDISABLE; + + if (AccountControl & USER_HOME_DIRECTORY_REQUIRED) + Flags |= UF_HOMEDIR_REQUIRED; + + if (AccountControl & USER_PASSWORD_NOT_REQUIRED) + Flags |= UF_PASSWD_NOTREQD; + +// UF_PASSWD_CANT_CHANGE + + if (AccountControl & USER_ACCOUNT_AUTO_LOCKED) + Flags |= UF_LOCKOUT; + + if (AccountControl & USER_DONT_EXPIRE_PASSWORD) + Flags |= UF_DONT_EXPIRE_PASSWD; + +/* + if (AccountControl & USER_ENCRYPTED_TEXT_PASSWORD_ALLOWED) + Flags |= UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED; + + if (AccountControl & USER_SMARTCARD_REQUIRED) + Flags |= UF_SMARTCARD_REQUIRED; + + if (AccountControl & USER_TRUSTED_FOR_DELEGATION) + Flags |= UF_TRUSTED_FOR_DELEGATION; + + if (AccountControl & USER_NOT_DELEGATED) + Flags |= UF_NOT_DELEGATED; + + if (AccountControl & USER_USE_DES_KEY_ONLY) + Flags |= UF_USE_DES_KEY_ONLY; + + if (AccountControl & USER_DONT_REQUIRE_PREAUTH) + Flags |= UF_DONT_REQUIRE_PREAUTH; + + if (AccountControl & USER_PASSWORD_EXPIRED) + Flags |= UF_PASSWORD_EXPIRED; +*/ + + /* Set account type flags */ + if (AccountControl & USER_TEMP_DUPLICATE_ACCOUNT) + Flags |= UF_TEMP_DUPLICATE_ACCOUNT; + else if (AccountControl & USER_NORMAL_ACCOUNT) + Flags |= UF_NORMAL_ACCOUNT; + else if (AccountControl & USER_INTERDOMAIN_TRUST_ACCOUNT) + Flags |= UF_INTERDOMAIN_TRUST_ACCOUNT; + else if (AccountControl & USER_WORKSTATION_TRUST_ACCOUNT) + Flags |= UF_WORKSTATION_TRUST_ACCOUNT; + else if (AccountControl & USER_SERVER_TRUST_ACCOUNT) + Flags |= UF_SERVER_TRUST_ACCOUNT; + + return Flags; +} + + +static NET_API_STATUS BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo, DWORD level, @@ -173,6 +235,7 @@ PUSER_INFO_3 UserInfo3; PUSER_INFO_10 UserInfo10; PUSER_INFO_20 UserInfo20; + PUSER_INFO_23 UserInfo23; LPWSTR Ptr; ULONG Size = 0; NET_API_STATUS ApiStatus = NERR_Success; @@ -286,7 +349,18 @@ Size += UserInfo->AdminComment.Length + sizeof(WCHAR); break; -// case 23: + case 23: + Size = sizeof(USER_INFO_23) + + UserInfo->UserName.Length + sizeof(WCHAR); + + if (UserInfo->FullName.Length > 0) + Size += UserInfo->FullName.Length + sizeof(WCHAR); + + if (UserInfo->AdminComment.Length > 0) + Size += UserInfo->AdminComment.Length + sizeof(WCHAR); + + /* FIXME: usri23_user_sid */ + break; default: ApiStatus = ERROR_INVALID_LEVEL; @@ -356,7 +430,7 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } -// UserInfo1->usri1_flags = UserInfo->UserAccountControl; + UserInfo1->usri1_flags = GetAccountFlags(UserInfo->UserAccountControl); if (UserInfo->ScriptPath.Length > 0) { @@ -383,7 +457,6 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR)); - /* FIXME: usri2_password */ /* FIXME: usri2_password_age */ /* FIXME: usri2_priv */ @@ -411,7 +484,7 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - /* FIXME: usri2_flags */ + UserInfo2->usri2_flags = GetAccountFlags(UserInfo->UserAccountControl); if (UserInfo->ScriptPath.Length > 0) { @@ -454,14 +527,23 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->WorkStations.Length + sizeof(WCHAR)); } - /* FIXME: usri2_last_logon */ - /* FIXME: usri2_last_logoff */ - /* FIXME: usri2_acct_expires */ - /* FIXME: usri2_max_storage */ + RtlTimeToSecondsSince1970(&UserInfo->LastLogon, + &UserInfo2->usri2_last_logon); + + RtlTimeToSecondsSince1970(&UserInfo->LastLogoff, + &UserInfo2->usri2_last_logoff); + + RtlTimeToSecondsSince1970(&UserInfo->AccountExpires, + &UserInfo2->usri2_acct_expires); + + UserInfo2->usri2_max_storage = USER_MAXSTORAGE_UNLIMITED; + /* FIXME: usri2_units_per_week */ /* FIXME: usri2_logon_hours */ - /* FIXME: usri2_bad_pw_count */ - /* FIXME: usri2_num_logons */ + + UserInfo2->usri2_bad_pw_count = UserInfo->BadPasswordCount; + UserInfo2->usri2_num_logons = UserInfo->LogonCount; + /* FIXME: usri2_logon_server */ /* FIXME: usri2_country_code */ /* FIXME: usri2_code_page */ @@ -482,7 +564,6 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR)); - /* FIXME: usri3_password */ /* FIXME: usri3_password_age */ /* FIXME: usri3_priv */ @@ -510,7 +591,7 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - /* FIXME: usri3_flags */ + UserInfo3->usri3_flags = GetAccountFlags(UserInfo->UserAccountControl); if (UserInfo->ScriptPath.Length > 0) { @@ -553,14 +634,23 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->WorkStations.Length + sizeof(WCHAR)); } - /* FIXME: usri3_last_logon */ - /* FIXME: usri3_last_logoff */ - /* FIXME: usri3_acct_expires */ - /* FIXME: usri3_max_storage */ + RtlTimeToSecondsSince1970(&UserInfo->LastLogon, + &UserInfo3->usri3_last_logon); + + RtlTimeToSecondsSince1970(&UserInfo->LastLogoff, + &UserInfo3->usri3_last_logoff); + + RtlTimeToSecondsSince1970(&UserInfo->AccountExpires, + &UserInfo3->usri3_acct_expires); + + UserInfo3->usri3_max_storage = USER_MAXSTORAGE_UNLIMITED; + /* FIXME: usri3_units_per_week */ /* FIXME: usri3_logon_hours */ - /* FIXME: usri3_bad_pw_count */ - /* FIXME: usri3_num_logons */ + + UserInfo3->usri3_bad_pw_count = UserInfo->BadPasswordCount; + UserInfo3->usri3_num_logons = UserInfo->LogonCount; + /* FIXME: usri3_logon_server */ /* FIXME: usri3_country_code */ /* FIXME: usri3_code_page */ @@ -592,7 +682,7 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->HomeDirectoryDrive.Length + sizeof(WCHAR)); } - /* FIXME: usri3_password_expired */ + UserInfo3->usri3_password_expired = (UserInfo->UserAccountControl & USER_PASSWORD_EXPIRED); break; // case 4: @@ -678,11 +768,53 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } -// UserInfo20->usri20_flags = UserInfo->UserAccountControl; + UserInfo20->usri20_flags = GetAccountFlags(UserInfo->UserAccountControl); + UserInfo20->usri20_user_id = RelativeId; break; -// case 23: + case 23: + UserInfo23 = (PUSER_INFO_23)LocalBuffer; + + Ptr = (LPWSTR)((ULONG_PTR)UserInfo23 + sizeof(USER_INFO_23)); + + UserInfo23->usri23_name = Ptr; + + memcpy(UserInfo23->usri23_name, + UserInfo->UserName.Buffer, + UserInfo->UserName.Length); + UserInfo23->usri23_name[UserInfo->UserName.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR)); + + if (UserInfo->FullName.Length > 0) + { + UserInfo23->usri23_full_name = Ptr; + + memcpy(UserInfo23->usri23_full_name, + UserInfo->FullName.Buffer, + UserInfo->FullName.Length); + UserInfo23->usri23_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR)); + } + + if (UserInfo->AdminComment.Length > 0) + { + UserInfo23->usri23_comment = Ptr; + + memcpy(UserInfo23->usri23_comment, + UserInfo->AdminComment.Buffer, + UserInfo->AdminComment.Length); + UserInfo23->usri23_comment[UserInfo->AdminComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); + } + + UserInfo23->usri23_flags = GetAccountFlags(UserInfo->UserAccountControl); + + /* FIXME: usri23_user_sid */ + break; } done:

11 years, 11 months

[ekohl] 58129: [PSDK] Add missing types USER_INFO_4 and USER_INFO_23.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 6 13:22:47 2013 New Revision: 58129 URL: http://svn.reactos.org/svn/reactos?rev=58129&view=rev Log: [PSDK] Add missing types USER_INFO_4 and USER_INFO_23. Modified: trunk/reactos/include/psdk/lmaccess.h Modified: trunk/reactos/include/psdk/lmaccess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/lmaccess.h?re… ============================================================================== --- trunk/reactos/include/psdk/lmaccess.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/lmaccess.h [iso-8859-1] Sun Jan 6 13:22:47 2013 @@ -266,6 +266,37 @@ LPWSTR usri3_home_dir_drive; DWORD usri3_password_expired; }USER_INFO_3,*PUSER_INFO_3,*LPUSER_INFO_3; +typedef struct _USER_INFO_4 { + LPWSTR usri4_name; + LPWSTR usri4_password; + DWORD usri4_password_age; + DWORD usri4_priv; + LPWSTR usri4_home_dir; + LPWSTR usri4_comment; + DWORD usri4_flags; + LPWSTR usri4_script_path; + DWORD usri4_auth_flags; + LPWSTR usri4_full_name; + LPWSTR usri4_usr_comment; + LPWSTR usri4_parms; + LPWSTR usri4_workstations; + DWORD usri4_last_logon; + DWORD usri4_last_logoff; + DWORD usri4_acct_expires; + DWORD usri4_max_storage; + DWORD usri4_units_per_week; + PBYTE usri4_logon_hours; + DWORD usri4_bad_pw_count; + DWORD usri4_num_logons; + LPWSTR usri4_logon_server; + DWORD usri4_country_code; + DWORD usri4_code_page; + PSID usri4_user_sid; + DWORD usri4_primary_group_id; + LPWSTR usri4_profile; + LPWSTR usri4_home_dir_drive; + DWORD usri4_password_expired; +} USER_INFO_4, *PUSER_INFO_4, *LPUSER_INFO_4; typedef struct _USER_INFO_10 { LPWSTR usri10_name; LPWSTR usri10_comment; @@ -329,7 +360,14 @@ LPWSTR usri22_logon_server; DWORD usri22_country_code; DWORD usri22_code_page; - }USER_INFO_22,*PUSER_INFO_22,*LPUSER_INFO_22; +}USER_INFO_22,*PUSER_INFO_22,*LPUSER_INFO_22; +typedef struct _USER_INFO_23 { + LPWSTR usri23_name; + LPWSTR usri23_full_name; + LPWSTR usri23_comment; + DWORD usri23_flags; + PSID usri23_user_sid; +} USER_INFO_23, *PUSER_INFO_23, *LPUSER_INFO_23; typedef struct _USER_INFO_1003 { LPWSTR usri1003_password; } USER_INFO_1003,*PUSER_INFO_1003,*LPUSER_INFO_1003;

11 years, 11 months

[ekohl] 58128: [SAMSRV] SAM Setup: Set the UserAccountControl flags when user accounts are created.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 6 13:03:01 2013 New Revision: 58128 URL: http://svn.reactos.org/svn/reactos?rev=58128&view=rev Log: [SAMSRV] SAM Setup: Set the UserAccountControl flags when user accounts are created. Modified: trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sun Jan 6 13:03:01 2013 @@ -221,7 +221,8 @@ static BOOL SampCreateUserAccount(HKEY hDomainKey, LPCWSTR lpAccountName, - ULONG ulRelativeId) + ULONG ulRelativeId, + ULONG UserAccountControl) { SAM_USER_FIXED_DATA FixedUserData; LPWSTR lpEmptyString = L""; @@ -235,6 +236,7 @@ FixedUserData.Version = 1; FixedUserData.UserId = ulRelativeId; + FixedUserData.UserAccountControl = UserAccountControl; swprintf(szAccountKeyName, L"Users\\%08lX", ulRelativeId); @@ -673,11 +675,13 @@ { SampCreateUserAccount(hDomainKey, L"Administrator", - DOMAIN_USER_RID_ADMIN); + DOMAIN_USER_RID_ADMIN, + USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); SampCreateUserAccount(hDomainKey, L"Guest", - DOMAIN_USER_RID_GUEST); + DOMAIN_USER_RID_GUEST, + USER_ACCOUNT_DISABLED | USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); RegCloseKey(hDomainKey); }

11 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2013