Skip to content

W
wine-winehq
Commit 8fd26b91 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Renamed WIN_GetWndPtr into WIN_GetPtr and added corresponding

WIN_ReleasePtr. Started using it instead of WIN_FindWndPtr where we don't need to access windows of other processes.
parent 7ede8fab
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 363 additions and 386 deletions
controls/icontitle.c
View file @ 8fd26b91
...@@ -46,25 +46,22 @@ HWND ICONTITLE_Create( HWND owner ) ...@@ -46,25 +46,22 @@ HWND ICONTITLE_Create( HWND owner )
WND* wndPtr; WND* wndPtr;
HWND hWnd; HWND hWnd;
HINSTANCE instance = GetWindowLongA( owner, GWL_HINSTANCE ); HINSTANCE instance = GetWindowLongA( owner, GWL_HINSTANCE );
LONG style = WS_CLIPSIBLINGS;
if (!IsWindowEnabled(owner)) style |= WS_DISABLED;
if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD ) if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD )
hWnd = CreateWindowExA( 0, ICONTITLE_CLASS_ATOM, NULL, hWnd = CreateWindowExA( 0, ICONTITLE_CLASS_ATOM, NULL,
WS_CHILD | WS_CLIPSIBLINGS, 0, 0, 1, 1, style | WS_CHILD, 0, 0, 1, 1,
GetParent(owner), 0, instance, NULL ); GetParent(owner), 0, instance, NULL );
else else
hWnd = CreateWindowExA( 0, ICONTITLE_CLASS_ATOM, NULL, hWnd = CreateWindowExA( 0, ICONTITLE_CLASS_ATOM, NULL,
WS_CLIPSIBLINGS, 0, 0, 1, 1, style, 0, 0, 1, 1,
owner, 0, instance, NULL ); owner, 0, instance, NULL );
wndPtr = WIN_FindWndPtr( hWnd ); if (!(wndPtr = WIN_GetPtr( hWnd ))) return 0;
if( wndPtr ) wndPtr->owner = owner; /* MDI depends on this */
{ wndPtr->dwStyle &= ~(WS_CAPTION | WS_BORDER);
wndPtr->owner = owner; /* MDI depends on this */ WIN_ReleasePtr(wndPtr);
wndPtr->dwStyle &= ~(WS_CAPTION | WS_BORDER); return hWnd;
if (!IsWindowEnabled(owner)) wndPtr->dwStyle |= WS_DISABLED;
WIN_ReleaseWndPtr(wndPtr);
return hWnd;
}
return 0;
} }
/*********************************************************************** /***********************************************************************
......
controls/scroll.c
View file @ 8fd26b91
...@@ -791,7 +791,7 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, ...@@ -791,7 +791,7 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar,
if (!wndPtr || !infoPtr || if (!wndPtr || !infoPtr ||
((nBar == SB_VERT) && !(wndPtr->dwStyle & WS_VSCROLL)) || ((nBar == SB_VERT) && !(wndPtr->dwStyle & WS_VSCROLL)) ||
((nBar == SB_HORZ) && !(wndPtr->dwStyle & WS_HSCROLL))) goto END; ((nBar == SB_HORZ) && !(wndPtr->dwStyle & WS_HSCROLL))) goto END;
if (!WIN_IsWindowDrawable( wndPtr, FALSE )) goto END; if (!WIN_IsWindowDrawable( hwnd, FALSE )) goto END;
hwnd = wndPtr->hwndSelf; /* make it a full handle */ hwnd = wndPtr->hwndSelf; /* make it a full handle */
vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect, vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
......
dlls/user/msg16.c
View file @ 8fd26b91
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "winerror.h"
#include "heap.h" #include "heap.h"
#include "hook.h" #include "hook.h"
#include "message.h" #include "message.h"
...@@ -263,35 +264,44 @@ LONG WINAPI DispatchMessage16( const MSG16* msg ) ...@@ -263,35 +264,44 @@ LONG WINAPI DispatchMessage16( const MSG16* msg )
} }
} }
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0; if (!(wndPtr = WIN_GetPtr( msg->hwnd )))
if (!wndPtr->winproc)
{ {
WIN_ReleaseWndPtr( wndPtr ); if (msg->hwnd) SetLastError( ERROR_INVALID_WINDOW_HANDLE );
return 0;
}
if (wndPtr == WND_OTHER_PROCESS)
{
if (IsWindow( msg->hwnd ))
ERR( "cannot dispatch msg to other process window %x\n", msg->hwnd );
SetLastError( ERROR_INVALID_WINDOW_HANDLE );
return 0;
}
if (!(winproc = (WNDPROC16)wndPtr->winproc))
{
WIN_ReleasePtr( wndPtr );
return 0; return 0;
} }
winproc = (WNDPROC16)wndPtr->winproc;
painting = (msg->message == WM_PAINT); painting = (msg->message == WM_PAINT);
if (painting) wndPtr->flags |= WIN_NEEDS_BEGINPAINT; if (painting) wndPtr->flags |= WIN_NEEDS_BEGINPAINT;
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
SPY_EnterMessage( SPY_DISPATCHMESSAGE16, hwnd, msg->message, msg->wParam, msg->lParam ); SPY_EnterMessage( SPY_DISPATCHMESSAGE16, hwnd, msg->message, msg->wParam, msg->lParam );
retval = CallWindowProc16( winproc, msg->hwnd, msg->message, msg->wParam, msg->lParam ); retval = CallWindowProc16( winproc, msg->hwnd, msg->message, msg->wParam, msg->lParam );
SPY_ExitMessage( SPY_RESULT_OK16, hwnd, msg->message, retval, msg->wParam, msg->lParam ); SPY_ExitMessage( SPY_RESULT_OK16, hwnd, msg->message, retval, msg->wParam, msg->lParam );
if (!painting) return retval; if (painting && (wndPtr = WIN_GetPtr( hwnd )) && (wndPtr != WND_OTHER_PROCESS))
if ((wndPtr = WIN_FindWndPtr( hwnd )))
{ {
if ((wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate) BOOL validate = ((wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate);
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
WIN_ReleasePtr( wndPtr );
if (validate)
{ {
ERR( "BeginPaint not called on WM_PAINT for hwnd %04x!\n", msg->hwnd ); ERR( "BeginPaint not called on WM_PAINT for hwnd %04x!\n", msg->hwnd );
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
WIN_ReleaseWndPtr( wndPtr );
/* Validate the update region to avoid infinite WM_PAINT loop */ /* Validate the update region to avoid infinite WM_PAINT loop */
RedrawWindow( hwnd, NULL, 0, RedrawWindow( hwnd, NULL, 0,
RDW_NOFRAME | RDW_VALIDATE | RDW_NOCHILDREN | RDW_NOINTERNALPAINT ); RDW_NOFRAME | RDW_VALIDATE | RDW_NOCHILDREN | RDW_NOINTERNALPAINT );
} }
else WIN_ReleaseWndPtr( wndPtr );
} }
return retval; return retval;
} }
......
dlls/x11drv/desktop.c
View file @ 8fd26b91
...@@ -54,11 +54,11 @@ static DWORD CALLBACK desktop_thread( LPVOID driver_data ) ...@@ -54,11 +54,11 @@ static DWORD CALLBACK desktop_thread( LPVOID driver_data )
hwnd = GetDesktopWindow(); hwnd = GetDesktopWindow();
/* patch the desktop window queue to point to our queue */ /* patch the desktop window queue to point to our queue */
win = WIN_FindWndPtr( hwnd ); win = WIN_GetPtr( hwnd );
win->tid = GetCurrentThreadId(); win->tid = GetCurrentThreadId();
win->hmemTaskQ = InitThreadInput16( 0, 0 ); win->hmemTaskQ = InitThreadInput16( 0, 0 );
X11DRV_register_window( display, hwnd, win->pDriverData ); X11DRV_register_window( display, hwnd, win->pDriverData );
WIN_ReleaseWndPtr( win ); WIN_ReleasePtr( win );
SetWindowLongW( hwnd, GWL_WNDPROC, (LONG)desktop_winproc ); SetWindowLongW( hwnd, GWL_WNDPROC, (LONG)desktop_winproc );
wine_tsx11_lock(); wine_tsx11_lock();
......
dlls/x11drv/scroll.c
View file @ 8fd26b91
...@@ -142,16 +142,9 @@ INT X11DRV_ScrollWindowEx( HWND hwnd, INT dx, INT dy, ...@@ -142,16 +142,9 @@ INT X11DRV_ScrollWindowEx( HWND hwnd, INT dx, INT dy,
INT retVal = NULLREGION; INT retVal = NULLREGION;
BOOL bCaret = FALSE, bOwnRgn = TRUE; BOOL bCaret = FALSE, bOwnRgn = TRUE;
RECT rc, cliprc; RECT rc, cliprc;
WND* wnd = WIN_FindWndPtr( hwnd );
if (!wnd) return ERROR; if (!WIN_IsWindowDrawable( hwnd, TRUE )) return ERROR;
if (!WIN_IsWindowDrawable( wnd, TRUE )) hwnd = WIN_GetFullHandle( hwnd );
{
WIN_ReleaseWndPtr( wnd );
return ERROR;
}
hwnd = wnd->hwndSelf; /* make it a full handle */
WIN_ReleaseWndPtr( wnd );
GetClientRect(hwnd, &rc); GetClientRect(hwnd, &rc);
if (rect) IntersectRect(&rc, &rc, rect); if (rect) IntersectRect(&rc, &rc, rect);
......
dlls/x11drv/window.c
View file @ 8fd26b91
...@@ -45,6 +45,9 @@ Atom wmChangeState = None; ...@@ -45,6 +45,9 @@ Atom wmChangeState = None;
Atom kwmDockWindow = None; Atom kwmDockWindow = None;
Atom _kde_net_wm_system_tray_window_for = None; /* KDE 2 Final */ Atom _kde_net_wm_system_tray_window_for = None; /* KDE 2 Final */
static LPCSTR whole_window_atom;
static LPCSTR client_window_atom;
static LPCSTR icon_window_atom;
/*********************************************************************** /***********************************************************************
* is_window_managed * is_window_managed
...@@ -197,7 +200,7 @@ static Window create_icon_window( Display *display, WND *win ) ...@@ -197,7 +200,7 @@ static Window create_icon_window( Display *display, WND *win )
wine_tsx11_unlock(); wine_tsx11_unlock();
TRACE( "created %lx\n", data->icon_window ); TRACE( "created %lx\n", data->icon_window );
SetPropA( win->hwndSelf, "__wine_x11_icon_window", (HANDLE)data->icon_window ); SetPropA( win->hwndSelf, icon_window_atom, (HANDLE)data->icon_window );
return data->icon_window; return data->icon_window;
} }
...@@ -216,7 +219,7 @@ inline static void destroy_icon_window( Display *display, WND *win ) ...@@ -216,7 +219,7 @@ inline static void destroy_icon_window( Display *display, WND *win )
XDestroyWindow( display, data->icon_window ); XDestroyWindow( display, data->icon_window );
data->icon_window = 0; data->icon_window = 0;
wine_tsx11_unlock(); wine_tsx11_unlock();
RemovePropA( win->hwndSelf, "__wine_x11_icon_window" ); RemovePropA( win->hwndSelf, icon_window_atom );
} }
...@@ -600,11 +603,15 @@ static void create_desktop( Display *display, WND *wndPtr, CREATESTRUCTA *cs ) ...@@ -600,11 +603,15 @@ static void create_desktop( Display *display, WND *wndPtr, CREATESTRUCTA *cs )
_kde_net_wm_system_tray_window_for = XInternAtom( display, "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False ); _kde_net_wm_system_tray_window_for = XInternAtom( display, "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False );
wine_tsx11_unlock(); wine_tsx11_unlock();
whole_window_atom = MAKEINTATOMA( GlobalAddAtomA( "__wine_x11_whole_window" ));
client_window_atom = MAKEINTATOMA( GlobalAddAtomA( "__wine_x11_client_window" ));
icon_window_atom = MAKEINTATOMA( GlobalAddAtomA( "__wine_x11_icon_window" ));
data->whole_window = data->client_window = root_window; data->whole_window = data->client_window = root_window;
data->whole_rect = data->client_rect = wndPtr->rectWindow; data->whole_rect = data->client_rect = wndPtr->rectWindow;
SetPropA( wndPtr->hwndSelf, "__wine_x11_whole_window", (HANDLE)root_window ); SetPropA( wndPtr->hwndSelf, whole_window_atom, (HANDLE)root_window );
SetPropA( wndPtr->hwndSelf, "__wine_x11_client_window", (HANDLE)root_window ); SetPropA( wndPtr->hwndSelf, client_window_atom, (HANDLE)root_window );
SetPropA( wndPtr->hwndSelf, "__wine_x11_visual_id", (HANDLE)XVisualIDFromVisual(visual) ); SetPropA( wndPtr->hwndSelf, "__wine_x11_visual_id", (HANDLE)XVisualIDFromVisual(visual) );
SendMessageW( wndPtr->hwndSelf, WM_NCCREATE, 0, (LPARAM)cs ); SendMessageW( wndPtr->hwndSelf, WM_NCCREATE, 0, (LPARAM)cs );
...@@ -717,10 +724,8 @@ BOOL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) ...@@ -717,10 +724,8 @@ BOOL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text )
char *utf8_buffer; char *utf8_buffer;
static UINT text_cp = (UINT)-1; static UINT text_cp = (UINT)-1;
Window win; Window win;
WND *wndPtr = WIN_FindWndPtr( hwnd );
if (!wndPtr) return FALSE; if ((win = X11DRV_get_whole_window( hwnd )))
if ((win = get_whole_window(wndPtr)))
{ {
if (text_cp == (UINT)-1) if (text_cp == (UINT)-1)
{ {
...@@ -743,7 +748,6 @@ BOOL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) ...@@ -743,7 +748,6 @@ BOOL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text )
if (!(buffer = HeapAlloc( GetProcessHeap(), 0, count ))) if (!(buffer = HeapAlloc( GetProcessHeap(), 0, count )))
{ {
ERR("Not enough memory for window text\n"); ERR("Not enough memory for window text\n");
WIN_ReleaseWndPtr( wndPtr );
return FALSE; return FALSE;
} }
WideCharToMultiByte(text_cp, 0, text, -1, buffer, count, NULL, NULL); WideCharToMultiByte(text_cp, 0, text, -1, buffer, count, NULL, NULL);
...@@ -752,7 +756,6 @@ BOOL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) ...@@ -752,7 +756,6 @@ BOOL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text )
if (!(utf8_buffer = HeapAlloc( GetProcessHeap(), 0, count ))) if (!(utf8_buffer = HeapAlloc( GetProcessHeap(), 0, count )))
{ {
ERR("Not enough memory for window text in UTF-8\n"); ERR("Not enough memory for window text in UTF-8\n");
WIN_ReleaseWndPtr( wndPtr );
return FALSE; return FALSE;
} }
WideCharToMultiByte(CP_UTF8, 0, text, strlenW(text), utf8_buffer, count, NULL, NULL); WideCharToMultiByte(CP_UTF8, 0, text, strlenW(text), utf8_buffer, count, NULL, NULL);
...@@ -775,7 +778,6 @@ BOOL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) ...@@ -775,7 +778,6 @@ BOOL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text )
HeapFree( GetProcessHeap(), 0, utf8_buffer ); HeapFree( GetProcessHeap(), 0, utf8_buffer );
HeapFree( GetProcessHeap(), 0, buffer ); HeapFree( GetProcessHeap(), 0, buffer );
} }
WIN_ReleaseWndPtr( wndPtr );
return TRUE; return TRUE;
} }
...@@ -786,7 +788,7 @@ BOOL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) ...@@ -786,7 +788,7 @@ BOOL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text )
BOOL X11DRV_DestroyWindow( HWND hwnd ) BOOL X11DRV_DestroyWindow( HWND hwnd )
{ {
Display *display = thread_display(); Display *display = thread_display();
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
X11DRV_WND_DATA *data = wndPtr->pDriverData; X11DRV_WND_DATA *data = wndPtr->pDriverData;
if (!data) goto done; if (!data) goto done;
...@@ -808,7 +810,7 @@ BOOL X11DRV_DestroyWindow( HWND hwnd ) ...@@ -808,7 +810,7 @@ BOOL X11DRV_DestroyWindow( HWND hwnd )
HeapFree( GetProcessHeap(), 0, data ); HeapFree( GetProcessHeap(), 0, data );
wndPtr->pDriverData = NULL; wndPtr->pDriverData = NULL;
done: done:
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
return TRUE; return TRUE;
} }
...@@ -847,8 +849,8 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) ...@@ -847,8 +849,8 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleaseWndPtr( wndPtr );
SetPropA( hwnd, "__wine_x11_whole_window", (HANDLE)data->whole_window ); SetPropA( hwnd, whole_window_atom, (HANDLE)data->whole_window );
SetPropA( hwnd, "__wine_x11_client_window", (HANDLE)data->client_window ); SetPropA( hwnd, client_window_atom, (HANDLE)data->client_window );
/* send WM_NCCREATE */ /* send WM_NCCREATE */
TRACE( "hwnd %x cs %d,%d %dx%d\n", hwnd, cs->x, cs->y, cs->cx, cs->cy ); TRACE( "hwnd %x cs %d,%d %dx%d\n", hwnd, cs->x, cs->y, cs->cx, cs->cy );
...@@ -958,12 +960,16 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) ...@@ -958,12 +960,16 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
Window X11DRV_get_client_window( HWND hwnd ) Window X11DRV_get_client_window( HWND hwnd )
{ {
Window ret = 0; Window ret = 0;
WND *win = WIN_FindWndPtr( hwnd ); WND *win = WIN_GetPtr( hwnd );
if (win == WND_OTHER_PROCESS)
return GetPropA( hwnd, client_window_atom );
if (win) if (win)
{ {
struct x11drv_win_data *data = win->pDriverData; struct x11drv_win_data *data = win->pDriverData;
ret = data->client_window; ret = data->client_window;
WIN_ReleaseWndPtr( win ); WIN_ReleasePtr( win );
} }
return ret; return ret;
} }
...@@ -977,12 +983,16 @@ Window X11DRV_get_client_window( HWND hwnd ) ...@@ -977,12 +983,16 @@ Window X11DRV_get_client_window( HWND hwnd )
Window X11DRV_get_whole_window( HWND hwnd ) Window X11DRV_get_whole_window( HWND hwnd )
{ {
Window ret = 0; Window ret = 0;
WND *win = WIN_FindWndPtr( hwnd ); WND *win = WIN_GetPtr( hwnd );
if (win == WND_OTHER_PROCESS)
return GetPropA( hwnd, whole_window_atom );
if (win) if (win)
{ {
struct x11drv_win_data *data = win->pDriverData; struct x11drv_win_data *data = win->pDriverData;
ret = data->whole_window; ret = data->whole_window;
WIN_ReleaseWndPtr( win ); WIN_ReleasePtr( win );
} }
return ret; return ret;
} }
...@@ -1176,19 +1186,15 @@ void X11DRV_SetFocus( HWND hwnd ) ...@@ -1176,19 +1186,15 @@ void X11DRV_SetFocus( HWND hwnd )
*/ */
HICON X11DRV_SetWindowIcon( HWND hwnd, HICON icon, BOOL small ) HICON X11DRV_SetWindowIcon( HWND hwnd, HICON icon, BOOL small )
{ {
WND *wndPtr;
Display *display = thread_display(); Display *display = thread_display();
WND *wndPtr = WIN_FindWndPtr( hwnd ); HICON old = SetClassLongW( hwnd, small ? GCL_HICONSM : GCL_HICON, icon );
int index = small ? GCL_HICONSM : GCL_HICON;
HICON old;
if (!wndPtr) return 0;
old = GetClassLongW( hwnd, index );
SetClassLongW( hwnd, index, icon );
SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE | SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE |
SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER ); SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER );
if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return old;
if (wndPtr->dwExStyle & WS_EX_MANAGED) if (wndPtr->dwExStyle & WS_EX_MANAGED)
{ {
Window win = get_whole_window(wndPtr); Window win = get_whole_window(wndPtr);
...@@ -1202,7 +1208,6 @@ HICON X11DRV_SetWindowIcon( HWND hwnd, HICON icon, BOOL small ) ...@@ -1202,7 +1208,6 @@ HICON X11DRV_SetWindowIcon( HWND hwnd, HICON icon, BOOL small )
TSXFree( wm_hints ); TSXFree( wm_hints );
} }
} }
WIN_ReleasePtr( wndPtr );
WIN_ReleaseWndPtr( wndPtr );
return old; return old;
} }
dlls/x11drv/winpos.c
View file @ 8fd26b91
...@@ -148,7 +148,7 @@ static HRGN get_visible_region( WND *win, HWND top, UINT flags, int mode ) ...@@ -148,7 +148,7 @@ static HRGN get_visible_region( WND *win, HWND top, UINT flags, int mode )
if (top && top != win->hwndSelf) /* need to clip siblings of ancestors */ if (top && top != win->hwndSelf) /* need to clip siblings of ancestors */
{ {
WND *parent, *ptr = WIN_LockWndPtr( win ); WND *parent, *ptr = WIN_FindWndPtr( win->hwndSelf );
HRGN tmp = 0; HRGN tmp = 0;
OffsetRgn( rgn, xoffset, yoffset ); OffsetRgn( rgn, xoffset, yoffset );
...@@ -194,7 +194,7 @@ static int get_covered_region( WND *win, HRGN rgn ) ...@@ -194,7 +194,7 @@ static int get_covered_region( WND *win, HRGN rgn )
{ {
HRGN tmp; HRGN tmp;
int ret; int ret;
WND *parent, *ptr = WIN_LockWndPtr( win ); WND *parent, *ptr = WIN_FindWndPtr( win->hwndSelf );
int xoffset = 0, yoffset = 0; int xoffset = 0, yoffset = 0;
tmp = CreateRectRgn( 0, 0, 0, 0 ); tmp = CreateRectRgn( 0, 0, 0, 0 );
...@@ -384,7 +384,7 @@ void X11DRV_Expose( HWND hwnd, XExposeEvent *event ) ...@@ -384,7 +384,7 @@ void X11DRV_Expose( HWND hwnd, XExposeEvent *event )
rect.right = rect.left + event->width; rect.right = rect.left + event->width;
rect.bottom = rect.top + event->height; rect.bottom = rect.top + event->height;
if (!(win = WIN_FindWndPtr(hwnd))) return; if (!(win = WIN_GetPtr( hwnd ))) return;
data = win->pDriverData; data = win->pDriverData;
if (event->window != data->client_window) /* whole window or icon window */ if (event->window != data->client_window) /* whole window or icon window */
...@@ -393,7 +393,7 @@ void X11DRV_Expose( HWND hwnd, XExposeEvent *event ) ...@@ -393,7 +393,7 @@ void X11DRV_Expose( HWND hwnd, XExposeEvent *event )
/* make position relative to client area instead of window */ /* make position relative to client area instead of window */
OffsetRect( &rect, -data->client_rect.left, -data->client_rect.top ); OffsetRect( &rect, -data->client_rect.left, -data->client_rect.top );
} }
WIN_ReleaseWndPtr( win ); WIN_ReleasePtr( win );
expose_window( hwnd, &rect, 0, flags ); expose_window( hwnd, &rect, 0, flags );
} }
...@@ -1434,7 +1434,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XConfigureEvent *event ) ...@@ -1434,7 +1434,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XConfigureEvent *event )
WINDOWPOS winpos; WINDOWPOS winpos;
int x = event->x, y = event->y; int x = event->x, y = event->y;
if (!(win = WIN_FindWndPtr( hwnd ))) return; if (!(win = WIN_GetPtr( hwnd ))) return;
data = win->pDriverData; data = win->pDriverData;
/* Get geometry */ /* Get geometry */
...@@ -1455,7 +1455,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XConfigureEvent *event ) ...@@ -1455,7 +1455,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XConfigureEvent *event )
hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top,
event->x, event->y, event->width, event->height ); event->x, event->y, event->width, event->height );
X11DRV_X_to_window_rect( win, &rect ); X11DRV_X_to_window_rect( win, &rect );
WIN_ReleaseWndPtr( win ); WIN_ReleasePtr( win );
winpos.hwnd = hwnd; winpos.hwnd = hwnd;
winpos.x = rect.left; winpos.x = rect.left;
......
include/win.h
View file @ 8fd26b91
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include "winuser.h" #include "winuser.h"
#include "wine/windef16.h" #include "wine/windef16.h"
#include "user.h"
#define WND_MAGIC 0x444e4957 /* 'WIND' */ #define WND_MAGIC 0x444e4957 /* 'WIND' */
struct tagCLASS; struct tagCLASS;
...@@ -76,22 +78,20 @@ typedef struct ...@@ -76,22 +78,20 @@ typedef struct
#define WIN_NEEDS_INTERNALSOP 0x1000 /* Window was hidden by WIN_InternalShowOwnedPopups */ #define WIN_NEEDS_INTERNALSOP 0x1000 /* Window was hidden by WIN_InternalShowOwnedPopups */
/* Window functions */ /* Window functions */
extern WND *WIN_GetWndPtr( HWND hwnd ); extern WND *WIN_GetPtr( HWND hwnd );
extern int WIN_SuspendWndsLock( void ); extern int WIN_SuspendWndsLock( void );
extern void WIN_RestoreWndsLock(int ipreviousLock); extern void WIN_RestoreWndsLock(int ipreviousLock);
extern WND* WIN_FindWndPtr( HWND hwnd ); extern WND* WIN_FindWndPtr( HWND hwnd );
extern WND* WIN_LockWndPtr(WND *wndPtr);
extern void WIN_ReleaseWndPtr(WND *wndPtr); extern void WIN_ReleaseWndPtr(WND *wndPtr);
extern void WIN_UpdateWndPtr(WND **oldPtr,WND *newPtr);
extern HWND WIN_Handle32( HWND16 hwnd16 ); extern HWND WIN_Handle32( HWND16 hwnd16 );
extern BOOL WIN_IsCurrentProcess( HWND hwnd ); extern HWND WIN_IsCurrentProcess( HWND hwnd );
extern BOOL WIN_IsCurrentThread( HWND hwnd ); extern HWND WIN_IsCurrentThread( HWND hwnd );
extern void WIN_LinkWindow( HWND hwnd, HWND parent, HWND hwndInsertAfter ); extern void WIN_LinkWindow( HWND hwnd, HWND parent, HWND hwndInsertAfter );
extern void WIN_UnlinkWindow( HWND hwnd ); extern void WIN_UnlinkWindow( HWND hwnd );
extern HWND WIN_FindWinToRepaint( HWND hwnd ); extern HWND WIN_FindWinToRepaint( HWND hwnd );
extern void WIN_DestroyThreadWindows( HWND hwnd ); extern void WIN_DestroyThreadWindows( HWND hwnd );
extern BOOL WIN_CreateDesktopWindow(void); extern BOOL WIN_CreateDesktopWindow(void);
extern BOOL WIN_IsWindowDrawable(WND*, BOOL ); extern BOOL WIN_IsWindowDrawable( HWND hwnd, BOOL );
extern HWND *WIN_ListParents( HWND hwnd ); extern HWND *WIN_ListParents( HWND hwnd );
extern HWND *WIN_ListChildren( HWND hwnd ); extern HWND *WIN_ListChildren( HWND hwnd );
extern BOOL WIN_InternalShowOwnedPopups( HWND owner, BOOL fShow, BOOL unmanagedOnly ); extern BOOL WIN_InternalShowOwnedPopups( HWND owner, BOOL fShow, BOOL unmanagedOnly );
...@@ -113,7 +113,13 @@ inline static WND *WIN_FindWndPtr16( HWND16 hwnd ) ...@@ -113,7 +113,13 @@ inline static WND *WIN_FindWndPtr16( HWND16 hwnd )
return WIN_FindWndPtr( (HWND)(ULONG_PTR)hwnd ); return WIN_FindWndPtr( (HWND)(ULONG_PTR)hwnd );
} }
#define BAD_WND_PTR ((WND *)1) /* returned by WIN_GetWndPtr on bad window handles */ /* to release pointers retrieved by WIN_GetPtr; do not confuse with WIN_ReleaseWndPtr!! */
inline static void WIN_ReleasePtr( WND *ptr )
{
USER_Unlock();
}
#define WND_OTHER_PROCESS ((WND *)1) /* returned by WIN_GetPtr on unknown window handles */
extern HWND CARET_GetHwnd(void); extern HWND CARET_GetHwnd(void);
extern void CARET_GetRect(LPRECT lprc); /* windows/caret.c */ extern void CARET_GetRect(LPRECT lprc); /* windows/caret.c */
......
windows/class.c
View file @ 8fd26b91
...@@ -58,25 +58,27 @@ static CLASS *firstClass; ...@@ -58,25 +58,27 @@ static CLASS *firstClass;
/*********************************************************************** /***********************************************************************
* get_class_ptr * get_class_ptr
*/ */
static CLASS *get_class_ptr( HWND hwnd ) static CLASS *get_class_ptr( HWND hwnd, BOOL write_access )
{ {
CLASS *ret = NULL; WND *ptr = WIN_GetPtr( hwnd );
WND *ptr = WIN_GetWndPtr( hwnd );
if (!ptr) if (ptr)
{ {
if (ptr != WND_OTHER_PROCESS) return ptr->class;
if (IsWindow( hwnd )) /* check other processes */ if (IsWindow( hwnd )) /* check other processes */
{ {
ERR( "class of window %04x belongs to other process\n", hwnd ); if (write_access)
{
/* modifying classes in other processes is not allowed */
SetLastError( ERROR_ACCESS_DENIED );
return NULL;
}
FIXME( "reading from class of other process window %04x\n", hwnd );
/* DbgBreakPoint(); */ /* DbgBreakPoint(); */
} }
} }
else SetLastError( ERROR_INVALID_WINDOW_HANDLE );
{ return NULL;
if (ptr != BAD_WND_PTR) ret = ptr->class;
else SetLastError( ERROR_INVALID_WINDOW_HANDLE );
}
return ret;
} }
...@@ -741,7 +743,7 @@ WORD WINAPI GetClassWord( HWND hwnd, INT offset ) ...@@ -741,7 +743,7 @@ WORD WINAPI GetClassWord( HWND hwnd, INT offset )
TRACE("%x %x\n",hwnd, offset); TRACE("%x %x\n",hwnd, offset);
if (!(class = get_class_ptr( hwnd ))) return 0; if (!(class = get_class_ptr( hwnd, FALSE ))) return 0;
if (offset <= class->cbClsExtra - sizeof(WORD)) if (offset <= class->cbClsExtra - sizeof(WORD))
retvalue = GET_WORD((char *)(class + 1) + offset); retvalue = GET_WORD((char *)(class + 1) + offset);
...@@ -766,7 +768,7 @@ LONG WINAPI GetClassLong16( HWND16 hwnd16, INT16 offset ) ...@@ -766,7 +768,7 @@ LONG WINAPI GetClassLong16( HWND16 hwnd16, INT16 offset )
switch( offset ) switch( offset )
{ {
case GCL_WNDPROC: case GCL_WNDPROC:
if (!(class = get_class_ptr( hwnd ))) return 0; if (!(class = get_class_ptr( hwnd, FALSE ))) return 0;
ret = (LONG)CLASS_GetProc( class, WIN_PROC_16 ); ret = (LONG)CLASS_GetProc( class, WIN_PROC_16 );
release_class_ptr( class ); release_class_ptr( class );
return ret; return ret;
...@@ -789,7 +791,7 @@ LONG WINAPI GetClassLongA( HWND hwnd, INT offset ) ...@@ -789,7 +791,7 @@ LONG WINAPI GetClassLongA( HWND hwnd, INT offset )
TRACE("%x %d\n", hwnd, offset); TRACE("%x %d\n", hwnd, offset);
if (!(class = get_class_ptr( hwnd ))) return 0; if (!(class = get_class_ptr( hwnd, FALSE ))) return 0;
if (offset >= 0) if (offset >= 0)
{ {
...@@ -858,7 +860,7 @@ LONG WINAPI GetClassLongW( HWND hwnd, INT offset ) ...@@ -858,7 +860,7 @@ LONG WINAPI GetClassLongW( HWND hwnd, INT offset )
TRACE("%x %d\n", hwnd, offset); TRACE("%x %d\n", hwnd, offset);
if (!(class = get_class_ptr( hwnd ))) return 0; if (!(class = get_class_ptr( hwnd, FALSE ))) return 0;
if (offset == GCL_WNDPROC) if (offset == GCL_WNDPROC)
retvalue = (LONG)CLASS_GetProc( class, WIN_PROC_32W ); retvalue = (LONG)CLASS_GetProc( class, WIN_PROC_32W );
...@@ -882,7 +884,7 @@ WORD WINAPI SetClassWord( HWND hwnd, INT offset, WORD newval ) ...@@ -882,7 +884,7 @@ WORD WINAPI SetClassWord( HWND hwnd, INT offset, WORD newval )
TRACE("%x %d %x\n", hwnd, offset, newval); TRACE("%x %d %x\n", hwnd, offset, newval);
if (!(class = get_class_ptr( hwnd ))) return 0; if (!(class = get_class_ptr( hwnd, TRUE ))) return 0;
if (offset <= class->cbClsExtra - sizeof(WORD)) if (offset <= class->cbClsExtra - sizeof(WORD))
{ {
...@@ -911,7 +913,7 @@ LONG WINAPI SetClassLong16( HWND16 hwnd16, INT16 offset, LONG newval ) ...@@ -911,7 +913,7 @@ LONG WINAPI SetClassLong16( HWND16 hwnd16, INT16 offset, LONG newval )
switch(offset) switch(offset)
{ {
case GCL_WNDPROC: case GCL_WNDPROC:
if (!(class = get_class_ptr( hwnd ))) return 0; if (!(class = get_class_ptr( hwnd, TRUE ))) return 0;
retval = (LONG)CLASS_SetProc( class, (WNDPROC)newval, WIN_PROC_16 ); retval = (LONG)CLASS_SetProc( class, (WNDPROC)newval, WIN_PROC_16 );
release_class_ptr( class ); release_class_ptr( class );
return retval; return retval;
...@@ -934,7 +936,7 @@ LONG WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval ) ...@@ -934,7 +936,7 @@ LONG WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval )
TRACE("%x %d %lx\n", hwnd, offset, newval); TRACE("%x %d %lx\n", hwnd, offset, newval);
if (!(class = get_class_ptr( hwnd ))) return 0; if (!(class = get_class_ptr( hwnd, TRUE ))) return 0;
if (offset >= 0) if (offset >= 0)
{ {
...@@ -979,10 +981,6 @@ LONG WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval ) ...@@ -979,10 +981,6 @@ LONG WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval )
retval = (LONG)class->cbWndExtra; retval = (LONG)class->cbWndExtra;
class->cbWndExtra = newval; class->cbWndExtra = newval;
break; break;
case GCL_CBCLSEXTRA:
retval = (LONG)class->cbClsExtra;
class->cbClsExtra = newval;
break;
case GCL_HMODULE: case GCL_HMODULE:
retval = (LONG)class->hInstance; retval = (LONG)class->hInstance;
class->hInstance = newval; class->hInstance = newval;
...@@ -991,6 +989,9 @@ LONG WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval ) ...@@ -991,6 +989,9 @@ LONG WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval )
retval = (DWORD)class->atomName; retval = (DWORD)class->atomName;
class->atomName = newval; class->atomName = newval;
break; break;
case GCL_CBCLSEXTRA: /* cannot change this one */
SetLastError( ERROR_INVALID_PARAMETER );
break;
default: default:
SetLastError( ERROR_INVALID_INDEX ); SetLastError( ERROR_INVALID_INDEX );
break; break;
...@@ -1013,7 +1014,7 @@ LONG WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval ) ...@@ -1013,7 +1014,7 @@ LONG WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval )
TRACE("%x %d %lx\n", hwnd, offset, newval); TRACE("%x %d %lx\n", hwnd, offset, newval);
if (!(class = get_class_ptr( hwnd ))) return 0; if (!(class = get_class_ptr( hwnd, TRUE ))) return 0;
if (offset == GCL_WNDPROC) if (offset == GCL_WNDPROC)
retval = (LONG)CLASS_SetProc( class, (WNDPROC)newval, WIN_PROC_32W ); retval = (LONG)CLASS_SetProc( class, (WNDPROC)newval, WIN_PROC_32W );
...@@ -1032,12 +1033,7 @@ LONG WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval ) ...@@ -1032,12 +1033,7 @@ LONG WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval )
*/ */
INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count ) INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count )
{ {
INT ret; INT ret = GlobalGetAtomNameA( GetClassLongA( hwnd, GCW_ATOM ), buffer, count );
CLASS *class;
if (!(class = get_class_ptr( hwnd ))) return 0;
ret = GlobalGetAtomNameA( class->atomName, buffer, count );
release_class_ptr( class );
TRACE("%x %s %x\n",hwnd, debugstr_a(buffer), count); TRACE("%x %s %x\n",hwnd, debugstr_a(buffer), count);
return ret; return ret;
...@@ -1049,12 +1045,7 @@ INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count ) ...@@ -1049,12 +1045,7 @@ INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count )
*/ */
INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count ) INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count )
{ {
INT ret; INT ret = GlobalGetAtomNameW( GetClassLongW( hwnd, GCW_ATOM ), buffer, count );
CLASS *class;
if (!(class = get_class_ptr( hwnd ))) return 0;
ret = GlobalGetAtomNameW( class->atomName, buffer, count );
release_class_ptr( class );
TRACE("%x %s %x\n",hwnd, debugstr_w(buffer), count); TRACE("%x %s %x\n",hwnd, debugstr_w(buffer), count);
return ret; return ret;
......
windows/dce.c
View file @ 8fd26b91
...@@ -274,65 +274,42 @@ BOOL DCE_InvalidateDCE(HWND hwnd, const RECT* pRectUpdate) ...@@ -274,65 +274,42 @@ BOOL DCE_InvalidateDCE(HWND hwnd, const RECT* pRectUpdate)
for (dce = firstDCE; (dce); dce = dce->next) for (dce = firstDCE; (dce); dce = dce->next)
{ {
WND* wndCurrent;
HWND tmp;
INT xoffset = 0, yoffset = 0;
if (dce->DCXflags & DCX_DCEEMPTY) continue; if (dce->DCXflags & DCX_DCEEMPTY) continue;
if ((dce->hwndCurrent == hwndScope) && !(dce->DCXflags & DCX_CLIPCHILDREN)) if ((dce->hwndCurrent == hwndScope) && !(dce->DCXflags & DCX_CLIPCHILDREN))
continue; /* child window positions don't bother us */ continue; /* child window positions don't bother us */
if (!(wndCurrent = WIN_FindWndPtr(dce->hwndCurrent))) continue;
/* check if DCE window is within the z-order scope */ /* check if DCE window is within the z-order scope */
for (tmp = dce->hwndCurrent; tmp; tmp = GetAncestor( tmp, GA_PARENT )) if (hwndScope == dce->hwndCurrent || IsChild( hwndScope, dce->hwndCurrent ))
{ {
if (tmp == hwndScope ) if (hwnd != dce->hwndCurrent)
{
/* check if the window rectangle intersects this DCE window */
RECT rect;
GetWindowRect( dce->hwndCurrent, &rect );
MapWindowPoints( 0, hwndScope, (POINT *)&rect, 2 );
if (!IntersectRect( &rect, &rect, pRectUpdate )) continue;
}
if( !(dce->DCXflags & DCX_DCEBUSY) )
{ {
RECT wndRect; /* Don't bother with visible regions of unused DCEs */
wndRect = wndCurrent->rectWindow; TRACE("\tpurged %p dce [%04x]\n", dce, dce->hwndCurrent);
dce->hwndCurrent = 0;
OffsetRect( &wndRect, xoffset - wndCurrent->rectClient.left, dce->DCXflags &= DCX_CACHE;
yoffset - wndCurrent->rectClient.top); dce->DCXflags |= DCX_DCEEMPTY;
if (hwnd == wndCurrent->hwndSelf ||
IntersectRect( &wndRect, &wndRect, pRectUpdate ))
{
if( !(dce->DCXflags & DCX_DCEBUSY) )
{
/* Don't bother with visible regions of unused DCEs */
TRACE("\tpurged %08x dce [%04x]\n",
(unsigned)dce, wndCurrent->hwndSelf);
dce->hwndCurrent = 0;
dce->DCXflags &= DCX_CACHE;
dce->DCXflags |= DCX_DCEEMPTY;
}
else
{
/* Set dirty bits in the hDC and DCE structs */
TRACE("\tfixed up %08x dce [%04x]\n",
(unsigned)dce, wndCurrent->hwndSelf);
dce->DCXflags |= DCX_DCEDIRTY;
SetHookFlags16(dce->hDC, DCHF_INVALIDATEVISRGN);
bRet = TRUE;
}
}
break;
} }
else else
{ {
WND* wnd = WIN_FindWndPtr( tmp ); /* Set dirty bits in the hDC and DCE structs */
xoffset += wnd->rectClient.left;
yoffset += wnd->rectClient.top; TRACE("\tfixed up %p dce [%04x]\n", dce, dce->hwndCurrent);
WIN_ReleaseWndPtr( wnd ); dce->DCXflags |= DCX_DCEDIRTY;
SetHookFlags16(dce->hDC, DCHF_INVALIDATEVISRGN);
bRet = TRUE;
} }
} }
WIN_ReleaseWndPtr(wndCurrent);
} /* dce list */ } /* dce list */
} }
return bRet; return bRet;
......
windows/defdlg.c
View file @ 8fd26b91
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
#include "controls.h" #include "controls.h"
#include "win.h" #include "win.h"
#include "winproc.h" #include "winproc.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(dialog);
/*********************************************************************** /***********************************************************************
...@@ -19,13 +22,17 @@ ...@@ -19,13 +22,17 @@
*/ */
static WNDPROC DEFDLG_GetDlgProc( HWND hwnd ) static WNDPROC DEFDLG_GetDlgProc( HWND hwnd )
{ {
WNDPROC ret = 0; WNDPROC ret;
WND * wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
if (wndPtr)
if (!wndPtr) return 0;
if (wndPtr == WND_OTHER_PROCESS)
{ {
ret = *(WNDPROC *)((char *)wndPtr->wExtra + DWL_DLGPROC); ERR( "cannot get dlg proc %x from other process\n", hwnd );
WIN_ReleaseWndPtr(wndPtr); return 0;
} }
ret = *(WNDPROC *)((char *)wndPtr->wExtra + DWL_DLGPROC);
WIN_ReleasePtr( wndPtr );
return ret; return ret;
} }
......
windows/defwnd.c
View file @ 8fd26b91
...@@ -38,10 +38,10 @@ static short iMenuSysKey = 0; ...@@ -38,10 +38,10 @@ static short iMenuSysKey = 0;
static void DEFWND_HandleWindowPosChanged( HWND hwnd, UINT flags ) static void DEFWND_HandleWindowPosChanged( HWND hwnd, UINT flags )
{ {
RECT rect; RECT rect;
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
rect = wndPtr->rectClient; rect = wndPtr->rectClient;
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
if (!(flags & SWP_NOCLIENTMOVE)) if (!(flags & SWP_NOCLIENTMOVE))
SendMessageW( hwnd, WM_MOVE, 0, MAKELONG(rect.left, rect.top)); SendMessageW( hwnd, WM_MOVE, 0, MAKELONG(rect.left, rect.top));
...@@ -96,14 +96,14 @@ static void DEFWND_SetTextW( HWND hwnd, LPCWSTR text ) ...@@ -96,14 +96,14 @@ static void DEFWND_SetTextW( HWND hwnd, LPCWSTR text )
if (!text) text = empty_string; if (!text) text = empty_string;
count = strlenW(text) + 1; count = strlenW(text) + 1;
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return; if (!(wndPtr = WIN_GetPtr( hwnd ))) return;
if (wndPtr->text) HeapFree(GetProcessHeap(), 0, wndPtr->text); if (wndPtr->text) HeapFree(GetProcessHeap(), 0, wndPtr->text);
if ((wndPtr->text = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR)))) if ((wndPtr->text = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR))))
strcpyW( wndPtr->text, text ); strcpyW( wndPtr->text, text );
else else
ERR("Not enough memory for window text\n"); ERR("Not enough memory for window text\n");
text = wndPtr->text; text = wndPtr->text;
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
if (USER_Driver.pSetWindowText) USER_Driver.pSetWindowText( hwnd, text ); if (USER_Driver.pSetWindowText) USER_Driver.pSetWindowText( hwnd, text );
} }
...@@ -357,9 +357,9 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa ...@@ -357,9 +357,9 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
{ {
LONG hitcode; LONG hitcode;
POINT pt; POINT pt;
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
HMENU hMenu = wndPtr->hSysMenu; HMENU hMenu = wndPtr->hSysMenu;
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
if (!hMenu) return 0; if (!hMenu) return 0;
pt.x = SLOWORD(lParam); pt.x = SLOWORD(lParam);
pt.y = SHIWORD(lParam); pt.y = SHIWORD(lParam);
...@@ -378,14 +378,14 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa ...@@ -378,14 +378,14 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
case WM_NCDESTROY: case WM_NCDESTROY:
{ {
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
if (!wndPtr) return 0; if (!wndPtr) return 0;
if (wndPtr->text) HeapFree( GetProcessHeap(), 0, wndPtr->text ); if (wndPtr->text) HeapFree( GetProcessHeap(), 0, wndPtr->text );
wndPtr->text = NULL; wndPtr->text = NULL;
if (wndPtr->pVScroll) HeapFree( GetProcessHeap(), 0, wndPtr->pVScroll ); if (wndPtr->pVScroll) HeapFree( GetProcessHeap(), 0, wndPtr->pVScroll );
if (wndPtr->pHScroll) HeapFree( GetProcessHeap(), 0, wndPtr->pHScroll ); if (wndPtr->pHScroll) HeapFree( GetProcessHeap(), 0, wndPtr->pHScroll );
wndPtr->pVScroll = wndPtr->pHScroll = NULL; wndPtr->pVScroll = wndPtr->pHScroll = NULL;
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
return 0; return 0;
} }
...@@ -607,9 +607,9 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa ...@@ -607,9 +607,9 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
case WM_ISACTIVEICON: case WM_ISACTIVEICON:
{ {
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
BOOL ret = (wndPtr->flags & WIN_NCACTIVATED) != 0; BOOL ret = (wndPtr->flags & WIN_NCACTIVATED) != 0;
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
return ret; return ret;
} }
...@@ -626,21 +626,15 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa ...@@ -626,21 +626,15 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
return USER_Driver.pSetWindowIcon( hwnd, lParam, (wParam != ICON_SMALL) ); return USER_Driver.pSetWindowIcon( hwnd, lParam, (wParam != ICON_SMALL) );
else else
{ {
int index = (wParam != ICON_SMALL) ? GCL_HICON : GCL_HICONSM; HICON hOldIcon = SetClassLongW( hwnd, (wParam != ICON_SMALL) ? GCL_HICON : GCL_HICONSM,
HICON hOldIcon = GetClassLongW(hwnd, index); lParam);
SetClassLongW(hwnd, index, lParam); SetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE |
SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER);
SetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED return hOldIcon;
| SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE
| SWP_NOZORDER);
return hOldIcon;
} }
case WM_GETICON: case WM_GETICON:
{ return GetClassLongW( hwnd, (wParam != ICON_SMALL) ? GCL_HICON : GCL_HICONSM );
int index = (wParam != ICON_SMALL) ? GCL_HICON : GCL_HICONSM;
return GetClassLongW(hwnd, index);
}
case WM_HELP: case WM_HELP:
SendMessageW( GetParent(hwnd), msg, wParam, lParam ); SendMessageW( GetParent(hwnd), msg, wParam, lParam );
...@@ -661,7 +655,12 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd16, UINT16 msg, WPARAM16 wParam, ...@@ -661,7 +655,12 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd16, UINT16 msg, WPARAM16 wParam,
LRESULT result = 0; LRESULT result = 0;
HWND hwnd = WIN_Handle32( hwnd16 ); HWND hwnd = WIN_Handle32( hwnd16 );
if (!IsWindow( hwnd )) return 0; if (!WIN_IsCurrentProcess( hwnd ))
{
if (!IsWindow( hwnd )) return 0;
ERR( "called for other process window %x\n", hwnd );
return 0;
}
SPY_EnterMessage( SPY_DEFWNDPROC16, hwnd, msg, wParam, lParam ); SPY_EnterMessage( SPY_DEFWNDPROC16, hwnd, msg, wParam, lParam );
switch(msg) switch(msg)
...@@ -719,9 +718,16 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd16, UINT16 msg, WPARAM16 wParam, ...@@ -719,9 +718,16 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd16, UINT16 msg, WPARAM16 wParam,
LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
{ {
LRESULT result = 0; LRESULT result = 0;
HWND full_handle;
if (!(full_handle = WIN_IsCurrentProcess( hwnd )))
{
if (!IsWindow( hwnd )) return 0;
ERR( "called for other process window %x\n", hwnd );
return 0;
}
hwnd = full_handle;
if (!IsWindow( hwnd )) return 0;
hwnd = WIN_GetFullHandle( hwnd );
SPY_EnterMessage( SPY_DEFWNDPROC, hwnd, msg, wParam, lParam ); SPY_EnterMessage( SPY_DEFWNDPROC, hwnd, msg, wParam, lParam );
switch(msg) switch(msg)
...@@ -754,17 +760,17 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ...@@ -754,17 +760,17 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
case WM_GETTEXTLENGTH: case WM_GETTEXTLENGTH:
{ {
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
if (wndPtr && wndPtr->text) if (wndPtr && wndPtr->text)
result = WideCharToMultiByte( CP_ACP, 0, wndPtr->text, strlenW(wndPtr->text), result = WideCharToMultiByte( CP_ACP, 0, wndPtr->text, strlenW(wndPtr->text),
NULL, 0, NULL, NULL ); NULL, 0, NULL, NULL );
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
} }
break; break;
case WM_GETTEXT: case WM_GETTEXT:
{ {
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
if (wParam && wndPtr && wndPtr->text) if (wParam && wndPtr && wndPtr->text)
{ {
LPSTR dest = (LPSTR)lParam; LPSTR dest = (LPSTR)lParam;
...@@ -772,7 +778,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ...@@ -772,7 +778,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
dest, wParam, NULL, NULL )) dest[wParam-1] = 0; dest, wParam, NULL, NULL )) dest[wParam-1] = 0;
result = strlen( dest ); result = strlen( dest );
} }
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
} }
break; break;
...@@ -849,9 +855,15 @@ LRESULT WINAPI DefWindowProcW( ...@@ -849,9 +855,15 @@ LRESULT WINAPI DefWindowProcW(
LPARAM lParam ) /* [in] second message parameter */ LPARAM lParam ) /* [in] second message parameter */
{ {
LRESULT result = 0; LRESULT result = 0;
HWND full_handle;
if (!IsWindow( hwnd )) return 0; if (!(full_handle = WIN_IsCurrentProcess( hwnd )))
hwnd = WIN_GetFullHandle( hwnd ); {
if (!IsWindow( hwnd )) return 0;
ERR( "called for other process window %x\n", hwnd );
return 0;
}
hwnd = full_handle;
SPY_EnterMessage( SPY_DEFWNDPROC, hwnd, msg, wParam, lParam ); SPY_EnterMessage( SPY_DEFWNDPROC, hwnd, msg, wParam, lParam );
switch(msg) switch(msg)
...@@ -884,22 +896,22 @@ LRESULT WINAPI DefWindowProcW( ...@@ -884,22 +896,22 @@ LRESULT WINAPI DefWindowProcW(
case WM_GETTEXTLENGTH: case WM_GETTEXTLENGTH:
{ {
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
if (wndPtr && wndPtr->text) result = (LRESULT)strlenW(wndPtr->text); if (wndPtr && wndPtr->text) result = (LRESULT)strlenW(wndPtr->text);
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
} }
break; break;
case WM_GETTEXT: case WM_GETTEXT:
{ {
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
if (wParam && wndPtr && wndPtr->text) if (wParam && wndPtr && wndPtr->text)
{ {
LPWSTR dest = (LPWSTR)lParam; LPWSTR dest = (LPWSTR)lParam;
lstrcpynW( dest, wndPtr->text, wParam ); lstrcpynW( dest, wndPtr->text, wParam );
result = strlenW( dest ); result = strlenW( dest );
} }
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
} }
break; break;
......
windows/dialog.c
View file @ 8fd26b91
...@@ -851,9 +851,9 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate, ...@@ -851,9 +851,9 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate,
HeapFree( GetProcessHeap(), 0, dlgInfo ); HeapFree( GetProcessHeap(), 0, dlgInfo );
return 0; return 0;
} }
wndPtr = WIN_FindWndPtr( hwnd ); wndPtr = WIN_GetPtr( hwnd );
wndPtr->flags |= WIN_ISDIALOG; wndPtr->flags |= WIN_ISDIALOG;
WIN_ReleaseWndPtr(wndPtr); WIN_ReleasePtr( wndPtr );
if (template.helpId) SetWindowContextHelpId( hwnd, template.helpId ); if (template.helpId) SetWindowContextHelpId( hwnd, template.helpId );
SetWindowLongW( hwnd, DWL_WINE_DIALOGINFO, (LONG)dlgInfo ); SetWindowLongW( hwnd, DWL_WINE_DIALOGINFO, (LONG)dlgInfo );
......
windows/mdi.c
View file @ 8fd26b91
...@@ -180,9 +180,14 @@ const struct builtin_class_descr MDICLIENT_builtin_class = ...@@ -180,9 +180,14 @@ const struct builtin_class_descr MDICLIENT_builtin_class =
static MDICLIENTINFO *get_client_info( HWND client ) static MDICLIENTINFO *get_client_info( HWND client )
{ {
MDICLIENTINFO *ret = NULL; MDICLIENTINFO *ret = NULL;
WND *win = WIN_FindWndPtr( client ); WND *win = WIN_GetPtr( client );
if (win) if (win)
{ {
if (win == WND_OTHER_PROCESS)
{
ERR( "client %x belongs to other process\n", client );
return NULL;
}
if (win->cbWndExtra < sizeof(MDICLIENTINFO)) WARN( "%x is not an MDI client\n", client ); if (win->cbWndExtra < sizeof(MDICLIENTINFO)) WARN( "%x is not an MDI client\n", client );
else ret = (MDICLIENTINFO *)win->wExtra; else ret = (MDICLIENTINFO *)win->wExtra;
WIN_ReleaseWndPtr( win ); WIN_ReleaseWndPtr( win );
...@@ -1215,7 +1220,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, ...@@ -1215,7 +1220,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
/* Since we are using only cs->lpCreateParams, we can safely /* Since we are using only cs->lpCreateParams, we can safely
* cast to LPCREATESTRUCTA here */ * cast to LPCREATESTRUCTA here */
LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam;
WND *wndPtr = WIN_FindWndPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
/* Translation layer doesn't know what's in the cs->lpCreateParams /* Translation layer doesn't know what's in the cs->lpCreateParams
* so we have to keep track of what environment we're in. */ * so we have to keep track of what environment we're in. */
...@@ -1233,7 +1238,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, ...@@ -1233,7 +1238,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
ci->hWindowMenu = ccs->hWindowMenu; ci->hWindowMenu = ccs->hWindowMenu;
ci->idFirstChild = ccs->idFirstChild; ci->idFirstChild = ccs->idFirstChild;
} }
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
ci->hwndChildMaximized = 0; ci->hwndChildMaximized = 0;
ci->nActiveChildren = 0; ci->nActiveChildren = 0;
...@@ -1549,17 +1554,17 @@ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient, ...@@ -1549,17 +1554,17 @@ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient,
{ {
/* control menu is between the frame system menu and /* control menu is between the frame system menu and
* the first entry of menu bar */ * the first entry of menu bar */
WND *wndPtr = WIN_FindWndPtr(hwnd); WND *wndPtr = WIN_GetPtr(hwnd);
if( (wParam == VK_LEFT && GetMenu(hwnd) == next_menu->hmenuIn) || if( (wParam == VK_LEFT && GetMenu(hwnd) == next_menu->hmenuIn) ||
(wParam == VK_RIGHT && GetSubMenu(wndPtr->hSysMenu, 0) == next_menu->hmenuIn) ) (wParam == VK_RIGHT && GetSubMenu(wndPtr->hSysMenu, 0) == next_menu->hmenuIn) )
{ {
WIN_ReleaseWndPtr(wndPtr); WIN_ReleasePtr(wndPtr);
wndPtr = WIN_FindWndPtr(ci->hwndActiveChild); wndPtr = WIN_GetPtr(ci->hwndActiveChild);
next_menu->hmenuNext = GetSubMenu(wndPtr->hSysMenu, 0); next_menu->hmenuNext = GetSubMenu(wndPtr->hSysMenu, 0);
next_menu->hwndNext = ci->hwndActiveChild; next_menu->hwndNext = ci->hwndActiveChild;
WIN_ReleaseWndPtr(wndPtr);
} }
WIN_ReleasePtr(wndPtr);
} }
return 0; return 0;
} }
...@@ -1765,9 +1770,9 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, ...@@ -1765,9 +1770,9 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
if( wParam == VK_LEFT ) /* switch to frame system menu */ if( wParam == VK_LEFT ) /* switch to frame system menu */
{ {
WND *wndPtr = WIN_FindWndPtr( parent ); WND *wndPtr = WIN_GetPtr( parent );
next_menu->hmenuNext = GetSubMenu( wndPtr->hSysMenu, 0 ); next_menu->hmenuNext = GetSubMenu( wndPtr->hSysMenu, 0 );
WIN_ReleaseWndPtr( wndPtr ); WIN_ReleasePtr( wndPtr );
} }
if( wParam == VK_RIGHT ) /* to frame menu bar */ if( wParam == VK_RIGHT ) /* to frame menu bar */
{ {
......
windows/message.c
View file @ 8fd26b91
...@@ -1006,7 +1006,8 @@ LONG WINAPI DispatchMessageA( const MSG* msg ) ...@@ -1006,7 +1006,8 @@ LONG WINAPI DispatchMessageA( const MSG* msg )
WND * wndPtr; WND * wndPtr;
LONG retval; LONG retval;
int painting; int painting;
WNDPROC winproc;
/* Process timer messages */ /* Process timer messages */
if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER))
{ {
...@@ -1025,40 +1026,48 @@ LONG WINAPI DispatchMessageA( const MSG* msg ) ...@@ -1025,40 +1026,48 @@ LONG WINAPI DispatchMessageA( const MSG* msg )
} }
} }
if (!msg->hwnd) return 0; if (!(wndPtr = WIN_GetPtr( msg->hwnd )))
if (!(wndPtr = WIN_FindWndPtr( msg->hwnd ))) return 0; {
if (!wndPtr->winproc) if (msg->hwnd) SetLastError( ERROR_INVALID_WINDOW_HANDLE );
return 0;
}
if (wndPtr == WND_OTHER_PROCESS)
{
if (IsWindow( msg->hwnd ))
ERR( "cannot dispatch msg to other process window %x\n", msg->hwnd );
SetLastError( ERROR_INVALID_WINDOW_HANDLE );
return 0;
}
if (!(winproc = wndPtr->winproc))
{ {
retval = 0; WIN_ReleasePtr( wndPtr );
goto END; return 0;
} }
painting = (msg->message == WM_PAINT); painting = (msg->message == WM_PAINT);
if (painting) wndPtr->flags |= WIN_NEEDS_BEGINPAINT; if (painting) wndPtr->flags |= WIN_NEEDS_BEGINPAINT;
/* HOOK_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */ WIN_ReleasePtr( wndPtr );
/* hook_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message,
msg->wParam, msg->lParam ); msg->wParam, msg->lParam );
retval = CallWindowProcA( (WNDPROC)wndPtr->winproc, retval = CallWindowProcA( winproc, msg->hwnd, msg->message,
msg->hwnd, msg->message, msg->wParam, msg->lParam );
msg->wParam, msg->lParam );
SPY_ExitMessage( SPY_RESULT_OK, msg->hwnd, msg->message, retval, SPY_ExitMessage( SPY_RESULT_OK, msg->hwnd, msg->message, retval,
msg->wParam, msg->lParam ); msg->wParam, msg->lParam );
WIN_ReleaseWndPtr(wndPtr);
wndPtr = WIN_FindWndPtr(msg->hwnd);
if (painting && wndPtr && if (painting && (wndPtr = WIN_GetPtr( msg->hwnd )) && (wndPtr != WND_OTHER_PROCESS))
(wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate)
{ {
ERR("BeginPaint not called on WM_PAINT for hwnd %04x!\n", BOOL validate = ((wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate);
msg->hwnd); wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT; WIN_ReleasePtr( wndPtr );
/* Validate the update region to avoid infinite WM_PAINT loop */ if (validate)
RedrawWindow( wndPtr->hwndSelf, NULL, 0, {
RDW_NOFRAME | RDW_VALIDATE | RDW_NOCHILDREN | RDW_NOINTERNALPAINT ); ERR( "BeginPaint not called on WM_PAINT for hwnd %04x!\n", msg->hwnd );
/* Validate the update region to avoid infinite WM_PAINT loop */
RedrawWindow( msg->hwnd, NULL, 0,
RDW_NOFRAME | RDW_VALIDATE | RDW_NOCHILDREN | RDW_NOINTERNALPAINT );
}
} }
END:
WIN_ReleaseWndPtr(wndPtr);
return retval; return retval;
} }
...@@ -1089,7 +1098,8 @@ LONG WINAPI DispatchMessageW( const MSG* msg ) ...@@ -1089,7 +1098,8 @@ LONG WINAPI DispatchMessageW( const MSG* msg )
WND * wndPtr; WND * wndPtr;
LONG retval; LONG retval;
int painting; int painting;
WNDPROC winproc;
/* Process timer messages */ /* Process timer messages */
if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER))
{ {
...@@ -1108,40 +1118,48 @@ LONG WINAPI DispatchMessageW( const MSG* msg ) ...@@ -1108,40 +1118,48 @@ LONG WINAPI DispatchMessageW( const MSG* msg )
} }
} }
if (!msg->hwnd) return 0; if (!(wndPtr = WIN_GetPtr( msg->hwnd )))
if (!(wndPtr = WIN_FindWndPtr( msg->hwnd ))) return 0; {
if (!wndPtr->winproc) if (msg->hwnd) SetLastError( ERROR_INVALID_WINDOW_HANDLE );
return 0;
}
if (wndPtr == WND_OTHER_PROCESS)
{
if (IsWindow( msg->hwnd ))
ERR( "cannot dispatch msg to other process window %x\n", msg->hwnd );
SetLastError( ERROR_INVALID_WINDOW_HANDLE );
return 0;
}
if (!(winproc = wndPtr->winproc))
{ {
retval = 0; WIN_ReleasePtr( wndPtr );
goto END; return 0;
} }
painting = (msg->message == WM_PAINT); painting = (msg->message == WM_PAINT);
if (painting) wndPtr->flags |= WIN_NEEDS_BEGINPAINT; if (painting) wndPtr->flags |= WIN_NEEDS_BEGINPAINT;
WIN_ReleasePtr( wndPtr );
/* HOOK_CallHooks32W( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */ /* HOOK_CallHooks32W( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message,
msg->wParam, msg->lParam ); msg->wParam, msg->lParam );
retval = CallWindowProcW( (WNDPROC)wndPtr->winproc, retval = CallWindowProcW( winproc, msg->hwnd, msg->message,
msg->hwnd, msg->message, msg->wParam, msg->lParam );
msg->wParam, msg->lParam );
SPY_ExitMessage( SPY_RESULT_OK, msg->hwnd, msg->message, retval, SPY_ExitMessage( SPY_RESULT_OK, msg->hwnd, msg->message, retval,
msg->wParam, msg->lParam ); msg->wParam, msg->lParam );
WIN_ReleaseWndPtr(wndPtr);
wndPtr = WIN_FindWndPtr(msg->hwnd);
if (painting && wndPtr && if (painting && (wndPtr = WIN_GetPtr( msg->hwnd )) && (wndPtr != WND_OTHER_PROCESS))
(wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate)
{ {
ERR("BeginPaint not called on WM_PAINT for hwnd %04x!\n", BOOL validate = ((wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate);
msg->hwnd); wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT; WIN_ReleasePtr( wndPtr );
/* Validate the update region to avoid infinite WM_PAINT loop */ if (validate)
RedrawWindow( wndPtr->hwndSelf, NULL, 0, {
RDW_NOFRAME | RDW_VALIDATE | RDW_NOCHILDREN | RDW_NOINTERNALPAINT ); ERR( "BeginPaint not called on WM_PAINT for hwnd %04x!\n", msg->hwnd );
/* Validate the update region to avoid infinite WM_PAINT loop */
RedrawWindow( msg->hwnd, NULL, 0,
RDW_NOFRAME | RDW_VALIDATE | RDW_NOCHILDREN | RDW_NOINTERNALPAINT );
}
} }
END:
WIN_ReleaseWndPtr(wndPtr);
return retval; return retval;
} }
......
windows/nonclient.c
View file @ 8fd26b91
...@@ -1401,7 +1401,7 @@ static void NC_DoNCPaint( WND* wndPtr, HRGN clip, BOOL suppress_menupaint ) ...@@ -1401,7 +1401,7 @@ static void NC_DoNCPaint( WND* wndPtr, HRGN clip, BOOL suppress_menupaint )
HWND hwnd = wndPtr->hwndSelf; HWND hwnd = wndPtr->hwndSelf;
if ( wndPtr->dwStyle & WS_MINIMIZE || if ( wndPtr->dwStyle & WS_MINIMIZE ||
!WIN_IsWindowDrawable( wndPtr, 0 )) return; /* Nothing to do */ !WIN_IsWindowDrawable( hwnd, 0 )) return; /* Nothing to do */
active = wndPtr->flags & WIN_NCACTIVATED; active = wndPtr->flags & WIN_NCACTIVATED;
...@@ -1513,7 +1513,7 @@ static void NC_DoNCPaint95( ...@@ -1513,7 +1513,7 @@ static void NC_DoNCPaint95(
HWND hwnd = wndPtr->hwndSelf; HWND hwnd = wndPtr->hwndSelf;
if ( wndPtr->dwStyle & WS_MINIMIZE || if ( wndPtr->dwStyle & WS_MINIMIZE ||
!WIN_IsWindowDrawable( wndPtr, 0 )) return; /* Nothing to do */ !WIN_IsWindowDrawable( hwnd, 0 )) return; /* Nothing to do */
active = wndPtr->flags & WIN_NCACTIVATED; active = wndPtr->flags & WIN_NCACTIVATED;
......
windows/painting.c
View file @ 8fd26b91
...@@ -787,16 +787,12 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rectUpdate, ...@@ -787,16 +787,12 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rectUpdate,
WND* wndPtr; WND* wndPtr;
if (!hwnd) hwnd = GetDesktopWindow(); if (!hwnd) hwnd = GetDesktopWindow();
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
/* check if the window or its parents are visible/not minimized */ /* check if the window or its parents are visible/not minimized */
if (!WIN_IsWindowDrawable( wndPtr, !(flags & RDW_FRAME) ) ) if (!WIN_IsWindowDrawable( hwnd, !(flags & RDW_FRAME) )) return TRUE;
{
WIN_ReleaseWndPtr(wndPtr);
return TRUE;
}
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
if (TRACE_ON(win)) if (TRACE_ON(win))
{ {
if( hrgnUpdate ) if( hrgnUpdate )
......
windows/spy.c
View file @ 8fd26b91
...@@ -1710,19 +1710,17 @@ static void SPY_GetMsgStuff( SPY_INSTANCE *sp_e ) ...@@ -1710,19 +1710,17 @@ static void SPY_GetMsgStuff( SPY_INSTANCE *sp_e )
*/ */
void SPY_GetWndName( SPY_INSTANCE *sp_e ) void SPY_GetWndName( SPY_INSTANCE *sp_e )
{ {
WND* pWnd = WIN_FindWndPtr( sp_e->msg_hwnd ); WND* pWnd = WIN_GetPtr( sp_e->msg_hwnd );
if( pWnd ) if (pWnd && pWnd != WND_OTHER_PROCESS)
{ {
LPSTR p = (LPSTR)&sp_e->wnd_name; LPSTR p = sp_e->wnd_name;
LPSTR s = (LPSTR)&sp_e->wnd_name; LPSTR s = sp_e->wnd_name;
char postfix; char postfix;
DWORD save_error; DWORD save_error;
/* save and restore error code over the next call */ /* save and restore error code over the next call */
save_error = GetLastError(); save_error = GetLastError();
GlobalGetAtomNameA((ATOM) GetClassWord(pWnd->hwndSelf, GCW_ATOM), GetClassNameA( sp_e->msg_hwnd, sp_e->wnd_class, sizeof(sp_e->wnd_class)-1);
(LPSTR)&sp_e->wnd_class,
sizeof(sp_e->wnd_class)-1);
SetLastError(save_error); SetLastError(save_error);
if( pWnd->text && pWnd->text[0] != '\0' ) if( pWnd->text && pWnd->text[0] != '\0' )
...@@ -1734,7 +1732,7 @@ void SPY_GetWndName( SPY_INSTANCE *sp_e ) ...@@ -1734,7 +1732,7 @@ void SPY_GetWndName( SPY_INSTANCE *sp_e )
} }
else /* get class name */ else /* get class name */
{ {
LPSTR src = (LPSTR)&sp_e->wnd_class; LPSTR src = sp_e->wnd_class;
int n=sizeof(sp_e->wnd_name)-2; int n=sizeof(sp_e->wnd_name)-2;
*(p++) = '{'; *(p++) = '{';
while ((n-- > 0) && *src) *p++ = *src++; while ((n-- > 0) && *src) *p++ = *src++;
...@@ -1749,10 +1747,14 @@ void SPY_GetWndName( SPY_INSTANCE *sp_e ) ...@@ -1749,10 +1747,14 @@ void SPY_GetWndName( SPY_INSTANCE *sp_e )
} }
*(p++) = postfix; *(p++) = postfix;
*(p++) = '\0'; *(p++) = '\0';
WIN_ReleaseWndPtr(pWnd); WIN_ReleasePtr(pWnd);
} }
else {strcpy( sp_e->wnd_name, "\"NULL\"" ); sp_e->wnd_class[0] = 0;} else
{
strcpy( sp_e->wnd_name, "\"NULL\"" );
sp_e->wnd_class[0] = 0;
}
return; return;
} }
......
windows/timer.c
View file @ 8fd26b91
...@@ -104,7 +104,7 @@ static UINT TIMER_SetTimer( HWND hwnd, UINT id, UINT timeout, ...@@ -104,7 +104,7 @@ static UINT TIMER_SetTimer( HWND hwnd, UINT id, UINT timeout,
TIMER * pTimer; TIMER * pTimer;
HWINDOWPROC winproc = 0; HWINDOWPROC winproc = 0;
if (hwnd && !WIN_IsCurrentThread( hwnd )) if (hwnd && !(hwnd = WIN_IsCurrentThread( hwnd )))
{ {
SetLastError( ERROR_INVALID_WINDOW_HANDLE ); SetLastError( ERROR_INVALID_WINDOW_HANDLE );
return 0; return 0;
...@@ -243,8 +243,7 @@ UINT WINAPI SetTimer( HWND hwnd, UINT id, UINT timeout, ...@@ -243,8 +243,7 @@ UINT WINAPI SetTimer( HWND hwnd, UINT id, UINT timeout,
{ {
TRACE("%04x %d %d %08lx\n", TRACE("%04x %d %d %08lx\n",
hwnd, id, timeout, (LONG)proc ); hwnd, id, timeout, (LONG)proc );
return TIMER_SetTimer( WIN_GetFullHandle(hwnd), id, timeout, (WNDPROC16)proc, return TIMER_SetTimer( hwnd, id, timeout, (WNDPROC16)proc, WIN_PROC_32A, FALSE );
WIN_PROC_32A, FALSE );
} }
...@@ -294,8 +293,7 @@ UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout, ...@@ -294,8 +293,7 @@ UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout,
{ {
TRACE("%04x %d %d %08lx\n", TRACE("%04x %d %d %08lx\n",
hwnd, id, timeout, (LONG)proc ); hwnd, id, timeout, (LONG)proc );
return TIMER_SetTimer( WIN_GetFullHandle(hwnd), id, timeout, (WNDPROC16)proc, return TIMER_SetTimer( hwnd, id, timeout, (WNDPROC16)proc, WIN_PROC_32A, TRUE );
WIN_PROC_32A, TRUE );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment