October 2012 - Wine-commits

Matteo Bruni : d3dcompiler/tests: Fix access to the test output for y > 0.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 71da1bac5d78d9d07ea6da1ea6379caa1d89a856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71da1bac5d78d9d07ea6da1ea… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:59 2012 +0200 d3dcompiler/tests: Fix access to the test output for y > 0. --- dlls/d3dcompiler_43/tests/hlsl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index a528e80..1bc3641 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -269,7 +269,7 @@ static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShade /* Now go through the probes and check each one */ for (i = 0; i < count; i++, probes++) { - int index = probes->x + (probes->y * lr.Pitch); + int index = probes->x + (probes->y * lr.Pitch / sizeof(D3DXCOLOR)); ok(colors_match(probes->c, pbits_data[index], probes->epsilon), "Line %d: At (%d, %d): %s: Expected (%.04f,%.04f,%.04f, %.04f), got " "(%.04f,%.04f,%.04f,%.04f)\n", line_number, probes->x, probes->y, probes->message,

1 0

Matteo Bruni : d3dcompiler: Don' t raise a warning for an uninitialized uniform.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 1f876a670e60464b4a39de2382c533782179172f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f876a670e60464b4a39de238… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:26:00 2012 +0200 d3dcompiler: Don't raise a warning for an uninitialized uniform. --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index afb12ec..a7d4c68 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -605,7 +605,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, local = FALSE; } - if (var->modifiers & HLSL_MODIFIER_CONST && !v->initializer) + if (var->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer) { hlsl_report_message(v->loc.file, v->loc.line, v->loc.col, HLSL_LEVEL_ERROR, "const variable without initializer");

1 0

Alexandre Julliard : winex11: Recreate the GL drawable when changing the window parent.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: c6e0daa200587dda0710ee0dc7135097a4bdce7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e0daa200587dda0710ee0dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 10:46:16 2012 +0200 winex11: Recreate the GL drawable when changing the window parent. --- dlls/winex11.drv/opengl.c | 101 +++++++++++++++++++++++++++++++++++++-------- dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 86 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ac6f953..5151e20 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1162,26 +1162,13 @@ static void free_gl_drawable( struct gl_drawable *gl ) /*********************************************************************** - * set_win_format + * create_gl_drawable */ -static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) +static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) { - HWND parent = GetAncestor( hwnd, GA_PARENT ); XSetWindowAttributes attrib; - struct gl_drawable *gl, *prev; - gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); - gl->format = format; - gl->visual = pglXGetVisualFromFBConfig( gdi_display, format->fbconfig ); - if (!gl->visual) - { - HeapFree( GetProcessHeap(), 0, gl ); - return FALSE; - } - - GetClientRect( hwnd, &gl->rect ); - gl->rect.right = min( max( 1, gl->rect.right ), 65535 ); - gl->rect.bottom = min( max( 1, gl->rect.bottom ), 65535 ); + gl->drawable = 0; if (parent == GetDesktopWindow()) /* top-level window */ { @@ -1261,7 +1248,32 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) } } - if (!gl->drawable) + return gl->drawable != 0; +} + + +/*********************************************************************** + * set_win_format + */ +static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) +{ + HWND parent = GetAncestor( hwnd, GA_PARENT ); + struct gl_drawable *gl, *prev; + + gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); + gl->format = format; + gl->visual = pglXGetVisualFromFBConfig( gdi_display, format->fbconfig ); + if (!gl->visual) + { + HeapFree( GetProcessHeap(), 0, gl ); + return FALSE; + } + + GetClientRect( hwnd, &gl->rect ); + gl->rect.right = min( max( 1, gl->rect.right ), 65535 ); + gl->rect.bottom = min( max( 1, gl->rect.bottom ), 65535 ); + + if (!create_gl_drawable( hwnd, parent, gl )) { XFree( gl->visual ); HeapFree( GetProcessHeap(), 0, gl ); @@ -1343,6 +1355,57 @@ done: release_gl_drawable( gl ); } + +/*********************************************************************** + * set_gl_drawable_parent + */ +void set_gl_drawable_parent( HWND hwnd, HWND parent ) +{ + struct gl_drawable *gl; + Drawable old_drawable; + + if (!(gl = get_gl_drawable( hwnd, 0 ))) return; + + TRACE( "setting drawable %lx parent %p\n", gl->drawable, parent ); + + old_drawable = gl->drawable; + switch (gl->type) + { + case DC_GL_WINDOW: + XDestroyWindow( gdi_display, gl->drawable ); + XFreeColormap( gdi_display, gl->colormap ); + break; + case DC_GL_CHILD_WIN: + if (parent != GetDesktopWindow()) goto done; + XDestroyWindow( gdi_display, gl->drawable ); + XFreeColormap( gdi_display, gl->colormap ); + break; + case DC_GL_PIXMAP_WIN: + if (parent != GetDesktopWindow()) goto done; + pglXDestroyGLXPixmap( gdi_display, gl->drawable ); + XFreePixmap( gdi_display, gl->pixmap ); + break; + default: + goto done; + } + + if (!create_gl_drawable( hwnd, parent, gl )) + { + XDeleteContext( gdi_display, (XID)hwnd, gl_hwnd_context ); + release_gl_drawable( gl ); + XFree( gl->visual ); + HeapFree( GetProcessHeap(), 0, gl ); + __wine_set_pixel_format( hwnd, 0 ); + return; + } + mark_drawable_dirty( old_drawable, gl->drawable ); + +done: + release_gl_drawable( gl ); + +} + + /*********************************************************************** * destroy_gl_drawable */ @@ -3076,6 +3139,10 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r { } +void set_gl_drawable_parent( HWND hwnd, HWND parent ) +{ +} + void destroy_gl_drawable( HWND hwnd ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b0fc9a0..f5f7af5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2002,6 +2002,7 @@ void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) } done: release_win_data( data ); + set_gl_drawable_parent( hwnd, parent ); fetch_icon_data( hwnd, 0, 0 ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2f34098..f4ccdd2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -568,6 +568,7 @@ extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) DECLSPEC_HIDDEN; +extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void wait_for_withdrawn_state( HWND hwnd, BOOL set ) DECLSPEC_HIDDEN;

