January 2015 - Wine-Commits

Sebastian Lackner : wininet: Fix handling of subdirectory in FtpFindFirstFile.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: 2ce16509687079c1f95bdfd018e08c0dee36aaa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce16509687079c1f95bdfd01… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Dec 16 01:37:12 2014 +0100 wininet: Fix handling of subdirectory in FtpFindFirstFile. Based on a patch by Mike Ruprecht. --- dlls/wininet/ftp.c | 18 +++++++++++++++++- dlls/wininet/tests/ftp.c | 23 +++++++++++++++++++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f45e495..64c06c3 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -831,6 +831,7 @@ static HINTERNET FTP_FtpFindFirstFileW(ftp_session_t *lpwfs, INT nResCode; appinfo_t *hIC = NULL; HINTERNET hFindNext = NULL; + LPWSTR lpszSearchPath = NULL; TRACE("\n"); @@ -846,7 +847,20 @@ static HINTERNET FTP_FtpFindFirstFileW(ftp_session_t *lpwfs, if (!FTP_SendPortOrPasv(lpwfs)) goto lend; - if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_LIST, NULL, + /* split search path into file and path */ + if (lpszSearchFile) + { + LPCWSTR name = lpszSearchFile, p; + if ((p = strrchrW( name, '\\' ))) name = p + 1; + if ((p = strrchrW( name, '/' ))) name = p + 1; + if (name != lpszSearchFile) + { + lpszSearchPath = heap_strndupW(lpszSearchFile, name - lpszSearchFile); + lpszSearchFile = name; + } + } + + if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_LIST, lpszSearchPath, lpwfs->hdr.lpfnStatusCB, &lpwfs->hdr, lpwfs->hdr.dwContext)) goto lend; @@ -872,6 +886,8 @@ static HINTERNET FTP_FtpFindFirstFileW(ftp_session_t *lpwfs, } lend: + heap_free(lpszSearchPath); + if (lpwfs->lstnSocket != -1) { closesocket(lpwfs->lstnSocket); diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index b88b136..567545d 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -751,6 +751,7 @@ static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) HINTERNET hSearch2; HINTERNET hOpenFile; DWORD error; + BOOL success; /* NULL as the search file ought to return the first file in the directory */ SetLastError(0xdeadbeef); @@ -770,13 +771,13 @@ static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) /* Try a valid filename in a subdirectory search */ SetLastError(0xdeadbeef); hSearch = FtpFindFirstFileA(hFtp, "pub/wine", &findData, 0, 0); - todo_wine ok ( hSearch != NULL, "Expected FtpFindFirstFileA to pass\n" ); + ok( hSearch != NULL, "Expected FtpFindFirstFileA to pass\n" ); InternetCloseHandle(hSearch); /* Try a valid filename in a subdirectory wildcard search */ SetLastError(0xdeadbeef); hSearch = FtpFindFirstFileA(hFtp, "pub/w*", &findData, 0, 0); - todo_wine ok ( hSearch != NULL, "Expected FtpFindFirstFileA to pass\n" ); + ok( hSearch != NULL, "Expected FtpFindFirstFileA to pass\n" ); InternetCloseHandle(hSearch); /* Try an invalid wildcard search */ @@ -785,6 +786,24 @@ static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) ok ( hSearch == NULL, "Expected FtpFindFirstFileA to fail\n" ); InternetCloseHandle(hSearch); /* Just in case */ + /* change current directory, and repeat those tests - this shows + * that the search string is interpreted as relative directory. */ + success = FtpSetCurrentDirectoryA(hFtp, "pub"); + ok( success, "Expected FtpSetCurrentDirectory to succeed\n" ); + + SetLastError(0xdeadbeef); + hSearch = FtpFindFirstFileA(hFtp, "wine", &findData, 0, 0); + ok( hSearch != NULL, "Expected FtpFindFirstFileA to pass\n" ); + InternetCloseHandle(hSearch); + + SetLastError(0xdeadbeef); + hSearch = FtpFindFirstFileA(hFtp, "w*", &findData, 0, 0); + ok( hSearch != NULL, "Expected FtpFindFirstFileA to pass\n" ); + InternetCloseHandle(hSearch); + + success = FtpSetCurrentDirectoryA(hFtp, ".."); + ok( success, "Expected FtpSetCurrentDirectory to succeed\n" ); + /* Try FindFirstFile between FtpOpenFile and InternetCloseHandle */ SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0);

1 0

