From c0039ecd859f2262a71ed524ff9e6d8546d9a858 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Tue, 30 Jun 2009 13:16:05 +0200 Subject: [PATCH] cryptdlg: Build language resource files separately. Instead of including them from an other rc file. --- dlls/cryptdlg/Makefile.in | 9 ++++++++- dlls/cryptdlg/cryptdlg.rc | 31 ------------------------------- dlls/cryptdlg/cryptdlg_De.rc | 2 ++ dlls/cryptdlg/cryptdlg_En.rc | 2 ++ dlls/cryptdlg/cryptdlg_Fr.rc | 2 ++ dlls/cryptdlg/cryptdlg_Ko.rc | 2 ++ dlls/cryptdlg/cryptdlg_Lt.rc | 4 ++-- dlls/cryptdlg/cryptdlg_Nl.rc | 2 ++ dlls/cryptdlg/cryptdlg_Ro.rc | 4 ++-- dlls/cryptdlg/cryptres.h | 2 ++ 10 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 dlls/cryptdlg/cryptdlg.rc diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index dd5a8155860..311e805fb15 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -8,7 +8,14 @@ IMPORTS = cryptui crypt32 wintrust user32 advapi32 kernel32 C_SRCS = \ main.c -RC_SRCS = cryptdlg.rc +RC_SRCS = \ + cryptdlg_De.rc \ + cryptdlg_En.rc \ + cryptdlg_Fr.rc \ + cryptdlg_Ko.rc \ + cryptdlg_Lt.rc \ + cryptdlg_Nl.rc \ + cryptdlg_Ro.rc @MAKE_DLL_RULES@ diff --git a/dlls/cryptdlg/cryptdlg.rc b/dlls/cryptdlg/cryptdlg.rc deleted file mode 100644 index ac5ce114e24..00000000000 --- a/dlls/cryptdlg/cryptdlg.rc +++ /dev/null @@ -1,31 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2008 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 "cryptdlg_De.rc" -#include "cryptdlg_En.rc" -#include "cryptdlg_Fr.rc" -#include "cryptdlg_Ko.rc" -#include "cryptdlg_Lt.rc" -#include "cryptdlg_Nl.rc" -#include "cryptdlg_Ro.rc" diff --git a/dlls/cryptdlg/cryptdlg_De.rc b/dlls/cryptdlg/cryptdlg_De.rc index 647171d8983..d3181ef51b0 100644 --- a/dlls/cryptdlg/cryptdlg_De.rc +++ b/dlls/cryptdlg/cryptdlg_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/cryptdlg/cryptdlg_En.rc b/dlls/cryptdlg/cryptdlg_En.rc index 99126c42898..3ab5f94cbbd 100644 --- a/dlls/cryptdlg/cryptdlg_En.rc +++ b/dlls/cryptdlg/cryptdlg_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/cryptdlg/cryptdlg_Fr.rc b/dlls/cryptdlg/cryptdlg_Fr.rc index 23de9ebd572..f71be3ae0fd 100644 --- a/dlls/cryptdlg/cryptdlg_Fr.rc +++ b/dlls/cryptdlg/cryptdlg_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/cryptdlg/cryptdlg_Ko.rc b/dlls/cryptdlg/cryptdlg_Ko.rc index 3778a57b71d..548a74d7939 100644 --- a/dlls/cryptdlg/cryptdlg_Ko.rc +++ b/dlls/cryptdlg/cryptdlg_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/cryptdlg/cryptdlg_Lt.rc b/dlls/cryptdlg/cryptdlg_Lt.rc index d239dbcce43..a9674946ba5 100644 --- a/dlls/cryptdlg/cryptdlg_Lt.rc +++ b/dlls/cryptdlg/cryptdlg_Lt.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) @@ -37,5 +39,3 @@ STRINGTABLE DISCARDABLE IDS_NOTICE_NUM "Pranešimo numeris=" IDS_NOTICE_TEXT "Pranešimo tekstas=" } - -#pragma code_page(default) diff --git a/dlls/cryptdlg/cryptdlg_Nl.rc b/dlls/cryptdlg/cryptdlg_Nl.rc index 27b09357eb0..3e8aca0d11a 100644 --- a/dlls/cryptdlg/cryptdlg_Nl.rc +++ b/dlls/cryptdlg/cryptdlg_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/cryptdlg/cryptdlg_Ro.rc b/dlls/cryptdlg/cryptdlg_Ro.rc index 998ce7fb469..17b60e0ef5c 100644 --- a/dlls/cryptdlg/cryptdlg_Ro.rc +++ b/dlls/cryptdlg/cryptdlg_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) @@ -37,5 +39,3 @@ STRINGTABLE DISCARDABLE IDS_NOTICE_NUM "Numărul notiței=" IDS_NOTICE_TEXT "Textul notiței=" } - -#pragma code_page(default) diff --git a/dlls/cryptdlg/cryptres.h b/dlls/cryptdlg/cryptres.h index b64459aca78..4d3c2d2ffb3 100644 --- a/dlls/cryptdlg/cryptres.h +++ b/dlls/cryptdlg/cryptres.h @@ -18,6 +18,8 @@ #ifndef __CRYPTRES_H__ #define __CRYPTRES_H__ +#include + #define IDS_CERT_POLICY 100 #define IDS_POLICY_ID 101 #define IDS_POLICY_QUALIFIER_INFO 102