April 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : server: Post a message to the desktop window when the cursor clip rectangle changes .
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 21e86f60ec44bbb61c87b97abb6fa7a9843e42b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e86f60ec44bbb61c87b97ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 20:27:29 2011 +0200 server: Post a message to the desktop window when the cursor clip rectangle changes. --- dlls/user32/cursoricon.c | 3 ++- dlls/user32/message.c | 6 ++++++ dlls/user32/user_private.h | 1 + dlls/winex11.drv/xinerama.c | 1 - include/wine/server_protocol.h | 4 +++- programs/explorer/desktop.c | 1 + server/protocol.def | 1 + server/queue.c | 25 ++++++++++++++++++++----- server/request.h | 3 ++- server/trace.c | 1 + server/user.h | 1 + 11 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7a9c78a..476aa51 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1717,7 +1717,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) SERVER_START_REQ( set_cursor ) { - req->flags = SET_CURSOR_CLIP; + req->flags = SET_CURSOR_CLIP; + req->clip_msg = WM_WINE_CLIPCURSOR; if (rect) { req->clip.left = rect->left; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 59f2e49..51691ab 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1869,6 +1869,12 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return call_current_hook( h_extra->handle, HC_ACTION, wparam, h_extra->lparam ); } + case WM_WINE_CLIPCURSOR: + { + RECT rect; + GetClipCursor( &rect ); + return USER_Driver->pClipCursor( &rect ); + } default: if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG) return USER_Driver->pWindowMessage( hwnd, msg, wparam, lparam ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 6d668ba..bd7d39e 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -47,6 +47,7 @@ enum wine_internal_message WM_WINE_SETACTIVEWINDOW, WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, + WM_WINE_CLIPCURSOR, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 2a66df5..b2014ed 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -197,7 +197,6 @@ void xinerama_init( unsigned int width, unsigned int height ) wine_dbgstr_rect(&rect), screen_width, screen_height ); wine_tsx11_unlock(); - ClipCursor( NULL ); /* reset the cursor clip rectangle */ } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 70e539b..d321a80 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4798,6 +4798,8 @@ struct set_cursor_request int x; int y; rectangle_t clip; + unsigned int clip_msg; + char __pad_52[4]; }; struct set_cursor_reply { @@ -5561,6 +5563,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 418 +#define SERVER_PROTOCOL_VERSION 419 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 78ff389..b2f7730 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -334,6 +334,7 @@ void manage_desktop( WCHAR *arg ) if (name) set_desktop_window_title( hwnd, name ); SystemParametersInfoA( SPI_SETDESKPATTERN, -1, NULL, FALSE ); SetDeskWallPaper( (LPSTR)-1 ); + ClipCursor( NULL ); initialize_display_settings( hwnd ); initialize_appbar(); initialize_systray( using_root ); diff --git a/server/protocol.def b/server/protocol.def index f8fc82b..8aaf2d3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3318,6 +3318,7 @@ enum coords_relative int x; /* cursor position */ int y; rectangle_t clip; /* cursor clip rectangle */ + unsigned int clip_msg; /* message to post on cursor clip changes */ @REPLY user_handle_t prev_handle; /* previous handle */ int prev_count; /* previous show count */ diff --git a/server/queue.c b/server/queue.c index 35448e5..14086eb 100644 --- a/server/queue.c +++ b/server/queue.c @@ -318,11 +318,23 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ return 1; } +/* set the cursor clip rectangle */ +static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect ) +{ + rectangle_t top_rect, new_rect; + + get_top_window_rectangle( desktop, &top_rect ); + if (!rect || !intersect_rect( &new_rect, &top_rect, rect )) new_rect = top_rect; + if (!memcmp( &desktop->cursor.clip, &new_rect, sizeof(new_rect) )) return; + desktop->cursor.clip = new_rect; + if (desktop->cursor.clip_msg) post_desktop_message( desktop, desktop->cursor.clip_msg, 0, 0 ); +} + /* change the foreground input and reset the cursor clip rect */ static void set_foreground_input( struct desktop *desktop, struct thread_input *input ) { if (desktop->foreground_input == input) return; - get_top_window_rectangle( desktop, &desktop->cursor.clip ); + set_clip_rectangle( desktop, NULL ); desktop->foreground_input = input; } @@ -2620,10 +2632,13 @@ DECL_HANDLER(set_cursor) } if (req->flags & SET_CURSOR_CLIP) { - rectangle_t top_rect; - get_top_window_rectangle( input->desktop, &top_rect ); - if (!intersect_rect( &input->desktop->cursor.clip, &top_rect, &req->clip )) - input->desktop->cursor.clip = top_rect; + struct desktop *desktop = input->desktop; + + /* only the desktop owner can set the message */ + if (req->clip_msg && get_top_window_owner(desktop) == current->process) + desktop->cursor.clip_msg = req->clip_msg; + + set_clip_rectangle( desktop, &req->clip ); } reply->new_x = input->desktop->cursor.x; diff --git a/server/request.h b/server/request.h index c2104e9..0133af7 100644 --- a/server/request.h +++ b/server/request.h @@ -2097,7 +2097,8 @@ C_ASSERT( FIELD_OFFSET(struct set_cursor_request, show_count) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_request, x) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_request, y) == 28 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_request, clip) == 32 ); -C_ASSERT( sizeof(struct set_cursor_request) == 48 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_request, clip_msg) == 48 ); +C_ASSERT( sizeof(struct set_cursor_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_handle) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_count) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_x) == 16 ); diff --git a/server/trace.c b/server/trace.c index 553ba4d..06fe545 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3896,6 +3896,7 @@ static void dump_set_cursor_request( const struct set_cursor_request *req ) fprintf( stderr, ", x=%d", req->x ); fprintf( stderr, ", y=%d", req->y ); dump_rectangle( ", clip=", &req->clip ); + fprintf( stderr, ", clip_msg=%08x", req->clip_msg ); } static void dump_set_cursor_reply( const struct set_cursor_reply *req ) diff --git a/server/user.h b/server/user.h index 2a3f369..9b86031 100644 --- a/server/user.h +++ b/server/user.h @@ -56,6 +56,7 @@ struct global_cursor int x; /* cursor position */ int y; rectangle_t clip; /* cursor clip rectangle */ + unsigned int clip_msg; /* message to post for cursor clip changes */ unsigned int last_change; /* time of last position change */ };

1 0

Alexandre Julliard : winex11: Implement cursor clipping using a pointer grab.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: ae2b356361be4d9d25d82bc62d0fbb130aea4f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2b356361be4d9d25d82bc62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 5 11:50:45 2011 +0200 winex11: Implement cursor clipping using a pointer grab. --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/mouse.c | 56 +++++++++++++++++++++++++++++++++++- dlls/winex11.drv/window.c | 34 +++++++++++++++++++-- dlls/winex11.drv/winex11.drv.spec | 1 + dlls/winex11.drv/x11drv.h | 1 + 5 files changed, 87 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 4a36e46..eefc74c 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -258,6 +258,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) virtual_screen_rect.right - virtual_screen_rect.left, virtual_screen_rect.bottom - virtual_screen_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); + X11DRV_ClipCursor( NULL ); SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 1a2d618..2b793e1 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -95,6 +95,7 @@ static const UINT button_up_flags[NB_BUTTONS] = static HWND cursor_window; static DWORD last_time_modified; static XContext cursor_context; +static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); @@ -216,11 +217,18 @@ void sync_window_cursor( struct x11drv_win_data *data ) static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y, unsigned int state, DWORD mouse_data, Time time ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data; POINT pt; INPUT input; - if (!data) return; + if (!hwnd && window == clip_window) + { + pt.x = x + clip_rect.left; + pt.y = y + clip_rect.top; + goto done; + } + + if (!(data = X11DRV_get_win_data( hwnd ))) return; if (window == data->whole_window) { @@ -270,6 +278,7 @@ static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y SERVER_END_REQ; } +done: input.type = INPUT_MOUSE; input.u.mi.dx = pt.x; input.u.mi.dy = pt.y; @@ -911,6 +920,49 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) return ret; } +/*********************************************************************** + * ClipCursor (X11DRV.@) + */ +BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) +{ + Display *display = thread_init_display(); + + if (!clip_window) return TRUE; + + /* we are clipping if the clip rectangle is smaller than the screen */ + if (clip && (clip->left > virtual_screen_rect.left || + clip->right < virtual_screen_rect.right || + clip->top > virtual_screen_rect.top || + clip->bottom < virtual_screen_rect.bottom)) + { + if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) + return TRUE; /* don't clip in the desktop process */ + + TRACE( "clipping to %s\n", wine_dbgstr_rect(clip) ); + wine_tsx11_lock(); + XUnmapWindow( display, clip_window ); + XMoveResizeWindow( display, clip_window, + clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, + clip->right - clip->left, clip->bottom - clip->top ); + XMapWindow( display, clip_window ); + if (!XGrabPointer( display, clip_window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + { + wine_tsx11_unlock(); + clip_rect = *clip; + return TRUE; + } + wine_tsx11_unlock(); + } + + /* release the grab if any */ + TRACE( "no longer clipping\n" ); + wine_tsx11_lock(); + XUnmapWindow( display, clip_window ); + wine_tsx11_unlock(); + return TRUE; +} /*********************************************************************** * X11DRV_ButtonPress diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e2ffccc..1fcadb5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -68,6 +68,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); #define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) +/* cursor clipping window */ +Window clip_window = 0; + /* X context to associate a hwnd to an X window */ XContext winContext = 0; @@ -82,6 +85,7 @@ static const char foreign_window_prop[] = "__wine_x11_foreign_window"; static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char client_window_prop[]= "__wine_x11_client_window"; static const char icon_window_prop[] = "__wine_x11_icon_window"; +static const char clip_window_prop[] = "__wine_x11_clip_window"; static const char fbconfig_id_prop[] = "__wine_x11_fbconfig_id"; static const char gl_drawable_prop[] = "__wine_x11_gl_drawable"; static const char pixmap_prop[] = "__wine_x11_pixmap"; @@ -1962,13 +1966,35 @@ BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) */ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) { - if (hwnd == GetDesktopWindow() && root_window != DefaultRootWindow( gdi_display )) + Display *display = thread_init_display(); + + if (hwnd == GetDesktopWindow()) { - Display *display = thread_init_display(); + XSetWindowAttributes attr; + + if (root_window != DefaultRootWindow( gdi_display )) + { + /* the desktop win data can't be created lazily */ + if (!create_desktop_win_data( display, hwnd )) return FALSE; + } - /* the desktop win data can't be created lazily */ - if (!create_desktop_win_data( display, hwnd )) return FALSE; + /* create the cursor clipping window */ + attr.override_redirect = TRUE; + attr.event_mask = StructureNotifyMask; + wine_tsx11_lock(); + clip_window = XCreateWindow( display, root_window, 0, 0, 1, 1, 0, 0, + InputOnly, visual, CWOverrideRedirect | CWEventMask, &attr ); + wine_tsx11_unlock(); + SetPropA( hwnd, clip_window_prop, (HANDLE)clip_window ); } + else if (!clip_window) + { + clip_window = (Window)GetPropA( GetDesktopWindow(), clip_window_prop ); + wine_tsx11_lock(); + XSelectInput( display, clip_window, StructureNotifyMask ); + wine_tsx11_unlock(); + } + return TRUE; } diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 85177c5..f5c45d1 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -77,6 +77,7 @@ @ cdecl SetCursor(long) X11DRV_SetCursor @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos +@ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl GetScreenSaveActive() X11DRV_GetScreenSaveActive @ cdecl SetScreenSaveActive(long) X11DRV_SetScreenSaveActive @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e51a614..a746d08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -585,6 +585,7 @@ static inline size_t get_property_size( int format, unsigned long count ) extern Visual *visual; extern Window root_window; +extern Window clip_window; extern unsigned int screen_width; extern unsigned int screen_height; extern unsigned int screen_bpp;

