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

Alexandre Julliard : server: Store all desktop cursor information in a separate structure.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: c64c36f5734f4c2931fbe3e32c9f06d420652d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64c36f5734f4c2931fbe3e32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 19:54:22 2011 +0200 server: Store all desktop cursor information in a separate structure. --- server/queue.c | 30 +++++++++++++++--------------- server/user.h | 11 ++++++++--- server/window.c | 2 +- server/winstation.c | 7 +------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/server/queue.c b/server/queue.c index 2e1168d..f6ac303 100644 --- a/server/queue.c +++ b/server/queue.c @@ -322,7 +322,7 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ 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 ); + get_top_window_rectangle( desktop, &desktop->cursor.clip ); desktop->foreground_input = input; } @@ -1279,8 +1279,8 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru /* set the cursor position, clipping to the cursor clip rect */ static void set_cursor_pos( struct desktop *desktop, int x, int y ) { - desktop->cursor_x = min( max( x, desktop->cursor_clip.left ), desktop->cursor_clip.right - 1 ); - desktop->cursor_y = min( max( y, desktop->cursor_clip.top ), desktop->cursor_clip.bottom - 1 ); + desktop->cursor.x = min( max( x, desktop->cursor.clip.left ), desktop->cursor.clip.right - 1 ); + desktop->cursor.y = min( max( y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom - 1 ); } /* queue a hardware message into a given thread input */ @@ -1312,8 +1312,8 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg if (desktop->keystate[VK_XBUTTON1] & 0x80) msg->wparam |= MK_XBUTTON1; if (desktop->keystate[VK_XBUTTON2] & 0x80) msg->wparam |= MK_XBUTTON2; } - data->x = desktop->cursor_x; - data->y = desktop->cursor_y; + data->x = desktop->cursor.x; + data->y = desktop->cursor.y; if (msg->win && (thread = get_window_thread( msg->win ))) { @@ -1422,19 +1422,19 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons x = input->mouse.x; y = input->mouse.y; if (flags & ~(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE) && - x == desktop->cursor_x && y == desktop->cursor_y) + x == desktop->cursor.x && y == desktop->cursor.y) flags &= ~MOUSEEVENTF_MOVE; } else { - x = desktop->cursor_x + input->mouse.x; - y = desktop->cursor_y + input->mouse.y; + x = desktop->cursor.x + input->mouse.x; + y = desktop->cursor.y + input->mouse.y; } } else { - x = desktop->cursor_x; - y = desktop->cursor_y; + x = desktop->cursor.x; + y = desktop->cursor.y; } for (i = 0; i < sizeof(messages)/sizeof(messages[0]); i++) @@ -2620,11 +2620,11 @@ DECL_HANDLER(set_cursor) { 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; + if (!intersect_rect( &input->desktop->cursor.clip, &top_rect, &req->clip )) + input->desktop->cursor.clip = top_rect; } - reply->new_x = input->desktop->cursor_x; - reply->new_y = input->desktop->cursor_y; - reply->new_clip = input->desktop->cursor_clip; + reply->new_x = input->desktop->cursor.x; + reply->new_y = input->desktop->cursor.y; + reply->new_clip = input->desktop->cursor.clip; } diff --git a/server/user.h b/server/user.h index b8da053..52a44a6 100644 --- a/server/user.h +++ b/server/user.h @@ -51,6 +51,13 @@ struct winstation struct atom_table *atom_table; /* global atom table */ }; +struct global_cursor +{ + int x; /* cursor position */ + int y; + rectangle_t clip; /* cursor clip rectangle */ +}; + struct desktop { struct object obj; /* object header */ @@ -63,9 +70,7 @@ struct desktop struct timeout_user *close_timeout; /* timeout before closing the desktop */ struct thread_input *foreground_input; /* thread input of foreground thread */ unsigned int users; /* processes and threads using this desktop */ - int cursor_x; /* cursor position */ - int cursor_y; - rectangle_t cursor_clip; /* cursor clip rectangle */ + struct global_cursor cursor; /* global cursor information */ unsigned char keystate[256]; /* asynchronous key state */ }; diff --git a/server/window.c b/server/window.c index 5d211eb..0fbce24 100644 --- a/server/window.c +++ b/server/window.c @@ -1553,7 +1553,7 @@ static void set_window_pos( struct window *win, struct window *previous, } /* reset cursor clip rectangle when the desktop changes size */ - if (win == win->desktop->top_window) win->desktop->cursor_clip = *window_rect; + if (win == win->desktop->top_window) win->desktop->cursor.clip = *window_rect; /* if the window is not visible, everything is easy */ if (!visible) return; diff --git a/server/winstation.c b/server/winstation.c index 13871cf..7b01919 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -232,12 +232,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned desktop->close_timeout = NULL; desktop->foreground_input = NULL; desktop->users = 0; - desktop->cursor_x = 0; - desktop->cursor_y = 0; - desktop->cursor_clip.left = 0; - desktop->cursor_clip.top = 0; - desktop->cursor_clip.right = 0; - desktop->cursor_clip.bottom = 0; + memset( &desktop->cursor, 0, sizeof(desktop->cursor) ); memset( desktop->keystate, 0, sizeof(desktop->keystate) ); list_add_tail( &winstation->desktops, &desktop->entry ); }

