diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-19 18:27:06 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-19 18:27:06 (GMT) |
| commit | 775e9aac009c6cd4a3cddbf67de9feac451f5662 (patch) | |
| tree | 7403b32378476c8e8c666143dd7e0c3871904a60 /win/tclWin32Dll.c | |
| parent | 0ff016021c022c1f60500a200461fee9721b97e1 (diff) | |
| parent | 39795a1da493f0ea91a228e768c0c656156ab340 (diff) | |
| download | tcl-775e9aac009c6cd4a3cddbf67de9feac451f5662.zip tcl-775e9aac009c6cd4a3cddbf67de9feac451f5662.tar.gz tcl-775e9aac009c6cd4a3cddbf67de9feac451f5662.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win/tclWin32Dll.c')
| -rw-r--r-- | win/tclWin32Dll.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 85e2925..821ac35 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.c @@ -316,7 +316,7 @@ TclWinDriveLetterForVolMountPoint( * Try to read the volume mount point and see where it points. */ - if (GetVolumeNameForVolumeMountPoint(drive, + if (GetVolumeNameForVolumeMountPointW(drive, Target, 55) != 0) { if (wcscmp(dlIter->volumeName, Target) == 0) { /* @@ -375,7 +375,7 @@ TclWinDriveLetterForVolMountPoint( * Try to read the volume mount point and see where it points. */ - if (GetVolumeNameForVolumeMountPoint(drive, + if (GetVolumeNameForVolumeMountPointW(drive, Target, 55) != 0) { int alreadyStored = 0; @@ -467,7 +467,7 @@ TclWinDriveLetterForVolMountPoint( #if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 #undef Tcl_WinUtfToTChar -WCHAR * +TCHAR * Tcl_WinUtfToTChar( const char *string, /* Source string in UTF-8. */ int len, /* Source string length in bytes, or -1 for @@ -476,19 +476,19 @@ Tcl_WinUtfToTChar( * converted string is stored. */ { Tcl_DStringInit(dsPtr); - return Tcl_UtfToWCharDString(string, len, dsPtr); + return (TCHAR *)Tcl_UtfToWCharDString(string, len, dsPtr); } #undef Tcl_WinTCharToUtf char * Tcl_WinTCharToUtf( - const WCHAR *string, /* Source string in Unicode. */ + const TCHAR *string, /* Source string in Unicode. */ int len, /* Source string length in bytes, or -1 for * platform-specific string length. */ Tcl_DString *dsPtr) /* Uninitialized or free DString in which the * converted string is stored. */ { Tcl_DStringInit(dsPtr); - return Tcl_WCharToUtfDString(string, len >> 1, dsPtr); + return Tcl_WCharToUtfDString((WCHAR *)string, len >> 1, dsPtr); } #endif /* !defined(TCL_NO_DEPRECATED) */ |