wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Eric Pouech : winedbg: Use dbg_lgint_t as parameter in type_print_hex.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: bbfbd7ac053f14e6d021d70f0793af070298b956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbfbd7ac053f14e6d021d70f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:43:44 2021 +0100 winedbg: Use dbg_lgint_t as parameter in type_print_hex. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index db4060d816a..d919922c058 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -360,13 +360,13 @@ static void dbg_print_longlong(LONGLONG sv, BOOL is_signed) dbg_printf("%s", ptr); } -static void dbg_print_hex(DWORD size, ULONGLONG sv) +static void dbg_print_hex(DWORD size, dbg_lgint_t sv) { if (!sv) dbg_printf("0"); else /* clear unneeded high bits, esp. sign extension */ - dbg_printf("%#I64x", sv & (~0LLU >> (64 - 8 * size))); + dbg_printf("%#I64x", sv & (~(dbg_lguint_t)0 >> (8 * (sizeof(dbg_lgint_t) - size)))); } static void print_typed_basic(const struct dbg_lvalue* lvalue) @@ -543,7 +543,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) switch (format) { case 'x': - dbg_print_hex(size, (ULONGLONG)res); + dbg_print_hex(size, res); return; case 'd':

1 0

Louis Lenders : wsdapi: Add stub for WSDCreateDiscoveryProvider.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 03f06598052e716178c41ef9203a8506122873f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03f06598052e716178c41ef9… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Dec 7 19:22:03 2021 +0100 wsdapi: Add stub for WSDCreateDiscoveryProvider. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52173 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/discovery.c | 7 ++++++ dlls/wsdapi/wsdapi.spec | 2 +- include/wsddisco.idl | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index fcbdfef2ab2..708cb803d03 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -470,3 +470,10 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover return S_OK; } + +HRESULT WINAPI WSDCreateDiscoveryProvider(IWSDXMLContext *context, IWSDiscoveryProvider **provider) +{ + FIXME("(%p, %p) stub\n", context, provider); + + return E_NOTIMPL; +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 95ee072a1cf..d7465458dd5 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -15,7 +15,7 @@ @ stub WSDCreateDeviceProxy @ stub WSDCreateDeviceProxyAdvanced @ stub WSDCreateDiscoveryProvider2 -@ stub WSDCreateDiscoveryProvider +@ stdcall WSDCreateDiscoveryProvider(ptr ptr) @ stub WSDCreateDiscoveryPublisher2 @ stdcall WSDCreateDiscoveryPublisher(ptr ptr) @ stub WSDCreateHttpAddress diff --git a/include/wsddisco.idl b/include/wsddisco.idl index 50d2198cea7..bbeff522a85 100644 --- a/include/wsddisco.idl +++ b/include/wsddisco.idl @@ -24,6 +24,9 @@ interface IWSDScopeMatchingRule; interface IWSDiscoveryPublisherNotify; interface IWSDiscoveryPublisher; interface IWSDXMLContext; +interface IWSDiscoveryProvider; +interface IWSDiscoveryProviderNotify; +interface IWSDiscoveredService; [ uuid(fcafe424-fef5-481a-bd9f-33ce0574256f), @@ -38,6 +41,62 @@ interface IWSDScopeMatchingRule : IUnknown HRESULT MatchScopes([in] LPCWSTR pszScope1, [in] LPCWSTR pszScope2, [out] BOOL *pfMatch); } +[ +uuid(73ee3ced-b6e6-4329-a546-3e8ad46563d2), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveryProviderNotify : IUnknown +{ + HRESULT Add([in] IWSDiscoveredService *service); + HRESULT Remove([in] IWSDiscoveredService *service); + HRESULT SearchFailed([in] HRESULT hr,[in, optional] LPCWSTR tag); + HRESULT SearchComplete([in, optional] LPCWSTR tag); +} + +[ +uuid(4bad8a3b-b374-4420-9632-aac945b374aa), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveredService : IUnknown +{ + HRESULT GetEndpointReference([out] WSD_ENDPOINT_REFERENCE **endpoint_reference); + HRESULT GetTypes([out] WSD_NAME_LIST **types_list); + HRESULT GetScopes([out] WSD_URI_LIST **scopes_list); + HRESULT GetXAddrs([out] WSD_URI_LIST **x_addrs_list); + HRESULT GetMetadataVersion([out] ULONGLONG *metadata_version); + HRESULT GetExtendedDiscoXML([out] WSDXML_ELEMENT **header_any,[out] WSDXML_ELEMENT **body_any); + HRESULT GetProbeResolveTag([out] LPCWSTR *tag); + HRESULT GetRemoteTransportAddress([out] LPCWSTR *remote_transport_address); + HRESULT GetLocalTransportAddress([out] LPCWSTR *local_transport_address); + HRESULT GetLocalInterfaceGUID([out] GUID *guid); + HRESULT GetInstanceId([out] ULONGLONG *instance_id); +} + +[ +uuid (8ffc8e55-f0eb-480f-88b7-b435dd281d45), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveryProvider : IUnknown +{ + HRESULT SetAddressFamily([in] DWORD address_family); + HRESULT Attach([in] IWSDiscoveryProviderNotify *sink); + HRESULT Detach(void); + HRESULT SearchById([in] LPCWSTR id,[in, optional] LPCWSTR tag); + HRESULT SearchByAddress([in] LPCWSTR address,[in, optional] LPCWSTR tag); + HRESULT SearchByType([in, optional] const WSD_NAME_LIST *types_list, \ + [in, optional] const WSD_URI_LIST *scopes_list,[in, optional] LPCWSTR match_by,[in, optional] LPCWSTR tag); + HRESULT GetXMLContext([out] IWSDXMLContext **context); +} + [ uuid(e67651b0-337a-4b3c-9758-733388568251), object, @@ -104,4 +163,5 @@ interface IWSDiscoveryPublisher : IUnknown HRESULT GetXMLContext([out] IWSDXMLContext **ppContext); } +cpp_quote("HRESULT WINAPI WSDCreateDiscoveryProvider(IWSDXMLContext *context, IWSDiscoveryProvider **provider);") cpp_quote("HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext* pContext, IWSDiscoveryPublisher **ppPublisher);")

1 0

Jactry Zeng : msxml3: Add GBK support for builtin character converter.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 2ec519dc64746b6b32589914254e372d88f5d7fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ec519dc64746b6b32589914… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 7 08:39:28 2021 -0600 msxml3: Add GBK support for builtin character converter. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/main.c | 11 +++++++ dlls/msxml3/tests/domdoc.c | 80 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 73 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index ba8d3b2e21b..2a97f2637f1 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -202,6 +202,16 @@ done: return len; } +static int gbk_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(936, out, outlen, in, inlen); +} + +static int utf8_to_gbk(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(936, out, outlen, in, inlen); +} + static int win1250_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) { return to_utf8(1250, out, outlen, in, inlen); @@ -300,6 +310,7 @@ static void init_char_encoders(void) xmlCharEncodingOutputFunc output; } encoder[] = { + { "gbk", gbk_to_utf8, utf8_to_gbk }, { "windows-1250", win1250_to_utf8, utf8_to_win1250 }, { "windows-1251", win1251_to_utf8, utf8_to_win1251 }, { "windows-1252", win1252_to_utf8, utf8_to_win1252 }, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 70e2da89a2f..e931c683fb8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -781,6 +781,20 @@ static const char complete7[] = { "</root>" }; +#define DECL_GBK \ +"<?xml version=\"1.0\" encoding=\"gbk\"?>" + +static const char gbkxml[] = +DECL_GBK +"<open></open>"; + +#define DECL_WIN_936 \ +"<?xml version=\"1.0\" encoding=\"Windows-936\"?>" + +static const char win936xml[] = +DECL_WIN_936 +"<open></open>"; + #define DECL_WIN_1252 \ "<?xml version=\"1.0\" encoding=\"Windows-1252\"?>" @@ -10506,7 +10520,10 @@ static void write_to_file(const char *name, const char *data) CloseHandle(hfile); } -static void test_doc_load_from_path(IXMLDOMDocument *doc, const char *path) +#define TEST_DOC_LOAD_FROM_PATH(doc,path,expected_hr, expected_ret) \ + _test_doc_load_from_path(doc, path, expected_hr, expected_ret, __LINE__) +static void _test_doc_load_from_path(IXMLDOMDocument *doc, const char *path, + HRESULT expected_hr, VARIANT_BOOL expected_ret, int line) { IXMLDOMDocument *doc2; IXMLDOMElement *elem; @@ -10520,29 +10537,32 @@ static void test_doc_load_from_path(IXMLDOMDocument *doc, const char *path) V_VT(&src) = VT_BSTR; V_BSTR(&src) = url; hr = IXMLDOMDocument_load(doc, src, &b); - ok(hr == S_OK, "Failed to load document, %#x.\n", hr); - ok(b == VARIANT_TRUE, "got %d\n", b); + ok_(__FILE__, line)(hr == expected_hr, "Failed to load document, %#x.\n", hr); + ok_(__FILE__, line)(b == expected_ret, "got %d\n", b); V_VT(&src) = VT_BSTR | VT_BYREF; V_BSTRREF(&src) = &url; hr = IXMLDOMDocument_load(doc, src, &b); - ok(hr == S_OK, "Failed to load document, %#x.\n", hr); - ok(b == VARIANT_TRUE, "got %d\n", b); + ok_(__FILE__, line)(hr == expected_hr, "Failed to load document, %#x.\n", hr); + ok_(__FILE__, line)(b == expected_ret, "got %d\n", b); + + if (expected_hr != S_OK) + return; url = NULL; hr = IXMLDOMDocument_get_url(doc, &url); - ok(hr == S_OK, "Failed to get document url, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get document url, hr %#x.\n", hr); hr = IXMLDOMDocument_get_documentElement(doc, &elem); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "got 0x%08x\n", hr); /* Create another instance for the same document, check url */ hr = IXMLDOMElement_get_ownerDocument(elem, &doc2); - ok(hr == S_OK, "Failed to get owner document, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get owner document, hr %#x.\n", hr); hr = IXMLDOMDocument_get_url(doc2, &url2); - ok(hr == S_OK, "Failed to get document url, hr %#x.\n", hr); - ok(!lstrcmpW(url, url2), "Unexpected url %s.\n", wine_dbgstr_w(url2)); + ok_(__FILE__, line)(hr == S_OK, "Failed to get document url, hr %#x.\n", hr); + ok_(__FILE__, line)(!lstrcmpW(url, url2), "Unexpected url %s.\n", wine_dbgstr_w(url2)); IXMLDOMDocument_Release(doc2); IXMLDOMElement_Release(elem); @@ -10574,6 +10594,18 @@ static void test_load(void) HRESULT hr; void* ptr; int n; + struct encoding_test + { + const char *xml; + HRESULT expected_hr; + VARIANT_BOOL expected_ret; + } encoding_tests[] = + { + { gbkxml, S_OK, VARIANT_TRUE }, + { win1252xml, S_OK, VARIANT_TRUE }, + { win936xml, S_FALSE, VARIANT_FALSE }, + }; + GetTempPathA(MAX_PATH, path); strcat(path, "winetest.xml"); @@ -10593,23 +10625,23 @@ static void test_load(void) /* "file://" url */ strcpy(path2, "file://"); strcat(path2, path); - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); /* file:// url, forward slashes */ url_forward_slash(path2); - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); /* "file:/" url */ strcpy(path2, "file:/"); strcat(path2, path); - test_doc_load_from_path(doc, path); + TEST_DOC_LOAD_FROM_PATH(doc, path, S_OK, VARIANT_TRUE); /* file:/ with forward slashes. */ url_forward_slash(path2); - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); /* Regular local path. */ - test_doc_load_from_path(doc, path); + TEST_DOC_LOAD_FROM_PATH(doc, path, S_OK, VARIANT_TRUE); /* load from a path: VT_BSTR|VT_BYREF, null ptr */ V_VT(&src) = VT_BSTR | VT_BYREF; @@ -10627,16 +10659,16 @@ static void test_load(void) strcpy(path2, path); n = strlen(path2); strcpy(&path2[n-1], "%6C"); /* C:\path\to\winetest.xm%6C */ - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); /* Both spaces and %20s work. */ GetTempPathA(MAX_PATH, path2); strcat(path2, "wine test.xml"); write_to_file(path2, win1252xml); - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); GetTempPathA(MAX_PATH, path2); strcat(path2, "wine%20test.xml"); - test_doc_load_from_path(doc, path2); + TEST_DOC_LOAD_FROM_PATH(doc, path2, S_OK, VARIANT_TRUE); DeleteFileA(path2); DeleteFileA(path); @@ -10771,6 +10803,18 @@ static void test_load(void) IXMLDOMDocument_Release(doc); + /* Encoding tests. */ + for (n = 0; n < ARRAY_SIZE(encoding_tests); n++) + { + GetTempPathA(MAX_PATH, path); + strcat(path, "codepage_test.xml"); + write_to_file(path, encoding_tests[n].xml); + doc = create_document(&IID_IXMLDOMDocument); + TEST_DOC_LOAD_FROM_PATH(doc, path, encoding_tests[n].expected_hr, encoding_tests[n].expected_ret); + DeleteFileA(path); + IXMLDOMDocument_Release(doc); + } + free_bstrs(); }

1 0

Alex Henrie : msvcp120/tests: Don't check for handle equality in _Thrd_current tests.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 7cb65f4487b1fa306b75d9638d40298b93a99b03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cb65f4487b1fa306b75d963… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 7 23:40:56 2021 -0700 msvcp120/tests: Don't check for handle equality in _Thrd_current tests. Fixes an intermittent testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 495ee9dd6fb..6bc636c4b1f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2093,8 +2093,9 @@ static void test_thrd(void) tb = p__Thrd_current(); ok(ta.id == tb.id, "got a %d b %d\n", ta.id, tb.id); ok(ta.id == GetCurrentThreadId(), "expected %d, got %d\n", GetCurrentThreadId(), ta.id); - /* these can be different if new threads are created at same time */ - ok(ta.hnd == tb.hnd, "got a %p b %p\n", ta.hnd, tb.hnd); + /* the handles can be different if new threads are created at same time */ + ok(ta.hnd != NULL, "handle a is NULL\n"); + ok(tb.hnd != NULL, "handle b is NULL\n"); ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); ok(!CloseHandle(tb.hnd), "handle %p not closed\n", tb.hnd);

1 0

Nikolay Sivov : dwrite: Remove some unused fields.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 98d88f22e20dbd3a5ee804314868503a5c176ebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=98d88f22e20dbd3a5ee80431… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:46 2021 +0300 dwrite: Remove some unused fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 -- dlls/dwrite/font.c | 16 ---------------- dlls/dwrite/layout.c | 1 - 3 files changed, 19 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index dd346191662..024741388cf 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -445,8 +445,6 @@ struct dwrite_glyphbitmap { DWORD simulations; float emsize; - BOOL nohint; - BOOL aliased; UINT16 glyph; INT pitch; RECT bbox; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ffe012d3029..5815c09e8ae 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5942,19 +5942,6 @@ static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) return refcount; } -static BOOL is_natural_rendering_mode(DWRITE_RENDERING_MODE1 mode) -{ - switch (mode) - { - case DWRITE_RENDERING_MODE1_NATURAL: - case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC: - case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: - return TRUE; - default: - return FALSE; - } -} - static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *analysis, RECT *bounds) { struct dwrite_glyphbitmap glyph_bitmap; @@ -5971,7 +5958,6 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.simulations = IDWriteFontFace_GetSimulations(analysis->run.fontFace); glyph_bitmap.emsize = analysis->run.fontEmSize; - glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; @@ -6051,8 +6037,6 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.simulations = fontface->simulations; glyph_bitmap.emsize = analysis->run.fontEmSize; - glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); - glyph_bitmap.aliased = analysis->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED; if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; if (!(glyph_bitmap.buf = malloc(analysis->max_glyph_bitmap_size))) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 51fa6cbfbe6..2b5e8433d2d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3946,7 +3946,6 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.simulations = IDWriteFontFace_GetSimulations(glyph_run.fontFace); glyph_bitmap.emsize = glyph_run.fontEmSize; - glyph_bitmap.nohint = layout->measuringmode == DWRITE_MEASURING_MODE_NATURAL; bbox = &glyph_bitmap.bbox;

