Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[akhaldi] 61695: [INTL] * Remove one time shellapi.h inclusion from the main header and put it back where it belongs. * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 19 10:31:28 2014 New Revision: 61695 URL: http://svn.reactos.org/svn/reactos?rev=61695&view=rev Log: [INTL] * Remove one time shellapi.h inclusion from the main header and put it back where it belongs. * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/languages.c Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Sun Jan 19 10:31:28 2014 @@ -27,6 +27,8 @@ #include "intl.h" +#include <debug.h> + #define SAMPLE_NUMBER _T("123456789") #define NO_FLAG 0 Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=61… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] Sun Jan 19 10:31:28 2014 @@ -25,6 +25,8 @@ #include "intl.h" +#include <debug.h> + #define NUM_APPLETS (1) static LONG APIENTRY Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=61… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Sun Jan 19 10:31:28 2014 @@ -1,16 +1,15 @@ +#include <stdarg.h> + #define WIN32_NO_STATUS -#include <stdarg.h> #include <windef.h> #include <winbase.h> #include <winnls.h> #include <winreg.h> #include <winuser.h> -#include <shellapi.h> #include <cpl.h> #include <setupapi.h> #include <tchar.h> #include <malloc.h> -#include <debug.h> #include "resource.h" Modified: trunk/reactos/dll/cpl/intl/languages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/languages.c?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/languages.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/languages.c [iso-8859-1] Sun Jan 19 10:31:28 2014 @@ -1,4 +1,6 @@ #include "intl.h" + +#include <shellapi.h> /* Property page dialog callback */ INT_PTR CALLBACK

10 years, 11 months

[akhaldi] 61694: [INPUT] * Remove one time inclusions from the main header and put them back where they belong. * Remove redundant resource.h inclusion. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 19 10:28:42 2014 New Revision: 61694 URL: http://svn.reactos.org/svn/reactos?rev=61694&view=rev Log: [INPUT] * Remove one time inclusions from the main header and put them back where they belong. * Remove redundant resource.h inclusion. CORE-7716 Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/input.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=61… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Sun Jan 19 10:28:42 2014 @@ -8,7 +8,6 @@ * 06-09-2007 Created */ -#include "resource.h" #include "input.h" static HWND hLangList; Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.c [iso-8859-1] Sun Jan 19 10:28:42 2014 @@ -9,6 +9,8 @@ */ #include "input.h" + +#include <cpl.h> #define NUM_APPLETS (1) Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.h [iso-8859-1] Sun Jan 19 10:28:42 2014 @@ -1,13 +1,12 @@ +#include <stdarg.h> + #define WIN32_NO_STATUS -#include <stdarg.h> #include <windef.h> #include <winbase.h> #include <winnls.h> #include <winreg.h> -#include <wingdi.h> #include <winuser.h> #include <commctrl.h> -#include <cpl.h> #include <tchar.h> #include "resource.h" Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Sun Jan 19 10:28:42 2014 @@ -10,6 +10,8 @@ */ #include "input.h" + +#include <wingdi.h> static HWND MainDlgWnd; // for SaveInputLang()

10 years, 11 months

