January 2013 - Wine-commits

Alexandre Julliard : gdi32: Add support for . fot files in RemoveFontResource.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 46532e8d8a5cd0f963231e15cb7d80cc88b3de2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46532e8d8a5cd0f963231e15c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 12:54:02 2013 +0100 gdi32: Add support for .fot files in RemoveFontResource. --- dlls/gdi32/font.c | 20 +++++++++++++++++++- dlls/gdi32/tests/font.c | 15 ++++----------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c6a6946..fe211a1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3565,7 +3565,25 @@ BOOL WINAPI RemoveFontResourceExA( LPCSTR str, DWORD fl, PVOID pdv ) */ BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) { - return WineEngRemoveFontResourceEx(str, fl, pdv); + int ret = WineEngRemoveFontResourceEx( str, fl, pdv ); + WCHAR *filename; + + if (ret == 0) + { + /* FreeType <2.3.5 has problems reading resources wrapped in PE files. */ + HMODULE hModule = LoadLibraryExW(str, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (hModule != NULL) + { + WARN("Can't unload resources from PE file %s\n", wine_dbgstr_w(str)); + FreeLibrary(hModule); + } + else if ((filename = get_scalable_filename( str )) != NULL) + { + ret = WineEngRemoveFontResourceEx( filename, fl, pdv ); + HeapFree( GetProcessHeap(), 0, filename ); + } + } + return ret; } /*********************************************************************** diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 1dfdd11..62997d1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4475,22 +4475,11 @@ static void test_CreateScalableFontResource(void) SetLastError(0xdeadbeef); ret = pRemoveFontResourceExA(fot_name, 0, 0); -todo_wine ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); -todo_wine ok(!ret, "font wine_test should not be enumerated\n"); - /* FIXME: since RemoveFontResource is a stub correct testing is impossible */ - if (ret) - { - /* remove once RemoveFontResource is implemented */ - DeleteFile(fot_name); - DeleteFile(ttf_name); - return; - } - ret = pRemoveFontResourceExA(fot_name, 0, 0); ok(!ret, "RemoveFontResourceEx() should fail\n"); @@ -4509,17 +4498,21 @@ todo_wine ok(ret, "AddFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); + todo_wine ok(!ret, "font wine_test should not be enumerated\n"); /* XP allows removing a private font added with 0 flags */ SetLastError(0xdeadbeef); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); + todo_wine ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); + todo_wine ok(!ret, "font wine_test should not be enumerated\n"); ret = pRemoveFontResourceExA(fot_name, 0, 0); + todo_wine ok(!ret, "RemoveFontResourceEx() should fail\n"); DeleteFile(fot_name);

1 0

Alexandre Julliard : gdi32: Support for hidden flag of CreateScalableFontResource.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 8681774a4ff9c66f7f33614e772452290ea4101f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8681774a4ff9c66f7f33614e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 12:52:04 2013 +0100 gdi32: Support for hidden flag of CreateScalableFontResource. --- dlls/gdi32/font.c | 72 ++++++++++++++++++++++++++++------------------- dlls/gdi32/tests/font.c | 3 -- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fe211a1..fdd16e3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3405,16 +3405,41 @@ static void *map_file( const WCHAR *filename, LARGE_INTEGER *size ) return ptr; } -static WCHAR *get_scalable_filename( const WCHAR *res ) +static void *find_resource( BYTE *ptr, WORD type, DWORD rsrc_off, DWORD size, DWORD *len ) +{ + WORD align, type_id, count; + DWORD res_off; + + if (size < rsrc_off + 10) return NULL; + align = *(WORD *)(ptr + rsrc_off); + rsrc_off += 2; + type_id = *(WORD *)(ptr + rsrc_off); + while (type_id && type_id != type) + { + count = *(WORD *)(ptr + rsrc_off + 2); + rsrc_off += 8 + count * 12; + if (size < rsrc_off + 8) return NULL; + type_id = *(WORD *)(ptr + rsrc_off); + } + if (!type_id) return NULL; + count = *(WORD *)(ptr + rsrc_off + 2); + if (size < rsrc_off + 8 + count * 12) return NULL; + res_off = *(WORD *)(ptr + rsrc_off + 8) << align; + *len = *(WORD *)(ptr + rsrc_off + 10) << align; + if (size < res_off + *len) return NULL; + return ptr + res_off; +} + +static WCHAR *get_scalable_filename( const WCHAR *res, BOOL *hidden ) { LARGE_INTEGER size; BYTE *ptr = map_file( res, &size ); const IMAGE_DOS_HEADER *dos; const IMAGE_OS2_HEADER *ne; + WORD *fontdir; + char *data; WCHAR *name = NULL; - WORD rsrc_off, align, type_id, count; - DWORD res_off, res_len, i; - int len; + DWORD len; if (!ptr) return NULL; @@ -3423,33 +3448,18 @@ static WCHAR *get_scalable_filename( const WCHAR *res ) if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto fail; if (size.u.LowPart < dos->e_lfanew + sizeof( *ne )) goto fail; ne = (const IMAGE_OS2_HEADER *)(ptr + dos->e_lfanew); - rsrc_off = dos->e_lfanew + ne->ne_rsrctab; - if (size.u.LowPart < rsrc_off + 10) goto fail; - align = *(WORD *)(ptr + rsrc_off); - rsrc_off += 2; - type_id = *(WORD *)(ptr + rsrc_off); - while (type_id && type_id != 0x80cc) - { - count = *(WORD *)(ptr + rsrc_off + 2); - rsrc_off += 8 + count * 12; - if (size.u.LowPart < rsrc_off + 8) goto fail; - type_id = *(WORD *)(ptr + rsrc_off); - } - if (!type_id) goto fail; - count = *(WORD *)(ptr + rsrc_off + 2); - if (size.u.LowPart < rsrc_off + 8 + count * 12) goto fail; - res_off = *(WORD *)(ptr + rsrc_off + 8) << align; - res_len = *(WORD *)(ptr + rsrc_off + 10) << align; - if (size.u.LowPart < res_off + res_len) goto fail; + fontdir = find_resource( ptr, 0x8007, dos->e_lfanew + ne->ne_rsrctab, size.u.LowPart, &len ); + if (!fontdir) goto fail; + *hidden = (fontdir[35] & 0x80) != 0; /* fontdir->dfType */ - for (i = 0; i < res_len; i++) - if (ptr[ res_off + i ] == 0) break; - if (i == res_len) goto fail; + data = find_resource( ptr, 0x80cc, dos->e_lfanew + ne->ne_rsrctab, size.u.LowPart, &len ); + if (!data) goto fail; + if (!memchr( data, 0, len )) goto fail; - len = MultiByteToWideChar( CP_ACP, 0, (char *)ptr + res_off, -1, NULL, 0 ); + len = MultiByteToWideChar( CP_ACP, 0, data, -1, NULL, 0 ); name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - if (name) MultiByteToWideChar( CP_ACP, 0, (char *)ptr + res_off, -1, name, len ); + if (name) MultiByteToWideChar( CP_ACP, 0, data, -1, name, len ); fail: UnmapViewOfFile( ptr ); @@ -3463,6 +3473,7 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) { int ret = WineEngAddFontResourceEx(str, fl, pdv); WCHAR *filename; + BOOL hidden; if (ret == 0) { @@ -3479,8 +3490,9 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) ret = num_resources; FreeLibrary(hModule); } - else if ((filename = get_scalable_filename( str )) != NULL) + else if ((filename = get_scalable_filename( str, &hidden )) != NULL) { + if (hidden) fl |= FR_PRIVATE | FR_NOT_ENUM; ret = WineEngAddFontResourceEx( filename, fl, pdv ); HeapFree( GetProcessHeap(), 0, filename ); } @@ -3567,6 +3579,7 @@ BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) { int ret = WineEngRemoveFontResourceEx( str, fl, pdv ); WCHAR *filename; + BOOL hidden; if (ret == 0) { @@ -3577,8 +3590,9 @@ BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) WARN("Can't unload resources from PE file %s\n", wine_dbgstr_w(str)); FreeLibrary(hModule); } - else if ((filename = get_scalable_filename( str )) != NULL) + else if ((filename = get_scalable_filename( str, &hidden )) != NULL) { + if (hidden) fl |= FR_PRIVATE | FR_NOT_ENUM; ret = WineEngRemoveFontResourceEx( filename, fl, pdv ); HeapFree( GetProcessHeap(), 0, filename ); } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 62997d1..f234b62 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4504,15 +4504,12 @@ static void test_CreateScalableFontResource(void) /* XP allows removing a private font added with 0 flags */ SetLastError(0xdeadbeef); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); - todo_wine ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); - todo_wine ok(!ret, "font wine_test should not be enumerated\n"); ret = pRemoveFontResourceExA(fot_name, 0, 0); - todo_wine ok(!ret, "RemoveFontResourceEx() should fail\n"); DeleteFile(fot_name);

