--- a/src/intl-encap-win32.c	Thu Dec 16 11:20:17 2021 +0000
+++ b/src/intl-encap-win32.c	Mon Apr 21 11:42:50 2014 +0100
@@ -25,6 +25,15 @@
    Created summer 2000 by Ben Wing.  Completed August 2001.  Completely
    written by Ben Wing.
    */
+/* Brute-force wrench forward to the modern
+    world by Henry S. Thompson <ht@inf.ed.ac.uk>, April 2014.
+
+   Mostly added 'review' for new functionality
+
+   Added 11 new 'file' lines because refactoring happened,
+    moved everything required to its new home among them.
+*/
+
 
 #define NEED_MSWINDOWS_COMMCTRL
 #define NEED_MSWINDOWS_SHLOBJ
@@ -125,14 +134,15 @@
 review BuildImpersonateTrustee
 review GetMultipleTrustee
 review GetMultipleTrusteeOperation
+review GetInheritanceSource HST: new? -- needs review
+review TreeResetNamedSecurityInfo HST: new? -- needs review
+review TreeSetNamedSecurityInfo HST: new? -- needs review
 
 file WINBASE.H
 
 yes GetBinaryType
-yes GetShortPathName
 no GetLongPathName Win98/2K+ only
 skip GetEnvironmentStrings misnamed ANSI version of the function
-yes FreeEnvironmentStrings
 yes FormatMessage
 yes CreateMailslot
 begin-bracket !defined (CYGWIN_HEADERS)
@@ -147,31 +157,11 @@
 yes lstrcpy
 yes lstrcat
 yes lstrlen
-yes CreateMutex
-yes OpenMutex
-yes CreateEvent
-yes OpenEvent
 yes CreateSemaphore
-yes OpenSemaphore
 yes CreateWaitableTimer
-yes OpenWaitableTimer
-yes CreateFileMapping
-yes OpenFileMapping
-yes GetLogicalDriveStrings
 yes LoadLibrary
-yes LoadLibraryEx
-yes GetModuleFileName
-yes GetModuleHandle
-split CreateProcess LPSTARTUPINFO
 yes FatalAppExit
-split GetStartupInfo LPSTARTUPINFO
-yes GetCommandLine
-yes GetEnvironmentVariable
-yes SetEnvironmentVariable
-yes ExpandEnvironmentStrings
-yes OutputDebugString
 yes FindResource
-yes FindResourceEx
 skip EnumResourceTypes different prototypes in VC6 and VC7
 skip EnumResourceNames different prototypes in VC6 and VC7
 skip EnumResourceLanguages different prototypes in VC6 and VC7
@@ -197,43 +187,20 @@
 yes GetPrivateProfileSectionNames
 yes GetPrivateProfileStruct
 yes WritePrivateProfileStruct
-yes GetDriveType
-yes GetSystemDirectory
-yes GetTempPath
-yes GetTempFileName
-yes GetWindowsDirectory
-yes SetCurrentDirectory
-yes GetCurrentDirectory
-yes GetDiskFreeSpace
-yes GetDiskFreeSpaceEx
-yes CreateDirectory
 yes CreateDirectoryEx
-yes RemoveDirectory
-yes GetFullPathName
-yes DefineDosDevice
-yes QueryDosDevice
-yes CreateFile
-yes SetFileAttributes
-yes GetFileAttributes
-yes GetFileAttributesEx
 yes GetCompressedFileSize
-yes DeleteFile
 no FindFirstFileEx split-sized LPWIN32_FIND_DATA; not used, NT 4.0+ only
 skip FindFirstFile split-sized LPWIN32_FIND_DATA
 skip FindNextFile split-sized LPWIN32_FIND_DATA
-yes SearchPath
 yes CopyFile
 yes CopyFileEx NT 4.0+ only
 yes MoveFile
 yes MoveFileEx
 no MoveFileWithProgress NT 5.0+ only
 no CreateHardLink NT 5.0+ only
-yes CreateNamedPipe
 yes GetNamedPipeHandleState
 yes CallNamedPipe
-yes WaitNamedPipe
 yes SetVolumeLabel
-yes GetVolumeInformation
 yes ClearEventLog
 yes BackupEventLog
 yes OpenEventLog
@@ -241,17 +208,8 @@
 yes OpenBackupEventLog
 yes ReadEventLog
 yes ReportEvent
-yes AccessCheckAndAuditAlarm
 no AccessCheckByTypeAndAuditAlarm NT 5.0+ only
 no AccessCheckByTypeResultListAndAuditAlarm NT 5.0+ only
