Author: akhaldi
Date: Sun Mar 19 17:09:31 2017
New Revision: 74199
URL: http://svn.reactos.org/svn/reactos?rev=74199&view=rev
Log:
[WINTRUST] Sync with Wine Staging 2.2. CORE-12823
e141d4a wintrust: Use return value of sprintf() instead of calling strlen().
Modified:
trunk/reactos/dll/win32/wintrust/asn.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/wintrust/asn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?rev=74199&r1=74198&r2=74199&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] Sun Mar 19
17:09:31 2017
@@ -1883,10 +1883,9 @@
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);
- pszObjId += strlen(pszObjId);
for (ptr = pbEncoded + 2 + lenBytes; ret &&
ptr - pbEncoded - 1 - lenBytes < dataLen; )
{
@@ -1901,8 +1900,7 @@
}
val <<= 7;
val |= *ptr++;
- sprintf(pszObjId, ".%d", val);
- pszObjId += strlen(pszObjId);
+ pszObjId += sprintf(pszObjId, ".%d", val);
}
}
else
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=74199&r1=74198&r2=74199&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 19 17:09:31 2017
@@ -206,7 +206,7 @@
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