1 0

Nikolay Sivov : dwrite: Keep corresponding data context for created backend object.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 94d7abce63a65bfe998f3dedf597282cc505b1b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94d7abce63a65bfe998f3ded… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:45 2021 +0300 dwrite: Keep corresponding data context for created backend object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 22fb3369bc7..ffe012d3029 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5316,10 +5316,15 @@ static UINT64 dwrite_fontface_get_font_object(struct dwrite_fontface *fontface) return 0; } - if (InterlockedCompareExchange64((LONGLONG *)&fontface->font_object, font_object, 0)) + if (!InterlockedCompareExchange64((LONGLONG *)&fontface->font_object, font_object, 0)) + { + fontface->data_context = data_context; + } + else { release_params.object = font_object; UNIX_CALL(release_font_object, &release_params); + IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, data_context); } } }

1 0

Nikolay Sivov : dwrite/layout: Simplify run direction check condition.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 828e7173bcb46378108aefa03bfa494d557ef98b URL: https://source.winehq.org/git/wine.git/?a=commit;h=828e7173bcb46378108aefa0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:44 2021 +0300 dwrite/layout: Simplify run direction check condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b7ab855d1f1..51fa6cbfbe6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1594,10 +1594,9 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const run->width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count); memset(&run->bbox, 0, sizeof(run->bbox)); - /* Check if run direction matches paragraph direction, if it doesn't adjust by - run width */ - if (is_run_rtl(run) ^ is_rtl) - run->origin.x = is_rtl ? origin_x - run->width : origin_x + run->width; + /* Adjust by run width if direction differs. */ + if (is_run_rtl(run) != is_rtl) + run->origin.x = origin_x + (is_rtl ? -run->width : run->width); else run->origin.x = origin_x;

