Skip to content

Commit

Permalink
Fixes #230, #246, #247, #250, #249, #206; Also cleaned up several han…
Browse files Browse the repository at this point in the history
…dle types
  • Loading branch information
Steve Otteson committed Feb 18, 2021
1 parent 6feda86 commit a4e2373
Show file tree
Hide file tree
Showing 7 changed files with 282 additions and 39 deletions.
73 changes: 46 additions & 27 deletions generation/baseRemap.rsp
Original file line number Diff line number Diff line change
Expand Up @@ -55,97 +55,114 @@ PHKEY=HKEY*
PBOOL=BOOL*
PHANDLE=HANDLE*
LPHANDLE=HANDLE*
LPHMIDIIN=HMIDIIN*
LPHMIDIOUT=HMIDIOUT*
LPHMIDISTRM=HMIDISTRM*
HBRUSH=IntPtr
HBRUSH__*=HBRUSH
HCOLORSPACE=IntPtr
HCOLORSPACE__*=HCOLORSPACE
HBMP=IntPtr
HBMP__*=HDC
HDC=IntPtr
HDC__*=HDC
HDESK=IntPtr
HDESK__*=HDESK
HDRVR=IntPtr
HDRVR__*=IntPtr
HDRVROBJ=IntPtr
HDRVROBJ__*=IntPtr
HDEV=IntPtr
HDEV__*=IntPtr
HFILTER_INSTANCE=HFILTER_INSTANCE
HFILTER_INSTANCE1*=HFILTER_INSTANCE*
__MIDL___MIDL_itf_uianimation_0000_0002_0003*=UI_ANIMATION_KEYFRAME
heaacwaveformat_tag=HEAACWAVEFORMAT
heaacwaveinfo_tag=HEAACWAVEINFO
HENHMETAFILE=IntPtr
HENHMETAFILE__*=IntPtr
HFASTMUTEX=IntPtr
HFASTMUTEX__*=HFASTMUTEX
HFONT=IntPtr
HFONT__*=HFONT
HGDIOBJ=IntPtr
HGDIOBJ__*=HGDIOBJ
HGESTUREINFO=IntPtr
HGESTUREINFO__*=IntPtr
HGESTUREINFO__*=HGESTUREINFO
HGLRC=IntPtr
HGLRC__*=IntPtr
HGLRC__*=HGLRC
HHOOK=IntPtr
HHOOK__*=IntPtr
HHOOK__*=HHOOK
HICON=IntPtr
HICON__*=HICON
HINSTANCE=IntPtr
HINSTANCE__*=HINSTANCE
HKEY=IntPtr
HKEY__*=HKEY
HKL=IntPtr
HKL__*=IntPtr
HKL__*=HKL
HLSURF=IntPtr
HLSURF__*=IntPtr
HLSURF__*=HLSURF
HMENU=IntPtr
HMENU__*=HMENU
HMETAFILE=IntPtr
HMETAFILE__*=HMETAFILE
HMIDI=IntPtr
HMIDIIN=IntPtr
HMIDIIN__*=IntPtr
HMIDIIN__*=HMIDIIN
HMIDIOUT=IntPtr
HMIDIOUT__*=IntPtr
HMIDIOUT__*=HMIDIOUT
HMIDISTRM=IntPtr
HMIDISTRM__*=IntPtr
HMIDI__*=IntPtr
HMIDISTRM__*=HMIDISTRM
HMIDI=IntPtr
HMIDI__*=HMIDI
HMIXER=IntPtr
HMIXER__*=HMIXER
HMIXEROBJ=IntPtr
HMIXEROBJ__*=IntPtr
HMIXER__*=IntPtr
HMIXEROBJ__*=HMIXEROBJ
HMONITOR=IntPtr
HMONITOR__*=IntPtr
HMONITOR__*=HMONITOR
HPALETTE=IntPtr
HPALETTE__*=HPALETTE
HPEN=IntPtr
HPEN__*=HPEN
HRAWINPUT=IntPtr
HRAWINPUT__*=IntPtr
HRAWINPUT__*=HRAWINPUT
HRGN=IntPtr
HRGN__*=HRGN
HRSRC=IntPtr
HRSRC__*=IntPtr
HRSRC__*=HRSRC
HSEMAPHORE=IntPtr
HSEMAPHORE__*=HSEMAPHORE
HSPRITE=IntPtr
HSPRITE__*=IntPtr
HSPRITE__*=HSPRITE
HSTR=IntPtr
HSTR__*=IntPtr
HSTRING__*=IntPtr
HSTR__*=HSTR
HSTRING=IntPtr
HSTRING__*=IntPtr
HSTRING_BUFFER=IntPtr
HSTRING_BUFFER__*=IntPtr
HSTRING_BUFFER__*=HSTRING_BUFFER
HSURF=IntPtr
HSURF__*=HSURF
HSYNTHETICPOINTERDEVICE=IntPtr
HSYNTHETICPOINTERDEVICE__*=IntPtr
HSYNTHETICPOINTERDEVICE__*=HSYNTHETICPOINTERDEVICE
HTASK=IntPtr
HTASK__*=IntPtr
HTASK__*=HTASK
HTOUCHINPUT=IntPtr
HTOUCHINPUT__*=IntPtr
HTOUCHINPUT__*=HTOUCHINPUT
HUMPD=IntPtr
HUMPD__*=IntPtr
HUMPD__*=HUMPD
HWAVE=IntPtr
HWAVE__*=HWAVE
HWAVEIN=IntPtr
HWAVEIN__*=IntPtr
HWAVEIN__*=HWAVEIN
LPHWAVEIN=HWAVEIN*
LPHWAVEOUT=HWAVEOUT*
HWAVEOUT=IntPtr
HWAVEOUT__*=IntPtr
HWAVE__*=IntPtr
HWINEVENTHOOK=IntPtr
HWINEVENTHOOK__*=IntPtr
HWINEVENTHOOK__*=HWINEVENTHOOK
HWINSTA=IntPtr
HWINSTA__*=IntPtr
HWINSTA__*=HWINSTA
HWND=IntPtr
HWND__*=HWND
ID3D10Blob=ID3DBlob
Expand Down Expand Up @@ -10968,3 +10985,5 @@ __MIDL___MIDL_itf_xpsprint_0000_0000_0001=XPS_JOB_COMPLETION
__MIDL___MIDL_itf_xpsprint_0000_0000_0002=XPS_JOB_STATUS
_IGMPV3_REPORT_HEADER_=IGMPV3_REPORT_HEADER
_D3DPRESENT_PARAMETERS_=D3DPRESENT_PARAMETERS
waveopendesc_tag=WAVEOPENDESC
OLD_LARGE_INTEGER=LARGE_INTEGER
52 changes: 52 additions & 0 deletions generation/baseSettings.rsp
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,55 @@ DWRITE_FONT_AXIS_TAG=uint
*=Winapi
--exclude
PEXCEPTION_ROUTINE
_OLD_LARGE_INTEGER
HACCEL__
HBITMAP__
HBMP__
HBRUSH__
HCOLORSPACE__
HDC__
HDESK__
HDRVOBJ__
HENHMETAFILE__
HFASTMUTEX__
HFONT__
HGDIOBJ__
HGESTUREINFO__
HGLRC__
HHOOK__
HICON__
HINSTANCE__
HKEY__
HKL__
HLSURF__
HMENU__
HMETAFILE__
HMIDI__
HMIDIIN__
HMIDIOUT__
HMIDISTRM__
HMIDI__
HMIXER__
HMIXEROBJ__
HMONITOR__
HPALETTE__
HPEN__
HRAWINPUT__
HRGN__
HRSRC__
HSEMAPHORE__
HSPRITE__
HSTR__
HSTRING__
HSTRING_BUFFER__
HSURF__
HSYNTHETICPOINTERDEVICE__
HTASK__
HTOUCHINPUT__
HUMPD__
HWAVE__
HWAVEIN__
HWAVEOUT__
HWINEVENTHOOK__
HWINSTA__
HWND__
95 changes: 95 additions & 0 deletions sources/Win32MetadataSource/Gdi.manual.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
using System;

