December 2014 - Wine-commits

Hans Leidekker : rpcrt4: Make sure the Content-Length header is set correctly when preparing the out pipe.
by Alexandre Julliard 19 Dec '14

19 Dec '14

Module: wine Branch: master Commit: 49a2fb660be589f5bdbd3c2e71fb7f48d8f37836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a2fb660be589f5bdbd3c2e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 19 17:06:19 2014 +0100 rpcrt4: Make sure the Content-Length header is set correctly when preparing the out pipe. --- dlls/rpcrt4/rpc_transport.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c5ed04d..3016d83 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2321,14 +2321,17 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy const UUID *out_pipe_uuid, ULONG *flow_control_increment, BOOL authorized) { + static const WCHAR fmtW[] = + {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; BOOL ret; RPC_STATUS status; RpcPktHdr *hdr; BYTE *data_from_server; RpcPktHdr pkt_from_server; ULONG field1, field3; - DWORD bytes_read; + DWORD bytes_read, len; BYTE buf[20]; + WCHAR header[sizeof(fmtW) / sizeof(fmtW[0]) + 10]; if (!authorized) { @@ -2344,7 +2347,8 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy TRACE("sending HTTP connect header to server\n"); prepare_async_request(async_data); - ret = HttpSendRequestW(out_request, NULL, 0, hdr, hdr->common.frag_len); + len = sprintfW(header, fmtW, hdr->common.frag_len); + ret = HttpSendRequestW(out_request, header, len, hdr, hdr->common.frag_len); status = wait_async_request(async_data, ret, cancel_event); RPCRT4_FreeHeader(hdr); if (status != RPC_S_OK) return status;

1 0

Sergey Kalinichev : ntdll: Add stub for RtlSetHeapInformation.
by Alexandre Julliard 19 Dec '14

19 Dec '14

Module: wine Branch: master Commit: 7eed378f5dc907e9733124727bcd03aacebbd3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eed378f5dc907e9733124727… Author: Sergey Kalinichev <kalinichev.so.0(a)gmail.com> Date: Mon Dec 15 21:15:07 2014 +0400 ntdll: Add stub for RtlSetHeapInformation. --- dlls/kernel32/heap.c | 5 +++-- dlls/ntdll/heap.c | 9 +++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 9037f8e..cac73ec 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -296,8 +296,9 @@ BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size) { - FIXME("%p %d %p %ld\n", heap, infoclass, info, size ); - return TRUE; + NTSTATUS ret = RtlSetHeapInformation( heap, infoclass, info, size ); + if (ret) SetLastError( RtlNtStatusToDosError(ret) ); + return !ret; } /* diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 3bb7a11..4ef44cf 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -2252,3 +2252,12 @@ NTSTATUS WINAPI RtlQueryHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS inf return STATUS_INVALID_INFO_CLASS; } } + +/*********************************************************************** + * RtlSetHeapInformation (NTDLL.@) + */ +NTSTATUS WINAPI RtlSetHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, PVOID info, SIZE_T size) +{ + FIXME("%p %d %p %ld stub\n", heap, info_class, info, size); + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7e95969..51de6e7 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -847,7 +847,7 @@ @ stdcall RtlSetDaclSecurityDescriptor(ptr long ptr long) @ stdcall RtlSetEnvironmentVariable(ptr ptr ptr) @ stdcall RtlSetGroupSecurityDescriptor(ptr ptr long) -# @ stub RtlSetHeapInformation +@ stdcall RtlSetHeapInformation(long long ptr long) @ stub RtlSetInformationAcl @ stdcall RtlSetIoCompletionCallback(long ptr long) @ stdcall RtlSetLastWin32Error(long) diff --git a/include/winternl.h b/include/winternl.h index 5a27f94..1a694da 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2507,6 +2507,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING*); NTSYSAPI void WINAPI RtlSetCurrentEnvironment(PWSTR, PWSTR*); NTSYSAPI NTSTATUS WINAPI RtlSetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR*,PUNICODE_STRING,PUNICODE_STRING); +NTSYSAPI NTSTATUS WINAPI RtlSetHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T); NTSYSAPI NTSTATUS WINAPI RtlSetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE,PRTL_OVERLAPPED_COMPLETION_ROUTINE,ULONG);

1 0

André Hentschel : Add WWN 382
by Jeremy Newman 19 Dec '14

19 Dec '14

Module: website Branch: master Commit: 7fec317d00bf5d3ae17f804079e03b19aca4a15a URL: http://source.winehq.org/git/website.git/?a=commit;h=7fec317d00bf5d3ae17f80… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 19 22:11:16 2014 +0100 Add WWN 382 --- news/de/2014121901.xml | 11 + news/en/2014121901.xml | 11 + wwn/en/wn20141219_382.xml | 620 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 642 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=7fec317d00bf5d3ae1…

1 0

Drew Ronneberg : winemenubuilder: Eliminate an unused variable.
by Alexandre Julliard 18 Dec '14

18 Dec '14

Module: wine Branch: master Commit: cbc8f3c81148079a17f4062fb9bad6569107fb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc8f3c81148079a17f4062fb… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Wed Dec 17 21:05:11 2014 -0500 winemenubuilder: Eliminate an unused variable. --- programs/winemenubuilder/winemenubuilder.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fae89f9..d902e93 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1012,7 +1012,6 @@ static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) WCHAR *comma; WCHAR *executable = NULL; int index = 0; - char *output_path = NULL; HRESULT hr = HRESULT_FROM_WIN32(ERROR_NOT_FOUND); extension = strrchrW(szFileName, '.'); @@ -1040,7 +1039,6 @@ static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) end: HeapFree(GetProcessHeap(), 0, icon); HeapFree(GetProcessHeap(), 0, executable); - HeapFree(GetProcessHeap(), 0, output_path); return hr; }