1 0

Alexandre Julliard : gdi32: Initialize fontconfig even when fonts are cached.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 0b10f0b8547f05780841bc476955ea2e1faa1e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b10f0b8547f05780841bc476… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 14:28:10 2013 +0100 gdi32: Initialize fontconfig even when fonts are cached. --- dlls/gdi32/freetype.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 59ac9a4..639fb63 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3703,10 +3703,6 @@ static void init_font_list(void) char *unixname; const char *data_dir; -#ifdef SONAME_LIBFONTCONFIG - init_fontconfig(); -#endif - delete_external_font_keys(); /* load the system bitmap fonts */ @@ -3885,6 +3881,10 @@ BOOL WineEngInit(void) if(!init_freetype()) return FALSE; +#ifdef SONAME_LIBFONTCONFIG + init_fontconfig(); +#endif + if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL) { ERR("Failed to create font mutex\n");

1 0

Jacek Caban : atl100: Added AtlGetObjectSourceInterface implementation.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 852a42e2759f6a3ae417ddfab8c755730990d577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852a42e2759f6a3ae417ddfab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 15 12:45:47 2013 +0100 atl100: Added AtlGetObjectSourceInterface implementation. --- dlls/atl/atl.spec | 2 +- dlls/atl100/atl.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 1 + 5 files changed, 115 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index cb071f5..7b36397 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -45,7 +45,7 @@ 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save 52 stub AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save -54 stub AtlGetObjectSourceInterface +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 28b8cbc..28321c2 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -595,6 +595,117 @@ BOOL WINAPI AtlWaitWithMessageLoop(HANDLE handle) } } +static HRESULT get_default_source(ITypeLib *typelib, const CLSID *clsid, IID *iid) +{ + ITypeInfo *typeinfo, *src_typeinfo = NULL; + TYPEATTR *attr; + int type_flags; + unsigned i; + HRESULT hres; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, clsid, &typeinfo); + if(FAILED(hres)) + return hres; + + hres = ITypeInfo_GetTypeAttr(typeinfo, &attr); + if(FAILED(hres)) { + ITypeInfo_Release(typeinfo); + return hres; + } + + for(i=0; i < attr->cImplTypes; i++) { + hres = ITypeInfo_GetImplTypeFlags(typeinfo, i, &type_flags); + if(SUCCEEDED(hres) && type_flags == (IMPLTYPEFLAG_FSOURCE|IMPLTYPEFLAG_FDEFAULT)) { + HREFTYPE ref; + + hres = ITypeInfo_GetRefTypeOfImplType(typeinfo, i, &ref); + if(SUCCEEDED(hres)) + hres = ITypeInfo_GetRefTypeInfo(typeinfo, ref, &src_typeinfo); + break; + } + } + + ITypeInfo_ReleaseTypeAttr(typeinfo, attr); + ITypeInfo_Release(typeinfo); + if(FAILED(hres)) + return hres; + + if(!src_typeinfo) { + *iid = IID_NULL; + return S_OK; + } + + hres = ITypeInfo_GetTypeAttr(src_typeinfo, &attr); + if(SUCCEEDED(hres)) { + *iid = attr->guid; + ITypeInfo_ReleaseTypeAttr(src_typeinfo, attr); + } + ITypeInfo_Release(src_typeinfo); + return hres; +} + +/*********************************************************************** + * AtlGetObjectSourceInterface [atl100.54] + */ +HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown *unk, GUID *libid, IID *iid, unsigned short *major, unsigned short *minor) +{ + IProvideClassInfo2 *classinfo; + ITypeInfo *typeinfo; + ITypeLib *typelib; + IPersist *persist; + IDispatch *disp; + HRESULT hres; + + TRACE("(%p %p %p %p %p)\n", unk, libid, iid, major, minor); + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) + return hres; + + hres = IDispatch_GetTypeInfo(disp, 0, 0, &typeinfo); + IDispatch_Release(disp); + if(FAILED(hres)) + return hres; + + hres = ITypeInfo_GetContainingTypeLib(typeinfo, &typelib, 0); + ITypeInfo_Release(typeinfo); + if(SUCCEEDED(hres)) { + TLIBATTR *attr; + + hres = ITypeLib_GetLibAttr(typelib, &attr); + if(SUCCEEDED(hres)) { + *libid = attr->guid; + *major = attr->wMajorVerNum; + *minor = attr->wMinorVerNum; + ITypeLib_ReleaseTLibAttr(typelib, attr); + }else { + ITypeLib_Release(typelib); + } + } + if(FAILED(hres)) + return hres; + + hres = IUnknown_QueryInterface(unk, &IID_IProvideClassInfo2, (void**)&classinfo); + if(SUCCEEDED(hres)) { + hres = IProvideClassInfo2_GetGUID(classinfo, GUIDKIND_DEFAULT_SOURCE_DISP_IID, iid); + IProvideClassInfo2_Release(classinfo); + ITypeLib_Release(typelib); + return hres; + } + + hres = IUnknown_QueryInterface(unk, &IID_IPersist, (void**)&persist); + if(SUCCEEDED(hres)) { + CLSID clsid; + + hres = IPersist_GetClassID(persist, &clsid); + if(SUCCEEDED(hres)) + hres = get_default_source(typelib, &clsid, iid); + IPersist_Release(persist); + } + + return hres; +} + /*********************************************************************** * AtlGetVersion [atl100.@] */ diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 1eae2ed..2de1102 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -37,7 +37,7 @@ 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stub AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save -54 stub AtlGetObjectSourceInterface +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index bf36bbc..620c719 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -39,7 +39,7 @@ 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save 52 stub AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save -54 stub AtlGetObjectSourceInterface +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface 55 stub AtlUnRegisterTypeLib 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib 58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc diff --git a/include/atlbase.h b/include/atlbase.h index 84a22b4..8bacb97 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -257,5 +257,6 @@ HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID,const struct _ATL_CATMA HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void**); HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); +HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*); #endif /* __WINE_ATLBASE_H__ */

