Moved common types to .Foundation.

generation/emitter/autoTypes.rsp

@@ -1,5 +1,18 @@
 --autoTypes
-Windows.Win32.System.Com,HRESULT,int,
+Windows.Win32.Foundation,BOOL,int
+Windows.Win32.Foundation,BSTR,char*,SysFreeString
+Windows.Win32.Foundation,HANDLE,DECLARE_HANDLE,CloseHandle
+Windows.Win32.Foundation,HINSTANCE,DECLARE_HANDLE,FreeLibrary
+Windows.Win32.Foundation,HRESULT,int
+Windows.Win32.Foundation,HWND,DECLARE_HANDLE
+Windows.Win32.Foundation,LPARAM,IntPtr
+Windows.Win32.Foundation,LRESULT,int
+Windows.Win32.Foundation,LSTATUS,int
+Windows.Win32.Foundation,NTSTATUS,int
+Windows.Win32.Foundation,PSID,IntPtr
+Windows.Win32.Foundation,PSTR,byte*
+Windows.Win32.Foundation,PWSTR,char*
+Windows.Win32.Foundation,WPARAM,UIntPtr
 Windows.Win32.System.DataExchange,HSZ,DECLARE_HANDLE,
 Windows.Win32.System.DataExchange,HCONV,DECLARE_HANDLE
 Windows.Win32.System.DataExchange,HCONVLIST,DECLARE_HANDLE
@@ -24,19 +37,8 @@ Windows.Win32.Media.Audio.CoreAudio,HTASK,DECLARE_HANDLE
 Windows.Win32.UI.TouchInput,HTOUCHINPUT,DECLARE_HANDLE
 ,HWINEVENTHOOK,DECLARE_HANDLE,UnhookWinEvent
 ,HWINSTA,DECLARE_HANDLE,CloseWindowStation
-Windows.Win32.UI.WindowsAndMessaging,HWND,DECLARE_HANDLE
-Windows.Win32.UI.WindowsAndMessaging,LPARAM,IntPtr
-Windows.Win32.UI.WindowsAndMessaging,WPARAM,UIntPtr
-Windows.Win32.System.SystemServices,LSTATUS,int
-Windows.Win32.System.SystemServices,NTSTATUS,int
-Windows.Win32.System.SystemServices,LRESULT,int
-Windows.Win32.System.SystemServices,BOOL,int
-Windows.Win32.System.SystemServices,PWSTR,char*
-Windows.Win32.System.SystemServices,PSTR,byte*
 ,HSTRING,DECLARE_HANDLE,WindowsDeleteString
 Windows.Win32.System.WinRT,HSTRING_BUFFER,DECLARE_HANDLE
-,HANDLE,DECLARE_HANDLE,CloseHandle
-,HINSTANCE,DECLARE_HANDLE,FreeLibrary
 ,HDC,DECLARE_HANDLE,ReleaseDC
 ,CreatedHDC,IntPtr,DeleteDC,HDC
 Windows.Win32.Graphics.Gdi,HGDIOBJ,DECLARE_HANDLE,
@@ -85,7 +87,6 @@ Windows.Win32.Graphics.Gdi,HMONITOR,DECLARE_HANDLE
 ,HCERTCHAINENGINE,IntPtr,CertFreeCertificateChainEngine
 ,HPOWERNOTIFY,IntPtr,UnregisterPowerSettingNotification
 ,LsaHandle,IntPtr,LsaDeregisterLogonProcess
-Windows.Win32.Security,PSID,IntPtr,
 ,PerfProviderHandle,IntPtr,PerfStopProvider
 ,PerfQueryHandle,IntPtr,PerfCloseQueryHandle
 ,DnsContextHandle,IntPtr,DnsReleaseContextHandle
@@ -96,7 +97,6 @@ Windows.Win32.Security,PSID,IntPtr,
 ,FilterVolumeInstanceFindHandle,IntPtr,FilterVolumeInstanceFindClose
 ,GetDcContextHandle,IntPtr,DsGetDcCloseW
 ,TDH_HANDLE,IntPtr,TdhCloseDecodingHandle
-,BSTR,char*,SysFreeString
 ,COMPRESSOR_HANDLE,DECLARE_HANDLE,CloseDecompressor
 ,MSIHANDLE,uint,MsiCloseHandle
 Windows.Win32.UI.Animation,UI_ANIMATION_KEYFRAME,IntPtr

generation/emitter/manual/Automation.manual.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
+using Windows.Win32.Foundation;
 using Windows.Win32.System.Com;
 
 namespace Windows.Win32.System.OleAutomation

generation/emitter/requiredNamespacesForNames.rsp

@@ -1269,12 +1269,12 @@ XLATEOBJ=Windows.Win32.UI.DisplayDevices
 # region windef.h
 DPI_AWARENESS=Windows.Win32.UI.HiDpi
 DPI_HOSTING_BEHAVIOR=Windows.Win32.UI.HiDpi
-POINT=Windows.Win32.UI.DisplayDevices
-POINTL=Windows.Win32.UI.DisplayDevices
-POINTS=Windows.Win32.UI.DisplayDevices
-RECT=Windows.Win32.UI.DisplayDevices
-RECTL=Windows.Win32.UI.DisplayDevices
-SIZE=Windows.Win32.UI.DisplayDevices
+POINT=Windows.Win32.Foundation
+POINTL=Windows.Win32.Foundation
+POINTS=Windows.Win32.Foundation
+RECT=Windows.Win32.Foundation
+RECTL=Windows.Win32.Foundation
+SIZE=Windows.Win32.Foundation
 # endregion windef.h
 # region wingdi.h
 AbortDoc=Windows.Win32.Storage.Xps

generation/scraper/header.txt

@@ -26,6 +26,7 @@ using Windows.Win32.Devices.SerialCommunication;
 using Windows.Win32.Devices.Tapi;
 using Windows.Win32.Devices.Usb;
 using Windows.Win32.Devices.WebServicesOnDevices;
+using Windows.Win32.Foundation;
 using Windows.Win32.Gaming;
 using Windows.Win32.Globalization;
 using Windows.Win32.Graphics.Direct2D;

sources/ClangSharpSourceToWinmd/ClangSharpSourceWinmdGenerator.cs

@@ -22,8 +22,8 @@ namespace ClangSharpSourceToWinmd
 {
     public class ClangSharpSourceWinmdGenerator
     {
-        public const string Win32WideStringType = "Windows.Win32.System.SystemServices.PWSTR";
-        public const string Win32StringType = "Windows.Win32.System.SystemServices.PSTR";
+        public const string Win32WideStringType = "Windows.Win32.Foundation.PWSTR";
+        public const string Win32StringType = "Windows.Win32.Foundation.PSTR";
 
         private const string InteropNamespace = "Windows.Win32.Interop";
         private const string ScannedSuffix = "__scanned__";