diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 13 | ||||
| -rw-r--r-- | winsup/w32api/include/winnetwk.h | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/winuser.h | 13 | ||||
| -rw-r--r-- | winsup/w32api/lib/user32.def | 1 |
4 files changed, 29 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 69876ab..fc237ca 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,16 @@ +2002-12-18 James E. Lucas <xelloss@users.sourceforge.net> + + * include/winnetwk.h (WNetResourceInformation[AW]): Correct + prototypes. + * include/winuser.h (GetAncestor) Add prototype. + (GA_PARENT, GA_ROOT, GA_ROOTOWNER): Add defines. + (EWX_FORCEIFHUNG): Add define for _WIN32_WINNT >= 0x0500. + (SPI_GETACTIVEWINDOWTRACKING, SPI_GETACTIVEWNDTRKZORDER, + SPI_GETACTIVEWNDTRKTIMEOUT, SPI_SETACTIVEWINDOWTRACKING + SPI_SETACTIVEWNDTRKZORDER, SPI_SETACTIVEWNDTRKTIMEOUT): Add + defines. + * lib/user32.def (GetAncestor@8): Add stub. + 2002-12-15 Danny Smith <dannysmith@users.sourceforge.net> * include/windows.h: Guard inclusion of wingdi.h, diff --git a/winsup/w32api/include/winnetwk.h b/winsup/w32api/include/winnetwk.h index 662fba9..0e73446 100644 --- a/winsup/w32api/include/winnetwk.h +++ b/winsup/w32api/include/winnetwk.h @@ -276,8 +276,8 @@ DWORD APIENTRY WNetGetProviderNameA(DWORD,LPSTR,PDWORD); DWORD APIENTRY WNetGetProviderNameW(DWORD,LPWSTR,PDWORD); 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 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); DWORD APIENTRY MultinetGetConnectionPerformanceA(LPNETRESOURCEA,LPNETCONNECTINFOSTRUCT); diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index a05e8ff..2b358a9 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -537,6 +537,9 @@ extern "C" { #define EWX_POWEROFF 8 #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 #define CS_KEYCVTWINDOW 4 @@ -1028,6 +1031,9 @@ extern "C" { #define HSHELL_WINDOWCREATED 1 #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 #define SPI_GETBORDER 5 @@ -1069,6 +1075,9 @@ extern "C" { #define SPI_LANGDRIVER 12 #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 #define SPI_SETBORDER 6 @@ -1940,6 +1949,9 @@ extern "C" { #define LSFW_LOCK 1 #define LSFW_UNLOCK 2 #endif +#define GA_PARENT 1 +#define GA_ROOT 2 +#define GA_ROOTOWNER 3 #ifndef RC_INVOKED typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); @@ -2910,6 +2922,7 @@ BOOL WINAPI FlashWindow(HWND,BOOL); int WINAPI FrameRect(HDC,LPCRECT,HBRUSH); 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); UINT WINAPI GetCaretBlinkTime(void); diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def index ddd047d..59e9841 100644 --- a/winsup/w32api/lib/user32.def +++ b/winsup/w32api/lib/user32.def @@ -205,6 +205,7 @@ GetAltTabInfo@20 GetAltTabInfoA@20 GetAltTabInfoW@20 GetActiveWindow@0 +GetAncestor@8 GetAsyncKeyState@4 GetCapture@0 GetCaretBlinkTime@0 |