[akhaldi] 61693: [INETCPL] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Set ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 19 10:26:08 2014 New Revision: 61693 URL: http://svn.reactos.org/svn/reactos?rev=61693&view=rev Log: [INETCPL] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 Added: trunk/reactos/dll/cpl/inetcpl/resource.h (with props) Modified: trunk/reactos/dll/cpl/inetcpl/content.c trunk/reactos/dll/cpl/inetcpl/general.c trunk/reactos/dll/cpl/inetcpl/inetcpl.c trunk/reactos/dll/cpl/inetcpl/inetcpl.h trunk/reactos/dll/cpl/inetcpl/inetcpl.rc trunk/reactos/dll/cpl/inetcpl/lang/He.rc trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc trunk/reactos/dll/cpl/inetcpl/security.c Modified: trunk/reactos/dll/cpl/inetcpl/content.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/content.c?… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/content.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/content.c [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -19,19 +19,9 @@ * */ -#define NONAMELESSUNION -#define WIN32_NO_STATUS +#include "inetcpl.h" -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> #include <cryptuiapi.h> - -#include "inetcpl.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); /********************************************************************* * display_cert_manager (internal) Modified: trunk/reactos/dll/cpl/inetcpl/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/general.c?… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/general.c [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -19,27 +19,10 @@ * */ -#define NONAMELESSUNION - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -//#include <winuser.h> +#include "inetcpl.h" + #include <wininet.h> -#include <winreg.h> -#include <shlwapi.h> -//#include <prsht.h> #include <shlobj.h> - -#include "inetcpl.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.c?… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.c [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -19,28 +19,9 @@ * */ -#define NONAMELESSUNION -#define COBJMACROS -#define CONST_VTABLE -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -//#include <wingdi.h> -#include <winuser.h> -//#include <commctrl.h> +#include "inetcpl.h" + #include <cpl.h> -#include <ole2.h> - -#include <wine/debug.h> - -#include "inetcpl.h" - - -WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); DECLSPEC_HIDDEN HMODULE hcpl; Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.h?… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.h [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -22,9 +22,26 @@ #ifndef __WINE_INETCPL__ #define __WINE_INETCPL__ +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define CONST_VTABLE +#define NONAMELESSUNION + #include <windef.h> +#include <winbase.h> #include <winuser.h> +#include <winreg.h> +#include <ole2.h> #include <commctrl.h> +#include <shlwapi.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); extern HMODULE hcpl; INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; @@ -52,55 +69,6 @@ #define NUM_PROPERTY_PAGES 8 -/* icons */ -#define ICO_MAIN 100 -#define ICO_INTERNET 1313 +#include "resource.h" -/* strings */ -#define IDS_CPL_NAME 1 -#define IDS_CPL_INFO 2 -#define IDS_SEC_SETTINGS 0x10 -#define IDS_SEC_LEVEL0 0x100 -#define IDS_SEC_LEVEL1 0x101 -#define IDS_SEC_LEVEL2 0x102 -#define IDS_SEC_LEVEL3 0x103 -#define IDS_SEC_LEVEL4 0x104 -#define IDS_SEC_LEVEL5 0x105 -#define IDS_SEC_LEVEL0_INFO 0x200 -#define IDS_SEC_LEVEL1_INFO 0x210 -#define IDS_SEC_LEVEL2_INFO 0x220 -#define IDS_SEC_LEVEL3_INFO 0x230 -#define IDS_SEC_LEVEL4_INFO 0x240 -#define IDS_SEC_LEVEL5_INFO 0x250 - -/* dialogs */ -#define IDC_STATIC -1 - -#define IDD_GENERAL 1000 -#define IDC_HOME_EDIT 1000 -#define IDC_HOME_CURRENT 1001 -#define IDC_HOME_DEFAULT 1002 -#define IDC_HOME_BLANK 1003 -#define IDC_HISTORY_DELETE 1004 -#define IDC_HISTORY_SETTINGS 1005 - -#define IDD_DELETE_HISTORY 1010 -#define IDC_DELETE_TEMP_FILES 1011 -#define IDC_DELETE_COOKIES 1012 -#define IDC_DELETE_HISTORY 1013 -#define IDC_DELETE_FORM_DATA 1014 -#define IDC_DELETE_PASSWORDS 1015 - -#define IDD_SECURITY 2000 -#define IDC_SEC_LISTVIEW 2001 -#define IDC_SEC_ZONE_INFO 2002 -#define IDC_SEC_GROUP 2003 -#define IDC_SEC_TRACKBAR 2004 -#define IDC_SEC_LEVEL 2005 -#define IDC_SEC_LEVEL_INFO 2006 - -#define IDD_CONTENT 4000 -#define IDC_CERT 4100 -#define IDC_CERT_PUBLISHER 4101 - -#endif +#endif /* __WINE_INETCPL__ */ Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -19,7 +19,11 @@ * */ -#include "inetcpl.h" +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + +#include "resource.h" #include <reactos/manifest_dll.rc> Modified: trunk/reactos/dll/cpl/inetcpl/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/He.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/He.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/de-DE… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/en-US… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/fr-FR… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/it-IT… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ja-JP… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ko-KR… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/lt-LT… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/nl-NL… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pt-BR… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ro-RO… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -20,8 +20,6 @@ * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-11-09 initial translation */ - -#include "inetcpl.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL 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] Sun Jan 19 10:26:08 2014 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/sv-SE… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/tr-TR… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/uk-UA… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "inetcpl.h" /* UTF-8 */ #pragma code_page(65001) Added: trunk/reactos/dll/cpl/inetcpl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resource.h… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/resource.h (added) +++ trunk/reactos/dll/cpl/inetcpl/resource.h [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -0,0 +1,52 @@ +#pragma once + +/* icons */ +#define ICO_MAIN 100 +#define ICO_INTERNET 1313 + +/* strings */ +#define IDS_CPL_NAME 1 +#define IDS_CPL_INFO 2 +#define IDS_SEC_SETTINGS 0x10 +#define IDS_SEC_LEVEL0 0x100 +#define IDS_SEC_LEVEL1 0x101 +#define IDS_SEC_LEVEL2 0x102 +#define IDS_SEC_LEVEL3 0x103 +#define IDS_SEC_LEVEL4 0x104 +#define IDS_SEC_LEVEL5 0x105 +#define IDS_SEC_LEVEL0_INFO 0x200 +#define IDS_SEC_LEVEL1_INFO 0x210 +#define IDS_SEC_LEVEL2_INFO 0x220 +#define IDS_SEC_LEVEL3_INFO 0x230 +#define IDS_SEC_LEVEL4_INFO 0x240 +#define IDS_SEC_LEVEL5_INFO 0x250 + +/* dialogs */ +#define IDC_STATIC -1 + +#define IDD_GENERAL 1000 +#define IDC_HOME_EDIT 1000 +#define IDC_HOME_CURRENT 1001 +#define IDC_HOME_DEFAULT 1002 +#define IDC_HOME_BLANK 1003 +#define IDC_HISTORY_DELETE 1004 +#define IDC_HISTORY_SETTINGS 1005 + +#define IDD_DELETE_HISTORY 1010 +#define IDC_DELETE_TEMP_FILES 1011 +#define IDC_DELETE_COOKIES 1012 +#define IDC_DELETE_HISTORY 1013 +#define IDC_DELETE_FORM_DATA 1014 +#define IDC_DELETE_PASSWORDS 1015 + +#define IDD_SECURITY 2000 +#define IDC_SEC_LISTVIEW 2001 +#define IDC_SEC_ZONE_INFO 2002 +#define IDC_SEC_GROUP 2003 +#define IDC_SEC_TRACKBAR 2004 +#define IDC_SEC_LEVEL 2005 +#define IDC_SEC_LEVEL_INFO 2006 + +#define IDD_CONTENT 4000 +#define IDC_CERT 4100 +#define IDC_CERT_PUBLISHER 4101 Propchange: trunk/reactos/dll/cpl/inetcpl/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/inetcpl/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/security.c… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/security.c [iso-8859-1] Sun Jan 19 10:26:08 2014 @@ -19,31 +19,7 @@ * */ -#define COBJMACROS -#define CONST_VTABLE -#define NONAMELESSUNION - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -//#include <prsht.h> -//#include "commctrl.h" - -//#include "ole2.h" -//#include "urlmon.h" -//#include "initguid.h" -#include <winreg.h> -#include <shlwapi.h> - #include "inetcpl.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); typedef struct secdlg_data_s { HWND hsec; /* security propsheet */

