December 2009 - Wine-commits

Marcus Meissner : msvcrt: Remove unnecessary NULL check (Coverity).
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 4da51e087d922431651c9bdec7151336d8471c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da51e087d922431651c9bdec… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 4 10:10:48 2009 +0100 msvcrt: Remove unnecessary NULL check (Coverity). --- dlls/msvcrt/wcs.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0f3e9ee..6e08822 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -810,12 +810,9 @@ int CDECL MSVCRT_vsnprintf( char *str, unsigned int len, out.used = 0; out.len = len; - if( format ) - { - sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); - formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); - } + sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); + formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); r = pf_vsnprintf( &out, formatW, valist );

1 0

Jörg Höhle : mciwave: Abort the play loop in case of audio error.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: ee3c8794eaab91fb3a453c394b131ea894cc6e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3c8794eaab91fb3a453c394… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 17 09:59:05 2009 +0100 mciwave: Abort the play loop in case of audio error. --- dlls/mciwave/mciwave.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 6d9b39e..456936c 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -876,14 +876,18 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, */ waveHdr[whidx].dwBufferLength = count; waveHdr[whidx].dwFlags &= ~WHDR_DONE; - TRACE("before WODM_WRITE lpWaveHdr=%p dwBufferLength=%u dwBytesRecorded=%u\n", - &waveHdr[whidx], waveHdr[whidx].dwBufferLength, - waveHdr[whidx].dwBytesRecorded); + TRACE("before WODM_WRITE lpWaveHdr=%p dwBufferLength=%u\n", + &waveHdr[whidx], waveHdr[whidx].dwBufferLength); dwRet = waveOutWrite(wmw->hWave, &waveHdr[whidx], sizeof(WAVEHDR)); + if (dwRet) { + ERR("Aborting play loop, WODM_WRITE error %d\n", dwRet); + dwRet = MCIERR_HARDWARE; + break; + } left -= count; wmw->dwPosition += count; TRACE("after WODM_WRITE dwPosition=%u\n", wmw->dwPosition); - + /* InterlockedDecrement if and only if waveOutWrite is successful */ WAVE_mciPlayWaitDone(wmw); whidx ^= 1; } @@ -896,8 +900,6 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, waveOutUnprepareHeader(wmw->hWave, &waveHdr[0], sizeof(WAVEHDR)); waveOutUnprepareHeader(wmw->hWave, &waveHdr[1], sizeof(WAVEHDR)); - dwRet = 0; - cleanUp: if (dwFlags & MCI_NOTIFY) oldcb = InterlockedExchangePointer(&wmw->hCallback, NULL);

1 0

Francois Gouget : mshtml: Make nsACString_{Init,Finish}() static.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 661208f088c857f4cb4c0089a23455b93ec2cf65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661208f088c857f4cb4c0089a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 4 11:43:19 2009 +0100 mshtml: Make nsACString_{Init,Finish}() static. --- dlls/mshtml/mshtml_private.h | 2 -- dlls/mshtml/nsembed.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6fad6e5..2a77808 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -684,10 +684,8 @@ HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); void *nsalloc(size_t) __WINE_ALLOC_SIZE(1); void nsfree(void*); -void nsACString_Init(nsACString*,const char*); void nsACString_SetData(nsACString*,const char*); PRUint32 nsACString_GetData(const nsACString*,const char**); -void nsACString_Finish(nsACString*); void nsAString_Init(nsAString*,const PRUnichar*); void nsAString_SetData(nsAString*,const PRUnichar*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index a33f88d..773ebed 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -533,7 +533,7 @@ void nsfree(void *mem) nsIMemory_Free(nsmem, mem); } -void nsACString_Init(nsACString *str, const char *data) +static void nsACString_Init(nsACString *str, const char *data) { NS_CStringContainerInit(str); if(data) @@ -550,7 +550,7 @@ PRUint32 nsACString_GetData(const nsACString *str, const char **data) return NS_CStringGetData(str, data, NULL); } -void nsACString_Finish(nsACString *str) +static void nsACString_Finish(nsACString *str) { NS_CStringContainerFinish(str); }

1 0

Francois Gouget : wininet: Make FTP_FtpOpenFileW() static.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: f3b738f63c3e3987f51fda1dfd94de8a05718e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b738f63c3e3987f51fda1df… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 4 11:43:25 2009 +0100 wininet: Make FTP_FtpOpenFileW() static. --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 1d8a8f9..1736ad5 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1308,7 +1308,7 @@ static const object_vtbl_t FTPFILEVtbl = { * NULL on failure * */ -HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, +static HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, LPCWSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, DWORD_PTR dwContext) {

1 0

Alexandre Julliard : rpcrt4/tests: Skip the get_ranged_enum test on old Windows versions.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: e48f4253a493e4b91224810db3e0fd0976e6793b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48f4253a493e4b91224810db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 12:56:04 2009 +0100 rpcrt4/tests: Skip the get_ranged_enum test on old Windows versions. --- dlls/rpcrt4/tests/server.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 6453f53..2a32b45 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -904,8 +904,11 @@ basic_tests(void) x = echo_ranged_int(100); ok(x == 100, "echo_ranged_int() returned %d instead of 100\n", x); - get_ranged_enum(&re); - ok(re == RE3, "get_ranged_enum() returned %d instead of RE3\n", re); + if (!old_windows_version) + { + get_ranged_enum(&re); + ok(re == RE3, "get_ranged_enum() returned %d instead of RE3\n", re); + } } static void

