[WINTRUST] Sync with Wine Staging 2.2. CORE-12823

e141d4a wintrust: Use return value of sprintf() instead of calling strlen().

svn path=/trunk/; revision=74199

diff --git a/reactos/dll/win32/wintrust/asn.c b/reactos/dll/win32/wintrust/asn.c
index eb35b3c..c0e416b 100644 (file)
--- a/reactos/dll/win32/wintrust/asn.c
+++ b/reactos/dll/win32/wintrust/asn.c
@@ -1883,10 +1883,9 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType,
                 LPSTR pszObjId = *(LPSTR *)pvStructInfo;
 
                 *pszObjId = 0;
                 LPSTR pszObjId = *(LPSTR *)pvStructInfo;
 
                 *pszObjId = 0;

-                sprintf(pszObjId, "%d.%d", pbEncoded[1 + lenBytes] / 40,
+                pszObjId += sprintf(pszObjId, "%d.%d", pbEncoded[1 + lenBytes] / 40,

                  pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] /
                  40) * 40);
                  pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] /
                  40) * 40);

-                pszObjId += strlen(pszObjId);

                 for (ptr = pbEncoded + 2 + lenBytes; ret &&
                  ptr - pbEncoded - 1 - lenBytes < dataLen; )
                 {
                 for (ptr = pbEncoded + 2 + lenBytes; ret &&
                  ptr - pbEncoded - 1 - lenBytes < dataLen; )
                 {


@@ -1901,8 +1900,7 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType,
                     }
                     val <<= 7;
                     val |= *ptr++;
                     }
                     val <<= 7;
                     val |= *ptr++;

-                    sprintf(pszObjId, ".%d", val);
-                    pszObjId += strlen(pszObjId);
+                    pszObjId += sprintf(pszObjId, ".%d", val);

                 }
             }
             else
                 }
             }
             else

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index c5ebd05..07db857 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -206,7 +206,7 @@ reactos/dll/win32/winmm               # Forked at Wine-20050628
 reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628
 reactos/dll/win32/winmm/wavemap       # Forked at Wine-20050628
 reactos/dll/win32/winscard            # Synced to WineStaging-2.2
 reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628
 reactos/dll/win32/winmm/wavemap       # Forked at Wine-20050628
 reactos/dll/win32/winscard            # Synced to WineStaging-2.2

-reactos/dll/win32/wintrust            # Synced to WineStaging-1.9.23
+reactos/dll/win32/wintrust            # Synced to WineStaging-2.2

 reactos/dll/win32/wldap32             # Synced to WineStaging-2.2
 reactos/dll/win32/wmi                 # Synced to WineStaging-1.9.11
 reactos/dll/win32/wmiutils            # Synced to WineStaging-1.9.11
 reactos/dll/win32/wldap32             # Synced to WineStaging-2.2
 reactos/dll/win32/wmi                 # Synced to WineStaging-1.9.11
 reactos/dll/win32/wmiutils            # Synced to WineStaging-1.9.11