[cwittich] 45801: [CRYPTDLG] sync cryptdlg to wine 1.1.39

Author: cwittich
Date: Wed Mar  3 21:42:01 2010
New Revision: 45801

URL: http://svn.reactos.org/svn/reactos?rev=45801&view=rev
Log:
[CRYPTDLG]
sync cryptdlg to wine 1.1.39

Added:
    trunk/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc   (with props)
Modified:
    trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc
    trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc
    trunk/reactos/dll/win32/cryptdlg/main.c

Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdlg...
==============================================================================
--- trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] Wed Mar  3 21:42:01 2010
@@ -22,11 +22,15 @@
 #include "winuser.h"
 #include "cryptres.h"

+#include "cryptdlg_En.rc"
+#include "cryptdlg_Ko.rc"
+#include "cryptdlg_Nl.rc"
+
+/* UTF-8 */
 #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_Uk.rc"
 #include "cryptdlg_Pt.rc"
 #include "cryptdlg_Ro.rc"
+

Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdlg...
==============================================================================
--- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc [iso-8859-1] Wed Mar  3 21:42:01 2010
@@ -40,4 +40,3 @@
     IDS_NOTICE_NUM "Numéro de l'avis ="
     IDS_NOTICE_TEXT "Texte de l'avis ="
 }
-#pragma code_page(default)

Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdlg...
==============================================================================
--- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc (added)
+++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc [iso-8859-1] Wed Mar  3 21:42:01 2010
@@ -1,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="
+}

Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/cryptdlg/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/main.c?r...
==============================================================================
--- trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] Wed Mar  3 21:42:01 2010
@@ -535,7 +535,7 @@
      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 @@
             headingSep = colonSpace;
             sep = commaSep;
         }
+
         sepLen = strlenW(sep);
-        headingSepLen = strlenW(headingSep);

if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
         {