- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : kernelbase: Copy the read-only attribute from the source.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: e8f4909ac3cc58e67ad73b9d4a0cbe6fe7b3bf90 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8f4909ac3cc58e67ad73b9d4a0cbe… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 7 21:32:57 2024 +0200 kernelbase: Copy the read-only attribute from the source. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/file.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 4 ++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 17cfe24d50a..02625140702 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -850,6 +850,56 @@ static void test_CopyFileA(void) CloseHandle(hmapfile); CloseHandle(hfile); + /* check read-only attribute */ + ret = GetFileAttributesA(source); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(!(ret & FILE_ATTRIBUTE_READONLY), "source is read-only\n"); + ret = GetFileAttributesA(dest); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(!(ret & FILE_ATTRIBUTE_READONLY), "dest is read-only\n"); + + /* make source read-only */ + ret = SetFileAttributesA(source, FILE_ATTRIBUTE_READONLY); + ok(ret, "SetFileAttributesA: error %ld\n", GetLastError()); + ret = GetFileAttributesA(source); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(ret & FILE_ATTRIBUTE_READONLY, "source is not read-only\n"); + ret = GetFileAttributesA(dest); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(!(ret & FILE_ATTRIBUTE_READONLY), "dest is read-only\n"); + + /* dest becomes read-only after copied from read-only source */ + ret = SetFileAttributesA(source, FILE_ATTRIBUTE_READONLY); + ok(ret, "SetFileAttributesA: error %ld\n", GetLastError()); + ret = GetFileAttributesA(source); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(ret & FILE_ATTRIBUTE_READONLY, "source is not read-only\n"); + ret = GetFileAttributesA(dest); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(!(ret & FILE_ATTRIBUTE_READONLY), "dest is read-only\n"); + + ret = CopyFileA(source, dest, FALSE); + ok(ret, "CopyFileA: error %ld\n", GetLastError()); + ret = GetFileAttributesA(dest); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(ret & FILE_ATTRIBUTE_READONLY, "dest is not read-only\n"); + + /* same when dest does not exist */ + ret = SetFileAttributesA(dest, FILE_ATTRIBUTE_NORMAL); + ok(ret, "SetFileAttributesA: error %ld\n", GetLastError()); + ret = DeleteFileA(dest); + ok(ret, "DeleteFileA: error %ld\n", GetLastError()); + ret = CopyFileA(source, dest, TRUE); + ok(ret, "CopyFileA: error %ld\n", GetLastError()); + ret = GetFileAttributesA(dest); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(ret & FILE_ATTRIBUTE_READONLY, "dest is not read-only\n"); + + ret = SetFileAttributesA(source, FILE_ATTRIBUTE_NORMAL); + ok(ret, "SetFileAttributesA: error %ld\n", GetLastError()); + ret = SetFileAttributesA(dest, FILE_ATTRIBUTE_NORMAL); + ok(ret, "SetFileAttributesA: error %ld\n", GetLastError()); + ret = DeleteFileA(source); ok(ret, "DeleteFileA: error %ld\n", GetLastError()); ret = DeleteFileA(dest); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index e1ba92a6448..cef861492e0 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -579,8 +579,8 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT } ret = TRUE; done: - /* Maintain the timestamp of source file to destination file */ - info.FileAttributes = 0; + /* Maintain the timestamp of source file to destination file and read-only attribute */ + info.FileAttributes &= FILE_ATTRIBUTE_READONLY; NtSetInformationFile( h2, &io, &info, sizeof(info), FileBasicInformation ); HeapFree( GetProcessHeap(), 0, buffer ); CloseHandle( h1 );

1 0