1 0

Alexandre Julliard : winex11: Add an option to disable pointer grabs.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 4d358bfee3ac087405a7609ecde0fd6e2d0c9353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d358bfee3ac087405a7609ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 5 11:00:09 2011 +0200 winex11: Add an option to disable pointer grabs. --- dlls/winex11.drv/mouse.c | 29 ++++++++++++++++------------- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 4 ++++ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2b793e1..fe9f716 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -938,22 +938,25 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) return TRUE; /* don't clip in the desktop process */ - TRACE( "clipping to %s\n", wine_dbgstr_rect(clip) ); - wine_tsx11_lock(); - XUnmapWindow( display, clip_window ); - XMoveResizeWindow( display, clip_window, - clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, - clip->right - clip->left, clip->bottom - clip->top ); - XMapWindow( display, clip_window ); - if (!XGrabPointer( display, clip_window, False, - PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + if (grab_pointer) { + TRACE( "clipping to %s\n", wine_dbgstr_rect(clip) ); + wine_tsx11_lock(); + XUnmapWindow( display, clip_window ); + XMoveResizeWindow( display, clip_window, + clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, + clip->right - clip->left, clip->bottom - clip->top ); + XMapWindow( display, clip_window ); + if (!XGrabPointer( display, clip_window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + { + wine_tsx11_unlock(); + clip_rect = *clip; + return TRUE; + } wine_tsx11_unlock(); - clip_rect = *clip; - return TRUE; } - wine_tsx11_unlock(); } /* release the grab if any */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a746d08..0a1e3d9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -598,6 +598,7 @@ extern int use_take_focus; extern int use_primary_selection; extern int use_system_cursors; extern int show_systray; +extern int grab_pointer; extern int usexcomposite; extern int managed_mode; extern int decorated_mode; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 606bc28..cc38be2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -84,6 +84,7 @@ int use_take_focus = 1; int use_primary_selection = 0; int use_system_cursors = 1; int show_systray = 1; +int grab_pointer = 1; int managed_mode = 1; int decorated_mode = 1; int private_color_map = 0; @@ -426,6 +427,9 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "ShowSystray", buffer, sizeof(buffer) )) show_systray = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "GrabPointer", buffer, sizeof(buffer) )) + grab_pointer = IS_OPTION_TRUE( buffer[0] ); + screen_depth = 0; if (!get_config_key( hkey, appkey, "ScreenDepth", buffer, sizeof(buffer) )) screen_depth = atoi(buffer);

