[ros-diffs] [cfinck] 35128: Fix Wine-ish code, which doesn't work in ReactOS and only works in Wine by accident

Author: cfinck
Date: Tue Aug  5 11:30:03 2008
New Revision: 35128

URL: http://svn.reactos.org/svn/reactos?rev=35128&view=rev
Log:
Fix Wine-ish code, which doesn't work in ReactOS and only works in Wine by accident

Modified:
    trunk/reactos/dll/win32/advapi32/sec/cred.c

Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/cre…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] Tue Aug  5 11:30:03 2008
@@ -26,13 +26,6 @@
 #include "winreg.h"
 #include "wincred.h"
 #include "winternl.h"
-
-#ifdef __APPLE__
-# include <Security/SecKeychain.h>
-# include <Security/SecKeychainItem.h>
-# include <Security/SecKeychainSearch.h>
-#endif
-
 #include "../crypt/crypt.h"
 
 #include "wine/unicode.h"
@@ -946,7 +939,10 @@
     if (CredentialW->TargetName)
     {
         CredentialA->TargetName = buffer;
-        string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1,
CredentialA->TargetName, -1, NULL, NULL);
+
+        /* Buffer is guaranteed to be large enough */
+        string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1,
CredentialA->TargetName, 0x7FFFFFFF, NULL, NULL);
+
         buffer += string_len;
         *len += string_len;
     }
@@ -955,7 +951,7 @@
     if (CredentialW->Comment)
     {
         CredentialA->Comment = buffer;
-        string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1,
CredentialA->Comment, -1, NULL, NULL);
+        string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1,
CredentialA->Comment, 0x7FFFFFFF, NULL, NULL);
         buffer += string_len;
         *len += string_len;
     }
@@ -979,7 +975,7 @@
     if (CredentialW->TargetAlias)
     {
         CredentialA->TargetAlias = buffer;
-        string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1,
CredentialA->TargetAlias, -1, NULL, NULL);
+        string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1,
CredentialA->TargetAlias, 0x7FFFFFFF, NULL, NULL);
         buffer += string_len;
         *len += string_len;
     }
@@ -988,7 +984,7 @@
     if (CredentialW->UserName)
     {
         CredentialA->UserName = buffer;
-        string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1,
CredentialA->UserName, -1, NULL, NULL);
+        string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1,
CredentialA->UserName, 0x7FFFFFFF, NULL, NULL);
         buffer += string_len;
         *len += string_len;
     }
@@ -1018,7 +1014,7 @@
     if (CredentialA->TargetName)
     {
         CredentialW->TargetName = (LPWSTR)buffer;
-        string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1,
CredentialW->TargetName, -1);
+        string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1,
CredentialW->TargetName, 0x7FFFFFFF);
         buffer += sizeof(WCHAR) * string_len;
         *len += sizeof(WCHAR) * string_len;
     }
@@ -1027,7 +1023,7 @@
     if (CredentialA->Comment)
     {
         CredentialW->Comment = (LPWSTR)buffer;
-        string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1,
CredentialW->Comment, -1);
+        string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1,
CredentialW->Comment, 0x7FFFFFFF);
         buffer += sizeof(WCHAR) * string_len;
         *len += sizeof(WCHAR) * string_len;
     }
@@ -1051,7 +1047,7 @@
     if (CredentialA->TargetAlias)
     {
         CredentialW->TargetAlias = (LPWSTR)buffer;
-        string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1,
CredentialW->TargetAlias, -1);
+        string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1,
CredentialW->TargetAlias, 0x7FFFFFFF);
         buffer += sizeof(WCHAR) * string_len;
         *len += sizeof(WCHAR) * string_len;
     }
@@ -1060,7 +1056,7 @@
     if (CredentialA->UserName)
     {
         CredentialW->UserName = (LPWSTR)buffer;
-        string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1,
CredentialW->UserName, -1);
+        string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1,
CredentialW->UserName, 0x7FFFFFFF);
         buffer += sizeof(WCHAR) * string_len;
         *len += sizeof(WCHAR) * string_len;
     }