wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Hans Leidekker : msi: Avoid a leak when a query is executed more than once.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: a8b51497e518817716a8f79c29999d22726ad35d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b51497e518817716a8f79c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:47:37 2011 +0200 msi: Avoid a leak when a query is executed more than once. --- dlls/msi/where.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 5304900..0e346d6 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -73,6 +73,7 @@ typedef struct tagMSIWHEREVIEW struct expr *cond; UINT rec_index; MSIORDERINFO *order_info; + UINT error; } MSIWHEREVIEW; #define INITIAL_REORDER_SIZE 16 @@ -617,6 +618,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( !table ) return ERROR_FUNCTION_FAILED; + if (wv->reorder) + return wv->error; + r = init_reorder(wv); if (r != ERROR_SUCCESS) return r; @@ -648,7 +652,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if (wv->order_info) r = wv->order_info->error; + msi_free( rows ); + wv->error = r; return r; }

1 0

Hans Leidekker : winhttp: Fix some memory leaks.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: d5a98e5d85090dbc28c1795033048470a122496e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a98e5d85090dbc28c179503… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:46:51 2011 +0200 winhttp: Fix some memory leaks. --- dlls/winhttp/request.c | 18 ++++++++++++++++-- dlls/winhttp/session.c | 11 ++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c46ce21..0d9e60a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2403,20 +2403,32 @@ static HRESULT WINAPI winhttp_request_SetProxy( { case HTTPREQUEST_PROXYSETTING_DEFAULT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; + heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; case HTTPREQUEST_PROXYSETTING_DIRECT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY; + heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; case HTTPREQUEST_PROXYSETTING_PROXY: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - if (V_VT( &proxy_server ) == VT_BSTR) request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); - if (V_VT( &bypass_list ) == VT_BSTR) request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); + if (V_VT( &proxy_server ) == VT_BSTR) + { + heap_free( (WCHAR *)request->proxy.lpszProxy ); + request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); + } + if (V_VT( &bypass_list ) == VT_BSTR) + { + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); + } break; default: @@ -3334,6 +3346,8 @@ HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; request->state = REQUEST_STATE_UNINITIALIZED; + request->proxy.lpszProxy = NULL; + request->proxy.lpszProxyBypass = NULL; InitializeCriticalSection( &request->cs ); *obj = &request->IWinHttpRequest_iface; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 1fe1889..b7cc31b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -206,6 +206,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->hdr.flags = flags; session->hdr.refs = 1; session->hdr.redirect_policy = WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP; + list_init( &session->hdr.children ); session->resolve_timeout = DEFAULT_RESOLVE_TIMEOUT; session->connect_timeout = DEFAULT_CONNECT_TIMEOUT; session->send_timeout = DEFAULT_SEND_TIMEOUT; @@ -498,6 +499,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hdr.callback = session->hdr.callback; connect->hdr.notify_mask = session->hdr.notify_mask; connect->hdr.context = session->hdr.context; + list_init( &connect->hdr.children ); addref_object( &session->hdr ); connect->session = session; @@ -505,9 +507,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO if (!(connect->hostname = strdupW( server ))) goto end; connect->hostport = port; - - if (!set_server_for_hostname( connect, server, port )) - goto end; + if (!set_server_for_hostname( connect, server, port )) goto end; if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; connect->hdr.handle = hconnect; @@ -516,7 +516,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO end: release_object( &connect->hdr ); - + release_object( &session->hdr ); TRACE("returning %p\n", hconnect); return hconnect; } @@ -930,6 +930,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.callback = connect->hdr.callback; request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; + list_init( &request->hdr.children ); addref_object( &connect->hdr ); request->connect = connect; @@ -970,7 +971,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o end: release_object( &request->hdr ); - + release_object( &connect->hdr ); TRACE("returning %p\n", hrequest); return hrequest; }

1 0