1 0

Alexandre Julliard : server: Return the time of last change along with the current cursor position.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 6576703facc1f42efcbd755308d46382b763d774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6576703facc1f42efcbd75530… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 20:15:56 2011 +0200 server: Return the time of last change along with the current cursor position. --- dlls/user32/input.c | 23 +++++++---------------- include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/queue.c | 11 +++++++---- server/request.h | 3 ++- server/trace.c | 1 + server/user.h | 1 + 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 06553a4..9b22021 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -52,7 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); WINE_DECLARE_DEBUG_CHANNEL(keyboard); -static DWORD last_mouse_event; /*********************************************************************** * get_key_state @@ -124,10 +123,7 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) */ BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ) { - NTSTATUS status; - - if (input->type == INPUT_MOUSE) last_mouse_event = GetTickCount(); - status = send_hardware_message( hwnd, input, 0 ); + NTSTATUS status = send_hardware_message( hwnd, input, 0 ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; } @@ -183,7 +179,6 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) { /* we need to update the coordinates to what the server expects */ INPUT input = inputs[i]; - last_mouse_event = GetTickCount(); update_mouse_coords( &input ); if (!(status = send_hardware_message( 0, &input, SEND_HWMSG_INJECTED ))) { @@ -254,28 +249,24 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, */ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { - BOOL ret = FALSE; + BOOL ret; + DWORD last_change; if (!pt) return FALSE; - /* query new position from graphics driver if we haven't updated recently */ - if (GetTickCount() - last_mouse_event > 100) ret = USER_Driver->pGetCursorPos( pt ); - SERVER_START_REQ( set_cursor ) { - if (ret) /* update it */ - { - req->flags = SET_CURSOR_POS; - req->x = pt->x; - req->y = pt->y; - } if ((ret = !wine_server_call( req ))) { pt->x = reply->new_x; pt->y = reply->new_y; + last_change = reply->last_change; } } SERVER_END_REQ; + + /* query new position from graphics driver if we haven't updated recently */ + if (ret && GetTickCount() - last_change > 100) ret = USER_Driver->pGetCursorPos( pt ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 82e95be..70e539b 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4807,6 +4807,8 @@ struct set_cursor_reply int new_x; int new_y; rectangle_t new_clip; + unsigned int last_change; + char __pad_44[4]; }; #define SET_CURSOR_HANDLE 0x01 #define SET_CURSOR_COUNT 0x02 @@ -5559,6 +5561,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 417 +#define SERVER_PROTOCOL_VERSION 418 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index aaaebc0..f8fc82b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3324,6 +3324,7 @@ enum coords_relative int new_x; /* new position */ int new_y; rectangle_t new_clip; /* new clip rectangle */ + unsigned int last_change; /* time of last position change */ @END #define SET_CURSOR_HANDLE 0x01 #define SET_CURSOR_COUNT 0x02 diff --git a/server/queue.c b/server/queue.c index f6ac303..35448e5 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1281,6 +1281,7 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y ) { desktop->cursor.x = min( max( x, desktop->cursor.clip.left ), desktop->cursor.clip.right - 1 ); desktop->cursor.y = min( max( y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom - 1 ); + desktop->cursor.last_change = get_tick_count(); } /* queue a hardware message into a given thread input */ @@ -1411,9 +1412,10 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons WM_MOUSEHWHEEL /* 0x1000 = MOUSEEVENTF_HWHEEL */ }; + desktop->cursor.last_change = get_tick_count(); flags = input->mouse.flags; time = input->mouse.time; - if (!time) time = get_tick_count(); + if (!time) time = desktop->cursor.last_change; if (flags & MOUSEEVENTF_MOVE) { @@ -2624,7 +2626,8 @@ DECL_HANDLER(set_cursor) input->desktop->cursor.clip = top_rect; } - reply->new_x = input->desktop->cursor.x; - reply->new_y = input->desktop->cursor.y; - reply->new_clip = input->desktop->cursor.clip; + reply->new_x = input->desktop->cursor.x; + reply->new_y = input->desktop->cursor.y; + reply->new_clip = input->desktop->cursor.clip; + reply->last_change = input->desktop->cursor.last_change; } diff --git a/server/request.h b/server/request.h index 47733a5..c2104e9 100644 --- a/server/request.h +++ b/server/request.h @@ -2103,7 +2103,8 @@ C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_count) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_x) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_y) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_clip) == 24 ); -C_ASSERT( sizeof(struct set_cursor_reply) == 40 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, last_change) == 40 ); +C_ASSERT( sizeof(struct set_cursor_reply) == 48 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 0933cf1..553ba4d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3905,6 +3905,7 @@ static void dump_set_cursor_reply( const struct set_cursor_reply *req ) fprintf( stderr, ", new_x=%d", req->new_x ); fprintf( stderr, ", new_y=%d", req->new_y ); dump_rectangle( ", new_clip=", &req->new_clip ); + fprintf( stderr, ", last_change=%08x", req->last_change ); } static const dump_func req_dumpers[REQ_NB_REQUESTS] = { diff --git a/server/user.h b/server/user.h index 52a44a6..cc603cf 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 last_change; /* time of last position change */ }; struct desktop

1 0

Henri Verbeet : wined3d: Fix the EXT_blend_minmax extension definitions.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: f8507d60618c13460e4290cc7c6dad80449e3a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8507d60618c13460e4290cc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 20:04:43 2011 +0200 wined3d: Fix the EXT_blend_minmax extension definitions. --- dlls/wined3d/state.c | 16 ++++++++-------- dlls/wined3d/wined3d_gl.h | 21 ++++++++++++++++----- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 182882d..a37f8ce 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -637,8 +637,8 @@ static void state_blendop_w(DWORD state, struct wined3d_stateblock *stateblock, static void state_blendop(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; - int blendEquation = GL_FUNC_ADD; - int blendEquationAlpha = GL_FUNC_ADD; + int blendEquation = GL_FUNC_ADD_EXT; + int blendEquationAlpha = GL_FUNC_ADD_EXT; /* BLENDOPALPHA requires GL_EXT_blend_equation_separate, so make sure it is around */ if (stateblock->state.render_states[WINED3DRS_BLENDOPALPHA] @@ -650,11 +650,11 @@ static void state_blendop(DWORD state, struct wined3d_stateblock *stateblock, st switch (stateblock->state.render_states[WINED3DRS_BLENDOP]) { - case WINED3DBLENDOP_ADD : blendEquation = GL_FUNC_ADD; break; + case WINED3DBLENDOP_ADD : blendEquation = GL_FUNC_ADD_EXT; break; case WINED3DBLENDOP_SUBTRACT : blendEquation = GL_FUNC_SUBTRACT; break; case WINED3DBLENDOP_REVSUBTRACT : blendEquation = GL_FUNC_REVERSE_SUBTRACT; break; - case WINED3DBLENDOP_MIN : blendEquation = GL_MIN; break; - case WINED3DBLENDOP_MAX : blendEquation = GL_MAX; break; + case WINED3DBLENDOP_MIN : blendEquation = GL_MIN_EXT; break; + case WINED3DBLENDOP_MAX : blendEquation = GL_MAX_EXT; break; default: FIXME("Unrecognized/Unhandled D3DBLENDOP value %#x.\n", stateblock->state.render_states[WINED3DRS_BLENDOP]); @@ -662,11 +662,11 @@ static void state_blendop(DWORD state, struct wined3d_stateblock *stateblock, st switch (stateblock->state.render_states[WINED3DRS_BLENDOPALPHA]) { - case WINED3DBLENDOP_ADD : blendEquationAlpha = GL_FUNC_ADD; break; + case WINED3DBLENDOP_ADD : blendEquationAlpha = GL_FUNC_ADD_EXT; break; case WINED3DBLENDOP_SUBTRACT : blendEquationAlpha = GL_FUNC_SUBTRACT; break; case WINED3DBLENDOP_REVSUBTRACT : blendEquationAlpha = GL_FUNC_REVERSE_SUBTRACT; break; - case WINED3DBLENDOP_MIN : blendEquationAlpha = GL_MIN; break; - case WINED3DBLENDOP_MAX : blendEquationAlpha = GL_MAX; break; + case WINED3DBLENDOP_MIN : blendEquationAlpha = GL_MIN_EXT; break; + case WINED3DBLENDOP_MAX : blendEquationAlpha = GL_MAX_EXT; break; default: FIXME("Unrecognized/Unhandled D3DBLENDOP value %#x\n", stateblock->state.render_states[WINED3DRS_BLENDOPALPHA]); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index fca79af..4c20e70 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -2984,6 +2984,16 @@ typedef void (WINE_GLAPI *PGLFNBLENDEQUATIONSEPARATEEXTPROC)(GLenum modeRGB, GLe typedef void (WINE_GLAPI *PGLFNBLENDFUNCSEPARATEEXTPROC)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +/* GL_EXT_blend_minmax */ +#ifndef GL_EXT_blend_minmax +#define GL_EXT_blend_minmax 1 +#define GL_FUNC_ADD_EXT 0x8006 +#define GL_MIN_EXT 0x8007 +#define GL_MAX_EXT 0x8008 +#define GL_BLEND_EQUATION_EXT 0x8009 +#endif +typedef void (WINE_GLAPI *PGLFNBLENDEQUATIONEXTPROC)(GLenum mode); + /* GL_EXT_depth_bounds_test */ #ifndef GL_EXT_depth_bounds_test #define GL_EXT_depth_bounds_test 1 @@ -3892,11 +3902,6 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval); glFramebufferTextureLayerARB, ARB_GEOMETRY_SHADER4, NULL) \ USE_GL_FUNC(PGLFNFRAMEBUFFERTEXTUREFACEARBPROC, \ glFramebufferTextureFaceARB, ARB_GEOMETRY_SHADER4, NULL) \ - /* GL_ARB_imaging, GL_EXT_blend_minmax */ \ - USE_GL_FUNC(PGLFNBLENDCOLORPROC, \ - glBlendColorEXT, EXT_BLEND_COLOR, NULL) \ - USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, \ - glBlendEquationEXT, EXT_BLEND_MINMAX, NULL) \ /* GL_ARB_map_buffer_range */ \ USE_GL_FUNC(PGLFNMAPBUFFERRANGEPROC, \ glMapBufferRange, ARB_MAP_BUFFER_RANGE, NULL) \ @@ -4231,12 +4236,18 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval); glStencilOpSeparateATI, ATI_SEPARATE_STENCIL, NULL) \ USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, \ glStencilFuncSeparateATI, ATI_SEPARATE_STENCIL, NULL) \ + /* GL_EXT_blend_color */ \ + USE_GL_FUNC(PGLFNBLENDCOLORPROC, \ + glBlendColorEXT, EXT_BLEND_COLOR, NULL) \ /* GL_EXT_blend_equation_separate */ \ USE_GL_FUNC(PGLFNBLENDFUNCSEPARATEEXTPROC, \ glBlendFuncSeparateEXT, EXT_BLEND_FUNC_SEPARATE, NULL) \ /* GL_EXT_blend_func_separate */ \ USE_GL_FUNC(PGLFNBLENDEQUATIONSEPARATEEXTPROC, \ glBlendEquationSeparateEXT, EXT_BLEND_EQUATION_SEPARATE, NULL) \ + /* GL_EXT_blend_minmax */ \ + USE_GL_FUNC(PGLFNBLENDEQUATIONEXTPROC, \ + glBlendEquationEXT, EXT_BLEND_MINMAX, NULL) \ /* GL_EXT_depth_bounds_test */ \ USE_GL_FUNC(PGLFNDEPTHBOUNDSEXTPROC, \ glDepthBoundsEXT, EXT_DEPTH_BOUNDS_TEST, NULL) \

1 0

Henri Verbeet : wined3d: Fix the EXT_blend_color extension definitions.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: e4e28c47ea2cc6a75c027687fa1e1962ab1ff29c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e28c47ea2cc6a75c027687f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 20:04:44 2011 +0200 wined3d: Fix the EXT_blend_color extension definitions. --- dlls/wined3d/state.c | 16 ++++++++-------- dlls/wined3d/wined3d_gl.h | 14 +++++++++++++- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a37f8ce..ad9374d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -314,8 +314,8 @@ static void state_blend(DWORD state, struct wined3d_stateblock *stateblock, stru FIXME("WINED3DRS_DESTBLEND = WINED3DBLEND_BOTHINVSRCALPHA, what to do?\n"); break; - case WINED3DBLEND_BLENDFACTOR : dstBlend = GL_CONSTANT_COLOR; break; - case WINED3DBLEND_INVBLENDFACTOR : dstBlend = GL_ONE_MINUS_CONSTANT_COLOR; break; + case WINED3DBLEND_BLENDFACTOR : dstBlend = GL_CONSTANT_COLOR_EXT; break; + case WINED3DBLEND_INVBLENDFACTOR : dstBlend = GL_ONE_MINUS_CONSTANT_COLOR_EXT; break; default: FIXME("Unrecognized dst blend value %#x.\n", stateblock->state.render_states[WINED3DRS_DESTBLEND]); @@ -348,8 +348,8 @@ static void state_blend(DWORD state, struct wined3d_stateblock *stateblock, stru dstBlend = GL_SRC_ALPHA; break; - case WINED3DBLEND_BLENDFACTOR : srcBlend = GL_CONSTANT_COLOR; break; - case WINED3DBLEND_INVBLENDFACTOR : srcBlend = GL_ONE_MINUS_CONSTANT_COLOR; break; + case WINED3DBLEND_BLENDFACTOR : srcBlend = GL_CONSTANT_COLOR_EXT; break; + case WINED3DBLEND_INVBLENDFACTOR : srcBlend = GL_ONE_MINUS_CONSTANT_COLOR_EXT; break; default: FIXME("Unrecognized src blend value %#x.\n", stateblock->state.render_states[WINED3DRS_SRCBLEND]); @@ -417,8 +417,8 @@ static void state_blend(DWORD state, struct wined3d_stateblock *stateblock, stru srcBlendAlpha = GL_ONE_MINUS_SRC_ALPHA; FIXME("WINED3DRS_DESTBLENDALPHA = WINED3DBLEND_BOTHINVSRCALPHA, what to do?\n"); break; - case WINED3DBLEND_BLENDFACTOR : dstBlendAlpha = GL_CONSTANT_COLOR; break; - case WINED3DBLEND_INVBLENDFACTOR : dstBlendAlpha = GL_ONE_MINUS_CONSTANT_COLOR; break; + case WINED3DBLEND_BLENDFACTOR : dstBlendAlpha = GL_CONSTANT_COLOR_EXT; break; + case WINED3DBLEND_INVBLENDFACTOR : dstBlendAlpha = GL_ONE_MINUS_CONSTANT_COLOR_EXT; break; default: FIXME("Unrecognized dst blend alpha value %#x.\n", stateblock->state.render_states[WINED3DRS_DESTBLENDALPHA]); @@ -445,8 +445,8 @@ static void state_blend(DWORD state, struct wined3d_stateblock *stateblock, stru srcBlendAlpha = GL_ONE_MINUS_SRC_ALPHA; dstBlendAlpha = GL_SRC_ALPHA; break; - case WINED3DBLEND_BLENDFACTOR : srcBlendAlpha = GL_CONSTANT_COLOR; break; - case WINED3DBLEND_INVBLENDFACTOR : srcBlendAlpha = GL_ONE_MINUS_CONSTANT_COLOR; break; + case WINED3DBLEND_BLENDFACTOR : srcBlendAlpha = GL_CONSTANT_COLOR_EXT; break; + case WINED3DBLEND_INVBLENDFACTOR : srcBlendAlpha = GL_ONE_MINUS_CONSTANT_COLOR_EXT; break; default: FIXME("Unrecognized src blend alpha value %#x.\n", stateblock->state.render_states[WINED3DRS_SRCBLENDALPHA]); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4c20e70..fc362a7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -2970,6 +2970,18 @@ typedef void (WINE_GLAPI *PGLFNSTENCILFUNCSEPARATEATIPROC)(GLenum, GLenum, GLint #define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 #endif +/* GL_EXT_blend_color */ +#ifndef GL_EXT_blend_color +#define GL_EXT_blend_color 1 +#define GL_CONSTANT_COLOR_EXT 0x8001 +#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 +#define GL_CONSTANT_ALPHA_EXT 0x8003 +#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 +#define GL_BLEND_COLOR_EXT 0x8005 +#endif +typedef GLvoid (WINE_GLAPI *PGLFNBLENDCOLOREXTPROC)(GLclampf red, + GLclampf green, GLclampf blue, GLclampf alpha); + /* GL_EXT_blend_equation_separate */ typedef void (WINE_GLAPI *PGLFNBLENDEQUATIONSEPARATEEXTPROC)(GLenum modeRGB, GLenum modeAlpha); @@ -4237,7 +4249,7 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval); USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, \ glStencilFuncSeparateATI, ATI_SEPARATE_STENCIL, NULL) \ /* GL_EXT_blend_color */ \ - USE_GL_FUNC(PGLFNBLENDCOLORPROC, \ + USE_GL_FUNC(PGLFNBLENDCOLOREXTPROC, \ glBlendColorEXT, EXT_BLEND_COLOR, NULL) \ /* GL_EXT_blend_equation_separate */ \ USE_GL_FUNC(PGLFNBLENDFUNCSEPARATEEXTPROC, \

1 0

Henri Verbeet : wined3d: Fix the EXT_blend_subtract extension definitions.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 97a5336ca9ad143928f6c2aac9a06be0047d90ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a5336ca9ad143928f6c2aac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 20:04:45 2011 +0200 wined3d: Fix the EXT_blend_subtract extension definitions. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/state.c | 20 ++++++++++---------- dlls/wined3d/wined3d_gl.h | 8 ++++++++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 43f445e..45b3832 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -105,6 +105,7 @@ static const struct { {"GL_EXT_blend_equation_separate", EXT_BLEND_EQUATION_SEPARATE, 0 }, {"GL_EXT_blend_func_separate", EXT_BLEND_FUNC_SEPARATE, 0 }, {"GL_EXT_blend_minmax", EXT_BLEND_MINMAX, 0 }, + {"GL_EXT_blend_subtract", EXT_BLEND_SUBTRACT, 0 }, {"GL_EXT_depth_bounds_test", EXT_DEPTH_BOUNDS_TEST, 0 }, {"GL_EXT_draw_buffers2", EXT_DRAW_BUFFERS2, 0 }, {"GL_EXT_fog_coord", EXT_FOG_COORD, 0 }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ad9374d..85e61de 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -650,11 +650,11 @@ static void state_blendop(DWORD state, struct wined3d_stateblock *stateblock, st switch (stateblock->state.render_states[WINED3DRS_BLENDOP]) { - case WINED3DBLENDOP_ADD : blendEquation = GL_FUNC_ADD_EXT; break; - case WINED3DBLENDOP_SUBTRACT : blendEquation = GL_FUNC_SUBTRACT; break; - case WINED3DBLENDOP_REVSUBTRACT : blendEquation = GL_FUNC_REVERSE_SUBTRACT; break; - case WINED3DBLENDOP_MIN : blendEquation = GL_MIN_EXT; break; - case WINED3DBLENDOP_MAX : blendEquation = GL_MAX_EXT; break; + case WINED3DBLENDOP_ADD: blendEquation = GL_FUNC_ADD_EXT; break; + case WINED3DBLENDOP_SUBTRACT: blendEquation = GL_FUNC_SUBTRACT_EXT; break; + case WINED3DBLENDOP_REVSUBTRACT: blendEquation = GL_FUNC_REVERSE_SUBTRACT_EXT; break; + case WINED3DBLENDOP_MIN: blendEquation = GL_MIN_EXT; break; + case WINED3DBLENDOP_MAX: blendEquation = GL_MAX_EXT; break; default: FIXME("Unrecognized/Unhandled D3DBLENDOP value %#x.\n", stateblock->state.render_states[WINED3DRS_BLENDOP]); @@ -662,11 +662,11 @@ static void state_blendop(DWORD state, struct wined3d_stateblock *stateblock, st switch (stateblock->state.render_states[WINED3DRS_BLENDOPALPHA]) { - case WINED3DBLENDOP_ADD : blendEquationAlpha = GL_FUNC_ADD_EXT; break; - case WINED3DBLENDOP_SUBTRACT : blendEquationAlpha = GL_FUNC_SUBTRACT; break; - case WINED3DBLENDOP_REVSUBTRACT : blendEquationAlpha = GL_FUNC_REVERSE_SUBTRACT; break; - case WINED3DBLENDOP_MIN : blendEquationAlpha = GL_MIN_EXT; break; - case WINED3DBLENDOP_MAX : blendEquationAlpha = GL_MAX_EXT; break; + case WINED3DBLENDOP_ADD: blendEquationAlpha = GL_FUNC_ADD_EXT; break; + case WINED3DBLENDOP_SUBTRACT: blendEquationAlpha = GL_FUNC_SUBTRACT_EXT; break; + case WINED3DBLENDOP_REVSUBTRACT: blendEquationAlpha = GL_FUNC_REVERSE_SUBTRACT_EXT; break; + case WINED3DBLENDOP_MIN: blendEquationAlpha = GL_MIN_EXT; break; + case WINED3DBLENDOP_MAX: blendEquationAlpha = GL_MAX_EXT; break; default: FIXME("Unrecognized/Unhandled D3DBLENDOP value %#x\n", stateblock->state.render_states[WINED3DRS_BLENDOPALPHA]); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index fc362a7..3e10d12 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1786,6 +1786,7 @@ typedef enum wined3d_gl_extension EXT_BLEND_EQUATION_SEPARATE, EXT_BLEND_FUNC_SEPARATE, EXT_BLEND_MINMAX, + EXT_BLEND_SUBTRACT, EXT_DRAW_BUFFERS2, EXT_DEPTH_BOUNDS_TEST, EXT_FOG_COORD, @@ -3006,6 +3007,13 @@ typedef void (WINE_GLAPI *PGLFNBLENDFUNCSEPARATEEXTPROC)(GLenum sfactorRGB, GLen #endif typedef void (WINE_GLAPI *PGLFNBLENDEQUATIONEXTPROC)(GLenum mode); +/* GL_EXT_blend_subtract */ +#ifndef GL_EXT_blend_subtract +#define GL_EXT_blend_subtract 1 +#define GL_FUNC_SUBTRACT_EXT 0x800a +#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800b +#endif + /* GL_EXT_depth_bounds_test */ #ifndef GL_EXT_depth_bounds_test #define GL_EXT_depth_bounds_test 1

1 0

Henri Verbeet : wined3d: Get rid of the ARB_imaging extension.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 02480a902e4faf3b5c369d3b544bd7457fbaeef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02480a902e4faf3b5c369d3b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 20:04:46 2011 +0200 wined3d: Get rid of the ARB_imaging extension. --- dlls/wined3d/directx.c | 1 - dlls/wined3d/wined3d_gl.h | 83 --------------------------------------------- 2 files changed, 0 insertions(+), 84 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 45b3832..a3488e3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -61,7 +61,6 @@ static const struct { {"GL_ARB_geometry_shader4", ARB_GEOMETRY_SHADER4, 0 }, {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL, 0 }, {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX, 0 }, - {"GL_ARB_imaging", ARB_IMAGING, 0 }, {"GL_ARB_map_buffer_range", ARB_MAP_BUFFER_RANGE, 0 }, {"GL_ARB_multisample", ARB_MULTISAMPLE, 0 }, /* needs GLX_ARB_MULTISAMPLE as well */ {"GL_ARB_multitexture", ARB_MULTITEXTURE, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3e10d12..be50b2f 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1744,7 +1744,6 @@ typedef enum wined3d_gl_extension ARB_GEOMETRY_SHADER4, ARB_HALF_FLOAT_PIXEL, ARB_HALF_FLOAT_VERTEX, - ARB_IMAGING, ARB_MAP_BUFFER_RANGE, ARB_MULTISAMPLE, ARB_MULTITEXTURE, @@ -2148,88 +2147,6 @@ typedef void (WINE_GLAPI *PGLFNFRAMEBUFFERTEXTUREFACEARBPROC)(GLenum target, GLe #define GL_HALF_FLOAT 0x140b #endif -/* GL_ARB_imaging */ -#ifndef GL_ARB_imaging -#define GL_ARB_imaging 1 -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800a -#define GL_FUNC_REVERSE_SUBTRACT 0x800b -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801a -#define GL_MAX_CONVOLUTION_HEIGHT 0x801b -#define GL_POST_CONVOLUTION_RED_SCALE 0x801d -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801f -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801e -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801f -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802a -#define GL_HISTOGRAM_ALPHA_SIZE 0x802b -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802c -#define GL_HISTOGRAM_SINK 0x802d -#define GL_MINMAX 0x802e -#define GL_MINMAX_FORMAT 0x802f -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_COLOR_MATRIX 0x80b1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80b2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80b3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80b4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80b5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80b6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80b7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80b8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80b9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80ba -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80bb -#define GL_COLOR_TABLE 0x80d0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80d1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80d2 -#define GL_PROXY_COLOR_TABLE 0x80d3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80d4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80d5 -#define GL_COLOR_TABLE_SCALE 0x80d6 -#define GL_COLOR_TABLE_BIAS 0x80d7 -#define GL_COLOR_TABLE_FORMAT 0x80d8 -#define GL_COLOR_TABLE_WIDTH 0x80d9 -#define GL_COLOR_TABLE_RED_SIZE 0x80da -#define GL_COLOR_TABLE_GREEN_SIZE 0x80db -#define GL_COLOR_TABLE_BLUE_SIZE 0x80dc -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80dd -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80de -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80df -#define GL_CONSTANT_BORDER 0x8151 -#define GL_REPLICATE_BORDER 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR 0x8154 -#endif -typedef void (WINE_GLAPI *PGLFNBLENDCOLORPROC)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -typedef void (WINE_GLAPI *PGLFNBLENDEQUATIONPROC)(GLenum mode); - /* GL_ARB_map_buffer_range */ #ifndef GL_ARB_map_buffer_range #define GL_ARB_map_buffer_range 1

1 0

Vincent Povirk : comctl32: Use current month and year when checking day of month.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 4d1fca24be9730707b5fb8510dc19c03c14074e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1fca24be9730707b5fb8510… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 31 13:55:24 2011 -0500 comctl32: Use current month and year when checking day of month. --- dlls/comctl32/datetime.c | 3 ++- dlls/comctl32/tests/datetime.c | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 8269758..bc643eb 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -167,7 +167,8 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy if (flag == GDT_VALID) { if (systime->wYear < 1601 || systime->wYear > 30827 || systime->wMonth < 1 || systime->wMonth > 12 || - systime->wDay < 1 || systime->wDay > 31 || + systime->wDay < 1 || + systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) || systime->wHour > 23 || systime->wMinute > 59 || systime->wSecond > 59 || diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 8b902ba..d60ad54 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -600,6 +600,15 @@ static void test_dtm_set_and_get_system_time(void) r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); expect(GDT_VALID, r); expect_systime(&ref, &getSt); + /* day invalid for current month */ + st = ref; + st.wDay = 30; + st.wMonth = 2; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); /* day of week isn't validated */ st = ref; st.wDayOfWeek = 10;

1 0