[FRQ 2965056]: Windows build with -DUNICODE

Add netapi32 to the windows link line, so we no longer have to use LoadLibrary to access those functions.

8 files changed, 174 insertions, 416 deletions

diff --git a/ChangeLog b/ChangeLog
index b473254..aa531b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-11  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/tclWinDde.c:    [FRQ 2965056]: Windows build with -DUNICODE
+	* win/tclWinReg.c:
+	* win/tclWinTest.c:   More cleanups
+	* win/tclWinFile.c:   Add netapi32 to the link line, so we no longer
+	* win/tcl.m4:         have to use LoadLibrary to access those functions.
+	* win/makefile.vc:
+	* win/configure:      (Re-generate with autoconf-2.59)
+
 2010-10-09  Miguel Sofer  <msofer@users.sf.net>
 
 	* generic/tclExecute.c: fix overallocation of exec stack in TEBC
diff --git a/win/configure b/win/configure
index c059ce8..f6f8b81 100755
--- a/win/configure
+++ b/win/configure
@@ -4015,7 +4015,7 @@ echo "$as_me: WARNING: 64bit mode not supported with GCC on Windows" >&2;}
 	fi
 	SHLIB_LD=""
 	SHLIB_LD_LIBS='${LIBS}'
-	LIBS="-lkernel32 -luser32 -ladvapi32 -lws2_32"
+	LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32"
 	# mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't
 	LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32"
 	STLIB_LD='${AR} cr'
@@ -4177,7 +4177,7 @@ echo "${ECHO_T}   Using 64-bit $MACHINE mode" >&6
 	    fi
 	fi
 
-	LIBS="kernel32.lib user32.lib advapi32.lib ws2_32.lib"
+	LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib"
 	if test "$do64bit" != "no" ; then
 	    # The space-based-path will work for the Makefile, but will
 	    # not work if AC_TRY_COMPILE is called.  TEA has the
diff --git a/win/makefile.vc b/win/makefile.vc
index 8e0ea11..dc8bce5 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,7 +13,7 @@
 # Copyright (c) 2003-2008 Pat Thoyts.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.214 2010/09/09 14:30:20 nijtmans Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.215 2010/10/11 12:11:53 nijtmans Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -522,7 +522,7 @@ dlllflags = $(lflags) -dll
 conlflags = $(lflags) -subsystem:console
 guilflags = $(lflags) -subsystem:windows
 
-baselibs   = kernel32.lib user32.lib advapi32.lib ws2_32.lib
+baselibs   = netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
 # Avoid 'unresolved external symbol __security_cookie' errors.
 # c.f. http://support.microsoft.com/?id=894573
 !if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
diff --git a/win/tcl.m4 b/win/tcl.m4
index 20845c0..ff07c34 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -463,7 +463,7 @@ file for information about building with Mingw.])
 	fi
 	SHLIB_LD=""
 	SHLIB_LD_LIBS='${LIBS}'
-	LIBS="-lkernel32 -luser32 -ladvapi32 -lws2_32"
+	LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32"
 	# mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't
 	LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32"
 	STLIB_LD='${AR} cr'
@@ -615,7 +615,7 @@ file for information about building with Mingw.])
 	    fi
 	fi
 
-	LIBS="kernel32.lib user32.lib advapi32.lib ws2_32.lib"
+	LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib"
 	if test "$do64bit" != "no" ; then
 	    # The space-based-path will work for the Makefile, but will
 	    # not work if AC_TRY_COMPILE is called.  TEA has the
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 9909d3a..2b1286c 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -9,15 +9,9 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinDde.c,v 1.44 2010/08/30 09:19:38 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinDde.c,v 1.45 2010/10/11 12:11:53 nijtmans Exp $
  */
 
-/* TODO: This file does not compile in UNICODE mode.
- * See [Freq 2965056]: Windows build with -DUNICODE
- */
-#undef UNICODE
-#undef _UNICODE
-
 #undef STATIC_BUILD
 #ifndef USE_TCL_STUBS
 #   define USE_TCL_STUBS
@@ -87,7 +81,7 @@ static Tcl_ThreadDataKey dataKey;
 
 static HSZ ddeServiceGlobal = 0;
 static DWORD ddeInstance;	/* The application instance handle given to us
-				 * by DdeInitialize. */
+				 * by DdeInitializeA. */
 static int ddeIsServer = 0;
 
 #define TCL_DDE_VERSION		"1.3.2"
