Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[akhaldi] 61991: [WIN32K] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 5 16:30:19 2014 New Revision: 61991 URL: http://svn.reactos.org/svn/reactos?rev=61991&view=rev Log: [WIN32K] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/gdi/eng/engevent.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/win32ss/gdi/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engevent.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engevent.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engevent.c [iso-8859-1] Wed Feb 5 16:30:19 2014 @@ -10,6 +10,9 @@ /* INCLUDES *******************************************************************/ #include <win32k.h> + +#include <ntddvdeo.h> + #define NDEBUG #include <debug.h> Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Wed Feb 5 16:30:19 2014 @@ -10,6 +10,14 @@ /** Includes ******************************************************************/ #include <win32k.h> + +#include FT_GLYPH_H +#include FT_TYPE1_TABLES_H +#include <freetype/tttables.h> +#include <freetype/fttrigon.h> +#include <freetype/ftbitmap.h> +#include <freetype/ftoutln.h> +#include <freetype/ftwinfnt.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=61991&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Wed Feb 5 16:30:19 2014 @@ -16,22 +16,17 @@ /* DDK/NDK/SDK headers */ #undef NTDDI_VERSION #define NTDDI_VERSION NTDDI_WS03SP1 -#include <ntddk.h> +#include <ntifs.h> #include <ntddmou.h> -#include <ntddvdeo.h> -#include <ntifs.h> -#include <tvout.h> #include <ndk/exfuncs.h> #include <ndk/kdfuncs.h> #include <ndk/kefuncs.h> -#include <ndk/lpcfuncs.h> #include <ndk/mmfuncs.h> #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> #include <ntstrsafe.h> #include <ntddkbd.h> -#include <bugcodes.h> /* Win32 headers */ /* FIXME: Defines in winbase.h that we need... */ @@ -61,20 +56,12 @@ #define _ENGINE_EXPORT_ #include <winddi.h> #include <winuser.h> -#include <windowsx.h> #include <prntfont.h> -#include <dde.h> -#include <wincon.h> -#include <winnls.h> #define _NOCSECT_TYPE #include <ddrawi.h> /* SEH support with PSEH */ #include <pseh/pseh2.h> - -/* CSRSS Header */ -#include <csr/csr.h> -#include <win/winmsg.h> /* Public Win32K headers */ #include <include/callback.h> @@ -87,20 +74,10 @@ /* Undocumented user definitions */ #include <undocuser.h> -#include <winlogon.h> /* Freetype headers */ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_GLYPH_H -#include FT_TYPE1_TABLES_H -#include <freetype/tttables.h> -#include <freetype/fttrigon.h> -#include <freetype/ftglyph.h> -#include <freetype/ftbitmap.h> -#include <freetype/ftoutln.h> -#include <freetype/ftwinfnt.h> -#include <freetype/freetype.h> /* Internal Win32K header */ #include "win32kp.h" Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Wed Feb 5 16:30:19 2014 @@ -7,6 +7,9 @@ */ #include <win32k.h> + +#include <windowsx.h> + DBG_DEFAULT_CHANNEL(UserDefwnd); // Client Shutdown messages Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Wed Feb 5 16:30:19 2014 @@ -9,6 +9,9 @@ */ #include <win32k.h> + +#include <winnls.h> + DBG_DEFAULT_CHANNEL(UserKbdLayout); PKL gspklBaseLayout = NULL; Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Wed Feb 5 16:30:19 2014 @@ -7,6 +7,9 @@ */ #include <win32k.h> + +#include <dde.h> + DBG_DEFAULT_CHANNEL(UserMsg); #define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE) Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Wed Feb 5 16:30:19 2014 @@ -7,6 +7,9 @@ */ #include <win32k.h> + +#include <winlogon.h> + DBG_DEFAULT_CHANNEL(UserMisc); /* registered Logon process */

10 years, 9 months

[akhaldi] 61990: [USERSRV] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 5 16:27:14 2014 New Revision: 61990 URL: http://svn.reactos.org/svn/reactos?rev=61990&view=rev Log: [USERSRV] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/user/winsrv/usersrv/api.h trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h Modified: trunk/reactos/win32ss/user/winsrv/usersrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/api.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/api.h [iso-8859-1] Wed Feb 5 16:27:14 2014 @@ -28,5 +28,3 @@ CSR_API(SrvEndTask); CSR_API(SrvLogon); CSR_API(SrvRecordShutdownReason); - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] Wed Feb 5 16:27:14 2014 @@ -11,10 +11,12 @@ #include "usersrv.h" +#include <ndk/mmfuncs.h> +#include <pseh/pseh2.h> +#include <strsafe.h> + #define NDEBUG #include <debug.h> - -#include <strsafe.h> #define IDTRYAGAIN 10 #define IDCONTINUE 11 Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Wed Feb 5 16:27:14 2014 @@ -10,6 +10,7 @@ /* INCLUDES *******************************************************************/ #include "usersrv.h" + #include "api.h" #define NDEBUG Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Wed Feb 5 16:27:14 2014 @@ -11,7 +11,14 @@ /* INCLUDES *******************************************************************/ #include "usersrv.h" + +#include <stdlib.h> +#include <winreg.h> +#include <winlogon.h> +#include <commctrl.h> #include <sddl.h> + +#include "resource.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h [iso-8859-1] Wed Feb 5 16:27:14 2014 @@ -9,23 +9,19 @@ #ifndef __USERSRV_H__ #define __USERSRV_H__ -#pragma once - /* PSDK/NDK Headers */ #include <stdarg.h> -#include <stdlib.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H + #include <windef.h> #include <winbase.h> #include <wingdi.h> -#include <winreg.h> #include <winuser.h> + #define NTOS_MODE_USER -#include <ndk/iofuncs.h> -#include <ndk/kefuncs.h> -#include <ndk/mmfuncs.h> #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> @@ -33,29 +29,15 @@ /* Public Win32K Headers */ #include <ntuser.h> -/* PSEH for SEH Support */ -#include <pseh/pseh2.h> - -/* External Winlogon Header */ -#include <winlogon.h> - /* CSRSS Header */ #include <csr/csrsrv.h> /* USER Headers */ #include <win/winmsg.h> -/* Public Win32 Headers */ -#include <commctrl.h> - -#include "resource.h" - - /* Globals */ extern HINSTANCE UserServerDllInstance; extern HANDLE UserServerHeap; extern ULONG_PTR LogonProcessId; -#endif // __USERSRV_H__ - -/* EOF */ +#endif /* __USERSRV_H__ */

10 years, 9 months

