1 files changed, 10 insertions, 90 deletions

diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index e026cbe..6027e32 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -17,7 +17,7 @@
 /*
  * For TestplatformChmod on Windows
  */
-#ifdef __WIN32__
+#ifdef _WIN32
 #include <aclapi.h>
 #endif
 
@@ -42,8 +42,6 @@ static int		TestwinclockCmd(ClientData dummy, Tcl_Interp* interp,
 static int		TestwinsleepCmd(ClientData dummy, Tcl_Interp* interp,
 			    int objc, Tcl_Obj *const objv[]);
 static Tcl_ObjCmdProc	TestExceptionCmd;
-static int		TestwincpuidCmd(ClientData dummy, Tcl_Interp* interp,
-			    int objc, Tcl_Obj *const objv[]);
 static int		TestplatformChmod(const char *nativePath, int pmode);
 static int		TestchmodCmd(ClientData dummy,
 			    Tcl_Interp *interp, int argc, const char **argv);
@@ -78,7 +76,6 @@ TclplatformtestInit(
     Tcl_CreateObjCommand(interp, "testvolumetype", TestvolumetypeCmd,
 	    NULL, NULL);
     Tcl_CreateObjCommand(interp, "testwinclock", TestwinclockCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "testwincpuid", TestwincpuidCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "testwinsleep", TestwinsleepCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "testexcept", TestExceptionCmd, NULL, NULL);
     return TCL_OK;
@@ -214,7 +211,7 @@ TestvolumetypeCmd(
 	TclWinConvertError(GetLastError());
 	return TCL_ERROR;
     }
-    Tcl_SetResult(interp, volType, TCL_VOLATILE);
+    Tcl_AppendResult(interp, volType, NULL);
     return TCL_OK;
 #undef VOL_BUF_SIZE
 }
@@ -294,83 +291,6 @@ TestwinclockCmd(
     return TCL_OK;
 }
 
-/*
- *----------------------------------------------------------------------
- *
- * TestwincpuidCmd --
- *
- *	Retrieves CPU ID information.
- *
- * Usage:
- *	testwincpuid <eax>
- *
- * Parameters:
- *	eax - The value to pass in the EAX register to a CPUID instruction.
- *
- * Results:
- *	Returns a four-element list containing the values from the EAX, EBX,
- *	ECX and EDX registers returned from the CPUID instruction.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestwincpuidCmd(
-    ClientData dummy,
-    Tcl_Interp* interp,		/* Tcl interpreter */
-    int objc,			/* Parameter count */
-    Tcl_Obj *const * objv)	/* Parameter vector */
-{
-    int status, index, i;
-    unsigned int regs[4];
-    Tcl_Obj *regsObjs[4];
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "eax");
-	return TCL_ERROR;
-    }
-    if (Tcl_GetIntFromObj(interp, objv[1], &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    status = TclWinCPUID((unsigned) index, regs);
-    if (status != TCL_OK) {
-	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj("operation not available", -1));
-	return status;
-    }
-    for (i=0 ; i<4 ; ++i) {
-	regsObjs[i] = Tcl_NewIntObj((int) regs[i]);
-    }
-    Tcl_SetObjResult(interp, Tcl_NewListObj(4, regsObjs));
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestwinsleepCmd --
- *
- *	Causes this process to wait for the given number of milliseconds by
- *	means of a direct call to Sleep.
- *
- * Usage:
- *	testwinsleep <n>
- *
- * Parameters:
- *	n - the number of milliseconds to sleep
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sleeps for the requisite number of milliseconds.
- *
- *----------------------------------------------------------------------
- */
-
 static int
 TestwinsleepCmd(
     ClientData clientData,	/* Unused */
@@ -430,7 +350,7 @@ TestExceptionCmd(
 	"invalid_disp", "guard_page", "invalid_handle", "ctrl+c",
 	NULL
     };
-    static DWORD exceptions[] = {
+    static const DWORD exceptions[] = {
 	EXCEPTION_ACCESS_VIOLATION, EXCEPTION_DATATYPE_MISALIGNMENT,
 	EXCEPTION_ARRAY_BOUNDS_EXCEEDED, EXCEPTION_FLT_DENORMAL_OPERAND,
 	EXCEPTION_FLT_DIVIDE_BY_ZERO, EXCEPTION_FLT_INEXACT_RESULT,
@@ -544,7 +464,7 @@ TestplatformChmod(
 	    goto done;
 	}
 
-	secDesc = (BYTE *) ckalloc(secDescLen);
+	secDesc = ckalloc(secDescLen);
 	if (!GetFileSecurityA(nativePath, infoBits,
 		(PSECURITY_DESCRIPTOR) secDesc, secDescLen, &secDescLen2)
 		|| (secDescLen < secDescLen2)) {
@@ -556,7 +476,7 @@ TestplatformChmod(
      * Get the World SID.
      */
 
-    userSid = (SID *) ckalloc(GetSidLengthRequired((UCHAR) 1));
+    userSid = ckalloc(GetSidLengthRequired((UCHAR) 1));
     InitializeSid(userSid, &userSidAuthority, (BYTE) 1);
     *(GetSidSubAuthority(userSid, 0)) = SECURITY_WORLD_RID;
 
@@ -582,7 +502,7 @@ TestplatformChmod(
 
     newAclSize = ACLSize.AclBytesInUse + sizeof(ACCESS_DENIED_ACE)
 	    + GetLengthSid(userSid) - sizeof(DWORD);
-    newAcl = (ACL *) ckalloc(newAclSize);
+    newAcl = ckalloc(newAclSize);
 
     /*
      * Initialize the new ACL.
@@ -657,16 +577,16 @@ TestplatformChmod(
 
   done:
     if (secDesc) {
-	ckfree((char *) secDesc);
+	ckfree(secDesc);
     }
     if (newAcl) {
-	ckfree((char *) newAcl);
+	ckfree(newAcl);
     }
     if (userSid) {
-	ckfree((char *) userSid);
+	ckfree(userSid);
     }
     if (userDomain) {
-	ckfree((char *) userDomain);
+	ckfree(userDomain);
     }
 
     if (res != 0) {