diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-03 13:23:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-03 13:24:43 +0200 |
| commit | 6cb1ddb7cc351f33673d846fedef0962ac49606f (patch) | |
| tree | 09418717dffcb3103896dc46ec2728438328404e /avmedia/source/vlc/wrapper/SymbolLoader.hxx | |
| parent | WaE: C4805: '!=' : unsafe mix of type 'bool' and type 'sal_Bool' (diff) | |
| download | core-6cb1ddb7cc351f33673d846fedef0962ac49606f.tar.gz core-6cb1ddb7cc351f33673d846fedef0962ac49606f.zip | |
Make --enable-vlc at least compile on Windows
...no idea whether the changes are actually any good, though.
Change-Id: I43965f6c10b572ee098bfacfa0995414a53af45f
Diffstat (limited to 'avmedia/source/vlc/wrapper/SymbolLoader.hxx')
| -rw-r--r-- | avmedia/source/vlc/wrapper/SymbolLoader.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index ae4cf668d740..bf75ac57d0e8 100644 --- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx +++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx @@ -10,6 +10,7 @@ #ifndef _SYMBOL_LOADER_HXX #define _SYMBOL_LOADER_HXX #if defined( WNT ) +# include <tchar.h> # include <windows.h> # include <winreg.h> #endif @@ -48,11 +49,12 @@ namespace if ( ::RegQueryValueEx( hKey, _T( "InstallDir" ), NULL, &dwType, ( LPBYTE )arCurrent, &dwCurrentSize ) == ERROR_SUCCESS ) { ::RegCloseKey( hKey ); - return OUString( arCurrent, MAX_PATH, rtl_TextEncoding, RTL_TEXTENCODING_UTF8 ) + "/"; + return OUString( arCurrent, strlen(arCurrent), RTL_TEXTENCODING_UTF8 ) + "/"; } ::RegCloseKey( hKey ); } + return OUString(); } #endif @@ -60,7 +62,7 @@ namespace template<size_t N> bool tryLink( oslModule &aModule, const ApiMap ( &pMap )[N] ) { - for (uint i = 0; i < N; ++i) + for (size_t i = 0; i < N; ++i) { SymbolFunc aMethod = ( SymbolFunc )osl_getFunctionSymbol ( aModule, OUString::createFromAscii( pMap[ i ].symName ).pData ); |