10 years, 11 months

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

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 19 10:21:10 2014 New Revision: 61692 URL: http://svn.reactos.org/svn/reactos?rev=61692&view=rev Log: [DESK] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 Modified: trunk/reactos/dll/cpl/desk/appearance.h trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/devsett.c trunk/reactos/dll/cpl/desk/draw.h trunk/reactos/dll/cpl/desk/monslctl.c trunk/reactos/dll/cpl/desk/preview.h trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] Sun Jan 19 10:21:10 2014 @@ -1,3 +1,5 @@ +#pragma once + /* Some definitions for theme */ #define SIZE_BORDER_WIDTH 0 #define SIZE_SCROLL_WIDTH 1 Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sun Jan 19 10:21:10 2014 @@ -9,6 +9,8 @@ */ #include "desk.h" + +#include <shellapi.h> #define MAX_BACKGROUNDS 100 Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=61… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] Sun Jan 19 10:21:10 2014 @@ -8,6 +8,8 @@ */ #include "desk.h" + +#include <cplext.h> #define NUM_APPLETS (1) Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=61… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] Sun Jan 19 10:21:10 2014 @@ -1,30 +1,24 @@ -#define COBJMACROS +#include <stdarg.h> #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> + +#define COBJMACROS + #include <windef.h> #include <winbase.h> #include <winreg.h> #include <wingdi.h> #include <winuser.h> #include <wincon.h> -#include <shellapi.h> #include <commdlg.h> #include <cpl.h> #include <tchar.h> #include <setupapi.h> -#include <assert.h> -#include <shlwapi.h> #include <shlobj.h> #include <regstr.h> -#include <cplext.h> #include <dll/desk/deskcplx.h> -#include <cfgmgr32.h> -#include <uxtheme.h> -#include <uxundoc.h> -#include <vssym32.h> #include "appearance.h" #include "preview.h" Modified: trunk/reactos/dll/cpl/desk/devsett.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/devsett.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/devsett.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/devsett.c [iso-8859-1] Sun Jan 19 10:21:10 2014 @@ -6,6 +6,8 @@ */ #include "desk.h" + +#include <cfgmgr32.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/cpl/desk/draw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/draw.h?rev=61… ============================================================================== --- trunk/reactos/dll/cpl/desk/draw.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/draw.h [iso-8859-1] Sun Jan 19 10:21:10 2014 @@ -1,3 +1,5 @@ +#pragma once + BOOL MyDrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState, COLOR_SCHEME *scheme); BOOL @@ -13,4 +15,3 @@ #define MY_BF_ACTIVEBORDER 0x1000000 #define MY_BF_INACTIVEBORDER 0x2000000 - Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] Sun Jan 19 10:21:10 2014 @@ -1,4 +1,3 @@ - #include "desk.h" static const TCHAR szMonitorSelWndClass[] = TEXT("MONITORSELWNDCLASS"); Modified: trunk/reactos/dll/cpl/desk/preview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/preview.h [iso-8859-1] Sun Jan 19 10:21:10 2014 @@ -5,6 +5,8 @@ * PURPOSE: Definitions used by the preview control * COPYRIGHT: Copyright 2006, 2007 Eric Kohl */ + +#pragma once #define IDX_DESKTOP 0 #define IDX_INACTIVE_CAPTION 1 Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=6… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Sun Jan 19 10:21:10 2014 @@ -8,6 +8,11 @@ */ #include "desk.h" + +#include <shlwapi.h> +#include <uxtheme.h> +#include <uxundoc.h> +#include <vssym32.h> static const WCHAR g_CPColors[] = L"Control Panel\\Colors"; static const WCHAR g_CPANewSchemes[] = L"Control Panel\\Appearance\\New Schemes"; @@ -890,4 +895,3 @@ return SUCCEEDED(hres); } -

