--- a/lib-src/make-mswin-unicode.pl	Fri Feb 27 17:48:44 2015 +0000
+++ b/lib-src/make-mswin-unicode.pl	Fri Jul 24 14:48:46 2015 +0100
@@ -182,8 +182,10 @@
 my $argmatch_re = "(?:($typetoken_re+)(${tok_ch}+)?(?: OPTIONAL)?)";
 # regexp matching a parenthesized argument list in a prototype
 my $args_re = "\\(((?:${ws_re}${arg_re}${ws_re},)*${ws_re}${arg_re}${ws_re})\\)";
-# regexp matching a return type in a protype
-my $rettype_re = "(SHSTDAPI_\\([${tok_ch} *]+\\)|${tok_ch}" . "[A-Za-z_0-9 \t\n\r\f]*?${tok_ch})";
+# regexp matching a return type in a protype -- this one from Vin
+my $rettype_re = "(SHSTDAPI_\\(${tok_ch}+${ws_re}\\*?\\)|${tok_ch}" .
+"[A-Za-z_0-9 \t\n\r\f]*?${tok_ch})";
+# HST "(SHSTDAPI_\\([${tok_ch} *]+\\)|${tok_ch}" . "[A-Za-z_0-9 \t\n\r\f]*?${tok_ch})";
 # regexp matching a function name
 my $funname_re = "(${tok_ch}+)";
 # Regexp matching a function prototype, $1 = rettype, $2 = name, $3 = args

--- a/notes.txt	Fri Feb 27 17:48:44 2015 +0000
+++ b/notes.txt	Fri Jul 24 14:48:46 2015 +0100
@@ -272,3 +272,39 @@
 a) Should be ...LongtPtr
 b) Not enough room allocated for a 64-bit long ptr -- fixed in
    console-msw-impl.h
+----
+Trying to get a clean diff to send to Vin
+Need Change log entries!
+Working with /c/C32/usr/local/src/xemacs-21.5-mine vs. -upstream (now
+pulled from xemacs, not xemacs-beta)
+_Only_ new files are 
+ src/s/cygwin64.h
+ src/m/x86_64.h
+Changed files are
+  > diff -rq --exclude=.hg --exclude=info --exclude=*.{o,i,exe,elc} xemacs-21.5-{upstream,mine}|egrep -v Only | cut -f 2 -d ' ' | cut -f 2- -d /
+ ChangeLog
+ README
+ configure
+ configure.ac
+ lib-src/gnuclient.c
+ lib-src/make-mswin-unicode.pl
+ lib-src/winclient.c
+ src/console-msw-impl.h
+ src/console-msw.c
+ src/device-impl.h
+ src/device.c
+ src/dialog-msw.c
+ src/event-msw.c
+ src/frame-msw.c
+ src/frame.c
+ src/glyphs-msw.c
+ src/glyphs.c
+ src/intl-auto-encap-win32.c
+ src/intl-auto-encap-win32.h
+ src/intl-encap-win32.c
+ src/menubar-msw.c
+ src/process-unix.c
+ src/scrollbar-msw.c
+ src/specifier.c
+ src/toolbar-msw.c
+ src/win32.c

--- a/nt/xemacs.mak	Fri Feb 27 17:48:44 2015 +0000
+++ b/nt/xemacs.mak	Fri Jul 24 14:48:46 2015 +0100
@@ -793,7 +793,7 @@
 INCLUDES=-I$(NT)\inc -I$(SRC) $(OPT_INCLUDES)
 
 DEFINES=$(OPT_DEFINES) \
-	-DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs \
+	-DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs -DNTDDI_VERSION=NTDDI_WIN2K -D_WIN32_WINNT=_WIN32_WINNT_WIN2K \
 	-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
 
 CFLAGS_NO_OPT=-nologo -W3 -DSTRICT $(DEBUG_FLAGS_COMPILE)

--- a/src/intl-auto-encap-win32.c	Fri Feb 27 17:48:44 2015 +0000
+++ b/src/intl-auto-encap-win32.c	Fri Jul 24 14:48:46 2015 +0100
@@ -627,14 +627,7 @@
 
 /* Error if CreateDesktop used: split-sized LPDEVMODE */
 
-HDESK
-qxeOpenDesktop (const Extbyte * lpszDesktop, DWORD dwFlags, WINBOOL fInherit, ACCESS_MASK dwDesiredAccess)
-{
-  if (XEUNICODE_P)
-    return OpenDesktopW ((LPCWSTR) lpszDesktop, dwFlags, fInherit, dwDesiredAccess);
-  else
-    return OpenDesktopA ((LPCSTR) lpszDesktop, dwFlags, fInherit, dwDesiredAccess);
-}
+/* Skipping OpenDesktop because HST_LPC...pblm_unused */
 
 /* NOTE: // callback fun differs only in string pointer type */
 WINBOOL
