mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added _scprintf macro to winpr because snprintf does not count characters on Windows.

Browse Source 
Modified write_rdp_file_ macros for windows compatibility
This commit is contained in:
Benoît LeBlanc 2013-11-07 13:44:18 -05:00
parent f4d0371480
commit c4dea17af3
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/common/file.c
View File

@ -643,7 +643,11 @@ BOOL freerdp_client_write_rdp_file(const rdpFile* file, const char* name, BOOL u
#define WRITE_RDP_FILE_VALUE_INTEGER(_format, _field) \
if (~__rdpFile->_field) \
{ \
__count = sprintf_s(__buffer == NULL ? NULL : __buffer + __current, __buffer == NULL ? 0 : __size - __required_size, _format, (int) __rdpFile->_field); \
if (__buffer) \
__count = sprintf_s(__buffer + __current, __size - __required_size, _format, (int) __rdpFile->_field); \
else \
__count = _scprintf(_format, (int) __rdpFile->_field); \
\
__required_size += __count; \
__current += __count; \
}
@ -651,7 +655,11 @@ if (~__rdpFile->_field) \
#define WRITE_RDP_FILE_VALUE_STRING(_format, _field) \
if (~((size_t) __rdpFile->_field) && __rdpFile->_field != NULL) \
{ \
__count = sprintf_s(__buffer == NULL ? NULL : __buffer + __current, __buffer == NULL ? 0 : __size - __required_size, _format, __rdpFile->_field); \
if (buffer) \
__count = sprintf_s(__buffer + __current, __size - __required_size, _format, __rdpFile->_field); \
else \
__count = _scprintf(_format, __rdpFile->_field); \
\
__required_size += __count; \
__current += __count; \
}

1
winpr/include/winpr/string.h
View File

@ -153,6 +153,7 @@ WINPR_API int lstrcmpW(LPCWSTR lpString1, LPCWSTR lpString2);
#endif
#define sprintf_s snprintf
#define _scprintf(_fmt, …) snprintf(NULL, 0, _fmt, ## __VAR_ARGS__)
/* Unicode Conversion */