Nikolay Sivov : winhttp: Release typeinfos and typelib on dll unload.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: e606551c21f59bac21ed1d33901c3a1740e5a6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e606551c21f59bac21ed1d339… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 13:48:48 2015 +0300 winhttp: Release typeinfos and typelib on dll unload. --- dlls/winhttp/main.c | 1 + dlls/winhttp/request.c | 12 ++++++++++++ dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 9cdcc98..cd2d114 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -48,6 +48,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_DETACH: if (lpv) break; netconn_unload(); + release_typelib(); break; } return TRUE; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a5f5897..de5eae4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2758,6 +2758,18 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) return S_OK; } +void release_typelib(void) +{ + unsigned i; + + for (i = 0; i < sizeof(winhttp_typeinfo)/sizeof(*winhttp_typeinfo); i++) + if (winhttp_typeinfo[i]) + ITypeInfo_Release(winhttp_typeinfo[i]); + + if (winhttp_typelib) + ITypeLib_Release(winhttp_typelib); +} + static HRESULT WINAPI winhttp_request_GetTypeInfo( IWinHttpRequest *iface, UINT index, diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index d08d153..51043fd 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -283,6 +283,7 @@ BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HID void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; +void release_typelib( void ) DECLSPEC_HIDDEN; static inline void *heap_alloc( SIZE_T size ) {

1 0

Michael Stefaniuc : devenum: Use the return value of __wine_register_resources (PVS-Studio).
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: d6829afe4bc42f43136034b1d24de47323dd0a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6829afe4bc42f43136034b1d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 14 11:11:21 2015 +0100 devenum: Use the return value of __wine_register_resources (PVS-Studio). --- dlls/devenum/devenum_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 716a05d..cb4b454 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -95,6 +95,8 @@ HRESULT WINAPI DllRegisterServer(void) TRACE("\n"); res = __wine_register_resources( DEVENUM_hInstance ); + if (FAILED(res)) + return res; /*** ActiveMovieFilter Categories ***/

1 0

Nikolay Sivov : hnetcfg: Return NET_FW_IP_VERSION_ANY as ipVersion property value.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: 23927e26442bd894149d850ce08b7104b231ea35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23927e26442bd894149d850ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 08:25:56 2015 +0300 hnetcfg: Return NET_FW_IP_VERSION_ANY as ipVersion property value. --- dlls/hnetcfg/apps.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index dded141..18031a3 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -256,8 +256,12 @@ static HRESULT WINAPI fw_app_get_IpVersion( { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - FIXME("%p, %p\n", This, ipVersion); - return E_NOTIMPL; + TRACE("%p, %p\n", This, ipVersion); + + if (!ipVersion) + return E_POINTER; + *ipVersion = NET_FW_IP_VERSION_ANY; + return S_OK; } static HRESULT WINAPI fw_app_put_IpVersion( @@ -266,8 +270,8 @@ static HRESULT WINAPI fw_app_put_IpVersion( { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - FIXME("%p, %u\n", This, ipVersion); - return E_NOTIMPL; + TRACE("%p, %u\n", This, ipVersion); + return S_OK; } static HRESULT WINAPI fw_app_get_Scope(

1 0

Hans Leidekker : wbemdisp: Implement ISWbemServices::InstancesOf.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: 78433f11644a9c74c13ff16f26dbf1aaaabd01f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78433f11644a9c74c13ff16f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 14 15:35:47 2015 +0100 wbemdisp: Implement ISWbemServices::InstancesOf. --- dlls/wbemdisp/locator.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 0a6b076..9731630 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -671,6 +671,18 @@ static HRESULT WINAPI services_DeleteAsync( return E_NOTIMPL; } +static BSTR build_query_string( const WCHAR *class ) +{ + static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; + UINT len = strlenW(class) + sizeof(selectW) / sizeof(selectW[0]); + BSTR ret; + + if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; + strcpyW( ret, selectW ); + strcatW( ret, class ); + return ret; +} + static HRESULT WINAPI services_InstancesOf( ISWbemServices *iface, BSTR strClass, @@ -678,8 +690,22 @@ static HRESULT WINAPI services_InstancesOf( IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet ) { - FIXME( "\n" ); - return E_NOTIMPL; + static const WCHAR wqlW[] = {'W','Q','L',0}; + BSTR query, wql = SysAllocString( wqlW ); + HRESULT hr; + + TRACE( "%p, %s, %x, %p, %p\n", iface, debugstr_w(strClass), iFlags, objWbemNamedValueSet, + objWbemObjectSet ); + + if (!(query = build_query_string( strClass ))) + { + SysFreeString( wql ); + return E_OUTOFMEMORY; + } + hr = ISWbemServices_ExecQuery( iface, query, wql, iFlags, objWbemNamedValueSet, objWbemObjectSet ); + SysFreeString( wql ); + SysFreeString( query ); + return hr; } static HRESULT WINAPI services_InstancesOfAsync(

1 0

Nikolay Sivov : hnetcfg: Fix refcount of returned ITypeInfo pointer.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: ea3ba293322280b0d448488266c2e2861f14208b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3ba293322280b0d44848826… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 08:29:37 2015 +0300 hnetcfg: Fix refcount of returned ITypeInfo pointer. --- dlls/hnetcfg/apps.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 18031a3..a0530e1 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -144,6 +144,7 @@ HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) ITypeInfo_Release( info ); } *ret = typeinfo[tid]; + ITypeInfo_AddRef(typeinfo[tid]); return S_OK; }

1 0

Hans Leidekker : wbemdisp: Implement ISWbemObject::Invoke.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: 054b260619b41d9375a3091aff39c32f4864313b URL: http://source.winehq.org/git/wine.git/?a=commit;h=054b260619b41d9375a3091af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 14 15:37:56 2015 +0100 wbemdisp: Implement ISWbemObject::Invoke. --- dlls/wbemdisp/locator.c | 29 ++++++++++++++++++++--------- dlls/wbemdisp/tests/wbemdisp.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 989c610..c604983 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -270,6 +270,16 @@ static HRESULT WINAPI object_GetIDsOfNames( return S_OK; } +static BSTR get_member_name( struct object *object, DISPID dispid ) +{ + UINT i; + for (i = 0; i < object->nb_members; i++) + { + if (object->members[i].dispid == dispid) return object->members[i].name; + } + return NULL; +} + static HRESULT WINAPI object_Invoke( ISWbemObject *iface, DISPID member, @@ -282,20 +292,21 @@ static HRESULT WINAPI object_Invoke( UINT *arg_err ) { struct object *object = impl_from_ISWbemObject( iface ); - ITypeInfo *typeinfo; - HRESULT hr; + BSTR name; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), + TRACE( "%p, %x, %s, %u, %x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - hr = get_typeinfo( ISWbemObject_tid, &typeinfo ); - if (SUCCEEDED(hr)) + if (flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) { - hr = ITypeInfo_Invoke( typeinfo, &object->ISWbemObject_iface, member, flags, - params, result, excep_info, arg_err ); - ITypeInfo_Release( typeinfo ); + FIXME( "flags %x not supported\n", flags ); + return E_NOTIMPL; } - return hr; + if (!(name = get_member_name( object, member ))) + return DISP_E_MEMBERNOTFOUND; + + memset( params, 0, sizeof(*params) ); + return IWbemClassObject_Get( object->object, name, 0, result, NULL, NULL ); } static HRESULT WINAPI object_Put_( diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index d91e5b8..e3d432b 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -130,10 +130,12 @@ static void test_ParseDisplayName(void) if (enumvar) { - VARIANT var; + VARIANT var, res; ULONG fetched; IDispatch *dispatch = NULL; DISPID dispid; + DISPPARAMS params; + UINT arg_err; fetched = 0xdeadbeef; hr = IEnumVARIANT_Next( enumvar, 0, &var, &fetched ); @@ -183,6 +185,42 @@ static void test_ParseDisplayName(void) ok( hr == S_OK, "got %x\n", hr ); ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); + if (dispid == 0x1800001) /* crashes on win2k */ + { + V_VT( &res ) = VT_ERROR; + V_BSTR( &res ) = (BSTR)0xdeadbeef; + params.rgvarg = (VARIANTARG *)0xdeadbeef; + params.rgdispidNamedArgs = (DISPID *)0xdeadbeef; + params.cArgs = params.cNamedArgs = 0xdeadbeef; + arg_err = 0xdeadbeef; + hr = IDispatch_Invoke( dispatch, DISPID_UNKNOWN, &IID_NULL, english, + DISPATCH_METHOD|DISPATCH_PROPERTYGET, + &params, &res, NULL, &arg_err ); + ok( hr == DISP_E_MEMBERNOTFOUND || hr == S_OK /* winxp */, "got %x\n", hr ); + ok( params.rgvarg == (VARIANTARG *)0xdeadbeef, "got %p\n", params.rgvarg ); + ok( params.rgdispidNamedArgs == (DISPID *)0xdeadbeef, "got %p\n", params.rgdispidNamedArgs ); + ok( params.cArgs == 0xdeadbeef, "got %u\n", params.cArgs ); + ok( params.cNamedArgs == 0xdeadbeef, "got %u\n", params.cNamedArgs ); + ok( V_VT( &res ) == VT_ERROR, "got %u\n", V_VT( &res ) ); + ok( V_ERROR( &res ) == 0xdeadbeef, "got %u\n", V_VT( &res ) ); + ok( arg_err == 0xdeadbeef, "got %u\n", arg_err ); + if (hr == S_OK) VariantClear( &res ); + } + + V_VT( &res ) = VT_ERROR; + V_BSTR( &res ) = (BSTR)0xdeadbeef; + memset( &params, 0, sizeof(params) ); + hr = IDispatch_Invoke( dispatch, dispid, &IID_NULL, english, + DISPATCH_METHOD|DISPATCH_PROPERTYGET, + &params, &res, NULL, NULL ); + ok( hr == S_OK, "got %x\n", hr ); + ok( params.rgvarg == NULL, "got %p\n", params.rgvarg ); + ok( params.rgdispidNamedArgs == NULL, "got %p\n", params.rgdispidNamedArgs ); + ok( !params.cArgs, "got %u\n", params.cArgs ); + ok( !params.cNamedArgs, "got %u\n", params.cNamedArgs ); + ok( V_VT( &res ) == VT_BSTR, "got %u\n", V_VT( &res ) ); + ok( V_BSTR( &res ) != (BSTR)0xdeadbeef, "got %u\n", V_VT( &res ) ); + VariantClear( &res ); VariantClear( &var ); fetched = 0xdeadbeef;

1 0

Hans Leidekker : wbemdisp: Implement ISwbemObject::GetIDsOfNames.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: e992df727a9bb5b54fbe4df4f1329bcabbb30bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e992df727a9bb5b54fbe4df4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 14 15:37:30 2015 +0100 wbemdisp: Implement ISwbemObject::GetIDsOfNames. --- dlls/wbemdisp/locator.c | 90 ++++++++++++++++++++++++++++++++++++++---- dlls/wbemdisp/tests/wbemdisp.c | 44 ++++++++++++++++++++- 2 files changed, 125 insertions(+), 9 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index c3103fa..989c610 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -93,11 +93,22 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) return S_OK; } +#define DISPID_BASE 0x1800000 + +struct member +{ + BSTR name; + DISPID dispid; +}; + struct object { ISWbemObject ISWbemObject_iface; LONG refs; IWbemClassObject *object; + struct member *members; + UINT nb_members; + DISPID last_dispid; }; static inline struct object *impl_from_ISWbemObject( @@ -120,8 +131,12 @@ static ULONG WINAPI object_Release( LONG refs = InterlockedDecrement( &object->refs ); if (!refs) { + UINT i; + TRACE( "destroying %p\n", object ); IWbemClassObject_Release( object->object ); + for (i = 0; i < object->nb_members; i++) SysFreeString( object->members[i].name ); + heap_free( object->members ); heap_free( object ); } return refs; @@ -169,9 +184,63 @@ static HRESULT WINAPI object_GetTypeInfo( ITypeInfo **info ) { struct object *object = impl_from_ISWbemObject( iface ); - TRACE( "%p, %u, %u, %p\n", object, index, lcid, info ); + FIXME( "%p, %u, %u, %p\n", object, index, lcid, info ); + return E_NOTIMPL; +} + +#define DISPID_BASE 0x1800000 + +static HRESULT init_members( struct object *object ) +{ + LONG bound, i; + SAFEARRAY *sa; + HRESULT hr; + + if (object->members) return S_OK; + + hr = IWbemClassObject_GetNames( object->object, NULL, 0, NULL, &sa ); + if (FAILED( hr )) return hr; + hr = SafeArrayGetUBound( sa, 1, &bound ); + if (FAILED( hr )) + { + SafeArrayDestroy( sa ); + return hr; + } + if (!(object->members = heap_alloc( sizeof(struct member) * (bound + 1) ))) + { + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } + for (i = 0; i <= bound; i++) + { + hr = SafeArrayGetElement( sa, &i, &object->members[i].name ); + if (FAILED( hr )) + { + for (i--; i >= 0; i--) SysFreeString( object->members[i].name ); + SafeArrayDestroy( sa ); + heap_free( object->members ); + object->members = NULL; + return E_OUTOFMEMORY; + } + object->members[i].dispid = 0; + } + object->nb_members = bound + 1; + SafeArrayDestroy( sa ); + return S_OK; +} - return get_typeinfo( ISWbemObject_tid, info ); +static DISPID get_member_dispid( struct object *object, const WCHAR *name ) +{ + UINT i; + for (i = 0; i < object->nb_members; i++) + { + if (!strcmpiW( object->members[i].name, name )) + { + if (!object->members[i].dispid) object->members[i].dispid = ++object->last_dispid; + return object->members[i].dispid; + } + } + return DISPID_UNKNOWN; } static HRESULT WINAPI object_GetIDsOfNames( @@ -183,20 +252,22 @@ static HRESULT WINAPI object_GetIDsOfNames( DISPID *dispid ) { struct object *object = impl_from_ISWbemObject( iface ); - ITypeInfo *typeinfo; HRESULT hr; + UINT i; TRACE( "%p, %s, %p, %u, %u, %p\n", object, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; - hr = get_typeinfo( ISWbemObject_tid, &typeinfo ); - if (SUCCEEDED(hr)) + hr = init_members( object ); + if (FAILED( hr )) return hr; + + for (i = 0; i < count; i++) { - hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); - ITypeInfo_Release( typeinfo ); + if ((dispid[i] = get_member_dispid( object, names[i] )) == DISPID_UNKNOWN) break; } - return hr; + if (i != count) return DISP_E_UNKNOWNNAME; + return S_OK; } static HRESULT WINAPI object_Invoke( @@ -260,6 +331,9 @@ static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject * object->refs = 1; object->object = wbem_object; IWbemClassObject_AddRef( object->object ); + object->members = NULL; + object->nb_members = 0; + object->last_dispid = DISPID_BASE; *obj = &object->ISWbemObject_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 863115b..d91e5b8 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -26,10 +26,14 @@ #include "wine/test.h" DEFINE_GUID(CLSID_WINMGMTS,0x172bddf8,0xceea,0x11d1,0x8b,0x05,0x00,0x60,0x08,0x06,0xd9,0xb6); +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static void test_ParseDisplayName(void) { static const WCHAR biosW[] = {'W','i','n','3','2','_','B','i','o','s',0}; + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; + static const WCHAR nosuchW[] = {'N','o','S','u','c','h',0}; static const WCHAR name1[] = {'w','i','n','m','g','m','t','s',':',0}; static const WCHAR name2[] = @@ -54,12 +58,13 @@ static void test_ParseDisplayName(void) { name3, S_OK, &IID_ISWbemObject, sizeof(name3)/sizeof(name3[0]) - 1 }, { name4, S_OK, &IID_ISWbemObject, sizeof(name4)/sizeof(name4[0]) - 1 } }; + LCID english = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); IParseDisplayName *displayname; IBindCtx *ctx; IMoniker *moniker; IUnknown *obj; BSTR str; - ULONG i, eaten; + ULONG i, eaten, count; HRESULT hr; hr = CoCreateInstance( &CLSID_WINMGMTS, NULL, CLSCTX_INPROC_SERVER, &IID_IParseDisplayName, (void **)&displayname ); @@ -127,6 +132,8 @@ static void test_ParseDisplayName(void) { VARIANT var; ULONG fetched; + IDispatch *dispatch = NULL; + DISPID dispid; fetched = 0xdeadbeef; hr = IEnumVARIANT_Next( enumvar, 0, &var, &fetched ); @@ -141,6 +148,41 @@ static void test_ParseDisplayName(void) ok( fetched == 1, "got %u\n", fetched ); ok( V_VT( &var ) == VT_DISPATCH, "got %u\n", V_VT( &var ) ); ok( V_DISPATCH( &var ) != (IDispatch *)0xdeadbeef, "got %u\n", V_VT( &var ) ); + + dispatch = V_DISPATCH( &var ); + count = 0; + hr = IDispatch_GetTypeInfoCount( dispatch, &count ); + ok( hr == S_OK, "got %x\n", hr ); + ok( count == 1, "got %u\n", count ); + + str = SysAllocString( manufacturerW ); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); + + str = SysAllocString( versionW ); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + ok( dispid == 0x1800002 || dispid == 0x119 /* win2k */, "got %x\n", dispid ); + + str = SysAllocString( nosuchW ); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); + SysFreeString( str ); + ok( hr == DISP_E_UNKNOWNNAME, "got %x\n", hr ); + ok( dispid == DISPID_UNKNOWN, "got %x\n", dispid ); + + str = SysAllocString( manufacturerW ); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); + VariantClear( &var ); fetched = 0xdeadbeef;

1 0

Nikolay Sivov : winhttp: Fix typeinfo refcount in GetTypeInfo().
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: 3816e44da1e0ef7db6155e791e2dfbd32ea622cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3816e44da1e0ef7db6155e791… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 13:42:37 2015 +0300 winhttp: Fix typeinfo refcount in GetTypeInfo(). --- dlls/winhttp/request.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 61f5439..a5f5897 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2754,6 +2754,7 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) ITypeInfo_Release( typeinfo ); } *ret = winhttp_typeinfo[tid]; + ITypeInfo_AddRef(winhttp_typeinfo[tid]); return S_OK; }

