JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/winuser.h (DeregisterShellHookWindow): Add function.

Browse Source 
* include/winuser.h [_WIN32_WINNT >= 0x0500] (EndTask): Add function.
* lib/user32.def (EndTask): Add function.
* include/winuser.h (WINVER, _WIN32_WINNT): It's better (?) to use _WIN32_WINNT instead of WINVER to test for Windows 2000.
* include/winable.h: Reorder target macros.
* lib/*.def: Cleanup.
This commit is contained in:
Dimitri Papadopoulos 2003-09-25 11:22:22 +00:00
parent 9a88a83d5a
commit cb86a98b3b
23 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/w32api/ChangeLog
View File

@ -1,3 +1,18 @@
2003-09-25 Dimitri Papadopoulos <papadopo@users.sourceforge.net>
* include/winuser.h (DeregisterShellHookWindow): Add function.
* include/winuser.h [_WIN32_WINNT >= 0x0500] (EndTask): Add function.
* lib/user32.def (EndTask): Add function.
* include/winuser.h (WINVER, _WIN32_WINNT): It's better (?) to
use _WIN32_WINNT instead of WINVER to test for Windows 2000.
* include/winable.h: Reorder target macros.
* lib/*.def: Cleanup.
2003-09-25 Dimitri Papadopoulos <papadopo@users.sourceforge.net> 2003-09-25 Dimitri Papadopoulos <papadopo@users.sourceforge.net>
* include/winuser.h [WINVER >= 0x0500] (AnimateWindow): Add * include/winuser.h [WINVER >= 0x0500] (AnimateWindow): Add

2
winsup/w32api/include/winable.h
View File

@ -8,12 +8,12 @@
extern "C" { extern "C" {
#endif #endif
#if (WINVER < 0x0500)
#if (_WIN32_WINNT < 0x0403) #if (_WIN32_WINNT < 0x0403)
#define INPUT_MOUSE 0 #define INPUT_MOUSE 0
#define INPUT_KEYBOARD 1 #define INPUT_KEYBOARD 1
#define INPUT_HARDWARE 2 #define INPUT_HARDWARE 2
#endif /* (_WIN32_WINNT < 0x04030) */ #endif /* (_WIN32_WINNT < 0x04030) */
#if (WINVER < 0x0500)
#define CHILDID_SELF 0 #define CHILDID_SELF 0
#define OBJID_WINDOW 0x00000000 #define OBJID_WINDOW 0x00000000
#define OBJID_SYSMENU 0xFFFFFFFF #define OBJID_SYSMENU 0xFFFFFFFF

42
winsup/w32api/include/winuser.h
View File