10 years, 11 months

[akhaldi] 61691: [APPWIZ] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 19 10:17:54 2014 New Revision: 61691 URL: http://svn.reactos.org/svn/reactos?rev=61691&view=rev Log: [APPWIZ] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/cpl/appwiz/addons.c trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/appwiz/appwiz.h trunk/reactos/dll/cpl/appwiz/createlink.c Modified: trunk/reactos/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] Sun Jan 19 10:17:54 2014 @@ -16,8 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> +#include "appwiz.h" #include <stdio.h> @@ -25,19 +24,7 @@ # include <unistd.h> #endif -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> #include <msi.h> - -#include "appwiz.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(appwiz); #define GECKO_VERSION "2.21" Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c [iso-8859-1] Sun Jan 19 10:17:54 2014 @@ -6,12 +6,11 @@ * Dmitry Chapyshev (dmitry(a)reactos.org) */ -#include <config.h> -#include <wine/port.h> - #include "appwiz.h" -WINE_DEFAULT_DEBUG_CHANNEL(appwiz); +#include <shellapi.h> +#include <cpl.h> +#include <wine/unicode.h> HINSTANCE hApplet = NULL; Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.h?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.h [iso-8859-1] Sun Jan 19 10:17:54 2014 @@ -1,19 +1,22 @@ -#define COBJMACROS +#include <config.h> +#include <wine/port.h> + +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> + +#define COBJMACROS + #include <windef.h> #include <winbase.h> #include <winreg.h> #include <winnls.h> -#include <shellapi.h> -#include <cpl.h> -#include <tchar.h> #include <shlobj.h> #include <wine/debug.h> -#include <wine/unicode.h> +WINE_DEFAULT_DEBUG_CHANNEL(appwiz); #include "resource.h" Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Sun Jan 19 10:17:54 2014 @@ -10,6 +10,8 @@ */ #include "appwiz.h" + +#include <tchar.h> BOOL IsShortcut(HKEY hKey)

10 years, 11 months

[akhaldi] 61690: [HOTPLUG] * We don't need PCH for one source file modules. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 19 10:14:18 2014 New Revision: 61690 URL: http://svn.reactos.org/svn/reactos?rev=61690&view=rev Log: [HOTPLUG] * We don't need PCH for one source file modules. CORE-7716 Modified: trunk/reactos/dll/cpl/hotplug/CMakeLists.txt Modified: trunk/reactos/dll/cpl/hotplug/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hotplug/CMakeLists… ============================================================================== --- trunk/reactos/dll/cpl/hotplug/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hotplug/CMakeLists.txt [iso-8859-1] Sun Jan 19 10:14:18 2014 @@ -22,5 +22,4 @@ comctl32 kernel32) -add_pch(hotplug hotplug.h) add_cd_file(TARGET hotplug DESTINATION reactos/system32 FOR all)

10 years, 11 months