-yes ObjectOpenAuditAlarm
-yes ObjectPrivilegeAuditAlarm
-yes ObjectCloseAuditAlarm
-yes ObjectDeleteAuditAlarm
-yes PrivilegedServiceAuditAlarm
-yes SetFileSecurity
-yes GetFileSecurity
-yes FindFirstChangeNotification
 no ReadDirectoryChanges Unicode-only
 yes IsBadStringPtr
 yes LookupAccountSid
@@ -268,7 +226,6 @@
 yes SetComputerName
 yes GetUserName
 yes LogonUser
-split CreateProcessAsUser LPSTARTUPINFO
 no GetCurrentHwProfile split-sized LPHW_PROFILE_INFO; NT 4.0+ only
 no GetVersionEx split-sized LPOSVERSIONINFO
 no CreateJobObject NT 5.0+ only
@@ -301,6 +258,37 @@
 review SetFirmwareEnvironmentVariable
 review SetVolumeMountPoint
 review VerifyVersionInfo
+review GetLongPathNameTransacted HST: new? -- needs review
+review OpenEncryptedFileRaw HST: new? -- needs review
+review QueryFullProcessImageName HST: new? -- needs review
+review GetFirmwareEnvironmentVariableEx HST: new? -- needs review
+review SetFirmwareEnvironmentVariableEx HST: new? -- needs review
+review GlobalAddAtomEx HST: new? -- needs review
+review CreateDirectoryTransacted HST: new? -- needs review
+review RemoveDirectoryTransacted HST: new? -- needs review
+review GetFullPathNameTransacted HST: new? -- needs review
+review CreateFileTransacted HST: new? -- needs review
+review SetFileAttributesTransacted HST: new? -- needs review
+review GetFileAttributesTransacted HST: new? -- needs review
+review GetCompressedFileSizeTransacted HST: new? -- needs review
+review DeleteFileTransacted HST: new? -- needs review
+review FindFirstFileTransacted HST: new? -- needs review
+review CopyFileTransacted HST: new? -- needs review
+review MoveFileTransacted HST: new? -- needs review
+review CreateHardLinkTransacted HST: new? -- needs review
+review FindFirstStream HST: new? -- needs review
+review FindNextStream HST: new? -- needs review
+review FindFirstStreamTransacted HST: new? -- needs review
+review FindFirstFileName HST: new? -- needs review
+review FindNextFileName HST: new? -- needs review
+review FindFirstFileNameTransacted HST: new? -- needs review
+review LookupAccountNameLocal HST: new? -- needs review
+review LookupAccountSidLocal HST: new? -- needs review
+review LogonUserEx HST: new? -- needs review
+review CreateProcessWithToken HST: new? -- needs review
+review CreateSymbolicLink HST: new? -- needs review
+review CreateSymbolicLinkTransacted HST: new? -- needs review
+review QueryActCtxSettings HST: new? -- needs review
 
 file WINUSER.H
 
@@ -421,7 +409,6 @@
 yes LoadCursorFromFile
 yes LoadIcon
 yes LoadImage NT 4.0+ only
-yes LoadString
 yes IsDialogMessage
 yes DlgDirList
 yes DlgDirSelectEx
@@ -444,9 +431,19 @@
 review EnumDisplaySettingsEx
 review GetClassLongPtr
 review GetRawInputDeviceInfo
-review GetWindowLongPtr
-review SetClassLongPtr
-review SetWindowLongPtr
+yes GetWindowLongPtr
+yes SetClassLongPtr
+yes SetWindowLongPtr
+review PrivateExtractIcons HST: new? -- needs review
+review CreateIcon HST: new? -- needs review
+review DestroyIcon HST: new? -- needs review
+review LookupIconIdFromDirectory HST: new? -- needs review
+review LookupIconIdFromDirectoryEx HST: new? -- needs review
+review CreateIconFromResource HST: new? -- needs review
+review CreateIconFromResourceEx HST: new? -- needs review
+review GetRawInputDeviceInfo HST: new? -- needs review
+review GetRawInputBuffer HST: new? -- needs review
+review CreateDesktopEx HST: new? -- needs review
 
 file WINGDI.H
 
@@ -593,6 +590,17 @@
 no SetPrinterHTMLView not used, complicated interface with split structures
 no GetPrinterHTMLView not used, complicated interface with split structures
 review GetDefaultPrinter
+review SetDefaultPrinter HST: new? -- needs review
+review AddPrinterConnection2 HST: new? -- needs review
+review DeletePrinterDriverPackage HST: new? -- needs review
+review DocumentEvent HST: new? -- needs review
+review GetCorePrinterDrivers HST: new? -- needs review
+review GetPrinterDriver2 HST: new? -- needs review
+review GetPrinterDriverPackagePath HST: new? -- needs review
+review GetSpoolFileHandle HST: new? -- needs review
+review OpenPrinter2 HST: new? -- needs review
+review UploadPrinterDriverPackage HST: new? -- needs review
+
 end-bracket
 
 file SHELLAPI.H
