June 2012 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Removed no longer needed arg_cnt and get_arg helpers .
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 14138e6f09b166bc11a3155941da396e61b06ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14138e6f09b166bc11a315594… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:08:58 2012 +0200 jscript: Removed no longer needed arg_cnt and get_arg helpers. --- dlls/jscript/dispex.c | 2 +- dlls/jscript/jscript.h | 10 ---------- 2 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5bec3d4..44008bd 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -327,7 +327,7 @@ static HRESULT convert_params(const DISPPARAMS *dp, VARIANT *buf, unsigned *argc } for(i = 0; i < cnt; i++) { - s = get_arg(dp, i); + s = dp->rgvarg+dp->cArgs-i-1; switch(V_VT(s)) { case VT_I2: V_VT(argv+i) = VT_I4; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index f36dcf3..4662afa 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -377,16 +377,6 @@ HRESULT regexp_match(script_ctx_t*,jsdisp_t*,const WCHAR*,DWORD,BOOL,match_resul HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*) DECLSPEC_HIDDEN; HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,BSTR,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; -static inline VARIANT *get_arg(const DISPPARAMS *dp, DWORD i) -{ - return dp->rgvarg + dp->cArgs-i-1; -} - -static inline DWORD arg_cnt(const DISPPARAMS *dp) -{ - return dp->cArgs - dp->cNamedArgs; -} - static inline BOOL is_class(jsdisp_t *jsdisp, jsclass_t class) { return jsdisp->builtin_info->class == class;

1 0

Jacek Caban : jscript: Added more apply and call tests.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 7dcd1d06ef543cb1dcb7e1d374081864de0384a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dcd1d06ef543cb1dcb7e1d37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:09:12 2012 +0200 jscript: Added more apply and call tests. --- dlls/jscript/tests/api.js | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d8f86f5..ac909b2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1644,9 +1644,11 @@ function callTest(argc) { callTest.call(tmp, 1, 1); callTest.call(tmp, 2, 1, 2); +callTest.call(tmp, 3, 1, 2, 3); callTest.apply(tmp, [1, 1]); callTest.apply(tmp, [2, 1, 2]); +callTest.apply(tmp, [3, 1, 2, 3]); (function () { callTest.apply(tmp, arguments); })(2,1,2); function callTest2() {

1 0

Piotr Caban : msvcp90: Added num_put<wchar> implementation.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 55b9bbc491dc618b93ea24dde7b354bdd7a797cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b9bbc491dc618b93ea24dde… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 25 15:48:18 2012 +0200 msvcp90: Added num_put<wchar> implementation. --- dlls/msvcp90/locale.c | 673 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 13 +- dlls/msvcp90/msvcp90.spec | 124 ++++---- dlls/msvcp90/string.c | 2 +- 4 files changed, 748 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55b9bbc491dc618b93ea2…

1 0

Alexandre Julliard : gdi32: Remove OpenGL functions that don' t use an HDC from the driver entry points.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: ee21554893176c0a90f4017afe000de30bfd2029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee21554893176c0a90f4017af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 12:02:13 2012 +0200 gdi32: Remove OpenGL functions that don't use an HDC from the driver entry points. --- dlls/gdi32/dibdrv/dc.c | 5 -- dlls/gdi32/driver.c | 30 --------- dlls/gdi32/enhmfdrv/init.c | 5 -- dlls/gdi32/freetype.c | 5 -- dlls/gdi32/gdi32.spec | 7 -- dlls/gdi32/mfdrv/init.c | 5 -- dlls/gdi32/opengl.c | 148 +------------------------------------------- dlls/gdi32/path.c | 5 -- dlls/wineps.drv/init.c | 5 -- dlls/winex11.drv/init.c | 5 -- dlls/winex11.drv/opengl.c | 5 -- dlls/winex11.drv/xrender.c | 5 -- include/wine/gdi_driver.h | 7 +-- 13 files changed, 2 insertions(+), 235 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee21554893176c0a90f40…

1 0

Hans Leidekker : wbemprox: Add a partial Win32_NetworkAdapter class implementation.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 7b8c10f0b1041f5a42e3f7d59340c5f4128a013a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8c10f0b1041f5a42e3f7d59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 25 11:20:09 2012 +0200 wbemprox: Add a partial Win32_NetworkAdapter class implementation. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 56e3d8f..bc82945 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = dxgi oleaut32 ole32 advapi32 +IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index af913d4..6092173 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -26,6 +26,8 @@ #include "windef.h" #include "winbase.h" #include "wbemcli.h" +#include "winsock2.h" +#include "iphlpapi.h" #include "tlhelp32.h" #include "initguid.h" #include "d3d10.h" @@ -47,6 +49,8 @@ static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; 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 class_networkadapterW[] = + {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; @@ -60,10 +64,14 @@ static const WCHAR prop_deviceidW[] = {'D','e','v','i','c','e','I','d',0}; static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; +static const WCHAR prop_interfaceindexW[] = + {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_modelW[] = {'M','o','d','e','l',0}; +static const WCHAR prop_netconnectionstatusW[] = + {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; static const WCHAR prop_osarchitectureW[] = {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_pprocessidW[] = @@ -90,6 +98,12 @@ static const struct column col_compsys[] = { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING } }; +static const struct column col_networkadapter[] = +{ + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_interfaceindexW, CIM_SINT32 }, + { prop_netconnectionstatusW, CIM_UINT16 } +}; static const struct column col_os[] = { { prop_captionW, CIM_STRING }, @@ -154,6 +168,12 @@ struct record_computersystem const WCHAR *manufacturer; const WCHAR *model; }; +struct record_networkadapter +{ + const WCHAR *device_id; + INT32 interface_index; + UINT16 netconnection_status; +}; struct record_operatingsystem { const WCHAR *caption; @@ -193,6 +213,60 @@ static const struct record_processor data_processor[] = { processor_manufacturerW } }; +static UINT16 get_connection_status( IF_OPER_STATUS status ) +{ + switch (status) + { + case IfOperStatusDown: + return 0; /* Disconnected */ + case IfOperStatusUp: + return 2; /* Connected */ + default: + ERR("unhandled status %u\n", status); + break; + } + return 0; +} + +static void fill_networkadapter( struct table *table ) +{ + static const WCHAR fmtW[] = {'%','u',0}; + WCHAR device_id[11]; + struct record_networkadapter *rec; + IP_ADAPTER_ADDRESSES *aa, *buffer; + UINT num_rows = 0, offset = 0; + DWORD size = 0, ret; + + ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + if (ret != ERROR_BUFFER_OVERFLOW) return; + + if (!(buffer = heap_alloc( size ))) return; + if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + { + heap_free( buffer ); + return; + } + for (aa = buffer; aa; aa = aa->Next) num_rows++; + if (!(table->data = heap_alloc( sizeof(*rec) * num_rows ))) + { + heap_free( buffer ); + return; + } + for (aa = buffer; aa; aa = aa->Next) + { + rec = (struct record_networkadapter *)(table->data + offset); + sprintfW( device_id, fmtW, aa->u.s.IfIndex ); + rec->device_id = heap_strdupW( device_id ); + rec->interface_index = aa->u.s.IfIndex; + rec->netconnection_status = get_connection_status( aa->OperStatus ); + offset += sizeof(*rec); + } + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; + + heap_free( buffer ); +} + static WCHAR *get_cmdline( DWORD process_id ) { if (process_id == GetCurrentProcessId()) return heap_strdupW( GetCommandLineW() ); @@ -301,6 +375,7 @@ static struct table classtable[] = { { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, { class_compsysW, SIZEOF(col_compsys), col_compsys, SIZEOF(data_compsys), (BYTE *)data_compsys, NULL }, + { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os }, { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, SIZEOF(data_processor), (BYTE *)data_processor, NULL },

1 0

Hans Leidekker : wbemprox: Parse the resource string in IWbemLocator:: ConnectServer.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 0588ba6939320718080f24654660e978f5e6da3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0588ba6939320718080f24654… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 25 11:20:21 2012 +0200 wbemprox: Parse the resource string in IWbemLocator::ConnectServer. --- dlls/wbemprox/services.c | 5 ++- dlls/wbemprox/tests/services.c | 87 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemlocator.c | 83 ++++++++++++++++++++++++++++++++++- dlls/wbemprox/wbemprox_private.h | 2 +- 4 files changed, 172 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index c2aaa3a..e33ff36 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -136,6 +136,7 @@ struct wbem_services { IWbemServices IWbemServices_iface; LONG refs; + WCHAR *namespace; }; static inline struct wbem_services *impl_from_IWbemServices( IWbemServices *iface ) @@ -158,6 +159,7 @@ static ULONG WINAPI wbem_services_Release( if (!refs) { TRACE("destroying %p\n", ws); + heap_free( ws->namespace ); heap_free( ws ); } return refs; @@ -486,7 +488,7 @@ static const IWbemServicesVtbl wbem_services_vtbl = wbem_services_ExecMethodAsync }; -HRESULT WbemServices_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT WbemServices_create( IUnknown *pUnkOuter, WCHAR *namespace, LPVOID *ppObj ) { struct wbem_services *ws; @@ -497,6 +499,7 @@ HRESULT WbemServices_create( IUnknown *pUnkOuter, LPVOID *ppObj ) ws->IWbemServices_iface.lpVtbl = &wbem_services_vtbl; ws->refs = 1; + ws->namespace = namespace; *ppObj = &ws->IWbemServices_iface; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 64be978..ff798a3 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -84,9 +84,96 @@ static void test_IClientSecurity(void) SysFreeString( path ); } +static void test_IWbemLocator(void) +{ + static const WCHAR path0W[] = {0}; + static const WCHAR path1W[] = {'\\',0}; + static const WCHAR path2W[] = {'\\','\\',0}; + static const WCHAR path3W[] = {'\\','\\','.',0}; + static const WCHAR path4W[] = {'\\','\\','.','\\',0}; + static const WCHAR path5W[] = {'\\','R','O','O','T',0}; + static const WCHAR path6W[] = {'\\','\\','R','O','O','T',0}; + static const WCHAR path7W[] = {'\\','\\','.','R','O','O','T',0}; + static const WCHAR path8W[] = {'\\','\\','.','\\','N','O','N','E',0}; + static const WCHAR path9W[] = {'\\','\\','.','\\','R','O','O','T',0}; + static const WCHAR path10W[] = {'\\','\\','\\','.','\\','R','O','O','T',0}; + static const WCHAR path11W[] = {'\\','/','.','\\','R','O','O','T',0}; + static const WCHAR path12W[] = {'/','/','.','\\','R','O','O','T',0}; + static const WCHAR path13W[] = {'\\','\\','.','/','R','O','O','T',0}; + static const WCHAR path14W[] = {'/','/','.','/','R','O','O','T',0}; + static const WCHAR path15W[] = {'N','O','N','E',0}; + static const WCHAR path16W[] = {'R','O','O','T',0}; + static const WCHAR path17W[] = {'R','O','O','T','\\','N','O','N','E',0}; + static const WCHAR path18W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; + static const WCHAR path19W[] = {'R','O','O','T','\\','\\','C','I','M','V','2',0}; + static const WCHAR path20W[] = {'R','O','O','T','\\','C','I','M','V','2','\\',0}; + static const WCHAR path21W[] = {'R','O','O','T','/','C','I','M','V','2',0}; + static const struct + { + const WCHAR *path; + HRESULT result; + int todo; + HRESULT result_broken; + } + test[] = + { + { path0W, WBEM_E_INVALID_NAMESPACE }, + { path1W, WBEM_E_INVALID_NAMESPACE }, + { path2W, WBEM_E_INVALID_NAMESPACE }, + { path3W, WBEM_E_INVALID_NAMESPACE }, + { path4W, WBEM_E_INVALID_NAMESPACE, 0, WBEM_E_INVALID_PARAMETER }, + { path5W, WBEM_E_INVALID_NAMESPACE }, + { path6W, 0x800706ba, 1 }, + { path7W, 0x800706ba, 1 }, + { path8W, WBEM_E_INVALID_NAMESPACE }, + { path9W, S_OK }, + { path10W, WBEM_E_INVALID_PARAMETER }, + { path11W, S_OK }, + { path12W, S_OK }, + { path13W, S_OK }, + { path14W, S_OK }, + { path15W, WBEM_E_INVALID_NAMESPACE }, + { path16W, S_OK }, + { path17W, WBEM_E_INVALID_NAMESPACE }, + { path18W, S_OK }, + { path19W, WBEM_E_INVALID_NAMESPACE }, + { path20W, WBEM_E_INVALID_NAMESPACE }, + { path21W, S_OK } + }; + IWbemLocator *locator; + IWbemServices *services; + unsigned int i; + HRESULT hr; + BSTR resource; + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void **)&locator ); + if (hr != S_OK) + { + win_skip("can't create instance of WbemLocator\n"); + return; + } + ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + + for (i = 0; i < sizeof(test) / sizeof(test[0]); i++) + { + resource = SysAllocString( test[i].path ); + hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); + if (test[i].todo) todo_wine + ok( hr == test[i].result || broken(hr == test[i].result_broken), + "%u: expected %08x got %08x\n", i, test[i].result, hr ); + else + ok( hr == test[i].result || broken(hr == test[i].result_broken), + "%u: expected %08x got %08x\n", i, test[i].result, hr ); + SysFreeString( resource ); + if (hr == S_OK) IWbemServices_Release( services ); + } + IWbemLocator_Release( locator ); +} + START_TEST(services) { CoInitialize( NULL ); test_IClientSecurity(); + test_IWbemLocator(); CoUninitialize(); } diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index b80e080..87a4d01 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -86,6 +86,77 @@ static HRESULT WINAPI wbem_locator_QueryInterface( return S_OK; } +static BOOL is_local_machine( const WCHAR *server ) +{ + static const WCHAR dotW[] = {'.',0}; + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len = sizeof(buffer) / sizeof(buffer[0]); + + if (!server || !strcmpW( server, dotW )) return TRUE; + if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; + return FALSE; +} + +static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **namespace ) +{ + static const WCHAR rootW[] = {'R','O','O','T'}; + static const WCHAR cimv2W[] = {'C','I','M','V','2'}; + HRESULT hr = WBEM_E_INVALID_NAMESPACE; + const WCHAR *p, *q; + unsigned int len; + + *server = NULL; + *namespace = NULL; + p = q = resource; + if (*p == '\\' || *p == '/') + { + p++; + if (*p == '\\' || *p == '/') p++; + if (!*p) return WBEM_E_INVALID_NAMESPACE; + if (*p == '\\' || *p == '/') return WBEM_E_INVALID_PARAMETER; + q = p + 1; + while (*q && *q != '\\' && *q != '/') q++; + if (!*q) return WBEM_E_INVALID_NAMESPACE; + len = q - p; + if (!(*server = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + memcpy( *server, p, len * sizeof(WCHAR) ); + (*server)[len] = 0; + q++; + } + if (!*q) goto done; + p = q; + while (*q && *q != '\\' && *q != '/') q++; + len = q - p; + if (len >= sizeof(rootW) / sizeof(rootW[0]) && memicmpW( rootW, p, len )) goto done; + if (!*q) + { + hr = S_OK; + goto done; + } + q++; + if ((len = strlenW( q )) != sizeof(cimv2W) / sizeof(cimv2W[0]) || memicmpW( q, cimv2W, len )) + goto done; + if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; + else + { + memcpy( *namespace, p, len * sizeof(WCHAR) ); + (*namespace)[len] = 0; + hr = S_OK; + } + +done: + if (hr != S_OK) + { + heap_free( *server ); + heap_free( *namespace ); + } + return hr; +} + static HRESULT WINAPI wbem_locator_ConnectServer( IWbemLocator *iface, const BSTR NetworkResource, @@ -98,14 +169,19 @@ static HRESULT WINAPI wbem_locator_ConnectServer( IWbemServices **ppNamespace) { HRESULT hr; + WCHAR *server, *namespace; TRACE("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), pCtx, ppNamespace); - if (((NetworkResource[0] == '\\' && NetworkResource[1] == '\\') || - (NetworkResource[0] == '/' && NetworkResource[1] == '/')) && NetworkResource[2] != '.') + hr = parse_resource( NetworkResource, &server, &namespace ); + if (hr != S_OK) return hr; + + if (!is_local_machine( server )) { FIXME("remote computer not supported\n"); + heap_free( server ); + heap_free( namespace ); return WBEM_E_TRANSPORT_FAILURE; } if (User || Password || Authority) @@ -115,10 +191,11 @@ static HRESULT WINAPI wbem_locator_ConnectServer( if (SecurityFlags) FIXME("unsupported flags\n"); - hr = WbemServices_create( NULL, (void **)ppNamespace ); + hr = WbemServices_create( NULL, namespace, (void **)ppNamespace ); if (SUCCEEDED( hr )) return WBEM_NO_ERROR; + heap_free( namespace ); return WBEM_E_FAILED; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 779d43d..d0cdb76 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -121,7 +121,7 @@ HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemServices_create(IUnknown *, WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemClassObject_create(IUnknown *, IEnumWbemClassObject *, UINT, LPVOID *) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Keep reference in node returned from get_node.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 7ebcb1820eda3c43c8de3eb28d7390c9e7c8184e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ebcb1820eda3c43c8de3eb28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:04:40 2012 +0200 mshtml: Keep reference in node returned from get_node. --- dlls/mshtml/htmldoc.c | 16 +++++++++++----- dlls/mshtml/htmldoc3.c | 11 +++++++---- dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/htmlelemcol.c | 3 +++ dlls/mshtml/htmlevent.c | 19 ++++++++++++++----- dlls/mshtml/htmlform.c | 1 - dlls/mshtml/htmlnode.c | 18 +++++++----------- dlls/mshtml/htmloption.c | 1 + dlls/mshtml/htmlselect.c | 1 - dlls/mshtml/mshtml_private.h | 5 +++++ dlls/mshtml/mutation.c | 1 + dlls/mshtml/nsembed.c | 1 + dlls/mshtml/pluginhost.c | 1 + dlls/mshtml/txtrange.c | 4 +++- 14 files changed, 55 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ebcb1820eda3c43c8de3…

1 0

Jacek Caban : mshtml: Added separated types for outer and inner HTML windows.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 08964ede45f9ac9d787ba8dd7f8cf31ca7cf2324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08964ede45f9ac9d787ba8dd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:04:59 2012 +0200 mshtml: Added separated types for outer and inner HTML windows. --- dlls/mshtml/binding.h | 12 +- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmldoc.c | 22 ++-- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlframe.c | 4 +- dlls/mshtml/htmlframebase.c | 8 +- dlls/mshtml/htmliframe.c | 2 +- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmllocation.c | 2 +- dlls/mshtml/htmloption.c | 2 +- dlls/mshtml/htmlwindow.c | 369 ++++++++++++++++++++++++------------------ dlls/mshtml/mshtml_private.h | 75 +++++---- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/navigate.c | 28 ++-- dlls/mshtml/npplugin.c | 8 +- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/nsio.c | 34 ++-- dlls/mshtml/nsservice.c | 4 +- dlls/mshtml/oleobj.c | 2 +- dlls/mshtml/persist.c | 12 +- dlls/mshtml/pluginhost.c | 2 +- dlls/mshtml/script.c | 22 ++-- 23 files changed, 340 insertions(+), 280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08964ede45f9ac9d787ba…

1 0

Jacek Caban : mshtml: Moved document node from HTMLOuterWindow to HTMLInnerWindow.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 79356c65c1e681ed46656cd65bb0f63617f37b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79356c65c1e681ed46656cd65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:05:17 2012 +0200 mshtml: Moved document node from HTMLOuterWindow to HTMLInnerWindow. --- dlls/mshtml/htmldoc.c | 7 +- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlframe.c | 4 +- dlls/mshtml/htmlframebase.c | 4 +- dlls/mshtml/htmliframe.c | 4 +- dlls/mshtml/htmlimg.c | 9 ++- dlls/mshtml/htmloption.c | 6 +- dlls/mshtml/htmlwindow.c | 172 +++++++++++++++++++++++++++--------------- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/navigate.c | 12 ++-- dlls/mshtml/npplugin.c | 8 +- dlls/mshtml/nsio.c | 8 +- dlls/mshtml/persist.c | 2 +- dlls/mshtml/script.c | 6 +- 15 files changed, 151 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79356c65c1e681ed46656…

1 0

Jacek Caban : mshtml: Moved DispatchEx instance from HTMLOuterWindow to HTMLInnerWindow.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: c13bb135ca9e780de6f530c73bf2cd52212eb3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13bb135ca9e780de6f530c73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:05:33 2012 +0200 mshtml: Moved DispatchEx instance from HTMLOuterWindow to HTMLInnerWindow. --- dlls/mshtml/htmlwindow.c | 38 +++++++++++++++++++------------------- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index bb389d1..4a696b7 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -154,7 +154,7 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_ITravelLogClient, riid)) { TRACE("(%p)->(IID_ITravelLogClient %p)\n", This, ppv); *ppv = &This->ITravelLogClient_iface; - }else if(dispex_query_interface(&This->outer_window->dispex, riid, ppv)) { + }else if(dispex_query_interface(&This->inner_window->dispex, riid, ppv)) { assert(!*ppv); return E_NOINTERFACE; } @@ -225,13 +225,13 @@ static void release_outer_window(HTMLOuterWindow *This) nsIDOMWindow_Release(This->nswindow); list_remove(&This->entry); - release_dispex(&This->dispex); heap_free(This); } static void release_inner_window(HTMLInnerWindow *This) { htmldoc_release(&This->doc->basedoc); + release_dispex(&This->dispex); heap_free(This); } @@ -2137,7 +2137,7 @@ static HRESULT WINAPI WindowDispEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pc TRACE("(%p)->(%p)\n", This, pctinfo); - return IDispatchEx_GetTypeInfoCount(&This->outer_window->dispex.IDispatchEx_iface, pctinfo); + return IDispatchEx_GetTypeInfoCount(&This->inner_window->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI WindowDispEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, @@ -2147,7 +2147,7 @@ static HRESULT WINAPI WindowDispEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return IDispatchEx_GetTypeInfo(&This->outer_window->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); + return IDispatchEx_GetTypeInfo(&This->inner_window->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI WindowDispEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, @@ -2182,7 +2182,7 @@ static HRESULT WINAPI WindowDispEx_Invoke(IDispatchEx *iface, DISPID dispIdMembe /* FIXME: Use script dispatch */ - return IDispatchEx_Invoke(&This->outer_window->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + return IDispatchEx_Invoke(&This->inner_window->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } @@ -2261,7 +2261,7 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(hres != DISP_E_UNKNOWNNAME) return hres; - hres = IDispatchEx_GetDispID(&window->dispex.IDispatchEx_iface, bstrName, grfdex, pid); + hres = IDispatchEx_GetDispID(&window->base.inner_window->dispex.IDispatchEx_iface, bstrName, grfdex, pid); if(hres != DISP_E_UNKNOWNNAME) return hres; @@ -2310,7 +2310,7 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID return hres; } - return IDispatchEx_InvokeEx(&window->dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, + return IDispatchEx_InvokeEx(&window->base.inner_window->dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } @@ -2320,7 +2320,7 @@ static HRESULT WINAPI WindowDispEx_DeleteMemberByName(IDispatchEx *iface, BSTR b TRACE("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); - return IDispatchEx_DeleteMemberByName(&This->outer_window->dispex.IDispatchEx_iface, bstrName, grfdex); + return IDispatchEx_DeleteMemberByName(&This->inner_window->dispex.IDispatchEx_iface, bstrName, grfdex); } static HRESULT WINAPI WindowDispEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) @@ -2329,7 +2329,7 @@ static HRESULT WINAPI WindowDispEx_DeleteMemberByDispID(IDispatchEx *iface, DISP TRACE("(%p)->(%x)\n", This, id); - return IDispatchEx_DeleteMemberByDispID(&This->outer_window->dispex.IDispatchEx_iface, id); + return IDispatchEx_DeleteMemberByDispID(&This->inner_window->dispex.IDispatchEx_iface, id); } static HRESULT WINAPI WindowDispEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) @@ -2338,7 +2338,7 @@ static HRESULT WINAPI WindowDispEx_GetMemberProperties(IDispatchEx *iface, DISPI TRACE("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); - return IDispatchEx_GetMemberProperties(&This->outer_window->dispex.IDispatchEx_iface, id, grfdexFetch, + return IDispatchEx_GetMemberProperties(&This->inner_window->dispex.IDispatchEx_iface, id, grfdexFetch, pgrfdex); } @@ -2348,7 +2348,7 @@ static HRESULT WINAPI WindowDispEx_GetMemberName(IDispatchEx *iface, DISPID id, TRACE("(%p)->(%x %p)\n", This, id, pbstrName); - return IDispatchEx_GetMemberName(&This->outer_window->dispex.IDispatchEx_iface, id, pbstrName); + return IDispatchEx_GetMemberName(&This->inner_window->dispex.IDispatchEx_iface, id, pbstrName); } static HRESULT WINAPI WindowDispEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) @@ -2357,7 +2357,7 @@ static HRESULT WINAPI WindowDispEx_GetNextDispID(IDispatchEx *iface, DWORD grfde TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); - return IDispatchEx_GetNextDispID(&This->outer_window->dispex.IDispatchEx_iface, grfdex, id, pid); + return IDispatchEx_GetNextDispID(&This->inner_window->dispex.IDispatchEx_iface, grfdex, id, pid); } static HRESULT WINAPI WindowDispEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) @@ -2436,24 +2436,24 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { HTMLWindowSP_QueryService }; -static inline HTMLOuterWindow *impl_from_DispatchEx(DispatchEx *iface) +static inline HTMLInnerWindow *impl_from_DispatchEx(DispatchEx *iface) { - return CONTAINING_RECORD(iface, HTMLOuterWindow, dispex); + return CONTAINING_RECORD(iface, HTMLInnerWindow, dispex); } static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { - HTMLOuterWindow *This = impl_from_DispatchEx(dispex); + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); global_prop_t *prop; DWORD idx; HRESULT hres; idx = id - MSHTML_DISPID_CUSTOM_MIN; - if(idx >= This->global_prop_cnt) + if(idx >= This->base.outer_window->global_prop_cnt) return DISP_E_MEMBERNOTFOUND; - prop = This->global_props+idx; + prop = This->base.outer_window->global_props+idx; switch(prop->type) { case GLOBAL_SCRIPTVAR: { @@ -2580,6 +2580,8 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLDocumentNo htmldoc_addref(&doc_node->basedoc); window->doc = doc_node; + init_dispex(&window->dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); + *ret = window; return S_OK; } @@ -2608,8 +2610,6 @@ HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, window->window_ref->window = window; window->window_ref->ref = 1; - init_dispex(&window->dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); - if(nswindow) { nsIDOMWindow_AddRef(nswindow); window->nswindow = nswindow; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cfec956..010542e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -316,7 +316,6 @@ struct HTMLWindow { struct HTMLOuterWindow { HTMLWindow base; - DispatchEx dispex; windowref_t *window_ref; LONG task_magic; @@ -356,6 +355,7 @@ struct HTMLOuterWindow { struct HTMLInnerWindow { HTMLWindow base; + DispatchEx dispex; HTMLDocumentNode *doc; };

1 0