[dreimer] 61987: [INPUT] Widen the space for "Turn off advanced text services" GUI control in all language resource by Ştefan Fulea CORE-7849 #resolve #comment Committed in r61987. Thx for help.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Feb 4 23:15:47 2014 New Revision: 61987 URL: http://svn.reactos.org/svn/reactos?rev=61987&view=rev Log: [INPUT] Widen the space for "Turn off advanced text services" GUI control in all language resource by Ştefan Fulea CORE-7849 #resolve #comment Committed in r61987. Thx for help. Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/cs-CZ.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/el-GR.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/he-IL.rc trunk/reactos/dll/cpl/input/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/no-NO.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ro-RO.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/tr-TR.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/lang/zh-CN.rc Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -21,7 +21,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/cs-CZ.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -21,7 +21,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Konfiguration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Erweiterte &Textdienste deaktivieren", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Erweiterte &Textdienste deaktivieren", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "AuswÃ¤hlen, um die erweiterte SprachunterstÃ¼tzung in allen Programmen zu deaktivieren.\nNicht empfohlen fÃ¼r ostasiatische Benutzer, da die Sprachleiste hierdurch geschlossen wird.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -21,7 +21,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -21,7 +21,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -23,7 +23,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -21,7 +21,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Configuration du systÃ¨me", -1, 7, 7, 240, 70 - AUTOCHECKBOX "ArrÃªter les services de texte a&vancÃ©s", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "ArrÃªter les services de texte a&vancÃ©s", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "SÃ©lectionnez cette case Ã cocher pour dÃ©sactiver les services de texte avancÃ©s dans tous les programmes.\nCeci n'est pas recommandÃ© aux utilisateurs d'Asie de l'Est, car cette opÃ©ration ferme la Barre de langue.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/he-IL.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -23,7 +23,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "××××¨×ª ××¢×¨××ª", -1, 7, 7, 240, 70 - AUTOCHECKBOX "××× ×©××¨××ª× ××¡×§×¡ ××ª×§×××", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "××× ×©××¨××ª× ××¡×§×¡ ××ª×§×××", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -21,7 +21,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Configurazione di sistema", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Disabilita i servizi avanzati per il testo", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Disabilita i servizi avanzati per il testo", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Questa abilitazione toglie i servizi avanzati per il testo da tutti i programmi.\nSconsigliata agli utenti dell'Asia dell'est perchÃ¨ verrÃ disabilitata la barra delle lingue.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/no-NO.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -21,7 +21,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 END 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… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -29,7 +29,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Konfiguracja Systemu", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&WyÅÄcz zaawansowane usÅugi tekstowe", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&WyÅÄcz zaawansowane usÅugi tekstowe", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Zaznacz tÄ opcjÄ by wyÅÄczyÄ zaawansowane usÅugi tesktowe we wszystkich programach.\nNie jest to zalecane dla uÅ¼ytkownikÃ³w z Dalekiego Wschodu, jako Å¼e zamyka to pasek jÄzykÃ³w.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -23,7 +23,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ConfiguraÈie de sistem", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&DezactiveazÄ serviciile avansate de text", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&DezactiveazÄ serviciile avansate de text", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "SelectaÈi aceastÄ bifÄ pentru a dezactiva serviciile avansate de text Ã®n toate programele.\nAceasta nu se recomandÄ pentru utilizatorii de limbi est-asiatice, deoarece va duce la Ã®nchiderea barei de limbi.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -21,7 +21,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¡Ð¸ÑÑÐµÐ¼Ñ", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&ÐÑÐºÐ»ÑÑÐ¸ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ ÑÐµÐºÑÑÐ¾Ð²ÑÐµ ÑÐ»ÑÐ¶Ð±Ñ", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&ÐÑÐºÐ»ÑÑÐ¸ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ ÑÐµÐºÑÑÐ¾Ð²ÑÐµ ÑÐ»ÑÐ¶Ð±Ñ", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐµ ÑÑÐ¾Ñ ÑÐ»Ð°Ð¶Ð¾Ðº, ÑÑÐ¾Ð±Ñ Ð²ÑÐºÐ»ÑÑÐ¸ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ ÑÐµÐºÑÑÐ¾Ð²ÑÐµ ÑÐ»ÑÐ¶Ð±Ñ Ð²Ð¾ Ð²ÑÐµÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°Ñ.\nÐÑÐ¾ Ð½Ðµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ Ð´Ð»Ñ ÐÐ¾ÑÑÐ¾ÑÐ½Ð¾-Ð°Ð·Ð¸Ð°ÑÑÐºÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ ÑÑÐ¾ Ð·Ð°ÐºÑÑÐ²Ð°ÐµÑ ÑÐ·ÑÐºÐ¾Ð²ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/tr-TR.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -23,7 +23,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Dizge YapÄ±landÄ±rmasÄ±", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&GeliÅmiÅ Metin Hizmetlerini Kapat", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&GeliÅmiÅ Metin Hizmetlerini Kapat", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "TÃ¼m Ã§izeylemlerdeki geliÅmiÅ metin hizmetlerini kapatmak iÃ§in bu kutucuÄu seÃ§iniz.\nBu ayar, dil Ã§ubuÄunuu kapatacaÄÄ±ndan DoÄu Asya kulanÄ±cÄ±larÄ± iÃ§in Ã¶nerilmez.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -29,7 +29,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/input/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/zh-CN.rc [iso-8859-1] Tue Feb 4 23:15:47 2014 @@ -23,7 +23,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 END

10 years, 9 months