Hans Leidekker : winhttp/tests: Initialize a variant with a known value.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 3762de9d8c2edc791f07fa6c919ef1c38d8ac55a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3762de9d8c2edc791f07fa6c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:46:15 2011 +0200 winhttp/tests: Initialize a variant with a known value. --- dlls/winhttp/tests/winhttp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index a662ef8..24478ad 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2131,8 +2131,8 @@ static void test_IWinHttpRequest(void) hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); ok( hr == S_OK, "got %08x\n", hr ); - VariantInit( &empty ); V_VT( &empty ) = VT_ERROR; + V_ERROR( &empty ) = 0xdeadbeef; V_VT( &async ) = VT_BOOL; V_BOOL( &async ) = VARIANT_FALSE;

1 0

Hans Leidekker : winhttp: Properly test a boolean variant.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 82f76510055461f4a4706feed300b2db5479ca63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f76510055461f4a4706feed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:45:45 2011 +0200 winhttp: Properly test a boolean variant. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a3c2207..c46ce21 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2541,7 +2541,7 @@ static HRESULT WINAPI winhttp_request_Open( path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (!(verb = strdupW( method ))) goto error; - if (V_BOOL( &async ) == VARIANT_TRUE) flags |= WINHTTP_FLAG_ASYNC; + if (V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) { err = get_last_error();

1 0

Hans Leidekker : xolehlp: New dll.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 1edf2d4a03ee7eb0732c61a7d544962296e2aeda URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edf2d4a03ee7eb0732c61a7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:44:51 2011 +0200 xolehlp: New dll. --- configure | 1 + configure.ac | 1 + dlls/xolehlp/Makefile.in | 5 +++++ dlls/xolehlp/xolehlp.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/xolehlp/xolehlp.spec | 6 ++++++ 5 files changed, 54 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7dd8070..7c1af08 100755 --- a/configure +++ b/configure @@ -15195,6 +15195,7 @@ wine_fn_config_test dlls/xinput1_3/tests xinput1_3_test wine_fn_config_dll xinput9_1_0 enable_xinput9_1_0 wine_fn_config_dll xmllite enable_xmllite wine_fn_config_test dlls/xmllite/tests xmllite_test +wine_fn_config_dll xolehlp enable_xolehlp wine_fn_config_makefile documentation enable_documentation wine_fn_config_makefile fonts enable_fonts install-lib wine_fn_config_makefile include enable_include install-dev diff --git a/configure.ac b/configure.ac index 0c97bfd..0421c74 100644 --- a/configure.ac +++ b/configure.ac @@ -2888,6 +2888,7 @@ WINE_CONFIG_TEST(dlls/xinput1_3/tests) WINE_CONFIG_DLL(xinput9_1_0) WINE_CONFIG_DLL(xmllite) WINE_CONFIG_TEST(dlls/xmllite/tests) +WINE_CONFIG_DLL(xolehlp) WINE_CONFIG_MAKEFILE([documentation]) WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) WINE_CONFIG_MAKEFILE([include],,[install-dev]) diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in new file mode 100644 index 0000000..b1389ca --- /dev/null +++ b/dlls/xolehlp/Makefile.in @@ -0,0 +1,5 @@ +MODULE = xolehlp.dll + +C_SRCS = xolehlp.c + +@MAKE_DLL_RULES@ diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c new file mode 100644 index 0000000..3b970ef --- /dev/null +++ b/dlls/xolehlp/xolehlp.c @@ -0,0 +1,41 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xolehlp); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/xolehlp/xolehlp.spec b/dlls/xolehlp/xolehlp.spec new file mode 100644 index 0000000..f774542 --- /dev/null +++ b/dlls/xolehlp/xolehlp.spec @@ -0,0 +1,6 @@ +@ stub GetDtcLocaleResourceHandle +@ stub DtcGetTransactionManager +@ stub DtcGetTransactionManagerEx +@ stub DtcGetTransactionManagerC +@ stub DtcGetTransactionManagerExA +@ stub DtcGetTransactionManagerExW

1 0

