Merge 8.7

5 files changed, 11 insertions, 12 deletions

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 84c6d04..cc91d33 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3976,7 +3976,7 @@ extern const TclStubs *tclStubsPtr;
 		    _t.reserved = -1; \
 		    tclStubsPtr->tcl_GetTime((&_t.now)); \
 		    if (_t.reserved != -1) { \
-			_t.now.usec = _t.reserved; \
+			_t.now.usec = (long) _t.reserved; \
 		    } \
 		    *(t) = _t.now; \
 		} while (0)
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 2836e4f..01fa6c3 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -379,7 +379,7 @@ TclWinDriveLetterForVolMountPoint(
 	    if (!alreadyStored) {
 		dlPtr2 = (MountPointMap *)Tcl_Alloc(sizeof(MountPointMap));
 		dlPtr2->volumeName = (WCHAR *)TclNativeDupInternalRep(Target);
-		dlPtr2->driveLetter = (char) drive[0];
+		dlPtr2->driveLetter = (WCHAR) drive[0];
 		dlPtr2->nextPtr = driveLetterLookup;
 		driveLetterLookup = dlPtr2;
 	    }
@@ -405,7 +405,7 @@ TclWinDriveLetterForVolMountPoint(
 
     dlPtr2 = (MountPointMap *)Tcl_Alloc(sizeof(MountPointMap));
     dlPtr2->volumeName = (WCHAR *)TclNativeDupInternalRep((void *)mountPoint);
-    dlPtr2->driveLetter = -1;
+    dlPtr2->driveLetter = (WCHAR)-1;
     dlPtr2->nextPtr = driveLetterLookup;
     driveLetterLookup = dlPtr2;
     Tcl_MutexUnlock(&mountPointMap);
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 4968802..ca79e42 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -613,7 +613,7 @@ FileInputProc(
 
     if (ReadFile(infoPtr->handle, (LPVOID) buf, (DWORD) bufSize, &bytesRead,
 	    (LPOVERLAPPED) NULL) != FALSE) {
-	return bytesRead;
+	return (int)bytesRead;
     }
 
     Tcl_WinConvertError(GetLastError());
@@ -670,7 +670,7 @@ FileOutputProc(
 	return -1;
     }
     infoPtr->dirty = 1;
-    return bytesWritten;
+    return (int)bytesWritten;
 }
 
 /*
@@ -1483,7 +1483,7 @@ NativeIsComPort(
     const WCHAR *nativePath)	/* Path of file to access, native encoding. */
 {
     const WCHAR *p = (const WCHAR *) nativePath;
-    int i, len = wcslen(p);
+    size_t i, len = wcslen(p);
 
     /*
      * 1. Look for com[1-9]:?
diff --git a/win/tclWinPanic.c b/win/tclWinPanic.c
index 7c21167..7928dcd 100644
--- a/win/tclWinPanic.c
+++ b/win/tclWinPanic.c
@@ -56,10 +56,10 @@ Tcl_ConsolePanic(
     if (IsDebuggerPresent()) {
 	OutputDebugStringW(msgString);
     } else if (_isatty(2)) {
-	WriteConsoleW(handle, msgString, wcslen(msgString), &dummy, 0);
+	WriteConsoleW(handle, msgString, (DWORD)wcslen(msgString), &dummy, 0);
     } else {
 	buf[0] = '\xEF'; buf[1] = '\xBB'; buf[2] = '\xBF'; /* UTF-8 bom */
-	WriteFile(handle, buf, strlen(buf), &dummy, 0);
+	WriteFile(handle, buf, (DWORD)strlen(buf), &dummy, 0);
 	WriteFile(handle, "\n", 1, &dummy, 0);
 	FlushFileBuffers(handle);
     }
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index deff000..c7abcdc 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -425,7 +425,6 @@ TestplatformChmod(
     DWORD attr, newAclSize;
     PACL newAcl = NULL;
     int res = 0;
-    SID_IDENTIFIER_AUTHORITY worldAuthority = SECURITY_WORLD_SID_AUTHORITY;
 
     HANDLE hToken = NULL;
     int i;
@@ -457,7 +456,7 @@ TestplatformChmod(
 	GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
 	goto done;
     }
-    pTokenUser = Tcl_Alloc(dw);
+    pTokenUser = (TOKEN_USER *)Tcl_Alloc(dw);
     if (!GetTokenInformation(hToken, TokenUser, pTokenUser, dw, &dw)) {
 	goto done;
     }
@@ -499,7 +498,7 @@ TestplatformChmod(
 		GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
 	    goto done;
 	}
-	pTokenGroup = Tcl_Alloc(dw);
+	pTokenGroup = (TOKEN_PRIMARY_GROUP *)Tcl_Alloc(dw);
 	if (!GetTokenInformation(hToken, TokenPrimaryGroup, pTokenGroup, dw, &dw)) {
 	    Tcl_Free(pTokenGroup);
 	    goto done;
@@ -566,7 +565,7 @@ TestplatformChmod(
 	newAclSize +=
 	    offsetof(ACCESS_ALLOWED_ACE, SidStart) + aceEntry[i].sidLen;
     }
-    newAcl = Tcl_Alloc(newAclSize);
+    newAcl = (PACL)Tcl_Alloc(newAclSize);
     if (!InitializeAcl(newAcl, newAclSize, ACL_REVISION)) {
 	goto done;
     }