Author: cwittich Date: Sat Aug 8 12:18:41 2009 New Revision: 42503
URL: http://svn.reactos.org/svn/reactos?rev=42503&view=rev Log: partial revert of r41770
Modified: trunk/reactos/dll/win32/localui/localui.h trunk/reactos/dll/win32/localui/localui.rbuild trunk/reactos/dll/win32/localui/localui.rc trunk/reactos/dll/win32/localui/ui_Da.rc trunk/reactos/dll/win32/localui/ui_De.rc trunk/reactos/dll/win32/localui/ui_En.rc trunk/reactos/dll/win32/localui/ui_Fr.rc trunk/reactos/dll/win32/localui/ui_Ko.rc trunk/reactos/dll/win32/localui/ui_Lt.rc trunk/reactos/dll/win32/localui/ui_Nl.rc trunk/reactos/dll/win32/localui/ui_No.rc trunk/reactos/dll/win32/localui/ui_Pl.rc trunk/reactos/dll/win32/localui/ui_Pt.rc trunk/reactos/dll/win32/localui/ui_Ro.rc trunk/reactos/dll/win32/localui/ui_Ru.rc trunk/reactos/dll/win32/localui/ui_Si.rc trunk/reactos/dll/win32/localui/ui_Sv.rc trunk/reactos/dll/win32/localui/ui_Zh.rc
Modified: trunk/reactos/dll/win32/localui/localui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.h... ============================================================================== --- trunk/reactos/dll/win32/localui/localui.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/localui.h [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -21,8 +21,6 @@ #ifndef __WINE_LOCALUI__ #define __WINE_LOCALUI__
-#include <windef.h> -#include <winuser.h>
/* ## Resource-ID ## */ #define ADDPORT_DIALOG 100
Modified: trunk/reactos/dll/win32/localui/localui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.r... ============================================================================== --- trunk/reactos/dll/win32/localui/localui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/localui.rbuild [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -8,21 +8,6 @@ <define name="__WINESRC__" /> <file>localui.c</file> <file>localui.rc</file> - <file>ui_Da.rc</file> - <file>ui_De.rc</file> - <file>ui_En.rc</file> - <file>ui_Fr.rc</file> - <file>ui_Ko.rc</file> - <file>ui_Lt.rc</file> - <file>ui_Nl.rc</file> - <file>ui_No.rc</file> - <file>ui_Pl.rc</file> - <file>ui_Pt.rc</file> - <file>ui_Ro.rc</file> - <file>ui_Ru.rc</file> - <file>ui_Si.rc</file> - <file>ui_Sv.rc</file> - <file>ui_Zh.rc</file> <library>wine</library> <library>winspool</library> <library>user32</library>
Modified: trunk/reactos/dll/win32/localui/localui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.r... ============================================================================== --- trunk/reactos/dll/win32/localui/localui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/localui.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -19,6 +19,10 @@ * */
+#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" #include "localui.h"
#define WINE_FILENAME_STR "localui.dll" @@ -32,3 +36,20 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.2180"
#include "wine/wine_common_ver.rc" + + +#include "ui_Da.rc" +#include "ui_De.rc" +#include "ui_En.rc" +#include "ui_Fr.rc" +#include "ui_Ko.rc" +#include "ui_Lt.rc" +#include "ui_Nl.rc" +#include "ui_No.rc" +#include "ui_Pl.rc" +#include "ui_Pt.rc" +#include "ui_Ro.rc" +#include "ui_Ru.rc" +#include "ui_Si.rc" +#include "ui_Sv.rc" +#include "ui_Zh.rc"
Modified: trunk/reactos/dll/win32/localui/ui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Da.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Da.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/localui/ui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_De.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_De.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/localui/ui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_En.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_En.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/localui/ui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Fr.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Fr.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,9 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h" - #pragma code_page(65001)
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -56,3 +53,5 @@ IDS_PORTEXISTS "Le port %s existe déjà " IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration" } + +#pragma code_page(default)
Modified: trunk/reactos/dll/win32/localui/ui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ko.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/localui/ui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Lt.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Lt.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -57,3 +57,4 @@ IDS_PORTEXISTS "Prievadas %s jau egzistuoja" IDS_NOTHINGTOCONFIG "Å is prievadas neturi parinkÄių konfigÅ«ravimui" } +#pragma code_page(default)
Modified: trunk/reactos/dll/win32/localui/ui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Nl.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Nl.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/localui/ui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_No.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_No.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
Modified: trunk/reactos/dll/win32/localui/ui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pl.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Pl.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/localui/ui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pt.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Pt.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/localui/ui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ro.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ro.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -16,8 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -55,3 +53,5 @@ IDS_PORTEXISTS "Portul %s existsÄ deja" IDS_NOTHINGTOCONFIG "Acest port nu are opÈiuni de configurat" } + +#pragma code_page(default)
Modified: trunk/reactos/dll/win32/localui/ui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ru.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ru.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/dll/win32/localui/ui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Si.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Si.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
#pragma code_page(65001)
@@ -56,3 +54,5 @@ IDS_PORTEXISTS "Vrata z imenom %s že obstajajo" IDS_NOTHINGTOCONFIG "Ta vrata nimajo možnosti nastavitve" } + +#pragma code_page(default)
Modified: trunk/reactos/dll/win32/localui/ui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Sv.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Sv.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
Modified: trunk/reactos/dll/win32/localui/ui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Zh.rc?... ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] Sat Aug 8 12:18:41 2009 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "localui.h"
/* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -92,3 +90,5 @@ IDS_PORTEXISTS "ç«¯å£ %s å·²ç¶åå¨" IDS_NOTHINGTOCONFIG "éå端å£æ²æå¯è¨å®é¸é " } + +#pragma code_page(default)