August 2013 - Wine-Commits - list.winehq.org

Álvaro Nieto : msvrct: Fix strncpy to fill the buffer.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: e3e12845572dce7b35660814c44dedf069de1dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e12845572dce7b35660814c… Author: Álvaro Nieto <alvaro.nieto(a)gmail.com> Date: Tue Aug 13 21:47:20 2013 +0200 msvrct: Fix strncpy to fill the buffer. --- dlls/msvcrt/string.c | 2 ++ dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index c5d0e18..082029d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -581,6 +581,8 @@ char* __cdecl MSVCRT_strncpy(char *dst, const char *src, MSVCRT_size_t len) for(i=0; i<len; i++) if((dst[i] = src[i]) == '\0') break; + while (i < len) dst[i++] = 0; + return dst; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6e3f962..dc90b38 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2574,6 +2574,36 @@ static void test_atoi(void) ok(r == 0, "atoi(4294967296) = %d\n", r); } +static void test_strncpy(void) +{ +#define TEST_STRNCPY_LEN 10 + char *ret; + char dst[TEST_STRNCPY_LEN + 1]; + char not_null_terminated[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'}; + + /* strlen(src) > TEST_STRNCPY_LEN */ + ret = strncpy(dst, "01234567890123456789", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); + + /* without null-terminated */ + ret = strncpy(dst, not_null_terminated, TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); + + /* strlen(src) < TEST_STRNCPY_LEN */ + strcpy(dst, "0123456789"); + ret = strncpy(dst, "012345", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strcmp(dst, "012345"), "dst != 012345\n"); + ok(dst[TEST_STRNCPY_LEN - 1] == '\0', "dst[TEST_STRNCPY_LEN - 1] != 0\n"); + + /* strlen(src) == TEST_STRNCPY_LEN */ + ret = strncpy(dst, "0123456789", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); +} + START_TEST(string) { char mem[100]; @@ -2675,4 +2705,5 @@ START_TEST(string) test__stricmp(); test__wcstoi64(); test_atoi(); + test_strncpy(); }

1 0

Alexandre Julliard : gdi32: Use Microsoft and Unicode encodings in priority for font names.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 87c2581c54fe8b28586b1958942dc5832155e126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c2581c54fe8b28586b19589… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 16 19:11:33 2013 +0200 gdi32: Use Microsoft and Unicode encodings in priority for font names. --- dlls/gdi32/freetype.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0e6f4e1..2a2bde1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1306,10 +1306,12 @@ static inline WORD get_mac_code_page( const FT_SfntName *name ) static int match_name_table_language( const FT_SfntName *name, LANGID lang ) { LANGID name_lang; + int res = 0; switch (name->platform_id) { case TT_PLATFORM_MICROSOFT: + res += 5; /* prefer the Microsoft name */ switch (name->encoding_id) { case TT_MS_ID_UNICODE_CS: @@ -1326,6 +1328,7 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang ) name_lang = mac_langid_table[name->language_id]; break; case TT_PLATFORM_APPLE_UNICODE: + res += 2; /* prefer Unicode encodings */ switch (name->encoding_id) { case TT_APPLE_ID_DEFAULT: @@ -1341,10 +1344,10 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang ) default: return 0; } - if (name_lang == lang) return 3; - if (PRIMARYLANGID( name_lang ) == PRIMARYLANGID( lang )) return 2; - if (name_lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) return 1; - return 0; + if (name_lang == lang) res += 30; + else if (PRIMARYLANGID( name_lang ) == PRIMARYLANGID( lang )) res += 20; + else if (name_lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) res += 10; + return res; } static WCHAR *copy_name_table_string( const FT_SfntName *name )

1 0

Hans Leidekker : wbemdisp: Add a class factory implementation.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 05b146349f2d3268ea4a16e78ed7c2ffee7c192b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b146349f2d3268ea4a16e78… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 16 14:20:24 2013 +0200 wbemdisp: Add a class factory implementation. --- dlls/wbemdisp/main.c | 105 +++++++++++++++++++++++++++++++++++++++++++ dlls/wbemdisp/wbemdisp.spec | 4 +- 2 files changed, 107 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index 2ebd986..078e3b5 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -18,13 +18,96 @@ #include "config.h" #include <stdarg.h> + +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "wbemdisp.h" #include "rpcproxy.h" +#include "wine/debug.h" +#include "wbemdisp_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); + static HINSTANCE instance; +struct factory +{ + IClassFactory IClassFactory_iface; + HRESULT (*fnCreateInstance)( IUnknown *, LPVOID * ); +}; + +static inline struct factory *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct factory, IClassFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *obj ) +{ + if (IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IClassFactory )) + { + IClassFactory_AddRef( iface ); + *obj = iface; + return S_OK; + } + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI factory_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI factory_CreateInstance( IClassFactory *iface, LPUNKNOWN outer, REFIID riid, + LPVOID *obj ) +{ + struct factory *factory = impl_from_IClassFactory( iface ); + IUnknown *unk; + HRESULT hr; + + TRACE( "%p, %s, %p\n", outer, debugstr_guid(riid), obj ); + + *obj = NULL; + if (outer) return CLASS_E_NOAGGREGATION; + + hr = factory->fnCreateInstance( outer, (LPVOID *)&unk ); + if (FAILED( hr )) + return hr; + + hr = IUnknown_QueryInterface( unk, riid, obj ); + if (FAILED( hr )) + return hr; + + IUnknown_Release( unk ); + return hr; +} + +static HRESULT WINAPI factory_LockServer( IClassFactory *iface, BOOL lock ) +{ + FIXME( "%p, %d\n", iface, lock ); + return S_OK; +} + +static const struct IClassFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + factory_CreateInstance, + factory_LockServer +}; + +static struct factory swbem_locator_cf = { { &factory_vtbl }, SWbemLocator_create }; + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { @@ -40,6 +123,28 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *obj ) +{ + IClassFactory *cf = NULL; + + TRACE( "%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(iid), obj ); + + if (IsEqualGUID( rclsid, &CLSID_SWbemLocator )) + { + cf = &swbem_locator_cf.IClassFactory_iface; + } + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, obj ); +} + +/*********************************************************************** + * DllCanUnloadNow (WBEMDISP.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + /*********************************************************************** * DllRegisterServer (WBEMDISP.@) */ diff --git a/dlls/wbemdisp/wbemdisp.spec b/dlls/wbemdisp/wbemdisp.spec index 6d0e061..b16365d 100644 --- a/dlls/wbemdisp/wbemdisp.spec +++ b/dlls/wbemdisp/wbemdisp.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Hans Leidekker : wbemdisp: Add a stub implementation of ISWbemLocator.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 5928f54ab0cb05facce503cbb5fcf759122a6bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5928f54ab0cb05facce503cbb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 16 14:19:51 2013 +0200 wbemdisp: Add a stub implementation of ISWbemLocator. --- dlls/wbemdisp/Makefile.in | 2 + dlls/wbemdisp/locator.c | 267 ++++++++++++++++++++++++++++++++++++++ dlls/wbemdisp/wbemdisp_private.h | 30 +++++ 3 files changed, 299 insertions(+), 0 deletions(-) diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in index 917ebb4..b6b3217 100644 --- a/dlls/wbemdisp/Makefile.in +++ b/dlls/wbemdisp/Makefile.in @@ -1,6 +1,8 @@ MODULE = wbemdisp.dll +IMPORTS = oleaut32 C_SRCS = \ + locator.c \ main.c IDL_R_SRCS = wbemdisp_classes.idl diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c new file mode 100644 index 0000000..6f3af95 --- /dev/null +++ b/dlls/wbemdisp/locator.c @@ -0,0 +1,267 @@ +/* + * Copyright 2013 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "objbase.h" +#include "wbemdisp.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wbemdisp_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); + +struct locator +{ + ISWbemLocator ISWbemLocator_iface; + LONG refs; +}; + +static inline struct locator *impl_from_ISWbemLocator( ISWbemLocator *iface ) +{ + return CONTAINING_RECORD( iface, struct locator, ISWbemLocator_iface ); +} + +static ULONG WINAPI locator_AddRef( + ISWbemLocator *iface ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + return InterlockedIncrement( &locator->refs ); +} + +static ULONG WINAPI locator_Release( + ISWbemLocator *iface ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + LONG refs = InterlockedDecrement( &locator->refs ); + if (!refs) + { + TRACE( "destroying %p\n", locator ); + heap_free( locator ); + } + return refs; +} + +static HRESULT WINAPI locator_QueryInterface( + ISWbemLocator *iface, + REFIID riid, + void **ppvObject ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + + TRACE( "%p, %s, %p\n", locator, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemLocator ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemLocator_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI locator_GetTypeInfoCount( + ISWbemLocator *iface, + UINT *count ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + + TRACE( "%p, %p\n", locator, count ); + *count = 1; + return S_OK; +} + +enum type_id +{ + ISWbemLocator_tid, + last_tid +}; + +static ITypeLib *wbemdisp_typelib; +static ITypeInfo *wbemdisp_typeinfo[last_tid]; + +static REFIID wbemdisp_tid_id[] = +{ + &IID_ISWbemLocator +}; + +static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) +{ + HRESULT hr; + + if (!wbemdisp_typelib) + { + ITypeLib *typelib; + + hr = LoadRegTypeLib( &LIBID_WbemScripting, 1, 2, LOCALE_SYSTEM_DEFAULT, &typelib ); + if (FAILED( hr )) + { + ERR( "LoadRegTypeLib failed: %08x\n", hr ); + return hr; + } + if (InterlockedCompareExchangePointer( (void **)&wbemdisp_typelib, typelib, NULL )) + ITypeLib_Release( typelib ); + } + if (!wbemdisp_typeinfo[tid]) + { + ITypeInfo *typeinfo; + + hr = ITypeLib_GetTypeInfoOfGuid( wbemdisp_typelib, wbemdisp_tid_id[tid], &typeinfo ); + if (FAILED( hr )) + { + ERR( "GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(wbemdisp_tid_id[tid]), hr ); + return hr; + } + if (InterlockedCompareExchangePointer( (void **)(wbemdisp_typeinfo + tid), typeinfo, NULL )) + ITypeInfo_Release( typeinfo ); + } + *ret = wbemdisp_typeinfo[tid]; + return S_OK; +} + +static HRESULT WINAPI locator_GetTypeInfo( + ISWbemLocator *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + TRACE( "%p, %u, %u, %p\n", locator, index, lcid, info ); + + return get_typeinfo( ISWbemLocator_tid, info ); +} + +static HRESULT WINAPI locator_GetIDsOfNames( + ISWbemLocator *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", locator, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemLocator_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI locator_Invoke( + ISWbemLocator *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", locator, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemLocator_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &locator->ISWbemLocator_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI locator_ConnectServer( + ISWbemLocator *iface, + BSTR strServer, + BSTR strNamespace, + BSTR strUser, + BSTR strPassword, + BSTR strLocale, + BSTR strAuthority, + LONG iSecurityFlags, + IDispatch *objWbemNamedValueSet, + ISWbemServices **objWbemServices ) +{ + FIXME( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strServer), + debugstr_w(strNamespace), debugstr_w(strUser), strPassword, debugstr_w(strLocale), + debugstr_w(strAuthority), iSecurityFlags, objWbemNamedValueSet, objWbemServices ); + return E_NOTIMPL; +} + +static HRESULT WINAPI locator_get_Security_( + ISWbemLocator *iface, + ISWbemSecurity **objWbemSecurity ) +{ + FIXME( "%p, %p\n", iface, objWbemSecurity ); + return E_NOTIMPL; +} + +static const ISWbemLocatorVtbl locator_vtbl = +{ + locator_QueryInterface, + locator_AddRef, + locator_Release, + locator_GetTypeInfoCount, + locator_GetTypeInfo, + locator_GetIDsOfNames, + locator_Invoke, + locator_ConnectServer, + locator_get_Security_ +}; + +HRESULT SWbemLocator_create( IUnknown *unk, void **obj ) +{ + struct locator *locator; + + TRACE( "%p, %p\n", unk, obj ); + + if (!(locator = heap_alloc( sizeof(*locator) ))) return E_OUTOFMEMORY; + locator->ISWbemLocator_iface.lpVtbl = &locator_vtbl; + locator->refs = 1; + + *obj = &locator->ISWbemLocator_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} diff --git a/dlls/wbemdisp/wbemdisp_private.h b/dlls/wbemdisp/wbemdisp_private.h new file mode 100644 index 0000000..549cb28 --- /dev/null +++ b/dlls/wbemdisp/wbemdisp_private.h @@ -0,0 +1,30 @@ +/* + * Copyright 2013 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 + */ + +HRESULT SWbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; + +static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), 0, len ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +}

1 0

Hans Leidekker : wbemdisp: Register interfaces.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 786daa1b7bd400de618320c5d064fa0a47fa9ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=786daa1b7bd400de618320c5d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 16 14:19:21 2013 +0200 wbemdisp: Register interfaces. --- .gitignore | 1 + dlls/wbemdisp/Makefile.in | 2 + dlls/wbemdisp/main.c | 21 ++ dlls/wbemdisp/wbemdisp.spec | 4 +- dlls/wbemdisp/wbemdisp_classes.idl | 27 ++ include/Makefile.in | 1 + include/wbemdisp.idl | 484 ++++++++++++++++++++++++++++++++++++ 7 files changed, 538 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=786daa1b7bd400de61832…

1 0

Hans Leidekker : wbemdisp: Add a stub dll.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: acb1ff4af0be881813e8fbd85679d65199dedd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb1ff4af0be881813e8fbd85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 16 14:18:52 2013 +0200 wbemdisp: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/wbemdisp/Makefile.in | 6 ++++++ dlls/wbemdisp/main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/wbemdisp/wbemdisp.spec | 4 ++++ tools/wine.inf.in | 1 + 6 files changed, 49 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0cdfd36..c149359 100755 --- a/configure +++ b/configure @@ -16449,6 +16449,7 @@ wine_fn_config_dll vtdapi.vxd enable_win16 wine_fn_config_dll vwin32.vxd enable_win16 wine_fn_config_dll w32skrnl enable_win16 wine_fn_config_dll w32sys.dll16 enable_win16 +wine_fn_config_dll wbemdisp enable_wbemdisp wine_fn_config_dll wbemprox enable_wbemprox wine_fn_config_test dlls/wbemprox/tests wbemprox_test wine_fn_config_dll webservices enable_webservices implib diff --git a/configure.ac b/configure.ac index 07ee2f0..b9de304 100644 --- a/configure.ac +++ b/configure.ac @@ -3089,6 +3089,7 @@ WINE_CONFIG_DLL(vtdapi.vxd,enable_win16) WINE_CONFIG_DLL(vwin32.vxd,enable_win16) WINE_CONFIG_DLL(w32skrnl,enable_win16) WINE_CONFIG_DLL(w32sys.dll16,enable_win16) +WINE_CONFIG_DLL(wbemdisp) WINE_CONFIG_DLL(wbemprox) WINE_CONFIG_TEST(dlls/wbemprox/tests) WINE_CONFIG_DLL(webservices,,[implib]) diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in new file mode 100644 index 0000000..93812cb --- /dev/null +++ b/dlls/wbemdisp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wbemdisp.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c new file mode 100644 index 0000000..83bd1eb --- /dev/null +++ b/dlls/wbemdisp/main.c @@ -0,0 +1,36 @@ +/* + * Copyright 2013 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 "config.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + } + return TRUE; +} diff --git a/dlls/wbemdisp/wbemdisp.spec b/dlls/wbemdisp/wbemdisp.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/wbemdisp/wbemdisp.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 75172f9..fcd32cf 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2535,6 +2535,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,shdocvw.dll 11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe +11,wbem,wbemdisp.dll 11,wbem,wbemprox.dll 11,wbem,wmic.exe 11,wbem,wmiutils.dll

1 0

Qian Hong : imm32: Fixed IMCC implementation.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 134935e714db87a0dcd7318d0efd4127d7321d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134935e714db87a0dcd7318d0… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:10:26 2013 +0800 imm32: Fixed IMCC implementation. --- dlls/imm32/imm.c | 52 ++++++--------------------------------------- dlls/imm32/tests/imm32.c | 22 +++++++++--------- 2 files changed, 18 insertions(+), 56 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 5aee6ea..bc7caba 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -37,12 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); -typedef struct tagIMCCInternal -{ - DWORD dwLock; - DWORD dwSize; -} IMCCInternal; - #define MAKE_FUNCPTR(f) typeof(f) * p##f typedef struct _tagImmHkl{ struct list entry; @@ -2625,15 +2619,7 @@ DWORD WINAPI ImmGetIMCLockCount(HIMC hIMC) */ HIMCC WINAPI ImmCreateIMCC(DWORD size) { - IMCCInternal *internal; - int real_size = size + sizeof(IMCCInternal); - - internal = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, real_size); - if (internal == NULL) - return NULL; - - internal->dwSize = size; - return internal; + return GlobalAlloc(GMEM_ZEROINIT | GMEM_MOVEABLE, size); } /*********************************************************************** @@ -2641,8 +2627,7 @@ HIMCC WINAPI ImmCreateIMCC(DWORD size) */ HIMCC WINAPI ImmDestroyIMCC(HIMCC block) { - HeapFree(GetProcessHeap(),0,block); - return NULL; + return GlobalFree(block); } /*********************************************************************** @@ -2650,11 +2635,7 @@ HIMCC WINAPI ImmDestroyIMCC(HIMCC block) */ LPVOID WINAPI ImmLockIMCC(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - internal->dwLock ++; - return internal + 1; + return GlobalLock(imcc); } /*********************************************************************** @@ -2662,12 +2643,7 @@ LPVOID WINAPI ImmLockIMCC(HIMCC imcc) */ BOOL WINAPI ImmUnlockIMCC(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - if (internal->dwLock) - internal->dwLock --; - return (internal->dwLock!=0); + return GlobalUnlock(imcc); } /*********************************************************************** @@ -2675,10 +2651,7 @@ BOOL WINAPI ImmUnlockIMCC(HIMCC imcc) */ DWORD WINAPI ImmGetIMCCLockCount(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - return internal->dwLock; + return GlobalFlags(imcc) & GMEM_LOCKCOUNT; } /*********************************************************************** @@ -2686,15 +2659,7 @@ DWORD WINAPI ImmGetIMCCLockCount(HIMCC imcc) */ HIMCC WINAPI ImmReSizeIMCC(HIMCC imcc, DWORD size) { - IMCCInternal *internal,*newone; - int real_size = size + sizeof(IMCCInternal); - - internal = imcc; - - newone = HeapReAlloc(GetProcessHeap(), 0, internal, real_size); - newone->dwSize = size; - - return newone; + return GlobalReAlloc(imcc, size, GMEM_ZEROINIT | GMEM_MOVEABLE); } /*********************************************************************** @@ -2702,10 +2667,7 @@ HIMCC WINAPI ImmReSizeIMCC(HIMCC imcc, DWORD size) */ DWORD WINAPI ImmGetIMCCSize(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - return internal->dwSize; + return GlobalSize(imcc); } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 308b3d3..0a511e6 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -734,25 +734,25 @@ static void test_ImmGetIMCCLockCount(void) ok(count == 0, "expect 0, returned %d\n", count); p = ImmLockIMCC(imcc); - todo_wine ok(GlobalHandle(p) == imcc, "expect %p, returned %p\n", imcc, GlobalHandle(p)); + ok(GlobalHandle(p) == imcc, "expect %p, returned %p\n", imcc, GlobalHandle(p)); for (i = 0; i < GMEM_LOCKCOUNT * 2; i++) { ImmLockIMCC(imcc); count = ImmGetIMCCLockCount(imcc); g_count = GlobalFlags(imcc) & GMEM_LOCKCOUNT; - todo_wine ok(count == g_count, "count %d, g_count %d\n", count, g_count); + ok(count == g_count, "count %d, g_count %d\n", count, g_count); } count = ImmGetIMCCLockCount(imcc); - todo_wine ok(count == GMEM_LOCKCOUNT, "expect GMEM_LOCKCOUNT, returned %d\n", count); + ok(count == GMEM_LOCKCOUNT, "expect GMEM_LOCKCOUNT, returned %d\n", count); for (i = 0; i < GMEM_LOCKCOUNT - 1; i++) GlobalUnlock(imcc); count = ImmGetIMCCLockCount(imcc); - todo_wine ok(count == 1, "expect 1, returned %d\n", count); + ok(count == 1, "expect 1, returned %d\n", count); GlobalUnlock(imcc); count = ImmGetIMCCLockCount(imcc); - todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ok(count == 0, "expect 0, returned %d\n", count); ImmDestroyIMCC(imcc); } @@ -775,18 +775,18 @@ static void test_ImmDestroyIMCC(void) p = ImmDestroyIMCC(imcc); ok(p == NULL, "Destroy a locked IMCC should success!\n"); p = ImmLockIMCC(imcc); - todo_wine ok(p == NULL, "Lock a destroyed IMCC should fail!\n"); + ok(p == NULL, "Lock a destroyed IMCC should fail!\n"); ret = ImmUnlockIMCC(imcc); - todo_wine ok(ret == FALSE, "Unlock a destroyed IMCC should return FALSE!\n"); + ok(ret == FALSE, "Unlock a destroyed IMCC should return FALSE!\n"); count = ImmGetIMCCLockCount(imcc); - todo_wine ok(count == 0, "Get lock count of a destroyed IMCC should return 0!\n"); + ok(count == 0, "Get lock count of a destroyed IMCC should return 0!\n"); size = ImmGetIMCCSize(imcc); - todo_wine ok(size == 0, "Get size of a destroyed IMCC should return 0!\n"); + ok(size == 0, "Get size of a destroyed IMCC should return 0!\n"); SetLastError(0xdeadbeef); p = ImmDestroyIMCC(imcc); - todo_wine ok(p != NULL, "returned NULL\n"); + ok(p != NULL, "returned NULL\n"); ret = GetLastError(); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); } static void test_ImmMessages(void)