[dreimer] 61986: [CPL] Update Russian translate by Sergei Abramov #resolve #comment Committed in r61986. Thx for help. Btw, it might be that you forgot to send in the wined3dcfg translation?

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Feb 4 23:09:27 2014 New Revision: 61986 URL: http://svn.reactos.org/svn/reactos?rev=61986&view=rev Log: [CPL] Update Russian translate by Sergei Abramov #resolve #comment Committed in r61986. Thx for help. Btw, it might be that you forgot to send in the wined3dcfg translation? Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] Tue Feb 4 23:09:27 2014 @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -51,19 +51,19 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..." + IDS_INSTALLING "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ°..." + IDS_INVALID_SHA "ÐÑÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½ÑÑÐ¾Ð»ÑÐ½Ð¾Ð¹ ÑÑÐ¼Ð¼Ñ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°. ÐÑÐµÑÑÐ²Ð°Ð½Ð¸Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Gecko Installer" +CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÑÐ¸Ðº Wine Gecko" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS could not find a Wine Gecko package which is needed for applications embedding HTML to work correctly. ReactOS can automatically download and install it for you.", + CONTROL "ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ Wine Gecko Ð¿Ð°ÐºÐµÑ, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð´Ð»Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ¾Ð¹ HTML, ÑÑÐ¾Ð±Ñ ÑÐ°Ð±Ð¾ÑÐ°ÑÑ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾. ReactOS Ð¼Ð¾Ð¶ÐµÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð¸ ÑÑÑÐ°Ð½Ð°Ð²Ð¸ÑÑ ÐµÐµ Ð´Ð»Ñ Ð²Ð°Ñ.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc [iso-8859-1] Tue Feb 4 23:09:27 2014 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Russian resources for the Internet control panel applet * * Copyright 2011 Alexander Lakhin @@ -104,13 +104,13 @@ STRINGTABLE BEGIN - IDS_CPL_NAME "Internet Settings" - IDS_CPL_INFO "Configure Wine Internet Browser and related settings" - IDS_SEC_SETTINGS "Security settings for zone: " - IDS_SEC_LEVEL0 "Custom" - IDS_SEC_LEVEL1 "Very Low" - IDS_SEC_LEVEL2 "Low" - IDS_SEC_LEVEL3 "Medium" - IDS_SEC_LEVEL4 "Increased" - IDS_SEC_LEVEL5 "High" + IDS_CPL_NAME "ÐÐ½ÑÐµÑÐ½ÐµÑ-ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" + IDS_CPL_INFO "ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ Wine ÐÐ½ÑÐµÑÐ½ÐµÑ-ÐÑÐ°ÑÐ·ÐµÑ Ð¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸, ÑÐ²ÑÐ·Ð°Ð½Ð½ÑÐµ Ñ" + IDS_SEC_SETTINGS "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ ÑÑÐ¾Ð¹ Ð·Ð¾Ð½Ñ: " + IDS_SEC_LEVEL0 "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ðµ" + IDS_SEC_LEVEL1 "ÐÑÐµÐ½Ñ ÐÐ¸Ð·ÐºÐ°Ñ" + IDS_SEC_LEVEL2 "ÐÐ¸Ð·ÐºÐ°Ñ" + IDS_SEC_LEVEL3 "Ð¡ÑÐµÐ´Ð½ÑÑ" + IDS_SEC_LEVEL4 "Ð£Ð²ÐµÐ»Ð¸ÑÐµÐ½Ð½Ð°Ñ" + IDS_SEC_LEVEL5 "ÐÑÑÐ¾ÐºÐ°Ñ" END Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] Tue Feb 4 23:09:27 2014 @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -17,12 +17,12 @@ IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Advanced Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 - LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +CAPTION "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¡Ð¸ÑÑÐµÐ¼Ñ", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&ÐÑÐºÐ»ÑÑÐ¸ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ ÑÐµÐºÑÑÐ¾Ð²ÑÐµ ÑÐ»ÑÐ¶Ð±Ñ", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐµ ÑÑÐ¾Ñ ÑÐ»Ð°Ð¶Ð¾Ðº, ÑÑÐ¾Ð±Ñ Ð²ÑÐºÐ»ÑÑÐ¸ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ ÑÐµÐºÑÑÐ¾Ð²ÑÐµ ÑÐ»ÑÐ¶Ð±Ñ Ð²Ð¾ Ð²ÑÐµÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°Ñ.\nÐÑÐ¾ Ð½Ðµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ Ð´Ð»Ñ ÐÐ¾ÑÑÐ¾ÑÐ½Ð¾-Ð°Ð·Ð¸Ð°ÑÑÐºÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ ÑÑÐ¾ Ð·Ð°ÐºÑÑÐ²Ð°ÐµÑ ÑÐ·ÑÐºÐ¾Ð²ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ.", -1, 14, 40, 230, 35 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] Tue Feb 4 23:09:27 2014 @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -196,16 +196,16 @@ STRINGTABLE BEGIN - IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" - IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" - IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" - IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" - IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" - IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" - IDS_ERROR_INPUT_DLL "Unable to start input.dll" -END - + IDS_ERROR "ÐÑÐ¸Ð±ÐºÐ°" + IDS_ERROR_SYMBOL_SEPARATE "ÐÐ¾ÑÐ¾ÑÐºÐ¸Ð¹ ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÐ¾Ð² Ð´Ð°ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð¼Ð²Ð¾Ð»(Ñ)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "ÐÐ¾ÑÐ¾ÑÐºÐ¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð¼Ð²Ð¾Ð»(Ñ)" + IDS_ERROR_SYMBOL_FORMAT_LONG "ÐÐ»Ð¸Ð½Ð½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð¼Ð²Ð¾Ð»(Ñ)" + IDS_ERROR_OEM_CODE_PAGE "ÐÐ¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð¿ÑÐ¸ ÑÑÐµÐ½Ð¸Ð¸ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ OEM" + IDS_ERROR_ANSI_CODE_PAGE "ÐÐ¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð¿ÑÐ¸ ÑÑÐµÐ½Ð¸Ð¸ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ ANSI" + IDS_ERROR_INT_KEY_REG "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð¾ÑÐºÑÑÑÐ¸Ñ ÐºÐ»ÑÑÐ°: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð¾ÑÐºÑÑÑÐ¸Ñ ÐºÐ»ÑÑÐ°: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð¾ÑÐºÑÑÑÐ¸Ñ ÐºÐ»ÑÑÐ°: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð¾ÑÐºÑÑÑÐ¸Ñ ÐºÐ»ÑÑÐ°: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ input.dll" +END + Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] Tue Feb 4 23:09:27 2014 @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_VOLUME DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -170,7 +170,7 @@ LTEXT "ÐÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÑ Ð·Ð²ÑÐº Ð¿Ð¾ÐºÐ° ÑÐ»ÑÐ¶Ð±Ð° Ð·Ð²ÑÐºÐ° ReactOS Ð½Ðµ Ð²ÐºÐ»ÑÑÐµÐ½Ð°.", 10245, 60, 25, 150, 40 AUTOCHECKBOX "&ÐÐºÐ»ÑÑÐ¸ÑÑ ÐÐ²ÑÐº ReactOS", 10253, 60, 68, 150, 9 LTEXT "ÐÑÐ¸Ð¼ÐµÑÐ°Ð½Ð¸Ñ", 10246, 58, 87, 150, 9 - LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40 + LTEXT "1. ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼, ÑÑÐ¾Ð±Ñ Ð²ÐºÐ»ÑÑÐ¸ÑÑ ÑÑÑ ÑÐ»ÑÐ¶Ð±Ñ. ÐÑÐ»Ð¸ Ð²Ñ Ð½Ðµ Ð²Ð¾ÑÐ»Ð¸ Ð² ÑÐ¸ÑÑÐµÐ¼Ñ Ð² ÐºÐ°ÑÐµÑÑÐ²Ðµ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°, Ð²Ð°Ð¼ Ð±ÑÐ´ÐµÑ Ð¿ÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¾ Ð²Ð²ÐµÑÑÐ¸ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°.", 10247, 60, 100, 150, 40 LTEXT "2. ÐÐ¾ÑÐ»Ðµ ÑÐ¾Ð³Ð¾, ÐºÐ°Ðº Ð²Ñ Ð²ÐºÐ»ÑÑÐ¸ÑÐµ ÐÐ²ÑÐº ReactOS, Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ.", 10248, 60, 140, 150, 40 END @@ -223,9 +223,9 @@ BEGIN GROUPBOX "ÐÐ²ÑÐº ReactOS", 10259, 7, 5, 213, 192 ICON 4394, 10257, 25, 25, 20, 20 - LTEXT "The ReactOS Audio service is now enabled. However, audio may not function properly until you restart ReactOS. If you want to restart now, first save your work and close all programs.", 10261, 60, 25, 150, 50 + LTEXT "ReactOS ÑÐµÑÐ²Ð¸Ñ Audio Ð²ÐºÐ»ÑÑÐµÐ½. ÐÐ´Ð½Ð°ÐºÐ¾, Ð·Ð²ÑÐº Ð¼Ð¾Ð¶ÐµÑ Ð½Ðµ ÑÑÐ½ÐºÑÐ¸Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð´Ð¾Ð»Ð¶Ð½ÑÐ¼ Ð¾Ð±ÑÐ°Ð·Ð¾Ð¼, Ð¿Ð¾ÐºÐ° Ð²Ñ Ð½Ðµ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ReactOS. ÐÑÐ»Ð¸ Ð²Ñ ÑÐ¾ÑÐ¸ÑÐµ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ ÑÐµÐ¹ÑÐ°Ñ, ÑÐ½Ð°ÑÐ°Ð»Ð° ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ Ð¸ Ð·Ð°ÐºÑÐ¾Ð¹ÑÐµ Ð²ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ.", 10261, 60, 25, 150, 50 LTEXT "ÐÐ»Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ¸ ReactOS Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""OK"".", 10262, 60, 75, 150, 20 - LTEXT "If you Cancel, you will need to restart later for ReactOS Audio to function properly.", 10263, 60, 100, 150, 40 + LTEXT "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐÑÐ¼ÐµÐ½Ð°, ÑÑÐ¾Ð±Ñ Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÑÐ¸ÑÑ ReactOS Ð¿Ð¾Ð·Ð¶Ðµ.", 10263, 60, 100, 150, 40 END STRINGTABLE Modified: trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ru-R… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc [iso-8859-1] Tue Feb 4 23:09:27 2014 @@ -1,4 +1,4 @@ -/* Russian translation by Andrey Korotaev (unC0Rr(a)gmail.com) */ +ï»¿/* Russian translation by Andrey Korotaev (unC0Rr(a)gmail.com) */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -140,6 +140,6 @@ IDS_TIMEOUT14 "ÑÐµÑÐµÐ· 4 ÑÐ°ÑÐ°" IDS_TIMEOUT15 "ÑÐµÑÐµÐ· 5 ÑÐ°ÑÐ¾Ð²" IDS_TIMEOUT16 "Ð½Ð¸ÐºÐ¾Ð³Ð´Ð°" - IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" - IDS_DEL_SCHEME_TITLE "Delete Scheme" + IDS_DEL_SCHEME "ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐµÐ¼Ñ Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ?" + IDS_DEL_SCHEME_TITLE "Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¡ÑÐµÐ¼Ñ" END Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Tue Feb 4 23:09:27 2014 @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -62,7 +62,7 @@ IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "System Settings" +CAPTION "Ð¡Ð¸ÑÑÐµÐ¼Ð½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 @@ -100,15 +100,15 @@ IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Copy Profile" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 +CAPTION "ÐÐ¾Ð¿Ð¸Ñ ÐÑÐ¾ÑÐ¸Ð»Ñ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ð¸Ð·:", IDC_STATIC, 5, 10, 20, 8 LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 - LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + LTEXT "Ð²:", IDC_STATIC, 5, 30, 20, 8 EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 - DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 + DEFPUSHBUTTON "&ÐÐ", IDOK, 199, 9, 50, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 199, 30, 50, 14 END IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 @@ -270,10 +270,10 @@ IDS_USERPROFILE_TYPE "Ð¢Ð¸Ð¿" IDS_USERPROFILE_STATUS "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ" IDS_USERPROFILE_MODIFIED "ÐÐ·Ð¼ÐµÐ½ÐµÐ½" - IDS_MESSAGEBOXTITLE "System control panel applet" - IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." - IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." - IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_MESSAGEBOXTITLE "ÐÐ°Ð½ÐµÐ»Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ" + IDS_WARNINITIALSIZE "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÐ¸ÑÐ»Ð¾Ð²Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¸ÑÑÐ¾Ð´Ð½Ð¾Ð³Ð¾ ÑÐ°Ð·Ð¼ÐµÑÐ° ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸." + IDS_WARNMAXIMUMSIZE "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÐ¸ÑÐ»Ð¾Ð²Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸." + IDS_WARNINITIALRANGE "ÐÐ°ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð½Ðµ Ð¼ÐµÐ½ÑÑÐµ, ÑÐµÐ¼ 2 ÐÐ Ð¸ Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ° Ð½Ð° Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." + IDS_WARNMAXIMUMRANGE "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð½Ðµ Ð¼ÐµÐ½ÑÑÐµ, ÑÐµÐ¼ Ð½Ð°ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ° Ð½Ð° Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." IDS_DEVS "\nÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS\n\nÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÐ¾Ñ Ð¿ÑÐ¾ÐµÐºÑÐ°\n\nÐÐ»ÐµÐºÑÐµÐ¹ ÐÑÐ°Ð³Ð¸Ð½\n\nÐÐ¾Ð»Ð»ÐµÐºÑÐ¸Ð² ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¾Ð²\n\nÐÐ»ÐµÐºÑÐµÐ¹ ÐÑÐ°Ð³Ð¸Ð½\nÐÐ½Ð´ÑÑ ÐÑÐ¸Ð½Ð²ÑÐ´\nÐÐ½Ð´ÑÐµÐ¹ ÐÐ¾ÑÐ¾ÑÐ°ÐµÐ²\nÐÑÑ ÐÐµÑÐºÑ\nÐÑÐ¸ÑÑÐ¾Ñ ÑÐ¾Ð½ ÐÐ¸ÑÑÐ¸Ñ\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐÐ°Ð½Ð¸ÑÐ»Ñ Ð Ð°Ð¹Ð¼ÐµÑ\nÐÐ¼Ð¸ÑÑÐ¸Ð¹ Ð§Ð°Ð¿ÑÑÐµÐ²\nÐÑÐ¸Ðº ÐÐ¾Ð»Ñ\nÐÐµÐ´ ÐÑÑÑÐ¸\nÐÑÐµÐ³Ð¾Ñ ÐÑÑÐ½Ð¼Ð°Ñ\nÐÑÐ²Ðµ ÐÐ¾ÑÑÐ¸Ð½Ð¾\nÐÐ¶ÐµÐ¹Ð¼Ñ Ð¢ÑÐ±Ð¾Ñ\nÐÐ¶ÐµÑÑÑÐ¸ ÐÐ¾ÑÐ»Ð°Ð½\nÐÐ¾ÑÐ°Ð½Ð½ÐµÑ ÐÐ½Ð´ÐµÑÐ²Ð°Ð»ÑÐ´\nKJK::ÐÐ¸Ð¿ÐµÑÐ¸Ð¾Ð½\nÐÐ°Ð°ÑÑÐµÐ½ ÐÐ¾ÑÐ¼Ð°\nÐÐ°Ð³Ð½ÑÑ ÐÐ»ÑÐµÐ½\nÐÐ°ÑÐº ÐÐ¸ÑÐ»Ð°ÑÑ\nÐÐ°ÑÑÐ¸Ð°Ñ ÐÑÐ¿ÑÐµÑ\nÐÐ°Ð¹Ðº ÐÐ¾ÑÐ´ÐµÐ»Ð»\nÐÐ¸ÑÐµÑ ÐÐ°ÑÐ´\nÐÑÐµÑ Ð¨Ð²ÐµÐ¹ÑÐµÑ\nÐ¡Ð°Ð²ÐµÐ»Ð¸Ð¹ Ð¢ÑÐµÑÑÑÐºÐ¾Ð²\nÐ¡ÑÐµÑÐ°Ð½ ÐÐ¸Ð½ÑÐ±ÐµÑÐ³\nÐ¡Ð¸Ð»ÑÐ²ÐµÐ¹Ð½ ÐÐµÑÑÐµÐ¾Ð»Ñ\nÐ¢Ð¾Ð¼Ð°Ñ ÐÐ»ÑÐ¼ÐµÐ»Ñ\nÐ¢Ð¸Ð¼Ð¾ ÐÑÐ¾Ð¹ÑÐµÑ\n\nÐÐ»ÐµÐºÑ ÐÐ¾Ð½ÐµÑÐºÑ\nÐ¤Ð¸Ð»Ð¸Ð¿ ÐÐ°Ð²Ð°ÑÐ°\nÐÑÐ½Ð½Ð°Ñ ÐÐ°Ð»ÑÐ½ÐµÑ\nÐÐ°ÑÑÐ¸Ð½ Ð¤ÑÐºÑ\nÐ Ð¾Ð¹Ñ ÐÐ¸ÑÑÐµÐ»Ð» III\nÐÑÑÐ½Ð´Ð¾Ð½ Ð¢ÑÑÐ½ÐµÑ\nÐÑÐ°Ð¹Ð°Ð½ ÐÐ°Ð»Ð¼ÐµÑ\nÐÐ°ÑÐ¿ÐµÑ Ð¥Ð¾ÑÐ½ÑÑÑÑÐ¿\nÐÑÐ²Ð¸Ð´ ÐÐµÐ»Ñ\nÐÐ¼Ð°Ð½ÑÑÐ»Ñ ÐÐ»Ð¸Ð±ÐµÑÑÐ¸\nÐÐµ Ð²Ð°Ð½ ÐÐµÐ»ÑÐ´Ð¾ÑÐ¿\nÐÑÐµÐ³Ð¾Ñ ÐÐ½Ð¸Ñ\nÐÐ¶ÐµÐ¹ÑÐ¾Ð½ Ð¤Ð¸Ð»Ð±Ð¸\nÐÐµÐ½Ñ ÐÐ¾Ð»Ð»Ð¸Ð½\nÐÐ¸ÑÐ°ÑÐ»Ñ ÐÐ¸ÑÑ\nÐÐ°ÑÐ°Ð½ ÐÑÐ´Ñ\nÐ Ð¾Ð±ÐµÑÑ ÐÐ¸ÐºÐµÐ½ÑÐ¾Ð½\nÐ ÐµÐºÑ ÐÐ¶Ð¾Ð»Ð»Ð¸ÑÑ\nVizzini\n\nÐ ÐµÐ»Ð¸Ð·-Ð¸Ð½Ð¶ÐµÐ½ÐµÑÑ\n\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¦Ð·ÑÐ»ÑÐ½ ÐÑÐ¾\n\nÐ Ð°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ° Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ°\n\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¯Ð½ ÐÐ»ÑÐ¼ÐºÐ²Ð¸ÑÑ ÐÐ¸Ð½Ð°Ð½Ð´ÐµÑ\nÐÐ»ÐµÐ¼ÐµÐ½Ñ Ð¤ÑÐ¸Ð´Ð»\nÐ¦Ð·ÑÐ»ÑÐ½ ÐÑÐ¾\n\nÐÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ Ð´Ð¸Ð·Ð°Ð¹Ð½\n\nMindflyer\nWierd_W\n\nÐÐ»Ð°Ð³Ð¾Ð´Ð°ÑÐ½Ð¾ÑÑÐ¸\n\nÐ²ÑÐµÐ¼ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ°Ð¼ Ð¿ÑÐ¾ÐµÐºÑÐ°\nÐÐ¾Ð¼Ð°Ð½Ð´Ðµ Wine\n\n" END Modified: trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc [iso-8859-1] Tue Feb 4 23:09:27 2014 @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* * Attention Translators: @@ -14,11 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE - PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 - PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 - PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 - AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED - PUSHBUTTON "Reset Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED + PUSHBUTTON "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Ð¡Ð²Ð¾Ð¸ÑÑÐ²Ð°", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Ð¢ÑÐµÐ±ÑÐµÑÑÑ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿ÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ ÑÐ¸ÑÑÐµÐ¼Ñ.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Ð¡Ð±ÑÐ¾ÑÐ¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED END IDD_GROUPS DIALOGEX 0, 0, 252, 223 @@ -28,9 +28,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE - PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 - PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 - PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 + PUSHBUTTON "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Ð¡Ð²Ð¾Ð¸ÑÑÐ²Ð°", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END IDD_EXTRA DIALOGEX 0, 0, 252, 223