1 0

Vincent Povirk : ole32: Forbid substorages of simple mode storages.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: cf5e6c571ad7b7a78289a116e9fdf2c2d7910997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5e6c571ad7b7a78289a116e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 2 11:28:09 2009 -0600 ole32: Forbid substorages of simple mode storages. --- dlls/ole32/storage32.c | 11 +++++++++++ dlls/ole32/tests/storage32.c | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 089206d..3991b9e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -530,6 +530,12 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( goto end; } + if (This->openFlags & STGM_SIMPLE) + { + res = STG_E_INVALIDFUNCTION; + goto end; + } + /* as documented */ if (snbExclude != NULL) { @@ -1022,6 +1028,11 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( if (ppstg == 0) return STG_E_INVALIDPOINTER; + if (This->openFlags & STGM_SIMPLE) + { + return STG_E_INVALIDFUNCTION; + } + if (pwcsName == 0) return STG_E_INVALIDNAME; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 53811db..6e222c7 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1774,9 +1774,10 @@ static void test_simple(void) { /* Tests for STGM_SIMPLE mode */ - IStorage *stg; + IStorage *stg, *stg2; HRESULT r; IStream *stm; + static const WCHAR stgname[] = { 'S','t','g',0 }; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; static const WCHAR stmname2[] = { 'S','m','a','l','l',0 }; LARGE_INTEGER pos; @@ -1789,6 +1790,10 @@ static void test_simple(void) r = StgCreateDocfile( filename, STGM_SIMPLE | STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); ok(r == S_OK, "got %08x\n", r); + r = IStorage_CreateStorage(stg, stgname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stg2); + ok(r == STG_E_INVALIDFUNCTION, "got %08x\n", r); + if (SUCCEEDED(r)) IStorage_Release(stg2); + r = IStorage_CreateStream(stg, stmname, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); ok(r == STG_E_INVALIDFLAG, "got %08x\n", r); r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); @@ -1853,6 +1858,10 @@ static void test_simple(void) } ok(r == S_OK, "got %08x\n", r); + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, NULL, 0, &stg2); + ok(r == STG_E_INVALIDFUNCTION, "got %08x\n", r); + if (SUCCEEDED(r)) IStorage_Release(stg2); + r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); ok(r == S_OK, "got %08x\n", r);

1 0

Roderick Colenbrander : wgl: Add a direct rendering check to new winediag channel.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: a191184ae9b2c3f7d94fd39c3674066fe79494b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a191184ae9b2c3f7d94fd39c3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Dec 3 21:12:26 2009 +0100 wgl: Add a direct rendering check to new winediag channel. --- dlls/winex11.drv/opengl.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 19e3fe3..aadb7f1 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -29,12 +29,20 @@ #include <stdlib.h> #include <string.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_SYS_UN_H +#include <sys/un.h> +#endif + #include "x11drv.h" #include "winternl.h" #include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBGL @@ -351,6 +359,19 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) TRACE("Client GLX vendor: : %s.\n", WineGLInfo.glxClientVendor); TRACE("Direct rendering enabled: %s\n", WineGLInfo.glxDirect ? "True" : "False"); + if(!WineGLInfo.glxDirect) + { + int fd = ConnectionNumber(gdi_display); + struct sockaddr_un uaddr; + unsigned int uaddrlen = sizeof(struct sockaddr_un); + + /* In general indirect rendering on a local X11 server indicates a driver problem. + * Detect a local X11 server by checking whether the X11 socket is a Unix socket. + */ + if(!getsockname(fd, &uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) + ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers haven't been installed correctly\n"); + } + if(vis) XFree(vis); if(ctx) { pglXMakeCurrent(gdi_display, None, NULL);

1 0

Juan Lang : wintrust: Fix memory leaks in tests.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: ba9ccc51e252ac9f38cb4c145b5619ac5508b6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9ccc51e252ac9f38cb4c145… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 3 15:12:57 2009 -0800 wintrust: Fix memory leaks in tests. --- dlls/wintrust/tests/softpub.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index c60ccb3..e01a26c 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -179,8 +179,12 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) ok(data.pasSigners[0].pasCertChain != NULL, "Expected pasCertChain to be allocated\n"); if (data.pasSigners[0].pasCertChain) + { ok(data.pasSigners[0].pasCertChain[0].pCert == cert, "Unexpected cert\n"); + CertFreeCertificateContext( + data.pasSigners[0].pasCertChain[0].pCert); + } CertFreeCertificateContext(cert); } else @@ -433,6 +437,9 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) (CERT_CONFIDENCE_SIG | CERT_CONFIDENCE_TIMENEST), "Expected CERT_CONFIDENCE_SIG | CERT_CONFIDENCE_TIMENEST, got %08x\n", data.pasSigners[0].pasCertChain[0].dwConfidence); + CertFreeCertificateContext( + data.pasSigners[0].pasCertChain[0].pCert); + CertFreeCertificateChain(data.pasSigners[0].pChainContext); CertFreeCertificateContext(cert); } }