1 0

Alexandre Julliard : winex11: Always forward SetCursor to the driver, and limit the frequency of updates on the driver side.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 886ae4c3484bcf2cda549d8be39e2f901e0394fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=886ae4c3484bcf2cda549d8be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 15:06:59 2011 +0200 winex11: Always forward SetCursor to the driver, and limit the frequency of updates on the driver side. --- dlls/user32/cursoricon.c | 4 +--- dlls/winex11.drv/mouse.c | 26 +++++++++++++++++--------- dlls/winex11.drv/window.c | 6 +++++- dlls/winex11.drv/x11drv.h | 2 +- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 476aa51..ba06e96 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1651,9 +1651,7 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu SERVER_END_REQ; if (!ret) return 0; - - /* Change the cursor shape only if it is visible */ - if (show_count >= 0 && hOldCursor != hCursor) USER_Driver->pSetCursor( hCursor ); + USER_Driver->pSetCursor( show_count >= 0 ? hCursor : 0 ); if (!(obj = get_icon_ptr( hOldCursor ))) return 0; release_icon_ptr( hOldCursor, obj ); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index fe9f716..63773ce 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -93,7 +93,8 @@ static const UINT button_up_flags[NB_BUTTONS] = }; static HWND cursor_window; -static DWORD last_time_modified; +static HCURSOR last_cursor; +static DWORD last_cursor_change; static XContext cursor_context; static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); @@ -157,7 +158,7 @@ static Cursor get_empty_cursor(void) /*********************************************************************** * set_window_cursor */ -void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ) +void set_window_cursor( Window window, HCURSOR handle ) { Cursor cursor, prev; @@ -184,10 +185,9 @@ void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ) } } - XDefineCursor( gdi_display, data->whole_window, cursor ); + XDefineCursor( gdi_display, window, cursor ); /* make the change take effect immediately */ XFlush( gdi_display ); - data->cursor = handle; wine_tsx11_unlock(); } @@ -206,7 +206,11 @@ void sync_window_cursor( struct x11drv_win_data *data ) } SERVER_END_REQ; - if (data->cursor != cursor) set_window_cursor( data, cursor ); + if (data->cursor != cursor) + { + data->cursor = cursor; + set_window_cursor( data->whole_window, cursor ); + } } /*********************************************************************** @@ -247,12 +251,11 @@ static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y MapWindowPoints( hwnd, 0, &pt, 1 ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || - GetTickCount() - last_time_modified > 100) + GetTickCount() - last_cursor_change > 100) { - cursor_window = hwnd; sync_window_cursor( data ); + last_cursor_change = GetTickCount(); } - last_time_modified = GetTickCount(); if (hwnd != GetDesktopWindow()) hwnd = GetAncestor( hwnd, GA_ROOT ); @@ -877,7 +880,12 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) */ void CDECL X11DRV_SetCursor( HCURSOR handle ) { - if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle || + GetTickCount() - last_cursor_change > 100) + { + last_cursor_change = GetTickCount(); + if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + } } /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1fcadb5..21c8352 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2699,7 +2699,11 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) ); return 0; case WM_X11DRV_SET_CURSOR: - if ((data = X11DRV_get_win_data( hwnd ))) set_window_cursor( data, (HCURSOR)lp ); + if ((data = X11DRV_get_win_data( hwnd )) && data->whole_window) + { + data->cursor = (HCURSOR)lp; + set_window_cursor( data->whole_window, data->cursor ); + } return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0a1e3d9..26375fd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -820,7 +820,7 @@ extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow); extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); -extern void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ); +extern void set_window_cursor( Window window, HCURSOR handle ); extern void sync_window_cursor( struct x11drv_win_data *data ); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display );