namespace Windows.Win32.Gdi
{
public enum R2_MODE
{
R2_BLACK = 1,
R2_NOTMERGEPEN = 2,
R2_MASKNOTPEN = 3,
R2_NOTCOPYPEN = 4,
R2_MASKPENNOT = 5,
R2_NOT = 6,
R2_XORPEN = 7,
R2_NOTMASKPEN = 8,
R2_MASKPEN = 9,
R2_NOTXORPEN = 10,
R2_NOP = 11,
R2_MERGENOTPEN = 12,
R2_COPYPEN = 13,
R2_MERGEPENNOT = 14,
R2_MERGEPEN = 15,
R2_WHITE = 16,
R2_LAST = 16
}

public enum RGN_COMBINE_MODE
{
RGN_AND = 1,
RGN_OR = 2,
RGN_XOR = 3,
RGN_DIFF = 4,
RGN_COPY = 5,
RGN_MIN = RGN_AND,
RGN_MAX = RGN_COPY
}

[Flags]
public enum ETO_OPTIONS : uint
{
ETO_OPAQUE = 0x0002,
ETO_CLIPPED = 0x0004,
ETO_GLYPH_INDEX = 0x0010,
ETO_RTLREADING = 0x0080,
ETO_NUMERICSLOCAL = 0x0400,
ETO_NUMERICSLATIN = 0x0800,
ETO_IGNORELANGUAGE = 0x1000,
ETO_PDY = 0x2000,
ETO_REVERSE_INDEX_MAP = 0x10000,
}

public enum OBJ_TYPE
{
OBJ_PEN = 1,
OBJ_BRUSH = 2,
OBJ_DC = 3,
OBJ_METADC = 4,
OBJ_PAL = 5,
OBJ_FONT = 6,
OBJ_BITMAP = 7,
OBJ_REGION = 8,
OBJ_METAFILE = 9,
OBJ_MEMDC = 10,
OBJ_EXTPEN = 11,
OBJ_ENHMETADC = 12,
OBJ_ENHMETAFILE = 13,
OBJ_COLORSPACE = 14
}

public enum ROP_CODE : uint
{
SRCCOPY = 0x00CC0020,
SRCPAINT = 0x00EE0086,
SRCAND = 0x008800C6,
SRCINVERT = 0x00660046,
SRCERASE = 0x00440328,
NOTSRCCOPY = 0x00330008,
NOTSRCERASE = 0x001100A6,
MERGECOPY = 0x00C000CA,
MERGEPAINT = 0x00BB0226,
PATCOPY = 0x00F00021,
PATPAINT = 0x00FB0A09,
PATINVERT = 0x005A0049,
DSTINVERT = 0x00550009,
BLACKNESS = 0x00000042,
WHITENESS = 0x00FF0062,
NOMIRRORBITMAP = 0x80000000,
CAPTUREBLT = 0x40000000
}

public enum DIB_USAGE : uint
{
DIB_RGB_COLORS = 0,
DIB_PAL_COLORS = 1
}
}
11 changes: 11 additions & 0 deletions sources/Win32MetadataSource/MenuRc.manual.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,15 @@ namespace Windows.Win32.MenusAndResources
[UnmanagedFunctionPointer]
[return: NativeTypeName("BOOL")]
public unsafe delegate int DESKTOPENUMPROCW([NativeTypeName("LPWSTR")] ushort* param0, [NativeTypeName("LPARAM")] IntPtr param1);