Bernhard Übelacker : wininet: Avoid crash in InternetCreateUrl with scheme unknown.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: 267a5658fb96968964e2204971abf6db23a1a29f URL: https://gitlab.winehq.org/wine/wine/-/commit/267a5658fb96968964e2204971abf6… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Mon Feb 12 16:06:23 2024 +0100 wininet: Avoid crash in InternetCreateUrl with scheme unknown. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33050 --- dlls/wininet/internet.c | 6 ++++++ dlls/wininet/tests/url.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fc962016246..b74015146ea 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4405,6 +4405,12 @@ static BOOL calc_url_length(LPURL_COMPONENTSW lpUrlComponents, { LPCWSTR scheme; + if (lpUrlComponents->nScheme == INTERNET_SCHEME_UNKNOWN) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + nScheme = lpUrlComponents->nScheme; if (nScheme == INTERNET_SCHEME_DEFAULT) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 28269e8dd40..2177d651f08 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -1231,6 +1231,21 @@ static void InternetCreateUrlA_test(void) ok(!strcmp(szUrl, CREATE_URL13), "Expected \"%s\", got \"%s\"\n", CREATE_URL13, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); + + memset(&urlComp, 0, sizeof(urlComp)); + fill_url_components(&urlComp); + urlComp.lpszScheme = NULL; + urlComp.dwSchemeLength = 0; + urlComp.nScheme = INTERNET_SCHEME_UNKNOWN; + len = 256; + szUrl = HeapAlloc(GetProcessHeap(), 0, len); + SetLastError(0xdeadbeef); + ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, szUrl); } static void InternetCanonicalizeUrl_test(void)

1 0

Bernhard Übelacker : wininet: Add missing assignment of return value.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: ceea01b165903e376d8cef6dabb04be0f508630f URL: https://gitlab.winehq.org/wine/wine/-/commit/ceea01b165903e376d8cef6dabb04b… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Mon Feb 12 15:29:43 2024 +0100 wininet: Add missing assignment of return value. --- dlls/wininet/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index c09315c301f..28269e8dd40 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -1225,7 +1225,7 @@ static void InternetCreateUrlA_test(void) urlComp.dwExtraInfoLength = strlen(urlComp.lpszExtraInfo); len = 256; szUrl = HeapAlloc(GetProcessHeap(), 0, len); - InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL13), "Got len %lu\n", len); ok(!strcmp(szUrl, CREATE_URL13), "Expected \"%s\", got \"%s\"\n", CREATE_URL13, szUrl);

1 0

Santino Mazza : mlang: Fix bug with codepage priority in GetStrCodePages.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: b549ae11fbbe02564417e4029baa789bffe9d5aa URL: https://gitlab.winehq.org/wine/wine/-/commit/b549ae11fbbe02564417e4029baa78… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Nov 28 17:29:21 2023 -0300 mlang: Fix bug with codepage priority in GetStrCodePages. --- dlls/mlang/mlang.c | 9 +++------ dlls/mlang/tests/mlang.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 55e6f6edaa5..c7e7f360f0b 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3336,23 +3336,20 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface, for (i = 0; i < src_len; i++) { - DWORD cp, next_cp = 0; + DWORD cp = 0; HRESULT ret; ret = IMLangFontLink2_GetCharCodePages(iface, src[i], &cp); - if (i + 1 < src_len) - ret = IMLangFontLink2_GetCharCodePages(iface, src[i + 1], &next_cp); if (ret != S_OK) return E_FAIL; if (!cps) cps = cp; - else if ((cps & cp) != 0) cps &= cp; + else if ((cps & cp) != 0 && + !((priority_cp & cps) ^ (priority_cp & cp))) cps &= cp; else { i--; break; } - - if ((priority_cp & cps) && !(priority_cp & next_cp)) break; } if (codepages) *codepages = cps; diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index f8e37565115..6bb973dc285 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1330,7 +1330,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ret = IMLangFontLink_GetStrCodePages(iMLFL, L"\uff90a", 2, FS_LATIN1, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); - todo_wine ok(processed == 1, "expected 1, got %ld\n", processed); + ok(processed == 1, "expected 1, got %ld\n", processed); dwCodePages = 0xffff; processed = -1;

1 0

Santino Mazza : gdiplus: Replace HDC with GpGraphics in parameters.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: 1454ffe7ddf01226aacec07836d4afa62fecd3fa URL: https://gitlab.winehq.org/wine/wine/-/commit/1454ffe7ddf01226aacec07836d4af… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Jan 30 20:43:22 2024 -0300 gdiplus: Replace HDC with GpGraphics in parameters. --- dlls/gdiplus/gdiplus_private.h | 4 ++-- dlls/gdiplus/graphics.c | 36 +++++++++++++++++------------------- dlls/gdiplus/graphicspath.c | 8 ++++---- 3 files changed, 23 insertions(+), 25 deletions(-)

