wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Piotr Caban : oleaut32/tests: Show that VARIANT_UserUnmarshal may reuse passed in BSTR.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 1063623dfb23af70334aa688a5ae6aabdff0f48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1063623dfb23af70334aa688a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:57 2016 +0100 oleaut32/tests: Show that VARIANT_UserUnmarshal may reuse passed in BSTR. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d04a366..b9478d1 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -767,7 +767,7 @@ static void test_marshal_VARIANT(void) double d; void *mem; DWORD *wirev; - BSTR b; + BSTR b, b2; WCHAR str[] = {'m','a','r','s','h','a','l',' ','t','e','s','t',0}; SAFEARRAYBOUND sab; LPSAFEARRAY lpsa, lpsa2, lpsa_copy; @@ -1237,15 +1237,21 @@ static void test_marshal_VARIANT(void) ok(*wirev, "wv[6] %08x\n", *wirev); /* win2k: this is b. winxp: this is (char*)b + 1 */ wirev++; check_bstr(wirev, b); + b2 = SysAllocString(str); + b2[0] = 0; + V_VT(&v2) = VT_BSTR | VT_BYREF; + V_BSTRREF(&v2) = &b2; + mem = b2; VariantInit(&v2); stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + ok(mem == b2, "BSTR should be reused\n"); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(SysStringByteLen(*V_BSTRREF(&v)) == SysStringByteLen(*V_BSTRREF(&v2)), "bstr string lens differ\n"); ok(!memcmp(*V_BSTRREF(&v), *V_BSTRREF(&v2), SysStringByteLen(*V_BSTRREF(&v))), "bstrs differ\n"); - VARIANT_UserFree(&umcb.Flags, &v2); + SysFreeString(b2); HeapFree(GetProcessHeap(), 0, oldbuffer); SysFreeString(b);

1 0