@@ -603,6 +611,7 @@
 no CommandLineToArgv Unicode-only
 yes ShellAbout
 override HICON ExtractAssociatedIconW(HINSTANCE, LPWSTR, LPWORD); error arg2, Cygwin prototype, extra const
+review ExtractAssociatedIconEx HST: new? -- needs review
 yes ExtractIcon
 // split-simple DRAGINFO, used ??? (docs say "Not currently supported")
 begin-bracket !defined (CYGWIN_HEADERS)
@@ -615,6 +624,7 @@
 split SHFileOperation LPSHFILEOPSTRUCT NT 4.0+ only
 // split-simple SHELLEXECUTEINFO, used in ShellExecuteEx
 split ShellExecuteEx LPSHELLEXECUTEINFO NT 4.0+ only
+review SHCreateProcessAsUser HST: new? -- needs review
 no WinExecError causes link error; NT 4.0+ only
 begin-bracket !defined (CYGWIN_HEADERS)
 yes SHQueryRecycleBin NT 4.0+ only
@@ -624,11 +634,16 @@
 no Shell_NotifyIcon split-sized NOTIFYICONDATA, NT 4.0+ only
 // split-sized SHFILEINFO, used in SHGetFileInfo
 skip SHGetFileInfo split-sized SHFILEINFO, NT 4.0+ only
+review SHGetDiskFreeSpaceEx HST: new? -- needs review
 no SHGetDiskFreeSpace causes link error; NT 4.0+ only
 begin-bracket !defined (CYGWIN_HEADERS)
 yes SHGetNewLinkInfo NT 4.0+ only
 yes SHInvokePrinterCommand NT 4.0+ only
 end-bracket
+review IsLFNDrive HST: new? -- needs review
+review SHEnumerateUnreadMailAccounts HST: new? -- needs review
+review SHGetUnreadMailCount HST: new? -- needs review
+review SHSetUnreadMailCount HST: new? -- needs review
 
 end-unicode-encapsulation-script
 
@@ -937,6 +952,8 @@
 review WNetSetConnection
 review WNetGetResourceInformation
 review WNetGetResourceParent
+review WNetRestoreSingleConnection HST: new? -- needs review
+review WNetRestoreConnection HST: new? -- needs review
 end-bracket
 
 // file IME.H -- doesn't exist under Cygwin
@@ -988,6 +1005,13 @@
 review SHGetIconOverlayIndex
 review SHCreateDirectoryEx
 review SHGetFolderPathAndSubDir
+review ILCreateFromPath HST: new? -- needs review
+review SHSetFolderPath HST: new? -- needs review
+review SHUpdateImage HST: new? -- needs review
+review PathIsSlow HST: new? -- needs review
+review SHStartNetConnectionDialog HST: new? -- needs review
+review SHDefExtractIcon HST: new? -- needs review
+review Shell_GetCachedImageIndex HST: new? -- needs review
 
 file WINNLS.H
 
@@ -1052,7 +1076,13 @@
 yes SetConsoleTitle
 yes ReadConsole
 yes WriteConsole
-
+review AddConsoleAlias HST: new? -- needs review
+review GetConsoleAlias HST: new? -- needs review
+review GetConsoleAliasesLength HST: new? -- needs review
+review GetConsoleAliasExesLength HST: new? -- needs review
+review GetConsoleAliases HST: new? -- needs review
+review GetConsoleAliasExes HST: new? -- needs review
+review GetConsoleOriginalTitle HST: new? -- needs review
 file WINREG.H
 
 yes RegConnectRegistry former error in Cygwin prototype, but no more (Cygwin 1.7, 1-30-10)
@@ -1079,6 +1109,20 @@
 yes InitiateSystemShutdown
 override BOOL AbortSystemShutdownW(LPWSTR); error arg 1, Cygwin prototype, extra const
 review RegDeleteKeyEx
+review RegConnectRegistryEx HST: new? -- needs review
+review RegGetValue HST: new? -- needs review
+review InitiateSystemShutdownEx HST: new? -- needs review
+review RegSaveKeyEx HST: new? -- needs review
+review RegCopyTree HST: new? -- needs review
+review RegCreateKeyTransacted HST: new? -- needs review
+review RegDeleteKeyTransacted HST: new? -- needs review
+review RegDeleteKeyValue HST: new? -- needs review
+review RegDeleteTree HST: new? -- needs review
+review RegDisablePredefinedCacheEx HST: new? -- needs review
+review RegLoadAppKey HST: new? -- needs review
+review RegLoadMUIString HST: new? -- needs review
+review RegOpenKeyTransacted HST: new? -- needs review
+review RegSetKeyValue HST: new? -- needs review
 
 file EXCPT.H
 
@@ -1168,6 +1212,135 @@
 CertOpenSystemStore
 CertAddEncodedCertificateToSystemStore
 