1 0

Alexandre Julliard : winex11: Update the cursor on the clipping window while it's mapped.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: ecf217bbe4617cec454e055fa6b163bc9cc64563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf217bbe4617cec454e055fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 15:20:14 2011 +0200 winex11: Update the cursor on the clipping window while it's mapped. --- dlls/winex11.drv/event.c | 17 ++++++++++++++++- dlls/winex11.drv/mouse.c | 10 +++++++--- dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6e4225c..ba5cdff 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -91,6 +91,7 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *event ); static void X11DRV_FocusOut( HWND hwnd, XEvent *event ); static void X11DRV_Expose( HWND hwnd, XEvent *event ); static void X11DRV_MapNotify( HWND hwnd, XEvent *event ); +static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ); static void X11DRV_ReparentNotify( HWND hwnd, XEvent *event ); static void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event ); @@ -124,7 +125,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = /* VisibilityNotify */ /* CreateNotify */ { DestroyNotify, X11DRV_DestroyNotify }, - /* UnmapNotify */ + { UnmapNotify, X11DRV_UnmapNotify }, { MapNotify, X11DRV_MapNotify }, /* MapRequest */ { ReparentNotify, X11DRV_ReparentNotify }, @@ -801,6 +802,11 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; + if (event->xany.window == clip_window) + { + clipping_cursor = 1; + return; + } if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->mapped || data->embedded) return; @@ -812,6 +818,15 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) } +/********************************************************************** + * X11DRV_UnmapNotify + */ +static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) +{ + if (event->xany.window == clip_window) clipping_cursor = 0; +} + + /*********************************************************************** * is_net_wm_state_maximized */ diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 63773ce..e7e8d62 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -884,7 +884,8 @@ void CDECL X11DRV_SetCursor( HCURSOR handle ) GetTickCount() - last_cursor_change > 100) { last_cursor_change = GetTickCount(); - if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + if (clipping_cursor) set_window_cursor( clip_window, handle ); + else if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); } } @@ -958,12 +959,14 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (!XGrabPointer( display, clip_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + clipping_cursor = 1; + wine_tsx11_unlock(); + + if (clipping_cursor) { - wine_tsx11_unlock(); clip_rect = *clip; return TRUE; } - wine_tsx11_unlock(); } } @@ -972,6 +975,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) wine_tsx11_lock(); XUnmapWindow( display, clip_window ); wine_tsx11_unlock(); + clipping_cursor = 0; return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 21c8352..e35547a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -70,6 +70,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* cursor clipping window */ Window clip_window = 0; +int clipping_cursor = 0; /* X context to associate a hwnd to an X window */ XContext winContext = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 26375fd..986d03a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -586,6 +586,7 @@ static inline size_t get_property_size( int format, unsigned long count ) extern Visual *visual; extern Window root_window; extern Window clip_window; +extern int clipping_cursor; extern unsigned int screen_width; extern unsigned int screen_height; extern unsigned int screen_bpp;