1 0

Akihiro Sagawa : advapi32: Remove unused parameter.
by Alexandre Julliard 18 Dec '14

18 Dec '14

Module: wine Branch: master Commit: 9f9104d6bd891e96b1d6218daf1e1bf23e199b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9104d6bd891e96b1d6218da… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 19 00:21:36 2014 +0900 advapi32: Remove unused parameter. --- dlls/advapi32/registry.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7675a59..8e33ab3 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -103,7 +103,7 @@ static BOOL is_wow6432node( const UNICODE_STRING *name ) } /* open the Wow6432Node subkey of the specified key */ -static HANDLE open_wow6432node( HANDLE key, const UNICODE_STRING *name ) +static HANDLE open_wow6432node( HANDLE key ) { static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; OBJECT_ATTRIBUTES attr; @@ -150,7 +150,7 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (force_wow32 && pos) { if (is_wow6432node( &str )) force_wow32 = FALSE; - else if ((subkey = open_wow6432node( attr->RootDirectory, &str ))) + else if ((subkey = open_wow6432node( attr->RootDirectory ))) { if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); attr->RootDirectory = subkey; @@ -204,7 +204,7 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a if (force_wow32 && pos) { if (is_wow6432node( &str )) force_wow32 = FALSE; - else if ((subkey = open_wow6432node( attr->RootDirectory, &str ))) + else if ((subkey = open_wow6432node( attr->RootDirectory ))) { if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); attr->RootDirectory = subkey;

1 0

Akihiro Sagawa : advapi32/tests: Add more KEY_WOW64_32KEY tests for 64-bit.
by Alexandre Julliard 18 Dec '14

18 Dec '14

Module: wine Branch: master Commit: 88778ec0b85ef5ff0f39381596c1ee47360a80ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=88778ec0b85ef5ff0f3938159… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 19 00:21:38 2014 +0900 advapi32/tests: Add more KEY_WOW64_32KEY tests for 64-bit. --- dlls/advapi32/tests/registry.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 55a74f6..bcf3d7d 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2106,6 +2106,29 @@ static void test_redirection(void) check_key_value( key, "Wow6432Node\\Wine\\Winetest", KEY_WOW64_32KEY, is_vista ? 32 : 0 ); RegCloseKey( key ); } + else + { + err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, + KEY_WOW64_64KEY | KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_SUCCESS, "RegCreateKeyExA failed: %u\n", err ); + check_key_value( key, "Wine\\Winetest", 0, 64 ); + check_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY, 64 ); + dw = get_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY ); + todo_wine ok( dw == 32, "wrong value %u\n", dw ); + check_key_value( key, "Wow6432Node\\Wine\\Winetest", 0, 32 ); + RegCloseKey( key ); + + err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, + KEY_WOW64_32KEY | KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_SUCCESS, "RegCreateKeyExA failed: %u\n", err ); + dw = get_key_value( key, "Wine\\Winetest", 0 ); + todo_wine ok( dw == 32, "wrong value %u\n", dw ); + dw = get_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY ); + todo_wine ok( dw == 32 || broken(dw == 64) /* vista */, "wrong value %u\n", dw ); + dw = get_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY ); + todo_wine ok( dw == 32, "wrong value %u\n", dw ); + RegCloseKey( key ); + } check_key_value( HKEY_LOCAL_MACHINE, "Software\\Wine\\Winetest", 0, ptr_size ); check_key_value( HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\Winetest", 0, 32 );

1 0

Hans Leidekker : mlang: Add a stub implementation of IMultiLanguage3:: DetectOutboundCodePageInIStream.
by Alexandre Julliard 18 Dec '14

18 Dec '14

Module: wine Branch: master Commit: e11f91ed8d55373761fab8d29b08b61c23b26646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11f91ed8d55373761fab8d29… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 18 16:33:03 2014 +0100 mlang: Add a stub implementation of IMultiLanguage3::DetectOutboundCodePageInIStream. --- dlls/mlang/mlang.c | 28 +++++-- dlls/mlang/tests/mlang.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++ include/mlang.idl | 12 +++ 3 files changed, 246 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e11f91ed8d55373761fab…

1 0

Stefan Leichter : shell32: Export SHILCreateFromPath by name too.
by Alexandre Julliard 18 Dec '14

18 Dec '14

Module: wine Branch: master Commit: 6f98de084b5fa50e08c82ac9bee579e55fddfc14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f98de084b5fa50e08c82ac9b… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Wed Dec 17 22:21:33 2014 +0100 shell32: Export SHILCreateFromPath by name too. --- dlls/shell32/shell32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 0a8d448..f168ed7 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -24,7 +24,7 @@ 25 stdcall -ordinal ILCombine(ptr ptr) 26 stdcall -noname ILLoadFromStream(ptr ptr) 27 stdcall -ordinal ILSaveToStream(ptr ptr) - 28 stdcall -noname SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW + 28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW 29 stdcall -noname PathIsRoot(ptr) PathIsRootAW 30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW 31 stdcall -noname PathFindExtension(ptr) PathFindExtensionAW

1 0

Julian Rüger : German translation for release 1.7.33
by Jeremy Newman 17 Dec '14

17 Dec '14

Module: website Branch: master Commit: e286547060e04c4700d83e89071ad25af13d7442 URL: http://source.winehq.org/git/website.git/?a=commit;h=e286547060e04c4700d83e… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Dec 17 15:25:53 2014 +0100 German translation for release 1.7.33 --- news/de/2014121201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014121201.xml b/news/de/2014121201.xml new file mode 100644 index 0000000..f47c6c5 --- /dev/null +++ b/news/de/2014121201.xml @@ -0,0 +1,16 @@ +<news> +<date>12. Dezember 2014</date> +<title>Wine 1.7.33 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.33 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.33">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Kopieren/Einfügen in MSHTML.</li> + <li>Ein wenig mehr Schriftarten-Unterstützung in DirectWrite.</li> + <li>Bessere Behandlung von Fokusverlust bei Direct3D-Fenstern.</li> + <li>Mehrere zusätzliche API-* DLLs.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.33.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Nikolay Sivov : dwrite: Added stub EUDC font collection.
by Alexandre Julliard 17 Dec '14

17 Dec '14

Module: wine Branch: master Commit: 00ea0b72b64a190014fcd507f1ed3b182b87c89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ea0b72b64a190014fcd507f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 17 09:54:13 2014 +0300 dwrite: Added stub EUDC font collection. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 22 +++++++++++++++++-- dlls/dwrite/tests/font.c | 28 ++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3558bf8..907a1c3 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -103,6 +103,7 @@ extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDE extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory2*,IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern HRESULT get_eudc_fontcollection(IDWriteFactory2*,IDWriteFontCollection**) DECLSPEC_HIDDEN; extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 61d370b..80b7f07 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1968,6 +1968,58 @@ HRESULT get_system_fontcollection(IDWriteFactory2 *factory, IDWriteFontCollectio return hr; } +static HRESULT WINAPI eudcfontfileenumerator_QueryInterface(IDWriteFontFileEnumerator *iface, REFIID riid, void **obj) +{ + *obj = NULL; + + if (IsEqualIID(riid, &IID_IDWriteFontFileEnumerator) || IsEqualIID(riid, &IID_IUnknown)) { + IDWriteFontFileEnumerator_AddRef(iface); + *obj = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI eudcfontfileenumerator_AddRef(IDWriteFontFileEnumerator *iface) +{ + return 2; +} + +static ULONG WINAPI eudcfontfileenumerator_Release(IDWriteFontFileEnumerator *iface) +{ + return 1; +} + +static HRESULT WINAPI eudcfontfileenumerator_GetCurrentFontFile(IDWriteFontFileEnumerator *iface, IDWriteFontFile **file) +{ + *file = NULL; + return E_FAIL; +} + +static HRESULT WINAPI eudcfontfileenumerator_MoveNext(IDWriteFontFileEnumerator *iface, BOOL *current) +{ + *current = FALSE; + return S_OK; +} + +static const struct IDWriteFontFileEnumeratorVtbl eudcfontfileenumeratorvtbl = +{ + eudcfontfileenumerator_QueryInterface, + eudcfontfileenumerator_AddRef, + eudcfontfileenumerator_Release, + eudcfontfileenumerator_MoveNext, + eudcfontfileenumerator_GetCurrentFontFile +}; + +static IDWriteFontFileEnumerator eudc_fontfile_enumerator = { &eudcfontfileenumeratorvtbl }; + +HRESULT get_eudc_fontcollection(IDWriteFactory2 *factory, IDWriteFontCollection **collection) +{ + TRACE("building EUDC font collection for factory %p\n", factory); + return create_font_collection(factory, &eudc_fontfile_enumerator, FALSE, collection); +} + static HRESULT WINAPI dwritefontfile_QueryInterface(IDWriteFontFile *iface, REFIID riid, void **obj) { struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index eeb8728..8ad5097 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -453,6 +453,7 @@ struct dwritefactory { LONG ref; IDWriteFontCollection *system_collection; + IDWriteFontCollection *eudc_collection; IDWriteGdiInterop *gdiinterop; IDWriteLocalFontFileLoader* localfontfileloader; @@ -505,6 +506,8 @@ static void release_dwritefactory(struct dwritefactory *factory) if (factory->system_collection) IDWriteFontCollection_Release(factory->system_collection); + if (factory->eudc_collection) + IDWriteFontCollection_Release(factory->eudc_collection); if (factory->gdiinterop) release_gdiinterop(factory->gdiinterop); heap_free(factory); @@ -1025,8 +1028,22 @@ static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory2 *ifac BOOL check_for_updates) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - FIXME("(%p)->(%p %d): stub\n", This, collection, check_for_updates); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%p %d)\n", This, collection, check_for_updates); + + if (check_for_updates) + FIXME("checking for eudc updates not implemented\n"); + + if (!This->eudc_collection) + hr = get_eudc_fontcollection(iface, &This->eudc_collection); + + if (SUCCEEDED(hr)) + IDWriteFontCollection_AddRef(This->eudc_collection); + + *collection = This->eudc_collection; + + return hr; } static HRESULT WINAPI dwritefactory1_CreateCustomRenderingParams(IDWriteFactory2 *iface, FLOAT gamma, @@ -1172,6 +1189,7 @@ static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYP factory->ref = 1; factory->localfontfileloader = NULL; factory->system_collection = NULL; + factory->eudc_collection = NULL; factory->gdiinterop = NULL; list_init(&factory->collection_loaders); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f63ab1d..c3cad68 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2928,6 +2928,33 @@ static void test_GetGlyphRunOutline(void) DeleteFileW(test_fontfile); } +static void test_GetEudcFontCollection(void) +{ + IDWriteFontCollection *coll, *coll2; + IDWriteFactory1 *factory1; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory1, (void**)&factory1); + IDWriteFactory_Release(factory); + if (hr != S_OK) { + win_skip("GetEudcFontCollection() is not supported.\n"); + return; + } + + hr = IDWriteFactory1_GetEudcFontCollection(factory1, &coll, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory1_GetEudcFontCollection(factory1, &coll2, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(coll == coll2, "got %p, %p\n", coll, coll2); + IDWriteFontCollection_Release(coll); + IDWriteFontCollection_Release(coll2); + + IDWriteFactory1_Release(factory1); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2965,6 +2992,7 @@ START_TEST(font) test_GetDesignGlyphAdvances(); test_IsMonospacedFont(); test_GetGlyphRunOutline(); + test_GetEudcFontCollection(); IDWriteFactory_Release(factory); }

1 0