Hans Leidekker : programs: Add a stub implementation of regasm.exe.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 29a072e7aaeb92b1d3f56fbb14a4a305ca53a9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a072e7aaeb92b1d3f56fbb1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:44:17 2011 +0200 programs: Add a stub implementation of regasm.exe. --- configure | 1 + configure.ac | 1 + programs/regasm/Makefile.in | 8 ++++++++ programs/regasm/main.c | 33 +++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 5 files changed, 44 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 563117e..7dd8070 100755 --- a/configure +++ b/configure @@ -15235,6 +15235,7 @@ wine_fn_config_program plugplay enable_plugplay install wine_fn_config_program presentationfontcache enable_presentationfontcache install wine_fn_config_program progman enable_progman install,po wine_fn_config_program reg enable_reg install,po +wine_fn_config_program regasm enable_regasm install wine_fn_config_program regedit enable_regedit install,installbin,manpage,po wine_fn_config_test programs/regedit/tests regedit.exe_test wine_fn_config_program regsvcs enable_regsvcs install diff --git a/configure.ac b/configure.ac index ed7a60c..0c97bfd 100644 --- a/configure.ac +++ b/configure.ac @@ -2928,6 +2928,7 @@ WINE_CONFIG_PROGRAM(plugplay,,[install]) WINE_CONFIG_PROGRAM(presentationfontcache,,[install]) WINE_CONFIG_PROGRAM(progman,,[install,po]) WINE_CONFIG_PROGRAM(reg,,[install,po]) +WINE_CONFIG_PROGRAM(regasm,,[install]) WINE_CONFIG_PROGRAM(regedit,,[install,installbin,manpage,po]) WINE_CONFIG_TEST(programs/regedit/tests) WINE_CONFIG_PROGRAM(regsvcs,,[install]) diff --git a/programs/regasm/Makefile.in b/programs/regasm/Makefile.in new file mode 100644 index 0000000..9466c73 --- /dev/null +++ b/programs/regasm/Makefile.in @@ -0,0 +1,8 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = regasm.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +@MAKE_PROG_RULES@ diff --git a/programs/regasm/main.c b/programs/regasm/main.c new file mode 100644 index 0000000..a3243c3 --- /dev/null +++ b/programs/regasm/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(regasm); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cd5e0e8..3d91981 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2577,6 +2577,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,Microsoft.NET\Framework\v1.1.4322,regsvcs.exe 10,Microsoft.NET\Framework\v2.0.50727,ngen.exe 10,Microsoft.NET\Framework\v2.0.50727,fusion.dll +10,Microsoft.NET\Framework\v2.0.50727,regasm.exe 10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe 10,Microsoft.NET\Framework\v3.0\wpf,presentationfontcache.exe 10,Microsoft.NET\Framework\v4.0.30319,ngen.exe

1 0

