Standardize on '%long --pointer'.

tools/winapi/win32.api

@@ -252,11 +252,14 @@ BOOL
 HFCI
 HFDI
 HRESULT
-INT_PTR
 TCOMP
 USHORT
 int
 
+%long --pointer
+
+INT_PTR
+
 %ptr
 
 DLLVERSIONINFO *
@@ -357,7 +360,6 @@ REFIID
 BOOL
 COLORREF
 DWORD
-DWORD_PTR
 HANDLE
 HBITMAP
 HDC
@@ -376,11 +378,15 @@ LONG
 LPARAM
 LRESULT
 UINT
-UINT_PTR
 WORD
 WPARAM
 int
 
+%long --pointer
+
+DWORD_PTR
+UINT_PTR
+
 %longlong
 
 POINT
@@ -391,6 +397,7 @@ DLLVERSIONINFO *
 DPALOADPROC
 DWORD_PTR *
 HDPA *
+HICON *
 IMAGEINFO *
 IMAGELISTDRAWPARAMS *
 INT *
@@ -418,6 +425,7 @@ PFNDPAENUMCALLBACK
 PFNDPAMERGE
 PFNDSAENUMCALLBACK
 POINT *
+RGBQUAD *
 SMOOTHSCROLLSTRUCT *
 SUBCLASSPROC
 TRACKMOUSEEVENT *
@@ -1133,13 +1141,16 @@ void
 %long
 
 DWORD
+HMODULE
 HRESULT
 HWND
 UINT
+int
 
 %str
 
 LPCSTR
+LPSTR
 
 %wstr
 
@@ -1400,6 +1411,7 @@ UINT16
 
 %long --pointer
 
+DWORD_PTR
 LONG_PTR
 ULONG_PTR
 
@@ -1518,6 +1530,7 @@ PLARGE_INTEGER
 PLONG
 PMEMORY_BASIC_INFORMATION
 PSIZE_T
+PULONG_PTR
 PVOID
 PTIMERAPCROUTINE
 PULARGE_INTEGER
@@ -1528,6 +1541,8 @@ SYSLEVEL **
 SYSTEMTIME *
 TIMEFMT_ENUMPROCA
 TIMEFMT_ENUMPROCW
+UILANGUAGE_ENUMPROCA
+UILANGUAGE_ENUMPROCW
 ULONG_PTR *
 WAITORTIMERCALLBACK
 WIN32_FIND_DATAA *
@@ -1603,7 +1618,7 @@ SCODE
 ULONG
 int
 
-%long --ptr
+%long --pointer
 
 ULONG_PTR
 
@@ -2111,6 +2126,7 @@ char *
 char **
 char ***
 cxx_exception_type *
+exception *
 free_func_t
 int (*)(void *, void *)
 int *
@@ -3097,7 +3113,9 @@ CLSID *
 CStdPSFactoryBuffer *
 LPPSFACTORYBUFFER
 LPRPCCHANNELBUFFER
+LPRPCPROXYBUFFER *
 LPRPCSTUBBUFFER
+LPTYPEINFO
 LPUNKNOWN
 LPVOID
 LPVOID *
@@ -3244,7 +3262,7 @@ LONG
 REGSAM
 UINT
 
-%long --ptr
+%long --pointer
 
 UINT_PTR
 
@@ -3473,7 +3491,7 @@ WPARAM
 char
 int
 
-%long --ptr
+%long --pointer
 
 INT_PTR
 
@@ -3774,6 +3792,7 @@ LPWSTR
 
 %long
 
+ACCESS_MASK
 ATOM
 BOOL
 BYTE
@@ -4353,7 +4372,7 @@ MCIDEVICEID
 MMRESULT
 UINT
 
-%long --ptr
+%long --pointer
 
 DWORD_PTR
 UINT_PTR
@@ -4545,7 +4564,6 @@ GROUP
 HANDLE
 HWND
 INT
-LONG
 SOCKET
 UINT
 WORD