Piotr Caban : oleaut32: Don' t overwrite pointers in VARIANT_UserUnmarshal so we may free or reuse them.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: ba498e6002728df149730f7089c0c81e661639d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba498e6002728df149730f708… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:44 2016 +0100 oleaut32: Don't overwrite pointers in VARIANT_UserUnmarshal so we may free or reuse them. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/usrmarshal.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 726dd96..955b709 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -349,10 +349,6 @@ static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char * ptr = *(DWORD*)Buffer; Buffer += sizeof(DWORD); - /* Clear any existing interface which WdtpInterfacePointer_UserUnmarshal() - would try to release. This has been done already with a VariantClear(). */ - *ppunk = NULL; - if(!ptr) return Buffer; @@ -528,8 +524,14 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe memset(V_BYREF(pvar), 0, mem_size); } - if(!(header->vt & VT_ARRAY)) + if(!(header->vt & VT_ARRAY) + && (header->vt & VT_TYPEMASK) != VT_BSTR + && (header->vt & VT_TYPEMASK) != VT_VARIANT + && (header->vt & VT_TYPEMASK) != VT_UNKNOWN + && (header->vt & VT_TYPEMASK) != VT_DISPATCH + && (header->vt & VT_TYPEMASK) != VT_RECORD) memcpy(V_BYREF(pvar), Pos, type_size); + if((header->vt & VT_TYPEMASK) != VT_VARIANT) Pos += type_size; else @@ -540,6 +542,14 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe VariantClear(pvar); if(header->vt & VT_ARRAY) V_ARRAY(pvar) = NULL; + else if((header->vt & VT_TYPEMASK) == VT_BSTR) + V_BSTR(pvar) = NULL; + else if((header->vt & VT_TYPEMASK) == VT_UNKNOWN) + V_UNKNOWN(pvar) = NULL; + else if((header->vt & VT_TYPEMASK) == VT_DISPATCH) + V_DISPATCH(pvar) = NULL; + else if((header->vt & VT_TYPEMASK) == VT_RECORD) + V_RECORD(pvar) = NULL; else if((header->vt & VT_TYPEMASK) == VT_DECIMAL) memcpy(pvar, Pos, type_size); else @@ -564,11 +574,9 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe switch (header->vt) { case VT_BSTR: - V_BSTR(pvar) = NULL; Pos = BSTR_UserUnmarshal(pFlags, Pos, &V_BSTR(pvar)); break; case VT_BSTR | VT_BYREF: - *V_BSTRREF(pvar) = NULL; Pos = BSTR_UserUnmarshal(pFlags, Pos, V_BSTRREF(pvar)); break; case VT_VARIANT | VT_BYREF:

1 0

Piotr Caban : oleaut32: Reuse safearray passed to LPSAFEARRAY_UserUnmarshal if possible.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: c1974090c6d592535ea893d28d35b672d51e77ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1974090c6d592535ea893d28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:32 2016 +0100 oleaut32: Reuse safearray passed to LPSAFEARRAY_UserUnmarshal if possible. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 3 +-- dlls/oleaut32/usrmarshal.c | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index e5fb58c..d04a366 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1371,8 +1371,7 @@ static void test_marshal_VARIANT(void) ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(lpsa2 == lpsa_copy, "safearray should be reused\n"); - todo_wine ok(mem == lpsa2->pvData, "safearray data should be reused\n"); - if(mem != lpsa2->pvData) CoTaskMemFree(mem); + ok(mem == lpsa2->pvData, "safearray data should be reused\n"); ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v2)), "array dims differ\n"); SafeArrayGetLBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetLBound(*V_ARRAYREF(&v2), 1, &bound2); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 02f5f34..726dd96 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1008,7 +1008,26 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B wiresab = (SAFEARRAYBOUND *)Buffer; Buffer += sizeof(wiresab[0]) * wiresa->cDims; - if(vt) + if(*ppsa && (*ppsa)->cDims==wiresa->cDims) + { + if(((*ppsa)->fFeatures & ~FADF_AUTOSETFLAGS) != (wiresa->fFeatures & ~FADF_AUTOSETFLAGS)) + RpcRaiseException(DISP_E_BADCALLEE); + + if(SAFEARRAY_GetCellCount(*ppsa)*(*ppsa)->cbElements != cell_count*elem_mem_size(wiresa, sftype)) + { + if((*ppsa)->fFeatures & (FADF_AUTO|FADF_STATIC|FADF_EMBEDDED|FADF_FIXEDSIZE)) + RpcRaiseException(DISP_E_BADCALLEE); + + hr = SafeArrayDestroyData(*ppsa); + if(FAILED(hr)) + RpcRaiseException(hr); + } + memcpy((*ppsa)->rgsabound, wiresab, sizeof(*wiresab)*wiresa->cDims); + + if((*ppsa)->fFeatures & FADF_HAVEVARTYPE) + ((DWORD*)(*ppsa))[-1] = vt; + } + else if(vt) { SafeArrayDestroy(*ppsa); *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); @@ -1028,11 +1047,10 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B (*ppsa)->fFeatures |= (wiresa->fFeatures & ~(FADF_AUTOSETFLAGS)); /* FIXME: there should be a limit on how large wiresa->cbElements can be */ (*ppsa)->cbElements = elem_mem_size(wiresa, sftype); - (*ppsa)->cLocks = 0; /* SafeArrayCreateEx allocates the data for us, but * SafeArrayAllocDescriptor doesn't */ - if(!vt) + if(!(*ppsa)->pvData) { hr = SafeArrayAllocData(*ppsa); if (FAILED(hr))

1 0

Piotr Caban : oleaut32: Pass safearray from VARIANT_UserUnmarshal to LPSAFEARRAY_UserUnmarshal so it can be reused.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 37e2acb205957bd7120274a73abba9323994aa21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e2acb205957bd7120274a73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:23 2016 +0100 oleaut32: Pass safearray from VARIANT_UserUnmarshal to LPSAFEARRAY_UserUnmarshal so it can be reused. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 8 ++------ dlls/oleaut32/usrmarshal.c | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d4d7d53..e5fb58c 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1370,13 +1370,9 @@ static void test_marshal_VARIANT(void) next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); - todo_wine ok(lpsa2 == lpsa_copy, "safearray should be reused\n"); + ok(lpsa2 == lpsa_copy, "safearray should be reused\n"); todo_wine ok(mem == lpsa2->pvData, "safearray data should be reused\n"); - if(lpsa2 != lpsa_copy) - { - lpsa_copy->fFeatures &= ~FADF_STATIC; - SafeArrayDestroy(lpsa_copy); - } + if(mem != lpsa2->pvData) CoTaskMemFree(mem); ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v2)), "array dims differ\n"); SafeArrayGetLBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetLBound(*V_ARRAYREF(&v2), 1, &bound2); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index d66d42a..02f5f34 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -520,10 +520,16 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe { VariantClear(pvar); V_BYREF(pvar) = CoTaskMemAlloc(mem_size); + memset(V_BYREF(pvar), 0, mem_size); } else if (!V_BYREF(pvar)) + { V_BYREF(pvar) = CoTaskMemAlloc(mem_size); - memcpy(V_BYREF(pvar), Pos, type_size); + memset(V_BYREF(pvar), 0, mem_size); + } + + if(!(header->vt & VT_ARRAY)) + memcpy(V_BYREF(pvar), Pos, type_size); if((header->vt & VT_TYPEMASK) != VT_VARIANT) Pos += type_size; else @@ -532,7 +538,9 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe else { VariantClear(pvar); - if((header->vt & VT_TYPEMASK) == VT_DECIMAL) + if(header->vt & VT_ARRAY) + V_ARRAY(pvar) = NULL; + else if((header->vt & VT_TYPEMASK) == VT_DECIMAL) memcpy(pvar, Pos, type_size); else memcpy(&pvar->n1.n2.n3, Pos, type_size); @@ -963,6 +971,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B if (!ptr) { + SafeArrayDestroy(*ppsa); *ppsa = NULL; TRACE("NULL safe array unmarshaled\n"); @@ -1001,11 +1010,13 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B if(vt) { + SafeArrayDestroy(*ppsa); *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); if (!*ppsa) RpcRaiseException(E_OUTOFMEMORY); } else { + SafeArrayDestroy(*ppsa); if (FAILED(SafeArrayAllocDescriptor(wiresa->cDims, ppsa))) RpcRaiseException(E_OUTOFMEMORY); memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims);

1 0

Piotr Caban : oleaut32: Set safearray pointer to NULL in LPSAFEARRAY_UserFree.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 3815eca2683766403aa80648b48d9c19894a2e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3815eca2683766403aa80648b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:12 2016 +0100 oleaut32: Set safearray pointer to NULL in LPSAFEARRAY_UserFree. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 1 + dlls/oleaut32/usrmarshal.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 24b382c..d4d7d53 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -277,6 +277,7 @@ static void test_marshal_LPSAFEARRAY(void) ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); + ok(!lpsa2, "lpsa2 was not set to 0 by LPSAFEARRAY_UserFree\n"); HeapFree(GetProcessHeap(), 0, buffer); lpsa->cLocks = 0; hr = SafeArrayDestroy(lpsa); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 303ec69..d66d42a 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1091,6 +1091,7 @@ void WINAPI LPSAFEARRAY_UserFree(ULONG *pFlags, LPSAFEARRAY *ppsa) TRACE("("); dump_user_flags(pFlags); TRACE(", &%p\n", *ppsa); SafeArrayDestroy(*ppsa); + *ppsa = NULL; }