1 0

Santino Mazza : gdiplus: Implement font linking for gdiplus.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: ba4681e776c0c1cef9b5b2610dc67f634999d095 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba4681e776c0c1cef9b5b2610dc67f… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Nov 14 19:22:25 2023 -0300 gdiplus: Implement font linking for gdiplus. --- dlls/gdiplus/Makefile.in | 2 +- dlls/gdiplus/gdiplus_private.h | 16 ++++- dlls/gdiplus/graphics.c | 159 ++++++++++++++++++++++++++++++++++++----- dlls/gdiplus/graphicspath.c | 2 +- 4 files changed, 158 insertions(+), 21 deletions(-)

1 0

Santino Mazza : gdiplus/tests: Add interactive test for font linking.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: d68a9d1213c7f80bf1a24f1a4db64cd3d34858b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d68a9d1213c7f80bf1a24f1a4db64c… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Dec 11 10:03:32 2023 -0300 gdiplus/tests: Add interactive test for font linking. --- dlls/gdiplus/tests/graphics.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 54960beabb3..4af7f179ec2 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2357,10 +2357,29 @@ static void test_GdipDrawString(void) } expect(Ok, status); - status = GdipCreateSolidFill((ARGB)0xdeadbeef, (GpSolidFill**)&brush); + status = GdipCreateStringFormat(0,0,&format); expect(Ok, status); - status = GdipCreateStringFormat(0,0,&format); + if (winetest_interactive) + { + status = GdipCreateSolidFill(0xFF000000, (GpSolidFill**)&brush); + expect(Ok, status); + rect.X = 0; + rect.Y = 0; + rect.Width = 0; + rect.Height = 14; + GdipRotateWorldTransform(graphics, 45, MatrixOrderPrepend); + GdipScaleWorldTransform(graphics, 2, 2, MatrixOrderPrepend); + GdipGraphicsClear(graphics, 0xFFFFFFFF); + status = GdipDrawString(graphics, L"\u8336Hola\u8336", 6, fnt, &rect, format, brush); + expect(Ok, status); + RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); /* FIXME: In Windows this test works without this line. */ + Sleep(4000); + GdipDeleteBrush(brush); + GdipResetWorldTransform(graphics); + } + + status = GdipCreateSolidFill((ARGB)0xdeadbeef, (GpSolidFill**)&brush); expect(Ok, status); rect.X = 0;

1 0

Santino Mazza : mlang/tests: Test codepages priority bug in GetStrCodepages.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: bc6231481119a244e7d3de29089878b8fbcecbf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc6231481119a244e7d3de29089878… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Nov 28 16:51:18 2023 -0300 mlang/tests: Test codepages priority bug in GetStrCodepages. --- dlls/mlang/tests/mlang.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 4ab4b579245..f8e37565115 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1324,6 +1324,14 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); ok(processed == 2, "expected 2, got %ld\n", processed); + dwCmpCodePages = FS_JISJAPAN; + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, L"\uff90a", 2, FS_LATIN1, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + todo_wine ok(processed == 1, "expected 1, got %ld\n", processed); + dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed);

1 0