1 0

Nikolay Sivov : dwrite: Implement Wow64 entry points for unixlib.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: a005d43b986280f13fb0dcce05a8626cc982dce2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a005d43b986280f13fb0dcce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:43 2021 +0300 dwrite: Implement Wow64 entry points for unixlib. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 02f496f181b..0caf2b03696 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -814,3 +814,231 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_glyph_bitmap, get_design_glyph_metrics, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_create_font_object(void *args) +{ + struct + { + PTR32 data; + UINT64 size; + ULONG index; + PTR32 object; + } const *params32 = args; + struct create_font_object_params params = + { + ULongToPtr(params32->data), + params32->size, + params32->index, + ULongToPtr(params32->object), + }; + + return create_font_object(&params); +} + +static NTSTATUS wow64_release_font_object(void *args) +{ + struct + { + UINT64 object; + } const *params32 = args; + struct release_font_object_params params = + { + params32->object + }; + + return release_font_object(&params); +} + +struct dwrite_outline32 +{ + struct + { + PTR32 values; + ULONG count; + ULONG size; + } tags; + + struct + { + PTR32 values; + ULONG count; + ULONG size; + } points; +}; + +static NTSTATUS wow64_get_glyph_outline(void *args) +{ + struct + { + UINT64 object; + ULONG simulations; + ULONG glyph; + float emsize; + PTR32 outline; + } const *params32 = args; + struct dwrite_outline32 *outline32 = ULongToPtr(params32->outline); + struct dwrite_outline outline = + { + .tags.values = ULongToPtr(outline32->tags.values), + .tags.count = outline32->tags.count, + .tags.size = outline32->tags.size, + .points.values = ULongToPtr(outline32->points.values), + .points.count = outline32->points.count, + .points.size = outline32->points.size, + }; + + struct get_glyph_outline_params params = + { + params32->object, + params32->simulations, + params32->glyph, + params32->emsize, + &outline, + }; + NTSTATUS status; + + status = get_glyph_outline(&params); + outline32->points.count = outline.points.count; + outline32->tags.count = outline.tags.count; + return status; +} + +static NTSTATUS wow64_get_glyph_count(void *args) +{ + struct + { + UINT64 object; + PTR32 count; + } const *params32 = args; + struct get_glyph_count_params params = + { + params32->object, + ULongToPtr(params32->count), + }; + + return get_glyph_count(&params); +} + +static NTSTATUS wow64_get_glyph_advance(void *args) +{ + struct + { + UINT64 object; + ULONG glyph; + ULONG mode; + float emsize; + PTR32 advance; + PTR32 has_contours; + } const *params32 = args; + struct get_glyph_advance_params params = + { + params32->object, + params32->glyph, + params32->mode, + params32->emsize, + ULongToPtr(params32->advance), + ULongToPtr(params32->has_contours), + }; + + return get_glyph_advance(&params); +} + +static NTSTATUS wow64_get_glyph_bbox(void *args) +{ + struct + { + UINT64 object; + ULONG simulations; + ULONG glyph; + float emsize; + DWRITE_MATRIX m; + PTR32 bbox; + } const *params32 = args; + struct get_glyph_bbox_params params = + { + params32->object, + params32->simulations, + params32->glyph, + params32->emsize, + params32->m, + ULongToPtr(params32->bbox), + }; + + return get_glyph_bbox(&params); +} + +static NTSTATUS wow64_get_glyph_bitmap(void *args) +{ + struct + { + UINT64 object; + ULONG simulations; + ULONG glyph; + ULONG mode; + float emsize; + DWRITE_MATRIX m; + RECT bbox; + int pitch; + PTR32 bitmap; + PTR32 is_1bpp; + } const *params32 = args; + struct get_glyph_bitmap_params params = + { + params32->object, + params32->simulations, + params32->glyph, + params32->mode, + params32->emsize, + params32->m, + params32->bbox, + params32->pitch, + ULongToPtr(params32->bitmap), + ULongToPtr(params32->is_1bpp), + }; + + return get_glyph_bitmap(&params); +} + +static NTSTATUS wow64_get_design_glyph_metrics(void *args) +{ + struct + { + UINT64 object; + ULONG simulations; + ULONG glyph; + ULONG upem; + ULONG ascent; + PTR32 metrics; + } const *params32 = args; + struct get_design_glyph_metrics_params params = + { + params32->object, + params32->simulations, + params32->glyph, + params32->upem, + params32->ascent, + ULongToPtr(params32->metrics), + }; + + return get_design_glyph_metrics(&params); +}; + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + process_attach, + process_detach, + wow64_create_font_object, + wow64_release_font_object, + wow64_get_glyph_outline, + wow64_get_glyph_count, + wow64_get_glyph_advance, + wow64_get_glyph_bbox, + wow64_get_glyph_bitmap, + wow64_get_design_glyph_metrics, +}; + +#endif /* _WIN64 */