@ -460,7 +460,7 @@ extern "C" {
#if (WINVER >= 0x0500) #if (WINVER >= 0x0500)
#define DFCS_TRANSPARENT 0x800 #define DFCS_TRANSPARENT 0x800
#define DFCS_HOT 0x1000 #define DFCS_HOT 0x1000
#endif /* WINVER >= 0x0500 */ #endif /* (WINVER >= 0x0500) */
#define DFCS_ADJUSTRECT 0x2000 #define DFCS_ADJUSTRECT 0x2000
#define DFCS_FLAT 0x4000 #define DFCS_FLAT 0x4000
#define DFCS_MONO 0x8000 #define DFCS_MONO 0x8000
@ -555,7 +555,7 @@ extern "C" {
#define EWX_POWEROFF 8 #define EWX_POWEROFF 8
#define EWX_REBOOT 2 #define EWX_REBOOT 2
#define EWX_SHUTDOWN 1 #define EWX_SHUTDOWN 1
#if(_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
#define EWX_FORCEIFHUNG 16 #define EWX_FORCEIFHUNG 16
#endif #endif
#define CS_BYTEALIGNCLIENT 4096 #define CS_BYTEALIGNCLIENT 4096
@ -724,12 +724,12 @@ extern "C" {
#define IDYES 6 #define IDYES 6
#define IDNO 7 #define IDNO 7
#if (WINVER >= 0x0400) #if (WINVER >= 0x0400)
# define IDCLOSE 8 #define IDCLOSE 8
# define IDHELP 9 #define IDHELP 9
#endif #endif
#if (WINVER >= 0x0500) #if (WINVER >= 0x0500)
# define IDTRYAGAIN 10 #define IDTRYAGAIN 10
# define IDCONTINUE 11 #define IDCONTINUE 11
#endif #endif
#define GWL_EXSTYLE (-20) #define GWL_EXSTYLE (-20)
@ -902,9 +902,9 @@ extern "C" {
#define SM_CMONITORS 80 #define SM_CMONITORS 80
#define SM_SAMEDISPLAYFORMAT 81 #define SM_SAMEDISPLAYFORMAT 81
#if (_WIN32_WINNT < 0x0400) #if (_WIN32_WINNT < 0x0400)
#define SM_CMETRICS 76 # define SM_CMETRICS 76
#else #else
#define SM_CMETRICS 83 # define SM_CMETRICS 83
#endif #endif
#define ARW_BOTTOMLEFT 0 #define ARW_BOTTOMLEFT 0
#define ARW_BOTTOMRIGHT 1 #define ARW_BOTTOMRIGHT 1
@ -933,7 +933,7 @@ extern "C" {
#define LR_SHARED 32768 #define LR_SHARED 32768
#define KEYEVENTF_EXTENDEDKEY 0x00000001 #define KEYEVENTF_EXTENDEDKEY 0x00000001
#define KEYEVENTF_KEYUP 00000002 #define KEYEVENTF_KEYUP 00000002
#if(_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
#define KEYEVENTF_UNICODE 0x00000004 #define KEYEVENTF_UNICODE 0x00000004
#define KEYEVENTF_SCANCODE 0x00000008 #define KEYEVENTF_SCANCODE 0x00000008
#endif #endif
@ -1263,7 +1263,7 @@ extern "C" {
#define WM_MDISETMENU 560 #define WM_MDISETMENU 560
#define WM_MDITILE 550 #define WM_MDITILE 550
#define WM_MEASUREITEM 44 #define WM_MEASUREITEM 44
#if(WINVER >= 0x0500) #if (WINVER >= 0x0500)
#define WM_MENURBUTTONUP 290 #define WM_MENURBUTTONUP 290
#endif #endif
#define WM_MENUCHAR 288 #define WM_MENUCHAR 288
@ -1365,7 +1365,7 @@ extern "C" {
#define WM_MOUSELAST 522 #define WM_MOUSELAST 522
#define WM_MOUSEHOVER 0x2A1 #define WM_MOUSEHOVER 0x2A1
#define WM_MOUSELEAVE 0x2A3 #define WM_MOUSELEAVE 0x2A3
#if(_WIN32_WINNT >= 0x0400) #if (_WIN32_WINNT >= 0x0400)
#define WHEEL_DELTA 120 #define WHEEL_DELTA 120
#define GET_WHEEL_DELTA_WPARAM(wparam) ((short)HIWORD (wparam)) #define GET_WHEEL_DELTA_WPARAM(wparam) ((short)HIWORD (wparam))
#define WHEEL_PAGESCROLL UINT_MAX #define WHEEL_PAGESCROLL UINT_MAX
@ -2038,8 +2038,8 @@ extern "C" {
#define INPUT_HARDWARE 2 #define INPUT_HARDWARE 2
#define CURSOR_SHOWING 0x00000001 #define CURSOR_SHOWING 0x00000001
#if (WINVER >= 0x0400) #if (WINVER >= 0x0400)
#define ENDSESSION_LOGOFF 0x80000000 #define ENDSESSION_LOGOFF 0x80000000
#endif /* WINVER >= 0x0400 */ #endif /* (WINVER >= 0x0400) */
#if (WINVER >= 0x0500) #if (WINVER >= 0x0500)
#define CHILDID_SELF 0 #define CHILDID_SELF 0
#define OBJID_WINDOW 0x00000000 #define OBJID_WINDOW 0x00000000
@ -2804,7 +2804,7 @@ typedef struct tagKBDLLHOOKSTRUCT {
DWORD time; DWORD time;
DWORD dwExtraInfo; DWORD dwExtraInfo;
} KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT; } KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
#if(WINVER >= 0x0500) #if (WINVER >= 0x0500)
typedef struct { typedef struct {
UINT cbSize; UINT cbSize;
HWND hwnd; HWND hwnd;
@ -2883,9 +2883,9 @@ typedef struct tagGUITHREADINFO {
HKL WINAPI ActivateKeyboardLayout(HKL,UINT); HKL WINAPI ActivateKeyboardLayout(HKL,UINT);
BOOL WINAPI AdjustWindowRect(LPRECT,DWORD,BOOL); BOOL WINAPI AdjustWindowRect(LPRECT,DWORD,BOOL);
BOOL WINAPI AdjustWindowRectEx(LPRECT,DWORD,BOOL,DWORD); BOOL WINAPI AdjustWindowRectEx(LPRECT,DWORD,BOOL,DWORD);
#if (WINVER >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
BOOL WINAPI AnimateWindow(HWND,DWORD,DWORD); BOOL WINAPI AnimateWindow(HWND,DWORD,DWORD);
#endif /* (WINVER >= 0x0500) */ #endif /* (_WIN32_WINNT >= 0x0500) */
BOOL WINAPI AnyPopup(void); BOOL WINAPI AnyPopup(void);
BOOL WINAPI AppendMenuA(HMENU,UINT,UINT_PTR,LPCSTR); BOOL WINAPI AppendMenuA(HMENU,UINT,UINT_PTR,LPCSTR);
BOOL WINAPI AppendMenuW(HMENU,UINT,UINT_PTR,LPCWSTR); BOOL WINAPI AppendMenuW(HMENU,UINT,UINT_PTR,LPCWSTR);
@ -2989,6 +2989,7 @@ LRESULT WINAPI DefMDIChildProcW(HWND,UINT,WPARAM,LPARAM);
LRESULT WINAPI DefWindowProcA(HWND,UINT,WPARAM,LPARAM); LRESULT WINAPI DefWindowProcA(HWND,UINT,WPARAM,LPARAM);
LRESULT WINAPI DefWindowProcW(HWND,UINT,WPARAM,LPARAM); LRESULT WINAPI DefWindowProcW(HWND,UINT,WPARAM,LPARAM);
BOOL WINAPI DeleteMenu(HMENU,UINT,UINT); BOOL WINAPI DeleteMenu(HMENU,UINT,UINT);
BOOL WINAPI DeregisterShellHookWindow(HWND);
BOOL WINAPI DestroyAcceleratorTable(HACCEL); BOOL WINAPI DestroyAcceleratorTable(HACCEL);
BOOL WINAPI DestroyCaret(void); BOOL WINAPI DestroyCaret(void);
BOOL WINAPI DestroyCursor(HCURSOR); BOOL WINAPI DestroyCursor(HCURSOR);
@ -3037,6 +3038,9 @@ BOOL WINAPI EndDeferWindowPos(HDWP);
BOOL WINAPI EndDialog(HWND,int); BOOL WINAPI EndDialog(HWND,int);
BOOL WINAPI EndMenu(VOID); BOOL WINAPI EndMenu(VOID);
BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*); BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*);
#if (_WIN32_WINNT >= 0x0500)
BOOL WINAPI EndTask(HWND,BOOL,BOOL);
#endif
BOOL WINAPI EnumChildWindows(HWND,ENUMWINDOWSPROC,LPARAM); BOOL WINAPI EnumChildWindows(HWND,ENUMWINDOWSPROC,LPARAM);
UINT WINAPI EnumClipboardFormats(UINT); UINT WINAPI EnumClipboardFormats(UINT);
BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM); BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM);
@ -3454,17 +3458,17 @@ int WINAPIV wsprintfA(LPSTR,LPCSTR,...);
int WINAPIV wsprintfW(LPWSTR,LPCWSTR,...); int WINAPIV wsprintfW(LPWSTR,LPCWSTR,...);
int WINAPI wvsprintfA(LPSTR,LPCSTR,va_list arglist); int WINAPI wvsprintfA(LPSTR,LPCSTR,va_list arglist);
int WINAPI wvsprintfW(LPWSTR,LPCWSTR,va_list arglist); int WINAPI wvsprintfW(LPWSTR,LPCWSTR,va_list arglist);
#if(_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490) #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490)
BOOL WINAPI AllowSetForegroundWindow(DWORD); BOOL WINAPI AllowSetForegroundWindow(DWORD);
BOOL WINAPI LockSetForegroundWindow(UINT); BOOL WINAPI LockSetForegroundWindow(UINT);
#endif #endif
#if(_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD); BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD);
#ifndef NOGDI #ifndef NOGDI
BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD);
#endif #endif
#endif #endif
#if(_WIN32_WINNT >= 0x0501) #if (_WIN32_WINNT >= 0x0501)
BOOL WINAPI GetLayeredWindowAttributes(HWND,COLORREF*,BYTE*,DWORD*); BOOL WINAPI GetLayeredWindowAttributes(HWND,COLORREF*,BYTE*,DWORD*);
#endif #endif
#ifdef UNICODE #ifdef UNICODE

2
winsup/w32api/lib/advapi32.def
View File

@ -1,4 +1,4 @@
LIBRARY "ADVAPI32.DLL" LIBRARY ADVAPI32.DLL
EXPORTS EXPORTS
AbortSystemShutdownA@4 AbortSystemShutdownA@4
AbortSystemShutdownW@4 AbortSystemShutdownW@4

2
winsup/w32api/lib/cap.def
View File

@ -1,4 +1,4 @@
LIBRARY "CAP.DLL" LIBRARY CAP.DLL
EXPORTS EXPORTS
DumpCAP@0 DumpCAP@0
StartCAP@0 StartCAP@0

2
winsup/w32api/lib/comctl32.def
View File

@ -1,4 +1,4 @@
LIBRARY "COMCTL32.DLL" LIBRARY COMCTL32.DLL
EXPORTS EXPORTS
_TrackMouseEvent@4 _TrackMouseEvent@4
AddMRUData@12 AddMRUData@12

2
winsup/w32api/lib/comdlg32.def
View File

@ -1,4 +1,4 @@
LIBRARY "COMDLG32.DLL" LIBRARY COMDLG32.DLL
EXPORTS EXPORTS
ChooseColorA@4 ChooseColorA@4
ChooseColorW@4 ChooseColorW@4

2
winsup/w32api/lib/crypt32.def
View File

@ -1,4 +1,4 @@
LIBRARY "CRYPT32.DLL" LIBRARY CRYPT32.DLL
EXPORTS EXPORTS
CertFreeCertificateChain@4 CertFreeCertificateChain@4
CertGetCertificateChain@32 CertGetCertificateChain@32

2
winsup/w32api/lib/d3dim.def
View File

@ -1,5 +1,5 @@
; from DirectX 6.1 ; from DirectX 6.1
LIBRARY "d3dim.dll" LIBRARY d3dim.dll
EXPORTS EXPORTS
Direct3DCreate@12 Direct3DCreate@12
Direct3D_HALCleanUp@8 Direct3D_HALCleanUp@8

2
winsup/w32api/lib/d3drm.def
View File

@ -1,5 +1,5 @@
; from DirectX 6.1 ; from DirectX 6.1
LIBRARY "d3drm.dll" LIBRARY d3drm.dll
EXPORTS EXPORTS
D3DRMColorGetAlpha@4 D3DRMColorGetAlpha@4
D3DRMColorGetBlue@4 D3DRMColorGetBlue@4

2
winsup/w32api/lib/d3dxof.def
View File

@ -1,4 +1,4 @@
; from DirectX 6.1 ; from DirectX 6.1
LIBRARY "d3dxof.dll" LIBRARY d3dxof.dll
EXPORTS EXPORTS
DirectXFileCreate@4 DirectXFileCreate@4

2
winsup/w32api/lib/ddraw.def
View File

@ -1,5 +1,5 @@
; from DirectX 6.1 ; from DirectX 6.1
LIBRARY "DDRAW.dll" LIBRARY DDRAW.dll
EXPORTS EXPORTS
D3DParseUnknownCommand@8 D3DParseUnknownCommand@8
DDHAL32_VidMemAlloc@16 DDHAL32_VidMemAlloc@16

2
winsup/w32api/lib/dinput.def
View File

@ -1,5 +1,5 @@
; from DirectX 6.1 ; from DirectX 6.1
LIBRARY "DINPUT.dll" LIBRARY DINPUT.dll
EXPORTS EXPORTS
DirectInputCreateA@16 DirectInputCreateA@16
DirectInputCreateW@16 DirectInputCreateW@16

2
winsup/w32api/lib/dplayx.def
View File

@ -1,5 +1,5 @@
; from DirectX 6.1 ; from DirectX 6.1
LIBRARY "DPLAYX.dll" LIBRARY DPLAYX.dll
EXPORTS EXPORTS
DirectPlayCreate@12 DirectPlayCreate@12
DirectPlayEnumerate@8 DirectPlayEnumerate@8

2
winsup/w32api/lib/dsetup.def
View File

@ -1,5 +1,5 @@
; from DirectX 6.1 ; from DirectX 6.1
LIBRARY "DSETUP.dll" LIBRARY DSETUP.dll
EXPORTS EXPORTS
DirectXDeviceDriverSetupA@16 DirectXDeviceDriverSetupA@16
DirectXDeviceDriverSetupW@16 DirectXDeviceDriverSetupW@16

2
winsup/w32api/lib/dsound.def
View File

@ -1,5 +1,5 @@
; from DirectX 6.1 ; from DirectX 6.1
LIBRARY "DSOUND.dll" LIBRARY DSOUND.dll
EXPORTS EXPORTS
DirectSoundCaptureCreate@12 DirectSoundCaptureCreate@12
DirectSoundCaptureEnumerateA@8 DirectSoundCaptureEnumerateA@8

2
winsup/w32api/lib/iphlpapi.def
View File

@ -1,4 +1,4 @@
LIBRARY "IPHLPAPI.DLL" LIBRARY IPHLPAPI.DLL
EXPORTS EXPORTS
AddIPAddress@20 AddIPAddress@20
CreateIpForwardEntry@4 CreateIpForwardEntry@4

2
winsup/w32api/lib/rasdlg.def
View File

@ -1,4 +1,4 @@
LIBRARY "RASDLG.DLL" LIBRARY RASDLG.DLL
EXPORTS EXPORTS
RasDialDlgA@16 RasDialDlgA@16
RasDialDlgW@16 RasDialDlgW@16

2
winsup/w32api/lib/shfolder.def
View File

@ -1,4 +1,4 @@
LIBRARY "SHFOLDER.DLL" LIBRARY SHFOLDER.DLL
EXPORTS EXPORTS
SHGetFolderPathA@20 SHGetFolderPathA@20
SHGetFolderPathW@20 SHGetFolderPathW@20

2
winsup/w32api/lib/user32.def
View File

@ -131,6 +131,7 @@ DefWindowProcA@16
DefWindowProcW@16 DefWindowProcW@16
DeferWindowPos@32 DeferWindowPos@32
DeleteMenu@12 DeleteMenu@12
DeregisterShellHookWindow@4
DestroyAcceleratorTable@4 DestroyAcceleratorTable@4
DestroyCaret@0 DestroyCaret@0
DestroyCursor@4 DestroyCursor@4
@ -177,6 +178,7 @@ EndDeferWindowPos@4
EndDialog@8 EndDialog@8
EndMenu@0 EndMenu@0
EndPaint@8 EndPaint@8
EndTask@12
EnumChildWindows@12 EnumChildWindows@12
EnumClipboardFormats@4 EnumClipboardFormats@4
EnumDesktopWindows@12 EnumDesktopWindows@12

2
winsup/w32api/lib/version.def
View File

@ -1,4 +1,4 @@
LIBRARY "VERSION.dll" LIBRARY VERSION.dll
EXPORTS EXPORTS
GetFileVersionInfoA@16 GetFileVersionInfoA@16
GetFileVersionInfoSizeA@8 GetFileVersionInfoSizeA@8

2
winsup/w32api/lib/winspool.def
View File

@ -1,4 +1,4 @@
LIBRARY "WINSPOOL.DRV" LIBRARY WINSPOOL.DRV
EXPORTS EXPORTS
ADVANCEDSETUPDIALOG@16 ADVANCEDSETUPDIALOG@16
AbortPrinter@4 AbortPrinter@4

2
winsup/w32api/lib/ws2_32.def
View File

@ -1,4 +1,4 @@
LIBRARY "WS2_32.DLL" LIBRARY WS2_32.DLL
EXPORTS EXPORTS
WEP@0 WEP@0
WPUCompleteOverlappedRequest@20 WPUCompleteOverlappedRequest@20