October 2012 - Wine-Commits

Andrew Eikum : dsound: Don't exit early in mixer thread.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 8ba4090fc3049930acd296b3b90529d7004830c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba4090fc3049930acd296b3b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 10 10:17:10 2012 -0500 dsound: Don't exit early in mixer thread. --- dlls/dsound/mixer.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index fed9165..264d64d 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -684,12 +684,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) to_mix_frags = device->prebuf - (pad * device->pwfx->nBlockAlign + device->fraglen - 1) / device->fraglen; - if(to_mix_frags == 0){ - /* nothing to do! */ - LeaveCriticalSection(&device->mixlock); - return; - } - to_mix_bytes = to_mix_frags * device->fraglen; if(device->in_mmdev_bytes > 0){

1 0

Nikolay Sivov : dwrite: Added IDWriteTextFormat stub implementation.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 9a32882c4da3e44164f73eaf187aba72cb700bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a32882c4da3e44164f73eaf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 10 14:58:20 2012 -0400 dwrite: Added IDWriteTextFormat stub implementation. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/layout.c | 275 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 4 +- 3 files changed, 278 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a32882c4da3e44164f73…

1 0

Jacek Caban : mshtml: Added noscript tag handling tests.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: c7f155f333147b474613083ea75b3b86691fd297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f155f333147b474613083ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 10 11:19:22 2012 +0200 mshtml: Added noscript tag handling tests. --- dlls/mshtml/tests/dom.c | 48 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 08ea83e7..f7bba1d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -80,6 +80,9 @@ static const char frameset_str[] = static const char emptydiv_str[] = "<html><head><title>emptydiv test</title></head>" "<body><div id=\"divid\"></div></body></html>"; +static const char noscript_str[] = + "<html><head><title>noscript test</title><noscript><style>.body { margin-right: 0px; }</style></noscript></head>" + "<body><noscript><div>test</div></noscript></body></html>"; static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0}; static WCHAR texteditW[] = {'t','e','x','t','e','d','i','t',0}; @@ -115,7 +118,8 @@ typedef enum { ET_OBJECT, ET_EMBED, ET_DIV, - ET_META + ET_META, + ET_NOSCRIPT } elem_type_t; static const IID * const none_iids[] = { @@ -427,7 +431,8 @@ static const elem_type_info_t elem_type_infos[] = { {"OBJECT", object_iids, &DIID_DispHTMLObjectElement}, {"EMBED", embed_iids, &DIID_DispHTMLEmbed}, {"DIV", elem_iids, NULL}, - {"META", meta_iids, &DIID_DispHTMLMetaElement} + {"META", meta_iids, &DIID_DispHTMLMetaElement}, + {"NOSCRIPT", elem_iids, NULL /*&DIID_DispHTMLNoShowElement*/} }; static const char *dbgstr_guid(REFIID riid) @@ -2011,8 +2016,11 @@ static void _test_elem_innertext(unsigned line, IHTMLElement *elem, const char * hres = IHTMLElement_get_innerText(elem, &text); ok_(__FILE__,line) (hres == S_OK, "get_innerText failed: %08x\n", hres); - ok_(__FILE__,line) (!strcmp_wa(text, extext), "get_innerText returned %s expected %s\n", - wine_dbgstr_w(text), extext); + if(extext) + ok_(__FILE__,line) (!strcmp_wa(text, extext), "get_innerText returned %s expected %s\n", + wine_dbgstr_w(text), extext); + else + ok_(__FILE__,line) (!text, "get_innerText returned %s expected NULL\n", wine_dbgstr_w(text)); SysFreeString(text); } @@ -6042,6 +6050,37 @@ static void test_replacechild_elems(IHTMLDocument2 *doc) IHTMLElement_Release(body); } +static void test_noscript(IHTMLDocument2 *doc) +{ + IHTMLElementCollection *col; + IHTMLElement *body; + HRESULT hres; + + static const elem_type_t all_types[] = { + ET_HTML, + ET_HEAD, + ET_TITLE, + ET_NOSCRIPT, + ET_BODY, + ET_NOSCRIPT + }; + + static const elem_type_t body_all_types[] = { + ET_DIV, + ET_NOSCRIPT + }; + + hres = IHTMLDocument2_get_all(doc, &col); + ok(hres == S_OK, "get_all failed: %08x\n", hres); + test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); + IHTMLElementCollection_Release(col); + + body = doc_get_body(doc); + test_elem_set_innerhtml((IUnknown*)body, "<div>test</div><noscript><a href=\"about:blank\">A</a></noscript>"); + test_elem_all((IUnknown*)body, body_all_types, sizeof(body_all_types)/sizeof(*body_all_types)); + IHTMLElement_Release(body); +} + static void test_null_write(IHTMLDocument2 *doc) { HRESULT hres; @@ -6536,6 +6575,7 @@ START_TEST(dom) run_domtest(frameset_str, test_frameset); run_domtest(emptydiv_str, test_docfrag); run_domtest(doc_blank, test_replacechild_elems); + run_domtest(noscript_str, test_noscript); CoUninitialize(); }