1 0

Piotr Caban : oleaut32/tests: Add tests for safearray unmarshaling into passed variant.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 6183f4fc7d4c38477960337c290a30b79ecbf1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6183f4fc7d4c38477960337c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:50:55 2016 +0100 oleaut32/tests: Add tests for safearray unmarshaling into passed variant. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 60 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 88a0731..24b382c 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -769,7 +769,7 @@ static void test_marshal_VARIANT(void) BSTR b; WCHAR str[] = {'m','a','r','s','h','a','l',' ','t','e','s','t',0}; SAFEARRAYBOUND sab; - LPSAFEARRAY lpsa; + LPSAFEARRAY lpsa, lpsa2, lpsa_copy; DECIMAL dec, dec2; HeapUnknown *heap_unknown; DWORD expected; @@ -1336,6 +1336,64 @@ static void test_marshal_VARIANT(void) } VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); + + /*** ARRAY BYREF ***/ + VariantInit(&v); + V_VT(&v) = VT_UI4 | VT_ARRAY | VT_BYREF; + V_ARRAYREF(&v) = &lpsa; + lpsa->fFeatures |= FADF_STATIC; + + rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v); + expected = 152; + ok(stubMsg.BufferLength == expected || stubMsg.BufferLength == expected + 16, /* win64 */ + "size %u instead of %u\n", stubMsg.BufferLength, expected); + buffer = rpcMsg.Buffer = stubMsg.Buffer = stubMsg.BufferStart = alloc_aligned(stubMsg.BufferLength, &oldbuffer); + stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength; + next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v); + ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); + wirev = (DWORD*)buffer; + + wirev = check_variant_header(wirev, &v, expected); + ok(*wirev == 4, "wv[5] %08x\n", *wirev); + wirev++; + ok(*wirev, "wv[6] %08x\n", *wirev); /* win2k: this is lpsa. winxp: this is (char*)lpsa + 1 */ + wirev++; + check_safearray(wirev, lpsa); + lpsa_copy = lpsa2 = SafeArrayCreate(VT_I8, 1, &sab); + /* set FADF_STATIC feature to make sure lpsa2->pvData pointer changes if new data buffer is allocated */ + lpsa2->fFeatures |= FADF_STATIC; + mem = lpsa2->pvData; + V_VT(&v2) = VT_UI4 | VT_ARRAY | VT_BYREF; + V_ARRAYREF(&v2) = &lpsa2; + stubMsg.Buffer = buffer; + next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); + ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); + ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); + todo_wine ok(lpsa2 == lpsa_copy, "safearray should be reused\n"); + todo_wine ok(mem == lpsa2->pvData, "safearray data should be reused\n"); + if(lpsa2 != lpsa_copy) + { + lpsa_copy->fFeatures &= ~FADF_STATIC; + SafeArrayDestroy(lpsa_copy); + } + ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v2)), "array dims differ\n"); + SafeArrayGetLBound(*V_ARRAYREF(&v), 1, &bound); + SafeArrayGetLBound(*V_ARRAYREF(&v2), 1, &bound2); + ok(bound == bound2, "array lbounds differ\n"); + SafeArrayGetUBound(*V_ARRAYREF(&v), 1, &bound); + SafeArrayGetUBound(*V_ARRAYREF(&v2), 1, &bound2); + ok(bound == bound2, "array ubounds differ\n"); + if (pSafeArrayGetVartype) + { + pSafeArrayGetVartype(*V_ARRAYREF(&v), &vt); + pSafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); + ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); + } + lpsa2->fFeatures &= ~FADF_STATIC; + hr = SafeArrayDestroy(*V_ARRAYREF(&v2)); + ok(hr == S_OK, "got 0x%08x\n", hr); + HeapFree(GetProcessHeap(), 0, oldbuffer); + lpsa->fFeatures &= ~FADF_STATIC; hr = SafeArrayDestroy(lpsa); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite: Scale strikethrough thickness and position with current font size.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 943fb2c071049c2f17358c4df5d54a6e4c5d0ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=943fb2c071049c2f17358c4df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 14 01:04:54 2016 +0300 dwrite: Scale strikethrough thickness and position with current font size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index daa56e9..943fef9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -651,10 +651,7 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s } } -static inline FLOAT get_scaled_font_metric(UINT32 metric, FLOAT emSize, const DWRITE_FONT_METRICS *metrics) -{ - return (FLOAT)metric * emSize / (FLOAT)metrics->designUnitsPerEm; -} +#define SCALE_FONT_METRIC(metric, emSize, metrics) ((FLOAT)(metric) * (emSize) / (FLOAT)(metrics)->designUnitsPerEm) static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) { @@ -878,8 +875,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) else IDWriteFontFace_GetMetrics(run->run.fontFace, &fontmetrics); - r->baseline = get_scaled_font_metric(fontmetrics.ascent, run->run.fontEmSize, &fontmetrics); - r->height = get_scaled_font_metric(fontmetrics.ascent + fontmetrics.descent, run->run.fontEmSize, &fontmetrics); + r->baseline = SCALE_FONT_METRIC(fontmetrics.ascent, run->run.fontEmSize, &fontmetrics); + r->height = SCALE_FONT_METRIC(fontmetrics.ascent + fontmetrics.descent, run->run.fontEmSize, &fontmetrics); layout_set_cluster_metrics(layout, r, &cluster); @@ -1135,8 +1132,9 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const IDWriteFontFace_GetMetrics(r->u.regular.run.fontFace, &metrics); s->s.width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count); - s->s.thickness = metrics.strikethroughThickness; - s->s.offset = metrics.strikethroughPosition; + s->s.thickness = SCALE_FONT_METRIC(metrics.strikethroughThickness, r->u.regular.run.fontEmSize, &metrics); + /* Negative offset moves it above baseline as Y coordinate grows downward. */ + s->s.offset = -SCALE_FONT_METRIC(metrics.strikethroughPosition, r->u.regular.run.fontEmSize, &metrics); s->s.readingDirection = layout->format.readingdir; s->s.flowDirection = layout->format.flow; s->s.localeName = r->u.regular.descr.localeName;

