From 37f36cd583584ce3b4a4f08aa78d61ec58772e5d Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Wed, 3 Mar 2010 20:42:01 +0000
Subject: [PATCH] [CRYPTDLG] sync cryptdlg to wine 1.1.39

svn path=/trunk/; revision=45801
---
 reactos/dll/win32/cryptdlg/cryptdlg.rc    | 10 ++++--
 reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc |  1 -
 reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc | 42 +++++++++++++++++++++++
 reactos/dll/win32/cryptdlg/main.c         |  4 +--
 4 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc

diff --git a/reactos/dll/win32/cryptdlg/cryptdlg.rc b/reactos/dll/win32/cryptdlg/cryptdlg.rc
index dd9f97f4fde..7ea41c57407 100644
--- a/reactos/dll/win32/cryptdlg/cryptdlg.rc
+++ b/reactos/dll/win32/cryptdlg/cryptdlg.rc
@@ -22,11 +22,15 @@
 #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"
+
+/* UTF-8 */
+#include "cryptdlg_De.rc"
+#include "cryptdlg_Fr.rc"
+#include "cryptdlg_Lt.rc"
+#include "cryptdlg_Uk.rc"
 #include "cryptdlg_Pt.rc"
 #include "cryptdlg_Ro.rc"
+
diff --git a/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc b/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc
index 1deeaa31587..25d8a644ecf 100644
--- a/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc
+++ b/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc
@@ -40,4 +40,3 @@ STRINGTABLE DISCARDABLE
     IDS_NOTICE_NUM "Numéro de l'avis ="
     IDS_NOTICE_TEXT "Texte de l'avis ="
 }
-#pragma code_page(default)
diff --git a/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc b/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc
new file mode 100644
index 00000000000..d90226f9abc
--- /dev/null
+++ b/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc
@@ -0,0 +1,42 @@
+/*
+ * cryptdlg dll resources
+ *
+ * Copyright 2008 Juan Lang
+ * Copyright 2010 Igor Paliychuk
+ *
+ * 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 "cryptres.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_CERT_POLICY "Certificate Policy"
+    IDS_POLICY_ID "Policy Identifier: "
+    IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info"
+    IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id="
+    IDS_CPS "CPS" /* Certification Practice Statement */
+    IDS_USER_NOTICE "User Notice"
+    IDS_QUALIFIER "Qualifier"
+    IDS_NOTICE_REF "Notice Reference"
+    IDS_ORGANIZATION "Організація="
+    IDS_NOTICE_NUM "Notice Number="
+    IDS_NOTICE_TEXT "Notice Text="
+}
diff --git a/reactos/dll/win32/cryptdlg/main.c b/reactos/dll/win32/cryptdlg/main.c
index 1971578dbf5..f6653ec2c78 100644
--- a/reactos/dll/win32/cryptdlg/main.c
+++ b/reactos/dll/win32/cryptdlg/main.c
@@ -535,7 +535,7 @@ static BOOL CRYPT_FormatCPS(DWORD dwCertEncodingType,
      pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &cpsValue, &size)))
     {
         LPCWSTR headingSep, sep;
-        DWORD headingSepLen, sepLen;
+        DWORD sepLen;
 
         if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
         {
@@ -547,8 +547,8 @@ static BOOL CRYPT_FormatCPS(DWORD dwCertEncodingType,
             headingSep = colonSpace;
             sep = commaSep;
         }
+
         sepLen = strlenW(sep);
-        headingSepLen = strlenW(headingSep);
 
         if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
         {