October 2012 - Wine-Commits

Matteo Bruni : d3d8: Use proper helper.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: f90f895759bf541ca1a245814beba67ed257cd33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90f895759bf541ca1a245814… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:57 2012 +0200 d3d8: Use proper helper. --- dlls/d3d8/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b16d5bf..8cd150f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -168,7 +168,7 @@ static void check_mipmap_levels(IDirect3DDevice8 *device, UINT width, UINT heigh } else trace("CreateTexture failed: %#08x\n", hr); - if (texture) IDirect3DDevice8_Release( texture ); + if (texture) IDirect3DBaseTexture8_Release( texture ); } static void test_mipmap_levels(void)

1 0

Matteo Bruni : wined3d: Recognize Radeon HD 6970 as reported on some Macs.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 3d71c2d1cae32543fa1415de9e30a47568fb62ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d71c2d1cae32543fa1415de9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:56 2012 +0200 wined3d: Recognize Radeon HD 6970 as reported on some Macs. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1120a9e..24ed040 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1708,6 +1708,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in {"HD 7800", CARD_AMD_RADEON_HD7800}, {"HD 7700", CARD_AMD_RADEON_HD7700}, /* Northern Islands */ + {"HD 6970", CARD_AMD_RADEON_HD6900}, {"HD 6900", CARD_AMD_RADEON_HD6900}, {"HD 6800", CARD_AMD_RADEON_HD6800}, {"HD 6770M",CARD_AMD_RADEON_HD6600M},

1 0