1 0

Jacek Caban : atl100: Added AtlGetObjectSourceInterface tests.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 4ad22987bcc923a03af0240a689d9ad5e153a851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad22987bcc923a03af0240a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 15 12:45:57 2013 +0100 atl100: Added AtlGetObjectSourceInterface tests. --- dlls/atl100/tests/atl.c | 214 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 214 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 963b39e..8aea90a 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -23,6 +23,7 @@ #define CONST_VTABLE #include <atlbase.h> +#include <mshtml.h> #include <wine/test.h> @@ -38,6 +39,21 @@ static const GUID CATID_CatTest2 = {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; #define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + if(!riid) + return "(null)"; + + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static void test_winmodule(void) { _AtlCreateWndData create_data[3]; @@ -343,6 +359,203 @@ static void test_cp(void) ok(!advise_cnt, "advise_cnt = %d\n", advise_cnt); } +static CLSID persist_clsid; + +static HRESULT WINAPI Persist_QueryInterface(IPersist *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI Persist_AddRef(IPersist *iface) +{ + return 2; +} + +static ULONG WINAPI Persist_Release(IPersist *iface) +{ + return 1; +} + +static HRESULT WINAPI Persist_GetClassID(IPersist *iface, CLSID *pClassID) +{ + *pClassID = persist_clsid; + return S_OK; +} + +static const IPersistVtbl PersistVtbl = { + Persist_QueryInterface, + Persist_AddRef, + Persist_Release, + Persist_GetClassID +}; + +static IPersist Persist = { &PersistVtbl }; + +static HRESULT WINAPI ProvideClassInfo2_QueryInterface(IProvideClassInfo2 *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ProvideClassInfo2_AddRef(IProvideClassInfo2 *iface) +{ + return 2; +} + +static ULONG WINAPI ProvideClassInfo2_Release(IProvideClassInfo2 *iface) +{ + return 1; +} + +static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) +{ + ok(dwGuidKind == GUIDKIND_DEFAULT_SOURCE_DISP_IID, "unexpected dwGuidKind %x\n", dwGuidKind); + *pGUID = DIID_DispHTMLBody; + return S_OK; +} + +static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { + ProvideClassInfo2_QueryInterface, + ProvideClassInfo2_AddRef, + ProvideClassInfo2_Release, + ProvideClassInfo2_GetClassInfo, + ProvideClassInfo2_GetGUID +}; + +static IProvideClassInfo2 ProvideClassInfo2 = { &ProvideClassInfo2Vtbl }; +static BOOL support_classinfo2; + +static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { + *ppv = iface; + return S_OK; + } + + if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { + if(!support_classinfo2) + return E_NOINTERFACE; + *ppv = &ProvideClassInfo2; + return S_OK; + } + + if(IsEqualGUID(&IID_IPersist, riid)) { + *ppv = &Persist; + return S_OK; + } + + ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Dispatch_AddRef(IDispatch *iface) +{ + return 2; +} + +static ULONG WINAPI Dispatch_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + ITypeLib *typelib; + HRESULT hres; + + static const WCHAR mshtml_tlbW[] = {'m','s','h','t','m','l','.','t','l','b',0}; + + ok(!iTInfo, "iTInfo = %d\n", iTInfo); + ok(!lcid, "lcid = %x\n", lcid); + + hres = LoadTypeLib(mshtml_tlbW, &typelib); + ok(hres == S_OK, "LoadTypeLib failed: %08x\n", hres); + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IHTMLElement, ppTInfo); + ok(hres == S_OK, "GetTypeInfoOfGuid failed: %08x\n", hres); + + ITypeLib_Release(typelib); + return S_OK; +} + +static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IDispatchVtbl DispatchVtbl = { + Dispatch_QueryInterface, + Dispatch_AddRef, + Dispatch_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + Dispatch_GetIDsOfNames, + Dispatch_Invoke +}; + +static IDispatch Dispatch = { &DispatchVtbl }; + +static void test_source_iface(void) +{ + unsigned short maj_ver, min_ver; + IID libid, iid; + HRESULT hres; + + support_classinfo2 = TRUE; + + maj_ver = min_ver = 0xdead; + hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); + ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); + ok(IsEqualGUID(&iid, &DIID_DispHTMLBody), "iid = %s\n", debugstr_guid(&iid)); + ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); + + support_classinfo2 = FALSE; + persist_clsid = CLSID_HTMLDocument; + + maj_ver = min_ver = 0xdead; + hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); + ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); + ok(IsEqualGUID(&iid, &DIID_HTMLDocumentEvents), "iid = %s\n", debugstr_guid(&iid)); + ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); + + persist_clsid = CLSID_HTMLStyle; + + maj_ver = min_ver = 0xdead; + hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); + ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); + ok(IsEqualGUID(&iid, &IID_NULL), "iid = %s\n", debugstr_guid(&iid)); + ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); +} + START_TEST(atl) { CoInitialize(NULL); @@ -351,6 +564,7 @@ START_TEST(atl) test_regcat(); test_typelib(); test_cp(); + test_source_iface(); CoUninitialize(); }