1 0

Hans Leidekker : wbemprox: Handle NULL operands in eval_strcmp.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 68f0e174d6de3b313a7cf4f22e72a40a40ec05fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f0e174d6de3b313a7cf4f22… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 12:00:58 2012 +0200 wbemprox: Handle NULL operands in eval_strcmp. --- dlls/wbemprox/query.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 3525be9..223a373 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -72,6 +72,11 @@ static BOOL eval_like( const WCHAR *lstr, const WCHAR *rstr ) static HRESULT eval_strcmp( UINT op, const WCHAR *lstr, const WCHAR *rstr, LONGLONG *val ) { + if (!lstr || !rstr) + { + *val = 0; + return S_OK; + } switch (op) { case OP_EQ:

1 0

Alexandre Julliard : winex11: Create a surface even for OpenGL windows, to allow painting the non-client area.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 47983d819fddb566883e8d45c631a714f7ab8922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47983d819fddb566883e8d45c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 12:46:37 2012 +0200 winex11: Create a surface even for OpenGL windows, to allow painting the non-client area. --- dlls/winex11.drv/opengl.c | 14 -------------- dlls/winex11.drv/window.c | 1 - dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b19f334..ac6f953 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1114,15 +1114,6 @@ static void release_gl_drawable( struct gl_drawable *gl ) if (gl) LeaveCriticalSection( &context_section ); } -BOOL has_gl_drawable( HWND hwnd ) -{ - struct gl_drawable *gl; - - gl = get_gl_drawable( hwnd, 0 ); - release_gl_drawable( gl ); - return gl != NULL; -} - static GLXContext create_glxcontext(Display *display, struct wgl_context *context, GLXContext shareList) { GLXContext ctx; @@ -3081,11 +3072,6 @@ struct opengl_funcs *get_glx_driver( UINT version ) return NULL; } -BOOL has_gl_drawable( HWND hwnd ) -{ - return FALSE; -} - void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 386db2c..b0fc9a0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2060,7 +2060,6 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (data->embedded) goto done; if (data->whole_window == root_window) goto done; - if (has_gl_drawable( hwnd )) goto done; if (!client_side_graphics && !layered) goto done; surface_rect = get_surface_rect( visible_rect ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8e114a2..2f34098 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -567,7 +567,6 @@ extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; -extern BOOL has_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_IADD in the GLSL shader backend.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 6e4ecdf854059108b789c4dde69c1df816a7589d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ecdf854059108b789c4dde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:49 2012 +0200 wined3d: Implement WINED3DSIH_IADD in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 708c6d8..ed5db06 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2198,6 +2198,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_ADD: op = '+'; break; case WINED3DSIH_AND: op = '&'; break; case WINED3DSIH_DIV: op = '/'; break; + case WINED3DSIH_IADD: op = '+'; break; case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; default: @@ -5173,7 +5174,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_GE */ NULL, - /* WINED3DSIH_IADD */ NULL, + /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc,

1 0

Christian Costa : quartz: Use target rect if set otherwise default to source rect in VideoRenderer_AutoShowWindow .
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 266e79d05f054904162dea62a3a2656b8917c13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=266e79d05f054904162dea62a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 9 23:55:44 2012 +0200 quartz: Use target rect if set otherwise default to source rect in VideoRenderer_AutoShowWindow. --- dlls/quartz/videorenderer.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 5e78c55..50a01fc 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -150,7 +150,8 @@ static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) return TRUE; } -static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) { +static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) +{ if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) { DWORD style = GetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE); @@ -158,13 +159,29 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) { if (!This->WindowPos.right) { - This->WindowPos.left = This->SourceRect.left; - This->WindowPos.right = This->SourceRect.right; + if (This->DestRect.right) + { + This->WindowPos.left = This->DestRect.left; + This->WindowPos.right = This->DestRect.right; + } + else + { + This->WindowPos.left = This->SourceRect.left; + This->WindowPos.right = This->SourceRect.right; + } } if (!This->WindowPos.bottom) { - This->WindowPos.top = This->SourceRect.top; - This->WindowPos.bottom = This->SourceRect.bottom; + if (This->DestRect.bottom) + { + This->WindowPos.top = This->DestRect.top; + This->WindowPos.bottom = This->DestRect.bottom; + } + else + { + This->WindowPos.top = This->SourceRect.top; + This->WindowPos.bottom = This->SourceRect.bottom; + } } AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); @@ -740,7 +757,7 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) { VideoRendererImpl *This = impl_from_IBaseFilter(iface); - + TRACE("(%p/%p)->()\n", This, iface); EnterCriticalSection(&This->renderer.csRenderLock); @@ -781,9 +798,8 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = }; /*** IUnknown methods ***/ -static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, - REFIID riid, - LPVOID*ppvObj) { +static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID *ppvObj) +{ VideoRendererImpl *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); @@ -852,9 +868,8 @@ static const IBasicVideoVtbl IBasicVideo_VTable = /*** IUnknown methods ***/ -static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, - REFIID riid, - LPVOID*ppvObj) { +static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID *ppvObj) +{ VideoRendererImpl *This = impl_from_IVideoWindow(iface); TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj);