1 0

Daniel Lehman : msvcp: Flip fclose result check in filebuf<>::close.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: c152c54084ac3c1a096563de9f7227f9a0be8f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c152c54084ac3c1a096563de9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Oct 8 12:14:24 2012 -0700 msvcp: Flip fclose result check in filebuf<>::close. --- dlls/msvcp100/ios.c | 4 ++-- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp71/ios.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 6b1fcc8..8122ad1 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -1993,7 +1993,7 @@ static basic_filebuf_char* basic_filebuf_char_close(basic_filebuf_char *this) /* TODO: handle exceptions */ if(!basic_filebuf_char__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_char__Init(this, NULL, INITFL_close); @@ -2482,7 +2482,7 @@ static basic_filebuf_wchar* basic_filebuf_wchar_close(basic_filebuf_wchar *this) /* TODO: handle exceptions */ if(!basic_filebuf_wchar__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_wchar__Init(this, NULL, INITFL_close); diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 2b06716..43bd10b 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2331,7 +2331,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_close(basic_filebuf_char *this /* TODO: handle exceptions */ if(!basic_filebuf_char__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_char__Init(this, NULL, INITFL_close); @@ -2901,7 +2901,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_close(basic_filebuf_wchar *t /* TODO: handle exceptions */ if(!basic_filebuf_wchar__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_wchar__Init(this, NULL, INITFL_close); diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index d2a1eb6..32e3941 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -2414,7 +2414,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_close(basic_filebuf_char *this /* TODO: handle exceptions */ if(!basic_filebuf_char__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_char__Init(this, NULL, INITFL_close); @@ -2974,7 +2974,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_close(basic_filebuf_wchar *t /* TODO: handle exceptions */ if(!basic_filebuf_wchar__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_wchar__Init(this, NULL, INITFL_close);

1 0

Daniel Lehman : msvcp90: Initialize state in mb_to_wc.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 650ccf598e5e6b5d01be22484d8ce184aa0a95de URL: http://source.winehq.org/git/wine.git/?a=commit;h=650ccf598e5e6b5d01be22484… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 2 00:04:22 2012 -0700 msvcp90: Initialize state in mb_to_wc. --- dlls/msvcp90/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 010284e..501443c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4397,7 +4397,7 @@ num_get* num_get_short_use_facet(const locale *loc) static inline wchar_t mb_to_wc(char ch, const _Cvtvec *cvt) { - int state; + int state = 0; wchar_t ret; return _Mbrtowc(&ret, &ch, 1, &state, cvt) == 1 ? ret : 0;

1 0

Daniel Lehman : msvcp90: Copy facetvec element pointer in copy ctor.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 4f5f2e8e1b29ee43dfe899fdb7530dd993f8a1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5f2e8e1b29ee43dfe899fdb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 3 16:49:37 2012 -0700 msvcp90: Copy facetvec element pointer in copy ctor. --- dlls/msvcp90/locale.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 501443c..9a79933 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7798,8 +7798,11 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const return NULL; } for(i=0; i<this->facet_cnt; i++) + { + this->facetvec[i] = copy->facetvec[i]; if(this->facetvec[i]) locale_facet__Incref(this->facetvec[i]); + } } MSVCP_basic_string_char_copy_ctor(&this->name, &copy->name); _Lockit_dtor(&lock);

1 0

Jacek Caban : mshtml: Added noscript tag handling tests.
by Alexandre Julliard 10 Oct '12

10 Oct '12

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

Jacek Caban : mshtml: Get rid of no longer needed workarounds for async ActiveX loading.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 3e27a4dfa7685be4be843488b712d5bb9a1c0fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e27a4dfa7685be4be843488b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 10 11:19:38 2012 +0200 mshtml: Get rid of no longer needed workarounds for async ActiveX loading. --- dlls/mshtml/tests/activex.c | 41 ++++++----------------------------------- 1 files changed, 6 insertions(+), 35 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 0bb2837..9243282 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -2297,7 +2297,7 @@ static IHTMLDocument2 *create_document(void) return doc; } -static IHTMLDocument2 *create_doc(const char *str, BOOL *b) +static IHTMLDocument2 *create_doc(const char *str) { IHTMLDocument2 *doc; MSG msg; @@ -2307,7 +2307,7 @@ static IHTMLDocument2 *create_doc(const char *str, BOOL *b) doc_load_string(doc, str); do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); - while((!doc_complete || (b && !*b)) && GetMessage(&msg, NULL, 0, 0)) { + while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } @@ -2375,11 +2375,6 @@ static void test_flash_ax(void) init_test(TEST_FLASH); - /* - * We pump messages until both document is loaded and plugin instance is created. - * Pumping until document is loaded should be enough, but Gecko loads plugins - * asynchronously and until we'll work around it, we need this hack. - */ SET_EXPECT(CreateInstance); SET_EXPECT(FreezeEvents_TRUE); SET_EXPECT(QuickActivate); @@ -2390,7 +2385,7 @@ static void test_flash_ax(void) SET_EXPECT(GetExtent); SET_EXPECT(DoVerb); - doc = create_doc(object_ax_str, &called_CreateInstance); + doc = create_doc(object_ax_str); CHECK_CALLED(CreateInstance); todo_wine @@ -2449,7 +2444,7 @@ static void test_noquickact_ax(void) SET_EXPECT(GetExtent); SET_EXPECT(DoVerb); - doc = create_doc(object_ax_str, &called_CreateInstance); + doc = create_doc(object_ax_str); CHECK_CALLED(CreateInstance); todo_wine CHECK_CALLED(FreezeEvents_TRUE); @@ -2482,11 +2477,6 @@ static void test_event_binding(void) init_test(TEST_FLASH); - /* - * We pump messages until both document is loaded and plugin instance is created. - * Pumping until document is loaded should be enough, but Gecko loads plugins - * asynchronously and until we'll work around it, we need this hack. - */ SET_EXPECT(CreateInstance); SET_EXPECT(FreezeEvents_TRUE); SET_EXPECT(QuickActivate); @@ -2502,7 +2492,7 @@ static void test_event_binding(void) SET_EXPECT(FindConnectionPoint); SET_EXPECT(Advise); - doc = create_doc(event_binding_str, &called_CreateInstance); + doc = create_doc(event_binding_str); CHECK_CALLED(CreateInstance); todo_wine @@ -2522,25 +2512,6 @@ static void test_event_binding(void) CHECK_CALLED(InPlaceObject_GetWindow); CHECK_CALLED(SetObjectRects); - /* FIXME: to be removed once we have support for synchronous plugin loading (planned for Wine Gecko 1.8) */ - if(!called_GetClassInfo) { - todo_wine ok(0, "GetClassInfo not called\n"); - - CLEAR_CALLED(GetClassInfo); - CLEAR_CALLED(OnAmbientPropertyChange_UNKNOWN); - CLEAR_CALLED(FindConnectionPoint); - CLEAR_CALLED(Advise); - - SET_EXPECT(InPlaceDeactivate); - SET_EXPECT(Close); - SET_EXPECT(SetClientSite_NULL); - release_doc(doc); - CHECK_CALLED(InPlaceDeactivate); - CHECK_CALLED(Close); - CHECK_CALLED(SetClientSite_NULL); - return; - } - CHECK_CALLED(GetClassInfo); todo_wine CHECK_CALLED(OnAmbientPropertyChange_UNKNOWN); @@ -2571,7 +2542,7 @@ static void test_nooleobj_ax(void) SET_EXPECT(CreateInstance); SET_EXPECT(Invoke_READYSTATE); - doc = create_doc(object_ax_str, &called_CreateInstance); + doc = create_doc(object_ax_str); CHECK_CALLED(CreateInstance); CHECK_CALLED(Invoke_READYSTATE);

1 0

Jacek Caban : mshtml: Added more ActiveX loading and script binding tests.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: e63b9f4ec029989a0df9e64439bf11b9cdbde5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63b9f4ec029989a0df9e6443… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 10 11:19:55 2012 +0200 mshtml: Added more ActiveX loading and script binding tests. --- dlls/mshtml/tests/activex.c | 47 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 9243282..ce9b711 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -79,6 +79,7 @@ DEFINE_EXPECT(Invoke_ENABLED); DEFINE_EXPECT(Invoke_VALID); DEFINE_EXPECT(Invoke_SECURITYCTX); DEFINE_EXPECT(Invoke_SCRIPTPROP); +DEFINE_EXPECT(Invoke_SCRIPTCALL); DEFINE_EXPECT(GetIDsOfNames_scriptprop); DEFINE_EXPECT(DoVerb); DEFINE_EXPECT(SetExtent); @@ -106,6 +107,7 @@ DEFINE_EXPECT(Advise); DEFINE_EXPECT(Unadvise); #define DISPID_SCRIPTPROP 1000 +#define DISPID_SCRIPTCALL 1001 enum { TEST_FLASH, @@ -132,6 +134,9 @@ static const char object_ax_str[] = "<param name=\"param_name\" value=\"param_value\">" "<param name=\"num_param\" value=\"3\">" "</object>" + "<script>" + "objid.scriptCall();" + "</script>" "</body></html>"; static const char event_binding_str[] = @@ -711,14 +716,20 @@ static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID l static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - CHECK_EXPECT(GetIDsOfNames_scriptprop); ok(IsEqualGUID(riid, &IID_NULL), "riid = %s\n", debugstr_guid(riid)); ok(cNames == 1, "cNames = %d\n", cNames); ok(rgszNames != NULL, "rgszNames == NULL\n"); - ok(!strcmp_wa(rgszNames[0], "scriptprop"), "rgszNames[0] = %s\n", wine_dbgstr_w(rgszNames[0])); ok(rgDispId != NULL, "rgDispId == NULL\n"); - *rgDispId = DISPID_SCRIPTPROP; + if(!strcmp_wa(rgszNames[0], "scriptprop")) { + CHECK_EXPECT(GetIDsOfNames_scriptprop); + *rgDispId = DISPID_SCRIPTPROP; + }else if(!strcmp_wa(rgszNames[0], "scriptCall")) { + *rgDispId = DISPID_SCRIPTCALL; + }else { + ok(0, "rgszNames[0] = %s\n", wine_dbgstr_w(rgszNames[0])); + } + return S_OK; } @@ -730,7 +741,6 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pDispParams != NULL, "pDispParams == NULL\n"); ok(!pDispParams->cNamedArgs, "pDispParams->cNamedArgs = %d\n", pDispParams->cNamedArgs); ok(!pDispParams->rgdispidNamedArgs, "pDispParams->rgdispidNamedArgs != NULL\n"); - ok(pVarResult != NULL, "pVarResult == NULL\n"); switch(dispIdMember) { case DISPID_READYSTATE: @@ -740,6 +750,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(!pDispParams->rgvarg, "pDispParams->rgvarg != NULL\n"); ok(!pExcepInfo, "pExcepInfo != NULL\n"); ok(puArgErr != NULL, "puArgErr == NULL\n"); + ok(pVarResult != NULL, "pVarResult == NULL\n"); V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = plugin_readystate; @@ -751,6 +762,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(!pDispParams->rgvarg, "pDispParams->rgvarg != NULL\n"); ok(!pExcepInfo, "pExcepInfo != NULL\n"); ok(puArgErr != NULL, "puArgErr == NULL\n"); + ok(pVarResult != NULL, "pVarResult == NULL\n"); return DISP_E_MEMBERNOTFOUND; case DISPID_VALID: CHECK_EXPECT(Invoke_VALID); @@ -759,6 +771,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(!pDispParams->rgvarg, "pDispParams->rgvarg != NULL\n"); ok(!pExcepInfo, "pExcepInfo != NULL\n"); ok(puArgErr != NULL, "puArgErr == NULL\n"); + ok(pVarResult != NULL, "pVarResult == NULL\n"); return DISP_E_MEMBERNOTFOUND; case DISPID_SECURITYCTX: CHECK_EXPECT(Invoke_SECURITYCTX); @@ -767,6 +780,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(!pDispParams->rgvarg, "pDispParams->rgvarg != NULL\n"); ok(!pExcepInfo, "pExcepInfo != NULL\n"); ok(puArgErr != NULL, "puArgErr == NULL\n"); + ok(pVarResult != NULL, "pVarResult == NULL\n"); return DISP_E_MEMBERNOTFOUND; case DISPID_SCRIPTPROP: CHECK_EXPECT(Invoke_SCRIPTPROP); @@ -775,10 +789,23 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(!pDispParams->rgvarg, "pDispParams->rgvarg != NULL\n"); ok(pExcepInfo != NULL, "pExcepInfo == NULL\n"); ok(!puArgErr, "puArgErr != NULL\n"); + ok(pVarResult != NULL, "pVarResult == NULL\n"); V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = 4; return S_OK; + case DISPID_SCRIPTCALL: + CHECK_EXPECT(Invoke_SCRIPTCALL); + ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); + ok(!pDispParams->cArgs, "pDispParams->cArgs = %d\n", pDispParams->cArgs); + ok(pExcepInfo != NULL, "pExcepInfo == NULL\n"); + ok(!puArgErr, "puArgErr != NULL\n"); + ok(!pVarResult, "pVarResult != NULL\n"); + /* + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = 4; + */ + return S_OK; default: ok(0, "unexpected call %d\n", dispIdMember); } @@ -2381,6 +2408,8 @@ static void test_flash_ax(void) SET_EXPECT(FreezeEvents_FALSE); SET_EXPECT(IPersistPropertyBag_Load); SET_EXPECT(Invoke_READYSTATE); + SET_EXPECT(Invoke_SECURITYCTX); + SET_EXPECT(Invoke_SCRIPTCALL); SET_EXPECT(SetExtent); SET_EXPECT(GetExtent); SET_EXPECT(DoVerb); @@ -2395,6 +2424,8 @@ static void test_flash_ax(void) CHECK_CALLED(FreezeEvents_FALSE); CHECK_CALLED(IPersistPropertyBag_Load); CHECK_CALLED(Invoke_READYSTATE); + CHECK_CALLED(Invoke_SECURITYCTX); + CHECK_CALLED(Invoke_SCRIPTCALL); todo_wine CHECK_CALLED(SetExtent); todo_wine @@ -2440,6 +2471,8 @@ static void test_noquickact_ax(void) SET_EXPECT(GetViewStatus); SET_EXPECT(FreezeEvents_FALSE); SET_EXPECT(Invoke_READYSTATE); + SET_EXPECT(Invoke_SECURITYCTX); + SET_EXPECT(Invoke_SCRIPTCALL); SET_EXPECT(SetExtent); SET_EXPECT(GetExtent); SET_EXPECT(DoVerb); @@ -2454,6 +2487,8 @@ static void test_noquickact_ax(void) CHECK_CALLED(GetViewStatus); todo_wine CHECK_CALLED(FreezeEvents_FALSE); CHECK_CALLED(Invoke_READYSTATE); + CHECK_CALLED(Invoke_SECURITYCTX); + CHECK_CALLED(Invoke_SCRIPTCALL); todo_wine CHECK_CALLED(SetExtent); todo_wine CHECK_CALLED(GetExtent); CHECK_CALLED(DoVerb); @@ -2541,11 +2576,15 @@ static void test_nooleobj_ax(void) SET_EXPECT(CreateInstance); SET_EXPECT(Invoke_READYSTATE); + SET_EXPECT(Invoke_SECURITYCTX); + SET_EXPECT(Invoke_SCRIPTCALL); doc = create_doc(object_ax_str); CHECK_CALLED(CreateInstance); CHECK_CALLED(Invoke_READYSTATE); + CHECK_CALLED(Invoke_SECURITYCTX); + CHECK_CALLED(Invoke_SCRIPTCALL); release_doc(doc); }

1 0

Hans Leidekker : wbemprox: Handle NULL operands in eval_strcmp.
by Alexandre Julliard 10 Oct '12

10 Oct '12

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