marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

GWL_WNDPROC when compiling the Wine source.
oldstable
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);
if (wndProc)
SetWindowLongA(hWnd, GWL_WNDPROC, wndProc);
SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc);
}
return hWnd;
}
@ -2725,7 +2725,7 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle
SetWindowLongA(hWnd, DWL_MSGRESULT, z);
if (wndProc)
SetWindowLongA(hWnd, GWL_WNDPROC, wndProc);
SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc);
}
return hWnd;
}

4
dlls/wininet/dialogs.c
View File

@ -248,7 +248,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog(
/* save the parameter list */
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 */
if( WININET_GetAuthRealm( params->hRequest,
@ -272,7 +272,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog(
}
params = (struct WININET_ErrorDlgParams*)
GetWindowLongW( hdlg, GWL_USERDATA );
GetWindowLongPtrW( hdlg, GWLP_USERDATA );
switch( uMsg )
{

12
include/winuser.h
View File

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