Ros-diffs February 2013

ros-diffs@reactos.org

11 participants
125 discussions

[tkreuzer] 58332: [WINE] Silence GCC 4.7.2 warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 14:33:01 2013 New Revision: 58332 URL: http://svn.reactos.org/svn/reactos?rev=58332&view=rev Log: [WINE] Silence GCC 4.7.2 warnings Modified: trunk/reactos/include/reactos/wine/debug.h Modified: trunk/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug… ============================================================================== --- trunk/reactos/include/reactos/wine/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/debug.h [iso-8859-1] Sun Feb 17 14:33:01 2013 @@ -245,9 +245,9 @@ #define WINE_ERR_ON(ch) __WINE_IS_DEBUG_ON(_ERR,&__wine_dbch_##ch) #define WINE_DECLARE_DEBUG_CHANNEL(ch) \ - static struct __wine_debug_channel __wine_dbch_##ch = { ~0, #ch } + static struct __wine_debug_channel __wine_dbch_##ch = { (unsigned char)~0, #ch } #define WINE_DEFAULT_DEBUG_CHANNEL(ch) \ - static struct __wine_debug_channel __wine_dbch_##ch = { ~0, #ch }; \ + static struct __wine_debug_channel __wine_dbch_##ch = { (unsigned char)~0, #ch }; \ static struct __wine_debug_channel * const __wine_dbch___default = &__wine_dbch_##ch #define WINE_DPRINTF wine_dbg_printf

11 years, 8 months

[tkreuzer] 58331: [INCLUDE/CRT] Remove hacks from crtdefs.h (threadmbcinfostruct definition is private)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 14:27:48 2013 New Revision: 58331 URL: http://svn.reactos.org/svn/reactos?rev=58331&view=rev Log: [INCLUDE/CRT] Remove hacks from crtdefs.h (threadmbcinfostruct definition is private) Modified: trunk/reactos/include/crt/crtdefs.h Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Sun Feb 17 14:27:48 2013 @@ -343,14 +343,6 @@ #endif #endif -/* For wine code... */ -#if !defined(_MSVCRT_LONG_DEFINED) && defined(__ROS_LONG64__) -#define _MSVCRT_LONG_DEFINED -/* we need 32-bit longs even on 64-bit */ -typedef int __msvcrt_long; -typedef unsigned int __msvcrt_ulong; -#endif - #ifndef _TIME_T_DEFINED #define _TIME_T_DEFINED #ifdef _USE_32BIT_TIME_T @@ -360,16 +352,8 @@ #endif #endif - typedef struct threadmbcinfostruct { - int refcount; - int mbcodepage; - int ismbcodepage; - int mblcid; - unsigned short mbulinfo[6]; - char mbctype[257]; - char mbcasemap[256]; -} threadmbcinfo, *pthreadmbcinfo; - +struct threadmbcinfostruct; +typedef struct threadmbcinfostruct *pthreadmbcinfo; #ifndef _TAGLC_ID_DEFINED #define _TAGLC_ID_DEFINED

11 years, 8 months

[tkreuzer] 58330: [MSVCRT_WINETEST] define __msvcrt_ulong to ULONG in the CMakeLists.txt file, instead of relying on hacks in our CRT headers.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 14:26:33 2013 New Revision: 58330 URL: http://svn.reactos.org/svn/reactos?rev=58330&view=rev Log: [MSVCRT_WINETEST] define __msvcrt_ulong to ULONG in the CMakeLists.txt file, instead of relying on hacks in our CRT headers. Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Sun Feb 17 14:26:33 2013 @@ -1,7 +1,8 @@ add_definitions( -D__ROS_LONG64__ - -D_CRT_NONSTDC_NO_DEPRECATE) + -D_CRT_NONSTDC_NO_DEPRECATE + -D__msvcrt_ulong=ULONG) list(APPEND SOURCE cpp.c

11 years, 8 months