1 0

Nikolay Sivov : dwrite: Switch to unixlib syscall interface.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 275a2d71d69ca3accb83f274be90d3fe76b4ad52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=275a2d71d69ca3accb83f274… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:42 2021 +0300 dwrite: Switch to unixlib syscall interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/dwrite_private.h | 23 +-- dlls/dwrite/font.c | 149 ++++++++++++------ dlls/dwrite/freetype.c | 362 ++++++++++++++++++++++--------------------- dlls/dwrite/main.c | 8 +- dlls/dwrite/unixlib.h | 113 ++++++++++++++ 6 files changed, 407 insertions(+), 249 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=275a2d71d69ca3accb83…

1 0

Alexandre Julliard : ntdll: Don't restore the %fs register for exceptions happening inside system calls.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 0b3d65f82241aa246e0c8a49c1ec37199f539f5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b3d65f82241aa246e0c8a49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 15:02:42 2021 +0100 ntdll: Don't restore the %fs register for exceptions happening inside system calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9e9a96db832..d32e38875a4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -355,7 +355,7 @@ static inline struct amd64_thread_data *amd64_thread_data(void) return (struct amd64_thread_data *)ntdll_get_thread_data()->cpu_data; } -static BOOL is_inside_syscall( ucontext_t *sigcontext ) +static BOOL is_inside_syscall( const ucontext_t *sigcontext ) { return ((char *)RSP_sig(sigcontext) >= (char *)ntdll_get_thread_data()->kernel_stack && (char *)RSP_sig(sigcontext) <= (char *)amd64_thread_data()->syscall_frame); @@ -1544,7 +1544,7 @@ static inline void init_handler( const ucontext_t *sigcontext ) static inline void leave_handler( const ucontext_t *sigcontext ) { #ifdef __linux__ - if (fs32_sel && !is_inside_signal_stack( (void *)RSP_sig(sigcontext ))) + if (fs32_sel && !is_inside_signal_stack( (void *)RSP_sig(sigcontext )) && !is_inside_syscall(sigcontext)) __asm__ volatile( "movw %0,%%fs" :: "r" (fs32_sel) ); #endif }

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021