February 2019 - Wine-Commits

Hans Leidekker : wininet: Trace modifiers in hexadecimal in HttpAddRequestHeaders.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 25b10ea4ccb06a015fb1fda0bdb79e195220c841 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25b10ea4ccb06a015fb1fda0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 8 11:15:18 2019 +0100 wininet: Trace modifiers in hexadecimal in HttpAddRequestHeaders. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4122067..54bb569 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1335,7 +1335,7 @@ BOOL WINAPI HttpAddRequestHeadersW(HINTERNET hHttpRequest, http_request_t *request; DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; - TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); + TRACE("%p, %s, %u, %08x\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); if (!lpszHeader) return TRUE; @@ -1367,7 +1367,7 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest, WCHAR *headers = NULL; BOOL r; - TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); + TRACE("%p, %s, %u, %08x\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); if(lpszHeader) headers = heap_strndupAtoW(lpszHeader, dwHeaderLength, &dwHeaderLength);

1 0

Hans Leidekker : secur32: Fix default return flags for schannel contexts.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 5a0de62cf935e27ca6c2af3ddacd0d1fd91f0983 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a0de62cf935e27ca6c2af3d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 8 09:58:13 2019 +0100 secur32: Fix default return flags for schannel contexts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 10 +--------- dlls/secur32/tests/schannel.c | 5 +++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5caaece..8063fd4 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -915,17 +915,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-ctx->transport.in.offset; } - *pfContextAttr = 0; - if (ctx->req_ctx_attr & ISC_REQ_REPLAY_DETECT) - *pfContextAttr |= ISC_RET_REPLAY_DETECT; - if (ctx->req_ctx_attr & ISC_REQ_SEQUENCE_DETECT) - *pfContextAttr |= ISC_RET_SEQUENCE_DETECT; - if (ctx->req_ctx_attr & ISC_REQ_CONFIDENTIALITY) - *pfContextAttr |= ISC_RET_CONFIDENTIALITY; + *pfContextAttr = ISC_RET_REPLAY_DETECT | ISC_RET_SEQUENCE_DETECT | ISC_RET_CONFIDENTIALITY | ISC_RET_STREAM; if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; - if (ctx->req_ctx_attr & ISC_REQ_STREAM) - *pfContextAttr |= ISC_RET_STREAM; if (ctx->req_ctx_attr & ISC_REQ_USE_SUPPLIED_CREDS) *pfContextAttr |= ISC_RET_USED_SUPPLIED_CREDS; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 6ae76ea..426bf66 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -860,7 +860,7 @@ todo_wine buf->BufferType = SECBUFFER_TOKEN; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", - ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS, + ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); buffers[1].pBuffers[0].cbBuffer = buf_size; } @@ -871,7 +871,8 @@ todo_wine skip("Handshake failed\n"); return; } - ok(attrs & (ISC_RET_CONFIDENTIALITY|ISC_RET_STREAM|ISC_RET_USED_SUPPLIED_CREDS), "got %08x\n", attrs); + ok(attrs == (ISC_RET_REPLAY_DETECT|ISC_RET_SEQUENCE_DETECT|ISC_RET_CONFIDENTIALITY|ISC_RET_STREAM|ISC_RET_USED_SUPPLIED_CREDS), + "got %08x\n", attrs); status = QueryCredentialsAttributesA(&cred_handle, SECPKG_CRED_ATTR_NAMES, &names); ok(status == SEC_E_NO_CREDENTIALS || status == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", status);

1 0

