[vlc-commits] Win32: use %ls for wchar_t strings

Hannes Domani git at videolan.org
Wed Aug 13 21:40:02 CEST 2014


vlc/vlc-2.2 | branch: master | Hannes Domani <ssbssa at yahoo.de> | Mon Aug 11 20:51:22 2014 +0200| [170278862f902c35afc68971f7a5c304f9316aaa] | committer: Jean-Baptiste Kempf

Win32: use %ls for wchar_t strings

Signed-off-by: Rafaël Carré <funman at videolan.org>
(cherry picked from commit 63e775d57f411671d429b468b403716ffb7ed1fc)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=170278862f902c35afc68971f7a5c304f9316aaa
---

 bin/winvlc.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/winvlc.c b/bin/winvlc.c
index 2de6482..02bc5b6 100644
--- a/bin/winvlc.c
+++ b/bin/winvlc.c
@@ -296,7 +296,7 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo)
         osvi.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
         GetVersionEx( &osvi );
 
-        fwprintf( fd, L"[version]\nOS=%d.%d.%d.%d.%s\nVLC=" VERSION_MESSAGE,
+        fwprintf( fd, L"[version]\nOS=%d.%d.%d.%d.%ls\nVLC=" VERSION_MESSAGE,
                 osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber,
                 osvi.dwPlatformId, osvi.szCSDVersion);
 
@@ -347,7 +347,7 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo)
             wchar_t module[ 256 ];
             VirtualQuery( caller, &mbi, sizeof( mbi ) ) ;
             GetModuleFileName( mbi.AllocationBase, module, 256 );
-            fwprintf( fd, L"%p|%s\n", caller, module );
+            fwprintf( fd, L"%p|%ls\n", caller, module );
 
             /*The last BP points to NULL!*/
             caller = *(pBase + 1);
@@ -368,7 +368,7 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo)
                 for (unsigned int i = 0; i < size / sizeof(HMODULE); i++) {
                     wchar_t module[ 256 ];
                     GetModuleFileName(mods[i], module, 256);
-                    fwprintf( fd, L"%p|%s\n", mods[i], module);
+                    fwprintf( fd, L"%p|%ls\n", mods[i], module);
                 }
             }
             CloseHandle(hpid);



More information about the vlc-commits mailing list