@@ -226,7 +220,7 @@ Initialize(void)
     if (ddeInstance == 0) {
 	Tcl_MutexLock(&ddeMutex);
 	if (ddeInstance == 0) {
-	    if (DdeInitialize(&ddeInstance, DdeServerProc,
+	    if (DdeInitializeA(&ddeInstance, DdeServerProc,
 		    CBF_SKIP_REGISTRATIONS | CBF_SKIP_UNREGISTRATIONS
 		    | CBF_FAIL_POKES, 0) != DMLERR_NO_ERROR) {
 		ddeInstance = 0;
@@ -239,7 +233,7 @@ Initialize(void)
 	if ((ddeServiceGlobal == 0) && (nameFound != 0)) {
 	    ddeIsServer = 1;
 	    Tcl_CreateExitHandler(DdeExitProc, NULL);
-	    ddeServiceGlobal = DdeCreateStringHandle(ddeInstance,
+	    ddeServiceGlobal = DdeCreateStringHandleA(ddeInstance,
 		    TCL_DDE_SERVICE_NAME, 0);
 	    DdeNameService(ddeInstance, ddeServiceGlobal, 0L, DNS_REGISTER);
 	} else {
@@ -346,7 +340,7 @@ DdeSetServerName(
 		    &srvPtrPtr);
 	}
 	if (r != TCL_OK) {
-	    OutputDebugString(Tcl_GetStringResult(interp));
+	    OutputDebugStringA(Tcl_GetStringResult(interp));
 	    return NULL;
 	}
 
@@ -631,11 +625,11 @@ DdeServerProc(
 	 * sure we have a valid topic.
 	 */
 
-	len = DdeQueryString(ddeInstance, ddeTopic, NULL, 0, 0);
+	len = DdeQueryStringA(ddeInstance, ddeTopic, NULL, 0, 0);
 	Tcl_DStringInit(&dString);
 	Tcl_DStringSetLength(&dString, len);
 	utilString = Tcl_DStringValue(&dString);
-	DdeQueryString(ddeInstance, ddeTopic, utilString, (DWORD) len + 1,
+	DdeQueryStringA(ddeInstance, ddeTopic, utilString, (DWORD) len + 1,
 		CP_WINANSI);
 
 	for (riPtr = tsdPtr->interpListPtr; riPtr != NULL;
@@ -656,11 +650,11 @@ DdeServerProc(
 	 * result to return in an XTYP_REQUEST.
 	 */
 
-	len = DdeQueryString(ddeInstance, ddeTopic, NULL, 0, 0);
+	len = DdeQueryStringA(ddeInstance, ddeTopic, NULL, 0, 0);
 	Tcl_DStringInit(&dString);
 	Tcl_DStringSetLength(&dString, len);
 	utilString = Tcl_DStringValue(&dString);
-	DdeQueryString(ddeInstance, ddeTopic, utilString, (DWORD) len + 1,
+	DdeQueryStringA(ddeInstance, ddeTopic, utilString, (DWORD) len + 1,
 		CP_WINANSI);
 	for (riPtr = tsdPtr->interpListPtr; riPtr != NULL;
 		riPtr = riPtr->nextPtr) {
@@ -723,11 +717,11 @@ DdeServerProc(
 	if (convPtr != NULL) {
 	    BYTE *returnString;
 
-	    len = DdeQueryString(ddeInstance, ddeItem, NULL, 0, CP_WINANSI);
+	    len = DdeQueryStringA(ddeInstance, ddeItem, NULL, 0, CP_WINANSI);
 	    Tcl_DStringInit(&dString);
 	    Tcl_DStringSetLength(&dString, len);
 	    utilString = Tcl_DStringValue(&dString);
-	    DdeQueryString(ddeInstance, ddeItem, utilString, (DWORD) len + 1,
+	    DdeQueryStringA(ddeInstance, ddeItem, utilString, (DWORD) len + 1,
 		    CP_WINANSI);
 	    if (strcasecmp(utilString, TCL_DDE_EXECUTE_RESULT) == 0) {
 		returnString = (BYTE *)
@@ -828,9 +822,9 @@ DdeServerProc(
 	len = dlen;
 	for (i = 0, riPtr = tsdPtr->interpListPtr; i < numItems;
 		i++, riPtr = riPtr->nextPtr) {
-	    returnPtr[i].hszSvc = DdeCreateStringHandle(ddeInstance,
+	    returnPtr[i].hszSvc = DdeCreateStringHandleA(ddeInstance,
 		    TCL_DDE_SERVICE_NAME, CP_WINANSI);
-	    returnPtr[i].hszTopic = DdeCreateStringHandle(ddeInstance,
+	    returnPtr[i].hszTopic = DdeCreateStringHandleA(ddeInstance,
 		    riPtr->name, CP_WINANSI);
 	}
 	returnPtr[i].hszSvc = NULL;
@@ -895,8 +889,8 @@ MakeDdeConnection(
     HSZ ddeTopic, ddeService;
     HCONV ddeConv;
 
-    ddeService = DdeCreateStringHandle(ddeInstance, TCL_DDE_SERVICE_NAME, 0);
-    ddeTopic = DdeCreateStringHandle(ddeInstance, (void *) name, 0);
+    ddeService = DdeCreateStringHandleA(ddeInstance, TCL_DDE_SERVICE_NAME, 0);
+    ddeTopic = DdeCreateStringHandleA(ddeInstance, (void *) name, 0);
 
     ddeConv = DdeConnect(ddeInstance, ddeService, ddeTopic, NULL);
     DdeFreeStringHandle(ddeInstance, ddeService);
@@ -938,7 +932,7 @@ static int
 DdeCreateClient(
     struct DdeEnumServices *es)
 {
-    WNDCLASSEX wc;
+    WNDCLASSEXA wc;
     static const char *szDdeClientClassName = "TclEval client class";
     static const char *szDdeClientWindowName = "TclEval client window";
 
@@ -952,8 +946,8 @@ DdeCreateClient(
      * Register and create the callback window.
      */
 
-    RegisterClassEx(&wc);
-    es->hwnd = CreateWindowEx(0, szDdeClientClassName, szDdeClientWindowName,
+    RegisterClassExA(&wc);
+    es->hwnd = CreateWindowExA(0, szDdeClientClassName, szDdeClientWindowName,
 	    WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL, (LPVOID)es);
     return TCL_OK;
 }
@@ -975,7 +969,7 @@ DdeClientWindowProc(
 #ifdef _WIN64
 	SetWindowLongPtr(hwnd, GWLP_USERDATA, (long)es);
 #else
-	SetWindowLong(hwnd, GWL_USERDATA, (long)es);
+	SetWindowLongA(hwnd, GWL_USERDATA, (long)es);
 #endif
 	return (LRESULT) 0L;
     }
@@ -983,7 +977,7 @@ DdeClientWindowProc(
 	return DdeServicesOnAck(hwnd, wParam, lParam);
 	break;
     default:
-	return DefWindowProc(hwnd, uMsg, wParam, lParam);
+	return DefWindowProcA(hwnd, uMsg, wParam, lParam);
     }
 }
 
@@ -1002,7 +996,7 @@ DdeServicesOnAck(
 #ifdef _WIN64
     es = (struct DdeEnumServices *) GetWindowLongPtr(hwnd, GWLP_USERDATA);
 #else
-    es = (struct DdeEnumServices *) GetWindowLong(hwnd, GWL_USERDATA);
+    es = (struct DdeEnumServices *) GetWindowLongA(hwnd, GWL_USERDATA);
 #endif
 
     if ((es->service == (ATOM)0 || es->service == service)
@@ -1039,7 +1033,7 @@ DdeServicesOnAck(
      * Tell the server we are no longer interested.
      */
 
-    PostMessage(hwndRemote, WM_DDE_TERMINATE, (WPARAM)hwnd, 0L);
+    PostMessageA(hwndRemote, WM_DDE_TERMINATE, (WPARAM)hwnd, 0L);
     return 0L;
 }
 
@@ -1051,7 +1045,7 @@ DdeEnumWindowsCallback(
     DWORD dwResult = 0;
     struct DdeEnumServices *es = (struct DdeEnumServices *) lParam;
 
-    SendMessageTimeout(hwndTarget, WM_DDE_INITIATE, (WPARAM)es->hwnd,
+    SendMessageTimeoutA(hwndTarget, WM_DDE_INITIATE, (WPARAM)es->hwnd,
 	    MAKELONG(es->service, es->topic), SMTO_ABORTIFHUNG, 1000,
 	    &dwResult);
     return TRUE;
@@ -1068,8 +1062,8 @@ DdeGetServicesList(
     es.interp = interp;
     es.result = TCL_OK;
     es.service = (serviceName == NULL)
-	    ? (ATOM)0 : GlobalAddAtom(serviceName);
-    es.topic = (topicName == NULL) ? (ATOM)0 : GlobalAddAtom(topicName);
+	    ? (ATOM)0 : GlobalAddAtomA(serviceName);
+    es.topic = (topicName == NULL) ? (ATOM)0 : GlobalAddAtomA(topicName);
 
     Tcl_ResetResult(interp); /* our list is to be appended to result. */
     DdeCreateClient(&es);
@@ -1330,7 +1324,7 @@ DdeObjCmd(
     if (length == 0) {
 	serviceName = NULL;
     } else if ((index != DDE_SERVERNAME) && (index != DDE_EVAL)) {
-	ddeService = DdeCreateStringHandle(ddeInstance, (void *) serviceName,
+	ddeService = DdeCreateStringHandleA(ddeInstance, (void *) serviceName,
 		CP_WINANSI);
     }
 
@@ -1339,7 +1333,7 @@ DdeObjCmd(
 	if (length == 0) {
 	    topicName = NULL;
 	} else {
-	    ddeTopic = DdeCreateStringHandle(ddeInstance, (void *) topicName,
+	    ddeTopic = DdeCreateStringHandleA(ddeInstance, (void *) topicName,
 		    CP_WINANSI);
 	}
     }
@@ -1417,7 +1411,7 @@ DdeObjCmd(
 	    result = TCL_ERROR;
 	} else {
 	    Tcl_Obj *returnObjPtr;
-	    ddeItem = DdeCreateStringHandle(ddeInstance, (void *) itemString,
+	    ddeItem = DdeCreateStringHandleA(ddeInstance, (void *) itemString,
 		    CP_WINANSI);
 	    if (ddeItem != NULL) {
 		ddeData = DdeClientTransaction(NULL, 0, hConv, ddeItem,
@@ -1469,7 +1463,7 @@ DdeObjCmd(
 	    SetDdeError(interp);
 	    result = TCL_ERROR;
 	} else {
-	    ddeItem = DdeCreateStringHandle(ddeInstance, (void *) itemString,
+	    ddeItem = DdeCreateStringHandleA(ddeInstance, (void *) itemString,
 		    CP_WINANSI);
 	    if (ddeItem != NULL) {
 		ddeData = DdeClientTransaction(dataString, (DWORD) length+1,
@@ -1627,7 +1621,7 @@ DdeObjCmd(
 			0xFFFFFFFF, hConv, 0,
 			CF_TEXT, XTYP_EXECUTE, 30000, NULL);
 		if (ddeData != 0) {
-		    ddeCookie = DdeCreateStringHandle(ddeInstance,
+		    ddeCookie = DdeCreateStringHandleA(ddeInstance,
 			    TCL_DDE_EXECUTE_RESULT, CP_WINANSI);
 		    ddeData = DdeClientTransaction(NULL, 0, hConv, ddeCookie,
 			    CF_TEXT, XTYP_REQUEST, 30000, NULL);
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 0bdcbd8..e43e593 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinFile.c,v 1.113 2010/09/21 20:22:51 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinFile.c,v 1.114 2010/10/11 12:11:53 nijtmans Exp $
  */
 
 #include "tclWinInt.h"
@@ -19,7 +19,7 @@
 #include <winioctl.h>
 #include <sys/stat.h>
 #include <shlobj.h>
-#include <lmaccess.h>		/* For TclpGetUserHome(). */
+#include <lm.h>		/* For TclpGetUserHome(). */
 
 /*
  * The number of 100-ns intervals between the Windows system epoch (1601-01-01
@@ -150,14 +150,6 @@ typedef struct {
 static time_t		ToCTime(FILETIME fileTime);
 static void		FromCTime(time_t posixTime, FILETIME *fileTime);
 
-typedef NET_API_STATUS NET_API_FUNCTION NETUSERGETINFOPROC(
-	LPWSTR servername, LPWSTR username, DWORD level, LPBYTE *bufptr);
-
-typedef NET_API_STATUS NET_API_FUNCTION NETAPIBUFFERFREEPROC(LPVOID Buffer);
-
-typedef NET_API_STATUS NET_API_FUNCTION NETGETDCNAMEPROC(
-	LPWSTR servername, LPWSTR domainname, LPBYTE *bufptr);
-
 /*
  * Declarations for local functions defined in this file:
  */
@@ -819,17 +811,18 @@ TclpFindExecutable(
      * create this process.
      */
 
-    if (GetModuleFileNameW(NULL, wName, MAX_PATH) == 0) {
-	GetModuleFileNameA(NULL, name, sizeof(name));
+#ifdef UNICODE
+    GetModuleFileNameW(NULL, wName, MAX_PATH);
+#else
+    GetModuleFileNameA(NULL, name, sizeof(name));
 
-	/*
-	 * Convert to WCHAR to get out of ANSI codepage
-	 */
-
-	MultiByteToWideChar(CP_ACP, 0, name, -1, wName, MAX_PATH);
-    }
+    /*
+     * Convert to WCHAR to get out of ANSI codepage
+     */
 
-    WideCharToMultiByte(CP_UTF8, 0, wName, -1, name, sizeof(name), NULL,NULL);
+    MultiByteToWideChar(CP_ACP, 0, name, -1, wName, MAX_PATH);
+#endif
+    WideCharToMultiByte(CP_UTF8, 0, wName, -1, name, sizeof(name), NULL, NULL);
     TclWinNoBackslash(name);
     TclSetObjNameOfExecutable(Tcl_NewStringObj(name, -1), NULL);
 }
@@ -1392,75 +1385,52 @@ TclpGetUserHome(
     Tcl_DString *bufferPtr)	/* Uninitialized or free DString filled with
 				 * name of user's home directory. */
 {
-    const char *result;
-    HINSTANCE netapiInst;
+    const char *result = NULL;
+    USER_INFO_1 *uiPtr, **uiPtrPtr = &uiPtr;
+    Tcl_DString ds;
+    int nameLen = -1;
+    int badDomain = 0;
+    char *domain;
+    WCHAR *wName, *wHomeDir, *wDomain, **wDomainPtr = &wDomain;
+    WCHAR buf[MAX_PATH];
 
-    result = NULL;
     Tcl_DStringInit(bufferPtr);
+    wDomain = NULL;
+    domain = strchr(name, '@');
+    if (domain != NULL) {
+	Tcl_DStringInit(&ds);
+	wName = Tcl_UtfToUniCharDString(domain + 1, -1, &ds);
+	badDomain = NetGetDCName(NULL, wName,
+		(LPBYTE *) wDomainPtr);
+	Tcl_DStringFree(&ds);
+	nameLen = domain - name;
+    }
+    if (badDomain == 0) {
+	Tcl_DStringInit(&ds);
+	wName = Tcl_UtfToUniCharDString(name, nameLen, &ds);
+	if (NetUserGetInfo(wDomain, wName, 1,
+		(LPBYTE *) uiPtrPtr) == 0) {
+	    wHomeDir = uiPtr->usri1_home_dir;
+	    if ((wHomeDir != NULL) && (wHomeDir[0] != L'\0')) {
+		Tcl_UniCharToUtfDString(wHomeDir, lstrlenW(wHomeDir),
+			bufferPtr);
+	    } else {
+		/*
+		 * User exists but has no home dir. Return
+		 * "{Windows Drive}:/users/default".
+		 */
 
-    netapiInst = LoadLibraryA("netapi32.dll");
-    if (netapiInst != NULL) {
-	NETAPIBUFFERFREEPROC *netApiBufferFreeProc;
-	NETGETDCNAMEPROC *netGetDCNameProc;
-	NETUSERGETINFOPROC *netUserGetInfoProc;
-
-	netApiBufferFreeProc = (NETAPIBUFFERFREEPROC *)
-		GetProcAddress(netapiInst, "NetApiBufferFree");
-	netGetDCNameProc = (NETGETDCNAMEPROC *)
-		GetProcAddress(netapiInst, "NetGetDCName");
-	netUserGetInfoProc = (NETUSERGETINFOPROC *)
-		GetProcAddress(netapiInst, "NetUserGetInfo");
-
-	if ((netUserGetInfoProc != NULL) && (netGetDCNameProc != NULL)
-		&& (netApiBufferFreeProc != NULL)) {
-	    USER_INFO_1 *uiPtr, **uiPtrPtr = &uiPtr;
-	    Tcl_DString ds;
-	    int nameLen, badDomain;
-	    char *domain;
-	    WCHAR *wName, *wHomeDir, *wDomain, **wDomainPtr = &wDomain;
-	    WCHAR buf[MAX_PATH];
-
-	    badDomain = 0;
-	    nameLen = -1;
-	    wDomain = NULL;
-	    domain = strchr(name, '@');
-	    if (domain != NULL) {
-		Tcl_DStringInit(&ds);
-		wName = Tcl_UtfToUniCharDString(domain + 1, -1, &ds);
-		badDomain = netGetDCNameProc(NULL, wName,
-			(LPBYTE *) wDomainPtr);
-		Tcl_DStringFree(&ds);
-		nameLen = domain - name;
-	    }
-	    if (badDomain == 0) {
-		Tcl_DStringInit(&ds);
-		wName = Tcl_UtfToUniCharDString(name, nameLen, &ds);
-		if (netUserGetInfoProc(wDomain, wName, 1,
-			(LPBYTE *) uiPtrPtr) == 0) {
-		    wHomeDir = uiPtr->usri1_home_dir;
-		    if ((wHomeDir != NULL) && (wHomeDir[0] != L'\0')) {
-			Tcl_UniCharToUtfDString(wHomeDir, lstrlenW(wHomeDir),
-				bufferPtr);
-		    } else {
-			/*
-			 * User exists but has no home dir. Return
-			 * "{Windows Drive}:/users/default".
-			 */
-
-			GetWindowsDirectoryW(buf, MAX_PATH);
-			Tcl_UniCharToUtfDString(buf, 2, bufferPtr);
-			Tcl_DStringAppend(bufferPtr, "/users/default", -1);
-		    }
-		    result = Tcl_DStringValue(bufferPtr);
-		    netApiBufferFreeProc((void *) uiPtr);
-		}
-		Tcl_DStringFree(&ds);
-	    }
-	    if (wDomain != NULL) {
-		netApiBufferFreeProc((void *) wDomain);
+		GetWindowsDirectoryW(buf, MAX_PATH);
+		Tcl_UniCharToUtfDString(buf, 2, bufferPtr);
+		Tcl_DStringAppend(bufferPtr, "/users/default", -1);
 	    }
+	    result = Tcl_DStringValue(bufferPtr);
+	    NetApiBufferFree((void *) uiPtr);
 	}
-	FreeLibrary(netapiInst);
+	Tcl_DStringFree(&ds);
+    }
+    if (wDomain != NULL) {
+	NetApiBufferFree((void *) wDomain);
     }
     if (result == NULL) {
 	/*
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 987099c..26ad6df 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -11,15 +11,9 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinReg.c,v 1.54 2010/08/30 09:19:38 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinReg.c,v 1.55 2010/10/11 12:11:53 nijtmans Exp $
  */
 
-/* TODO: This file does not compile in UNICODE mode.
- * See [Freq 2965056]: Windows build with -DUNICODE
- */
-#undef UNICODE
-#undef _UNICODE
-
 #undef STATIC_BUILD
 #ifndef USE_TCL_STUBS
 #   define USE_TCL_STUBS
@@ -96,90 +90,6 @@ static const char *const typeNames[] = {
 static DWORD lastType = REG_RESOURCE_LIST;
 
 /*
- * The following structures allow us to select between the Unicode and ASCII
- * interfaces at run time based on whether Unicode APIs are available. The
- * Unicode APIs are preferable because they will handle characters outside of
- * the current code page.
- */
-
-typedef struct RegWinProcs {
-    int useWide;
-
-    LONG (WINAPI *regConnectRegistryProc)(const TCHAR *, HKEY, PHKEY);
-    LONG (WINAPI *regCreateKeyExProc)(HKEY, const TCHAR *, DWORD, TCHAR *,
-	    DWORD, REGSAM, SECURITY_ATTRIBUTES *, HKEY *, DWORD *);
-    LONG (WINAPI *regDeleteKeyProc)(HKEY, const TCHAR *);
-    LONG (WINAPI *regDeleteValueProc)(HKEY, const TCHAR *);
-    LONG (WINAPI *regEnumKeyProc)(HKEY, DWORD, TCHAR *, DWORD);
-    LONG (WINAPI *regEnumKeyExProc)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    TCHAR *, DWORD *, FILETIME *);
-    LONG (WINAPI *regEnumValueProc)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, BYTE *, DWORD *);
-    LONG (WINAPI *regOpenKeyExProc)(HKEY, const TCHAR *, DWORD, REGSAM,
-	    HKEY *);
-    LONG (WINAPI *regQueryInfoKeyProc)(HKEY, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *,
-	    FILETIME *);
-    LONG (WINAPI *regQueryValueExProc)(HKEY, const TCHAR *, DWORD *, DWORD *,
-	    BYTE *, DWORD *);
-    LONG (WINAPI *regSetValueExProc)(HKEY, const TCHAR *, DWORD, DWORD,
-	    const BYTE*, DWORD);
-} RegWinProcs;
-
-static RegWinProcs *regWinProcs;
-
-static RegWinProcs asciiProcs = {
-    0,
-
-    (LONG (WINAPI *)(const TCHAR *, HKEY, PHKEY)) RegConnectRegistryA,
-    (LONG (WINAPI *)(HKEY, const TCHAR *, DWORD, TCHAR *,
-	    DWORD, REGSAM, SECURITY_ATTRIBUTES *, HKEY *,
-	    DWORD *)) RegCreateKeyExA,
-    (LONG (WINAPI *)(HKEY, const TCHAR *)) RegDeleteKeyA,
-    (LONG (WINAPI *)(HKEY, const TCHAR *)) RegDeleteValueA,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD)) RegEnumKeyA,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    TCHAR *, DWORD *, FILETIME *)) RegEnumKeyExA,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, BYTE *, DWORD *)) RegEnumValueA,
-    (LONG (WINAPI *)(HKEY, const TCHAR *, DWORD, REGSAM,
-	    HKEY *)) RegOpenKeyExA,
-    (LONG (WINAPI *)(HKEY, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *,
-	    FILETIME *)) RegQueryInfoKeyA,
-    (LONG (WINAPI *)(HKEY, const TCHAR *, DWORD *, DWORD *,
-	    BYTE *, DWORD *)) RegQueryValueExA,
-    (LONG (WINAPI *)(HKEY, const TCHAR *, DWORD, DWORD,
-	    const BYTE*, DWORD)) RegSetValueExA,
-};
-
-static RegWinProcs unicodeProcs = {
-    1,
-
-    (LONG (WINAPI *)(const TCHAR *, HKEY, PHKEY)) RegConnectRegistryW,
-    (LONG (WINAPI *)(HKEY, const TCHAR *, DWORD, TCHAR *,
-	    DWORD, REGSAM, SECURITY_ATTRIBUTES *, HKEY *,
-	    DWORD *)) RegCreateKeyExW,
-    (LONG (WINAPI *)(HKEY, const TCHAR *)) RegDeleteKeyW,
-    (LONG (WINAPI *)(HKEY, const TCHAR *)) RegDeleteValueW,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD)) RegEnumKeyW,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    TCHAR *, DWORD *, FILETIME *)) RegEnumKeyExW,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, BYTE *, DWORD *)) RegEnumValueW,
-    (LONG (WINAPI *)(HKEY, const TCHAR *, DWORD, REGSAM,
-	    HKEY *)) RegOpenKeyExW,
-    (LONG (WINAPI *)(HKEY, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *,
-	    FILETIME *)) RegQueryInfoKeyW,
-    (LONG (WINAPI *)(HKEY, const TCHAR *, DWORD *, DWORD *,
-	    BYTE *, DWORD *)) RegQueryValueExW,
-    (LONG (WINAPI *)(HKEY, const TCHAR *, DWORD, DWORD,
-	    const BYTE*, DWORD)) RegSetValueExW,
-};
-
-
-/*
  * Declarations for functions defined in this file.
  */
 
@@ -240,21 +150,12 @@ int
 Registry_Init(
     Tcl_Interp *interp)
 {
-    int useWide;
     Tcl_Command cmd;
 
     if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
 	return TCL_ERROR;
     }
 
-    /*
-     * Determine if the unicode interfaces are available and select the
-     * appropriate registry function table.
-     */
-
-    useWide = (TclWinGetPlatformId() != VER_PLATFORM_WIN32_WINDOWS);
-    regWinProcs = useWide ? &unicodeProcs : &asciiProcs;
-
     cmd = Tcl_CreateObjCommand(interp, "registry", RegistryObjCmd,
 	    interp, DeleteCmd);
     Tcl_SetAssocData(interp, REGISTRY_ASSOC_KEY, NULL, cmd);
@@ -498,7 +399,7 @@ DeleteKey(
     REGSAM mode)		/* Mode flags to pass. */
 {
     char *tail, *buffer, *hostName, *keyName;
-    const char *nativeTail;
+    const TCHAR *nativeTail;
     HKEY rootKey, subkey;
     DWORD result;
     int length;
@@ -609,7 +510,7 @@ DeleteValue(
 
     valueName = Tcl_GetStringFromObj(valueNameObj, &length);
     Tcl_WinUtfToTChar(valueName, length, &ds);
-    result = regWinProcs->regDeleteValueProc(key, Tcl_DStringValue(&ds));
+    result = RegDeleteValue(key, (const TCHAR *)Tcl_DStringValue(&ds));
     Tcl_DStringFree(&ds);
     if (result != ERROR_SUCCESS) {
 	Tcl_AppendResult(interp, "unable to delete value \"",
@@ -654,7 +555,7 @@ GetKeyNames(
     HKEY key;			/* Handle to the key being examined */
     DWORD subKeyCount;		/* Number of subkeys to list */
     DWORD maxSubKeyLen;		/* Maximum string length of any subkey */
-    char *buffer;		/* Buffer to hold the subkey name */
+    TCHAR *buffer;		/* Buffer to hold the subkey name */
     DWORD bufSize;		/* Size of the buffer */
     DWORD index;		/* Position of the current subkey */
     char *name;			/* Subkey name */
@@ -682,7 +583,7 @@ GetKeyNames(
      * many subkeys there are.
      */
 
-    result = regWinProcs->regQueryInfoKeyProc(key, NULL, NULL, NULL,
+    result = RegQueryInfoKey(key, NULL, NULL, NULL,
 	    &subKeyCount, &maxSubKeyLen, NULL, NULL, NULL, NULL, NULL, NULL);
     if (result != ERROR_SUCCESS) {
 	Tcl_SetObjResult(interp, Tcl_NewObj());
@@ -692,11 +593,7 @@ GetKeyNames(
 	RegCloseKey(key);
 	return TCL_ERROR;
     }
-    if (regWinProcs->useWide) {
-	buffer = ckalloc((maxSubKeyLen+1) * sizeof(WCHAR));
-    } else {
-	buffer = ckalloc(maxSubKeyLen+1);
-    }
+    buffer = (TCHAR *) ckalloc((maxSubKeyLen+1) * sizeof(TCHAR));
 
     /*
      * Enumerate the subkeys.
@@ -705,7 +602,7 @@ GetKeyNames(
     resultPtr = Tcl_NewObj();
     for (index = 0; index < subKeyCount; ++index) {
 	bufSize = maxSubKeyLen+1;
-	result = regWinProcs->regEnumKeyExProc(key, index, buffer, &bufSize,
+	result = RegEnumKeyEx(key, index, buffer, &bufSize,
 		NULL, NULL, NULL, NULL);
 	if (result != ERROR_SUCCESS) {
 	    Tcl_SetObjResult(interp, Tcl_NewObj());
@@ -715,11 +612,7 @@ GetKeyNames(
 	    result = TCL_ERROR;
 	    break;
 	}
-	if (regWinProcs->useWide) {
-	    Tcl_WinTCharToUtf((TCHAR *) buffer, bufSize * sizeof(WCHAR), &ds);
-	} else {
-	    Tcl_WinTCharToUtf((TCHAR *) buffer, bufSize, &ds);
-	}
+	Tcl_WinTCharToUtf(buffer, bufSize * sizeof(WCHAR), &ds);
 	name = Tcl_DStringValue(&ds);
 	if (pattern && !Tcl_StringMatch(name, pattern)) {
 	    Tcl_DStringFree(&ds);
@@ -736,7 +629,7 @@ GetKeyNames(
 	Tcl_SetObjResult(interp, resultPtr);
     }
 
-    ckfree(buffer);
+    ckfree((char *)buffer);
     RegCloseKey(key);
     return result;
 }
@@ -768,7 +661,8 @@ GetType(
     HKEY key;
     DWORD result, type;
     Tcl_DString ds;
-    const char *valueName, *nativeValue;
+    const char *valueName;
+    const TCHAR *nativeValue;
     int length;
 
     /*
@@ -786,7 +680,7 @@ GetType(
 
     valueName = Tcl_GetStringFromObj(valueNameObj, &length);
     nativeValue = Tcl_WinUtfToTChar(valueName, length, &ds);
-    result = regWinProcs->regQueryValueExProc(key, nativeValue, NULL, &type,
+    result = RegQueryValueEx(key, nativeValue, NULL, &type,
 	    NULL, NULL);
     Tcl_DStringFree(&ds);
     RegCloseKey(key);
@@ -837,7 +731,8 @@ GetValue(
     REGSAM mode)		/* Mode flags to pass. */
 {
     HKEY key;
-    const char *valueName, *nativeValue;
+    const char *valueName;
+    const TCHAR *nativeValue;
     DWORD result, length, type;
     Tcl_DString data, buf;
     int nameLen;
@@ -868,7 +763,7 @@ GetValue(
     valueName = Tcl_GetStringFromObj(valueNameObj, &nameLen);
     nativeValue = Tcl_WinUtfToTChar(valueName, nameLen, &buf);
 
-    result = regWinProcs->regQueryValueExProc(key, nativeValue, NULL, &type,
+    result = RegQueryValueEx(key, nativeValue, NULL, &type,
 	    (BYTE *) Tcl_DStringValue(&data), &length);
     while (result == ERROR_MORE_DATA) {
 	/*
@@ -879,7 +774,7 @@ GetValue(
 
 	length *= 2;
 	Tcl_DStringSetLength(&data, (int) length);
-	result = regWinProcs->regQueryValueExProc(key, (char *) nativeValue,
+	result = RegQueryValueEx(key, nativeValue,
 		NULL, &type, (BYTE *) Tcl_DStringValue(&data), &length);
     }
     Tcl_DStringFree(&buf);
@@ -915,19 +810,16 @@ GetValue(
 	 */
 
 	while ((p < end)
-		&& (regWinProcs->useWide ? *((Tcl_UniChar *) p) : *p) != 0) {
+		&& (*((Tcl_UniChar *) p)) != 0) {
+	    Tcl_UniChar *up;
 	    Tcl_WinTCharToUtf((TCHAR *) p, -1, &buf);
 	    Tcl_ListObjAppendElement(interp, resultPtr,
 		    Tcl_NewStringObj(Tcl_DStringValue(&buf),
 			    Tcl_DStringLength(&buf)));
-	    if (regWinProcs->useWide) {
-		Tcl_UniChar *up = (Tcl_UniChar *) p;
+	    up = (Tcl_UniChar *) p;
 
-		while (*up++ != 0) {}
-		p = (char *) up;
-	    } else {
-		while (*p++ != '\0') {}
-	    }
+	    while (*up++ != 0) {}
+	    p = (char *) up;
 	    Tcl_DStringFree(&buf);
 	}
 	Tcl_SetObjResult(interp, resultPtr);
@@ -992,7 +884,7 @@ GetValueNames(
      * largest value name plus the terminating null.
      */
 
-    result = regWinProcs->regQueryInfoKeyProc(key, NULL, NULL, NULL, NULL,
+    result = RegQueryInfoKey(key, NULL, NULL, NULL, NULL,
 	    NULL, NULL, &index, &maxSize, NULL, NULL, NULL);
     if (result != ERROR_SUCCESS) {
 	Tcl_AppendResult(interp, "unable to query key \"",
@@ -1007,7 +899,7 @@ GetValueNames(
     resultPtr = Tcl_NewObj();
     Tcl_DStringInit(&buffer);
     Tcl_DStringSetLength(&buffer,
-	    (int) (regWinProcs->useWide ? maxSize*2 : maxSize));
+	    (int) (maxSize*sizeof(WCHAR)));
     index = 0;
     result = TCL_OK;
 
@@ -1024,11 +916,9 @@ GetValueNames(
      */
 
     size = maxSize;
-    while (regWinProcs->regEnumValueProc(key,index, Tcl_DStringValue(&buffer),
+    while (RegEnumValue(key,index, (TCHAR *)Tcl_DStringValue(&buffer),
 	    &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) {
-	if (regWinProcs->useWide) {
-	    size *= 2;
-	}
+	size *= 2;
 
 	Tcl_WinTCharToUtf((TCHAR *) Tcl_DStringValue(&buffer), (int) size,
 		&ds);
@@ -1141,7 +1031,7 @@ OpenSubKey(
 
     if (hostName) {
 	hostName = (char *) Tcl_WinUtfToTChar(hostName, -1, &buf);
-	result = regWinProcs->regConnectRegistryProc(hostName, rootKey,
+	result = RegConnectRegistry((TCHAR *)hostName, rootKey,
 		&rootKey);
 	Tcl_DStringFree(&buf);
 	if (result != ERROR_SUCCESS) {
@@ -1158,7 +1048,7 @@ OpenSubKey(
     if (flags & REG_CREATE) {
 	DWORD create;
 
-	result = regWinProcs->regCreateKeyExProc(rootKey, keyName, 0, NULL,
+	result = RegCreateKeyEx(rootKey, (TCHAR *)keyName, 0, NULL,
 		REG_OPTION_NON_VOLATILE, mode, NULL, keyPtr, &create);
     } else if (rootKey == HKEY_PERFORMANCE_DATA) {
 	/*
@@ -1169,7 +1059,7 @@ OpenSubKey(
 	*keyPtr = HKEY_PERFORMANCE_DATA;
 	result = ERROR_SUCCESS;
     } else {
-	result = regWinProcs->regOpenKeyExProc(rootKey, keyName, 0, mode,
+	result = RegOpenKeyEx(rootKey, (TCHAR *)keyName, 0, mode,
 		keyPtr);
     }
     Tcl_DStringFree(&buf);
@@ -1286,7 +1176,7 @@ ParseKeyName(
 static DWORD
 RecursiveDeleteKey(
     HKEY startKey,		/* Parent of key to be deleted. */
-    const char *keyName,	/* Name of key to be deleted in external
+    const TCHAR *keyName,	/* Name of key to be deleted in external
 				 * encoding, not UTF. */
     REGSAM mode)		/* Mode flags to pass. */
 {
@@ -1306,11 +1196,11 @@ RecursiveDeleteKey(
     }
 
     mode |= KEY_ENUMERATE_SUB_KEYS | DELETE | KEY_QUERY_VALUE;
-    result = regWinProcs->regOpenKeyExProc(startKey, keyName, 0, mode, &hKey);
+    result = RegOpenKeyEx(startKey, keyName, 0, mode, &hKey);
     if (result != ERROR_SUCCESS) {
 	return result;
     }
-    result = regWinProcs->regQueryInfoKeyProc(hKey, NULL, NULL, NULL, NULL,
+    result = RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL,
 	    &maxSize, NULL, NULL, NULL, NULL, NULL, NULL);
     maxSize++;
     if (result != ERROR_SUCCESS) {
@@ -1319,7 +1209,7 @@ RecursiveDeleteKey(
 
     Tcl_DStringInit(&subkey);
     Tcl_DStringSetLength(&subkey,
-	    (int) ((regWinProcs->useWide) ? maxSize * 2 : maxSize));
+	    (int) (maxSize * sizeof(WCHAR)));
 
     mode = saveMode;
     while (result == ERROR_SUCCESS) {
@@ -1328,8 +1218,8 @@ RecursiveDeleteKey(
 	 */
 
 	size = maxSize;
-	result = regWinProcs->regEnumKeyExProc(hKey, 0,
-		Tcl_DStringValue(&subkey), &size, NULL, NULL, NULL, NULL);
+	result = RegEnumKeyEx(hKey, 0, (TCHAR *)Tcl_DStringValue(&subkey),
+		&size, NULL, NULL, NULL, NULL);
 	if (result == ERROR_NO_MORE_ITEMS) {
 	    /*
 	     * RegDeleteKeyEx doesn't exist on non-64bit XP platforms, so we
@@ -1341,25 +1231,20 @@ RecursiveDeleteKey(
 		HINSTANCE dllH;
 
 		checkExProc = 1;
-		dllH = LoadLibrary("advapi32.dll");
+		dllH = LoadLibrary(TEXT("advapi32.dll"));
 		if (dllH) {
-		    if (regWinProcs->useWide) {
-			regDeleteKeyExProc = (FARPROC)
-				GetProcAddress(dllH, "RegDeleteKeyExW");
-		    } else {
-			regDeleteKeyExProc = (FARPROC)
-				GetProcAddress(dllH, "RegDeleteKeyExA");
-		    }
+		    regDeleteKeyExProc = (FARPROC)
+			    GetProcAddress(dllH, "RegDeleteKeyExW");
 		}
 	    }
 	    if (mode && regDeleteKeyExProc) {
 		result = regDeleteKeyExProc(startKey, keyName, mode, 0);
 	    } else {
-		result = regWinProcs->regDeleteKeyProc(startKey, keyName);
+		result = RegDeleteKey(startKey, keyName);
 	    }
 	    break;
 	} else if (result == ERROR_SUCCESS) {
-	    result = RecursiveDeleteKey(hKey, Tcl_DStringValue(&subkey),
+	    result = RecursiveDeleteKey(hKey, (const TCHAR *) Tcl_DStringValue(&subkey),
 		    mode);
 	}
     }
@@ -1416,7 +1301,7 @@ SetValue(
     }
 
     valueName = Tcl_GetStringFromObj(valueNameObj, &length);
-    valueName = Tcl_WinUtfToTChar(valueName, length, &nameBuf);
+    valueName = (char *) Tcl_WinUtfToTChar(valueName, length, &nameBuf);
 
     if (type == REG_DWORD || type == REG_DWORD_BIG_ENDIAN) {
 	int value;
@@ -1428,7 +1313,7 @@ SetValue(
 	}
 
 	value = ConvertDWORD((DWORD)type, (DWORD)value);
-	result = regWinProcs->regSetValueExProc(key, valueName, 0,
+	result = RegSetValueEx(key, (TCHAR *)valueName, 0,
 		(DWORD) type, (BYTE *) &value, sizeof(DWORD));
     } else if (type == REG_MULTI_SZ) {
 	Tcl_DString data, buf;
@@ -1463,7 +1348,7 @@ SetValue(
 
 	Tcl_WinUtfToTChar(Tcl_DStringValue(&data), Tcl_DStringLength(&data)+1,
 		&buf);
-	result = regWinProcs->regSetValueExProc(key, valueName, 0,
+	result = RegSetValueEx(key, (TCHAR *)valueName, 0,
 		(DWORD) type, (BYTE *) Tcl_DStringValue(&buf),
 		(DWORD) Tcl_DStringLength(&buf));
 	Tcl_DStringFree(&data);
@@ -1472,18 +1357,16 @@ SetValue(
 	Tcl_DString buf;
 	const char *data = Tcl_GetStringFromObj(dataObj, &length);
 
-	data = Tcl_WinUtfToTChar(data, length, &buf);
+	data = (char *)Tcl_WinUtfToTChar(data, length, &buf);
 
 	/*
 	 * Include the null in the length, padding if needed for Unicode.
 	 */
 
-	if (regWinProcs->useWide) {
-	    Tcl_DStringSetLength(&buf, Tcl_DStringLength(&buf)+1);
-	}
+	Tcl_DStringSetLength(&buf, Tcl_DStringLength(&buf)+1);
 	length = Tcl_DStringLength(&buf) + 1;
 
-	result = regWinProcs->regSetValueExProc(key, valueName, 0,
+	result = RegSetValueEx(key, (TCHAR *)valueName, 0,
 		(DWORD) type, (BYTE *) data, (DWORD) length);
 	Tcl_DStringFree(&buf);
     } else {
@@ -1494,7 +1377,7 @@ SetValue(
 	 */
 
 	data = (BYTE *) Tcl_GetByteArrayFromObj(dataObj, &length);
-	result = regWinProcs->regSetValueExProc(key, valueName, 0,
+	result = RegSetValueEx(key, (TCHAR *)valueName, 0,
 		(DWORD) type, data, (DWORD) length);
     }
 
@@ -1560,7 +1443,7 @@ BroadcastValue(
      * Use the ignore the result.
      */
 
-    result = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE,
+    result = SendMessageTimeoutA(HWND_BROADCAST, WM_SETTINGCHANGE,
 	    (WPARAM) 0, (LPARAM) str, SMTO_ABORTIFHUNG, timeout, &sendResult);
 
     objPtr = Tcl_NewObj();
@@ -1594,7 +1477,7 @@ AppendSystemError(
     DWORD error)		/* Result code from error. */
 {
     int length;
-    WCHAR *wMsgPtr, **wMsgPtrPtr = &wMsgPtr;
+    TCHAR *tMsgPtr, **tMsgPtrPtr = &tMsgPtr;
     const char *msg;
     char id[TCL_INTEGER_SPACE], msgBuf[24 + TCL_INTEGER_SPACE];
     Tcl_DString ds;
@@ -1603,9 +1486,9 @@ AppendSystemError(
     if (Tcl_IsShared(resultPtr)) {
 	resultPtr = Tcl_DuplicateObj(resultPtr);
     }
-    length = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM
+    length = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
 	    | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, error,
-	    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (WCHAR *) wMsgPtrPtr,
+	    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (TCHAR *) tMsgPtrPtr,
 	    0, NULL);
     if (length == 0) {
 	char *msgPtr;
@@ -1615,9 +1498,9 @@ AppendSystemError(
 		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char *) &msgPtr,
 		0, NULL);
 	if (length > 0) {
-	    wMsgPtr = (WCHAR *)
-		    LocalAlloc(LPTR, (length + 1) * sizeof(WCHAR));
-	    MultiByteToWideChar(CP_ACP, 0, msgPtr, length + 1, wMsgPtr,
+	    tMsgPtr = (TCHAR *)
+		    LocalAlloc(LPTR, (length + 1) * sizeof(TCHAR));
+	    MultiByteToWideChar(CP_ACP, 0, msgPtr, length + 1, tMsgPtr,
 		    length + 1);
 	    LocalFree(msgPtr);
 	}
@@ -1634,9 +1517,9 @@ AppendSystemError(
 	char *msgPtr;
 
 	encoding = Tcl_GetEncoding(NULL, "unicode");
-	Tcl_ExternalToUtfDString(encoding, (char *) wMsgPtr, -1, &ds);
+	Tcl_ExternalToUtfDString(encoding, (char *) tMsgPtr, -1, &ds);
 	Tcl_FreeEncoding(encoding);
-	LocalFree(wMsgPtr);
+	LocalFree(tMsgPtr);
 
 	msgPtr = Tcl_DStringValue(&ds);
 	length = Tcl_DStringLength(&ds);
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index 1a1c9d2..6b37f48 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -8,15 +8,9 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinTest.c,v 1.27 2010/08/30 09:19:38 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinTest.c,v 1.28 2010/10/11 12:11:53 nijtmans Exp $
  */
 
-/* TODO: This file does not compile in UNICODE mode.
- * See [Freq 2965056]: Windows build with -DUNICODE
- */
-#undef UNICODE
-#undef _UNICODE
-
 #ifndef USE_TCL_STUBS
 #   define USE_TCL_STUBS
 #endif
@@ -486,28 +480,6 @@ TestplatformChmod(
     const char *nativePath,
     int pmode)
 {
-    typedef DWORD (WINAPI *getSidLengthRequiredDef)(UCHAR);
-    typedef BOOL (WINAPI *initializeSidDef)(PSID, PSID_IDENTIFIER_AUTHORITY,
-	    BYTE);
-    typedef PDWORD (WINAPI *getSidSubAuthorityDef)(PSID, DWORD);
-    typedef DWORD (WINAPI *setNamedSecurityInfoADef)(IN LPSTR,
-	    IN SE_OBJECT_TYPE, IN SECURITY_INFORMATION, IN PSID, IN PSID,
-	    IN PACL, IN PACL);
-    typedef BOOL (WINAPI *getAceDef)(PACL, DWORD, LPVOID *);
-    typedef BOOL (WINAPI *addAceDef)(PACL, DWORD, DWORD, LPVOID, DWORD);
-    typedef BOOL (WINAPI *equalSidDef)(PSID, PSID);
-    typedef BOOL (WINAPI *addAccessDeniedAceDef)(PACL, DWORD, DWORD, PSID);
-    typedef BOOL (WINAPI *initializeAclDef)(PACL, DWORD, DWORD);
-    typedef DWORD (WINAPI *getLengthSidDef)(PSID);
-    typedef BOOL (WINAPI *getAclInformationDef)(PACL, LPVOID, DWORD,
-	    ACL_INFORMATION_CLASS);
-    typedef BOOL (WINAPI *getSecurityDescriptorDaclDef)(PSECURITY_DESCRIPTOR,
-	    LPBOOL, PACL *, LPBOOL);
-    typedef BOOL (WINAPI *lookupAccountNameADef)(LPCSTR, LPCSTR, PSID,
-	    PDWORD, LPSTR, LPDWORD, PSID_NAME_USE);
-    typedef BOOL (WINAPI *getFileSecurityADef)(LPCSTR, SECURITY_INFORMATION,
-	    PSECURITY_DESCRIPTOR, DWORD, LPDWORD);
-
     static const SECURITY_INFORMATION infoBits = OWNER_SECURITY_INFORMATION
 	    | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
     static const DWORD readOnlyMask = FILE_DELETE_CHILD | FILE_ADD_FILE
@@ -518,22 +490,6 @@ TestplatformChmod(
      * References to security functions (only available on NT and later).
      */
 
-    static getSidLengthRequiredDef getSidLengthRequiredProc;
-    static initializeSidDef initializeSidProc;
-    static getSidSubAuthorityDef getSidSubAuthorityProc;
-    static setNamedSecurityInfoADef setNamedSecurityInfoProc;
-    static getAceDef getAceProc;
-    static addAceDef addAceProc;
-    static equalSidDef equalSidProc;
-    static addAccessDeniedAceDef addAccessDeniedAceProc;
-    static initializeAclDef initializeAclProc;
-    static getLengthSidDef getLengthSidProc;
-    static getAclInformationDef getAclInformationProc;
-    static getSecurityDescriptorDaclDef getSecurityDescriptorDaclProc;
-    static lookupAccountNameADef lookupAccountNameProc;
-    static getFileSecurityADef getFileSecurityProc;
-    static int initialized = 0;
-
     const BOOL set_readOnly = !(pmode & 0222);
     BOOL acl_readOnly_found = FALSE, curAclPresent, curAclDefaulted;
     SID_IDENTIFIER_AUTHORITY userSidAuthority = {
@@ -545,72 +501,18 @@ TestplatformChmod(
     PACL curAcl, newAcl = 0;
     WORD j;
     SID *userSid = 0;
-    TCHAR *userDomain = 0;
+    char *userDomain = 0;
     int res = 0;
 
     /*
      * One time initialization, dynamically load Windows NT features
      */
 
-    if (!initialized) {
-	TCL_DECLARE_MUTEX(initializeMutex)
-	Tcl_MutexLock(&initializeMutex);
-	if (!initialized) {
-	    HINSTANCE hInstance = LoadLibrary("Advapi32");
-
-	    if (hInstance != NULL) {
-		setNamedSecurityInfoProc = (setNamedSecurityInfoADef)
-			GetProcAddress(hInstance, "SetNamedSecurityInfoA");
-		getFileSecurityProc = (getFileSecurityADef)
-			GetProcAddress(hInstance, "GetFileSecurityA");
-		getAceProc = (getAceDef)
-			GetProcAddress(hInstance, "GetAce");
-		addAceProc = (addAceDef)
-			GetProcAddress(hInstance, "AddAce");
-		equalSidProc = (equalSidDef)
-			GetProcAddress(hInstance, "EqualSid");
-		addAccessDeniedAceProc = (addAccessDeniedAceDef)
-			GetProcAddress(hInstance, "AddAccessDeniedAce");
-		initializeAclProc = (initializeAclDef)
-			GetProcAddress(hInstance, "InitializeAcl");
-		getLengthSidProc = (getLengthSidDef)
-			GetProcAddress(hInstance, "GetLengthSid");
-		getAclInformationProc = (getAclInformationDef)
-			GetProcAddress(hInstance, "GetAclInformation");
-		getSecurityDescriptorDaclProc = (getSecurityDescriptorDaclDef)
-			GetProcAddress(hInstance, "GetSecurityDescriptorDacl");
-		lookupAccountNameProc = (lookupAccountNameADef)
-			GetProcAddress(hInstance, "LookupAccountNameA");
-		getSidLengthRequiredProc = (getSidLengthRequiredDef)
-			GetProcAddress(hInstance, "GetSidLengthRequired");
-		initializeSidProc = (initializeSidDef)
-			GetProcAddress(hInstance, "InitializeSid");
-		getSidSubAuthorityProc = (getSidSubAuthorityDef)
-			GetProcAddress(hInstance, "GetSidSubAuthority");
-
-		if (setNamedSecurityInfoProc && getAceProc && addAceProc
-			&& equalSidProc && addAccessDeniedAceProc
-			&& initializeAclProc && getLengthSidProc
-			&& getAclInformationProc
-			&& getSecurityDescriptorDaclProc
-			&& lookupAccountNameProc && getFileSecurityProc
-			&& getSidLengthRequiredProc && initializeSidProc
-			&& getSidSubAuthorityProc) {
-		    initialized = 1;
-		}
-	    }
-	    if (!initialized) {
-		initialized = -1;
-	    }
-	}
-	Tcl_MutexUnlock(&initializeMutex);
-    }
-
     /*
      * Process the chmod request.
      */
 
-    attr = GetFileAttributes(nativePath);
+    attr = GetFileAttributesA(nativePath);
 
     /*
      * nativePath not found
@@ -622,11 +524,10 @@ TestplatformChmod(
     }
 
     /*
-     * If no ACL API is present or nativePath is not a directory, there is no
-     * special handling.
+     * If nativePath is not a directory, there is no special handling.
      */
 
-    if (initialized < 0 || !(attr & FILE_ATTRIBUTE_DIRECTORY)) {
+    if (!(attr & FILE_ATTRIBUTE_DIRECTORY)) {
 	goto done;
     }
 
@@ -642,7 +543,7 @@ TestplatformChmod(
      * obtains the size of the security descriptor.
      */
 
-    if (!getFileSecurityProc(nativePath, infoBits, NULL, 0, &secDescLen)) {
+    if (!GetFileSecurityA(nativePath, infoBits, NULL, 0, &secDescLen)) {
 	DWORD secDescLen2 = 0;
 
 	if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
@@ -650,7 +551,7 @@ TestplatformChmod(
 	}
 
 	secDesc = (BYTE *) ckalloc(secDescLen);
-	if (!getFileSecurityProc(nativePath, infoBits,
+	if (!GetFileSecurityA(nativePath, infoBits,
 		(PSECURITY_DESCRIPTOR) secDesc, secDescLen, &secDescLen2)
 		|| (secDescLen < secDescLen2)) {
 	    goto done;
@@ -661,22 +562,22 @@ TestplatformChmod(
      * Get the World SID.
      */
 
-    userSid = (SID *) ckalloc(getSidLengthRequiredProc((UCHAR) 1));
-    initializeSidProc(userSid, &userSidAuthority, (BYTE) 1);
-    *(getSidSubAuthorityProc(userSid, 0)) = SECURITY_WORLD_RID;
+    userSid = (SID *) ckalloc(GetSidLengthRequired((UCHAR) 1));
+    InitializeSid(userSid, &userSidAuthority, (BYTE) 1);
+    *(GetSidSubAuthority(userSid, 0)) = SECURITY_WORLD_RID;
 
     /*
      * If curAclPresent == false then curAcl and curAclDefaulted not valid.
      */
 
-    if (!getSecurityDescriptorDaclProc((PSECURITY_DESCRIPTOR) secDesc,
+    if (!GetSecurityDescriptorDacl((PSECURITY_DESCRIPTOR) secDesc,
 	    &curAclPresent, &curAcl, &curAclDefaulted)) {
 	goto done;
     }
     if (!curAclPresent || !curAcl) {
 	ACLSize.AclBytesInUse = 0;
 	ACLSize.AceCount = 0;
-    } else if (!getAclInformationProc(curAcl, &ACLSize, sizeof(ACLSize),
+    } else if (!GetAclInformation(curAcl, &ACLSize, sizeof(ACLSize),
 	    AclSizeInformation)) {
 	goto done;
     }
@@ -686,14 +587,14 @@ TestplatformChmod(
      */
 
     newAclSize = ACLSize.AclBytesInUse + sizeof(ACCESS_DENIED_ACE)
-	    + getLengthSidProc(userSid) - sizeof(DWORD);
+	    + GetLengthSid(userSid) - sizeof(DWORD);
     newAcl = (ACL *) ckalloc(newAclSize);
 
     /*
      * Initialize the new ACL.
      */
 
-    if (!initializeAclProc(newAcl, newAclSize, ACL_REVISION)) {
+    if (!InitializeAcl(newAcl, newAclSize, ACL_REVISION)) {
 	goto done;
     }
 
@@ -701,7 +602,7 @@ TestplatformChmod(
      * Add denied to make readonly, this will be known as a "read-only tag".
      */
 
-    if (set_readOnly && !addAccessDeniedAceProc(newAcl, ACL_REVISION,
+    if (set_readOnly && !AddAccessDeniedAce(newAcl, ACL_REVISION,
 	    readOnlyMask, userSid)) {
 	goto done;
     }
@@ -711,7 +612,7 @@ TestplatformChmod(
 	LPVOID pACE2;
 	ACE_HEADER *phACE2;
 
-	if (!getAceProc(curAcl, j, &pACE2)) {
+	if (!GetAce(curAcl, j, &pACE2)) {
 	    goto done;
 	}
 
@@ -734,7 +635,7 @@ TestplatformChmod(
 	    ACCESS_DENIED_ACE *pACEd = (ACCESS_DENIED_ACE *) phACE2;
 
 	    if (pACEd->Mask == readOnlyMask
-		    && equalSidProc(userSid, (PSID) &pACEd->SidStart)) {
+		    && EqualSid(userSid, (PSID) &pACEd->SidStart)) {
 		acl_readOnly_found = TRUE;
 		continue;
 	    }
@@ -744,7 +645,7 @@ TestplatformChmod(
 	 * Copy the current ACE from the old to the new ACL.
 	 */
 
-	if (!addAceProc(newAcl, ACL_REVISION, MAXDWORD, (PACL *) pACE2,
+	if (!AddAce(newAcl, ACL_REVISION, MAXDWORD, (PACL *) pACE2,
 		((PACE_HEADER) pACE2)->AceSize)) {
 	    goto done;
 	}
@@ -754,7 +655,7 @@ TestplatformChmod(
      * Apply the new ACL.
      */
 
-    if (set_readOnly == acl_readOnly_found || setNamedSecurityInfoProc(
+    if (set_readOnly == acl_readOnly_found || SetNamedSecurityInfoA(
 	    (LPSTR) nativePath, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION,
 	    NULL, NULL, newAcl, NULL) == ERROR_SUCCESS) {
 	res = 0;
@@ -771,7 +672,7 @@ TestplatformChmod(
 	ckfree((char *) userSid);
     }
     if (userDomain) {
-	ckfree(userDomain);
+	ckfree((char *) userDomain);
     }
 
     if (res != 0) {