Hans Leidekker : secur32: Return ISC_RET_USED_SUPPLIED_CREDS for schannel contexts if the feature was requested.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: e31bc3dbdb7af30faf82740a0db66e0d72715487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e31bc3dbdb7af30faf82740a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 8 09:58:12 2019 +0100 secur32: Return ISC_RET_USED_SUPPLIED_CREDS for schannel contexts if the feature was requested. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46127 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 2 ++ dlls/secur32/tests/schannel.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 2dbf8b1..5caaece 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -926,6 +926,8 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; if (ctx->req_ctx_attr & ISC_REQ_STREAM) *pfContextAttr |= ISC_RET_STREAM; + if (ctx->req_ctx_attr & ISC_REQ_USE_SUPPLIED_CREDS) + *pfContextAttr |= ISC_RET_USED_SUPPLIED_CREDS; return ret; } diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index ebdfcb6..6ae76ea 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -843,7 +843,7 @@ todo_wine buffers[1].pBuffers[0].cbBuffer = ret; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", - ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); buffers[1].pBuffers[0].cbBuffer = buf_size; while (status == SEC_I_CONTINUE_NEEDED) @@ -860,7 +860,7 @@ todo_wine buf->BufferType = SECBUFFER_TOKEN; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", - ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); buffers[1].pBuffers[0].cbBuffer = buf_size; } @@ -871,6 +871,7 @@ todo_wine skip("Handshake failed\n"); return; } + ok(attrs & (ISC_RET_CONFIDENTIALITY|ISC_RET_STREAM|ISC_RET_USED_SUPPLIED_CREDS), "got %08x\n", attrs); status = QueryCredentialsAttributesA(&cred_handle, SECPKG_CRED_ATTR_NAMES, &names); ok(status == SEC_E_NO_CREDENTIALS || status == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", status);

1 0

Zebediah Figura : ntdll: Reimplement condition variables on top of RtlWaitOnAddress().
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 954ed39584ba30fe194558cfbafa84aa1d3b2844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=954ed39584ba30fe194558cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 7 12:39:46 2019 -0600 ntdll: Reimplement condition variables on top of RtlWaitOnAddress(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46208 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 8513561..693013f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1909,8 +1909,8 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlWakeAddressSingle( variable ); } /*********************************************************************** @@ -1920,9 +1920,8 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); - while (val-- > 0) - NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlWakeAddressAll( variable ); } /*********************************************************************** @@ -1944,17 +1943,14 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R const LARGE_INTEGER *timeout ) { NTSTATUS status; - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + int val = *(int *)&variable->Ptr; + RtlLeaveCriticalSection( crit ); - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); - if (status != STATUS_SUCCESS) - { - if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); - } + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); RtlEnterCriticalSection( crit ); + return status; } @@ -1981,19 +1977,14 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, const LARGE_INTEGER *timeout, ULONG flags ) { NTSTATUS status; - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + int val = *(int *)&variable->Ptr; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlReleaseSRWLockShared( lock ); else RtlReleaseSRWLockExclusive( lock ); - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); - if (status != STATUS_SUCCESS) - { - if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); - } + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock );

1 0

Józef Kucia : wined3d: Do not convert SO declaration entries.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: c74c8800b3e8b2f89a43c38b9d90de675abae0ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=c74c8800b3e8b2f89a43c38b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 7 18:26:19 2019 +0100 wined3d: Do not convert SO declaration entries. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 92 +++++------------------------------------- dlls/wined3d/glsl_shader.c | 40 +++++++++--------- dlls/wined3d/shader.c | 57 +++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 6 +-- 5 files changed, 93 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c74c8800b3e8b2f89a43…

1 0

Nikolay Sivov : dwrite: Fix positions in outline mode.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 808152b73be387100160a9144fec9476d05e43df URL: https://source.winehq.org/git/wine.git/?a=commit;h=808152b73be387100160a914… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 8 11:59:14 2019 +0300 dwrite: Fix positions in outline mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 ++-- dlls/dwrite/freetype.c | 61 +++++++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0451a7e..e2aa213 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -320,8 +320,9 @@ extern void release_freetype(void) DECLSPEC_HIDDEN; extern HRESULT freetype_get_design_glyph_metrics(IDWriteFontFace4*,UINT16,UINT16,DWRITE_GLYPH_METRICS*) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern BOOL freetype_is_monospaced(IDWriteFontFace4*) DECLSPEC_HIDDEN; -extern HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4*,FLOAT,UINT16 const*,FLOAT const*, DWRITE_GLYPH_OFFSET const*, - UINT32,BOOL,IDWriteGeometrySink*) DECLSPEC_HIDDEN; +extern HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, float emsize, UINT16 const *glyphs, + float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, + IDWriteGeometrySink *sink) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern void freetype_get_glyphs(IDWriteFontFace4*,INT,UINT32 const*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern BOOL freetype_has_kerning_pairs(IDWriteFontFace4*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index d303653..29acb5e 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -438,7 +438,7 @@ static int decompose_cubic_to(const FT_Vector *control1, const FT_Vector *contro return 0; } -static void decompose_outline(FT_Outline *outline, FLOAT xoffset, FLOAT yoffset, IDWriteGeometrySink *sink) +static void decompose_outline(FT_Outline *outline, D2D1_POINT_2F offset, IDWriteGeometrySink *sink) { static const FT_Outline_Funcs decompose_funcs = { decompose_move_to, @@ -451,8 +451,8 @@ static void decompose_outline(FT_Outline *outline, FLOAT xoffset, FLOAT yoffset, struct decompose_context context; context.sink = sink; - context.xoffset = xoffset; - context.yoffset = yoffset; + context.xoffset = offset.x; + context.yoffset = offset.y; context.figure_started = FALSE; context.move_to = FALSE; context.origin.x = 0; @@ -485,8 +485,9 @@ static void embolden_glyph(FT_Glyph glyph, FLOAT emsize) embolden_glyph_outline(&outline_glyph->outline, emsize); } -HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, FLOAT emSize, UINT16 const *glyphs, - FLOAT const *advances, DWRITE_GLYPH_OFFSET const *offsets, UINT32 count, BOOL is_rtl, IDWriteGeometrySink *sink) +HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, float emSize, UINT16 const *glyphs, + float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, + IDWriteGeometrySink *sink) { FTC_ScalerRec scaler; USHORT simulations; @@ -509,14 +510,19 @@ HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, FLOAT emSize, EnterCriticalSection(&freetype_cs); if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) { - FLOAT advance = 0.0f; - UINT32 g; - - for (g = 0; g < count; g++) { - if (pFT_Load_Glyph(size->face, glyphs[g], FT_LOAD_NO_BITMAP) == 0) { + float rtl_factor = is_rtl ? -1.0f : 1.0f; + D2D1_POINT_2F origin; + unsigned int i; + + origin.x = origin.y = 0.0f; + for (i = 0; i < count; ++i) + { + if (pFT_Load_Glyph(size->face, glyphs[i], FT_LOAD_NO_BITMAP) == 0) + { FLOAT ft_advance = size->face->glyph->metrics.horiAdvance >> 6; FT_Outline *outline = &size->face->glyph->outline; - FLOAT xoffset = 0.0f, yoffset = 0.0f; + D2D1_POINT_2F glyph_origin; + float advance; FT_Matrix m; if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) @@ -529,23 +535,25 @@ HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, FLOAT emSize, pFT_Outline_Transform(outline, &m); + if (advances) + advance = rtl_factor * advances[i]; + else + advance = rtl_factor * ft_advance; + + glyph_origin = origin; + if (is_rtl) + glyph_origin.x += advance; + /* glyph offsets act as current glyph adjustment */ - if (offsets) { - xoffset += is_rtl ? -offsets[g].advanceOffset : offsets[g].advanceOffset; - yoffset -= offsets[g].ascenderOffset; + if (offsets) + { + glyph_origin.x += rtl_factor * offsets[i].advanceOffset; + glyph_origin.y -= offsets[i].ascenderOffset; } - if (g == 0 && is_rtl) - advance = advances ? -advances[g] : -ft_advance; - - xoffset += advance; - decompose_outline(outline, xoffset, yoffset, sink); + decompose_outline(outline, glyph_origin, sink); - /* update advance to next glyph */ - if (advances) - advance += is_rtl ? -advances[g] : advances[g]; - else - advance += is_rtl ? -ft_advance : ft_advance; + origin.x += advance; } } } @@ -959,8 +967,9 @@ BOOL freetype_is_monospaced(IDWriteFontFace4 *fontface) return FALSE; } -HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, FLOAT emSize, UINT16 const *glyphs, FLOAT const *advances, - DWRITE_GLYPH_OFFSET const *offsets, UINT32 count, BOOL is_rtl, IDWriteGeometrySink *sink) +HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, float emSize, UINT16 const *glyphs, + float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, + IDWriteGeometrySink *sink) { return E_NOTIMPL; }