[ekohl] 58329: [MSGINA] Fix an off-by-one bug!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 17 12:35:47 2013 New Revision: 58329 URL: http://svn.reactos.org/svn/reactos?rev=58329&view=rev Log: [MSGINA] Fix an off-by-one bug! Modified: trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Feb 17 12:35:47 2013 @@ -470,7 +470,7 @@ pProfile->pszProfile = ProfilePath; lpEnvironment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (wcslen(pgContext->Domain)+ 14) * sizeof(WCHAR)); + (wcslen(pgContext->Domain)+ 14 + 1) * sizeof(WCHAR)); if (!lpEnvironment) { WARN("HeapAlloc() failed\n");

11 years, 8 months

[ekohl] 58328: [MSGINA] - Remove the WM_SYSMENU style from the security dialog. - Add the unlock dialog. - Fix the layout of the german logon dialog. Password and user name are left-aligned again.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 17 12:07:45 2013 New Revision: 58328 URL: http://svn.reactos.org/svn/reactos?rev=58328&view=rev Log: [MSGINA] - Remove the WM_SYSMENU style from the security dialog. - Add the unlock dialog. - Fix the layout of the german logon dialog. Password and user name are left-aligned again. Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/resource.h Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -34,7 +34,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ð¡Ð¸Ð³ÑÑÐ½Ð¾ÑÑ" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -59,6 +59,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ´ÑÐ°Ð²ÐµÐ¹ÑÐµ!" Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -40,7 +40,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "BezpeÄnost" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -65,6 +65,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "VÃtejte!" Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -24,17 +24,17 @@ FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Benutzername:",IDC_STATIC,26, 75, 54, 8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - LTEXT "Passwort:",IDC_STATIC,43, 93, 38, 8 - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Benutzername:",IDC_STATIC,36, 75, 54, 8 + EDITTEXT IDC_USERNAME,92,72,119,14,ES_AUTOHSCROLL + LTEXT "Passwort:",IDC_STATIC,36, 93, 42, 8 + EDITTEXT IDC_PASSWORD,92,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,41, 122, 50, 14,BS_DEFPUSHBUTTON PUSHBUTTON "Abbrechen",IDCANCEL,103, 122, 50, 14 PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,165, 122, 64, 14 END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Sicherheit" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -59,6 +59,23 @@ LTEXT "DrÃ¼cken Sie Strg+Alt+Entf um den Computer zu entsperren.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "Dieser Computer wird verwendet und ist gesperrt.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Benutzername:",IDC_STATIC,36,107,54,8 + EDITTEXT IDC_USERNAME,92,104,119,14,ES_AUTOHSCROLL + LTEXT "Passwort:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,92,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Abbrechen",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Willkommen!" Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -34,7 +34,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Security" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -54,9 +54,26 @@ BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 ICON IDI_LOCKICON,-1,7,59,20,20 - LTEXT "This computer is in use and has been locked.",IDC_STATIC,37,61,231,8 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 LTEXT "Message",IDC_LOCKMSG,37,75,231,26 - LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 + LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,36,106,232,8 +END + +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -39,7 +39,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Seguridad" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -64,6 +64,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Â¡Bienvenido!" Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -34,7 +34,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "SÃ©curitÃ©" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -59,6 +59,23 @@ LTEXT "Appuyez sur les touches Ctrl-Alt-Suppr pour dÃ©verrouiller l'ordinateur.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bienvenue!" Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -34,7 +34,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "×××××" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -59,6 +59,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "××¨×××× ×××××!" Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -34,7 +34,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Keamanan" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -59,6 +59,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Selamat datang!" Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -41,6 +41,20 @@ PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,179,122,50,14 END +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Sicurezza" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "Cosa volete fare?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Bloccare il computer",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Fine sessione",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,170,76,70,14 + PUSHBUTTON "Task manager",IDC_TASKMGR,90,95,70,14 + PUSHBUTTON "Annulla",IDCANCEL,170,95,70,14 +END + IDD_LOCKED_DLG DIALOGEX 0,0,275,121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" @@ -53,18 +67,21 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU -CAPTION "Sicurezza" +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Cosa volete fare?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Bloccare il computer",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Fine sessione",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Task manager",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Annulla",IDCANCEL,170,95,70,14 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -34,7 +34,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ã»ãã¥ãªãã£" FONT 9, "MS UI Gothic",400,0,1 BEGIN @@ -59,6 +59,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ãããã!" Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -34,7 +34,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ReactOS-sikkerhet" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -59,6 +59,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Velkommen!" Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -42,7 +42,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "BezpieczeÅstwo" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -67,6 +67,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Witaj!" Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -35,7 +35,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Securitate" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -60,6 +60,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bun venit!" Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -36,7 +36,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -61,6 +61,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ!" Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -38,6 +38,20 @@ PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,179,122,50,14 END +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "BezpeÄnosÅ¥" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "Äo chcete urobiÅ¥?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "UzamknÃºÅ¥ poÄÃtaÄ",IDC_LOCK,10,76,70,14 + PUSHBUTTON "OdhlÃ¡siÅ¥",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,170,76,70,14 + PUSHBUTTON "SprÃ¡vca Ãºloh",IDC_TASKMGR,90,95,70,14 + PUSHBUTTON "ZruÅ¡iÅ¥",IDCANCEL,170,95,70,14 +END + IDD_LOCKED_DLG DIALOGEX 0,0,275,121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" @@ -50,18 +64,21 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU -CAPTION "BezpeÄnosÅ¥" +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Äo chcete urobiÅ¥?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "UzamknÃºÅ¥ poÄÃtaÄ",IDC_LOCK,10,76,70,14 - PUSHBUTTON "OdhlÃ¡siÅ¥",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "SprÃ¡vca Ãºloh",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "ZruÅ¡iÅ¥",IDCANCEL,170,95,70,14 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -42,7 +42,7 @@ END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐµÐ·Ð¿ÐµÐºÐ°" FONT 8,"MS Shell Dlg",400,0,1 BEGIN @@ -67,6 +67,23 @@ LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 END +IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Unlock Computer" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + ICON IDI_LOCKICON,-1,7,59,20,20 + LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 + LTEXT "Message",IDC_LOCKMSG,36,75,232,26 + LTEXT "Username:",IDC_STATIC,36,107,40,8 + EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,125,42,8 + EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ°ÑÐºÐ°Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð¼Ð¾!" Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Sun Feb 17 12:07:45 2013 @@ -6,6 +6,7 @@ #define IDD_LOGGEDON_DLG 102 #define IDD_LOGGEDOUT_DLG 103 #define IDD_LOCKED_DLG 104 +#define IDD_UNLOCK_DLG 105 #define IDC_LOGOFF 1001 #define IDC_USERNAME 1002