@@ -663,14 +656,7 @@
     return CreateWindowStationA ((LPSTR) arg1, arg2, arg3, arg4);
 }
 
-HWINSTA
-qxeOpenWindowStation (const Extbyte * lpszWinSta, WINBOOL fInherit, ACCESS_MASK dwDesiredAccess)
-{
-  if (XEUNICODE_P)
-    return OpenWindowStationW ((LPCWSTR) lpszWinSta, fInherit, dwDesiredAccess);
-  else
-    return OpenWindowStationA ((LPCSTR) lpszWinSta, fInherit, dwDesiredAccess);
-}
+/* Skipping OpenWindowStation because HST_LPC...pblm_unused */
 
 /* NOTE: // callback fun differs only in string pointer type */
 WINBOOL
@@ -1215,23 +1201,9 @@
     return DrawStateA (hdc, hbrFore, qfnCallBack, lData, wData, x, y, cx, cy, uFlags);
 }
 
-LONG
-qxeTabbedTextOut (HDC hdc, int x, int y, const Extbyte * lpString, int chCount, int nTabPositions, CONST INT * lpnTabStopPositions, int nTabOrigin)
-{
-  if (XEUNICODE_P)
-    return TabbedTextOutW (hdc, x, y, (LPCWSTR) lpString, chCount, nTabPositions, lpnTabStopPositions, nTabOrigin);
-  else
-    return TabbedTextOutA (hdc, x, y, (LPCSTR) lpString, chCount, nTabPositions, lpnTabStopPositions, nTabOrigin);
-}
-
-DWORD
-qxeGetTabbedTextExtent (HDC hdc, const Extbyte * lpString, int chCount, int nTabPositions, CONST INT * lpnTabStopPositions)
-{
-  if (XEUNICODE_P)
-    return GetTabbedTextExtentW (hdc, (LPCWSTR) lpString, chCount, nTabPositions, lpnTabStopPositions);
-  else
-    return GetTabbedTextExtentA (hdc, (LPCSTR) lpString, chCount, nTabPositions, lpnTabStopPositions);
-}
+/* Skipping TabbedTextOut because HST_LPC...pblm_unused */
+
+/* Skipping GetTabbedTextExtent because HST_LPC...pblm_unused */
 
 WINBOOL
 qxeSetProp (HWND hWnd, const Extbyte * lpString, HANDLE hData)
@@ -2413,9 +2385,9 @@
 qxeReadConsole (HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, LPVOID lpReserved)
 {
   if (XEUNICODE_P)
-    return ReadConsoleW (hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, lpReserved);
-  else
-    return ReadConsoleA (hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, lpReserved);
+    return ReadConsoleW (hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, (PCONSOLE_READCONSOLE_CONTROL)lpReserved);
+  else
+    return ReadConsoleA (hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, (PCONSOLE_READCONSOLE_CONTROL)lpReserved);
 }
 
 WINBOOL
@@ -3756,7 +3728,14 @@
     GetStartupInfoA ((LPSTARTUPINFOA) lpStartupInfo);
 }
 
-/* Error if CreateProcess used: HST: new? -- needs review */
+WINBOOL
+qxeCreateProcess (const Extbyte * lpApplicationName, Extbyte * lpCommandLine, LPSECURITY_ATTRIBUTES lpProcessAttributes, LPSECURITY_ATTRIBUTES lpThreadAttributes, WINBOOL bInheritHandles, DWORD dwCreationFlags, LPVOID lpEnvironment, const Extbyte * lpCurrentDirectory, LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation)
+{
+  if (XEUNICODE_P)
+    return CreateProcessW ((LPCWSTR) lpApplicationName, (LPWSTR) lpCommandLine, lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, (LPCWSTR) lpCurrentDirectory, lpStartupInfo, lpProcessInformation);
+  else
+    return CreateProcessA ((LPCSTR) lpApplicationName, (LPSTR) lpCommandLine, lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, (LPCSTR) lpCurrentDirectory, (LPSTARTUPINFOA) lpStartupInfo, lpProcessInformation);
+}
 
 WINBOOL
 qxeCreateProcessAsUser (HANDLE hToken, const Extbyte * lpApplicationName, Extbyte * lpCommandLine, LPSECURITY_ATTRIBUTES lpProcessAttributes, LPSECURITY_ATTRIBUTES lpThreadAttributes, WINBOOL bInheritHandles, DWORD dwCreationFlags, LPVOID lpEnvironment, const Extbyte * lpCurrentDirectory, LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation)
