2005=11-18 Brian Gunlogson <gmb300@users.sourceforge.net>

	* include/winuser.h (GetClassLongPtr{AW}): Add prototypes.
	(SetClassLongPtr{AW}): Likewise.
	(GCLP_*): Add GetClassLongPtr defines.
	* lib/user32.def (GetClassLongPtr{AW}): Add stubs.
	(SetClassLongPtr{AW}): Likewise.

2 files changed, 19 insertions, 0 deletions

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 36f7c82f6..70db1eb8d 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -612,6 +612,13 @@ extern "C" {
 #define GCL_MENUNAME (-8)
 #define GCL_STYLE (-26)
 #define GCL_WNDPROC (-24)
+#define GCLP_MENUNAME (-8)
+#define GCLP_HBRBACKGROUND (-10)
+#define GCLP_HCURSOR (-12)
+#define GCLP_HICON (-14)
+#define GCLP_HMODULE (-16)
+#define GCLP_WNDPROC (-24)
+#define GCLP_HICONSM (-34)
 #if 0
     /* This is supposed to be defined by the program using it not defined
        in the w32api headers.  I've left it here for documentation purposes.
@@ -3453,6 +3460,8 @@ WINUSERAPI BOOL WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,LPWNDCLASSW);
 WINUSERAPI BOOL WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,LPWNDCLASSEXW);
 WINUSERAPI DWORD WINAPI GetClassLongA(HWND,int);
 WINUSERAPI DWORD WINAPI GetClassLongW(HWND,int);
+WINUSERAPI ULONG_PTR WINAPI GetClassLongPtrA(HWND,int);
+WINUSERAPI ULONG_PTR WINAPI GetClassLongPtrW(HWND,int);
 WINUSERAPI int WINAPI GetClassNameA(HWND,LPSTR,int);
 WINUSERAPI int WINAPI GetClassNameW(HWND,LPWSTR,int);
 WINUSERAPI WORD WINAPI GetClassWord(HWND,int);
@@ -3776,6 +3785,8 @@ WINUSERAPI BOOL WINAPI SetCaretBlinkTime(UINT);
 WINUSERAPI BOOL WINAPI SetCaretPos(int,int);
 WINUSERAPI DWORD WINAPI SetClassLongA(HWND,int,LONG);
 WINUSERAPI DWORD WINAPI SetClassLongW(HWND,int,LONG);
+WINUSERAPI ULONG_PTR WINAPI SetClassLongPtrA(HWND,int,LONG_PTR);
+WINUSERAPI ULONG_PTR WINAPI SetClassLongPtrW(HWND,int,LONG_PTR);
 WINUSERAPI WORD WINAPI SetClassWord(HWND,int,WORD);
 WINUSERAPI HANDLE WINAPI SetClipboardData(UINT,HANDLE);
 WINUSERAPI HWND WINAPI SetClipboardViewer(HWND);
@@ -3989,6 +4000,7 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
 #define GetClassInfo GetClassInfoW
 #define GetClassInfoEx GetClassInfoExW
 #define GetClassLong GetClassLongW
+#define GetClassLongPtr GetClassLongPtrW
 #define GetClassName GetClassNameW
 #define GetClipboardFormatName GetClipboardFormatNameW
 #define GetDlgItemText GetDlgItemTextW
@@ -4053,6 +4065,7 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
 #define SendMessageTimeout SendMessageTimeoutW
 #define SendNotifyMessage SendNotifyMessageW
 #define SetClassLong SetClassLongW
+#define SetClassLongPtr SetClassLongPtrW
 #define SetDlgItemText SetDlgItemTextW
 #define SetMenuItemInfo SetMenuItemInfoW
 #define SetProp SetPropW
@@ -4154,6 +4167,7 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
 #define GetClassInfo GetClassInfoA
 #define GetClassInfoEx GetClassInfoExA
 #define GetClassLong GetClassLongA
+#define GetClassLongPtr GetClassLongPtrA
 #define GetClassName GetClassNameA
 #define GetClipboardFormatName GetClipboardFormatNameA
 #define GetDlgItemText GetDlgItemTextA
@@ -4218,6 +4232,7 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
 #define SendMessageTimeout SendMessageTimeoutA
 #define SendNotifyMessage SendNotifyMessageA
 #define SetClassLong SetClassLongA
+#define SetClassLongPtr SetClassLongPtrA
 #define SetDlgItemText SetDlgItemTextA
 #define SetMenuItemInfo SetMenuItemInfoA
 #define SetProp SetPropA
diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def
index 120b2a377..ff7c99d8d 100644
--- a/winsup/w32api/lib/user32.def
+++ b/winsup/w32api/lib/user32.def
@@ -232,6 +232,8 @@ GetClassInfoExW@12
 GetClassInfoW@12
 GetClassLongA@8
 GetClassLongW@8
+GetClassLongPtrA@8
+GetClassLongPtrW@8
 GetClassNameA@12
 GetClassNameW@12
 GetClassWord@8
@@ -515,6 +517,8 @@ SetCaretBlinkTime@4
 SetCaretPos@8
 SetClassLongA@12
 SetClassLongW@12
+SetClassLongPtrA@12
+SetClassLongPtrW@12
 SetClassWord@12
 SetClipboardData@8
 SetClipboardViewer@4