11 years, 8 months

[tkreuzer] 58327: [POWRPROF_APITEST] Fix subscript out of array bounds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 17 10:31:50 2013 New Revision: 58327 URL: http://svn.reactos.org/svn/reactos?rev=58327&view=rev Log: [POWRPROF_APITEST] Fix subscript out of array bounds Modified: trunk/rostests/apitests/powrprof/power.c Modified: trunk/rostests/apitests/powrprof/power.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/power.c… ============================================================================== --- trunk/rostests/apitests/powrprof/power.c [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/power.c [iso-8859-1] Sun Feb 17 10:31:50 2013 @@ -997,11 +997,6 @@ if (pp.mach.pad1[1] != pp_compare.mach.pad1[1]) { printf("mach.pad1[1] failed %i != %i\n",pp.mach.pad1[1],pp_compare.mach.pad1[1]); - ret = FALSE; - } - if (pp.mach.pad1[2] != pp_compare.mach.pad1[2]) - { - printf("mach.pad1[2] failed %i != %i\n",pp.mach.pad1[2],pp_compare.mach.pad1[2]); ret = FALSE; } if (pp.mach.Revision != pp_compare.mach.Revision)

11 years, 8 months

[ekohl] 58326: [MSGINA] - Fix a typo in the german lock dialog. - Store the user name and domain in the gina context and use them in the lock dialog. - Initialize the LOGONSERVER environment variable.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 17 01:06:24 2013 New Revision: 58326 URL: http://svn.reactos.org/svn/reactos?rev=58326&view=rev Log: [MSGINA] - Fix a typo in the german lock dialog. - Store the user name and domain in the gina context and use them in the lock dialog. - Initialize the LOGONSERVER environment variable. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Feb 17 01:06:24 2013 @@ -414,6 +414,24 @@ } +static VOID +OnInitLockedDlg(HWND hwnd, + PGINA_CONTEXT pgContext, + UINT id) +{ + WCHAR Buffer1[256]; + WCHAR Buffer2[256]; + WCHAR Buffer3[512]; + + LoadStringW(pgContext->hDllInstance, IDS_LOCKMSG, Buffer1, 256); + + wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); + wsprintfW(Buffer3, Buffer1, Buffer2); + + SetWindowTextW(GetDlgItem(hwnd, id), Buffer3); +} + + static INT_PTR CALLBACK LockedWindowProc( IN HWND hwndDlg, @@ -433,6 +451,7 @@ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + OnInitLockedDlg(hwndDlg, pgContext, IDC_LOCKMSG); return TRUE; } case WM_PAINT: @@ -462,11 +481,9 @@ GUIDisplayLockedNotice( IN OUT PGINA_CONTEXT pgContext) { - int result; - TRACE("GUIdisplayLockedNotice()\n"); - result = pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, pgContext->hDllInstance, MAKEINTRESOURCEW(IDD_LOCKED_DLG), Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Feb 17 01:06:24 2013 @@ -54,7 +54,7 @@ BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 ICON IDI_LOCKICON,-1,7,59,20,20 - LTEXT "Dieser Computer wird verwndet und ist gesperrt.",IDC_STATIC,37,61,231,8 + LTEXT "Dieser Computer wird verwendet und ist gesperrt.",IDC_STATIC,37,61,231,8 LTEXT "Message",IDC_LOCKMSG,37,75,231,26 LTEXT "DrÃ¼cken Sie Strg+Alt+Entf um den Computer zu entsperren.",IDC_STATIC,37,106,231,8 END Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Feb 17 01:06:24 2013 @@ -416,6 +416,7 @@ TOKEN_STATISTICS Stats; PWLX_PROFILE_V2_0 pProfile = NULL; DWORD cbStats, cbSize; + DWORD dwLength; BOOL bResult; if (!LogonUserW(UserName, Domain, Password, @@ -427,6 +428,18 @@ goto cleanup; } + /* Store user and domain in the context */ + wcscpy(pgContext->UserName, UserName); + if (Domain == NULL || wcslen(Domain) == 0) + { + dwLength = 256; + GetComputerNameW(pgContext->Domain, &dwLength); + } + else + { + wcscpy(pgContext->Domain, Domain); + } + /* Get profile path */ cbSize = 0; bResult = GetProfilesDirectoryW(NULL, &cbSize); @@ -456,13 +469,15 @@ pProfile->dwType = WLX_PROFILE_TYPE_V2_0; pProfile->pszProfile = ProfilePath; - lpEnvironment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 32 * sizeof(WCHAR)); + lpEnvironment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + (wcslen(pgContext->Domain)+ 14) * sizeof(WCHAR)); if (!lpEnvironment) { WARN("HeapAlloc() failed\n"); goto cleanup; } - wcscpy(lpEnvironment, L"LOGONSERVER=\\\\Test"); + + wsprintfW(lpEnvironment, L"LOGONSERVER=\\\\%s", pgContext->Domain); pProfile->pszEnvironment = lpEnvironment; Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Feb 17 01:06:24 2013 @@ -29,6 +29,8 @@ DWORD AutoLogonState; /* Informations to be filled during logon */ + WCHAR UserName[256]; + WCHAR Domain[256]; HANDLE UserToken; PLUID pAuthenticationId; PDWORD pdwOptions;