1 0

Hans Leidekker : msi: Fix parsing of an empty property followed by a non-empty property.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: ce0b3a030baae1b6d49e66718d0f71ef76789fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0b3a030baae1b6d49e66718… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 5 12:03:36 2011 +0200 msi: Fix parsing of an empty property followed by a non-empty property. --- dlls/msi/action.c | 5 ++++- dlls/msi/tests/install.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 79d12d6..366d897 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -231,6 +231,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) if (!count) goto done; in_quotes = 1; ignore = 1; + len++; break; case '"': state = state_quote; @@ -258,6 +259,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) state = state_whitespace; if (!count) goto done; in_quotes = 1; + len++; break; default: if (!count) in_quotes = 0; @@ -276,8 +278,9 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; case ' ': state = state_whitespace; - if (!count) goto done; + if (!count || (count > 1 && !len)) goto done; in_quotes = 1; + len++; break; default: state = state_token; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1f5ab9c..d54f923 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6346,6 +6346,10 @@ static void test_command_line_parsing(void) r = MsiInstallProductA(msifile, cmd); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + cmd = "Q=\"\" P=\"one\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + DeleteFile(msifile); RemoveDirectory("msitest"); }

1 0

Akihiro Sagawa : libwine: MB_ERR_INVALID_CHARS makes an error when the undefined byte character is used .
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 16d57370090a63560e01e64699517ae27ce94c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d57370090a63560e01e6469… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 4 19:01:01 2011 +0900 libwine: MB_ERR_INVALID_CHARS makes an error when the undefined byte character is used. --- dlls/kernel32/tests/codepage.c | 1 - libs/wine/mbtowc.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 96dd45d..13f9b75 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -385,7 +385,6 @@ static void test_undefined_byte_char(void) ret = MultiByteToWideChar(testset[i].codepage, MB_ERR_INVALID_CHARS, testset[i].str, -1, NULL, 0); if (testset[i].is_error) { - todo_wine ok(ret == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION, "ret is %d, GetLastError is %u (cp %d)\n", ret, GetLastError(), testset[i].codepage); diff --git a/libs/wine/mbtowc.c b/libs/wine/mbtowc.c index 8b06a89..1995b31 100644 --- a/libs/wine/mbtowc.c +++ b/libs/wine/mbtowc.c @@ -39,6 +39,13 @@ static int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen ) return res; } +/* check the code whether it is in Unicode Private Use Area (PUA). */ +/* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ +static inline int is_private_use_area_char(WCHAR code) +{ + return (code >= 0xe000 && code <= 0xf8ff); +} + /* check src string for invalid chars; return non-zero if invalid char found */ static inline int check_invalid_chars_sbcs( const struct sbcs_table *table, int flags, const unsigned char *src, unsigned int srclen ) @@ -49,7 +56,8 @@ static inline int check_invalid_chars_sbcs( const struct sbcs_table *table, int + (def_unicode_char & 0xff)]; while (srclen) { - if (cp2uni[*src] == def_unicode_char && *src != def_char) break; + if ((cp2uni[*src] == def_unicode_char && *src != def_char) || + is_private_use_area_char(cp2uni[*src])) break; src++; srclen--; } @@ -167,7 +175,8 @@ static inline int check_invalid_chars_dbcs( const struct dbcs_table *table, src++; srclen--; } - else if (cp2uni[*src] == def_unicode_char && *src != def_char) break; + else if ((cp2uni[*src] == def_unicode_char && *src != def_char) || + is_private_use_area_char(cp2uni[*src])) break; src++; srclen--; }