[Flags]
public enum DI_FLAGS : uint
{
DI_MASK = 0x0001,
DI_IMAGE = 0x0002,
DI_NORMAL = 0x0003,
DI_COMPAT = 0x0004,
DI_DEFAULTSIZE = 0x0008,
DI_NOMIRROR = 0x0010,
}
}
12 changes: 0 additions & 12 deletions sources/Win32MetadataSource/SystemServices.manual.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3494,18 +3494,6 @@ public static unsafe partial class Apis

public const int LR_SHARED = 0x00008000;

public const int DI_MASK = 0x0001;

public const int DI_IMAGE = 0x0002;

public const int DI_NORMAL = 0x0003;

public const int DI_COMPAT = 0x0004;

public const int DI_DEFAULTSIZE = 0x0008;

public const int DI_NOMIRROR = 0x0010;

public const int RES_ICON = 1;

public const int RES_CURSOR = 2;
Expand Down
40 changes: 40 additions & 0 deletions sources/Win32MetadataSource/Xps.manual.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using System;

namespace Windows.Win32.Xps
{
[Flags]
public enum PSINJECT_POINT : ushort
{
PSINJECT_BEGINSTREAM = 1,
PSINJECT_PSADOBE = 2,
PSINJECT_PAGESATEND = 3,
PSINJECT_PAGES = 4,
PSINJECT_DOCNEEDEDRES = 5,
PSINJECT_DOCSUPPLIEDRES = 6,
PSINJECT_PAGEORDER = 7,
PSINJECT_ORIENTATION = 8,
PSINJECT_BOUNDINGBOX = 9,
PSINJECT_DOCUMENTPROCESSCOLORS = 10,
PSINJECT_COMMENTS = 11,
PSINJECT_BEGINDEFAULTS = 12,
PSINJECT_ENDDEFAULTS = 13,
PSINJECT_BEGINPROLOG = 14,
PSINJECT_ENDPROLOG = 15,
PSINJECT_BEGINSETUP = 16,
PSINJECT_ENDSETUP = 17,
PSINJECT_TRAILER = 18,
PSINJECT_EOF = 19,
PSINJECT_ENDSTREAM = 20,
PSINJECT_DOCUMENTPROCESSCOLORSATEND = 21,
PSINJECT_PAGENUMBER = 100,
PSINJECT_BEGINPAGESETUP = 101,
PSINJECT_ENDPAGESETUP = 102,
PSINJECT_PAGETRAILER = 103,
PSINJECT_PLATECOLOR = 104,
PSINJECT_SHOWPAGE = 105,
PSINJECT_PAGEBBOX = 106,
PSINJECT_ENDPAGECOMMENTS = 107,
PSINJECT_VMSAVE = 200,
PSINJECT_VMRESTORE = 201
}
}
Loading

0 comments on commit a4e2373

Please sign in to comment.