11 years, 8 months

[hbelusca] 58325: [CONSOLE.DLL] - Fix edit controls flag style - Remove that ugly WS_BORDER style to the spin controls.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 16 21:39:57 2013 New Revision: 58325 URL: http://svn.reactos.org/svn/reactos?rev=58325&view=rev Log: [CONSOLE.DLL] - Fix edit controls flag style - Remove that ugly WS_BORDER style to the spin controls. Modified: branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc branches/ros-csrss/dll/cpl/console/lang/de-DE.rc branches/ros-csrss/dll/cpl/console/lang/en-US.rc branches/ros-csrss/dll/cpl/console/lang/es-ES.rc branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc branches/ros-csrss/dll/cpl/console/lang/he-IL.rc branches/ros-csrss/dll/cpl/console/lang/id-ID.rc branches/ros-csrss/dll/cpl/console/lang/it-IT.rc branches/ros-csrss/dll/cpl/console/lang/no-NO.rc branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… Modified: branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/…

11 years, 8 months

[tkreuzer] 58324: [RTL] Fix RtlIsNameLegalDOS8Dot3 regression

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 16 18:46:36 2013 New Revision: 58324 URL: http://svn.reactos.org/svn/reactos?rev=58324&view=rev Log: [RTL] Fix RtlIsNameLegalDOS8Dot3 regression Modified: trunk/reactos/lib/rtl/dos8dot3.c Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=583… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] Sat Feb 16 18:46:36 2013 @@ -225,12 +225,18 @@ /* * @implemented + * Note: the function does not conform to the annotations. + * SpacesFound is not always set! */ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTSYSAPI BOOLEAN NTAPI -RtlIsNameLegalDOS8Dot3(IN PCUNICODE_STRING UnicodeName, - IN OUT POEM_STRING AnsiName OPTIONAL, - IN OUT PBOOLEAN SpacesFound OPTIONAL) +RtlIsNameLegalDOS8Dot3 ( + _In_ PCUNICODE_STRING Name, + _Inout_opt_ POEM_STRING OemName, + _Out_opt_ PBOOLEAN NameContainsSpaces) { static const char Illegal[] = "*?<>|\"+=,;[]:/\\\345"; int Dot = -1; @@ -240,36 +246,35 @@ BOOLEAN GotSpace = FALSE; NTSTATUS Status; - if (SpacesFound) *SpacesFound = FALSE; - - if (!AnsiName) + if (!OemName) { OemString.Length = sizeof(Buffer); OemString.MaximumLength = sizeof(Buffer); OemString.Buffer = Buffer; - AnsiName = &OemString; - } - - Status = RtlUpcaseUnicodeStringToCountedOemString(AnsiName, UnicodeName, FALSE); + OemName = &OemString; + } + + Status = RtlUpcaseUnicodeStringToCountedOemString(OemName, Name, FALSE); if (!NT_SUCCESS(Status)) return FALSE; - if ((AnsiName->Length > 12) || (AnsiName->Buffer == NULL)) return FALSE; + if ((OemName->Length > 12) || (OemName->Buffer == NULL)) return FALSE; /* a starting . is invalid, except for . and .. */ - if (AnsiName->Buffer[0] == '.') - { - if (AnsiName->Length != 1 && (AnsiName->Length != 2 || AnsiName->Buffer[1] != '.')) return FALSE; + if (OemName->Buffer[0] == '.') + { + if (OemName->Length != 1 && (OemName->Length != 2 || OemName->Buffer[1] != '.')) return FALSE; + if (NameContainsSpaces) *NameContainsSpaces = FALSE; return TRUE; } - for (i = 0; i < AnsiName->Length; i++) - { - switch (AnsiName->Buffer[i]) + for (i = 0; i < OemName->Length; i++) + { + switch (OemName->Buffer[i]) { case ' ': /* leading/trailing spaces not allowed */ - if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; + if (!i || i == OemName->Length-1 || OemName->Buffer[i+1] == '.') return FALSE; GotSpace = TRUE; break; case '.': @@ -277,7 +282,7 @@ Dot = i; break; default: - if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; + if (strchr(Illegal, OemName->Buffer[i])) return FALSE; break; } } @@ -286,13 +291,13 @@ */ if (Dot == -1) { - if (AnsiName->Length > 8) return FALSE; + if (OemName->Length > 8) return FALSE; } else { - if (Dot > 8 || (AnsiName->Length - Dot > 4) || Dot == AnsiName->Length - 1) return FALSE; - } - if (SpacesFound) *SpacesFound = GotSpace; + if (Dot > 8 || (OemName->Length - Dot > 4) || Dot == OemName->Length - 1) return FALSE; + } + if (NameContainsSpaces) *NameContainsSpaces = GotSpace; return TRUE; }