[ekohl] 61689: [EVENTVWR] Make two more strings localizable. Patch by Ștefan Fulea. CORE-7785 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 19 10:10:38 2014 New Revision: 61689 URL: http://svn.reactos.org/svn/reactos?rev=61689&view=rev Log: [EVENTVWR] Make two more strings localizable. Patch by Ștefan Fulea. CORE-7785 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -55,11 +55,13 @@ #define MAX_LOADSTRING 255 /* Globals */ -HINSTANCE hInst; /* current instance */ -WCHAR szTitle[MAX_LOADSTRING]; /* The title bar text */ -HWND hwndMainWindow; /* Main window */ -HWND hwndListView; /* ListView control */ -HWND hwndStatus; /* Status bar */ +HINSTANCE hInst; /* current instance */ +WCHAR szTitle[MAX_LOADSTRING]; /* The title bar text */ +WCHAR szTitleTemplate[MAX_LOADSTRING]; /* The logged-on title bar text */ +HWND hwndMainWindow; /* Main window */ +HWND hwndListView; /* ListView control */ +HWND hwndStatus; /* Status bar */ +WCHAR szStatusBarTemplate[MAX_LOADSTRING]; /* The status bar text */ PEVENTLOGRECORD *g_RecordPtrs = NULL; DWORD g_TotalRecords = 0; @@ -97,6 +99,8 @@ /* Initialize global strings */ LoadStringW(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); + LoadStringW(hInstance, IDS_APP_TITLE_EX, szTitleTemplate, MAX_LOADSTRING); + LoadStringW(hInstance, IDS_STATUS_MSG, szStatusBarTemplate, MAX_LOADSTRING); MyRegisterClass(hInstance); /* Perform application initialization: */ @@ -687,7 +691,7 @@ EndDialog(hwndDlg, 0); - i = swprintf(szWindowTitle, L"%s - %s Log on \\\\", szTitle, lpLogName); /* i = number of characters written */ + i = swprintf(szWindowTitle, szTitleTemplate, szTitle, lpLogName); /* i = number of characters written */ /* lpComputerName can be NULL here if no records was read */ dwMaxLength = sizeof(szWindowTitle) / sizeof(WCHAR) - i; if(!lpComputerName) @@ -695,7 +699,7 @@ else _snwprintf(szWindowTitle+i, dwMaxLength, L"%s", lpComputerName); - swprintf(szStatusText, L"%s has %lu event(s)", lpLogName, dwTotalRecords); + swprintf(szStatusText, szStatusBarTemplate, lpLogName, dwTotalRecords); // Update the status bar SendMessageW(hwndStatus, SB_SETTEXT, (WPARAM)0, (LPARAM)szStatusText); Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -85,6 +85,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "ÐÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸Ñ" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "ÐÐµ Ðµ Ð½Ð°Ð¼ÐµÑÐµÐ½Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸ÐµÑÐ¾ Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸Ðµ ( %lu ) Ð² Ð¸Ð·ÑÐ¾ÑÐ½Ð¸Ðº ( %s ). ÐÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ðµ Ð¼ÐµÑÑÐ¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÑ Ð´Ð° Ð½ÑÐ¼Ð° Ð½ÑÐ¶Ð½Ð¸ÑÐµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð² ÑÐµÐ³Ð¸ÑÑÑÑÐ° Ð¸Ð»Ð¸ DLL ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑ, Ð½ÑÐ¶Ð½Ð¸ Ð·Ð° Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð¾Ñ Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½ ÐºÐ¾Ð¼Ð¿ÑÑÑÑ." IDS_EVENTLOG_ERROR_TYPE "Error" IDS_EVENTLOG_WARNING_TYPE "Warning" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Ereignisanzeige" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "Die Bezeichnung fÃ¼r die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es kÃ¶nnte sein, dass der Lokale Computer die notwendigen Registry EintrÃ¤ge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt." IDS_EVENTLOG_ERROR_TYPE "Fehler" IDS_EVENTLOG_WARNING_TYPE "Warnung" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Event Viewer" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." IDS_EVENTLOG_ERROR_TYPE "ÎÏÎ¬Î»Î¼Î±" IDS_EVENTLOG_WARNING_TYPE "Î ÏÎ¿ÎµÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ·" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -93,6 +93,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Event Viewer" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." IDS_EVENTLOG_ERROR_TYPE "Error" IDS_EVENTLOG_WARNING_TYPE "Warning" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Visor de sucesos" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "La descripciÃ³n para el evento con ID ( %lu ) y origen ( %s ) no pudo ser recuperada.El equipo local puede no tener la informaciÃ³n necesaria en el registro o las DLLs requeridas para mostrar los mensajes de un equipo remoto." IDS_EVENTLOG_ERROR_TYPE "Error" IDS_EVENTLOG_WARNING_TYPE "Advertencia" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Visionneuse d'Ã©vÃ©nements" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "La description pour l'Ã©vÃ©nement d'ID ( %lu ) dans la source ( %s ) ne peut Ãªtre trouvÃ©e. L'ordinateur local pourrait ne pas avoir les informations registres nÃ©cÃ©ssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." IDS_EVENTLOG_ERROR_TYPE "Erreur" IDS_EVENTLOG_WARNING_TYPE "Avertissement" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "×××× ××××¨××¢××" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." IDS_EVENTLOG_ERROR_TYPE "×©××××" IDS_EVENTLOG_WARNING_TYPE "××××¨×" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Visualizzatore eventi" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "La descrizione per l'ID evento ( %lu ) proveniente da ( %s ) non puÃ² essere trovata. Il computer locale potrebbe non avere le informazioni sul registry necessarie o i file DLL con i messaggi necessari per la visualizzazione da un computer remoto." IDS_EVENTLOG_ERROR_TYPE "Errore" IDS_EVENTLOG_WARNING_TYPE "Avviso" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "ã¤ãã³ã ãã¥ã¼ã¢" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "ã¤ãã³ã ID (%lu) (ã½ã¼ã¹ %s å) ã«é¢ããèª¬æãè¦ã¤ããã¾ããã§ããã ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ããã¡ãã»ã¼ã¸ãè¡¨ç¤ºããããã«å¿è¦ãªã¬ã¸ã¹ããªæå ±ã¾ãã¯ã¡ãã»ã¼ã¸ DLL ãã¡ã¤ã«ããã¼ã«ã« ã³ã³ãã¥ã¼ã¿ã«ãªãå¯è½æ§ãããã¾ãã" IDS_EVENTLOG_ERROR_TYPE "ã¨ã©ã¼" IDS_EVENTLOG_WARNING_TYPE "è¦å" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "ì´ë²¤í¸ ë·°ì´" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "( %s ) ì ì´ë²¤í¸ID ( %lu ) ì ëí ì¤ëªì ì°¾ì ì ììµëë¤. ë¡ì»¬ ì»´í¨í°ê° ìê²© ì»´í¨í°ì ë©ì¸ì§ë¥¼ íìíëë° íìí ë ì§ì¤í¸ë¦¬ë DLL íì¼ì ê°ì§ì§ ìê³ ììì ììµëë¤." IDS_EVENTLOG_ERROR_TYPE "ìë¬" IDS_EVENTLOG_WARNING_TYPE "ê²½ê³ " Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -85,6 +85,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Hendelseliste" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "Beskrivelsen for Hendelse ID ( %lu ) i kilden ( %s ) kan ikke bli finnet. Lokale datamaskinen har ikke nÃ¸dvendige register informasjon eller melding DLL filer for Ã¥ vise melding fra en fjern datamaskin." IDS_EVENTLOG_ERROR_TYPE "Feil" IDS_EVENTLOG_WARNING_TYPE "Advarseler" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "PodglÄd zdarzeÅ" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID: ( %lu ) nie zostaÅ odnaleziony w ÅºrÃ³dle: ( %s ). Ten komputer moÅ¼e nie miec wystarczajÄcych informacji w rejestrze, albo bibliotek DLL, aby wyÅwietliÄ wiadomoÅci z komputera zdalnego." IDS_EVENTLOG_ERROR_TYPE "BÅÄd" IDS_EVENTLOG_WARNING_TYPE "OstrzeÅ¼enie" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Visualizador de Eventos" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "A descriÃ§Ã£o para Event ID ( %lu ) em Fonte ( %s ) nÃ£o foi encontrado. O computador local talvez nÃ£o possua a informaÃ§Ã£o de registro necessÃ¡ria ou mensagem de arquivos DLL para exibir mensagens de um computador remoto." IDS_EVENTLOG_ERROR_TYPE "Erro" IDS_EVENTLOG_WARNING_TYPE "Aviso" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Observator de evenimente" + IDS_APP_TITLE_EX "%s - %s autentificat pe \\\\" + IDS_STATUS_MSG "%s are %lu eveniment(e)" IDS_EVENTSTRINGIDNOTFOUND "Nu se poate gÄsi descrierea evenimentului cu ID-ul ( %lu ) Ã®n sursa ( %s ). Este posibil ca Ã®n calculatorul local sÄ nu existe informaÈiile de registru necesare sau fiÈierele dll de mesaje sÄ afiÈeze mesaje de la un calculator din reÈea." IDS_EVENTLOG_ERROR_TYPE "Eroare" IDS_EVENTLOG_WARNING_TYPE "Avertisment" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐ¾Ð±ÑÑÐ¸Ð¹" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð´Ð»Ñ ÑÐ¾Ð±ÑÑÐ¸Ñ Ñ ÐºÐ¾Ð´Ð¾Ð¼ ( %lu ) Ð² Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐµ ( %s ). ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð½Ð° Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ Ð½ÐµÑ Ð½ÑÐ¶Ð½ÑÑ Ð´Ð°Ð½Ð½ÑÑ Ð² ÑÐµÐµÑÑÑÐµ Ð¸Ð»Ð¸ ÑÐ°Ð¹Ð»Ð¾Ð² DLL ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°." IDS_EVENTLOG_ERROR_TYPE "ÐÑÐ¸Ð±ÐºÐ°" IDS_EVENTLOG_WARNING_TYPE "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -90,6 +90,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "ZobrazovaÄ udalostÃ" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "Popis pre udalosÅ¥ ID ( %lu ) zo zdroja ( %s ) nebol nÃ¡jdenÃ½. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." IDS_EVENTLOG_ERROR_TYPE "Chyba" IDS_EVENTLOG_WARNING_TYPE "Upozornenie" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -93,6 +93,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Shikues ngjarjesh" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "PÃ«rshkrimi pÃ«r ngjarjet ID ( %lu ) nÃ« burim ( %s ) nuk gjindet. Kompjuter vendas mund tÃ« mos ketÃ« informacionin e regjistrit te nevojshem ose mesazhin pÃ«r dokumentat DLL pÃ«r tÃ« shfaqur nga njÃ« kompjuter nÃ« distancÃ«." IDS_EVENTLOG_ERROR_TYPE "Error" IDS_EVENTLOG_WARNING_TYPE "ParalajmÃ«rim" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "HÃ¤ndelselogg" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "Beskrivning av HÃ¤ndelse ID ( %lu ) i kÃ¤llan ( %s ) kan inte hittas. Lokal dator har inte nÃ¶dvendig registerinformation eller meddelander DLL filer for Ã¥ vise meddelander frÃ¥n en fjÃ¤rr dator." IDS_EVENTLOG_ERROR_TYPE "Fel" IDS_EVENTLOG_WARNING_TYPE "Varning" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Olay GÃ¶rÃ¼ntÃ¼leyicisi" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "Kaynaktaki olay kimliÄi (%lu) iÃ§in aÃ§Ä±klama (%s) bulunamadÄ±. Yerli bilgisayarda, uzaktaki bilgisayardan ileti gÃ¶rÃ¼ntÃ¼lemesi iÃ§in gerekli, deÄer bilgileri veyÃ¢ kitaplÄ±klar olmayabilir." IDS_EVENTLOG_ERROR_TYPE "YanlÄ±ÅlÄ±k" IDS_EVENTLOG_WARNING_TYPE "UyarÄ±" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "ÐÐ³Ð»ÑÐ´Ð°Ñ Ð¿Ð¾Ð´ÑÐ¹" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "ÐÐ¿Ð¸Ñ Ð´Ð»Ñ ÐÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÐ¾ÑÐ° Ð¿Ð¾Ð´ÑÑ( %lu ) Ð·Ð° Ð´Ð¶ÐµÑÐµÐ»Ð¾Ð¼( %s ) Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾. ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð¸Ð¹ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð¼Ð¾Ð¶Ðµ Ð½Ðµ Ð¼Ð°ÑÐ¸ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð² ÑÐµÑÑÑÑÑ ÑÐ¸ DLL ÑÐ°Ð¹Ð»ÑÐ² Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ð´Ð»Ñ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ, ÑÐ¾ Ð½Ð°Ð´ÑÐ¾Ð´ÑÑÑ Ð²ÑÐ´ Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÐ°." IDS_EVENTLOG_ERROR_TYPE "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°" IDS_EVENTLOG_WARNING_TYPE "ÐÐ¾Ð¿ÐµÑÐµÐ´Ð¶ÐµÐ½Ð½Ñ" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -87,6 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "äºä»¶æ¥çå¨" + IDS_APP_TITLE_EX "%s - %s Log on \\\\" + IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTSTRINGIDNOTFOUND "æ¥æº ( %s ) ä¸çäºä»¶ ID ( %lu ) çæè¿°æ æ³æ¾å°ãæ¬å°è®¡ç®æºå¯è½æ²¡ææ¾ç¤ºæ¥èªè¿ç¨è®¡ç®æºæ¶æ¯æå¿éçæ³¨åè¡¨ä¿¡æ¯ææ¶æ¯ DLL æä»¶ã" IDS_EVENTLOG_ERROR_TYPE "éè¯¯" IDS_EVENTLOG_WARNING_TYPE "è¦å" Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Sun Jan 19 10:10:38 2014 @@ -49,6 +49,8 @@ /* String IDs */ #define IDS_APP_TITLE 103 +#define IDS_APP_TITLE_EX 104 +#define IDS_STATUS_MSG 106 #define IDS_EVENTSTRINGIDNOTFOUND 209 #define IDS_EVENTLOG_ERROR_TYPE 251 #define IDS_EVENTLOG_WARNING_TYPE 252

