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

Hans Leidekker : wbemdisp: Register interfaces.
by Alexandre Julliard 16 Aug '13

16 Aug '13

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 implementation of ISWbemLocator.
by Alexandre Julliard 16 Aug '13

16 Aug '13

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: Add a class factory implementation.
by Alexandre Julliard 16 Aug '13

16 Aug '13

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 typelib.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 537d809189d9b921ba9523f352da3f5fad88d1d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537d809189d9b921ba9523f35… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 16 14:20:49 2013 +0200 wbemdisp: Add a typelib. --- dlls/wbemdisp/Makefile.in | 2 + dlls/wbemdisp/wbemdisp_tlb.idl | 21 ++ include/wbemdisp.idl | 628 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 651 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=537d809189d9b921ba952…

1 0

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

16 Aug '13

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

Qian Hong : imm32/tests: Added more IMCC lock count tests.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 7822398d275eb11b42f6e0050965901982d17e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7822398d275eb11b42f6e0050… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:09:54 2013 +0800 imm32/tests: Added more IMCC lock count tests. --- dlls/imm32/tests/imm32.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 26101a4..2cdc662 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -715,7 +715,8 @@ static void test_ImmGetIMCLockCount(void) static void test_ImmGetIMCCLockCount(void) { HIMCC imcc; - DWORD count, ret; + DWORD count, g_count, ret, i; + VOID *p; imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO)); count = ImmGetIMCCLockCount(imcc); @@ -731,6 +732,28 @@ static void test_ImmGetIMCCLockCount(void) ok(ret == FALSE, "expect FALSE, ret %d\n", ret); count = ImmGetIMCCLockCount(imcc); 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)); + + 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); + } + count = ImmGetIMCCLockCount(imcc); + todo_wine 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); + GlobalUnlock(imcc); + count = ImmGetIMCCLockCount(imcc); + todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ImmDestroyIMCC(imcc); }

1 0

Qian Hong : imm32/tests: Added tests for ImmDestroyIMCC.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 1448d95fa416de1c75909044c75b19f4b4c62875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1448d95fa416de1c75909044c… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:10:10 2013 +0800 imm32/tests: Added tests for ImmDestroyIMCC. --- dlls/imm32/tests/imm32.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 2cdc662..308b3d3 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -757,6 +757,38 @@ static void test_ImmGetIMCCLockCount(void) ImmDestroyIMCC(imcc); } +static void test_ImmDestroyIMCC(void) +{ + HIMCC imcc; + DWORD ret, count, size; + VOID *p; + + imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO)); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + p = ImmLockIMCC(imcc); + ok(p != NULL, "ImmLockIMCC failed!\n"); + count = ImmGetIMCCLockCount(imcc); + ok(count == 1, "expect 1, returned %d\n", count); + size = ImmGetIMCCSize(imcc); + ok(size == sizeof(CANDIDATEINFO), "returned %d\n", size); + 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"); + ret = ImmUnlockIMCC(imcc); + todo_wine 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"); + size = ImmGetIMCCSize(imcc); + todo_wine 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"); + ret = GetLastError(); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); +} + static void test_ImmMessages(void) { CANDIDATEFORM cf; @@ -918,6 +950,7 @@ START_TEST(imm32) { test_ImmDefaultHwnd(); test_ImmGetIMCLockCount(); test_ImmGetIMCCLockCount(); + test_ImmDestroyIMCC(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */ msg_spy_init(NULL);

1 0

Qian Hong : imm32: Fixed IMCC implementation.
by Alexandre Julliard 16 Aug '13

16 Aug '13

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

Qian Hong : imm32/tests: Added more IMC lock count tests.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: b5b52371d1776b9fb0b44b7583e65fb0ddfbd757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b52371d1776b9fb0b44b758… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:10:42 2013 +0800 imm32/tests: Added more IMC lock count tests. --- dlls/imm32/tests/imm32.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 0a511e6..13b9bc1 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -691,7 +691,7 @@ static void test_ImmDefaultHwnd(void) static void test_ImmGetIMCLockCount(void) { HIMC imc; - DWORD count, ret; + DWORD count, ret, i; INPUTCONTEXT *ic; imc = ImmCreateContext(); @@ -709,6 +709,23 @@ static void test_ImmGetIMCLockCount(void) ok(ret == TRUE, "expect TRUE, ret %d\n", ret); count = ImmGetIMCLockCount(imc); ok(count == 0, "expect 0, returned %d\n", count); + + for (i = 0; i < GMEM_LOCKCOUNT * 2; i++) + { + ic = ImmLockIMC(imc); + ok(ic != NULL, "ImmLockIMC failed!\n"); + } + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == GMEM_LOCKCOUNT, "expect GMEM_LOCKCOUNT, returned %d\n", count); + + for (i = 0; i < GMEM_LOCKCOUNT - 1; i++) + ImmUnlockIMC(imc); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 1, "expect 1, returned %d\n", count); + ImmUnlockIMC(imc); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ImmDestroyContext(imc); }

1 0

Qian Hong : imm32/tests: Added tests for ImmDestroyContext.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: af058929ca2d849ee28008aac46d84721fb15f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af058929ca2d849ee28008aac… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:10:52 2013 +0800 imm32/tests: Added tests for ImmDestroyContext. --- dlls/imm32/tests/imm32.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 13b9bc1..62bdb64 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -774,6 +774,34 @@ static void test_ImmGetIMCCLockCount(void) ImmDestroyIMCC(imcc); } +static void test_ImmDestroyContext(void) +{ + HIMC imc; + DWORD ret, count; + INPUTCONTEXT *ic; + + imc = ImmCreateContext(); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ic = ImmLockIMC(imc); + ok(ic != NULL, "ImmLockIMC failed!\n"); + count = ImmGetIMCLockCount(imc); + ok(count == 1, "expect 1, returned %d\n", count); + ret = ImmDestroyContext(imc); + ok(ret == TRUE, "Destroy a locked IMC should success!\n"); + ic = ImmLockIMC(imc); + todo_wine ok(ic == NULL, "Lock a destroyed IMC should fail!\n"); + ret = ImmUnlockIMC(imc); + todo_wine ok(ret == FALSE, "Unlock a destroyed IMC should fail!\n"); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 0, "Get lock count of a destroyed IMC should return 0!\n"); + SetLastError(0xdeadbeef); + ret = ImmDestroyContext(imc); + todo_wine ok(ret == FALSE, "Destroy a destroyed IMC should fail!\n"); + ret = GetLastError(); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); +} + static void test_ImmDestroyIMCC(void) { HIMCC imcc; @@ -967,6 +995,7 @@ START_TEST(imm32) { test_ImmDefaultHwnd(); test_ImmGetIMCLockCount(); test_ImmGetIMCCLockCount(); + test_ImmDestroyContext(); test_ImmDestroyIMCC(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */

1 0