+begin-unicode-encapsulation-script
+
+file DBGENG.H
+
+split CreateProcess LPSTARTUPINFO
+
+file DEBUGAPI.H
+
+yes OutputDebugString
+
+file FILEAPI.H
+
+yes CreateDirectory
+yes CreateFile
+yes DefineDosDevice
+yes DeleteFile
+yes FindFirstChangeNotification
+yes GetDiskFreeSpace
+yes GetDiskFreeSpaceEx
+yes GetDriveType
+yes GetFileAttributes
+yes GetFileAttributesEx
+yes GetFullPathName
+yes GetLogicalDriveStrings
+yes GetShortPathName
+yes GetTempFileName
+yes GetTempPath
+yes GetVolumeInformation
+yes QueryDosDevice
+yes RemoveDirectory
+yes SetFileAttributes
+review DeleteVolumeMountPoint HST: new? -- needs review
+review FindFirstFile HST: new? -- needs review
+review FindFirstVolume HST: new? -- needs review
+review FindNextVolume HST: new? -- needs review
+review GetLongPathName HST: new? -- needs review
+review GetVolumePathName HST: new? -- needs review
+review GetVolumeNameForVolumeMountPoint HST: new? -- needs review
+review GetVolumePathNamesForVolumeName HST: new? -- needs review
+review GetFinalPathNameByHandle HST: new? -- needs review
+review GetVolumeInformationByHandle HST: new? -- needs review
+review FindFirstFileEx HST: new? -- needs review
+review FindNextFile HST: new? -- needs review
+
+file LIBLOADERAPI.H
+
+yes FindResourceEx
+yes GetModuleFileName
+yes GetModuleHandle
+yes LoadLibraryEx
+yes LoadString
+review GetModuleHandleEx HST: new? -- needs review
+review EnumResourceLanguages HST: new? -- needs review
+review EnumResourceLanguagesEx HST: new? -- needs review
+review EnumResourceNamesEx HST: new? -- needs review
+review EnumResourceTypesEx HST: new? -- needs review
+
+file MEMORYAPI.H
+
+yes CreateFileMapping
+yes OpenFileMapping
+review CreateFileMappingNuma HST: new? -- needs review
+
+file NAMEDPIPEAPI.H
+
+yes CreateNamedPipe
+yes WaitNamedPipe
+review GetNamedPipeClientComputerName HST: new? -- needs review
+
+file PROCESSENV.H
+
+yes ExpandEnvironmentStrings
+yes FreeEnvironmentStrings
+yes GetCommandLine
+yes GetCurrentDirectory
+yes GetEnvironmentVariable
+yes SearchPath
+yes SetCurrentDirectory
+yes SetEnvironmentVariable
+review GetEnvironmentStrings HST: new? -- needs review
+review SetEnvironmentStrings HST: new? -- needs review
+review NeedCurrentDirectoryForExePath HST: new? -- needs review
+
+file PROCESSTHREADSAPI.H
+
+split CreateProcessAsUser LPSTARTUPINFO
+split GetStartupInfo LPSTARTUPINFO
+review CreateProcess HST: new? -- needs review
+
+file SECURITYBASEAPI.H
+
+yes AccessCheckAndAuditAlarm
+yes GetFileSecurity
+yes ObjectCloseAuditAlarm
+yes ObjectDeleteAuditAlarm
+yes ObjectOpenAuditAlarm
+yes ObjectPrivilegeAuditAlarm
+yes PrivilegedServiceAuditAlarm
+yes SetFileSecurity
+review AccessCheckByTypeAndAuditAlarm HST: new? -- needs review
+review AccessCheckByTypeResultListAndAuditAlarm HST: new? -- needs review
+review AccessCheckByTypeResultListAndAuditAlarmByHandle HST: new? -- needs review
+
+file SYNCHAPI.H
+
+yes CreateEvent
+yes CreateMutex
+yes OpenEvent
+yes OpenMutex
+yes OpenSemaphore
+yes OpenWaitableTimer
+review SleepConditionVariableSR HST: new? -- needs review
+review CreateMutexEx HST: new? -- needs review
+review CreateEventEx HST: new? -- needs review
+review CreateSemaphoreEx HST: new? -- needs review
+review CreateWaitableTimerEx HST: new? -- needs review
+
+file SYSINFOAPI.H
+
+yes GetSystemDirectory
+yes GetWindowsDirectory
+review GetSystemWindowsDirectory HST: new? -- needs review
+review GetComputerNameEx HST: new? -- needs review
+review SetComputerNameEx HST: new? -- needs review
+review GetVersionEx HST: new? -- needs review
+
+end-unicode-encapsulation-script
+
+
 */
 
 /* the functions below are examples of hand-written Unicode-splitting