10 years, 11 months

[tfaber] 61688: [DDK] - Add missing reserved fields to NDIS51_MINIPORT_CHARACTERISTICS

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jan 19 09:54:14 2014 New Revision: 61688 URL: http://svn.reactos.org/svn/reactos?rev=61688&view=rev Log: [DDK] - Add missing reserved fields to NDIS51_MINIPORT_CHARACTERISTICS Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=616… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sun Jan 19 09:54:14 2014 @@ -2168,7 +2168,11 @@ NDIS50_MINIPORT_CHARACTERISTICS Ndis50Chars; \ W_CANCEL_SEND_PACKETS_HANDLER CancelSendPacketsHandler; \ W_PNP_EVENT_NOTIFY_HANDLER PnPEventNotifyHandler; \ - W_MINIPORT_SHUTDOWN_HANDLER AdapterShutdownHandler; + W_MINIPORT_SHUTDOWN_HANDLER AdapterShutdownHandler; \ + PVOID Reserved1; \ + PVOID Reserved2; \ + PVOID Reserved3; \ + PVOID Reserved4; #else @@ -2176,7 +2180,11 @@ NDIS50_MINIPORT_CHARACTERISTICS_S \ W_CANCEL_SEND_PACKETS_HANDLER CancelSendPacketsHandler; \ W_PNP_EVENT_NOTIFY_HANDLER PnPEventNotifyHandler; \ - W_MINIPORT_SHUTDOWN_HANDLER AdapterShutdownHandler; + W_MINIPORT_SHUTDOWN_HANDLER AdapterShutdownHandler; \ + PVOID Reserved1; \ + PVOID Reserved2; \ + PVOID Reserved3; \ + PVOID Reserved4; #endif