1 0

Jacek Caban : atl100: Don't leak TLIBATTR in AtlComModuleUnregisterServer.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 022d02cca526375a4942b844d2e5150008692ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=022d02cca526375a4942b844d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 15 12:46:06 2013 +0100 atl100: Don't leak TLIBATTR in AtlComModuleUnregisterServer. --- dlls/atl100/atl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 28321c2..c4867aa 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -493,8 +493,10 @@ HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeL SysFreeString(path); hres = ITypeLib_GetLibAttr(typelib, &attr); - if(SUCCEEDED(hres)) + if(SUCCEEDED(hres)) { hres = UnRegisterTypeLib(&attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, attr->lcid, attr->syskind); + ITypeLib_ReleaseTLibAttr(typelib, attr); + } ITypeLib_Release(typelib); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Don' t check if script element was already parsed in doc_insert_script.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: ba521ffcb77812e205df0e67b969e99aafbc178e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba521ffcb77812e205df0e67b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 15 13:39:44 2013 +0100 mshtml: Don't check if script element was already parsed in doc_insert_script. --- dlls/mshtml/mutation.c | 3 ++- dlls/mshtml/script.c | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 87497f6..a00f81a 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -341,7 +341,8 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa while(!list_empty(&window->script_queue)) { iter = LIST_ENTRY(list_head(&window->script_queue), script_queue_entry_t, entry); list_remove(&iter->entry); - doc_insert_script(window, iter->script); + if(!iter->script->parsed) + doc_insert_script(window, iter->script); IHTMLScriptElement_Release(&iter->script->IHTMLScriptElement_iface); heap_free(iter); } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 82a230d..a212b99 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -760,7 +760,6 @@ static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *scri if(NS_FAILED(nsres)) { ERR("GetText failed: %08x\n", nsres); }else if(*text) { - script_elem->parsed = TRUE; parse_text(script_host, text); } @@ -927,9 +926,6 @@ void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem) { ScriptHost *script_host; - if(script_elem->parsed) - return; - script_host = get_elem_script_host(window, script_elem); if(!script_host) return;

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement::put_text implementation.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 1aa8742da76200e3c771fd416ec213c4f6129345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa8742da76200e3c771fd416… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 15 13:39:54 2013 +0100 mshtml: Added IHTMLScriptElement::put_text implementation. --- dlls/mshtml/htmlscript.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index d08c9cb..0750a5f 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -192,8 +192,38 @@ static HRESULT WINAPI HTMLScriptElement_get_event(IHTMLScriptElement *iface, BST static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR v) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + HTMLInnerWindow *window; + nsIDOMNode *parent; + nsAString text_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->element.node.doc || !This->element.node.doc->window) { + WARN("no windoow\n"); + return E_UNEXPECTED; + } + + window = This->element.node.doc->window; + + nsAString_InitDepend(&text_str, v); + nsres = nsIDOMHTMLScriptElement_SetText(This->nsscript, &text_str); + nsAString_Finish(&text_str); + if(NS_FAILED(nsres)) { + ERR("SetSrc failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + if(NS_FAILED(nsres) || !parent) { + TRACE("No parent, not executing\n"); + This->parse_on_bind = TRUE; + return S_OK; + } + + nsIDOMNode_Release(parent); + doc_insert_script(window, This); + return S_OK; } static HRESULT WINAPI HTMLScriptElement_get_text(IHTMLScriptElement *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement::put_text tests.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: b6bc92aaa96705589d204f98b7ffe59ef129365d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bc92aaa96705589d204f98b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 15 13:40:04 2013 +0100 mshtml: Added IHTMLScriptElement::put_text tests. --- dlls/mshtml/tests/exectest.html | 53 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html index e1e73f6..ca06e3c 100644 --- a/dlls/mshtml/tests/exectest.html +++ b/dlls/mshtml/tests/exectest.html @@ -5,6 +5,7 @@ Script execution test <div id="b2"></div> <div id="b3"></div> <script id="emptyscript"></script> +<script id="put_text_script">2+2</script> <script> function ok(b, msg) { return external.ok(b, msg); @@ -12,6 +13,7 @@ function ok(b, msg) { var executed = false; var extern_cnt = 0; +var exec_cnt; function testWriteScript() { var len = document.getElementsByTagName('div').length; @@ -24,7 +26,7 @@ function testWriteScript() { + "<" + "/script>"); len = document.getElementsByTagName('script').length; - ok(len === 3, "script col length = " + len); + ok(len === 4, "script col length = " + len); ok(executed, "written script not executed"); } @@ -36,9 +38,22 @@ function testPutSrc() { ok(extern_cnt === 0, "extern_cnt = " + extern_cnt + " expected 0"); } +function testPutText() { + var elem = document.getElementById("put_text_script"); + + exec_cnt = 0; + elem.text = "exec_cnt++;"; + ok(exec_cnt === 1, "put_text_script exec_cnt " + exec_cnt); + + exec_cnt = 0; + elem.text = "exec_cnt++;"; + ok(exec_cnt === 1, "put_text_script exec_cnt " + exec_cnt); +} + try { testWriteScript(); testPutSrc(); + testPutText(); }catch(e) { ok(false, "Got an exception"); } @@ -67,10 +82,46 @@ function testPutSrc2() { ok(extern_cnt === 4, "extern_cnt = " + extern_cnt + " expected 4"); } +function testPutText2() { + var elem; + + elem = document.createElement("script"); + exec_cnt = 0; + elem.text = "exec_cnt++;"; + ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); + + document.body.appendChild(elem); + ok(exec_cnt === 1, "script exec_cnt " + exec_cnt); + exec_cnt = 0; + elem.text = "exec_cnt++;"; + ok(exec_cnt === 1, "script exec_cnt " + exec_cnt); + + elem.src = "externscr.js"; + ok(extern_cnt === 5, "extern_cnt = " + extern_cnt + " expected 5"); + + exec_cnt = 0; + ok(extern_cnt === 5, "> extern_cnt = " + extern_cnt + " expected 5"); + elem.text = "exec_cnt++;"; /* forces evaluation, but src will be executed */ + ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); + ok(extern_cnt === 6, "< extern_cnt = " + extern_cnt + " expected 6"); + + elem = document.createElement("script"); + exec_cnt = 0; + elem.text = "exec_cnt++;"; + ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); + elem.src = "externscr.js"; + ok(extern_cnt === 6, "extern_cnt = " + extern_cnt + " expected 6"); + + document.body.appendChild(elem); + ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); + ok(extern_cnt === 7, "extern_cnt = " + extern_cnt + " expected 7"); +} + document.body.onload = function() { ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); try { testPutSrc2(); + testPutText2(); }catch(e) { ok(false, "got an exception"); }

1 0

Aric Stewart : ups10: Mark to Base, Mark and Ligature are not cumulative offsets.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: e5ab22d684e1d17c0ab1a2a757404379ab633ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ab22d684e1d17c0ab1a2a75… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 15 07:09:29 2013 -0600 ups10: Mark to Base, Mark and Ligature are not cumulative offsets. --- dlls/usp10/opentype.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 05b8cab..e729919 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1734,10 +1734,13 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c if (desU.x || desU.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - if (!analysis->fRTL) pGoffset[glyph_index].du -= piAdvance[glyph_index-1]; - else if (analysis->fLogicalOrder) devX *= -1; - pGoffset[glyph_index].du += round(devX); - pGoffset[glyph_index].dv += round(devY); + if (!analysis->fRTL) pGoffset[glyph_index].du = round(devX) - piAdvance[glyph_index-1]; + else + { + if (analysis->fLogicalOrder) devX *= -1; + pGoffset[glyph_index].du = round(devX); + } + pGoffset[glyph_index].dv = round(devY); } break; } @@ -1749,8 +1752,8 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c if (desU.x || desU.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - pGoffset[glyph_index].du += (round(devX) - piAdvance[glyph_index-1]); - pGoffset[glyph_index].dv += round(devY); + pGoffset[glyph_index].du = (round(devX) - piAdvance[glyph_index-1]); + pGoffset[glyph_index].dv = round(devY); } break; } @@ -1764,8 +1767,8 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); if (analysis->fRTL && analysis->fLogicalOrder) devX *= -1; - pGoffset[glyph_index].du += round(devX) + pGoffset[glyph_index - write_dir].du; - pGoffset[glyph_index].dv += round(devY) + pGoffset[glyph_index - write_dir].dv; + pGoffset[glyph_index].du = round(devX) + pGoffset[glyph_index - write_dir].du; + pGoffset[glyph_index].dv = round(devY) + pGoffset[glyph_index - write_dir].dv; } break; }

1 0