1 0

Nikolay Sivov : shell32: Move QueryInterface to IShellLinkW.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 17ad6aa28aaafd7a45f713cb8e4208e96b2babdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ad6aa28aaafd7a45f713cb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:37:35 2013 +0400 shell32: Move QueryInterface to IShellLinkW. --- dlls/shell32/shelllink.c | 123 ++++++++++++++++++++++------------------------ 1 files changed, 58 insertions(+), 65 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5fd4820..4000a1d 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -229,58 +229,6 @@ static inline LPWSTR strdupW( LPCWSTR src ) } /************************************************************************** - * ShellLink::QueryInterface implementation - */ -static HRESULT ShellLink_QueryInterface( IShellLinkImpl *This, REFIID riid, LPVOID *ppvObj) -{ - TRACE("(%p)->(\n\tIID:\t%s)\n",This,debugstr_guid(riid)); - - *ppvObj = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IShellLinkA)) - { - *ppvObj = &This->IShellLinkA_iface; - } - else if(IsEqualIID(riid, &IID_IShellLinkW)) - { - *ppvObj = &This->IShellLinkW_iface; - } - else if(IsEqualIID(riid, &IID_IPersistFile)) - { - *ppvObj = &This->IPersistFile_iface; - } - else if(IsEqualIID(riid, &IID_IPersistStream)) - { - *ppvObj = &This->IPersistStream_iface; - } - else if(IsEqualIID(riid, &IID_IShellLinkDataList)) - { - *ppvObj = &This->IShellLinkDataList_iface; - } - else if(IsEqualIID(riid, &IID_IShellExtInit)) - { - *ppvObj = &This->IShellExtInit_iface; - } - else if(IsEqualIID(riid, &IID_IContextMenu)) - { - *ppvObj = &This->IContextMenu_iface; - } - else if(IsEqualIID(riid, &IID_IObjectWithSite)) - { - *ppvObj = &This->IObjectWithSite_iface; - } - - if(*ppvObj) - { - IUnknown_AddRef((IUnknown*)(*ppvObj)); - TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); - return S_OK; - } - ERR("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -/************************************************************************** * IPersistFile_QueryInterface */ static HRESULT WINAPI IPersistFile_fnQueryInterface( @@ -289,7 +237,7 @@ static HRESULT WINAPI IPersistFile_fnQueryInterface( LPVOID *ppvObj) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - return ShellLink_QueryInterface( This, riid, ppvObj ); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObj); } /****************************************************************************** @@ -307,7 +255,7 @@ static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile* iface) static ULONG WINAPI IPersistFile_fnRelease(IPersistFile* iface) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - return IShellLinkA_Release(&This->IShellLinkA_iface); + return IShellLinkW_Release(&This->IShellLinkW_iface); } static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile* iface, CLSID *pClassID) @@ -510,7 +458,7 @@ static HRESULT WINAPI IPersistStream_fnQueryInterface( VOID** ppvObj) { IShellLinkImpl *This = impl_from_IPersistStream(iface); - return ShellLink_QueryInterface( This, riid, ppvObj ); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObj); } /************************************************************************ @@ -520,7 +468,7 @@ static ULONG WINAPI IPersistStream_fnRelease( IPersistStream* iface) { IShellLinkImpl *This = impl_from_IPersistStream(iface); - return IShellLinkA_Release(&This->IShellLinkA_iface); + return IShellLinkW_Release(&This->IShellLinkW_iface); } /************************************************************************ @@ -1336,7 +1284,7 @@ HRESULT IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid, static HRESULT WINAPI IShellLinkA_fnQueryInterface(IShellLinkA *iface, REFIID riid, void **ppvObj) { IShellLinkImpl *This = impl_from_IShellLinkA(iface); - return ShellLink_QueryInterface( This, riid, ppvObj ); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObj); } /****************************************************************************** @@ -1642,7 +1590,52 @@ static HRESULT WINAPI IShellLinkW_fnQueryInterface( IShellLinkW * iface, REFIID riid, LPVOID *ppvObj) { IShellLinkImpl *This = impl_from_IShellLinkW(iface); - return ShellLink_QueryInterface( This, riid, ppvObj ); + + TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); + + *ppvObj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IShellLinkA)) + { + *ppvObj = &This->IShellLinkA_iface; + } + else if(IsEqualIID(riid, &IID_IShellLinkW)) + { + *ppvObj = &This->IShellLinkW_iface; + } + else if(IsEqualIID(riid, &IID_IPersistFile)) + { + *ppvObj = &This->IPersistFile_iface; + } + else if(IsEqualIID(riid, &IID_IPersistStream)) + { + *ppvObj = &This->IPersistStream_iface; + } + else if(IsEqualIID(riid, &IID_IShellLinkDataList)) + { + *ppvObj = &This->IShellLinkDataList_iface; + } + else if(IsEqualIID(riid, &IID_IShellExtInit)) + { + *ppvObj = &This->IShellExtInit_iface; + } + else if(IsEqualIID(riid, &IID_IContextMenu)) + { + *ppvObj = &This->IContextMenu_iface; + } + else if(IsEqualIID(riid, &IID_IObjectWithSite)) + { + *ppvObj = &This->IObjectWithSite_iface; + } + + if(*ppvObj) + { + IUnknown_AddRef((IUnknown*)*ppvObj); + TRACE("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); + return S_OK; + } + ERR("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; } /****************************************************************************** @@ -2186,14 +2179,14 @@ static HRESULT WINAPI ShellLink_DataList_QueryInterface( IShellLinkDataList* iface, REFIID riid, void** ppvObject) { IShellLinkImpl *This = impl_from_IShellLinkDataList(iface); - return IShellLinkA_QueryInterface(&This->IShellLinkA_iface, riid, ppvObject); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObject); } static ULONG WINAPI ShellLink_DataList_AddRef( IShellLinkDataList* iface ) { IShellLinkImpl *This = impl_from_IShellLinkDataList(iface); - return IShellLinkA_AddRef(&This->IShellLinkA_iface); + return IShellLinkW_AddRef(&This->IShellLinkW_iface); } static ULONG WINAPI @@ -2296,14 +2289,14 @@ static HRESULT WINAPI ShellLink_ExtInit_QueryInterface( IShellExtInit* iface, REFIID riid, void** ppvObject ) { IShellLinkImpl *This = impl_from_IShellExtInit(iface); - return IShellLinkA_QueryInterface(&This->IShellLinkA_iface, riid, ppvObject); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObject); } static ULONG WINAPI ShellLink_ExtInit_AddRef( IShellExtInit* iface ) { IShellLinkImpl *This = impl_from_IShellExtInit(iface); - return IShellLinkA_AddRef(&This->IShellLinkA_iface); + return IShellLinkW_AddRef(&This->IShellLinkW_iface); } static ULONG WINAPI @@ -2376,14 +2369,14 @@ static HRESULT WINAPI ShellLink_ContextMenu_QueryInterface( IContextMenu* iface, REFIID riid, void** ppvObject ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); - return IShellLinkA_QueryInterface(&This->IShellLinkA_iface, riid, ppvObject); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObject); } static ULONG WINAPI ShellLink_ContextMenu_AddRef( IContextMenu* iface ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); - return IShellLinkA_AddRef(&This->IShellLinkA_iface); + return IShellLinkW_AddRef(&This->IShellLinkW_iface); } static ULONG WINAPI @@ -2552,7 +2545,7 @@ static HRESULT WINAPI ShellLink_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) { IShellLinkImpl *This = impl_from_IObjectWithSite(iface); - return ShellLink_QueryInterface( This, riid, ppvObject ); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, ppvObject ); } static ULONG WINAPI

1 0

Nikolay Sivov : shell32: Remove unnecessary WINAPI and some casts.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 81b9a83d838ecb83ab9bb94f4a4611bd748df2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b9a83d838ecb83ab9bb94f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:36:42 2013 +0400 shell32: Remove unnecessary WINAPI and some casts. --- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/shell32_main.h | 2 +- dlls/shell32/shelllink.c | 6 +++--- dlls/shell32/shfldr_desktop.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 29439c5..ed112f2 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -617,7 +617,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 *iface, HWN } else if ((IsEqualIID(riid,&IID_IShellLinkW) || IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine(This->pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl,(LPVOID*)&pObj); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); SHFree(pidl); } else { hr = E_NOINTERFACE; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index ece1863..c50330b 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -86,7 +86,6 @@ HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * HRESULT WINAPI IShellDispatch_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI IShellItem_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI IShellLink_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; -HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ISF_Desktop_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ISF_MyComputer_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ISF_NetworkPlaces_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; @@ -109,6 +108,7 @@ HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIco HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv) DECLSPEC_HIDDEN; LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 3ee06bc..5fd4820 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1295,8 +1295,8 @@ static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWor /************************************************************************** * IShellLink_ConstructFromFile */ -HRESULT WINAPI IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid, - LPCITEMIDLIST pidl, LPVOID* ppv) +HRESULT IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid, + LPCITEMIDLIST pidl, IUnknown **ppv) { IShellLinkW* psl; @@ -1318,7 +1318,7 @@ HRESULT WINAPI IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid, hr = E_FAIL; if (SUCCEEDED(hr)) - *ppv = psl; + *ppv = (IUnknown*)psl; IPersistFile_Release(ppf); } diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 227982e..e2b73d0 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -562,7 +562,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*)&pObj); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); SHFree (pidl); } else diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 6730733..4bd964c 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -690,7 +690,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, } else if ((IsEqualIID(riid,&IID_IShellLinkW) || IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*)&pObj); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); SHFree (pidl); } else { hr = E_NOINTERFACE; diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 766e8d8..a21a2f3 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -563,7 +563,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*) &pObj); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); SHFree (pidl); } else

