5 files changed, 12 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 5be7492..8348924 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -285,6 +285,7 @@ GENERIC_OBJS = \
 	tclPosixStr.$(OBJEXT) \
 	tclPreserve.$(OBJEXT) \
 	tclProc.$(OBJEXT) \
+	tclProcess.$(OBJEXT) \
 	tclRegexp.$(OBJEXT) \
 	tclResolve.$(OBJEXT) \
 	tclResult.$(OBJEXT) \
diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
index deb9e39..cb136be 100644
--- a/win/buildall.vc.bat
+++ b/win/buildall.vc.bat
@@ -38,7 +38,9 @@ if defined WINDOWSSDKDIR (goto :startBuilding)
 :: might not be correct.  You should call it yourself prior to running
 :: this batchfile.
 ::
-call "C:\Program Files\Microsoft Developer Studio\vc98\bin\vcvars32.bat"
+REM call "C:\Program Files\Microsoft Developer Studio\vc98\bin\vcvars32.bat"
+set "VSCMD_START_DIR=%CD%"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
 if errorlevel 1 (goto no_vcvars)
 
 :startBuilding
diff --git a/win/makefile.vc b/win/makefile.vc
index 64717af..11b15a3 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -218,6 +218,7 @@ COREOBJS = \
 	$(TMP_DIR)\tclPosixStr.obj \
 	$(TMP_DIR)\tclPreserve.obj \
 	$(TMP_DIR)\tclProc.obj \
+	$(TMP_DIR)\tclProcess.obj \
 	$(TMP_DIR)\tclRegexp.obj \
 	$(TMP_DIR)\tclResolve.obj \
 	$(TMP_DIR)\tclResult.obj \
diff --git a/win/tcl.dsp b/win/tcl.dsp
index ad9c764..ab9ec26 100644
--- a/win/tcl.dsp
+++ b/win/tcl.dsp
@@ -1264,6 +1264,10 @@ SOURCE=..\generic\tclProc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\generic\tclProcess.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\generic\tclRegexp.c
 # End Source File
 # Begin Source File
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index d1b0596..a357412 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -869,7 +869,7 @@ TclpGetPid(
 
     Tcl_MutexLock(&pipeMutex);
     for (infoPtr = procList; infoPtr != NULL; infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->hProcess == (HANDLE) pid) {
+	if (infoPtr->dwProcessId == (DWORD) pid) {
 	    Tcl_MutexUnlock(&pipeMutex);
 	    return infoPtr->dwProcessId;
 	}
@@ -1163,7 +1163,7 @@ TclpCreateProcess(
     WaitForInputIdle(procInfo.hProcess, 5000);
     CloseHandle(procInfo.hThread);
 
-    *pidPtr = (Tcl_Pid) procInfo.hProcess;
+    *pidPtr = (Tcl_Pid) procInfo.dwProcessId;
     if (*pidPtr != 0) {
 	TclWinAddProcess(procInfo.hProcess, procInfo.dwProcessId);
     }
@@ -2347,7 +2347,7 @@ Tcl_WaitPid(
     prevPtrPtr = &procList;
     for (infoPtr = procList; infoPtr != NULL;
 	    prevPtrPtr = &infoPtr->nextPtr, infoPtr = infoPtr->nextPtr) {
-	 if (infoPtr->hProcess == (HANDLE) pid) {
+	 if (infoPtr->dwProcessId == (DWORD) pid) {
 	    *prevPtrPtr = infoPtr->nextPtr;
 	    break;
 	}