Menu
▾
▴
[MinGW-cvs] w32api/include commctrl.h,1.12,1.13 oleacc.h,1.1,1.2 shellapi.h,1.3,1.4 shlobj.h,1.12,1.13 windows.h,1.8,1.9 winnetwk.h,1.3,1.4 winuser.h,1.22,1.23
|
From: <ea...@us...> - 2002-12-20 18:15:04
|
Update of /cvsroot/mingw/w32api/include
In directory sc8-pr-cvs1:/tmp/cvs-serv20820/include
Modified Files:
commctrl.h oleacc.h shellapi.h shlobj.h windows.h winnetwk.h
winuser.h
Log Message:
Merge winsup/w32api changes
Index: commctrl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/commctrl.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** commctrl.h 27 Aug 2002 12:39:55 -0000 1.12
--- commctrl.h 20 Dec 2002 17:51:09 -0000 1.13
***************
*** 458,463 ****
#define TTM_UPDATE (WM_USER+29)
#endif
! #define TTN_NEEDTEXTA (TTN_FIRST-0)
! #define TTN_NEEDTEXTW (TTN_FIRST-10)
#define TTN_SHOW (TTN_FIRST-1)
#define TTN_POP (TTN_FIRST-2)
--- 458,465 ----
#define TTM_UPDATE (WM_USER+29)
#endif
! #define TTN_GETDISPINFOA (TTN_FIRST - 0)
! #define TTN_GETDISPINFOW (TTN_FIRST - 10)
! #define TTN_NEEDTEXTA TTN_GETDISPINFOA
! #define TTN_NEEDTEXTW TTN_GETDISPINFOW
#define TTN_SHOW (TTN_FIRST-1)
#define TTN_POP (TTN_FIRST-2)
***************
*** 644,647 ****
--- 646,662 ----
#define CDRF_NEWFONT 2
#define CDRF_SKIPDEFAULT 4
+ #if (_WIN32_IE >= 0x0400)
+ #define LVBKIF_SOURCE_NONE 0x00000000
+ #define LVBKIF_SOURCE_HBITMAP 0x00000001
+ #define LVBKIF_SOURCE_URL 0x00000002
+ #define LVBKIF_SOURCE_MASK 0x00000003
+ #define LVBKIF_STYLE_NORMAL 0x00000000
+ #define LVBKIF_STYLE_TILE 0x00000010
+ #define LVBKIF_STYLE_MASK 0x00000010
+ #endif /* _WIN32_IE >=0x0400 */
+ #if (_WIN32_WINNT >= 0x501)
+ #define LVBKIF_FLAG_TILEOFFSET 0x00000100
+ #define LVBKIF_TYPE_WATERMARK 0x10000000
+ #endif /* _WIN32_WINNT >= 0x501 */
#define LVS_OWNERDATA 4096
#define LVS_EX_CHECKBOXES 4
***************
*** 699,702 ****
--- 714,723 ----
#define LVM_GETCALLBACKMASK (LVM_FIRST+10)
#define LVM_SETCALLBACKMASK (LVM_FIRST+11)
+ #if( _WIN32_IE >= 0x0400 )
+ #define LVM_SETBKIMAGEA (LVM_FIRST + 68)
+ #define LVM_SETBKIMAGEW (LVM_FIRST + 138)
+ #define LVM_GETBKIMAGEA (LVM_FIRST + 69)
+ #define LVM_GETBKIMAGEW (LVM_FIRST + 139)
+ #endif /* _WIN32_IE >=0x0400 */
#define LVNI_ALL 0
#define LVNI_FOCUSED 1
***************
*** 1412,1416 ****
int cchText;
} TBBUTTONINFOW, *LPTBBUTTONINFOW;
! #endif
typedef struct {
NMHDR hdr;
--- 1433,1453 ----
int cchText;
} TBBUTTONINFOW, *LPTBBUTTONINFOW;
! typedef struct tagLVBKIMAGEA {
! ULONG ulFlags;
! HBITMAP hbm;
! LPSTR pszImage;
! UINT cchImageMax;
! int xOffsetPercent;
! int yOffsetPercent;
! } LVBKIMAGEA, *LPLVBKIMAGEA;
! typedef struct tagLVBKIMAGEW {
! ULONG ulFlags;
! HBITMAP hbm;
! LPWSTR pszImage;
! UINT cchImageMax;
! int xOffsetPercent;
! int yOffsetPercent;
! } LVBKIMAGEW, *LPLVBKIMAGEW;
! #endif /* _WIN32_IE >= 0x400 */
typedef struct {
NMHDR hdr;
***************
*** 1618,1622 ****
TOOLINFOW ti;
} TTHITTESTINFOW,*LPHITTESTINFOW;
! typedef struct tagTOOLTIPTEXTA {
NMHDR hdr;
LPSTR lpszText;
--- 1655,1659 ----
TOOLINFOW ti;
} TTHITTESTINFOW,*LPHITTESTINFOW;
! typedef struct tagNMTTDISPINFOA {
NMHDR hdr;
LPSTR lpszText;
***************
*** 1624,1635 ****
HINSTANCE hinst;
UINT uFlags;
! } TOOLTIPTEXTA,*LPTOOLTIPTEXTA;
! typedef struct tagTOOLTIPTEXTW {
! NMHDR hdr;
! LPWSTR lpszText;
! WCHAR szText[80];
! HINSTANCE hinst;
! UINT uFlags;
! } TOOLTIPTEXTW,*LPTOOLTIPTEXTW;
typedef struct _UDACCEL {
UINT nSec;
--- 1661,1682 ----
HINSTANCE hinst;
UINT uFlags;
! #if (_WIN32_IE >= 0x0300)
! LPARAM lParam;
! #endif
! } NMTTDISPINFOA, *LPNMTTDISPINFOA;
! #define TOOLTIPTEXTA NMTTDISPINFOA
! #define LPTOOLTIPTEXTA LPNMTTDISPINFOA
! typedef struct tagNMTTDISPINFOW {
! NMHDR hdr;
! LPWSTR lpszText;
! WCHAR szText[80];
! HINSTANCE hinst;
! UINT uFlags;
! #if (_WIN32_IE >= 0x0300)
! LPARAM lParam;
! #endif
! } NMTTDISPINFOW, *LPNMTTDISPINFOW;
! #define TOOLTIPTEXTW NMTTDISPINFOW
! #define LPTOOLTIPTEXTW LPNMTTDISPINFOW
typedef struct _UDACCEL {
UINT nSec;
***************
*** 2368,2371 ****
--- 2415,2420 ----
#endif
#if (_WIN32_IE >= 0x0400)
+ #define ListView_GetBkImage(h,plvbki) (BOOL)SNDMSG((h), LVM_GETBKIMAGE, 0, (LPARAM)(plvbki))
+ #define ListView_SetBkImage(h, plvbki) (BOOL)SNDMSG((h), LVM_SETBKIMAGE, 0, (LPARAM)(plvbki))
#define ListView_SetExtendedListViewStyleEx(w,m,s) (DWORD)SNDMSG((w),LVM_SETEXTENDEDLISTVIEWSTYLE,(m),(s))
#define TabCtrl_HighlightItem(hwnd, i, fHighlight) SNDMSG((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)i, (LPARAM)MAKELONG (fHighlight, 0))
***************
*** 2403,2406 ****
--- 2452,2456 ----
typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO;
typedef TOOLTIPTEXTW TOOLTIPTEXT,*LPTOOLTIPTEXT;
+ typedef NMTTDISPINFOW NMTTDISPINFO, *LPNMTTDISPINFO;
typedef TV_ITEMW TV_ITEM,*LPTV_ITEM;
typedef TVITEMW TVITEM,*LPTVITEM;
***************
*** 2472,2475 ****
--- 2522,2526 ----
#define TTM_GETCURRENTTOOL TTM_GETCURRENTTOOLW
#define TTN_NEEDTEXT TTN_NEEDTEXTW
+ #define TTN_GETDISPINFO TTN_GETDISPINFOW
#define SB_GETTEXT SB_GETTEXTW
#define SB_SETTEXT SB_SETTEXTW
***************
*** 2482,2485 ****
--- 2533,2542 ----
#define LVITEM LVITEMW
#define LPSTR_TEXTCALLBACK LPSTR_TEXTCALLBACKW
+ #if _WIN32_IE >= 0x0400
+ #define LVBKIMAGE LVBKIMAGEW
+ #define LPLVBKIMAGE LPLVBKIMAGEW
+ #define LVM_SETBKIMAGE LVM_SETBKIMAGEW
+ #define LVM_GETBKIMAGE LVM_GETBKIMAGEW
+ #endif /* _WIN32_IE >= 0x400 */
#define LVM_GETITEM LVM_GETITEMW
#define LVM_SETITEM LVM_SETITEMW
***************
*** 2561,2564 ****
--- 2618,2622 ----
typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO;
typedef TOOLTIPTEXTA TOOLTIPTEXT,*LPTOOLTIPTEXT;
+ typedef NMTTDISPINFOA NMTTDISPINFO, *LPNMTTDISPINFO;
typedef TV_ITEMA TV_ITEM,*LPTV_ITEM;
typedef TVITEMA TVITEM,*LPTVITEM;
***************
*** 2627,2630 ****
--- 2685,2689 ----
#define TTM_GETCURRENTTOOL TTM_GETCURRENTTOOLA
#define TTN_NEEDTEXT TTN_NEEDTEXTA
+ #define TTN_GETDISPINFO TTN_GETDISPINFOA
#define SB_GETTEXT SB_GETTEXTA
#define SB_SETTEXT SB_SETTEXTA
***************
*** 2633,2636 ****
--- 2692,2701 ----
#define LVITEM LVITEMA
#define LPSTR_TEXTCALLBACK LPSTR_TEXTCALLBACKA
+ #if _WIN32_IE >= 0x0400
+ #define LVBKIMAGE LVBKIMAGEA
+ #define LPLVBKIMAGE LPLVBKIMAGEA
+ #define LVM_SETBKIMAGE LVM_SETBKIMAGEA
+ #define LVM_GETBKIMAGE LVM_GETBKIMAGEA
+ #endif /* _WIN32_IE >= 0x0400 */
#define LVM_GETITEM LVM_GETITEMA
#define LVM_SETITEM LVM_SETITEMA
Index: oleacc.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/oleacc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** oleacc.h 14 Oct 2002 20:27:51 -0000 1.1
--- oleacc.h 20 Dec 2002 17:51:09 -0000 1.2
***************
*** 24,34 ****
#define DISPID_ACC_DODEFAULTACTION (-5018)
! #define SELFLAG_NONE 0x00000000
! #define SELFLAG_TAKEFOCUS 0x00000001
! #define SELFLAG_TAKESELECTION 0x00000002
! #define SELFLAG_EXTENDSELECTION 0x00000004
! #define SELFLAG_ADDSELECTION 0x00000008
! #define SELFLAG_REMOVESELECTION 0x00000010
! #define SELFLAG_VALID 0x0000001F
/* DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b,0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); */
--- 24,38 ----
#define DISPID_ACC_DODEFAULTACTION (-5018)
! typedef enum tagSELFLAG
! {
! SELFLAG_NONE = 0,
! SELFLAG_TAKEFOCUS = 1,
! SELFLAG_TAKESELECTION = 2,
! SELFLAG_EXTENDSELECTION = 4,
! SELFLAG_ADDSELECTION = 8,
! SELFLAG_REMOVESELECTION = 16
! } SELFLAG;
!
! #define SELFLAG_VALID 0x0000001F
/* DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b,0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); */
Index: shellapi.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/shellapi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shellapi.h 14 Aug 2002 21:05:43 -0000 1.3
--- shellapi.h 20 Dec 2002 17:51:09 -0000 1.4
***************
*** 155,158 ****
--- 155,159 ----
HANDLE hProcess;
} SHELLEXECUTEINFOW,*LPSHELLEXECUTEINFOW;
+ #include <pshpack2.h>
typedef struct _SHFILEOPSTRUCTA {
HWND hwnd;
***************
*** 175,178 ****
--- 176,180 ----
LPCWSTR lpszProgressTitle;
} SHFILEOPSTRUCTW,*LPSHFILEOPSTRUCTW;
+ #include <poppack.h>
typedef struct _SHFILEINFOA {
HICON hIcon;
***************
*** 200,205 ****
HICON WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT);
HICON WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);
! HICON WINAPI ExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT);
! HICON WINAPI ExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR);
HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);
--- 202,207 ----
HICON WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT);
HICON WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);
! UINT WINAPI ExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT);
! UINT WINAPI ExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR);
HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);
Index: shlobj.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/shlobj.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shlobj.h 14 Oct 2002 20:23:36 -0000 1.12
--- shlobj.h 20 Dec 2002 17:51:09 -0000 1.13
***************
*** 529,533 ****
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
! STDMETHOD(GetPath)(THIS_ LPSTR,int,WIN32_FIND_DATAW*,DWORD) PURE;
STDMETHOD(GetIDList)(THIS_ LPITEMIDLIST*) PURE;
STDMETHOD(SetIDList)(THIS_ LPCITEMIDLIST) PURE;
--- 529,533 ----
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
! STDMETHOD(GetPath)(THIS_ LPWSTR,int,WIN32_FIND_DATAW*,DWORD) PURE;
STDMETHOD(GetIDList)(THIS_ LPITEMIDLIST*) PURE;
STDMETHOD(SetIDList)(THIS_ LPCITEMIDLIST) PURE;
Index: windows.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/windows.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** windows.h 14 Oct 2002 20:23:39 -0000 1.8
--- windows.h 20 Dec 2002 17:51:09 -0000 1.9
***************
*** 49,53 ****
#include <wincon.h>
#include <winbase.h>
! #ifndef _WINGDI_H
#include <wingdi.h>
#endif
--- 49,53 ----
#include <wincon.h>
#include <winbase.h>
! #if !(defined NOGDI || defined _WINGDI_H)
#include <wingdi.h>
#endif
***************
*** 72,76 ****
#ifndef WIN32_LEAN_AND_MEAN
- #include <commdlg.h>
#include <cderr.h>
#include <dde.h>
--- 72,75 ----
***************
*** 84,88 ****
--- 83,90 ----
#include <shellapi.h>
#include <winperf.h>
+ #ifndef NOGDI
+ #include <commdlg.h>
#include <winspool.h>
+ #endif
#if defined(Win32_Winsock)
#warning "The Win32_Winsock macro name is deprecated.\
***************
*** 104,107 ****
--- 106,110 ----
#endif /* (_WIN32_WINNT >= 0x0400) */
#endif
+ #ifndef NOGDI
#if !defined (__OBJC__)
#if __GNUC__ >= 3 /* what about Watcom? */
***************
*** 109,112 ****
--- 112,117 ----
#endif
#endif /* __OBJC__ */
+ #endif
+
#endif /* WIN32_LEAN_AND_MEAN */
Index: winnetwk.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winnetwk.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** winnetwk.h 9 Apr 2002 21:17:17 -0000 1.3
--- winnetwk.h 20 Dec 2002 17:51:09 -0000 1.4
***************
*** 277,282 ****
DWORD APIENTRY WNetGetNetworkInformationA(LPCSTR,LPNETINFOSTRUCT);
DWORD APIENTRY WNetGetNetworkInformationW(LPCWSTR,LPNETINFOSTRUCT);
! DWORD APIENTRY WNetGetResourceInformationA(LPNETRESOURCEA,LPVOID,LPDWORD,LPCSTR*);
! DWORD APIENTRY WNetGetResourceInformationW(LPNETRESOURCEA,LPVOID,LPDWORD,LPCWSTR*);
DWORD APIENTRY WNetGetLastErrorA(PDWORD,LPSTR,DWORD,LPSTR,DWORD);
DWORD APIENTRY WNetGetLastErrorW(PDWORD,LPWSTR,DWORD,LPWSTR,DWORD);
--- 277,282 ----
DWORD APIENTRY WNetGetNetworkInformationA(LPCSTR,LPNETINFOSTRUCT);
DWORD APIENTRY WNetGetNetworkInformationW(LPCWSTR,LPNETINFOSTRUCT);
! DWORD APIENTRY WNetGetResourceInformationA(LPNETRESOURCEA,LPVOID,LPDWORD,LPSTR*);
! DWORD APIENTRY WNetGetResourceInformationW(LPNETRESOURCEA,LPVOID,LPDWORD,LPWSTR*);
DWORD APIENTRY WNetGetLastErrorA(PDWORD,LPSTR,DWORD,LPSTR,DWORD);
DWORD APIENTRY WNetGetLastErrorW(PDWORD,LPWSTR,DWORD,LPWSTR,DWORD);
Index: winuser.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winuser.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** winuser.h 12 Nov 2002 15:51:48 -0000 1.22
--- winuser.h 20 Dec 2002 17:51:09 -0000 1.23
***************
*** 538,541 ****
--- 538,544 ----
#define EWX_REBOOT 2
#define EWX_SHUTDOWN 1
+ #if(_WIN32_WINNT >= 0x0500)
+ #define EWX_FORCEIFHUNG 16
+ #endif
#define CS_BYTEALIGNCLIENT 4096
#define CS_BYTEALIGNWINDOW 8192
***************
*** 1029,1032 ****
--- 1032,1038 ----
#define HSHELL_WINDOWDESTROYED 2
#define SPI_GETACCESSTIMEOUT 60
+ #define SPI_GETACTIVEWINDOWTRACKING 4096
+ #define SPI_GETACTIVEWNDTRKTIMEOUT 8194
+ #define SPI_GETACTIVEWNDTRKZORDER 4108
#define SPI_GETANIMATION 72
#define SPI_GETBEEP 1
***************
*** 1070,1073 ****
--- 1076,1082 ----
#define SPI_SCREENSAVERRUNNING 97
#define SPI_SETACCESSTIMEOUT 61
+ #define SPI_SETACTIVEWINDOWTRACKING 4097
+ #define SPI_SETACTIVEWNDTRKTIMEOUT 8195
+ #define SPI_SETACTIVEWNDTRKZORDER 4109
#define SPI_SETANIMATION 73
#define SPI_SETBEEP 2
***************
*** 1936,1939 ****
--- 1945,1956 ----
#define OBJID_ALERT 0xFFFFFFF6
#define OBJID_SOUND 0xFFFFFFF5
+ #if(WINVER >= 0x0500)
+ #define ASFW_ANY ((DWORD)-1)
+ #define LSFW_LOCK 1
+ #define LSFW_UNLOCK 2
+ #endif
+ #define GA_PARENT 1
+ #define GA_ROOT 2
+ #define GA_ROOTOWNER 3
#ifndef RC_INVOKED
***************
*** 2309,2312 ****
--- 2326,2330 ----
LPWSTR lpszDefaultScheme;
} HIGHCONTRASTW,*LPHIGHCONTRASTW;
+ #ifndef NOGDI
typedef struct tagICONMETRICSA {
UINT cbSize;
***************
*** 2323,2326 ****
--- 2341,2345 ----
LOGFONTW lfFont;
} ICONMETRICSW,*LPICONMETRICSW;
+ #endif /* NOGDI */
typedef struct tagMINIMIZEDMETRICS {
UINT cbSize;
***************
*** 2339,2342 ****
--- 2358,2362 ----
DWORD dwReserved2;
} MOUSEKEYS, *LPMOUSEKEYS;
+ #ifndef NOGDI
typedef struct tagNONCLIENTMETRICSA {
UINT cbSize;
***************
*** 2373,2376 ****
--- 2393,2397 ----
LOGFONTW lfMessageFont;
} NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW;
+ #endif
typedef struct tagSERIALKEYSA {
UINT cbSize;
***************
*** 2738,2743 ****
--- 2759,2766 ----
WORD WINAPI CascadeWindows(HWND,UINT,LPCRECT,UINT,const HWND*);
BOOL WINAPI ChangeClipboardChain(HWND,HWND);
+ #ifndef NOGDI
LONG WINAPI ChangeDisplaySettingsA(PDEVMODEA,DWORD);
LONG WINAPI ChangeDisplaySettingsW(PDEVMODEW,DWORD);
+ #endif
BOOL WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT);
BOOL WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT);
***************
*** 2785,2790 ****
--- 2808,2815 ----
BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int);
HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID);
+ #ifndef NOGDI
HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
+ #endif
#define CreateDialogA(h,n,w,f) CreateDialogParamA(h,n,w,f,0)
#define CreateDialogW(h,n,w,f) CreateDialogParamW(h,n,w,f,0)
***************
*** 2874,2879 ****
--- 2899,2906 ----
BOOL WINAPI EnumDesktopWindows(HDESK,ENUMWINDOWSPROC,LPARAM);
BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
+ #ifndef NOGDI
BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
+ #endif
int WINAPI EnumPropsA(HWND,PROPENUMPROCA);
int WINAPI EnumPropsW(HWND,PROPENUMPROCW);
***************
*** 2896,2899 ****
--- 2923,2927 ----
BOOL WINAPI FrameRgn(HDC,HRGN,HBRUSH,int,int);
HWND WINAPI GetActiveWindow(void);
+ HWND WINAPI GetAncestor(HWND hwnd, UINT gaFlags);
SHORT WINAPI GetAsyncKeyState(int);
HWND WINAPI GetCapture(void);
***************
*** 3272,3275 ****
--- 3300,3307 ----
int WINAPI wvsprintfA(LPSTR,LPCSTR,va_list arglist);
int WINAPI wvsprintfW(LPWSTR,LPCWSTR,va_list arglist);
+ #if(WINVER >= 0x0500)
+ BOOL WINAPI AllowSetForegroundWindow(DWORD);
+ BOOL WINAPI LockSetForegroundWindow(UINT);
+ #endif
#ifdef UNICODE
***************
*** 3288,3293 ****
typedef MSGBOXPARAMSW MSGBOXPARAMS,*PMSGBOXPARAMS,*LPMSGBOXPARAMS;
typedef HIGHCONTRASTW HIGHCONTRAST,*LPHIGHCONTRAST;
- typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
- typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
typedef SERIALKEYSW SERIALKEYS,*LPSERIALKEYS;
typedef SOUNDSENTRYW SOUNDSENTRY,*LPSOUNDSENTRY;
--- 3320,3323 ----
***************
*** 3299,3303 ****
#define AppendMenu AppendMenuW
#define CallWindowProc CallWindowProcW
- #define ChangeDisplaySettings ChangeDisplaySettingsW
#define ChangeMenu ChangeMenuW
#define CharLower CharLowerW
--- 3329,3332 ----
***************
*** 3313,3317 ****
#define CopyAcceleratorTable CopyAcceleratorTableW
#define CreateAcceleratorTable CreateAcceleratorTableW
- #define CreateDesktop CreateDesktopW
#define CreateDialog CreateDialogW
#define CreateDialogIndirect CreateDialogIndirectW
--- 3342,3345 ----
***************
*** 3339,3343 ****
#define DrawTextEx DrawTextExW
#define EnumDesktops EnumDesktopsW
- #define EnumDisplaySettings EnumDisplaySettingsW
#define EnumProps EnumPropsW
#define EnumPropsEx EnumPropsExW
--- 3367,3370 ----
***************
*** 3427,3431 ****
#define wsprintf wsprintfW
#define wvsprintf wvsprintfW
! #else
#define EDITWORDBREAKPROC EDITWORDBREAKPROCA
#define PROPENUMPROC PROPENUMPROCA
--- 3454,3465 ----
#define wsprintf wsprintfW
#define wvsprintf wvsprintfW
! #ifndef NOGDI
! typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
! typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
! #define ChangeDisplaySettings ChangeDisplaySettingsW
! #define CreateDesktop CreateDesktopW
! #define EnumDisplaySettings EnumDisplaySettingsW
! #endif /* NOGDI */
! #else /* UNICODE */
#define EDITWORDBREAKPROC EDITWORDBREAKPROCA
#define PROPENUMPROC PROPENUMPROCA
***************
*** 3442,3447 ****
typedef MSGBOXPARAMSA MSGBOXPARAMS,*PMSGBOXPARAMS,*LPMSGBOXPARAMS;
typedef HIGHCONTRASTA HIGHCONTRAST,*LPHIGHCONTRAST;
- typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
- typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
typedef SERIALKEYSA SERIALKEYS,*LPSERIALKEYS;
typedef SOUNDSENTRYA SOUNDSENTRY,*LPSOUNDSENTRY;
--- 3476,3479 ----
***************
*** 3453,3457 ****
#define AppendMenu AppendMenuA
#define CallWindowProc CallWindowProcA
- #define ChangeDisplaySettings ChangeDisplaySettingsA
#define ChangeMenu ChangeMenuA
#define CharLower CharLowerA
--- 3485,3488 ----
***************
*** 3467,3471 ****
#define CopyAcceleratorTable CopyAcceleratorTableA
#define CreateAcceleratorTable CreateAcceleratorTableA
- #define CreateDesktop CreateDesktopA
#define CreateDialog CreateDialogA
#define CreateDialogIndirect CreateDialogIndirectA
--- 3498,3501 ----
***************
*** 3493,3497 ****
#define DrawTextEx DrawTextExA
#define EnumDesktops EnumDesktopsA
- #define EnumDisplaySettings EnumDisplaySettingsA
#define EnumProps EnumPropsA
#define EnumPropsEx EnumPropsExA
--- 3523,3526 ----
***************
*** 3581,3586 ****
#define wsprintf wsprintfA
#define wvsprintf wvsprintfA
! #endif
! #endif
#ifdef __cplusplus
}
--- 3610,3622 ----
#define wsprintf wsprintfA
#define wvsprintf wvsprintfA
! #ifndef NOGDI
! typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
! typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
! #define ChangeDisplaySettings ChangeDisplaySettingsA
! #define CreateDesktop CreateDesktopA
! #define EnumDisplaySettings EnumDisplaySettingsA
! #endif /* NOGDI */
! #endif /* UNICODE */
! #endif /* RC_INVOKED */
#ifdef __cplusplus
}
|