system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 19:49:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't define GWL_USERDATA, GWL_ID, GWL_HWNDPARENT, GWL_HINSTANCE and

Browse source 
GWL_WNDPROC when compiling the Wine source.
This commit is contained in:
Robert Shearman 2004-09-23 22:54:58 +00:00 committed by Alexandre Julliard
parent d696f21b8a
commit 07519aa1d0
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/shlwapi/ordinal.c
View file

@ -2438,7 +2438,7 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle
SetWindowLongA(hWnd, DWL_MSGRESULT, z); SetWindowLongA(hWnd, DWL_MSGRESULT, z);
if (wndProc) if (wndProc)
SetWindowLongA(hWnd, GWL_WNDPROC, wndProc); SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc);
} }
return hWnd; return hWnd;
} }
@ -2725,7 +2725,7 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle
SetWindowLongA(hWnd, DWL_MSGRESULT, z); SetWindowLongA(hWnd, DWL_MSGRESULT, z);
if (wndProc) if (wndProc)
SetWindowLongA(hWnd, GWL_WNDPROC, wndProc); SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc);
} }
return hWnd; return hWnd;
} }

4
dlls/wininet/dialogs.c
View file

@ -248,7 +248,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog(
/* save the parameter list */ /* save the parameter list */
params = (struct WININET_ErrorDlgParams*) lParam; params = (struct WININET_ErrorDlgParams*) lParam;
SetWindowLongW( hdlg, GWL_USERDATA, lParam ); SetWindowLongPtrW( hdlg, GWLP_USERDATA, lParam );
/* extract the Realm from the proxy response and show it */ /* extract the Realm from the proxy response and show it */
if( WININET_GetAuthRealm( params->hRequest, if( WININET_GetAuthRealm( params->hRequest,
@ -272,7 +272,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog(
} }
params = (struct WININET_ErrorDlgParams*) params = (struct WININET_ErrorDlgParams*)
GetWindowLongW( hdlg, GWL_USERDATA ); GetWindowLongPtrW( hdlg, GWLP_USERDATA );
switch( uMsg ) switch( uMsg )
{ {

12
include/winuser.h
View file

@ -1344,13 +1344,15 @@ typedef struct {
#define WC_DIALOG WINELIB_NAME_AW(WC_DIALOG) #define WC_DIALOG WINELIB_NAME_AW(WC_DIALOG)
/* Offsets for GetWindowLong() and GetWindowWord() */ /* Offsets for GetWindowLong() and GetWindowWord() */
#define GWL_USERDATA (-21)
#define GWL_EXSTYLE (-20) #define GWL_EXSTYLE (-20)
#define GWL_STYLE (-16) #define GWL_STYLE (-16)
#define GWL_ID (-12) #ifndef __WINESRC__
#define GWL_HWNDPARENT (-8) # define GWL_USERDATA (-21)
#define GWL_HINSTANCE (-6) # define GWL_ID (-12)
#define GWL_WNDPROC (-4) # define GWL_HWNDPARENT (-8)
# define GWL_HINSTANCE (-6)
# define GWL_WNDPROC (-4)
#endif /* __WINESRC__ */
#define DWL_MSGRESULT 0 #define DWL_MSGRESULT 0
#define DWL_DLGPROC 4 #define DWL_DLGPROC 4
#define DWL_USER 8 #define DWL_USER 8