September 2012 - Wine-Commits

Alexandre Julliard : winex11: Check for changes in min/ maximize state even when the window rectangle didn't change.
by Alexandre Julliard Sept. 6, 2012

Sept. 6, 2012

Module: wine Branch: master Commit: 6f1d43b16ecd8018f61f8fc947e78b9f5255cd63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1d43b16ecd8018f61f8fc94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 14:09:06 2012 +0200 winex11: Check for changes in min/maximize state even when the window rectangle didn't change. --- dlls/winex11.drv/event.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dc7d1e3..ba80439 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1019,14 +1019,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if ((data->window_rect.right - data->window_rect.left == cx && data->window_rect.bottom - data->window_rect.top == cy) || (IsRectEmpty( &data->window_rect ) && event->width == 1 && event->height == 1)) - { - if (flags & SWP_NOMOVE) /* if nothing changed, don't do anything */ - { - TRACE( "Nothing has changed, ignoring event\n" ); - return; - } flags |= SWP_NOSIZE; - } else TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, @@ -1051,7 +1044,8 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) } } - SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + if ((flags & (SWP_NOSIZE | SWP_NOMOVE)) != (SWP_NOSIZE | SWP_NOMOVE)) + SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); }

1 0

Alexandre Julliard : winex11: Handle Expose events by refreshing from the window surface.
by Alexandre Julliard Sept. 6, 2012

Sept. 6, 2012

Module: wine Branch: master Commit: 2eebedf38e4d5fd49075f8f89e63f869ca85cceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eebedf38e4d5fd49075f8f89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 30 15:09:03 2012 +0200 winex11: Handle Expose events by refreshing from the window surface. --- dlls/winex11.drv/event.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7da0947..dc7d1e3 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -791,7 +791,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) XExposeEvent *event = &xev->xexpose; RECT rect; struct x11drv_win_data *data; - int flags = RDW_INVALIDATE | RDW_ERASE; + int flags = RDW_INVALIDATE | RDW_ERASE | RDW_FRAME; TRACE( "win %p (%lx) %d,%d %dx%d\n", hwnd, event->window, event->x, event->y, event->width, event->height ); @@ -802,15 +802,19 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) rect.top = event->y; rect.right = event->x + event->width; rect.bottom = event->y + event->height; - if (event->window == data->whole_window) + + if (data->surface) { - OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, - data->whole_rect.top - data->client_rect.top ); - flags |= RDW_FRAME; + data->surface->funcs->lock( data->surface ); + add_bounds_rect( data->surface->funcs->get_bounds( data->surface ), &rect ); + data->surface->funcs->unlock( data->surface ); } if (event->window != root_window) { + OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); + if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) mirror_rect( &data->client_rect, &rect ); @@ -829,7 +833,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) } else OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - RedrawWindow( hwnd, &rect, 0, flags ); + if (!data->surface) RedrawWindow( hwnd, &rect, 0, flags ); }

1 0

Jacek Caban : vbscript: Fixed uninitialized opcode param in forto statement bytecode.
by Alexandre Julliard Sept. 6, 2012

Sept. 6, 2012

Module: wine Branch: master Commit: 080169f1d2bf280b149943230d0ef859a8ae8b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=080169f1d2bf280b149943230… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 11:57:00 2012 +0200 vbscript: Fixed uninitialized opcode param in forto statement bytecode. --- dlls/vbscript/compile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 12db4e0..c3334fd 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -700,6 +700,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = identifier; + instr_ptr(ctx, instr)->arg2.uint = 0; hres = compile_expression(ctx, stat->to_expr); if(FAILED(hres))

1 0

Piotr Caban : msvcp90: Fixed locale_ctor_cstr implementation.
by Alexandre Julliard Sept. 6, 2012

Sept. 6, 2012