10 years, 11 months

[ekohl] 61687: [USETUP] Usetup does not properly return from quit+cancel. Patch by Ștefan Fulea. CORE-7783 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 19 09:47:27 2014 New Revision: 61687 URL: http://svn.reactos.org/svn/reactos?rev=61687&view=rev Log: [USETUP] Usetup does not properly return from quit+cancel. Patch by Ștefan Fulea. CORE-7783 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/genlist.h trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Sun Jan 19 09:47:27 2014 @@ -483,6 +483,20 @@ VOID +RedrawGenericList(PGENERIC_LIST List) +{ + if (List->CurrentEntry == NULL) + return; + + if (List->Redraw) + { + DrawListEntries(List); + DrawScrollBarGenericList(List); + } +} + + +VOID SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry) { if (Entry->List != List) Modified: trunk/reactos/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] Sun Jan 19 09:47:27 2014 @@ -70,6 +70,9 @@ ScrollToPositionGenericList (PGENERIC_LIST List, ULONG uIndex); VOID +RedrawGenericList(PGENERIC_LIST List); + +VOID SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry); PGENERIC_LIST_ENTRY Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Jan 19 09:47:27 2014 @@ -676,6 +676,8 @@ { if (ConfirmQuit(Ir) == TRUE) return QUIT_PAGE; + else + RedrawGenericList(LanguageList); } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { @@ -1354,7 +1356,7 @@ } } - return DISPLAY_SETTINGS_PAGE; + return KEYBOARD_SETTINGS_PAGE; } @@ -1420,7 +1422,7 @@ } } - return DISPLAY_SETTINGS_PAGE; + return LAYOUT_SETTINGS_PAGE; }