1 0

Henri Verbeet : wined3d: Don' t bother setting a depth render buffer for WINED3DFMT_NULL render targets.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 0ce17ea27ec2d89750d352bc83d89859a9846d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce17ea27ec2d89750d352bc8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 17:46:01 2011 +0200 wined3d: Don't bother setting a depth render buffer for WINED3DFMT_NULL render targets. --- dlls/wined3d/context.c | 5 +---- dlls/wined3d/surface.c | 14 +++++++++++++- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7d029db..8ffb30c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -455,10 +455,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Apply depth targets */ if (entry->depth_stencil) - { - surface_set_compatible_renderbuffer(entry->depth_stencil, - entry->render_targets[0]->pow2Width, entry->render_targets[0]->pow2Height); - } + surface_set_compatible_renderbuffer(entry->depth_stencil, entry->render_targets[0]); context_attach_depth_stencil_fbo(context, target, entry->depth_stencil, TRUE); entry->attached = TRUE; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5d4dfa7..59f5aa7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1104,12 +1104,24 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct win * render target dimensions. With FBOs, the dimensions have to be an exact match. */ /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* GL locking is done by the caller */ -void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned int width, unsigned int height) +void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, IWineD3DSurfaceImpl *rt) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; renderbuffer_entry_t *entry; GLuint renderbuffer = 0; unsigned int src_width, src_height; + unsigned int width, height; + + if (rt->resource.format->id != WINED3DFMT_NULL) + { + width = rt->pow2Width; + height = rt->pow2Height; + } + else + { + width = surface->pow2Width; + height = surface->pow2Height; + } src_width = surface->pow2Width; src_height = surface->pow2Height; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c985378..117909a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2121,8 +2121,7 @@ void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location, UI void surface_modify_location(IWineD3DSurfaceImpl *surface, DWORD flag, BOOL persistent) DECLSPEC_HIDDEN; void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN; -void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, - unsigned int width, unsigned int height) DECLSPEC_HIDDEN; +void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, IWineD3DSurfaceImpl *rt) DECLSPEC_HIDDEN; void surface_set_container(IWineD3DSurfaceImpl *surface, enum wined3d_container_type type, void *container) DECLSPEC_HIDDEN; void surface_set_texture_name(IWineD3DSurfaceImpl *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Fix partial depth buffer copies.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 032f8702edc769ba42e23034ef9dcc3854efd928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032f8702edc769ba42e23034e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 17:46:02 2011 +0200 wined3d: Fix partial depth buffer copies. Don't overwrite the entire buffer if only part of it is not current. The data we're copying may not be completely current either. This is for the case where the inner rect is not current and the outer edge is. The reverse case where the inner rect is current and we need to mask already works correctly. --- dlls/wined3d/surface.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 59f5aa7..bbbdd49 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4126,10 +4126,10 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, const struct wined3d_gl glDepthFunc(GL_ALWAYS); glDepthMask(GL_TRUE); glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); - glViewport(0, 0, w, h); + glViewport(0, This->pow2Height - h, w, h); SetRect(&rect, 0, h, w, 0); - surface_get_blt_info(target, &rect, w, h, &info); + surface_get_blt_info(target, &rect, This->pow2Width, This->pow2Height, &info); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); glGetIntegerv(info.binding, &old_binding); glBindTexture(info.bind_target, texture); @@ -4180,6 +4180,7 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte { IWineD3DDeviceImpl *device = surface->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; + GLsizei w, h; TRACE("surface %p, new location %#x.\n", surface, location); @@ -4188,9 +4189,16 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte if (!(surface->flags & location)) { + w = surface->ds_current_size.cx; + h = surface->ds_current_size.cy; surface->ds_current_size.cx = 0; surface->ds_current_size.cy = 0; } + else + { + w = surface->resource.width; + h = surface->resource.height; + } if (surface->ds_current_size.cx == surface->resource.width && surface->ds_current_size.cy == surface->resource.height) @@ -4216,14 +4224,13 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte { GLint old_binding = 0; GLenum bind_target; - GLsizei w, h; /* The render target is allowed to be smaller than the depth/stencil * buffer, so the onscreen depth/stencil buffer is potentially smaller * than the offscreen surface. Don't overwrite the offscreen surface * with undefined data. */ - w = min(surface->resource.width, context->swapchain->presentParms.BackBufferWidth); - h = min(surface->resource.height, context->swapchain->presentParms.BackBufferHeight); + w = min(w, context->swapchain->presentParms.BackBufferWidth); + h = min(h, context->swapchain->presentParms.BackBufferHeight); TRACE("Copying onscreen depth buffer to depth texture.\n"); @@ -4298,7 +4305,7 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte context_bind_fbo(context, GL_FRAMEBUFFER, NULL); surface_depth_blt(surface, gl_info, surface->texture_name, - surface->resource.width, surface->resource.height, surface->texture_target); + w, h, surface->texture_target); checkGLcall("depth_blt"); if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id);