Michael Stefaniuc : ntdll: Don' t use HIWORD to check if an atom is a small int.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 5a886316b4575b2ee2dae5b556c5891d22b17dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a886316b4575b2ee2dae5b55… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 5 11:18:17 2011 +0200 ntdll: Don't use HIWORD to check if an atom is a small int. --- dlls/ntdll/atom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/atom.c b/dlls/ntdll/atom.c index 8ac4b97..3789567 100644 --- a/dlls/ntdll/atom.c +++ b/dlls/ntdll/atom.c @@ -212,7 +212,7 @@ NTSTATUS WINAPI RtlAddAtomToAtomTable( RTL_ATOM_TABLE table, const WCHAR* name, if (!table) status = STATUS_INVALID_PARAMETER; else { - size_t len = HIWORD(name) ? strlenW(name) : 0; + size_t len = IS_INTATOM(name) ? 0 : strlenW(name); status = is_integral_atom( name, len, atom ); if (status == STATUS_MORE_ENTRIES) { @@ -242,7 +242,7 @@ NTSTATUS WINAPI RtlLookupAtomInAtomTable( RTL_ATOM_TABLE table, const WCHAR* nam if (!table) status = STATUS_INVALID_PARAMETER; else { - size_t len = HIWORD(name) ? strlenW(name) : 0; + size_t len = IS_INTATOM(name) ? 0 : strlenW(name); status = is_integral_atom( name, len, atom ); if (status == STATUS_MORE_ENTRIES) {

1 0

Jacek Caban : vbscript: Added AddNamedItem implementation.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: bbed41fa6a9b1745cdf2a8f82f9fd4f46f6e6597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbed41fa6a9b1745cdf2a8f82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 11:14:55 2011 +0200 vbscript: Added AddNamedItem implementation. --- dlls/vbscript/vbscript.c | 64 +++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.h | 31 ++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 2ca5584..77ccaee 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -87,6 +87,18 @@ static HRESULT set_ctx_site(VBScript *This) static void destroy_script(script_ctx_t *ctx) { + while(!list_empty(&ctx->named_items)) { + named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry); + + list_remove(&iter->entry); + if(iter->disp) + IDispatch_Release(iter->disp); + heap_free(iter->name); + heap_free(iter); + } + + if(ctx->host_global) + IDispatch_Release(ctx->host_global); if(ctx->site) IActiveScriptSite_Release(ctx->site); if(ctx->script_obj) @@ -295,7 +307,55 @@ static HRESULT WINAPI VBScript_Close(IActiveScript *iface) static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstrName, DWORD dwFlags) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); + named_item_t *item; + IDispatch *disp = NULL; + HRESULT hres; + + TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); + + if(This->thread_id != GetCurrentThreadId() || !This->ctx || This->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) { + IUnknown *unk; + + hres = IActiveScriptSite_GetItemInfo(This->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hres)) { + WARN("GetItemInfo failed: %08x\n", hres); + return hres; + } + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); + IUnknown_Release(unk); + if(FAILED(hres)) { + WARN("object does not implement IDispatch\n"); + return hres; + } + + if(This->ctx->host_global) + IDispatch_Release(This->ctx->host_global); + IDispatch_AddRef(disp); + This->ctx->host_global = disp; + } + + item = heap_alloc(sizeof(*item)); + if(!item) { + if(disp) + IDispatch_Release(disp); + return E_OUTOFMEMORY; + } + + item->disp = disp; + item->flags = dwFlags; + item->name = heap_strdupW(pstrName); + if(!item->name) { + if(disp) + IDispatch_Release(disp); + heap_free(item); + return E_OUTOFMEMORY; + } + + list_add_tail(&This->ctx->named_items, &item->entry); return S_OK; } @@ -421,6 +481,8 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) if(!ctx) return E_OUTOFMEMORY; + list_init(&ctx->named_items); + old_ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); if(old_ctx) { destroy_script(ctx); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1f6276f..9c1d35c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -28,6 +28,17 @@ #include "vbscript_classes.h" +#include "wine/list.h" +#include "wine/unicode.h" + +typedef struct named_item_t { + IDispatch *disp; + DWORD flags; + LPWSTR name; + + struct list entry; +} named_item_t; + typedef struct { IDispatchEx IDispatchEx_iface; @@ -38,7 +49,11 @@ typedef struct { IActiveScriptSite *site; LCID lcid; + IDispatch *host_global; + vbdisp_t *script_obj; + + struct list named_items; } script_ctx_t; HRESULT init_global(script_ctx_t*); @@ -59,3 +74,19 @@ static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); } + +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + if(ret) + memcpy(ret, str, size); + } + + return ret; +}

1 0

Jacek Caban : vbscript: Added more uninitialization tests and fixes.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: aff6961bacb75b42636c21142cdfd95842508d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff6961bacb75b42636c21142… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 11:14:29 2011 +0200 vbscript: Added more uninitialization tests and fixes. --- dlls/vbscript/tests/vbscript.c | 127 ++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.c | 24 +++++--- 2 files changed, 138 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 9dd3f0f..ab5c8af 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -23,6 +23,7 @@ #include <ole2.h> #include <activscp.h> #include <objsafe.h> +#include <dispex.h> #include "wine/test.h" @@ -282,6 +283,24 @@ static void test_safety(IActiveScript *script) IObjectSafety_Release(safety); } +static IDispatchEx *get_script_dispatch(IActiveScript *script) +{ + IDispatchEx *dispex; + IDispatch *disp; + HRESULT hres; + + disp = (void*)0xdeadbeef; + hres = IActiveScript_GetScriptDispatch(script, NULL, &disp); + ok(hres == S_OK, "GetScriptDispatch failed: %08x\n", hres); + if(FAILED(hres)) + return NULL; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + IDispatch_Release(disp); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + return dispex; +} + static void test_no_script_dispatch(IActiveScript *script) { IDispatch *disp; @@ -349,9 +368,7 @@ static void test_vbscript(void) SET_EXPECT(OnStateChange_CLOSED); hres = IActiveScript_Close(vbscript); ok(hres == S_OK, "Close failed: %08x\n", hres); - todo_wine CHECK_CALLED(OnStateChange_DISCONNECTED); - todo_wine CHECK_CALLED(OnStateChange_INITIALIZED); CHECK_CALLED(OnStateChange_CLOSED); @@ -364,6 +381,106 @@ static void test_vbscript(void) ok(!ref, "ref = %d\n", ref); } +static void test_vbscript_uninitializing(void) +{ + IActiveScriptParse *parse; + IActiveScript *script; + IDispatchEx *dispex; + ULONG ref; + HRESULT hres; + + static const WCHAR script_textW[] = + {'F','u','n','c','t','i','o','n',' ','f','\n','E','n','d',' ','F','u','n','c','t','i','o','n','\n',0}; + + script = create_vbscript(); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + hres = IActiveScriptParse64_InitNew(parse); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + test_state(script, SCRIPTSTATE_INITIALIZED); + + hres = IActiveScriptParse64_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); + todo_wine + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == E_UNEXPECTED, "SetScriptSite failed: %08x, expected E_UNEXPECTED\n", hres); + + SET_EXPECT(OnStateChange_UNINITIALIZED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_UNINITIALIZED); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + todo_wine + CHECK_CALLED(OnEnterScript); + todo_wine + CHECK_CALLED(OnLeaveScript); + + test_state(script, SCRIPTSTATE_CONNECTED); + + dispex = get_script_dispatch(script); + ok(dispex != NULL, "dispex == NULL\n"); + if(dispex) + IDispatchEx_Release(dispex); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_UNINITIALIZED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_UNINITIALIZED); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + test_state(script, SCRIPTSTATE_CLOSED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x, expected E_UNEXPECTED\n", hres); + + test_state(script, SCRIPTSTATE_CLOSED); + + IUnknown_Release(parse); + + ref = IActiveScript_Release(script); + ok(!ref, "ref = %d\n", ref); +} + + static BOOL check_vbscript(void) { IActiveScript *vbscript; @@ -381,10 +498,12 @@ START_TEST(vbscript) { CoInitialize(NULL); - if(check_vbscript()) + if(check_vbscript()) { test_vbscript(); - else + test_vbscript_uninitializing(); + }else { win_skip("VBScript engine not available\n"); + } CoUninitialize(); } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 9d23499..2ca5584 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -98,27 +98,33 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) { switch(This->state) { case SCRIPTSTATE_CONNECTED: + change_state(This, SCRIPTSTATE_DISCONNECTED); + if(state == SCRIPTSTATE_DISCONNECTED) + return; + /* FALLTHROUGH */ case SCRIPTSTATE_STARTED: case SCRIPTSTATE_DISCONNECTED: - FIXME("unimplemented state %d\n", This->state); + if(This->state == SCRIPTSTATE_DISCONNECTED) + change_state(This, SCRIPTSTATE_INITIALIZED); if(state == SCRIPTSTATE_INITIALIZED) break; /* FALLTHROUGH */ case SCRIPTSTATE_INITIALIZED: - destroy_script(This->ctx); - This->ctx = NULL; - This->thread_id = 0; - - change_state(This, state); - if(state == SCRIPTSTATE_UNINITIALIZED) - break; - /* FALLTHROUGH */ case SCRIPTSTATE_UNINITIALIZED: + change_state(This, state); + if(This->site) { IActiveScriptSite_Release(This->site); This->site = NULL; } + This->thread_id = 0; + + if(state == SCRIPTSTATE_CLOSED) { + destroy_script(This->ctx); + This->ctx = NULL; + } + break; default: assert(0);

1 0

Jacek Caban : vbscript: Added GetScriptDispatch implementation.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 71cbb6e17cd0aa3f44ddff97f2dca03687547b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cbb6e17cd0aa3f44ddff97f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 11:14:14 2011 +0200 vbscript: Added GetScriptDispatch implementation. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/tests/vbscript.c | 12 +++ dlls/vbscript/vbdisp.c | 205 ++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 24 +++++- dlls/vbscript/vbscript.h | 11 ++ 5 files changed, 251 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71cbb6e17cd0aa3f44ddf…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011