Module: wine Branch: master Commit: 01366a6b415eb185d0410da550c1fe65808e2780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01366a6b415eb185d0410da550...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue Jun 30 11:14:26 2009 +0200
crypt32: Build language resource files separately.
Instead of including them from an other rc file.
---
dlls/crypt32/Makefile.in | 12 +++++++++++- dlls/crypt32/crypt32.rc | 35 ----------------------------------- dlls/crypt32/crypt32_De.rc | 4 ++-- dlls/crypt32/crypt32_En.rc | 2 ++ dlls/crypt32/crypt32_Fr.rc | 2 ++ dlls/crypt32/crypt32_Ko.rc | 2 ++ dlls/crypt32/crypt32_Nl.rc | 2 ++ dlls/crypt32/crypt32_No.rc | 2 ++ dlls/crypt32/crypt32_Pt.rc | 2 ++ dlls/crypt32/crypt32_Ro.rc | 4 ++-- dlls/crypt32/crypt32_Sv.rc | 5 +++-- dlls/crypt32/cryptres.h | 2 ++ 12 files changed, 32 insertions(+), 42 deletions(-)
diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index 10ffda9..695bc75 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -33,7 +33,17 @@ C_SRCS = \ store.c \ str.c
-RC_SRCS = crypt32.rc +RC_SRCS = \ + crypt32_De.rc \ + crypt32_En.rc \ + crypt32_Fr.rc \ + crypt32_Ko.rc \ + crypt32_Nl.rc \ + crypt32_No.rc \ + crypt32_Pt.rc \ + crypt32_Ro.rc \ + crypt32_Sv.rc \ + version.rc
@MAKE_DLL_RULES@
diff --git a/dlls/crypt32/crypt32.rc b/dlls/crypt32/crypt32.rc deleted file mode 100644 index c51174b..0000000 --- a/dlls/crypt32/crypt32.rc +++ /dev/null @@ -1,35 +0,0 @@ -/* - * crypt32 dll resources - * - * Copyright (C) 2006 Juan Lang - * - * 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 "cryptres.h" - -#include "version.rc" - -#include "crypt32_De.rc" -#include "crypt32_En.rc" -#include "crypt32_Fr.rc" -#include "crypt32_Ko.rc" -#include "crypt32_Nl.rc" -#include "crypt32_No.rc" -#include "crypt32_Pt.rc" -#include "crypt32_Ro.rc" -#include "crypt32_Sv.rc" diff --git a/dlls/crypt32/crypt32_De.rc b/dlls/crypt32/crypt32_De.rc index 1d9cbb7..0a8bd38 100644 --- a/dlls/crypt32/crypt32_De.rc +++ b/dlls/crypt32/crypt32_De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cryptres.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
#pragma code_page(65001) @@ -239,5 +241,3 @@ STRINGTABLE DISCARDABLE IDS_NETSCAPE_SMIME_CA "S/MIME Zertifikationsautorität" IDS_NETSCAPE_SIGN_CA "Zertifikationsautorität der Signatur" } - -#pragma code_page(default) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index e24ce86..4670029 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cryptres.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_Fr.rc b/dlls/crypt32/crypt32_Fr.rc index 35ade1e..e6f57fc 100644 --- a/dlls/crypt32/crypt32_Fr.rc +++ b/dlls/crypt32/crypt32_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cryptres.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_Ko.rc b/dlls/crypt32/crypt32_Ko.rc index 51e3fc3..1a05353 100644 --- a/dlls/crypt32/crypt32_Ko.rc +++ b/dlls/crypt32/crypt32_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cryptres.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc index 70ea2ba..e12d25d 100644 --- a/dlls/crypt32/crypt32_Nl.rc +++ b/dlls/crypt32/crypt32_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cryptres.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_No.rc b/dlls/crypt32/crypt32_No.rc index 18de84b..2665286 100644 --- a/dlls/crypt32/crypt32_No.rc +++ b/dlls/crypt32/crypt32_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cryptres.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_Pt.rc b/dlls/crypt32/crypt32_Pt.rc index 424f8ea..5c5d3b7 100644 --- a/dlls/crypt32/crypt32_Pt.rc +++ b/dlls/crypt32/crypt32_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cryptres.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_Ro.rc b/dlls/crypt32/crypt32_Ro.rc index 6c02f5c..65d1c1e 100644 --- a/dlls/crypt32/crypt32_Ro.rc +++ b/dlls/crypt32/crypt32_Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cryptres.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -239,5 +241,3 @@ STRINGTABLE DISCARDABLE IDS_NETSCAPE_SMIME_CA "S/MIME CA" IDS_NETSCAPE_SIGN_CA "Semnătură CA" } - -#pragma code_page(default) diff --git a/dlls/crypt32/crypt32_Sv.rc b/dlls/crypt32/crypt32_Sv.rc index a0e9df5..4a242fe 100644 --- a/dlls/crypt32/crypt32_Sv.rc +++ b/dlls/crypt32/crypt32_Sv.rc @@ -17,6 +17,9 @@ * 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 "cryptres.h" + #pragma code_page(65001)
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL @@ -160,5 +163,3 @@ STRINGTABLE DISCARDABLE IDS_FILE_RECOVERY "File Recovery" IDS_ROOT_LIST_SIGNER "Root List Signer" } - -#pragma code_page(default) diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index fe2fd91..f9845be 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -18,6 +18,8 @@ #ifndef __WINE_CRYPTRES_H__ #define __WINE_CRYPTRES_H__
+#include <windef.h> + #define IDS_AUTHORITY_KEY_ID 1000 #define IDS_KEY_ATTRIBUTES 1001 #define IDS_KEY_USAGE_RESTRICTION 1002