Update win32.api

Francois Gouget fgouget at free.fr
Thu Oct 21 09:28:29 CDT 2004


The win32.api file was using both '%long --ptr' and '%long --pointer' to 
declare the XXX_PTR types (although neither qualifier is actually used). 
I decided to standardize on the latter as the other qualifiers have 
non-abreviated names.


Changelog:

  * tools/winapi/win32.api

    Standardize on '%long --pointer'
    Update it to match the latest source. Fixes many winapi_check 
warnings.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                 Linux: It is now safe to turn on your computer.
-------------- next part --------------
Index: tools/winapi/win32.api
===================================================================
RCS file: /var/cvs/wine/tools/winapi/win32.api,v
retrieving revision 1.20
diff -u -r1.20 win32.api
--- tools/winapi/win32.api	8 Oct 2004 21:02:09 -0000	1.20
+++ tools/winapi/win32.api	21 Oct 2004 09:26:12 -0000
@@ -252,11 +252,14 @@
 HFCI
 HFDI
 HRESULT
-INT_PTR
 TCOMP
 USHORT
 int
 
+%long --pointer
+
+INT_PTR
+
 %ptr
 
 DLLVERSIONINFO *
@@ -357,7 +360,6 @@
 BOOL
 COLORREF
 DWORD
-DWORD_PTR
 HANDLE
 HBITMAP
 HDC
@@ -376,11 +378,15 @@
 LPARAM
 LRESULT
 UINT
-UINT_PTR
 WORD
 WPARAM
 int
 
+%long --pointer
+
+DWORD_PTR
+UINT_PTR
+
 %longlong
 
 POINT
@@ -391,6 +397,7 @@
 DPALOADPROC
 DWORD_PTR *
 HDPA *
+HICON *
 IMAGEINFO *
 IMAGELISTDRAWPARAMS *
 INT *
@@ -418,6 +425,7 @@
 PFNDPAMERGE
 PFNDSAENUMCALLBACK
 POINT *
+RGBQUAD *
 SMOOTHSCROLLSTRUCT *
 SUBCLASSPROC
 TRACKMOUSEEVENT *
@@ -1129,13 +1141,16 @@
 %long
 
 DWORD
+HMODULE
 HRESULT
 HWND
 UINT
+int
 
 %str
 
 LPCSTR
+LPSTR
 
 %wstr
 
@@ -1396,6 +1411,7 @@
 
 %long --pointer
 
+DWORD_PTR
 LONG_PTR
 ULONG_PTR
 
@@ -1514,6 +1530,7 @@
 PLONG
 PMEMORY_BASIC_INFORMATION
 PSIZE_T
+PULONG_PTR
 PVOID
 PTIMERAPCROUTINE
 PULARGE_INTEGER
@@ -1524,6 +1541,8 @@
 SYSTEMTIME *
 TIMEFMT_ENUMPROCA
 TIMEFMT_ENUMPROCW
+UILANGUAGE_ENUMPROCA
+UILANGUAGE_ENUMPROCW
 ULONG_PTR *
 WAITORTIMERCALLBACK
 WIN32_FIND_DATAA *
@@ -1599,7 +1618,7 @@
 ULONG
 int
 
-%long --ptr
+%long --pointer
 
 ULONG_PTR
 
@@ -2107,6 +2126,7 @@
 char **
 char ***
 cxx_exception_type *
+exception *
 free_func_t
 int (*)(void *, void *)
 int *
@@ -3093,7 +3113,9 @@
 CStdPSFactoryBuffer *
 LPPSFACTORYBUFFER
 LPRPCCHANNELBUFFER
+LPRPCPROXYBUFFER *
 LPRPCSTUBBUFFER
+LPTYPEINFO
 LPUNKNOWN
 LPVOID
 LPVOID *
@@ -3240,7 +3262,7 @@
 REGSAM
 UINT
 
-%long --ptr
+%long --pointer
 
 UINT_PTR
 
@@ -3469,7 +3491,7 @@
 char
 int
 
-%long --ptr
+%long --pointer
 
 INT_PTR
 
@@ -3770,6 +3792,7 @@
 
 %long
 
+ACCESS_MASK
 ATOM
 BOOL
 BYTE
@@ -4349,7 +4372,7 @@
 MMRESULT
 UINT
 
-%long --ptr
+%long --pointer
 
 DWORD_PTR
 UINT_PTR
@@ -4538,7 +4564,6 @@
 HANDLE
 HWND
 INT
-LONG
 SOCKET
 UINT
 WORD


More information about the wine-patches mailing list