From 54580e6a88d640e3fdc41a00c152cf773dfaba34 Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Sun, 5 Aug 2001 12:47:53 +0000 Subject: [PATCH] * include/wtypes.h: (DECIMAL_SETZERO): Correct typo. * include/oleidl.h (ISupportErrorInfo, ICreateInfo): Move from here * include/oaidl.h: ... to here. * include/oaidl.h ICreateErrorInfo): Add interface definition. (IErrorInfo::GetGUID): Change arg to GUID. (LPSUPPORTERRORINFO): Add typedef. (IID_ISupportErrorInfo): Change forward decl. of type to IID. * include/winsock2.h (WSAGET* and WSAMAKE*): Remove duplicate defines. * include/commctrl.h (TreeView_SetIndent): Correct typo. * include/commctrl.h (TBSTYPE_FLAT): Remove define. * include/commctrl.h (TBBUTTONINFO[AW]): Add struct definitions, and UNICODE mappings, if _WIN32_IE >= 0x400. (TBIF_* and TB_SETBUTTONINFO): Add defines, if _WIN32_IE >= 0x400. (CDIS_*,CDDS_*,CDRF_*) : Add defines. (tagNMCUSTOMDRAWINFO): Add struct definition and typedefs. (tagNMLVCUSTOMDRAW): Likewise. (tagNMTVCUSTOMDRAW): Likewise. (tagNMLVCACHEHINT): Likewise. * include/basetsd.h (#include <_mingw.h>): Remove. (__int64): Define. * include/wingdi.h (AC_SRC_OVER): Add define. (struct _BLENDFUNCTION): Add. * include/shlobj.h: Add BIF_* defines. * include/winerror.h (E_PENDING): Add error code define. * include/basetsd.h (#include <_mingw.h>): Add directive. * include/winbase.h(InterlockedCompareExchange): Change args and return value from PVOID to LONG. (InterlockedExchange): Change first arg to LPLONG. (InterlockedCompareExchangePointer): New macro. (InterlockedExchangePointer): New macro. --- winsup/w32api/ChangeLog | 69 ++++++++++++++++++++ winsup/w32api/include/basetsd.h | 6 ++ winsup/w32api/include/commctrl.h | 106 ++++++++++++++++++++++++++++++- winsup/w32api/include/oaidl.h | 44 ++++++++++++- winsup/w32api/include/oleidl.h | 27 -------- winsup/w32api/include/shlobj.h | 7 ++ winsup/w32api/include/winbase.h | 10 ++- winsup/w32api/include/winerror.h | 1 + winsup/w32api/include/wingdi.h | 7 ++ winsup/w32api/include/winsock2.h | 7 -- winsup/w32api/include/wtypes.h | 2 +- 11 files changed, 246 insertions(+), 40 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 7b42fb018..7e1d10097 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,72 @@ +2001-08-04 Danny Smith + + * include/wtypes.h: (DECIMAL_SETZERO): Correct typo. + +2001-08-02 Danny Smith + + Apply Dmitry Bely patch 437834 (with additions). + * include/oleidl.h (ISupportErrorInfo, ICreateInfo): Move from here + * include/oaidl.h: ... to here. + * include/oaidl.h ICreateErrorInfo): Add interface definition. + (IErrorInfo::GetGUID): Change arg to GUID. + (LPSUPPORTERRORINFO): Add typedef. + (IID_ISupportErrorInfo): Change forward decl. of type to IID. + +2001-08-02 Danny Smith + + * include/winsock2.h (WSAGET* and WSAMAKE*): Remove duplicate + defines. + +2001-07-30 Danny Smith + + * include/commctrl.h (TreeView_SetIndent): Correct typo. + +2001-07-30 Danny Smith + + * include/commctrl.h (TBSTYPE_FLAT): Remove define. + Thanks to: Jason Craig + +2001-07-30 Mattia Barbon + + * include/commctrl.h (TBBUTTONINFO[AW]): Add struct definitions, + and UNICODE mappings, if _WIN32_IE >= 0x400. + (TBIF_* and TB_SETBUTTONINFO): Add defines, if _WIN32_IE >= 0x400. + (CDIS_*,CDDS_*,CDRF_*) : Add defines. + (tagNMCUSTOMDRAWINFO): Add struct definition and typedefs. + (tagNMLVCUSTOMDRAW): Likewise. + (tagNMTVCUSTOMDRAW): Likewise. + (tagNMLVCACHEHINT): Likewise. + +2001-07-06 Danny Smith + + * include/basetsd.h (#include <_mingw.h>): Remove. + (__int64): Define. + +2001-06-28 Danny Smith + + * include/wingdi.h (AC_SRC_OVER): Add define. + (struct _BLENDFUNCTION): Add. + +2001-06-28 Danny Smith + + * include/shlobj.h: Add BIF_* defines. + +2001-06-27 Danny Smith + + * include/winerror.h (E_PENDING): Add error code define. + +2001-06-27 Danny Smith + + * include/basetsd.h (#include <_mingw.h>): Add directive. + +2001-06-25 Danny Smith + + * include/winbase.h(InterlockedCompareExchange): Change args + and return value from PVOID to LONG. + (InterlockedExchange): Change first arg to LPLONG. + (InterlockedCompareExchangePointer): New macro. + (InterlockedExchangePointer): New macro. + 2001-06-19 Danny Smith * lib/kernel32.def: Add LanguageGroup and UILanguage symbols. diff --git a/winsup/w32api/include/basetsd.h b/winsup/w32api/include/basetsd.h index 376490069..1b382e2e3 100644 --- a/winsup/w32api/include/basetsd.h +++ b/winsup/w32api/include/basetsd.h @@ -1,6 +1,12 @@ #ifndef _BASETSD_H #define _BASETSD_H +#ifdef __GNUC__ +#ifndef __int64 +#define __int64 long long +#endif +#endif + #if defined(_WIN64) #define __int3264 __int64 #define ADDRESS_TAG_BIT 0x40000000000UI64 diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h index fa3024e9a..6292910b1 100644 --- a/winsup/w32api/include/commctrl.h +++ b/winsup/w32api/include/commctrl.h @@ -220,7 +220,6 @@ extern "C" { #define TBSTYLE_CHECKGROUP (TBSTYLE_GROUP|TBSTYLE_CHECK) #define TBSTYLE_TOOLTIPS 256 #define TBSTYLE_WRAPABLE 512 -#define TBSTYPE_FLAT 0x0800 #define TBSTYLE_ALTDRAG 1024 #if (_WIN32_IE >= 0x0300) #define TBSTYLE_FLAT 2048 @@ -302,6 +301,9 @@ extern "C" { #define TB_REPLACEBITMAP (WM_USER+46) #define TBBF_LARGE 1 #define TB_GETBITMAPFLAGS (WM_USER+41) +#if _WIN32_IE >= 0x400 +#define TB_SETBUTTONINFO (WM_USER+66) +#endif #define TBN_GETBUTTONINFOA (TBN_FIRST-0) #define TBN_GETBUTTONINFOW (TBN_FIRST-20) #define TBN_BEGINDRAG (TBN_FIRST-1) @@ -418,6 +420,16 @@ extern "C" { #define TBS_ENABLESELRANGE 32 #define TBS_FIXEDLENGTH 64 #define TBS_NOTHUMB 128 +#if _WIN32_IE >= 0x400 +#define TBIF_BYINDEX -2147483648 +#define TBIF_COMMAND 32 +#define TBIF_IMAGE 1 +#define TBIF_LPARAM 16 +#define TBIF_SIZE 64 +#define TBIF_STATE 4 +#define TBIF_STYLE 8 +#define TBIF_TEXT 2 +#endif #define TBM_GETPOS (WM_USER) #define TBM_GETRANGEMIN (WM_USER+1) #define TBM_GETRANGEMAX (WM_USER+2) @@ -504,6 +516,31 @@ extern "C" { #define LVS_NOCOLUMNHEADER 0x4000 #define LVS_NOSORTHEADER 0x8000 #if (_WIN32_IE >= 0x0300) +/* FIXME: missing CDIS_INDETERMINATE,CDIS_MARKED, + CDDS_SUBITEM, CDRF_NOTIFYSUBITEMDRAW */ +#define CDIS_CHECKED 8 +#define CDIS_DEFAULT 32 +#define CDIS_DISABLED 4 +#define CDIS_FOCUS 16 +#define CDIS_GRAYED 2 +#define CDIS_HOT 64 +#define CDIS_SELECTED 1 +#define CDDS_POSTERASE 4 +#define CDDS_POSTPAINT 2 +#define CDDS_PREERASE 3 +#define CDDS_PREPAINT 1 +#define CDDS_ITEM 65536 +#define CDDS_ITEMPOSTERASE 65540 +#define CDDS_ITEMPOSTPAINT 65538 +#define CDDS_ITEMPREERASE 65539 +#define CDDS_ITEMPREPAINT 65537 +#define CDRF_DODEFAULT 0 +#define CDRF_NOTIFYITEMDRAW 32 +#define CDRF_NOTIFYITEMERASE 128 +#define CDRF_NOTIFYPOSTERASE 64 +#define CDRF_NOTIFYPOSTPAINT 16 +#define CDRF_NEWFONT 2 +#define CDRF_SKIPDEFAULT 4 #define LVS_OWNERDATA 4096 #define LVS_EX_CHECKBOXES 4 #define LVS_EX_FULLROWSELECT 32 @@ -1114,6 +1151,32 @@ typedef struct _TBBUTTON { int iString; } TBBUTTON,*PTBBUTTON,*LPTBBUTTON; typedef const TBBUTTON *LPCTBBUTTON; +#if _WIN32_IE >= 0x400 +typedef struct { + UINT cbSize; + DWORD dwMask; + int idCommand; + int iImage; + BYTE fsState; + BYTE fsStyle; + WORD cx; + DWORD lParam; + LPSTR pszText; + int cchText; +} TBBUTTONINFOA, *LPTBBUTTONINFOA; +typedef struct { + UINT cbSize; + DWORD dwMask; + int idCommand; + int iImage; + BYTE fsState; + BYTE fsStyle; + WORD cx; + DWORD lParam; + LPWSTR pszText; + int cchText; +} TBBUTTONINFOW, *LPTBBUTTONINFOW; +#endif typedef struct { NMHDR hdr; int iItem; @@ -1213,6 +1276,31 @@ typedef struct _NMHEADERW { #define LPNMHEADER LPNMHEADERA #endif /* End FIXME. */ +typedef struct tagNMCUSTOMDRAWINFO { + NMHDR hdr; + DWORD dwDrawStage; + HDC hdc; + RECT rc; + DWORD dwItemSpec; + UINT uItemState; + LPARAM lItemParam; +} NMCUSTOMDRAW, *LPNMCUSTOMDRAW; +typedef struct tagNMLVCUSTOMDRAW { + NMCUSTOMDRAW nmcd; + COLORREF clrText; + COLORREF clrTextBk; +#if _WIN32_IE >= 0x0400 + int iSubItem; +#endif +} NMLVCUSTOMDRAW, *LPNMLVCUSTOMDRAW; +typedef struct tagNMTVCUSTOMDRAW { + NMCUSTOMDRAW nmcd; + COLORREF clrText; + COLORREF clrTextBk; +#if _WIN32_IE >= 0x0400 + int iLevel; +#endif +} NMTVCUSTOMDRAW, *LPNMTVCUSTOMDRAW; typedef struct tagTBADDBITMAP { HINSTANCE hInst; UINT nID; @@ -1412,6 +1500,12 @@ typedef struct _LV_KEYDOWN { WORD wVKey; UINT flags; } LV_KEYDOWN; +typedef struct tagNMLVCACHEHINT { + NMHDR hdr; + int iFrom; + int iTo; +} NMLVCACHEHINT, *PNMLVCACHEHINT; +#define NM_CACHEHINT NMLVCACHEHINT DECLARE_HANDLE(HTREEITEM); typedef struct tagTVITEMA { UINT mask; @@ -1912,7 +2006,7 @@ BOOL WINAPI _TrackMouseEvent(LPTRACKMOUSEEVENT); #define TreeView_GetItemRect(w,i,p,c) (*(HTREEITEM*)p=(i),(BOOL)SendMessage((w),TVM_GETITEMRECT,c,(LPARAM)(LPRECT)(p))) #define TreeView_GetCount(w) (UINT)SendMessage((w),TVM_GETCOUNT,0,0) #define TreeView_GetIndent(w) (UINT)SendMessage((w),TVM_GETINDENT,0,0) -#define TreeView_SetIndent(w,i) (BOOL)SendMessage((w),TVM_SETINDENT,indent,0) +#define TreeView_SetIndent(w,i) (BOOL)SendMessage((w),TVM_SETINDENT,i,0) #define TreeView_GetImageList(w,i) (HIMAGELIST)SendMessage((w),TVM_GETIMAGELIST,i,0) #define TreeView_SetImageList(w,h,i) (HIMAGELIST)SendMessage((w),TVM_SETIMAGELIST,i,(LPARAM)(HIMAGELIST)(h)) #define TreeView_GetNextItem(w,i,c) (HTREEITEM)SendMessage((w),TVM_GETNEXTITEM,c,(LPARAM)(HTREEITEM)(i)) @@ -2027,6 +2121,10 @@ typedef NMTREEVIEWW NMTREEVIEW,*LPNMTREEVIEW; #define TB_SAVERESTORE TB_SAVERESTOREW #define TB_ADDSTRING TB_ADDSTRINGW #define TBN_GETBUTTONINFO TBN_GETBUTTONINFOW +#if _WIN32_IE >= 0x400 +#define TBBUTTONINFO TBBUTTONINFOW +#define LPTBBUTTONINFO LPTBBUTTONINFOW +#endif #define TBNOTIFY TBNOTIFYW #define LPTBNOTIFY LPTBNOTIFYW #define TOOLTIPS_CLASS TOOLTIPS_CLASSW @@ -2158,6 +2256,10 @@ typedef NMTREEVIEWA NMTREEVIEW,*LPNMTREEVIEW; #define TB_SAVERESTORE TB_SAVERESTOREA #define TB_ADDSTRING TB_ADDSTRINGA #define TBN_GETBUTTONINFO TBN_GETBUTTONINFOA +#if _WIN32_IE >= 0x400 +#define TBBUTTONINFO TBBUTTONINFOA +#define LPTBBUTTONINFO LPTBBUTTONINFOA +#endif #define TBNOTIFY TBNOTIFYA #define LPTBNOTIFY LPTBNOTIFYA #define TTM_ADDTOOL TTM_ADDTOOLA diff --git a/winsup/w32api/include/oaidl.h b/winsup/w32api/include/oaidl.h index 9eccd7742..2c7148012 100644 --- a/winsup/w32api/include/oaidl.h +++ b/winsup/w32api/include/oaidl.h @@ -60,6 +60,7 @@ typedef interface IErrorInfo *LPERRORINFO; typedef interface IDispatch *LPDISPATCH; typedef interface IEnumVARIANT *LPENUMVARIANT; typedef interface ICreateErrorInfo *LPCREATEERRORINFO; +typedef interface ISupportErrorInfo *LPSUPPORTERRORINFO; extern const IID IID_ITypeLib; extern const IID IID_ICreateTypeInfo; @@ -71,7 +72,7 @@ extern const IID IID_IErrorInfo; extern const IID IID_IDispatch; extern const IID IID_IEnumVARIANT; extern const IID IID_ICreateErrorInfo; -extern const GUID IID_ISupportErrorInfo; +extern const IID IID_ISupportErrorInfo; typedef enum tagSYSKIND { SYS_WIN16,SYS_WIN32,SYS_MAC @@ -507,6 +508,47 @@ DECLARE_INTERFACE_(ITypeLib,IUnknown) STDMETHOD_(void,ReleaseTLibAttr)(THIS_ TLIBATTR*) PURE; }; +EXTERN_C const IID IID_IErrorInfo; +#undef INTERFACE +#define INTERFACE IErrorInfo +DECLARE_INTERFACE_(IErrorInfo, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(GetGUID)(THIS_ GUID*) PURE; + STDMETHOD(GetSource)(THIS_ BSTR*) PURE; + STDMETHOD(GetDescription)(THIS_ BSTR*) PURE; + STDMETHOD(GetHelpFile)(THIS_ BSTR*) PURE; + STDMETHOD(GetHelpContext)(THIS_ DWORD*) PURE; +}; + +EXTERN_C const IID IID_ICreateErrorInfo; +#undef INTERFACE +#define INTERFACE ICreateErrorInfo +DECLARE_INTERFACE_(ICreateErrorInfo, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*)PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(SetGUID)(THIS_ REFGUID) PURE; + STDMETHOD(SetSource)(THIS_ LPOLESTR) PURE; + STDMETHOD(SetDescription)(THIS_ LPOLESTR) PURE; + STDMETHOD(SetHelpFile)(THIS_ LPOLESTR) PURE; + STDMETHOD(SetHelpContext)(THIS_ DWORD) PURE; +}; + +EXTERN_C const IID IID_ISupportErrorInfo; +#undef INTERFACE +#define INTERFACE ISupportErrorInfo +DECLARE_INTERFACE_(ISupportErrorInfo, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(InterfaceSupportsErrorInfo)(THIS_ REFIID) PURE; +}; + #ifdef __cplusplus } #endif diff --git a/winsup/w32api/include/oleidl.h b/winsup/w32api/include/oleidl.h index e6b951f1d..c5e602bdd 100644 --- a/winsup/w32api/include/oleidl.h +++ b/winsup/w32api/include/oleidl.h @@ -285,33 +285,6 @@ DECLARE_INTERFACE_(IViewObject2,IUnknown) STDMETHOD(GetExtent)(THIS_ DWORD,DWORD,DVTARGETDEVICE*,LPSIZEL) PURE; }; -EXTERN_C const IID IID_ISupportErrorInfo; -#undef INTERFACE -#define INTERFACE ISupportErrorInfo -DECLARE_INTERFACE_(ISupportErrorInfo, IUnknown) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(InterfaceSupportsErrorInfo)(THIS_ REFIID) PURE; - -}; - -EXTERN_C const IID IID_IErrorInfo; -#undef INTERFACE -#define INTERFACE IErrorInfo -DECLARE_INTERFACE_(IErrorInfo, IUnknown) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - STDMETHOD(GetGUID)(THIS_ REFIID) PURE; - STDMETHOD(GetSource)(THIS_ BSTR*) PURE; - STDMETHOD(GetDescription)(THIS_ BSTR*) PURE; - STDMETHOD(GetHelpContext)(THIS_ DWORD*) PURE; - - }; #ifdef __cplusplus } diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index a6a62ba85..44e0d4c0b 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -15,8 +15,15 @@ extern "C" { #define BIF_DONTGOBELOWDOMAIN 2 #define BIF_STATUSTEXT 4 #define BIF_RETURNFSANCESTORS 8 +#define BIF_EDITBOX 16 +#define BIF_VALIDATE 32 +#define BIF_NEWDIALOGSTYLE 64 +#define BIF_BROWSEINCLUDEURLS 128 +#define BIF_USENEWUI ( BIF_EDITBOX | BIF_NEWDIALOGSTYLE ) #define BIF_BROWSEFORCOMPUTER 0x1000 #define BIF_BROWSEFORPRINTER 0x2000 +#define BIF_BROWSEINCLUDEFILES 0x4000 +#define BIF_SHAREABLE 0x8000 #define BFFM_INITIALIZED 1 #define BFFM_SELCHANGED 2 #define BFFM_SETSTATUSTEXT (WM_USER + 100) diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index 1713d6146..0309788f8 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1310,9 +1310,15 @@ BOOL WINAPI InitializeAcl(PACL,DWORD,DWORD); VOID WINAPI InitializeCriticalSection(LPCRITICAL_SECTION); BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD); BOOL WINAPI InitializeSid (PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); -PVOID WINAPI InterlockedCompareExchange(PVOID*,PVOID,PVOID); +LONG WINAPI InterlockedCompareExchange(LPLONG,LONG,LONG); +/* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ +#define InterlockedCompareExchangePointer(d,e,c) \ + (PVOID)InterlockedCompareExchange((LPLONG)(d),(LONG)(e),(LONG)(c)) LONG WINAPI InterlockedDecrement(LPLONG); -LONG WINAPI InterlockedExchange(PLONG,LONG); +LONG WINAPI InterlockedExchange(LPLONG,LONG); +/* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */ +#define InterlockedExchangePointer(t,v) \ + (PVOID)InterlockedExchange((LPLONG)(t),(LONG)(v) LONG WINAPI InterlockedExchangeAdd(PLONG,LONG); LONG WINAPI InterlockedIncrement(LPLONG); BOOL WINAPI IsBadCodePtr(FARPROC); diff --git a/winsup/w32api/include/winerror.h b/winsup/w32api/include/winerror.h index f1fa0f125..5dc58c774 100644 --- a/winsup/w32api/include/winerror.h +++ b/winsup/w32api/include/winerror.h @@ -699,6 +699,7 @@ #define E_ABORT 0x80004004L #define E_FAIL 0x80004005L #define E_ACCESSDENIED 0x80070005L +#define E_PENDING 0x8000000AL #define CO_E_INIT_TLS 0x80004006L #define CO_E_INIT_SHARED_ALLOCATOR 0x80004007L #define CO_E_INIT_MEMORY_ALLOCATOR 0x80004008L diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index 695d75d7a..ca319cf80 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -1146,6 +1146,7 @@ extern "C" { #define WGL_SWAP_UNDERLAY13 0x10000000 #define WGL_SWAP_UNDERLAY14 0x20000000 #define WGL_SWAP_UNDERLAY15 0x40000000 +#define AC_SRC_OVER 0 #ifndef RC_INVOKED typedef struct _ABC { @@ -2324,6 +2325,12 @@ typedef struct tagLAYERPLANEDESCRIPTOR { BYTE bReserved; COLORREF crTransparent; } LAYERPLANEDESCRIPTOR,*PLAYERPLANEDESCRIPTOR,*LPLAYERPLANEDESCRIPTOR; +typedef struct _BLENDFUNCTION { + BYTE BlendOp; + BYTE BlendFlags; + BYTE SourceConstantAlpha; + BYTE AlphaFormat; +} BLENDFUNCTION,*PBLENDFUNCTION,*LPBLENDFUNCTION; typedef BOOL (CALLBACK *ABORTPROC)(HDC,int); typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM); typedef int (CALLBACK *ENHMFENUMPROC)(HDC,HANDLETABLE*,ENHMETARECORD*,int,LPARAM); diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h index 5c682e691..ca13028d4 100644 --- a/winsup/w32api/include/winsock2.h +++ b/winsup/w32api/include/winsock2.h @@ -970,13 +970,6 @@ typedef LPWSAPROTOCOL_INFOA LPWSAPROTOCOL_INFO; #define TH_NETDEV 0x00000001 #define TH_TAPI 0x00000002 -#define WSAMAKEASYNCREPLY(buflen,error) MAKELONG(buflen,error) -#define WSAMAKESELECTREPLY(event,error) MAKELONG(event,error) -#define WSAGETASYNCBUFLEN(lParam) LOWORD(lParam) -#define WSAGETASYNCERROR(lParam) HIWORD(lParam) -#define WSAGETSELECTEVENT(lParam) LOWORD(lParam) -#define WSAGETSELECTERROR(lParam) HIWORD(lParam) - SOCKET WINAPI WSAAccept(SOCKET, struct sockaddr *, LPINT, LPCONDITIONPROC, DWORD); INT WINAPI WSAAddressToStringA(LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFOA, LPSTR, LPDWORD); INT WINAPI WSAAddressToStringW(LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFOW, LPWSTR, LPDWORD); diff --git a/winsup/w32api/include/wtypes.h b/winsup/w32api/include/wtypes.h index c54043176..7bd929d6c 100644 --- a/winsup/w32api/include/wtypes.h +++ b/winsup/w32api/include/wtypes.h @@ -10,7 +10,7 @@ extern "C" { #define CLSID_NULL GUID_NULL #define CBPCLIPDATA(d) ((d).cbSize-sizeof((d).ulClipFmt)) #define DECIMAL_NEG ((BYTE)0x80) -#define DECIMAL_SETZERO(d) {(dec).Lo64=(dec).Hi32=(dec).signscale=0;} +#define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;} typedef struct _BLOB { ULONG cbSize; BYTE *pBlobData;