1 0

Christian Costa : quartz: Don' t say we have a menu to AdjustWindowRectEx since the created window doesn' t have one.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: c82d96fded3fabeee7a13fd60599a4a1bba49d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82d96fded3fabeee7a13fd60… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 9 23:55:53 2012 +0200 quartz: Don't say we have a menu to AdjustWindowRectEx since the created window doesn't have one. --- dlls/quartz/videorenderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 50a01fc..d6b87fa 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -184,7 +184,7 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) } } - AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); + AdjustWindowRectEx(&This->WindowPos, style, FALSE, style_ex); TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL,

1 0

Alexandre Julliard : user32: Don' t use the window surface when the pixel format was set.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 77b9ec8cd6079bb4602f002a4a25003b551ab46b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b9ec8cd6079bb4602f002a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 12:46:14 2012 +0200 user32: Don't use the window surface when the pixel format was set. --- dlls/user32/painting.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 2a634fb..7d106bb 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -165,7 +165,8 @@ static void update_visible_region( struct dce *dce ) if ((win = WIN_GetPtr( top_win )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS) { - surface = win->surface; + /* don't use a surface to paint the client area of OpenGL windows */ + if (!win->pixel_format || (flags & DCX_WINDOW)) surface = win->surface; if (surface) window_surface_add_ref( surface ); WIN_ReleasePtr( win ); }

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_BREAKP in the GLSL shader backend.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 2b46c4046ac1aab30075e9470e255c55c93847c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b46c4046ac1aab30075e9470… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:47 2012 +0200 wined3d: Implement WINED3DSIH_BREAKP in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e2d2bb9..66c1e9d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3120,6 +3120,14 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) src0_param.param_str, shader_glsl_get_rel_op(ins->flags), src1_param.param_str); } +static void shader_glsl_breakp(const struct wined3d_shader_instruction *ins) +{ + struct glsl_src_param src_param; + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); + shader_addline(ins->ctx->buffer, "if (bool(%s)) break;\n", src_param.param_str); +} + static void shader_glsl_label(const struct wined3d_shader_instruction *ins) { shader_addline(ins->ctx->buffer, "}\n"); @@ -5131,7 +5139,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, - /* WINED3DSIH_BREAKP */ NULL, + /* WINED3DSIH_BREAKP */ shader_glsl_breakp, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, /* WINED3DSIH_CMP */ shader_glsl_cmp,

1 0