1 0

Nikolay Sivov : dwrite: Handle bitmap allocation error when rendering to bitmap target.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 261563f28e040512d95bb73b0673685809196924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=261563f28e040512d95bb73b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 13 22:41:13 2016 +0300 dwrite: Handle bitmap allocation error when rendering to bitmap target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index ded3731..794ebee 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -422,6 +422,11 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (texturetype == DWRITE_TEXTURE_CLEARTYPE_3x1) size *= 3; bitmap = heap_alloc_zero(size); + if (!bitmap) { + IDWriteGlyphRunAnalysis_Release(analysis); + return E_OUTOFMEMORY; + } + hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, texturetype, &target, bitmap, size); if (hr == S_OK) { /* blit to target dib */

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayLock()/SafeArrayUnlock().
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 2ef42bd946caa11c2248afbeb0dfc3e6d05929b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef42bd946caa11c2248afbeb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 13 22:25:56 2016 +0300 ole2disp: Implement SafeArrayLock()/SafeArrayUnlock(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 34 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 20b7b6c..af6f03c 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -108,6 +108,40 @@ USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayLock [OLE2DISP.21] + */ +HRESULT WINAPI SafeArrayLock16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + + if (!sa) + return E_INVALIDARG16; + + if (sa->cLocks == 0xffff) + return E_UNEXPECTED; + + sa->cLocks++; + return S_OK; +} + +/****************************************************************************** + * SafeArrayUnlock [OLE2DISP.22] + */ +HRESULT WINAPI SafeArrayUnlock16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + + if (!sa) + return E_INVALIDARG16; + + if (sa->cLocks == 0) + return E_UNEXPECTED; + + sa->cLocks--; + return S_OK; +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index ca884a0..b0db920 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -18,8 +18,8 @@ 18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 19 stub SAFEARRAYGETUBOUND 20 stub SAFEARRAYGETLBOUND -21 stub SAFEARRAYLOCK -22 stub SAFEARRAYUNLOCK +21 pascal SafeArrayLock(ptr) SafeArrayLock16 +22 pascal SafeArrayUnlock(ptr) SafeArrayUnlock16 23 stub SAFEARRAYACCESSDATA 24 stub SAFEARRAYUNACCESSDATA 25 stub SAFEARRAYGETELEMENT

1 0

Austin English : Update 1.8 references to 2.0.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: bugzilla Branch: master Commit: 306c3846e235273eb013491e63d4a7bdabe2cb5a URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=306c3846e235273eb0134… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jan 10 23:34:54 2016 -0600 Update 1.8 references to 2.0. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 07b81e2..f710221 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,7 +23,7 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=2.0.0&order=bugs.bug_severity">Wine 2.0</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 5d5b1b8..4c2dc95 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -150,8 +150,8 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a> - These bugs are scheduled to be fixed before Wine 1.8 is released. + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=2.0.0&order=bugs.bug_severity">Wine 2.0</a> + These bugs are scheduled to be fixed before Wine 2.0 is released. </li> <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a>

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
63
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 January 2016