10 years, 9 months

[akhaldi] 61985: [CONSRV] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 4 19:54:42 2014 New Revision: 61985 URL: http://svn.reactos.org/svn/reactos?rev=61985&view=rev Log: [CONSRV] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.c trunk/reactos/win32ss/user/winsrv/consrv/alias.h trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.h trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/console.h trunk/reactos/win32ss/user/winsrv/consrv/consrv.h trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/handle.h trunk/reactos/win32ss/user/winsrv/consrv/heap.h trunk/reactos/win32ss/user/winsrv/consrv/init.c trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h trunk/reactos/win32ss/user/winsrv/consrv/procinit.h trunk/reactos/win32ss/user/winsrv/consrv/resource.h trunk/reactos/win32ss/user/winsrv/consrv/settings.c trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -10,12 +10,9 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" -#include "console.h" -#include "include/conio.h" #define NDEBUG #include <debug.h> - /* TYPES **********************************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/alias.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/alias.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -10,5 +10,3 @@ #pragma once VOID IntDeleteAllAliases(PCONSOLE Console); - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -9,15 +9,10 @@ /* INCLUDES *******************************************************************/ -#include "consrv.h" -#include "include/conio.h" -#include "include/term.h" -#include "handle.h" -#include "lineinput.h" +#include <consrv.h> #define NDEBUG #include <debug.h> - /* GLOBALS ********************************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -9,16 +9,10 @@ /* INCLUDES *******************************************************************/ -#include "consrv.h" -#include "console.h" -#include "include/conio.h" -#include "include/term.h" -#include "conoutput.h" -#include "handle.h" +#include <consrv.h> #define NDEBUG #include <debug.h> - /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -10,20 +10,10 @@ /* INCLUDES *******************************************************************/ -#include "consrv.h" -#include "include/conio.h" -#include "include/term.h" -#include "handle.h" -#include "procinit.h" -#include "alias.h" -#include "coninput.h" -#include "conoutput.h" -#include "lineinput.h" -#include "include/settings.h" - -#include "include/console.h" -#include "console.h" -#include "resource.h" +#include <consrv.h> + +#include <alias.h> +#include <coninput.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -9,9 +9,7 @@ /* INCLUDES *******************************************************************/ -#include "consrv.h" -#include "include/conio.h" - +#include <consrv.h> /* DUMMY FRONTEND INTERFACE ***************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -11,15 +11,10 @@ /* INCLUDES *******************************************************************/ -#include "consrv.h" -#include "include/conio.h" -#include "include/term.h" -#include "conoutput.h" -#include "handle.h" +#include <consrv.h> #define NDEBUG #include <debug.h> - /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -9,20 +9,14 @@ /* INCLUDES *******************************************************************/ -#include "consrv.h" -#include "include/conio.h" -#include "include/term.h" -#include "conoutput.h" -#include "handle.h" +#include <consrv.h> #define NDEBUG #include <debug.h> - /* GLOBALS ********************************************************************/ #define TAB_WIDTH 8 - /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -10,14 +10,9 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" -#include "include/conio.h" -#include "include/term.h" -#include "handle.h" -#include "lineinput.h" #define NDEBUG #include <debug.h> - /* GLOBALS ********************************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/coninput.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/coninput.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -19,5 +19,3 @@ IN WCHAR UnicodeChar, IN ULONG ShiftState, IN BYTE KeyStateCtrl); - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -10,18 +10,9 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" -#include "console.h" -#include "include/conio.h" -#include "include/term.h" -#include "conoutput.h" -#include "handle.h" #define NDEBUG #include <debug.h> - - -/* PRIVATE FUNCTIONS **********************************************************/ - /* PUBLIC SERVER APIS *********************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -11,28 +11,17 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" -#include "include/conio.h" -#include "include/term.h" -#include "handle.h" + +#include <ndk/psfuncs.h> + #include "procinit.h" -#include "alias.h" -#include "coninput.h" -#include "conoutput.h" -#include "lineinput.h" -#include "include/settings.h" - -#include "frontends/gui/guiterm.h" + #ifdef TUITERM_COMPILE #include "frontends/tui/tuiterm.h" #endif -#include "include/console.h" -#include "console.h" -#include "resource.h" - #define NDEBUG #include <debug.h> - /* GLOBALS ********************************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -23,5 +23,3 @@ BOOL LockConsole); VOID FASTCALL ConSrvReleaseConsole(struct _CONSOLE* /* PCONSOLE */ Console, BOOL WasConsoleLocked); - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -9,8 +9,6 @@ #ifndef __CONSRV_H__ #define __CONSRV_H__ -#pragma once - /* PSDK/NDK Headers */ #include <stdarg.h> #define WIN32_NO_STATUS @@ -18,18 +16,14 @@ #define COM_NO_WINDOWS_H #include <windef.h> #include <winbase.h> -#include <wingdi.h> #include <winnls.h> #include <winreg.h> #include <wincon.h> #include <winuser.h> #define NTOS_MODE_USER #include <ndk/exfuncs.h> -#include <ndk/iofuncs.h> #include <ndk/mmfuncs.h> #include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/setypes.h> #include <ndk/rtlfuncs.h> /* Public Win32K Headers */ @@ -42,9 +36,7 @@ #include <csr/csrsrv.h> /* CONSOLE Headers */ -#include <win/console.h> #include <win/conmsg.h> - /* Heap Helpers */ #include "heap.h" @@ -74,6 +66,14 @@ LPTHREAD_START_ROUTINE PropDispatcher; // We hold the property dialog handler there, till all the GUI thingie moves out from CSRSS. } CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA; -#endif // __CONSRV_H__ +#include "include/conio.h" +#include "console.h" +#include "conoutput.h" +#include "handle.h" +#include "lineinput.h" +#include "frontends/gui/guisettings.h" +#include "include/console.h" +#include "include/settings.h" +#include "include/term.h" -/* EOF */ +#endif /* __CONSRV_H__ */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -9,18 +9,9 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" -#include "include/conio.h" -#include "include/term.h" -#include "conoutput.h" -#include "console.h" -#include "handle.h" #define NDEBUG #include <debug.h> - - -/* PRIVATE FUNCTIONS **********************************************************/ - /* PUBLIC SERVER APIS *********************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -8,7 +8,6 @@ #pragma once -#include "include/settings.h" +#include <include/settings.h> + #include "guisettings.h" - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -8,15 +8,10 @@ /* INCLUDES *******************************************************************/ -#include "consrv.h" -#include "include/conio.h" -#include "include/console.h" -#include "include/settings.h" -#include "guisettings.h" +#include <consrv.h> #define NDEBUG #include <debug.h> - /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -8,14 +8,10 @@ /* INCLUDES *******************************************************************/ -#include "consrv.h" -#include "include/conio.h" -#include "include/settings.h" -#include "guisettings.h" +#include <consrv.h> #define NDEBUG #include <debug.h> - /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -9,14 +9,10 @@ /* INCLUDES *******************************************************************/ -#include "consrv.h" -#include "include/conio.h" -#include "include/settings.h" -#include "guisettings.h" +#include <consrv.h> #define NDEBUG #include <debug.h> - VOID GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData); VOID SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -11,24 +11,17 @@ /* INCLUDES *******************************************************************/ +#include <consrv.h> + +#include <windowsx.h> #define COBJMACROS - -#include "consrv.h" -#include "include/conio.h" -#include "include/console.h" -#include "include/settings.h" -#include "conoutput.h" -#include "guiterm.h" -#include "guisettings.h" -#include "resource.h" - -#include <windowsx.h> - -#include <shlwapi.h> #include <shlobj.h> #define NDEBUG #include <debug.h> + +#include "guiterm.h" +#include "resource.h" /* GUI Console Window Class name */ #define GUI_CONSOLE_WINDOW_CLASS L"ConsoleWindowClass" Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -24,5 +24,3 @@ DWORD ProcessId, LPCWSTR IconPath, INT IconIndex); - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -11,14 +11,10 @@ /* INCLUDES *******************************************************************/ -#include "consrv.h" -#include "include/conio.h" -#include "include/settings.h" -#include "guisettings.h" +#include <consrv.h> #define NDEBUG #include <debug.h> - /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -11,16 +11,11 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" -#include "include/conio.h" -#include "include/term.h" -#include "handle.h" -#include "include/console.h" -#include "console.h" -#include "conoutput.h" + +#include <win/console.h> #define NDEBUG #include <debug.h> - /* GLOBALS ********************************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -30,5 +30,3 @@ CONSOLE_IO_OBJECT_TYPE Type); VOID FASTCALL ConSrvReleaseObject(PCONSOLE_IO_OBJECT Object, BOOL IsConsoleLocked); - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/heap.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/heap.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -13,5 +13,3 @@ #define ConsoleAllocHeap(Flags, Size) RtlAllocateHeap(ConSrvHeap, Flags, Size) #define ConsoleFreeHeap(HeapBase) RtlFreeHeap(ConSrvHeap, 0, HeapBase) - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -9,11 +9,9 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" + #include "api.h" #include "procinit.h" -#include "include/conio.h" -#include "include/console.h" -#include "console.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -11,9 +11,6 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" -#include "console.h" -#include "include/conio.h" -#include "include/term.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -10,5 +10,3 @@ VOID FASTCALL HistoryDeleteBuffers(PCONSOLE Console); VOID FASTCALL LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent); - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/procinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/procinit.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/procinit.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -20,5 +20,3 @@ PHANDLE pOutputHandle, PHANDLE pErrorHandle); VOID FASTCALL ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData); - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/resource.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/resource.h [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -8,5 +8,3 @@ #pragma once #define IDS_CONSOLE_TITLE 500 - -/* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -10,15 +10,11 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" -#include "include/conio.h" -#include "include/term.h" -#include "include/settings.h" #include <stdio.h> // for swprintf #define NDEBUG #include <debug.h> - /* GLOBALS ********************************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] Tue Feb 4 19:54:42 2014 @@ -12,7 +12,6 @@ #define NDEBUG #include <debug.h> - /* PUBLIC SERVER APIS *********************************************************/