1 0

Henri Verbeet : d3d8/tests: Add a test for partial depth buffer copies.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 826c91c5e0e3ee7804eb3e207e28278c98369afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=826c91c5e0e3ee7804eb3e207… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 17:46:03 2011 +0200 d3d8/tests: Add a test for partial depth buffer copies. --- dlls/d3d8/tests/visual.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a6a9c9b..08928d5 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1556,6 +1556,106 @@ static void depth_buffer_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); } +/* Test that partial depth copies work the way they're supposed to. The clear + * on rt2 only needs a partial copy of the onscreen depth/stencil buffer, and + * the following draw should only copy back the part that was modified. */ +static void depth_buffer2_test(IDirect3DDevice8 *device) +{ + static const struct vertex quad[] = + { + { -1.0, 1.0, 0.66f, 0xffff0000}, + { 1.0, 1.0, 0.66f, 0xffff0000}, + { -1.0, -1.0, 0.66f, 0xffff0000}, + { 1.0, -1.0, 0.66f, 0xffff0000}, + }; + + IDirect3DSurface8 *backbuffer, *rt1, *rt2; + IDirect3DSurface8 *depth_stencil; + unsigned int i, j; + D3DVIEWPORT8 vp; + D3DCOLOR color; + HRESULT hr; + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + + hr = IDirect3DDevice8_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, FALSE, &rt1); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 480, 360, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, FALSE, &rt2); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &depth_stencil); + ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderTarget(device, &backbuffer); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt1, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 0.5f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt2, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + IDirect3DSurface8_Release(depth_stencil); + IDirect3DSurface8_Release(backbuffer); + IDirect3DSurface8_Release(rt2); + IDirect3DSurface8_Release(rt1); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + unsigned int x = 80 * ((2 * j) + 1); + unsigned int y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 0), + "Expected color 0x0000ff00 %u,%u, got 0x%08x.\n", x, y, color); + } + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); +} + static void intz_test(IDirect3DDevice8 *device) { static const DWORD ps_code[] = @@ -2033,6 +2133,7 @@ START_TEST(visual) p8_texture_test(device_ptr); texop_test(device_ptr); depth_buffer_test(device_ptr); + depth_buffer2_test(device_ptr); intz_test(device_ptr); shadow_test(device_ptr);

1 0