October 2020 - Wine-Commits

Zebediah Figura : winegstreamer: Respect integer promotion rules when clamping timestamp + diff.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 458dfcb95a9d8877921574535fc0d8d08084ac6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=458dfcb95a9d887792157453… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 22 11:10:16 2020 -0500 winegstreamer: Respect integer promotion rules when clamping timestamp + diff. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6279c2c28c0..68b12cf8f14 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2060,7 +2060,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil /* The documentation specifies that timestamp + diff must be nonnegative. */ diff = qm.Late * 100; - if (timestamp < -diff) + if (diff < 0 && timestamp < (GstClockTime)-diff) diff = -timestamp; evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp);

1 0

Joachim Priesner : ntdll: Fix read buffer overflow in find_file_in_dir().
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: e533a26dcff611f312e5bfce47061d2155476c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e533a26dcff611f312e5bfce… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Thu Oct 22 18:29:49 2020 +0200 ntdll: Fix read buffer overflow in find_file_in_dir(). Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index afb552be098..d12a3ffb119 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2550,6 +2550,8 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i goto not_found; } } + /* if that did not work, restore previous state of unix_name */ + unix_name[pos - 1] = 0; } close( fd ); }

1 0

Paul Gofman : ntdll: Fix xmm registers copy offset in call_consolidate_callback() on x86_64.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 36dcb6965146022c1a1f15c1653d5d713036db3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=36dcb6965146022c1a1f15c1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Oct 21 22:52:24 2020 +0300 ntdll: Fix xmm registers copy offset in call_consolidate_callback() on x86_64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50010 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6fbb612825b..a332f961908 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1086,7 +1086,7 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, "pushq %rsi\n\t" "pushq %rdi\n\t" "leaq 0x200(%rcx),%rsi\n\t" - "leaq 0x60(%rsp),%rdi\n\t" + "leaq 0x70(%rsp),%rdi\n\t" "movq $0x14,%rcx\n\t" "cld\n\t" "rep; movsq\n\t"

1 0

Zebediah Figura : winegstreamer: DirectShow and GStreamer proportions are inverted with respect to each other.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 63cf882e392478f8df339a3aa45940af9fe75936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63cf882e392478f8df339a3a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 22 11:10:17 2020 -0500 winegstreamer: DirectShow and GStreamer proportions are inverted with respect to each other. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 22 +++++++++++++++++++++ dlls/winegstreamer/gstdemux.c | 42 ++++++++++++++++++++++++++-------------- 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 60b38a48f5a..57d40d19a89 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -37,9 +37,31 @@ #include "dshow.h" #include "strmif.h" #include "mfobjects.h" +#include "wine/debug.h" #include "wine/heap.h" #include "wine/strmbase.h" +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) extern LONG object_locks; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 68b12cf8f14..9f5e147b7ed 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2032,45 +2032,57 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) return IPin_Release(&pin->pin.pin.IPin_iface); } -static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) +static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { struct gstdemux_source *pin = impl_from_IQualityControl(iface); GstQOSType type = GST_QOS_TYPE_OVERFLOW; GstClockTime timestamp; GstClockTimeDiff diff; - GstEvent *evt; + GstEvent *event; - TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, - qm.Type, qm.Proportion, - wine_dbgstr_longlong(qm.Late), - wine_dbgstr_longlong(qm.TimeStamp)); + TRACE("pin %p, sender %p, type %s, proportion %u, late %s, timestamp %s.\n", + pin, sender, q.Type == Famine ? "Famine" : "Flood", q.Proportion, + debugstr_time(q.Late), debugstr_time(q.TimeStamp)); mark_wine_thread(); - /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + /* GST_QOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but * DirectShow filters might use Famine, so check that there actually is an * underrun. */ - if (qm.Type == Famine && qm.Proportion > 1000) + if (q.Type == Famine && q.Proportion < 1000) type = GST_QOS_TYPE_UNDERFLOW; /* DirectShow filters sometimes pass negative timestamps (Audiosurf uses the * current time instead of the time of the last buffer). GstClockTime is * unsigned, so clamp it to 0. */ - timestamp = max(qm.TimeStamp * 100, 0); + timestamp = max(q.TimeStamp * 100, 0); /* The documentation specifies that timestamp + diff must be nonnegative. */ - diff = qm.Late * 100; + diff = q.Late * 100; if (diff < 0 && timestamp < (GstClockTime)-diff) diff = -timestamp; - evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp); + /* DirectShow "Proportion" describes what percentage of buffers the upstream + * filter should keep (i.e. dropping the rest). If frames are late, the + * proportion will be less than 1. For example, a proportion of 500 means + * that the element should drop half of its frames, essentially because + * frames are taking twice as long as they should to arrive. + * + * GStreamer "proportion" is the inverse of this; it describes how much + * faster the upstream element should produce frames. I.e. if frames are + * taking twice as long as they should to arrive, we want the frames to be + * decoded twice as fast, and so we pass 2.0 to GStreamer. */ - if (!evt) { - WARN("Failed to create QOS event\n"); - return E_INVALIDARG; + if (!q.Proportion) + { + WARN("Ignoring quality message with zero proportion.\n"); + return S_OK; } - gst_pad_push_event(pin->my_sink, evt); + if (!(event = gst_event_new_qos(type, 1000.0 / q.Proportion, diff, timestamp))) + ERR("Failed to create QOS event.\n"); + + gst_pad_push_event(pin->my_sink, event); return S_OK; }