@@ -4461,14 +4440,7 @@
     return GetUserNameA ((LPSTR) lpBuffer, pcbBuffer);
 }
 
-WINBOOL
-qxeLogonUser (const Extbyte * lpszUsername, const Extbyte * lpszDomain, const Extbyte * lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken)
-{
-  if (XEUNICODE_P)
-    return LogonUserW ((LPCWSTR) lpszUsername, (LPCWSTR) lpszDomain, (LPCWSTR) lpszPassword, dwLogonType, dwLogonProvider, phToken);
-  else
-    return LogonUserA ((LPCSTR) lpszUsername, (LPCSTR) lpszDomain, (LPCSTR) lpszPassword, dwLogonType, dwLogonProvider, phToken);
-}
+/* Skipping LogonUser because HST_LPC...pblm_unused */
 
 /* Error if LogonUserEx used: HST: new? -- needs review */
 

--- a/src/intl-auto-encap-win32.h	Fri Feb 27 17:48:44 2015 +0000
+++ b/src/intl-auto-encap-win32.h	Fri Jul 24 14:48:46 2015 +0100
@@ -478,11 +478,7 @@
 #undef CreateDesktop
 #define CreateDesktop error_split_sized_LPDEVMODE
 
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef OpenDesktop
-#define OpenDesktop error_use_qxeOpenDesktop_or_OpenDesktopA_and_OpenDesktopW
-#endif
-HDESK qxeOpenDesktop (const Extbyte * lpszDesktop, DWORD dwFlags, WINBOOL fInherit, ACCESS_MASK dwDesiredAccess);
+/* Skipping OpenDesktop because HST_LPC...pblm_unused */
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef EnumDesktops
@@ -496,11 +492,7 @@
 #endif
 HWINSTA qxeCreateWindowStation (Extbyte * arg1, DWORD arg2, DWORD arg3, LPSECURITY_ATTRIBUTES arg4);
 
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef OpenWindowStation
-#define OpenWindowStation error_use_qxeOpenWindowStation_or_OpenWindowStationA_and_OpenWindowStationW
-#endif
-HWINSTA qxeOpenWindowStation (const Extbyte * lpszWinSta, WINBOOL fInherit, ACCESS_MASK dwDesiredAccess);
+/* Skipping OpenWindowStation because HST_LPC...pblm_unused */
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef EnumWindowStations
@@ -879,17 +871,9 @@
 #endif
 WINBOOL qxeDrawState (HDC hdc, HBRUSH hbrFore, DRAWSTATEPROC qfnCallBack, LPARAM lData, WPARAM wData, int x, int y, int cx, int cy, UINT uFlags);
 
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef TabbedTextOut
-#define TabbedTextOut error_use_qxeTabbedTextOut_or_TabbedTextOutA_and_TabbedTextOutW
-#endif
-LONG qxeTabbedTextOut (HDC hdc, int x, int y, const Extbyte * lpString, int chCount, int nTabPositions, CONST INT * lpnTabStopPositions, int nTabOrigin);
-
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef GetTabbedTextExtent
-#define GetTabbedTextExtent error_use_qxeGetTabbedTextExtent_or_GetTabbedTextExtentA_and_GetTabbedTextExtentW
-#endif
-DWORD qxeGetTabbedTextExtent (HDC hdc, const Extbyte * lpString, int chCount, int nTabPositions, CONST INT * lpnTabStopPositions);
+/* Skipping TabbedTextOut because HST_LPC...pblm_unused */
+
+/* Skipping GetTabbedTextExtent because HST_LPC...pblm_unused */
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef SetProp
@@ -2688,8 +2672,11 @@
 #endif
 VOID qxeGetStartupInfo (LPSTARTUPINFOW lpStartupInfo);
 
+#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef CreateProcess
-#define CreateProcess error_HST__new_____needs_review
+#define CreateProcess error_use_qxeCreateProcess_or_CreateProcessA_and_CreateProcessW
+#endif
+WINBOOL qxeCreateProcess (const Extbyte * lpApplicationName, Extbyte * lpCommandLine, LPSECURITY_ATTRIBUTES lpProcessAttributes, LPSECURITY_ATTRIBUTES lpThreadAttributes, WINBOOL bInheritHandles, DWORD dwCreationFlags, LPVOID lpEnvironment, const Extbyte * lpCurrentDirectory, LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation);
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef CreateProcessAsUser
@@ -3227,11 +3214,7 @@
 #endif
 WINBOOL qxeGetUserName (Extbyte * lpBuffer, LPDWORD pcbBuffer);
 
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef LogonUser
-#define LogonUser error_use_qxeLogonUser_or_LogonUserA_and_LogonUserW
-#endif
-WINBOOL qxeLogonUser (const Extbyte * lpszUsername, const Extbyte * lpszDomain, const Extbyte * lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken);
+/* Skipping LogonUser because HST_LPC...pblm_unused */
 
 #undef LogonUserEx
 #define LogonUserEx error_HST__new_____needs_review

