Commit 17027886 authored by Hannes Domani's avatar Hannes Domani Committed by Jean-Baptiste Kempf

Win32: use %ls for wchar_t strings

Signed-off-by: default avatarRafaël Carré <funman@videolan.org>
(cherry picked from commit 63e775d57f411671d429b468b403716ffb7ed1fc)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 30634392
...@@ -296,7 +296,7 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo) ...@@ -296,7 +296,7 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo)
osvi.dwOSVersionInfoSize = sizeof( OSVERSIONINFO ); osvi.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
GetVersionEx( &osvi ); 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.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber,
osvi.dwPlatformId, osvi.szCSDVersion); osvi.dwPlatformId, osvi.szCSDVersion);
...@@ -347,7 +347,7 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo) ...@@ -347,7 +347,7 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo)
wchar_t module[ 256 ]; wchar_t module[ 256 ];
VirtualQuery( caller, &mbi, sizeof( mbi ) ) ; VirtualQuery( caller, &mbi, sizeof( mbi ) ) ;
GetModuleFileName( mbi.AllocationBase, module, 256 ); 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!*/ /*The last BP points to NULL!*/
caller = *(pBase + 1); caller = *(pBase + 1);
...@@ -368,7 +368,7 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo) ...@@ -368,7 +368,7 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo)
for (unsigned int i = 0; i < size / sizeof(HMODULE); i++) { for (unsigned int i = 0; i < size / sizeof(HMODULE); i++) {
wchar_t module[ 256 ]; wchar_t module[ 256 ];
GetModuleFileName(mods[i], 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); CloseHandle(hpid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment