setupapi: Build language resource files separately.
Michael Stefaniuc
mstefani at redhat.de
Thu Jul 2 05:33:26 CDT 2009
Do not include them from an other rc file.
---
dlls/setupapi/Bg.rc | 2 +
dlls/setupapi/Cs.rc | 2 +
dlls/setupapi/Da.rc | 2 +
dlls/setupapi/De.rc | 4 +-
dlls/setupapi/En.rc | 2 +
dlls/setupapi/Eo.rc | 2 +
dlls/setupapi/Es.rc | 2 +
dlls/setupapi/Fi.rc | 2 +
dlls/setupapi/Fr.rc | 2 +
dlls/setupapi/Hu.rc | 2 +
dlls/setupapi/It.rc | 2 +
dlls/setupapi/Ja.rc | 4 +-
dlls/setupapi/Ko.rc | 2 +
dlls/setupapi/Lt.rc | 4 +-
dlls/setupapi/Makefile.in | 27 +++++++++++++++++++-
dlls/setupapi/Nl.rc | 2 +
dlls/setupapi/No.rc | 2 +
dlls/setupapi/Pl.rc | 2 +
dlls/setupapi/Pt.rc | 2 +
dlls/setupapi/Ro.rc | 4 +-
dlls/setupapi/Ru.rc | 2 +
dlls/setupapi/Si.rc | 4 +-
dlls/setupapi/Sk.rc | 2 +
dlls/setupapi/Sv.rc | 2 +
dlls/setupapi/Tr.rc | 2 +
dlls/setupapi/Zh.rc | 4 +-
dlls/setupapi/setupapi.rc | 51 --------------------------------------
dlls/setupapi/setupapi_private.h | 3 ++
28 files changed, 79 insertions(+), 64 deletions(-)
delete mode 100644 dlls/setupapi/setupapi.rc
diff --git a/dlls/setupapi/Bg.rc b/dlls/setupapi/Bg.rc
index 1527cde..05bfc56 100644
--- a/dlls/setupapi/Bg.rc
+++ b/dlls/setupapi/Bg.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Cs.rc b/dlls/setupapi/Cs.rc
index 9f30d3d..bb2f951 100644
--- a/dlls/setupapi/Cs.rc
+++ b/dlls/setupapi/Cs.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */
diff --git a/dlls/setupapi/Da.rc b/dlls/setupapi/Da.rc
index 4af93ff..7a83816 100644
--- a/dlls/setupapi/Da.rc
+++ b/dlls/setupapi/Da.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/De.rc b/dlls/setupapi/De.rc
index fc388ed..e3e8461 100644
--- a/dlls/setupapi/De.rc
+++ b/dlls/setupapi/De.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
#pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
@@ -57,5 +59,3 @@ BEGIN
PUSHBUTTON "Abbrechen", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "Durchsuchen...", IDC_RUNDLG_BROWSE, 190, 100, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
END
-
-#pragma code_page(default)
diff --git a/dlls/setupapi/En.rc b/dlls/setupapi/En.rc
index 84619f6..0524c27 100644
--- a/dlls/setupapi/En.rc
+++ b/dlls/setupapi/En.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
diff --git a/dlls/setupapi/Eo.rc b/dlls/setupapi/Eo.rc
index c721073..17dc123 100644
--- a/dlls/setupapi/Eo.rc
+++ b/dlls/setupapi/Eo.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Es.rc b/dlls/setupapi/Es.rc
index 78ff3d8..658d2e8 100644
--- a/dlls/setupapi/Es.rc
+++ b/dlls/setupapi/Es.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Fi.rc b/dlls/setupapi/Fi.rc
index c3a9cd1..d5da767 100644
--- a/dlls/setupapi/Fi.rc
+++ b/dlls/setupapi/Fi.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Fr.rc b/dlls/setupapi/Fr.rc
index 5405425..e18fa85 100644
--- a/dlls/setupapi/Fr.rc
+++ b/dlls/setupapi/Fr.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
diff --git a/dlls/setupapi/Hu.rc b/dlls/setupapi/Hu.rc
index afe3632..ae8725d 100644
--- a/dlls/setupapi/Hu.rc
+++ b/dlls/setupapi/Hu.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/It.rc b/dlls/setupapi/It.rc
index 8f776dc..f30859f 100644
--- a/dlls/setupapi/It.rc
+++ b/dlls/setupapi/It.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Ja.rc b/dlls/setupapi/Ja.rc
index d8b419b..50fcb7a 100644
--- a/dlls/setupapi/Ja.rc
+++ b/dlls/setupapi/Ja.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -35,5 +37,3 @@ BEGIN
LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
END
-
-#pragma code_page(default)
diff --git a/dlls/setupapi/Ko.rc b/dlls/setupapi/Ko.rc
index dfd75a9..6def9c2 100644
--- a/dlls/setupapi/Ko.rc
+++ b/dlls/setupapi/Ko.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
diff --git a/dlls/setupapi/Lt.rc b/dlls/setupapi/Lt.rc
index f56b079..8872859 100644
--- a/dlls/setupapi/Lt.rc
+++ b/dlls/setupapi/Lt.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -57,5 +59,3 @@ BEGIN
PUSHBUTTON "Atsisakyti", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "Parinkti...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
END
-
-#pragma code_page(default)
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index 700fce3..971a542 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -31,7 +31,32 @@ C_SRCS16 = \
SPEC_SRCS16 = setupx.spec
-RC_SRCS= setupapi.rc
+RC_SRCS = \
+ Bg.rc \
+ Cs.rc \
+ Da.rc \
+ De.rc \
+ En.rc \
+ Eo.rc \
+ Es.rc \
+ Fi.rc \
+ Fr.rc \
+ Hu.rc \
+ It.rc \
+ Ja.rc \
+ Ko.rc \
+ Lt.rc \
+ Nl.rc \
+ No.rc \
+ Pl.rc \
+ Pt.rc \
+ Ro.rc \
+ Ru.rc \
+ Si.rc \
+ Sk.rc \
+ Sv.rc \
+ Tr.rc \
+ Zh.rc
@MAKE_DLL_RULES@
diff --git a/dlls/setupapi/Nl.rc b/dlls/setupapi/Nl.rc
index 1aa43dd..019d6cc 100644
--- a/dlls/setupapi/Nl.rc
+++ b/dlls/setupapi/Nl.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
diff --git a/dlls/setupapi/No.rc b/dlls/setupapi/No.rc
index c41dab8..a1d41f0 100644
--- a/dlls/setupapi/No.rc
+++ b/dlls/setupapi/No.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Pl.rc b/dlls/setupapi/Pl.rc
index 27a48e9..34d9b46 100644
--- a/dlls/setupapi/Pl.rc
+++ b/dlls/setupapi/Pl.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Pt.rc b/dlls/setupapi/Pt.rc
index be71b27..5780b8f 100644
--- a/dlls/setupapi/Pt.rc
+++ b/dlls/setupapi/Pt.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Ro.rc b/dlls/setupapi/Ro.rc
index 80f90e8..8c3c1e0 100644
--- a/dlls/setupapi/Ro.rc
+++ b/dlls/setupapi/Ro.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
@@ -55,5 +57,3 @@ BEGIN
PUSHBUTTON "Renunță", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "Navigează...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
END
-
-#pragma code_page(default)
diff --git a/dlls/setupapi/Ru.rc b/dlls/setupapi/Ru.rc
index dafd2ea..a7ba4d2 100644
--- a/dlls/setupapi/Ru.rc
+++ b/dlls/setupapi/Ru.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Si.rc b/dlls/setupapi/Si.rc
index b9bf6e1..839927b 100644
--- a/dlls/setupapi/Si.rc
+++ b/dlls/setupapi/Si.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -56,5 +58,3 @@ BEGIN
PUSHBUTTON "PrekliÄi", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "Brskaj ...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
END
-
-#pragma code_page(default)
diff --git a/dlls/setupapi/Sk.rc b/dlls/setupapi/Sk.rc
index 4b08a46..7750d20 100644
--- a/dlls/setupapi/Sk.rc
+++ b/dlls/setupapi/Sk.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Sv.rc b/dlls/setupapi/Sv.rc
index e4b9ec6..e8cdd4b 100644
--- a/dlls/setupapi/Sv.rc
+++ b/dlls/setupapi/Sv.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Tr.rc b/dlls/setupapi/Tr.rc
index 3b922ee..55e3182 100644
--- a/dlls/setupapi/Tr.rc
+++ b/dlls/setupapi/Tr.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
diff --git a/dlls/setupapi/Zh.rc b/dlls/setupapi/Zh.rc
index fdaa5de..8969d9f 100644
--- a/dlls/setupapi/Zh.rc
+++ b/dlls/setupapi/Zh.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "setupapi_private.h"
+
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)
@@ -50,5 +52,3 @@ BEGIN
LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
END
-
-#pragma code_page(default)
diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc
deleted file mode 100644
index 97d2a07..0000000
--- a/dlls/setupapi/setupapi.rc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Top level resource file for SETUPX
- *
- * Copyright 2001 Andreas Mohr
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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 "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "setupapi_private.h"
-
-#include "Bg.rc"
-#include "Cs.rc"
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Eo.rc"
-#include "Fi.rc"
-#include "Fr.rc"
-#include "Hu.rc"
-#include "It.rc"
-#include "Ja.rc"
-#include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
-#include "No.rc"
-#include "Pl.rc"
-#include "Pt.rc"
-#include "Ro.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sk.rc"
-#include "Sv.rc"
-#include "Tr.rc"
-#include "Zh.rc"
diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h
index 9aba8cf..307dbae 100644
--- a/dlls/setupapi/setupapi_private.h
+++ b/dlls/setupapi/setupapi_private.h
@@ -19,6 +19,9 @@
#ifndef __SETUPAPI_PRIVATE_H
#define __SETUPAPI_PRIVATE_H
+#include <windef.h>
+#include <winuser.h>
+
#define COPYFILEDLGORD 1000
#define SOURCESTRORD 500
#define DESTSTRORD 501
--
1.6.3.3
More information about the wine-patches
mailing list