--- a/src/intl-encap-win32.c	Fri Feb 27 17:48:44 2015 +0000
+++ b/src/intl-encap-win32.c	Fri Jul 24 14:48:46 2015 +0100
@@ -225,7 +225,7 @@
 yes GetComputerName
 yes SetComputerName
 yes GetUserName
-yes LogonUser
+skip LogonUser HST_LPC...pblm_unused
 no GetCurrentHwProfile split-sized LPHW_PROFILE_INFO; NT 4.0+ only
 no GetVersionEx split-sized LPOSVERSIONINFO
 no CreateJobObject NT 5.0+ only
@@ -298,10 +298,10 @@
 yes LoadKeyboardLayout
 yes GetKeyboardLayoutName
 no CreateDesktop split-sized LPDEVMODE
-yes OpenDesktop
+skip OpenDesktop HST_LPC...pblm_unused
 split EnumDesktops DESKTOPENUMPROC // callback fun differs only in string pointer type
 override HWINSTA CreateWindowStationW(LPWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES); error arg 1, VS6 prototype, missing const
-yes OpenWindowStation
+skip OpenWindowStation HST_LPC...pblm_unused
 split EnumWindowStations WINSTAENUMPROC // callback fun differs only in string pointer type
 yes GetUserObjectInformation
 yes SetUserObjectInformation
@@ -381,8 +381,8 @@
 yes DrawTextEx NT 4.0+ only
 yes GrayString
 yes DrawState NT 4.0+ only
-yes TabbedTextOut
-yes GetTabbedTextExtent
+skip TabbedTextOut HST_LPC...pblm_unused
+skip GetTabbedTextExtent HST_LPC...pblm_unused
 yes SetProp
 yes GetProp
 yes RemoveProp
@@ -1299,7 +1299,7 @@
 
 split CreateProcessAsUser LPSTARTUPINFO
 split GetStartupInfo LPSTARTUPINFO
-review CreateProcess HST: new? -- needs review
+split CreateProcess LPSTARTUPINFO
 
 file SECURITYBASEAPI.H
 

--- a/src/syswindows.h	Fri Feb 27 17:48:44 2015 +0000
+++ b/src/syswindows.h	Fri Jul 24 14:48:46 2015 +0100
@@ -603,6 +603,49 @@
    intl-auto-encap-win32.[ch]. */
 typedef LPCVOID PCVOID;
 
+/* from Vin */
+
+typedef int WINBOOL;
+/*typedef intptr_t LONG_PTR;
+typedef uintptr_t ULONG_PTR;
+typedef uintptr_t DWORD_PTR;*/
+
+typedef ITEMIDLIST ITEMIDLIST_ABSOLUTE;
+
+typedef ITEMIDLIST_ABSOLUTE *PIDLIST_ABSOLUTE;
+typedef const ITEMIDLIST_ABSOLUTE *PCIDLIST_ABSOLUTE;
+
+/* Defined in w32api/winuser.h */
+#define GCLP_MENUNAME (-8)
+#define GCLP_HBRBACKGROUND (-10)
+#define GCLP_HCURSOR (-12)
+#define GCLP_HICON (-14)
+#define GCLP_HMODULE (-16)
+#define GCLP_WNDPROC (-24)
+#define GCLP_HICONSM (-34)
+#define GWLP_USERDATA (-21)
+#define GWLP_WNDPROC (-4)
+#define GWLP_HINSTANCE (-6)
+#define GWLP_HWNDPARENT (-8)
+#define GWLP_USERDATA (-21)
+#define GWLP_ID (-12)
+
+#define DWL_MSGRESULT 0
+#define DWL_DLGPROC 4
+#define DWL_USER 8
+
+#ifdef _WIN64
+
+#undef DWL_MSGRESULT
+#undef DWL_DLGPROC
+#undef DWL_USER
+#endif
+
+#define DWLP_MSGRESULT 0
+#define DWLP_DLGPROC DWLP_MSGRESULT + sizeof(LRESULT)
+#define DWLP_USER DWLP_DLGPROC + sizeof(DLGPROC)
+
+
 #endif /* CYGWIN_HEADERS */
 
 /* Not in VC 6 */