10 years, 9 months

[akhaldi] 61984: [USER32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 4 19:40:45 2014 New Revision: 61984 URL: http://svn.reactos.org/svn/reactos?rev=61984&view=rev Log: [USER32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h trunk/reactos/win32ss/user/user32/include/regcontrol.h trunk/reactos/win32ss/user/user32/include/user32.h trunk/reactos/win32ss/user/user32/include/user_x.h trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/misc/imm.c trunk/reactos/win32ss/user/user32/windows/input.c Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] Tue Feb 4 19:40:45 2014 @@ -1,3 +1,5 @@ +#pragma once + #if defined(__GNUC__) #define EXTINLINE extern inline __attribute__((always_inline)) #elif defined(_MSC_VER) Modified: trunk/reactos/win32ss/user/user32/include/regcontrol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/regcontrol.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/regcontrol.h [iso-8859-1] Tue Feb 4 19:40:45 2014 @@ -7,6 +7,7 @@ * REVISION HISTORY: 2003/06/16 GvG Created * NOTES: */ + #pragma once /* Built-in class descriptor */ Modified: trunk/reactos/win32ss/user/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32.h [iso-8859-1] Tue Feb 4 19:40:45 2014 @@ -9,9 +9,7 @@ /* INCLUDES ******************************************************************/ /* C Headers */ -#include <assert.h> #include <stdio.h> -#include <math.h> /* SDK/NDK Headers */ #define _USER32_ @@ -22,7 +20,6 @@ #define COM_NO_WINDOWS_H #include <windef.h> #include <winbase.h> -#include <wincon.h> #include <wingdi.h> #include <winreg.h> #include <winuser.h> @@ -30,13 +27,9 @@ #include <ddeml.h> #include <dde.h> #include <windowsx.h> -#include <winnls32.h> -#include <strsafe.h> -#include <ndk/cmfuncs.h> #include <ndk/kefuncs.h> #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> -#include <ndk/umfuncs.h> /* CSRSS Header */ #include <csr/csr.h> Modified: trunk/reactos/win32ss/user/user32/include/user_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user_x.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user_x.h [iso-8859-1] Tue Feb 4 19:40:45 2014 @@ -1,3 +1,4 @@ +#pragma once static __inline PVOID SharedPtrToUser(PVOID Ptr) Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Tue Feb 4 19:40:45 2014 @@ -1,4 +1,6 @@ #include <user32.h> + +#include <ndk/cmfuncs.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); Modified: trunk/reactos/win32ss/user/user32/misc/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/i… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/imm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/imm.c [iso-8859-1] Tue Feb 4 19:40:45 2014 @@ -9,6 +9,8 @@ */ #include <user32.h> + +#include <winnls32.h> #include <wine/debug.h> Modified: trunk/reactos/win32ss/user/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/input.c [iso-8859-1] Tue Feb 4 19:40:45 2014 @@ -28,6 +28,8 @@ /* INCLUDES ******************************************************************/ #include <user32.h> + +#include <strsafe.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32);

10 years, 9 months

[akhaldi] 61983: [GDI32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 4 17:23:25 2014 New Revision: 61983 URL: http://svn.reactos.org/svn/reactos?rev=61983&view=rev Log: [GDI32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/include/precomp.h trunk/reactos/win32ss/gdi/gdi32/misc/gdientry.c Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Tue Feb 4 17:23:25 2014 @@ -6,6 +6,7 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ +#pragma once /* DATA **********************************************************************/ Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] Tue Feb 4 17:23:25 2014 @@ -14,7 +14,7 @@ #define COM_NO_WINDOWS_H #define NTOS_MODE_USER -#include <stdio.h> +#include <stdarg.h> /* SDK/DDK/NDK Headers. */ #include <windef.h> @@ -25,18 +25,12 @@ #include <wingdi.h> #define _ENGINE_EXPORT_ #include <winddi.h> -#include <d3dnthal.h> #include <prntfont.h> #include <winddiui.h> #include <winspool.h> -#include <pseh/pseh2.h> - -#include <ddraw.h> #include <ddrawi.h> -#include <ddrawint.h> #include <ddrawgdi.h> -#include <d3dhal.h> /* Public Win32K Headers */ #include <ntgdityp.h> Modified: trunk/reactos/win32ss/gdi/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/gdi… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/misc/gdientry.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/misc/gdientry.c [iso-8859-1] Tue Feb 4 17:23:25 2014 @@ -10,6 +10,9 @@ /* INCLUDES ******************************************************************/ #include <precomp.h> + +#include <stdio.h> +#include <d3dhal.h> /* DATA **********************************************************************/

10 years, 9 months

[akhaldi] 61982: [VIDEOPRT] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Improve the GUIDs situation. * Im...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 4 17:15:06 2014 New Revision: 61982 URL: http://svn.reactos.org/svn/reactos?rev=61982&view=rev Log: [VIDEOPRT] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Improve the GUIDs situation. * Improve header inclusions. CORE-7716 Added: trunk/reactos/win32ss/drivers/videoprt/guid.c (with props) Modified: trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt trunk/reactos/win32ss/drivers/videoprt/agp.c trunk/reactos/win32ss/drivers/videoprt/child.c trunk/reactos/win32ss/drivers/videoprt/ddc.c trunk/reactos/win32ss/drivers/videoprt/dispatch.c trunk/reactos/win32ss/drivers/videoprt/dma.c trunk/reactos/win32ss/drivers/videoprt/event.c trunk/reactos/win32ss/drivers/videoprt/funclist.c trunk/reactos/win32ss/drivers/videoprt/int10.c trunk/reactos/win32ss/drivers/videoprt/interrupt.c trunk/reactos/win32ss/drivers/videoprt/registry.c trunk/reactos/win32ss/drivers/videoprt/resource.c trunk/reactos/win32ss/drivers/videoprt/services.c trunk/reactos/win32ss/drivers/videoprt/spinlock.c trunk/reactos/win32ss/drivers/videoprt/stubs.c trunk/reactos/win32ss/drivers/videoprt/timer.c trunk/reactos/win32ss/drivers/videoprt/videoprt.c trunk/reactos/win32ss/drivers/videoprt/videoprt.h Modified: trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/C… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -22,6 +22,7 @@ stubs.c timer.c videoprt.c + guid.c videoprt.rc ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def) Modified: trunk/reactos/win32ss/drivers/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/a… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/agp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/agp.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -21,6 +21,9 @@ #include "videoprt.h" +#define NDEBUG +#include <debug.h> + /* PRIVATE FUNCTIONS **********************************************************/ NTSTATUS @@ -566,4 +569,3 @@ return STATUS_SUCCESS; } - Modified: trunk/reactos/win32ss/drivers/videoprt/child.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/c… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/child.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/child.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */ #include "videoprt.h" + +#define NDEBUG +#include <debug.h> /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/win32ss/drivers/videoprt/ddc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/ddc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/ddc.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */ #include "videoprt.h" + +#define NDEBUG +#include <debug.h> #define DDC_EEPROM_ADDRESS 0xA0 @@ -222,4 +225,3 @@ INFO_(VIDEOPRT, "VideoPortDDCMonitorHelper() - SUCCESS!\n"); return TRUE; } - Modified: trunk/reactos/win32ss/drivers/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,12 @@ */ #include "videoprt.h" + +#include <ndk/inbvfuncs.h> +#include <ndk/psfuncs.h> + +#define NDEBUG +#include <debug.h> /* GLOBAL VARIABLES ***********************************************************/ Modified: trunk/reactos/win32ss/drivers/videoprt/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dma.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dma.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include <videoprt.h> + #define NDEBUG #include <debug.h> Modified: trunk/reactos/win32ss/drivers/videoprt/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/e… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/event.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -10,6 +10,9 @@ #include "videoprt.h" #include "../../gdi/eng/engevent.h" + +#define NDEBUG +#include <debug.h> /* PUBLIC FUNCTIONS ***********************************************************/ @@ -137,4 +140,3 @@ } /* EOF */ - Modified: trunk/reactos/win32ss/drivers/videoprt/funclist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/f… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/funclist.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/funclist.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -19,8 +19,10 @@ * */ +#include "videoprt.h" -#include "videoprt.h" +#define NDEBUG +#include <debug.h> typedef struct _VIDEO_PORT_FUNCTION_TABLE { PVOID Address; Added: trunk/reactos/win32ss/drivers/videoprt/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/g… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/guid.c (added) +++ trunk/reactos/win32ss/drivers/videoprt/guid.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -0,0 +1,6 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <initguid.h> +#include <wdmguid.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/win32ss/drivers/videoprt/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/drivers/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/i… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,11 @@ */ #include "videoprt.h" + +#include <ndk/kefuncs.h> + +#define NDEBUG +#include <debug.h> /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/win32ss/drivers/videoprt/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/i… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/interrupt.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,11 @@ */ #include "videoprt.h" + +#include <ndk/halfuncs.h> + +#define NDEBUG +#include <debug.h> /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/win32ss/drivers/videoprt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/r… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -21,6 +21,11 @@ #include "videoprt.h" +#include <ndk/obfuncs.h> + +#define NDEBUG +#include <debug.h> + NTSTATUS NTAPI IntCopyRegistryKey( @@ -633,4 +638,3 @@ return STATUS_SUCCESS; } - Modified: trunk/reactos/win32ss/drivers/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/r… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/resource.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */ #include "videoprt.h" + +#define NDEBUG +#include <debug.h> /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/win32ss/drivers/videoprt/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/s… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/services.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/services.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */ #include "videoprt.h" + +#define NDEBUG +#include <debug.h> VOID NTAPI IntInterfaceReference(PVOID Context) Modified: trunk/reactos/win32ss/drivers/videoprt/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/s… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/spinlock.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */ #include "videoprt.h" + +#define NDEBUG +#include <debug.h> /* * @implemented Modified: trunk/reactos/win32ss/drivers/videoprt/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/s… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/stubs.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -19,8 +19,10 @@ * */ - #include "videoprt.h" + +#define NDEBUG +#include <debug.h> VP_STATUS NTAPI Modified: trunk/reactos/win32ss/drivers/videoprt/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/t… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/timer.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */ #include "videoprt.h" + +#define NDEBUG +#include <debug.h> /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -19,8 +19,14 @@ * */ - #include "videoprt.h" + +#include <stdio.h> +#include <ndk/exfuncs.h> +#include <ndk/rtlfuncs.h> + +#define NDEBUG +#include <debug.h> /* GLOBAL VARIABLES ***********************************************************/ @@ -1473,4 +1479,3 @@ return FALSE; } - Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -22,16 +22,7 @@ #ifndef VIDEOPRT_H #define VIDEOPRT_H -#include <stdio.h> - #include <ntifs.h> -#include <ndk/exfuncs.h> -#include <ndk/halfuncs.h> -#include <ndk/inbvfuncs.h> -#include <ndk/kefuncs.h> -#include <ndk/rtlfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> #define __BROKEN__ #include <miniport.h> @@ -39,10 +30,7 @@ #include <ntagp.h> #include <dderror.h> #include <windef.h> -#include <initguid.h> #include <wdmguid.h> - -#include <debug.h> #define TAG_VIDEO_PORT 'PDIV' #define TAG_VIDEO_PORT_BUFFER '\0mpV'

10 years, 9 months

[akhaldi] 61981: [VGA] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 4 17:01:57 2014 New Revision: 61981 URL: http://svn.reactos.org/svn/reactos?rev=61981&view=rev Log: [VGA] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h [iso-8859-1] Tue Feb 4 17:01:57 2014 @@ -6,6 +6,7 @@ * PROGRAMMERS: Copyright (c) 1992 Microsoft Corporation */ +#pragma once //-------------------------------------------------------------------------- // Definition of the set/clear mode command language. Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] Tue Feb 4 17:01:57 2014 @@ -896,4 +896,3 @@ VgaInterpretCmdStream(HwDeviceExtension, DisableA000Color); } - Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h [iso-8859-1] Tue Feb 4 17:01:57 2014 @@ -6,6 +6,7 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ +#pragma once #define LOWORD(l) ((USHORT)((ULONG_PTR)(l))) #define HIWORD(l) ((USHORT)(((ULONG_PTR)(l)>>16)&0xFFFF)) Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] Tue Feb 4 17:01:57 2014 @@ -10,6 +10,8 @@ //--------------------------------------------------------------------------- #include "vga.h" + +#include <devioctl.h> //--------------------------------------------------------------------------- // Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h [iso-8859-1] Tue Feb 4 17:01:57 2014 @@ -7,12 +7,11 @@ * ReactOS Portable Systems Group */ -#include "ntdef.h" -#include "dderror.h" -#include "devioctl.h" -#include "miniport.h" -#include "ntddvdeo.h" -#include "video.h" +#include <ntdef.h> +#include <dderror.h> +#include <miniport.h> +#include <video.h> + #include "cmdcnst.h" //

10 years, 9 months

[akhaldi] 61980: [VGAMP] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 4 16:46:41 2014 New Revision: 61980 URL: http://svn.reactos.org/svn/reactos?rev=61980&view=rev Log: [VGAMP] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/win32ss/drivers/miniport/vga/initvga.c trunk/reactos/win32ss/drivers/miniport/vga/vgamp.c trunk/reactos/win32ss/drivers/miniport/vga/vgamp.h trunk/reactos/win32ss/drivers/miniport/vga/vgavideo.h Modified: trunk/reactos/win32ss/drivers/miniport/vga/initvga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/initvga.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/initvga.c [iso-8859-1] Tue Feb 4 16:46:41 2014 @@ -1,4 +1,6 @@ #include "vgamp.h" + +#include "vgavideo.h" static VGA_REGISTERS Mode12Regs = { Modified: trunk/reactos/win32ss/drivers/miniport/vga/vgamp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/vgamp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/vgamp.c [iso-8859-1] Tue Feb 4 16:46:41 2014 @@ -6,6 +6,9 @@ // ------------------------------------------------------- Includes #include "vgamp.h" + +#include <dderror.h> +#include <devioctl.h> // ------------------------------------------------------- Public Interface Modified: trunk/reactos/win32ss/drivers/miniport/vga/vgamp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/vgamp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/vgamp.h [iso-8859-1] Tue Feb 4 16:46:41 2014 @@ -23,13 +23,9 @@ /* INCLUDES *******************************************************************/ -#include "ntdef.h" -#include "dderror.h" -#include "devioctl.h" -#include "miniport.h" -#include "ntddvdeo.h" -#include "video.h" -#include "vgavideo.h" +#include <ntdef.h> +#include <miniport.h> +#include <video.h> #define UNIMPLEMENTED \ VideoPortDebugPrint(Error, "WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); Modified: trunk/reactos/win32ss/drivers/miniport/vga/vgavideo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/vgavideo.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/vgavideo.h [iso-8859-1] Tue Feb 4 16:46:41 2014 @@ -1,3 +1,4 @@ +#pragma once #define VGA_NORMAL 0 #define VGA_AND 8

10 years, 9 months

← Newer
1
...
35
36
37
38
39
40
41
...
47
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 February 2014