1 0

Nikolay Sivov : shell32: Forward GetClassID() to IPersistFile.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: d64697a34ea7cedb63fa6c0572a6b50bba4a8f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64697a34ea7cedb63fa6c057… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:34:10 2013 +0400 shell32: Forward GetClassID() to IPersistFile. --- dlls/shell32/shelllink.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 9664df9..3ee06bc 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -280,14 +280,6 @@ static HRESULT ShellLink_QueryInterface( IShellLinkImpl *This, REFIID riid, LPV return E_NOINTERFACE; } -static HRESULT ShellLink_GetClassID( IShellLinkImpl *This, CLSID *pclsid ) -{ - TRACE("%p %p\n", This, pclsid); - - *pclsid = CLSID_ShellLink; - return S_OK; -} - /************************************************************************** * IPersistFile_QueryInterface */ @@ -321,7 +313,12 @@ static ULONG WINAPI IPersistFile_fnRelease(IPersistFile* iface) static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile* iface, CLSID *pClassID) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - return ShellLink_GetClassID( This, pClassID ); + + TRACE("(%p)->(%p)\n", This, pClassID); + + *pClassID = CLSID_ShellLink; + + return S_OK; } static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile* iface) @@ -545,7 +542,7 @@ static HRESULT WINAPI IPersistStream_fnGetClassID( CLSID* pClassID) { IShellLinkImpl *This = impl_from_IPersistStream(iface); - return ShellLink_GetClassID( This, pClassID ); + return IPersistFile_GetClassID(&This->IPersistFile_iface, pClassID); } /************************************************************************

1 0