Jacek Caban : vbscript: Fixed tests on some non-English configs (without '. ' as decimal point).
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 2e1da7ec8b56227b1c377127069c41477443ed88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1da7ec8b56227b1c3771270… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 10 17:38:35 2012 +0200 vbscript: Fixed tests on some non-English configs (without '.' as decimal point). --- dlls/vbscript/tests/api.vbs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ff188ab..7ccbaa1 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -47,7 +47,7 @@ End Sub TestCStr "test", "test" TestCStr 3, "3" -TestCStr 3.5, "3.5" +if isEnglishLang then TestCStr 3.5, "3.5" if isEnglishLang then TestCStr true, "True" Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?")

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.AdapterType.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: b0045eccde3042ac9e443a47fef1540773bcb148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0045eccde3042ac9e443a47f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 12:01:22 2012 +0200 wbemprox: Implement Win32_NetworkAdapter.AdapterType. --- dlls/wbemprox/builtin.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9beb3e2..5be3b2c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -74,6 +74,8 @@ static const WCHAR class_stdregprovW[] = static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR prop_adaptertypeW[] = + {'A','d','a','p','t','e','r','T','y','p','e',0}; static const WCHAR prop_acceptpauseW[] = {'A','c','c','e','p','t','P','a','u','s','e',0}; static const WCHAR prop_acceptstopW[] = @@ -249,6 +251,7 @@ static const struct column col_logicaldisk[] = }; static const struct column col_networkadapter[] = { + { prop_adaptertypeW, CIM_STRING }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -422,6 +425,7 @@ struct record_logicaldisk }; struct record_networkadapter { + const WCHAR *adaptertype; const WCHAR *device_id; INT32 interface_index; const WCHAR *mac_address; @@ -711,6 +715,23 @@ static WCHAR *get_mac_address( const BYTE *addr, DWORD len ) sprintfW( ret, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); return ret; } +static const WCHAR *get_adaptertype( DWORD type ) +{ + static const WCHAR ethernetW[] = {'E','t','h','e','r','n','e','t',' ','8','0','2','.','3',0}; + static const WCHAR wirelessW[] = {'W','i','r','e','l','e','s','s',0}; + static const WCHAR firewireW[] = {'1','3','9','4',0}; + static const WCHAR tunnelW[] = {'T','u','n','n','e','l',0}; + + switch (type) + { + case IF_TYPE_ETHERNET_CSMACD: return ethernetW; + case IF_TYPE_IEEE80211: return wirelessW; + case IF_TYPE_IEEE1394: return firewireW; + case IF_TYPE_TUNNEL: return tunnelW; + default: break; + } + return NULL; +} static void fill_networkadapter( struct table *table ) { @@ -740,6 +761,7 @@ static void fill_networkadapter( struct table *table ) { rec = (struct record_networkadapter *)(table->data + offset); sprintfW( device_id, fmtW, aa->u.s.IfIndex ); + rec->adaptertype = get_adaptertype( aa->IfType ); rec->device_id = heap_strdupW( device_id ); rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength );

1 0

Hans Leidekker : wbemprox: Add support for uncommitted instances in IWbemClassObject::Get.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: b552ad3672aabedea9f58d52eb37c3f41c3838cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b552ad3672aabedea9f58d52e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 12:02:05 2012 +0200 wbemprox: Add support for uncommitted instances in IWbemClassObject::Get. --- dlls/wbemprox/class.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 5bbd6aa..8e1d664 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -323,6 +323,32 @@ static HRESULT WINAPI class_object_GetQualifierSet( return E_NOTIMPL; } +static HRESULT record_get_value( const struct record *record, UINT index, VARIANT *var, CIMTYPE *type ) +{ + if (type) *type = record->fields[index].type; + + switch (record->fields[index].type) + { + case CIM_STRING: + case CIM_DATETIME: + V_VT( var ) = VT_BSTR; + V_BSTR( var ) = SysAllocString( record->fields[index].u.sval ); + return S_OK; + case CIM_SINT32: + V_VT( var ) = VT_I4; + V_I4( var ) = record->fields[index].u.ival; + return S_OK; + case CIM_UINT32: + V_VT( var ) = VT_UI4; + V_UI4( var ) = record->fields[index].u.ival; + return S_OK; + default: + FIXME("unhandled type %u\n", record->fields[index].type); + break; + } + return WBEM_E_INVALID_PARAMETER; +} + static HRESULT WINAPI class_object_Get( IWbemClassObject *iface, LPCWSTR wszName, @@ -333,11 +359,22 @@ static HRESULT WINAPI class_object_Get( { struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - struct view *view = ec->query->view; TRACE("%p, %s, %08x, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor); - return get_propval( view, co->index, wszName, pVal, pType, plFlavor ); + if (co->record) + { + struct table *table = grab_table( co->name ); + UINT index; + HRESULT hr; + + if (!table) return WBEM_E_FAILED; + hr = get_column_index( table, wszName, &index ); + release_table( table ); + if (hr != S_OK) return hr; + return record_get_value( co->record, index, pVal, pType ); + } + return get_propval( ec->query->view, co->index, wszName, pVal, pType, plFlavor ); } static HRESULT record_set_value( struct record *record, UINT index, VARIANT *var )

1 0

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

Oct. 10, 2012

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

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

Oct. 10, 2012

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 Oct. 10, 2012

Oct. 10, 2012

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: Add reference counting to the table structure.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: ef6fa2b9f2e5141000d8602625159dfe45867fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6fa2b9f2e5141000d860262… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 12:01:44 2012 +0200 wbemprox: Add reference counting to the table structure. --- dlls/wbemprox/class.c | 35 ++++++++++++++++++++--------------- dlls/wbemprox/query.c | 4 ++-- dlls/wbemprox/services.c | 8 +++++--- dlls/wbemprox/table.c | 37 ++++++++++++++++++++++++++++++------- dlls/wbemprox/wbemprox_private.h | 8 +++++--- 5 files changed, 62 insertions(+), 30 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 5a70e9d..5bbd6aa 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -382,11 +382,14 @@ static HRESULT WINAPI class_object_Put( if (co->record) { - struct table *table = get_table( co->name ); + struct table *table = grab_table( co->name ); UINT index; HRESULT hr; - if ((hr = get_column_index( table, wszName, &index )) != S_OK) return hr; + if (!table) return WBEM_E_FAILED; + hr = get_column_index( table, wszName, &index ); + release_table( table ); + if (hr != S_OK) return hr; return record_set_value( co->record, index, pVal ); } return put_propval( ec->query->view, co->index, wszName, pVal, Type ); @@ -450,18 +453,18 @@ static HRESULT WINAPI class_object_Next( struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); struct view *view = ec->query->view; - const WCHAR *property; + BSTR property; HRESULT hr; TRACE("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor); if (!(property = get_property_name( co->name, co->index_property ))) return WBEM_S_NO_MORE_DATA; - if (!(*strName = SysAllocString( property ))) return E_OUTOFMEMORY; if ((hr = get_propval( view, co->index, property, pVal, pType, plFlavor ) != S_OK)) { - SysFreeString( *strName ); + SysFreeString( property ); return hr; } + *strName = property; co->index_property++; return S_OK; } @@ -834,7 +837,7 @@ static HRESULT WINAPI class_object_NextMethod( IWbemClassObject **ppOutSignature) { struct class_object *co = impl_from_IWbemClassObject( iface ); - const WCHAR *method; + BSTR method; HRESULT hr; TRACE("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature); @@ -842,18 +845,20 @@ static HRESULT WINAPI class_object_NextMethod( if (!(method = get_method_name( co->name, co->index_method ))) return WBEM_S_NO_MORE_DATA; hr = create_signature( co->name, method, PARAM_IN, ppInSignature ); - if (hr != S_OK) return hr; - + if (hr != S_OK) + { + SysFreeString( method ); + return hr; + } hr = create_signature( co->name, method, PARAM_OUT, ppOutSignature ); - if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); + if (hr != S_OK) + { + SysFreeString( method ); + IWbemClassObject_Release( *ppInSignature ); + } else { - if (!(*pstrName = SysAllocString( method ))) - { - IWbemClassObject_Release( *ppInSignature ); - IWbemClassObject_Release( *ppOutSignature ); - return E_OUTOFMEMORY; - } + *pstrName = method; co->index_method++; } return hr; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 223a373..8df09bc 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -37,7 +37,7 @@ HRESULT create_view( const struct property *proplist, const WCHAR *class, if (!view) return E_OUTOFMEMORY; view->proplist = proplist; - view->table = get_table( class ); + view->table = grab_table( class ); view->cond = cond; view->result = NULL; view->count = 0; @@ -47,7 +47,7 @@ HRESULT create_view( const struct property *proplist, const WCHAR *class, void destroy_view( struct view *view ) { - free_table( view->table ); + if (view->table) release_table( view->table ); heap_free( view->result ); heap_free( view ); } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 5e9cec0..3f87d5b 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -578,7 +578,7 @@ static HRESULT WINAPI wbem_services_ExecMethod( IWbemClassObject **ppOutParams, IWbemCallResult **ppCallResult ) { - const struct table *table; + struct table *table; class_method *func; struct path *path; HRESULT hr; @@ -590,11 +590,13 @@ static HRESULT WINAPI wbem_services_ExecMethod( if ((hr = parse_path( strObjectPath, &path )) != S_OK) return hr; - table = get_table( path->class ); + table = grab_table( path->class ); free_path( path ); if (!table) return WBEM_E_NOT_FOUND; - if ((hr = get_method( table, strMethodName, &func )) != S_OK) return hr; + hr = get_method( table, strMethodName, &func ); + release_table( table ); + if (hr != S_OK) return hr; return func( pInParams, ppOutParams ); } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index c414aa9..a49bf58 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -316,7 +316,12 @@ void free_table( struct table *table ) } } -struct table *get_table( const WCHAR *name ) +void release_table( struct table *table ) +{ + if (!InterlockedDecrement( &table->refs )) free_table( table ); +} + +struct table *grab_table( const WCHAR *name ) { struct table *table; @@ -325,6 +330,8 @@ struct table *get_table( const WCHAR *name ) if (!strcmpiW( table->name, name )) { if (table->fill && !table->data) table->fill( table ); + InterlockedIncrement( &table->refs ); + TRACE("returning %p\n", table); return table; } } @@ -344,6 +351,7 @@ struct table *create_table( const WCHAR *name, UINT num_cols, const struct colum table->data = data; table->fill = fill; table->flags = TABLE_FLAG_DYNAMIC; + table->refs = 0; list_init( &table->entry ); return table; } @@ -361,41 +369,56 @@ BOOL add_table( struct table *table ) } } list_add_tail( table_list, &table->entry ); + TRACE("added %p\n", table); return TRUE; } -const WCHAR *get_method_name( const WCHAR *class, UINT index ) +BSTR get_method_name( const WCHAR *class, UINT index ) { struct table *table; UINT i, count = 0; + BSTR ret; - if (!(table = get_table( class ))) return NULL; + if (!(table = grab_table( class ))) return NULL; for (i = 0; i < table->num_cols; i++) { if (table->columns[i].type & COL_FLAG_METHOD) { - if (index == count) return table->columns[i].name; + if (index == count) + { + ret = SysAllocString( table->columns[i].name ); + release_table( table ); + return ret; + } count++; } } + release_table( table ); return NULL; } -const WCHAR *get_property_name( const WCHAR *class, UINT index ) +BSTR get_property_name( const WCHAR *class, UINT index ) { struct table *table; UINT i, count = 0; + BSTR ret; - if (!(table = get_table( class ))) return NULL; + if (!(table = grab_table( class ))) return NULL; for (i = 0; i < table->num_cols; i++) { if (!(table->columns[i].type & COL_FLAG_METHOD)) { - if (index == count) return table->columns[i].name; + if (index == count) + { + ret = SysAllocString( table->columns[i].name ); + release_table( table ); + return ret; + } count++; } } + release_table( table ); return NULL; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index b99897e..b0e9933 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -57,6 +57,7 @@ struct table void (*fill)(struct table *); UINT flags; struct list entry; + LONG refs; }; struct property @@ -151,7 +152,8 @@ HRESULT create_view( const struct property *, const WCHAR *, const struct expr * struct view ** ) DECLSPEC_HIDDEN; void destroy_view( struct view * ) DECLSPEC_HIDDEN; void init_table_list( void ) DECLSPEC_HIDDEN; -struct table *get_table( const WCHAR * ) DECLSPEC_HIDDEN; +struct table *grab_table( const WCHAR * ) DECLSPEC_HIDDEN; +void release_table( struct table * ) DECLSPEC_HIDDEN; struct table *create_table( const WCHAR *, UINT, const struct column *, UINT, BYTE *, void (*)(struct table *)) DECLSPEC_HIDDEN; BOOL add_table( struct table * ) DECLSPEC_HIDDEN; @@ -169,8 +171,8 @@ HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYP HRESULT variant_to_longlong( VARIANT *, LONGLONG *, CIMTYPE * ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; -const WCHAR *get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; -const WCHAR *get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; +BSTR get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; +BSTR get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Add support for array types.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 3e52cea324af31fa7436615db2602fbb6984f6b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e52cea324af31fa7436615db… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 12:03:10 2012 +0200 wbemprox: Add support for array types. --- dlls/wbemprox/class.c | 18 ++++- dlls/wbemprox/query.c | 175 ++++++++++++++++++++++++++++++++------ dlls/wbemprox/table.c | 4 +- dlls/wbemprox/wbemprox_private.h | 10 ++- 4 files changed, 177 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e52cea324af31fa74366…

1 0