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

atl: Don't conflict GWLP_USERDATA with user applications.

oldstable
Qian Hong 2015-01-15 17:28:50 +08:00 committed by Alexandre Julliard
parent e1999c2a0e
commit 6756049be4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/atl/atl_ax.c
View File

@ -55,6 +55,8 @@ typedef struct IOCS {
BOOL fActive, fInPlace, fWindowless;
} IOCS;
static const WCHAR wine_atl_iocsW[] = {'_','_','W','I','N','E','_','A','T','L','_','I','O','C','S','\0'};
/**********************************************************************
* AtlAxWin class window procedure
*/
@ -150,7 +152,7 @@ static HRESULT IOCS_Detach( IOCS *This ) /* remove subclassing */
if ( This->hWnd )
{
SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc );
SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, 0 );
RemovePropW( This->hWnd, wine_atl_iocsW);
This->hWnd = NULL;
}
if ( This->control )
@ -906,7 +908,7 @@ static LRESULT IOCS_OnWndProc( IOCS *This, HWND hWnd, UINT uMsg, WPARAM wParam,
static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam )
{
IOCS *This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA );
IOCS *This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW );
return IOCS_OnWndProc( This, hWnd, wMsg, wParam, lParam );
}
@ -915,7 +917,7 @@ static HRESULT IOCS_Attach( IOCS *This, HWND hWnd, IUnknown *pUnkControl ) /* su
This->hWnd = hWnd;
IUnknown_QueryInterface( pUnkControl, &IID_IOleObject, (void**)&This->control );
IOleObject_SetClientSite( This->control, &This->IOleClientSite_iface );
SetWindowLongPtrW( hWnd, GWLP_USERDATA, (ULONG_PTR) This );
SetPropW( hWnd, wine_atl_iocsW, This );
This->OrigWndProc = (WNDPROC)SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc );
return S_OK;
@ -1328,7 +1330,7 @@ HRESULT WINAPI AtlAxGetHost(HWND hWnd, IUnknown **host)
*host = NULL;
This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA );
This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW );
if ( !This )
{
WARN("No container attached to %p\n", hWnd );
@ -1350,7 +1352,7 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk)
*pUnk = NULL;
This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA );
This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW );
if ( !This || !This->control )
{
WARN("No control attached to %p\n", hWnd );

2
dlls/atl100/tests/atl.c
View File

@ -845,7 +845,7 @@ static void test_AtlAxAttachControl(void)
ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr);
ok(container != NULL, "Expected not NULL!\n");
val = GetWindowLongW(hwnd, GWLP_USERDATA);
todo_wine ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val);
ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val);
DestroyWindow(hwnd);
IUnknown_Release(control);