1 0

Gijs Vermeulen : qcap/capturegraph: Return E_POINTER when ICaptureGraphBuilder2::FindInterface() is called with NULL filter.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 4aabbaaf95444c0b88978128a25a65e4ecf12743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aabbaaf95444c0b88978128… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Oct 22 18:14:56 2020 +0200 qcap/capturegraph: Return E_POINTER when ICaptureGraphBuilder2::FindInterface() is called with NULL filter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46950 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 3 +++ dlls/qcap/tests/capturegraph.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index b4f83956f0e..b98a321cb3a 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -343,6 +343,9 @@ static HRESULT WINAPI fnCaptureGraphBuilder2_FindInterface(ICaptureGraphBuilder2 TRACE("graph %p, category %s, majortype %s, filter %p, iid %s, out %p.\n", graph, debugstr_guid(category), debugstr_guid(majortype), filter, debugstr_guid(iid), out); + if (!filter) + return E_POINTER; + if (category && IsEqualGUID(category, &LOOK_DOWNSTREAM_ONLY)) return find_interface_recurse(PINDIR_OUTPUT, NULL, NULL, filter, iid, out); diff --git a/dlls/qcap/tests/capturegraph.c b/dlls/qcap/tests/capturegraph.c index c37ac515734..cdd9a27828a 100644 --- a/dlls/qcap/tests/capturegraph.c +++ b/dlls/qcap/tests/capturegraph.c @@ -384,6 +384,10 @@ static void test_find_interface(void) /* Test search order without any restrictions applied. */ + hr = ICaptureGraphBuilder2_FindInterface(capture_graph, NULL, &bogus_majortype, + NULL, &testiid, (void **)&unk); + ok(hr == E_POINTER, "got hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(tests_from_filter2); ++i) { hr = ICaptureGraphBuilder2_FindInterface(capture_graph, NULL, &bogus_majortype,

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put CursorType.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 7287bd50077ce5d187e5435e9192ffcdc73e2d3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7287bd50077ce5d187e5435e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 22 14:46:20 2020 +0200 msado15: Implement _Recordset get/put CursorType. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 6 ++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a5096e5c4ff..e3dd83a4309 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -44,6 +44,7 @@ struct recordset LONG index; VARIANT *data; CursorLocationEnum cursor_location; + CursorTypeEnum cursor_type; }; struct fields @@ -910,14 +911,22 @@ static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size ) static HRESULT WINAPI recordset_get_CursorType( _Recordset *iface, CursorTypeEnum *cursor_type ) { - FIXME( "%p, %p\n", iface, cursor_type ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", iface, cursor_type ); + + *cursor_type = recordset->cursor_type; + return S_OK; } static HRESULT WINAPI recordset_put_CursorType( _Recordset *iface, CursorTypeEnum cursor_type ) { - FIXME( "%p, %d\n", iface, cursor_type ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %d\n", iface, cursor_type ); + + recordset->cursor_type = cursor_type; + return S_OK; } static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) @@ -1546,6 +1555,7 @@ HRESULT Recordset_create( void **obj ) recordset->refs = 1; recordset->index = -1; recordset->cursor_location = adUseServer; + recordset->cursor_type = adOpenForwardOnly; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index adf9fb30bc2..e95df49c2c2 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -68,6 +68,7 @@ static void test_Recordset(void) LONG refs, count, state; VARIANT missing, val, index; CursorLocationEnum location; + CursorTypeEnum cursor; BSTR name; HRESULT hr; @@ -144,6 +145,11 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( location == adUseServer, "got %d\n", location ); + cursor = adOpenUnspecified; + hr = _Recordset_get_CursorType( recordset, &cursor ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr );

1 0