1 0

Nikolay Sivov : kernel32/lcformat: Avoid back jumps on failure.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 1a2609189f9d96e919d32ac6560976b55a40cc39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2609189f9d96e919d32ac65… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 3 21:23:43 2009 +0300 kernel32/lcformat: Avoid back jumps on failure. --- dlls/kernel32/lcformat.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index f1b5ba5..83c190f 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -355,11 +355,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, /* Verify our arguments */ if ((cchOut && !lpStr) || !(node = NLS_GetFormats(lcid, dwFlags))) - { -NLS_GetDateTimeFormatW_InvalidParameter: - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } + goto invalid_parameter; if (dwFlags & ~(DATE_DATEVARSONLY|TIME_TIMEVARSONLY)) { @@ -367,15 +363,13 @@ NLS_GetDateTimeFormatW_InvalidParameter: ((dwFlags & DATE_DATEVARSONLY && dwFlags & ~DATE_FORMAT_FLAGS) || (dwFlags & TIME_TIMEVARSONLY && dwFlags & ~TIME_FORMAT_FLAGS))) { -NLS_GetDateTimeFormatW_InvalidFlags: - SetLastError(ERROR_INVALID_FLAGS); - return 0; + goto invalid_flags; } if (dwFlags & DATE_DATEVARSONLY) { if ((dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) == (DATE_LTRREADING|DATE_RTLREADING)) - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; else if (dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) FIXME("Unsupported flags: DATE_LTRREADING/DATE_RTLREADING\n"); @@ -387,10 +381,10 @@ NLS_GetDateTimeFormatW_InvalidFlags: case DATE_LONGDATE: case DATE_YEARMONTH: if (lpFormat) - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; break; default: - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; } } } @@ -429,7 +423,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: st.wDay = lpTime->wDay; if (st.wDay > 31 || st.wMonth > 12 || !SystemTimeToFileTime(&st, &ftTmp)) - goto NLS_GetDateTimeFormatW_InvalidParameter; + goto invalid_parameter; FileTimeToSystemTime(&ftTmp, &st); lpTime = &st; @@ -439,7 +433,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: { /* Verify the time */ if (lpTime->wHour > 24 || lpTime->wMinute > 59 || lpTime->wSecond > 59) - goto NLS_GetDateTimeFormatW_InvalidParameter; + goto invalid_parameter; } } @@ -464,7 +458,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: if (!cchOut) cchWritten++; /* Count size only */ else if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else if (!bSkipping) { lpStr[cchWritten] = *lpFormat; @@ -624,7 +618,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: else { memcpy(lpStr + cchWritten, szAdd, (cchOut - cchWritten) * sizeof(WCHAR)); - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; } } cchWritten += dwLen; @@ -636,7 +630,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: if (!cchOut) cchWritten++; /* Count size only */ else if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else if (!bSkipping || *lpFormat == ' ') { lpStr[cchWritten] = *lpFormat; @@ -650,7 +644,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: if (cchOut) { if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else lpStr[cchWritten] = '\0'; } @@ -659,10 +653,18 @@ NLS_GetDateTimeFormatW_InvalidFlags: TRACE("returning length=%d, ouput=%s\n", cchWritten, debugstr_w(lpStr)); return cchWritten; -NLS_GetDateTimeFormatW_Overrun: +overrun: TRACE("returning 0, (ERROR_INSUFFICIENT_BUFFER)\n"); SetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; + +invalid_parameter: + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + +invalid_flags: + SetLastError(ERROR_INVALID_FLAGS); + return 0; } /******************************************************************************

1 0

Nikolay Sivov : kernel32/lcformat: Don't use uneeded string conversion.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 8e4f283e2de59fad52b60c500007187e36b64a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e4f283e2de59fad52b60c500… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 3 23:02:21 2009 +0300 kernel32/lcformat: Don't use uneeded string conversion. --- dlls/kernel32/lcformat.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 83c190f..c24ee37 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -470,7 +470,6 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, else if ((dwFlags & DATE_DATEVARSONLY && IsDateFmtChar(*lpFormat)) || (dwFlags & TIME_TIMEVARSONLY && IsTimeFmtChar(*lpFormat))) { - char buffA[32]; WCHAR buff[32], fmtChar; LPCWSTR szAdd = NULL; DWORD dwVal = 0; @@ -604,9 +603,9 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, if (szAdd == buff && buff[0] == '\0') { + static const WCHAR fmtW[] = {'%','.','*','d',0}; /* We have a numeric value to add */ - sprintf(buffA, "%.*d", count, dwVal); - MultiByteToWideChar(CP_ACP, 0, buffA, -1, buff, sizeof(buff)/sizeof(WCHAR)); + snprintfW(buff, sizeof(buff)/sizeof(WCHAR), fmtW, count, dwVal); } dwLen = szAdd ? strlenW(szAdd) : 0;

1 0