wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Hans Leidekker : wbemdisp: Implement ISWbemObjectSet::get__NewEnum.
by Alexandre Julliard 14 Jan '15

14 Jan '15

Module: wine Branch: master Commit: c245fb66f89da61818b743e1f1df9b00343968dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c245fb66f89da61818b743e1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 14 15:36:16 2015 +0100 wbemdisp: Implement ISWbemObjectSet::get__NewEnum. --- dlls/wbemdisp/locator.c | 156 +++++++++++++++++++++++++++++++++++++++-- dlls/wbemdisp/tests/wbemdisp.c | 69 ++++++++++++++++++ 2 files changed, 221 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 9731630..c3103fa 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); +static HRESULT EnumVARIANT_create( ISWbemObjectSet *, IEnumVARIANT ** ); + enum type_id { ISWbemLocator_tid, @@ -401,8 +403,11 @@ static HRESULT WINAPI objectset_get__NewEnum( ISWbemObjectSet *iface, IUnknown **pUnk ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + + TRACE( "%p, %p\n", objectset, pUnk ); + + return EnumVARIANT_create( iface, (IEnumVARIANT **)pUnk ); } static HRESULT WINAPI objectset_Item( @@ -420,12 +425,20 @@ static HRESULT WINAPI objectset_get_Count( LONG *iCount ) { struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + LONG count = 0, total = 0; TRACE( "%p, %p\n", objectset, iCount ); - *iCount = 0; + while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) count++; + IEnumWbemClassObject_Reset( objectset->objectenum ); - while (!IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 )) (*iCount)++; + while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) total++; + + count = total - count; + IEnumWbemClassObject_Reset( objectset->objectenum ); + while (count--) IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ); + + *iCount = total; return S_OK; } @@ -479,6 +492,141 @@ static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISW return S_OK; } +struct enumvar +{ + IEnumVARIANT IEnumVARIANT_iface; + LONG refs; + ISWbemObjectSet *objectset; +}; + +static inline struct enumvar *impl_from_IEnumVARIANT( + IEnumVARIANT *iface ) +{ + return CONTAINING_RECORD( iface, struct enumvar, IEnumVARIANT_iface ); +} + +static ULONG WINAPI enumvar_AddRef( + IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + return InterlockedIncrement( &enumvar->refs ); +} + +static ULONG WINAPI enumvar_Release( + IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + LONG refs = InterlockedDecrement( &enumvar->refs ); + if (!refs) + { + TRACE( "destroying %p\n", enumvar ); + ISWbemObjectSet_Release( enumvar->objectset ); + heap_free( enumvar ); + } + return refs; +} + +static HRESULT WINAPI enumvar_QueryInterface( + IEnumVARIANT *iface, + REFIID riid, + void **ppvObject ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + + TRACE( "%p %s %p\n", enumvar, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_IEnumVARIANT ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = enumvar; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + IEnumVARIANT_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + struct objectset *objectset = impl_from_ISWbemObjectSet( enumvar->objectset ); + IWbemClassObject *obj; + ULONG count = 0; + + TRACE( "%p, %u, %p, %p\n", iface, celt, var, fetched ); + + if (celt) IEnumWbemClassObject_Next( objectset->objectenum, WBEM_INFINITE, 1, &obj, &count ); + if (count) + { + ISWbemObject *sobj; + HRESULT hr; + + hr = SWbemObject_create( obj, &sobj ); + IWbemClassObject_Release( obj ); + if (FAILED( hr )) return hr; + + V_VT( var ) = VT_DISPATCH; + V_DISPATCH( var ) = (IDispatch *)sobj; + } + if (fetched) *fetched = count; + return (count < celt) ? S_FALSE : S_OK; +} + +static HRESULT WINAPI enumvar_Skip( IEnumVARIANT *iface, ULONG celt ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + struct objectset *objectset = impl_from_ISWbemObjectSet( enumvar->objectset ); + + TRACE( "%p, %u\n", iface, celt ); + + return IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, celt ); +} + +static HRESULT WINAPI enumvar_Reset( IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + struct objectset *objectset = impl_from_ISWbemObjectSet( enumvar->objectset ); + + TRACE( "%p\n", iface ); + + return IEnumWbemClassObject_Reset( objectset->objectenum ); +} + +static HRESULT WINAPI enumvar_Clone( IEnumVARIANT *iface, IEnumVARIANT **penum ) +{ + FIXME( "%p, %p\n", iface, penum ); + return E_NOTIMPL; +} + +static const struct IEnumVARIANTVtbl enumvar_vtbl = +{ + enumvar_QueryInterface, + enumvar_AddRef, + enumvar_Release, + enumvar_Next, + enumvar_Skip, + enumvar_Reset, + enumvar_Clone +}; + +static HRESULT EnumVARIANT_create( ISWbemObjectSet *objectset, IEnumVARIANT **obj ) +{ + struct enumvar *enumvar; + + if (!(enumvar = heap_alloc( sizeof(*enumvar) ))) return E_OUTOFMEMORY; + enumvar->IEnumVARIANT_iface.lpVtbl = &enumvar_vtbl; + enumvar->refs = 1; + enumvar->objectset = objectset; + ISWbemObjectSet_AddRef( enumvar->objectset ); + + *obj = &enumvar->IEnumVARIANT_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + struct services { ISWbemServices ISWbemServices_iface; diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 8c0b628..863115b 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -29,6 +29,7 @@ DEFINE_GUID(CLSID_WINMGMTS,0x172bddf8,0xceea,0x11d1,0x8b,0x05,0x00,0x60,0x08,0x0 static void test_ParseDisplayName(void) { + static const WCHAR biosW[] = {'W','i','n','3','2','_','B','i','o','s',0}; static const WCHAR name1[] = {'w','i','n','m','g','m','t','s',':',0}; static const WCHAR name2[] = @@ -90,6 +91,74 @@ static void test_ParseDisplayName(void) } } + str = SysAllocString( name1 ); + eaten = 0xdeadbeef; + moniker = NULL; + hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + ok( eaten == lstrlenW(name1), "got %u\n", eaten ); + if (moniker) + { + ISWbemServices *services = NULL; + + hr = IMoniker_BindToObject( moniker, ctx, NULL, &IID_IUnknown, (void **)&services ); + ok( hr == S_OK, "got %x\n", hr ); + if (services) + { + ISWbemObjectSet *objectset = NULL; + + str = SysAllocString( biosW ); + hr = ISWbemServices_InstancesOf( services, str, 0, NULL, &objectset ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + if (objectset) + { + hr = ISWbemObjectSet_get__NewEnum( objectset, &obj ); + ok( hr == S_OK, "got %x\n", hr ); + if (obj) + { + IEnumVARIANT *enumvar = NULL; + + hr = IUnknown_QueryInterface( obj, &IID_IEnumVARIANT, (void **)&enumvar ); + ok( hr == S_OK, "got %x\n", hr ); + + if (enumvar) + { + VARIANT var; + ULONG fetched; + + fetched = 0xdeadbeef; + hr = IEnumVARIANT_Next( enumvar, 0, &var, &fetched ); + ok( hr == S_OK, "got %x\n", hr ); + ok( !fetched, "got %u\n", fetched ); + + fetched = 0xdeadbeef; + V_VT( &var ) = VT_ERROR; + V_ERROR( &var ) = 0xdeadbeef; + hr = IEnumVARIANT_Next( enumvar, 1, &var, &fetched ); + ok( hr == S_OK, "got %x\n", hr ); + 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 ) ); + VariantClear( &var ); + + fetched = 0xdeadbeef; + hr = IEnumVARIANT_Next( enumvar, 1, &var, &fetched ); + ok( hr == S_FALSE, "got %x\n", hr ); + ok( !fetched, "got %u\n", fetched ); + + IEnumVARIANT_Release( enumvar ); + } + IUnknown_Release( obj ); + } + ISWbemObjectSet_Release( objectset ); + } + IUnknown_Release( services ); + } + IMoniker_Release( moniker ); + } + IBindCtx_Release( ctx ); IParseDisplayName_Release( displayname ); }