Nikolay Sivov : evr/mixer: Implement GetOutputStatus().
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: d63ff3403b323cf03522ca0a41b29446f6f11b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63ff3403b323cf03522ca0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:02:45 2020 +0300 evr/mixer: Implement GetOutputStatus(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 32 +++++++++++++++++++++++++++++--- dlls/evr/tests/evr.c | 20 ++++++++++++++++++++ 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index b87b621835e..2c2fda51cd1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -934,11 +934,37 @@ static HRESULT WINAPI video_mixer_transform_GetInputStatus(IMFTransform *iface, return hr; } -static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, DWORD *flags) +static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, DWORD *status) { - FIXME("%p, %p.\n", iface, flags); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + HRESULT hr = S_OK; + unsigned int i; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, status); + + if (!status) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + + if (!mixer->output.media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else + { + *status = MFT_OUTPUT_STATUS_SAMPLE_READY; + for (i = 0; i < mixer->input_count; ++i) + { + if (!mixer->inputs[i].sample) + { + *status = 0; + break; + } + } + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 776f61bbbe7..7cf127d4d8c 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2098,6 +2098,12 @@ static void test_mixer_samples(void) hr = IMFTransform_GetInputStatus(mixer, 1, &status); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetOutputStatus(mixer, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + /* Configure device and media types. */ hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2132,6 +2138,11 @@ static void test_mixer_samples(void) hr = IMFTransform_GetInputStatus(mixer, 1, &status); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + status = ~0u; + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!status, "Unexpected status %#x.\n", status); + IMFMediaType_Release(video_type); memset(&buffer, 0, sizeof(buffer)); @@ -2190,6 +2201,11 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#x.\n", status); + status = ~0u; + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!status, "Unexpected status %#x.\n", status); + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2198,6 +2214,10 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!status, "Unexpected status %#x.\n", status); + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#x.\n", status); + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr);

1 0

Alexandre Julliard : gdi32: Move the get_glyph_outline() helper to the font function interface.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: a3b08dd3f3e621d87782aff22447a95511b80a08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b08dd3f3e621d87782aff2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 11:56:47 2020 +0200 gdi32: Move the get_glyph_outline() helper to the font function interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 80 ++++++++++++++++++++++------- dlls/gdi32/freetype.c | 130 +++-------------------------------------------- dlls/gdi32/gdi_private.h | 9 +--- 3 files changed, 73 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3b08dd3f3e621d87782…

1 0

Huw Davies : riched20: Use cell ptrs in the rtf writing code.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: b2c812e3a3f8c3286373433635c4b653704c3d61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2c812e3a3f8c32863734336… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:49 2020 +0100 riched20: Use cell ptrs in the rtf writing code. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 182a725dbad..9e79eda274d 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -316,7 +316,7 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs ME_Run *run = first; ME_FontTableItem *table = pStream->fonttbl; unsigned int i; - ME_DisplayItem *pCell = NULL; + ME_Cell *cell = NULL; ME_Paragraph *prev_para = NULL; do @@ -336,12 +336,10 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs if (run->para->fmt.wNumbering) add_font_to_fonttbl( pStream, run->para->para_num.style ); - if ((pCell = run->para->pCell)) + if ((cell = para_cell( run->para ))) { - ME_Border* borders[4] = { &pCell->member.cell.border.top, - &pCell->member.cell.border.left, - &pCell->member.cell.border.bottom, - &pCell->member.cell.border.right }; + ME_Border* borders[4] = { &cell->border.top, &cell->border.left, + &cell->border.bottom, &cell->border.right }; for (i = 0; i < 4; i++) if (borders[i]->width > 0) add_color_to_colortbl( pStream, borders[i]->colorRef ); @@ -389,7 +387,7 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream, ME_Paragraph *para ) { - ME_DisplayItem *cell; + ME_Cell *cell; char props[STREAMOUT_BUFFER_SIZE] = ""; int i; const char sideChar[4] = {'t','l','b','r'}; @@ -399,19 +397,16 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream if (!editor->bEmulateVersion10) /* v4.1 */ { PARAFORMAT2 *pFmt = &table_row_end( para )->fmt; - para = table_row_start( para ); - cell = para->next_para->member.para.pCell; - assert(cell); + cell = table_row_first_cell( para ); + assert( cell ); if (pFmt->dxOffset) sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); if (pFmt->dxStartIndent) sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); do { - ME_Border* borders[4] = { &cell->member.cell.border.top, - &cell->member.cell.border.left, - &cell->member.cell.border.bottom, - &cell->member.cell.border.right }; + ME_Border* borders[4] = { &cell->border.top, &cell->border.left, + &cell->border.bottom, &cell->border.right }; for (i = 0; i < 4; i++) { if (borders[i]->width) @@ -425,9 +420,9 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream sprintf(props + strlen(props), "\\brdrcf%u", idx); } } - sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); - cell = cell->member.cell.next_cell; - } while (cell->member.cell.next_cell); + sprintf( props + strlen(props), "\\cellx%d", cell->nRightBoundary ); + cell = cell_next( cell ); + } while (cell_next( cell )); } else /* v1.0 - 3.0 */ {

1 0

Alexandre Julliard : gdi32: Move the font critical section out of freetype.c.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 26f8b4a7bc131acd910c41748bda6971a84148c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26f8b4a7bc131acd910c4174… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 11:54:35 2020 +0200 gdi32: Move the font critical section out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 147 ++++++++++++++++++++++++++++++++++++----------- dlls/gdi32/freetype.c | 95 ++++-------------------------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 125 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26f8b4a7bc131acd910c…

1 0