1 0

Jacek Caban : mstml: Add style.borderSpacing property implementation.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 71750bd80dfef19e70cf1a7123f455b9c4b87af7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71750bd80dfef19e70cf1a71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 8 16:38:28 2019 +0100 mstml: Add style.borderSpacing property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 35 +++++++++++++++++++++++------------ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 15 +++++++++++++++ 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index d260db1..ea435d1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -83,6 +83,8 @@ static const WCHAR border_right_styleW[] = {'b','o','r','d','e','r','-','r','i','g','h','t','-','s','t','y','l','e',0}; static const WCHAR border_right_widthW[] = {'b','o','r','d','e','r','-','r','i','g','h','t','-','w','i','d','t','h',0}; +static const WCHAR border_spacingW[] = + {'b','o','r','d','e','r','-','s','p','a','c','i','n','g',0}; static const WCHAR border_topW[] = {'b','o','r','d','e','r','-','t','o','p',0}; static const WCHAR border_top_colorW[] = @@ -476,6 +478,11 @@ static const style_tbl_entry_t style_tbl[] = { ATTR_FIX_PX }, { + border_spacingW, + DISPID_IHTMLCSSSTYLEDECLARATION_BORDERSPACING, + DISPID_IHTMLSTYLE6_BORDERSPACING + }, + { border_styleW, DISPID_IHTMLCSSSTYLEDECLARATION_BORDERSTYLE, DISPID_IHTMLSTYLE_BORDERSTYLE @@ -4938,18 +4945,22 @@ static HRESULT WINAPI HTMLStyle6_get_boxSizing(IHTMLStyle6 *iface, BSTR *p) return get_style_property(This, STYLEID_BOX_SIZING, p); } -static HRESULT WINAPI HTMLStyle6_put_boxSpacing(IHTMLStyle6 *iface, BSTR v) +static HRESULT WINAPI HTMLStyle6_put_borderSpacing(IHTMLStyle6 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_property(This, STYLEID_BORDER_SPACING, v); } -static HRESULT WINAPI HTMLStyle6_get_boxSpacing(IHTMLStyle6 *iface, BSTR *p) +static HRESULT WINAPI HTMLStyle6_get_borderSpacing(IHTMLStyle6 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_property(This, STYLEID_BORDER_SPACING, p); } static HRESULT WINAPI HTMLStyle6_put_orphans(IHTMLStyle6 *iface, VARIANT v) @@ -5062,8 +5073,8 @@ static const IHTMLStyle6Vtbl HTMLStyle6Vtbl = { HTMLStyle6_get_outlineColor, HTMLStyle6_put_boxSizing, HTMLStyle6_get_boxSizing, - HTMLStyle6_put_boxSpacing, - HTMLStyle6_get_boxSpacing, + HTMLStyle6_put_borderSpacing, + HTMLStyle6_get_borderSpacing, HTMLStyle6_put_orphans, HTMLStyle6_get_orphans, HTMLStyle6_put_windows, @@ -7039,15 +7050,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_boxSizing(IHTMLCSSStyleDeclara static HRESULT WINAPI HTMLCSSStyleDeclaration_put_borderSpacing(IHTMLCSSStyleDeclaration *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_BORDER_SPACING, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_borderSpacing(IHTMLCSSStyleDeclaration *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_BORDER_SPACING, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_orphans(IHTMLCSSStyleDeclaration *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 971a3dc..9908fc9 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -59,6 +59,7 @@ typedef enum { STYLEID_BORDER_RIGHT_COLOR, STYLEID_BORDER_RIGHT_STYLE, STYLEID_BORDER_RIGHT_WIDTH, + STYLEID_BORDER_SPACING, STYLEID_BORDER_STYLE, STYLEID_BORDER_TOP, STYLEID_BORDER_TOP_COLOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 44e4c83..788b784 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -801,6 +801,21 @@ static void test_style6(IHTMLStyle6 *style) ok(hres == S_OK, "get_boxSizing failed: %08x\n", hres); ok(!strcmp_wa(str, "border-box"), "boxSizing = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLStyle6_get_borderSpacing(style, &str); + ok(hres == S_OK, "get_borderSpacing failed: %08x\n", hres); + ok(!str, "borderSpacing = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("10px"); + hres = IHTMLStyle6_put_borderSpacing(style, str); + ok(hres == S_OK, "put_borderSpacing failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle6_get_borderSpacing(style, &str); + ok(hres == S_OK, "get_borderSpacing failed: %08x\n", hres); + ok(!strcmp_wa(str, "10px"), "borderSpacing = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style)

1 0

Alexandre Julliard : ntdll: Return an NT filename in find_dll_file().
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 3099b04a89124964944d14ba30ee93b04278fe4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3099b04a89124964944d14ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 12:46:32 2019 +0100 ntdll: Return an NT filename in find_dll_file(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 146 ++++++++++++++++++++++++++-------------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c1e336cd..0d8fc57 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2385,17 +2385,65 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct /*********************************************************************** + * search_dll_file + * + * Search for dll in the specified paths. + */ +static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING *nt_name ) +{ + WCHAR *name; + NTSTATUS status = STATUS_DLL_NOT_FOUND; + ULONG len = strlenW( paths ); + + if (len < strlenW( system_dir )) len = strlenW( system_dir ); + len += strlenW( search ) + 2; + + if (!(name = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + while (*paths) + { + LPCWSTR ptr = paths; + + while (*ptr && *ptr != ';') ptr++; + len = ptr - paths; + if (*ptr == ';') ptr++; + memcpy( name, paths, len * sizeof(WCHAR) ); + if (len && name[len - 1] != '\\') name[len++] = '\\'; + strcpyW( name + len, search ); + if (RtlDoesFileExists_U( name )) + { + if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) + status = STATUS_NO_MEMORY; + else + status = STATUS_SUCCESS; + goto done; + } + paths = ptr; + } + + /* not found, return file in the system dir to be loaded as builtin */ + strcpyW( name, system_dir ); + strcatW( name, search ); + if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; + +done: + RtlFreeHeap( GetProcessHeap(), 0, name ); + return status; +} + + +/*********************************************************************** * find_dll_file * * Find the file (or already loaded module) for a given dll name. */ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, - WCHAR *filename, ULONG *size, WINE_MODREF **pwm, + UNICODE_STRING *nt_name, WINE_MODREF **pwm, HANDLE *handle, struct stat *st ) { - UNICODE_STRING nt_name; - WCHAR *file_part, *ext, *dllname; - ULONG len; + WCHAR *ext, *dllname; + NTSTATUS status; /* first append .dll if needed */ @@ -2411,11 +2459,10 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, libname = dllname; } - nt_name.Buffer = NULL; + nt_name->Buffer = NULL; if (!contains_path( libname )) { - NTSTATUS status; WCHAR *fullname = NULL; if ((*pwm = find_basename_module( libname )) != NULL) goto found; @@ -2437,48 +2484,30 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { /* we need to search for it */ - len = RtlDosSearchPath_U( load_path, libname, NULL, *size, filename, &file_part ); - if (len) + if (!(status = search_dll_file( load_path, libname, nt_name ))) { - if (len >= *size) goto overflow; - if (!RtlDosPathNameToNtPathName_U( filename, &nt_name, NULL, NULL )) - { - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - return STATUS_NO_MEMORY; - } - *handle = open_dll_file( &nt_name, pwm, st ); + *handle = open_dll_file( nt_name, pwm, st ); } - else /* not found, return the name as is, to be loaded as builtin */ + else if (status != STATUS_DLL_NOT_FOUND) { - len = strlenW(libname) * sizeof(WCHAR); - if (len >= *size) goto overflow; - strcpyW( filename, libname ); + RtlFreeHeap( GetProcessHeap(), 0, dllname ); + return status; } goto found; } /* absolute path name */ - if (!RtlDosPathNameToNtPathName_U( libname, &nt_name, &file_part, NULL )) + if (!RtlDosPathNameToNtPathName_U( libname, nt_name, NULL, NULL )) { RtlFreeHeap( GetProcessHeap(), 0, dllname ); return STATUS_NO_MEMORY; } - len = nt_name.Length - 4*sizeof(WCHAR); /* for \??\ prefix */ - if (len >= *size) goto overflow; - memcpy( filename, nt_name.Buffer + 4, len + sizeof(WCHAR) ); - *handle = open_dll_file( &nt_name, pwm, st ); + *handle = open_dll_file( nt_name, pwm, st ); found: - RtlFreeUnicodeString( &nt_name ); RtlFreeHeap( GetProcessHeap(), 0, dllname ); return STATUS_SUCCESS; - -overflow: - RtlFreeUnicodeString( &nt_name ); - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - *size = len + sizeof(WCHAR); - return STATUS_BUFFER_TOO_SMALL; } @@ -2491,10 +2520,9 @@ overflow: static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ) { enum loadorder loadorder; - WCHAR buffer[64]; WCHAR *filename; - ULONG size; WINE_MODREF *main_exe; + UNICODE_STRING nt_name; struct stat st; HANDLE handle; NTSTATUS nts; @@ -2502,17 +2530,8 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); *pwm = NULL; - filename = buffer; - size = sizeof(buffer); - for (;;) - { - nts = find_dll_file( load_path, libname, filename, &size, pwm, &handle, &st ); - if (nts == STATUS_SUCCESS) break; - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); - if (nts != STATUS_BUFFER_TOO_SMALL) return nts; - /* grow the buffer and retry */ - if (!(filename = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return STATUS_NO_MEMORY; - } + nts = find_dll_file( load_path, libname, &nt_name, pwm, &handle, &st ); + if (nts) return nts; if (*pwm) /* found already loaded module */ { @@ -2521,10 +2540,11 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ TRACE("Found %s for %s at %p, count=%d\n", debugstr_w((*pwm)->ldr.FullDllName.Buffer), debugstr_w(libname), (*pwm)->ldr.BaseAddress, (*pwm)->ldr.LoadCount); - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); + RtlFreeUnicodeString( &nt_name ); return STATUS_SUCCESS; } + filename = nt_name.Buffer + 4; /* \??\ prefix */ main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); @@ -2578,19 +2598,13 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ } if (nts == STATUS_SUCCESS) - { - /* Initialize DLL just loaded */ TRACE("Loaded module %s (%s) at %p\n", debugstr_w(filename), - ((*pwm)->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native", - (*pwm)->ldr.BaseAddress); - if (handle) NtClose( handle ); - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); - return nts; - } + ((*pwm)->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native", (*pwm)->ldr.BaseAddress); + else + WARN("Failed to load module %s; status=%x\n", debugstr_w(libname), nts); - WARN("Failed to load module %s; status=%x\n", debugstr_w(libname), nts); if (handle) NtClose( handle ); - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); + RtlFreeUnicodeString( &nt_name ); return nts; } @@ -2630,9 +2644,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ) { NTSTATUS status; - WCHAR buffer[128]; - WCHAR *filename; - ULONG size; + UNICODE_STRING nt_name; WINE_MODREF *wm; HANDLE handle; struct stat st; @@ -2641,21 +2653,9 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S if (!load_path) load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - filename = buffer; - size = sizeof(buffer); - for (;;) - { - status = find_dll_file( load_path, name->Buffer, filename, &size, &wm, &handle, &st ); - if (handle) NtClose( handle ); - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); - if (status != STATUS_BUFFER_TOO_SMALL) break; - /* grow the buffer and retry */ - if (!(filename = RtlAllocateHeap( GetProcessHeap(), 0, size ))) - { - status = STATUS_NO_MEMORY; - break; - } - } + status = find_dll_file( load_path, name->Buffer, &nt_name, &wm, &handle, &st ); + if (handle) NtClose( handle ); + RtlFreeUnicodeString( &nt_name ); if (status == STATUS_SUCCESS) {

1 0

Byeongsik Jeon : gdi32: Add a helper macro for FreeType version check.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 9d92acaa56a7649840adfa0485d632e6b76a0d9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d92acaa56a7649840adfa04… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Fri Feb 8 10:51:32 2019 +0900 gdi32: Add a helper macro for FreeType version check. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 67229dd..0fc41f3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -130,6 +130,7 @@ typedef struct } FT_Version_t; static FT_Version_t FT_Version; static DWORD FT_SimpleVersion; +#define FT_VERSION_VALUE(major, minor, patch) (((major) << 16) | ((minor) << 8) | (patch)) static void *ft_handle = NULL; @@ -1003,7 +1004,7 @@ static BOOL is_subpixel_rendering_enabled( void ) if (enabled == -1) { /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */ - if (FT_SimpleVersion >= ((2 << 16) | (8 << 8) | (1 << 0))) + if (FT_SimpleVersion >= FT_VERSION_VALUE(2, 8, 1)) enabled = TRUE; #ifdef FT_LCD_FILTER_H else if (pFT_Library_SetLcdFilter && @@ -2188,7 +2189,7 @@ static FT_Face new_ft_face( const char *file, void *font_data_ptr, DWORD font_da } /* There are too many bugs in FreeType < 2.1.9 for bitmap font support */ - if (!FT_IS_SCALABLE( ft_face ) && FT_SimpleVersion < ((2 << 16) | (1 << 8) | (9 << 0))) + if (!FT_IS_SCALABLE( ft_face ) && FT_SimpleVersion < FT_VERSION_VALUE(2, 1, 9)) { WARN("FreeType version < 2.1.9, skipping bitmap font %s/%p\n", debugstr_a(file), font_data_ptr); goto fail; @@ -7568,7 +7569,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); /* there is a freetype bug where vertical metrics are only properly scaled and correct in 2.4.0 or greater */ - if ((vertical_metrics) && (FT_Version.major < 2 || (FT_Version.major == 2 && FT_Version.minor < 4))) + if (vertical_metrics && FT_SimpleVersion < FT_VERSION_VALUE(2, 4, 0)) vertical_metrics = FALSE; if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP;

1 0

Byeongsik Jeon : gdi32: Add helper functions to compute the glyph metrics.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: fe5f0ebf0c0a45ad7d5d651071b11c90eaabe3da URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe5f0ebf0c0a45ad7d5d6510… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Fri Feb 8 10:51:30 2019 +0900 gdi32: Add helper functions to compute the glyph metrics. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 252 +++++++++++++++++++++++++++++--------------------- 1 file changed, 145 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe5f0ebf0c0a45ad7d5d…

1 0