Module: wine Branch: master Commit: 225cab98425484e92146d7c05c91502e2ccc3cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=225cab98425484e92146d7c05… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 6 11:41:31 2012 +0200 msvcp90: Fixed locale_ctor_cstr implementation. --- dlls/msvcp100/locale.c | 4 +++- dlls/msvcp90/locale.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index b217232..1bba834 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -8142,7 +8142,9 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - this->ptr = locale__Init(); + locale__Locimp_ctor(this->ptr); + + locale__Init(); _Locinfo_ctor_cat_cstr(&locinfo, cat, locname); if(!memcmp(MSVCP_basic_string_char_c_str(&locinfo.newlocname), "*", 2)) { diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7e6b10f..1d9eb33 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -8293,7 +8293,9 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - this->ptr = locale__Init(); + locale__Locimp_ctor(this->ptr); + + locale__Init(); _Locinfo_ctor_cat_cstr(&locinfo, cat, locname); if(!memcmp(MSVCP_basic_string_char_c_str(&locinfo.newlocname), "*", 2)) {

1 0

Alexandre Julliard : user32: Add support for managing a DIB surface for a window.
by Alexandre Julliard Sept. 6, 2012

Sept. 6, 2012

Module: wine Branch: master Commit: a5ef549c6e4266d9a7e129b42ff49b109c6cadb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ef549c6e4266d9a7e129b42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:32:52 2012 +0200 user32: Add support for managing a DIB surface for a window. --- dlls/user32/driver.c | 14 +++++---- dlls/user32/painting.c | 58 +++++++++++++++++++++++++++++++++++- dlls/user32/user_private.h | 10 +++++- dlls/user32/win.c | 9 ++++++ dlls/user32/win.h | 2 + dlls/user32/winpos.c | 38 ++++++++++++++++++++---- dlls/winex11.drv/window.c | 6 ++- dlls/winex11.drv/winex11.drv.spec | 4 +- 8 files changed, 121 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5ef549c6e4266d9a7e12…

1 0

Jacek Caban : vbscript: Added IActiveScriptParseProcedure2:: ParseProcedureText implementation.
by Alexandre Julliard Sept. 6, 2012

Sept. 6, 2012

Module: wine Branch: master Commit: cf0faf1d3cac6b1eeb49bd270187de4ce8594164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0faf1d3cac6b1eeb49bd270… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 11:57:33 2012 +0200 vbscript: Added IActiveScriptParseProcedure2::ParseProcedureText implementation. --- dlls/vbscript/vbdisp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.c | 15 ++++++++++++- dlls/vbscript/vbscript.h | 3 ++ 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 022ac1d..f6e3f11 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -501,6 +501,8 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) vbdisp->ref = 1; vbdisp->desc = desc; + list_add_tail(&desc->ctx->objects, &vbdisp->entry); + if(desc->class_initialize_id) { DISPPARAMS dp = {0}; HRESULT hres; @@ -513,11 +515,56 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) } } - list_add_tail(&desc->ctx->objects, &vbdisp->entry); *ret = vbdisp; return S_OK; } +static HRESULT Procedure_invoke(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + script_ctx_t *ctx = This->desc->ctx; + HRESULT hres; + + TRACE("\n"); + + IActiveScriptSite_OnEnterScript(ctx->site); + hres = exec_script(ctx, This->desc->value_func, NULL, NULL, NULL); + IActiveScriptSite_OnLeaveScript(ctx->site); + + return hres; +} + +static const builtin_prop_t procedure_props[] = { + {DISPID_VALUE, Procedure_invoke, 0} +}; + +HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **ret) +{ + class_desc_t *desc; + vbdisp_t *vbdisp; + HRESULT hres; + + desc = heap_alloc_zero(sizeof(*desc)); + if(!desc) + return E_OUTOFMEMORY; + + desc->ctx = ctx; + desc->builtin_prop_cnt = sizeof(procedure_props)/sizeof(*procedure_props); + desc->builtin_props = procedure_props; + desc->value_func = &code->main_code; + + hres = create_vbdisp(desc, &vbdisp); + if(FAILED(hres)) { + heap_free(desc); + return hres; + } + + desc->next = ctx->procs; + ctx->procs = desc; + + *ret = (IDispatch*)&vbdisp->IDispatchEx_iface; + return S_OK; +} + void collect_objects(script_ctx_t *ctx) { vbdisp_t *iter, *iter2; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f250df3..f842bba 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -650,10 +650,21 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { VBScript *This = impl_from_IActiveScriptParseProcedure2(iface); - FIXME("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), + vbscode_t *code; + HRESULT hres; + + TRACE("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLineNumber, dwFlags, ppdisp); - return E_NOTIMPL; + + if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + hres = compile_script(This->ctx, pstrCode, &code); + if(FAILED(hres)) + return hres; + + return create_procedure_disp(This->ctx, code, ppdisp); } static const IActiveScriptParseProcedure2Vtbl VBScriptParseProcedureVtbl = { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 788d98d..8a316ab 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -100,6 +100,7 @@ typedef struct _class_desc_t { unsigned builtin_prop_cnt; const builtin_prop_t *builtin_props; ITypeInfo *typeinfo; + function_t *value_func; struct _class_desc_t *next; } class_desc_t; @@ -121,6 +122,7 @@ HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN; static inline unsigned arg_cnt(const DISPPARAMS *dp) { @@ -160,6 +162,7 @@ struct _script_ctx_t { dynamic_var_t *global_vars; function_t *global_funcs; class_desc_t *classes; + class_desc_t *procs; vbsheap_t heap;

1 0

Michael Stefaniuc : dsound: Inline some of the IDirectSound helpers.
by Alexandre Julliard Sept. 6, 2012

Sept. 6, 2012

Module: wine Branch: master Commit: 1440b25267b97a8e774d294b4036aff3b4c94b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1440b25267b97a8e774d294b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 5 23:19:12 2012 +0200 dsound: Inline some of the IDirectSound helpers. --- dlls/dsound/dsound.c | 274 +++++++++++++++++------------------------- dlls/dsound/dsound_private.h | 14 -- 2 files changed, 113 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1440b25267b97a8e774d2…

1 0

Rico Schüller : d3dx9: Move bool cropping into helper function.
by Alexandre Julliard Sept. 6, 2012

Sept. 6, 2012

Module: wine Branch: master Commit: 823d1fbc3887ab4b52b88555a8ef954f617b6194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823d1fbc3887ab4b52b88555a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 5 22:51:42 2012 +0200 d3dx9: Move bool cropping into helper function. --- dlls/d3dx9_36/effect.c | 5 ++--- dlls/d3dx9_36/util.c | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f3a5549..a6dcd98 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1649,8 +1649,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHA if (param && !param->element_count && param->rows == 1 && param->columns == 1) { - /* crop input */ - b = b != 0; set_number(param->data, param->type, &b, D3DXPT_BOOL); return D3D_OK; } @@ -1699,7 +1697,8 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBoolArray(ID3DXBaseEffect *iface, D case D3DXPC_MATRIX_ROWS: for (i = 0; i < size; ++i) { - set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_BOOL); + /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ + set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); } return D3D_OK; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 6daddd7..c5160fa 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -271,6 +271,11 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) #undef WINE_D3DX_TO_STR /* parameter type conversion helpers */ +BOOL get_bool(LPCVOID data) +{ + return (*(DWORD *)data) != 0; +} + INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) { INT i; @@ -286,7 +291,7 @@ INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) break; case D3DXPT_BOOL: - i = *(BOOL *)data; + i = get_bool(data); break; default: @@ -313,7 +318,7 @@ FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) break; case D3DXPT_BOOL: - f = *(BOOL *)data; + f = get_bool(data); break; default: @@ -325,15 +330,16 @@ FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) return f; } -BOOL get_bool(LPCVOID data) -{ - return (*(DWORD *)data) != 0; -} - void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) { TRACE("Changing from type %s to type %s\n", debug_d3dxparameter_type(intype), debug_d3dxparameter_type(outtype)); + if (outtype == intype) + { + *(DWORD *)outdata = *(DWORD *)indata; + return; + } + switch (outtype) { case D3DXPT_FLOAT:

1 0

Alexandre Julliard : winex11: Use window surfaces for rendering top-level windows.
by Alexandre Julliard Sept. 6, 2012

Sept. 6, 2012

Module: wine Branch: master Commit: 33ac850c80634c891b0c157bbffa612f70954a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ac850c80634c891b0c157bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:39:34 2012 +0200 winex11: Use window surfaces for rendering top-level windows. It can be disabled by setting "ClientSideGraphics"="n". --- dlls/winex11.drv/bitblt.c | 192 ++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 49 ++++++++++ dlls/winex11.drv/x11drv.h | 3 + dlls/winex11.drv/x11drv_main.c | 4 + 4 files changed, 248 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33ac850c80634c891b0c1…

1 0

Alexandre Julliard : user32: Maintain a list of active window surfaces and flush them periodically.
by Alexandre Julliard Sept. 6, 2012

Sept. 6, 2012

Module: wine Branch: master Commit: 7304445a7efa9f30e4541b075a2022319f291e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7304445a7efa9f30e4541b075… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:38:13 2012 +0200 user32: Maintain a list of active window surfaces and flush them periodically. --- dlls/user32/painting.c | 16 ++---------- dlls/user32/win.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/win.h | 2 + dlls/user32/winpos.c | 1 + dlls/user32/winproc.c | 5 +++- 5 files changed, 70 insertions(+), 16 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 3869b48..4def070 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -801,23 +801,11 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, * update_now * * Implementation of RDW_UPDATENOW behavior. - * - * FIXME: Windows uses WM_SYNCPAINT to cut down the number of intertask - * SendMessage() calls. This is a comment inside DefWindowProc() source - * from 16-bit SDK: - * - * This message avoids lots of inter-app message traffic - * by switching to the other task and continuing the - * recursion there. - * - * wParam = flags - * LOWORD(lParam) = hrgnClip - * HIWORD(lParam) = hwndSkip (not used; always NULL) - * */ static void update_now( HWND hwnd, UINT rdw_flags ) { HWND child = 0; + int count = 0; /* desktop window never gets WM_PAINT, only WM_ERASEBKGND */ if (hwnd == GetDesktopWindow()) erase_now( hwnd, rdw_flags | RDW_NOCHILDREN ); @@ -834,8 +822,10 @@ static void update_now( HWND hwnd, UINT rdw_flags ) if (!flags) break; /* nothing more to do */ SendMessageW( child, WM_PAINT, 0, 0 ); + count++; if (rdw_flags & RDW_NOCHILDREN) break; } + if (count) flush_window_surfaces( FALSE ); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c03ff42..2a0848e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -44,6 +44,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); static DWORD process_layout = ~0u; +static struct list window_surfaces = LIST_INIT( window_surfaces ); + +static CRITICAL_SECTION surfaces_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &surfaces_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": surfaces_section") } +}; +static CRITICAL_SECTION surfaces_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + /**********************************************************************/ /* helper for Get/SetWindowLong */ @@ -475,6 +486,45 @@ BOOL is_desktop_window( HWND hwnd ) } +/******************************************************************* + * register_window_surface + * + * Register a window surface in the global list, possibly replacing another one. + */ +void register_window_surface( struct window_surface *old, struct window_surface *new ) +{ + if (old == new) return; + EnterCriticalSection( &surfaces_section ); + if (old) list_remove( &old->entry ); + if (new) list_add_tail( &window_surfaces, &new->entry ); + LeaveCriticalSection( &surfaces_section ); +} + + +/******************************************************************* + * flush_window_surfaces + * + * Flush pending output from all window surfaces. + */ +void flush_window_surfaces( BOOL idle ) +{ + static DWORD last_idle; + DWORD now; + struct window_surface *surface; + + EnterCriticalSection( &surfaces_section ); + now = GetTickCount(); + if (idle) last_idle = now; + /* if not idle, we only flush if there's evidence that the app never goes idle */ + else if ((int)(now - last_idle) < 1000) goto done; + + LIST_FOR_EACH_ENTRY( surface, &window_surfaces, struct window_surface, entry ) + surface->funcs->flush( surface ); +done: + LeaveCriticalSection( &surfaces_section ); +} + + /*********************************************************************** * WIN_GetPtr * @@ -863,7 +913,11 @@ LRESULT WIN_DestroyWindow( HWND hwnd ) if (icon_title) DestroyWindow( icon_title ); if (menu) DestroyMenu( menu ); if (sys_menu) DestroyMenu( sys_menu ); - if (surface) window_surface_release( surface ); + if (surface) + { + register_window_surface( surface, NULL ); + window_surface_release( surface ); + } USER_Driver->pDestroyWindow( hwnd ); @@ -917,7 +971,11 @@ static void destroy_thread_window( HWND hwnd ) HeapFree( GetProcessHeap(), 0, wndPtr ); if (menu) DestroyMenu( menu ); if (sys_menu) DestroyMenu( sys_menu ); - if (surface) window_surface_release( surface ); + if (surface) + { + register_window_surface( surface, NULL ); + window_surface_release( surface ); + } } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 81e81b2..4bbe7ae 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -80,6 +80,8 @@ typedef struct tagWND /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern void register_window_surface( struct window_surface *old, struct window_surface *new ) DECLSPEC_HIDDEN; +extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 60a539b..fa74567 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2020,6 +2020,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { TRACE( "win %p surface %p -> %p\n", hwnd, old_surface, new_surface ); + register_window_surface( old_surface, new_surface ); if (old_surface) { if (!IsRectEmpty( valid_rects )) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index b06e93d..de7de6f 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1123,7 +1123,10 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { - DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); + DWORD ret; + + flush_window_surfaces( TRUE ); + ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); return ret; }

1 0