1 0

Jacek Caban : jscript: Don' t allow function execution if script engine is not in started state.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: 091738ffdf1cb2f71397fb37a9da2369cb945888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=091738ffdf1cb2f71397fb37a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 13 21:45:56 2015 +0100 jscript: Don't allow function execution if script engine is not in started state. --- dlls/jscript/function.c | 5 +++ dlls/jscript/tests/run.c | 84 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 79 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 276c4f9..43ade98 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -205,6 +205,11 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis scope_chain_t *scope; HRESULT hres; + if(ctx->state == SCRIPTSTATE_UNINITIALIZED || ctx->state == SCRIPTSTATE_CLOSED) { + WARN("Script engine state does not allow running code.\n"); + return E_UNEXPECTED; + } + if(!function->func_code) { FIXME("no source\n"); return E_FAIL; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index c0a62b8..fb313d5 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1908,7 +1908,7 @@ static void test_isvisible(BOOL global_members) IActiveScriptParse_Release(parser); } -static HRESULT parse_script_expr(const char *expr, VARIANT *res) +static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript **engine_ret) { IActiveScriptParse *parser; IActiveScript *engine; @@ -1939,9 +1939,14 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res) hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, res, NULL); SysFreeString(str); - IActiveScript_Release(engine); IActiveScriptParse_Release(parser); + if(engine_ret) { + *engine_ret = engine; + }else { + IActiveScript_Close(engine); + IActiveScript_Release(engine); + } return hres; } @@ -1952,7 +1957,7 @@ static void test_default_value(void) VARIANT v; HRESULT hres; - hres = parse_script_expr("new Date()", &v); + hres = parse_script_expr("new Date()", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); disp = V_DISPATCH(&v); @@ -1976,38 +1981,38 @@ static void test_script_exprs(void) testing_expr = TRUE; - hres = parse_script_expr("true", &v); + hres = parse_script_expr("true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); - hres = parse_script_expr("false, true", &v); + hres = parse_script_expr("false, true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - hres = parse_script_expr("reportSuccess(); true", &v); + hres = parse_script_expr("reportSuccess(); true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); - hres = parse_script_expr("if(false) true", &v); + hres = parse_script_expr("if(false) true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); - hres = parse_script_expr("return testPropGet", &v); + hres = parse_script_expr("return testPropGet", &v, NULL); ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); - hres = parse_script_expr("reportSuccess(); return true", &v); + hres = parse_script_expr("reportSuccess(); return true", &v, NULL); ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - hres = parse_script_expr("reportSuccess(); true", NULL); + hres = parse_script_expr("reportSuccess(); true", NULL, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); @@ -2017,6 +2022,64 @@ static void test_script_exprs(void) testing_expr = FALSE; } +static void test_invokeex(void) +{ + DISPID func_id, prop_id; + DISPPARAMS dp = {NULL}; + IActiveScript *script; + IDispatchEx *dispex; + VARIANT v; + BSTR str; + HRESULT hres; + + hres = parse_script_expr("var o = {func: function() {return 3;}, prop: 6}; o", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + VariantClear(&v); + + str = a2bstr("func"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + str = a2bstr("prop"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 3, "V_I4(v) = %d\n", V_I4(&v)); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 6, "V_I4(v) = %d\n", V_I4(&v)); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + str = a2bstr("func"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == E_UNEXPECTED || broken(hres == 0x800a1393), "InvokeEx failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 6, "V_I4(v) = %d\n", V_I4(&v)); + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); +} + struct bom_test { WCHAR str[1024]; @@ -2335,6 +2398,7 @@ static BOOL run_tests(void) ok(hres != S_OK, "ParseScriptText have not failed\n"); test_script_exprs(); + test_invokeex(); parse_script_with_error_a( "?",

1 0