Santino Mazza : mlang: Implement GetGlobalFontLinkObject.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: 829307455833e5182b93be7dd9b26529f1f136d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/829307455833e5182b93be7dd9b265… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Oct 16 17:12:56 2023 -0300 mlang: Implement GetGlobalFontLinkObject. --- dlls/mlang/mlang.c | 21 +++++++++++++++++++-- dlls/mlang/tests/mlang.c | 8 ++++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f424c87b860..55e6f6edaa5 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -44,6 +44,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang); #include "initguid.h" +static INIT_ONCE font_link_global_init_once = INIT_ONCE_STATIC_INIT; +static IUnknown *font_link_global = NULL; + static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); @@ -3882,11 +3885,25 @@ HRESULT WINAPI DllCanUnloadNow(void) return dll_count == 0 ? S_OK : S_FALSE; } +static BOOL WINAPI allocate_font_link_cb(PINIT_ONCE init_once, PVOID args, PVOID *context) +{ + return SUCCEEDED(MultiLanguage_create(NULL, (void**)&font_link_global)); +} + HRESULT WINAPI GetGlobalFontLinkObject(void **unknown) { + TRACE("%p\n", unknown); + if (!unknown) return E_INVALIDARG; - FIXME("%p: stub\n", unknown); + if (!InitOnceExecuteOnce(&font_link_global_init_once, allocate_font_link_cb, NULL, NULL)) + { + ERR("Failed to create global font link object.\n"); + return E_FAIL; + } - return S_FALSE; + IUnknown_AddRef(font_link_global); + *unknown = font_link_global; + + return S_OK; } diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 99664a0e556..4ab4b579245 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2306,18 +2306,18 @@ static void test_GetGlobalFontLinkObject(void) unknown = (void *)0xdeadbeef; ret = GetGlobalFontLinkObject(&unknown); -todo_wine { ok(ret == S_OK, "expected S_OK got %#lx\n", ret); ok(unknown != NULL && unknown != (void *)0xdeadbeef, "GetGlobalFontLinkObject() returned %p\n", unknown); if (unknown == (void *)0xdeadbeef || !unknown) return; - } ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink2, (void**)&IMLFL2); - ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); + todo_wine ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); + if (ret == S_OK) IMLangFontLink2_Release(IMLFL2); ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMultiLanguage, (void**)&IML); - ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); + todo_wine ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); + if (ret == S_OK) IMultiLanguage_Release(IML); ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink, (void**)&IMLFL); ok(ret == S_OK, "expected S_OK got %#lx\n", ret);

1 0

Santino Mazza : mlang/tests: Test for GetGlobalFontLinkObject.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: 6360992deaf60bd486c1e1f6f11492a6b4ec9aaa URL: https://gitlab.winehq.org/wine/wine/-/commit/6360992deaf60bd486c1e1f6f11492… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Oct 16 16:54:57 2023 -0300 mlang/tests: Test for GetGlobalFontLinkObject. --- dlls/mlang/tests/mlang.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index ee5ef5af738..99664a0e556 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2295,6 +2295,11 @@ static void test_GetGlobalFontLinkObject(void) { HRESULT ret; void *unknown; + LONG refcount; + IMLangFontLink2 *IMLFL2; + IMLangFontLink *IMLFL; + IMLangCodePages *IMLCP; + IMultiLanguage *IML; ret = GetGlobalFontLinkObject(NULL); ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", ret); @@ -2305,7 +2310,26 @@ todo_wine { ok(ret == S_OK, "expected S_OK got %#lx\n", ret); ok(unknown != NULL && unknown != (void *)0xdeadbeef, "GetGlobalFontLinkObject() returned %p\n", unknown); + if (unknown == (void *)0xdeadbeef || !unknown) return; } + + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink2, (void**)&IMLFL2); + ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); + + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMultiLanguage, (void**)&IML); + ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); + + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink, (void**)&IMLFL); + ok(ret == S_OK, "expected S_OK got %#lx\n", ret); + IMLangFontLink_Release(IMLFL); + + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangCodePages, (void**)&IMLCP); + ok(ret == S_OK, "expected S_OK got %#lx\n", ret); + IMLangCodePages_Release(IMLCP); + + + refcount = IUnknown_Release((IUnknown*)unknown); + ok(refcount == 1, "Got refcount %ld\n", refcount); } static void test_IMLangConvertCharset(IMultiLanguage *ml) @@ -2778,6 +2802,8 @@ START_TEST(mlang) if (!init_function_ptrs()) return; + test_GetGlobalFontLinkObject(); + CoInitialize(NULL); test_Rfc1766ToLcid(); test_LcidToRfc1766(); @@ -2785,8 +2811,6 @@ START_TEST(mlang) test_ConvertINetUnicodeToMultiByte(); test_JapaneseConversion(); - test_GetGlobalFontLinkObject(); - trace("IMultiLanguage\n"); ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, &IID_IMultiLanguage, (void **)&iML);

1 0