11 years, 8 months

[tkreuzer] 58323: [RTL] Fix some VS /analyze warnings, fix RtlGet/SetHeapInformation

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 16 18:08:58 2013 New Revision: 58323 URL: http://svn.reactos.org/svn/reactos?rev=58323&view=rev Log: [RTL] Fix some VS /analyze warnings, fix RtlGet/SetHeapInformation Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=58323&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Feb 16 18:08:58 2013 @@ -541,7 +541,7 @@ PLIST_ENTRY Current; PHEAP_UCR_DESCRIPTOR UcrDescriptor; - DPRINT("RtlpInsertUnCommittedPages(%p %p %x)\n", Segment, Address, Size); + DPRINT("RtlpInsertUnCommittedPages(%p %08Ix %Ix)\n", Segment, Address, Size); /* Go through the list of UCR descriptors, they are sorted from lowest address to the highest */ @@ -596,7 +596,7 @@ /* "Current" is the descriptor before which our one should go */ InsertTailList(Current, &UcrDescriptor->SegmentEntry); - DPRINT("Added segment UCR with base %p, size 0x%x\n", Address, Size); + DPRINT("Added segment UCR with base %08Ix, size 0x%x\n", Address, Size); /* Increase counters */ Segment->NumberOfUnCommittedRanges++; @@ -614,7 +614,7 @@ PHEAP_ENTRY FirstEntry, LastEntry; NTSTATUS Status; - DPRINT("RtlpFindAndCommitPages(%p %p %x %p)\n", Heap, Segment, *Size, Address); + DPRINT("RtlpFindAndCommitPages(%p %p %Ix %08Ix)\n", Heap, Segment, *Size, Address); /* Go through UCRs in a segment */ Current = Segment->UCRSegmentList.Flink; @@ -644,7 +644,7 @@ PAGE_READWRITE); } - DPRINT("Committed %d bytes at base %p, UCR size is %d\n", *Size, Address, UcrDescriptor->Size); + DPRINT("Committed %Iu bytes at base %08Ix, UCR size is %lu\n", *Size, Address, UcrDescriptor->Size); /* Fail in unsuccessful case */ if (!NT_SUCCESS(Status)) @@ -679,7 +679,7 @@ UcrDescriptor->Address = (PVOID)((ULONG_PTR)UcrDescriptor->Address + *Size); UcrDescriptor->Size -= *Size; - DPRINT("Updating UcrDescriptor %p, new Address %p, size %d\n", + DPRINT("Updating UcrDescriptor %p, new Address %p, size %lu\n", UcrDescriptor, UcrDescriptor->Address, UcrDescriptor->Size); /* Set various first entry fields */ @@ -1080,7 +1080,7 @@ { Segment = Heap->Segments[Index]; - if (Segment) DPRINT("Segment[%d] %p with NOUCP %x\n", Index, Segment, Segment->NumberOfUnCommittedPages); + if (Segment) DPRINT("Segment[%u] %p with NOUCP %x\n", Index, Segment, Segment->NumberOfUnCommittedPages); /* Check if its size suits us */ if (Segment && @@ -1162,7 +1162,7 @@ MEM_COMMIT, PAGE_READWRITE); - DPRINT("Committed %d bytes at base %p\n", CommitSize, Segment); + DPRINT("Committed %lu bytes at base %p\n", CommitSize, Segment); /* Initialize heap segment if commit was successful */ if (NT_SUCCESS(Status)) @@ -1479,7 +1479,7 @@ MEM_COMMIT, PAGE_READWRITE); - DPRINT("Committed %d bytes at base %p\n", CommitSize, CommittedAddress); + DPRINT("Committed %Iu bytes at base %p\n", CommitSize, CommittedAddress); if (!NT_SUCCESS(Status)) { @@ -3303,7 +3303,8 @@ if (CurrentEntry->SegmentOffset != SegmentOffset) { - DPRINT1("HEAP: Heap entry %p SegmentOffset is incorrect %x (should be %x)\n", CurrentEntry, SegmentOffset, CurrentEntry->SegmentOffset); + DPRINT1("HEAP: Heap entry %p SegmentOffset is incorrect %x (should be %x)\n", + CurrentEntry, SegmentOffset, CurrentEntry->SegmentOffset); return FALSE; } @@ -3317,7 +3318,8 @@ /* Check if it's not really the last one */ if (CurrentEntry != Segment->LastValidEntry) { - DPRINT1("HEAP: Heap entry %p is not last block in segment (%x)\n", CurrentEntry, Segment->LastValidEntry); + DPRINT1("HEAP: Heap entry %p is not last block in segment (%p)\n", + CurrentEntry, Segment->LastValidEntry); return FALSE; } } @@ -3439,24 +3441,24 @@ /* If there is an in-use entry in a free list - that's quite a big problem */ if (FreeEntry->Flags & HEAP_ENTRY_BUSY) { - DPRINT1("HEAP: %x-dedicated list free element %x is marked in-use\n", Size, FreeEntry); + DPRINT1("HEAP: %Ix-dedicated list free element %p is marked in-use\n", Size, FreeEntry); return FALSE; } /* Check sizes according to that specific list's size */ if ((Size == 0) && (FreeEntry->Size < HEAP_FREELISTS)) { - DPRINT1("HEAP: Non dedicated list free element %x has size %x which would fit a dedicated list\n", FreeEntry, FreeEntry->Size); + DPRINT1("HEAP: Non dedicated list free element %p has size %x which would fit a dedicated list\n", FreeEntry, FreeEntry->Size); return FALSE; } else if (Size && (FreeEntry->Size != Size)) { - DPRINT1("HEAP: %x-dedicated list free element %x has incorrect size %x\n", Size, FreeEntry, FreeEntry->Size); + DPRINT1("HEAP: %Ix-dedicated list free element %p has incorrect size %x\n", Size, FreeEntry, FreeEntry->Size); return FALSE; } else if ((Size == 0) && (FreeEntry->Size < PreviousSize)) { - DPRINT1("HEAP: Non dedicated list free element %x is not put in order\n", FreeEntry); + DPRINT1("HEAP: Non dedicated list free element %p is not put in order\n", FreeEntry); return FALSE; } @@ -3514,13 +3516,13 @@ if (FreeListEntriesCount != FreeBlocksCount) { - DPRINT1("HEAP: Free blocks count in arena (%d) does not match free blocks number in the free lists (%d)\n", FreeBlocksCount, FreeListEntriesCount); + DPRINT1("HEAP: Free blocks count in arena (%lu) does not match free blocks number in the free lists (%lu)\n", FreeBlocksCount, FreeListEntriesCount); return FALSE; } if (Heap->TotalFreeSize != TotalFreeSize) { - DPRINT1("HEAP: Total size of free blocks in arena (%d) does not equal to the one in heap header (%d)\n", TotalFreeSize, Heap->TotalFreeSize); + DPRINT1("HEAP: Total size of free blocks in arena (%Iu) does not equal to the one in heap header (%Iu)\n", TotalFreeSize, Heap->TotalFreeSize); return FALSE; } @@ -3562,7 +3564,7 @@ /* Check signature */ if (Heap->Signature != HEAP_SIGNATURE) { - DPRINT1("HEAP: Signature %x is invalid for heap %p\n", Heap->Signature, Heap); + DPRINT1("HEAP: Signature %lx is invalid for heap %p\n", Heap->Signature, Heap); return FALSE; } @@ -3810,11 +3812,11 @@ /* Pass user value */ if (UserValue) *UserValue = (PVOID)Extra->Settable; - - /* Decode and return user flags */ - if (UserFlags) - *UserFlags = (HeapEntry->Flags & HEAP_ENTRY_SETTABLE_FLAGS) << 4; - } + } + + /* Decode and return user flags */ + if (UserFlags) + *UserFlags = (HeapEntry->Flags & HEAP_ENTRY_SETTABLE_FLAGS) << 4; /* Release the heap lock if it was acquired */ if (HeapLocked) @@ -3900,53 +3902,59 @@ IN SIZE_T HeapInformationLength) { /* Setting heap information is not really supported except for enabling LFH */ - if (HeapInformationClass == 0) return STATUS_SUCCESS; - - /* Check buffer length */ - if (HeapInformationLength < sizeof(ULONG)) - { - /* The provided buffer is too small */ - return STATUS_BUFFER_TOO_SMALL; - } - - /* Check for a special magic value for enabling LFH */ - if (*(PULONG)HeapInformation == 2) - { + if (HeapInformationClass == HeapCompatibilityInformation) + { + /* Check buffer length */ + if (HeapInformationLength < sizeof(ULONG)) + { + /* The provided buffer is too small */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Check for a special magic value for enabling LFH */ + if (*(PULONG)HeapInformation != 2) + { + return STATUS_UNSUCCESSFUL; + } + DPRINT1("RtlSetHeapInformation() needs to enable LFH\n"); return STATUS_SUCCESS; } - return STATUS_UNSUCCESSFUL; + return STATUS_SUCCESS; } NTSTATUS NTAPI RtlQueryHeapInformation(HANDLE HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, - PVOID HeapInformation OPTIONAL, - SIZE_T HeapInformationLength OPTIONAL, + PVOID HeapInformation, + SIZE_T HeapInformationLength, PSIZE_T ReturnLength OPTIONAL) { PHEAP Heap = (PHEAP)HeapHandle; /* Only HeapCompatibilityInformation is supported */ - if (HeapInformationClass != HeapCompatibilityInformation) - return STATUS_UNSUCCESSFUL; - - /* Set result length */ - if (ReturnLength) *ReturnLength = sizeof(ULONG); - - /* Check buffer length */ - if (HeapInformationLength < sizeof(ULONG)) - { - /* It's too small, return needed length */ - return STATUS_BUFFER_TOO_SMALL; - } - - /* Return front end heap type */ - *(PULONG)HeapInformation = Heap->FrontEndHeapType; - - return STATUS_SUCCESS; + if (HeapInformationClass == HeapCompatibilityInformation) + { + /* Set result length */ + if (ReturnLength) + *ReturnLength = sizeof(ULONG); + + /* Check buffer length */ + if (HeapInformationLength < sizeof(ULONG)) + { + /* It's too small, return needed length */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Return front end heap type */ + *(PULONG)HeapInformation = Heap->FrontEndHeapType; + + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; } NTSTATUS

11 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2013