10 years, 11 months

[tfaber] 61686: [DDK][XDK] - Do not evaluate the NT_ASSERT macro's parameter before stringifying it. Forgot this in r61008/CORE-7758

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jan 19 09:28:53 2014 New Revision: 61686 URL: http://svn.reactos.org/svn/reactos?rev=61686&view=rev Log: [DDK][XDK] - Do not evaluate the NT_ASSERT macro's parameter before stringifying it. Forgot this in r61008/CORE-7758 Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/rtlfuncs.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6168… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Jan 19 09:28:53 2014 @@ -11063,9 +11063,21 @@ (__assert_annotationW(msg), \ DbgRaiseAssertionFailure(), FALSE) : TRUE) -#define NT_ASSERT(exp) ((void)NT_VERIFY(exp)) -#define NT_ASSERTMSG(msg, exp) ((void)NT_VERIFYMSG(msg, exp)) -#define NT_ASSERTMSGW(msg, exp) ((void)NT_VERIFYMSGW(msg, exp)) +/* Can't reuse verify, see above */ +#define NT_ASSERT(exp) \ + ((VOID)((!(exp)) ? \ + (__assert_annotationA(#exp), \ + DbgRaiseAssertionFailure(), FALSE) : TRUE)) + +#define NT_ASSERTMSG(msg, exp) \ + ((VOID)((!(exp)) ? \ + (__assert_annotationA(msg), \ + DbgRaiseAssertionFailure(), FALSE) : TRUE)) + +#define NT_ASSERTMSGW(msg, exp) \ + ((VOID)((!(exp)) ? \ + (__assert_annotationW(msg), \ + DbgRaiseAssertionFailure(), FALSE) : TRUE)) #else /* !DBG */ Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Sun Jan 19 09:28:53 2014 @@ -3133,9 +3133,21 @@ (__assert_annotationW(msg), \ DbgRaiseAssertionFailure(), FALSE) : TRUE) -#define NT_ASSERT(exp) ((void)NT_VERIFY(exp)) -#define NT_ASSERTMSG(msg, exp) ((void)NT_VERIFYMSG(msg, exp)) -#define NT_ASSERTMSGW(msg, exp) ((void)NT_VERIFYMSGW(msg, exp)) +/* Can't reuse verify, see above */ +#define NT_ASSERT(exp) \ + ((VOID)((!(exp)) ? \ + (__assert_annotationA(#exp), \ + DbgRaiseAssertionFailure(), FALSE) : TRUE)) + +#define NT_ASSERTMSG(msg, exp) \ + ((VOID)((!(exp)) ? \ + (__assert_annotationA(msg), \ + DbgRaiseAssertionFailure(), FALSE) : TRUE)) + +#define NT_ASSERTMSGW(msg, exp) \ + ((VOID)((!(exp)) ? \ + (__assert_annotationW(msg), \ + DbgRaiseAssertionFailure(), FALSE) : TRUE)) #else /* !DBG */

10 years, 11 months

← Newer
1
...
18
19
20
21
22
23
24
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2014