1 0

Hans Leidekker : wbemdisp: Implement ISWbemServices::InstancesOf.
by Alexandre Julliard 14 Jan '15

14 Jan '15

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 : scrrun: Fix refcount on GetTypeInfo().
by Alexandre Julliard 14 Jan '15

14 Jan '15

Module: wine Branch: master Commit: c1a3a1d5168ba5a4ba7704e5b7d275b005972729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a3a1d5168ba5a4ba7704e5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 15:23:06 2015 +0300 scrrun: Fix refcount on GetTypeInfo(). --- dlls/scrrun/scrrun.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index bad5b1c..3afcd50 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -152,6 +152,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) } *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(typeinfos[tid]); return S_OK; }

1 0

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

14 Jan '15

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 : hnetcfg: Fix refcount of returned ITypeInfo pointer.
by Alexandre Julliard 14 Jan '15

14 Jan '15

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

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

14 Jan '15

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

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

14 Jan '15

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

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

14 Jan '15

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

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

14 Jan '15

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

Jacek Caban : jscript: Added more SCRIPTSTATE_STARTED tests.
by Alexandre Julliard 14 Jan '15

14 Jan '15

Module: wine Branch: master Commit: a2a57791cd72bb8fd4a7df7c53a5c4799cab78f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a57791cd72bb8fd4a7df7c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 13 21:46:02 2015 +0100 jscript: Added more SCRIPTSTATE_STARTED tests. --- dlls/jscript/tests/run.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index fb313d5..1b895bb 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -139,6 +139,7 @@ DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_GLOBAL_TESTNORES 0x1019 #define DISPID_GLOBAL_DISPEXFUNC 0x101a #define DISPID_GLOBAL_TESTPROPPUTREF 0x101b +#define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -161,6 +162,7 @@ static const char *test_name = "(null)"; static IDispatch *script_disp; static int invoke_version; static IActiveScriptError *script_error; +static IActiveScript *script_engine; static const CLSID *engine_clsid = &CLSID_JScript; /* Returns true if the user interface is in English. Note that this does not @@ -756,6 +758,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "getScriptState")) { + *pid = DISPID_GLOBAL_GETSCRIPTSTATE; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -1108,6 +1115,18 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; + case DISPID_GLOBAL_GETSCRIPTSTATE: { + SCRIPTSTATE state; + HRESULT hres; + + hres = IActiveScript_GetScriptState(script_engine, &state); + ok(hres == S_OK, "GetScriptState failed: %08x\n", hres); + + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = state; + return S_OK; + } + case DISPID_GLOBAL_PROPARGPUT: CHECK_EXPECT(global_propargput_i); ok(wFlags == INVOKE_PROPERTYPUT, "wFlags = %x\n", wFlags); @@ -1908,6 +1927,47 @@ static void test_isvisible(BOOL global_members) IActiveScriptParse_Release(parser); } +static void test_start(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + script_engine = engine = create_script(); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + + str = a2bstr("ok(getScriptState() === 5, \"getScriptState = \" + getScriptState());\n" + "reportSuccess();"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + script_engine = NULL; +} + static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript **engine_ret) { IActiveScriptParse *parser; @@ -2380,6 +2440,7 @@ static BOOL run_tests(void) test_isvisible(FALSE); test_isvisible(TRUE); + test_start(); parse_script_af(0, "test.testThis2(this);"); parse_script_af(0, "(function () { test.testThis2(this); })();");

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

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 January 2015