November 2020 - Wine-Commits

Derek Lesho : winegstreamer: Implement IMFMediaStream::GetMediaSource.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: 96097c072b654872f1c6c366f4a820a099ffe5b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96097c072b654872f1c6c366… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Nov 3 09:56:55 2020 -0600 winegstreamer: Implement IMFMediaStream::GetMediaSource. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index dbc656a24da..06f35ce24b6 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -681,12 +681,15 @@ static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMedi { struct media_stream *stream = impl_from_IMFMediaStream(iface); - FIXME("stub (%p)->(%p)\n", stream, source); + TRACE("(%p)->(%p)\n", stream, source); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + IMFMediaSource_AddRef(&stream->parent_source->IMFMediaSource_iface); + *source = &stream->parent_source->IMFMediaSource_iface; + + return S_OK; } static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IMFStreamDescriptor **descriptor)

1 0

Robert Wilhelm : vbscript: Allow keywords to be used as function name.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: 72977a75a4e281dff69f150b608f50a73bb5c81f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72977a75a4e281dff69f150b… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Nov 5 23:12:15 2020 +0100 vbscript: Allow keywords to be used as function name. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 10 +++++----- dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 942e76459c2..7c749b5ef77 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -490,11 +490,11 @@ ArgumentDecl /* these keywords may also be an identifier, depending on context */ Identifier : tIdentifier { $$ = $1; } - | tDEFAULT { $$ = $1; } - | tERROR { $$ = $1; } - | tEXPLICIT { $$ = $1; } - | tPROPERTY { $$ = $1; } - | tSTEP { $$ = $1; } + | tDEFAULT { ctx->last_token = tIdentifier; $$ = $1; } + | tERROR { ctx->last_token = tIdentifier; $$ = $1; } + | tEXPLICIT { ctx->last_token = tIdentifier; $$ = $1; } + | tPROPERTY { ctx->last_token = tIdentifier; $$ = $1; } + | tSTEP { ctx->last_token = tIdentifier; $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 65f8a458cd7..570bb7fbcb3 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1631,9 +1631,31 @@ sub test_identifiers Dim step step = "xx" Call ok(step = "xx", "step = " & step & " expected ""xx""") + + Dim property + property = "xx" + Call ok(property = "xx", "property = " & property & " expected ""xx""") end sub call test_identifiers() +Class class_test_identifiers_as_function_name + Sub Property ( par ) + End Sub + + Function Error( par ) + End Function + + Sub Default () + End Sub + + Function Explicit (par) + Explicit = par + End Function + + Sub Step ( default ) + End Sub +End Class + sub test_dotIdentifiers ' test keywords that can also be an identifier after a dot Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10")

1 0

Alexandre Julliard : gdi32: Use wide-character string literals.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: b1d920bb9f1abec02c4998eb79438653eca7d1ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1d920bb9f1abec02c4998eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 6 12:08:16 2020 +0100 gdi32: Use wide-character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 6 +- dlls/gdi32/driver.c | 42 ++---- dlls/gdi32/enhmetafile.c | 3 +- dlls/gdi32/enhmfdrv/init.c | 3 +- dlls/gdi32/font.c | 344 +++++++++++++++------------------------------ dlls/gdi32/gdiobj.c | 186 ++++++++---------------- dlls/gdi32/opengl.c | 11 +- dlls/gdi32/region.c | 3 +- 8 files changed, 200 insertions(+), 398 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1d920bb9f1abec02c49…

1 0

Daniel Lehman : wine.inf: Update Caucasus Time Zone.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: 908fcc3d7ae9e7206e271a928f38bc5bd5515cdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=908fcc3d7ae9e7206e271a92… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Nov 5 20:04:48 2020 -0800 wine.inf: Update Caucasus Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 88fadca2342..2ee8f0428ff 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2891,7 +2891,11 @@ HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"Dlt",,"Caucasus Dayli HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"MUI_Dlt",,"@tzres.dll,-29873" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"MUI_Std",,"@tzres.dll,-29872" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"Std",,"Caucasus Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2011",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"FirstEntry",0x10001,"2011" +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Display",,"Australia/Adelaide" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Dlt",,"Cen. Australia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"MUI_Dlt",,"@tzres.dll,-38929"

1 0

Huw Davies : riched20: Add next / prev run from cursor helpers.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: 12dd2d5d785158d8ba15630e2ba775efd990c128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12dd2d5d785158d8ba15630e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 6 08:32:23 2020 +0000 riched20: Add next / prev run from cursor helpers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 5 ++-- dlls/riched20/list.c | 45 ----------------------------- dlls/riched20/run.c | 78 ++++++++++++++++++++++++++++++++++++++++++-------- dlls/riched20/writer.c | 2 +- 5 files changed, 70 insertions(+), 62 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b27bab48738..36918c9dd79 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -5423,7 +5423,7 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, } cursor.nOffset = 0; - if (!ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE)) + if (!cursor_next_run( &cursor, TRUE )) goto done; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index df8e9d2b829..d06fcef332f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -67,8 +67,6 @@ void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) DE /* list.c */ void ME_InsertBefore(ME_DisplayItem *diWhere, ME_DisplayItem *diWhat) DECLSPEC_HIDDEN; void ME_Remove(ME_DisplayItem *diWhere) DECLSPEC_HIDDEN; -BOOL ME_NextRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) DECLSPEC_HIDDEN; -BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) DECLSPEC_HIDDEN; ME_DisplayItem *ME_FindItemBack(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; ME_DisplayItem *ME_FindItemFwd(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; @@ -126,7 +124,8 @@ static inline ME_DisplayItem *row_get_di( ME_Row *row ) /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; - +BOOL cursor_next_run( ME_Cursor *cursor, BOOL all_para ) DECLSPEC_HIDDEN; +BOOL cursor_prev_run( ME_Cursor *cursor, BOOL all_para ) DECLSPEC_HIDDEN; int run_char_ofs( ME_Run *run, int ofs ) DECLSPEC_HIDDEN; ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 23d1a38991d..891a52e605f 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -63,51 +63,6 @@ static BOOL ME_DITypesEqual(ME_DIType type, ME_DIType nTypeOrClass) } } -/* Modifies run pointer to point to the next run. - * If all_para is FALSE constrain the search to the current para, - * otherwise modify the paragraph pointer if moving into the next paragraph. - * - * Returns TRUE if next run is found, otherwise returns FALSE. */ -BOOL ME_NextRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) -{ - ME_DisplayItem *p = (*run)->next; - while (p->type != diTextEnd) - { - if (p->type == diParagraph) { - if (!all_para) return FALSE; - *para = p; - } else if (p->type == diRun) { - *run = p; - return TRUE; - } - p = p->next; - } - return FALSE; -} - -/* Modifies run pointer to point to the previous run. - * If all_para is FALSE constrain the search to the current para, - * otherwise modify the paragraph pointer if moving into the previous paragraph. - * - * Returns TRUE if previous run is found, otherwise returns FALSE. */ -BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) -{ - ME_DisplayItem *p = (*run)->prev; - while (p->type != diTextStart) - { - if (p->type == diParagraph) { - if (!all_para) return FALSE; - if (para && p->member.para.prev_para->type == diParagraph) - *para = p->member.para.prev_para; - } else if (p->type == diRun) { - *run = p; - return TRUE; - } - p = p->prev; - } - return FALSE; -} - ME_DisplayItem *ME_FindItemBack(ME_DisplayItem *di, ME_DIType nTypeOrClass) { if (!di) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index b1436ad5060..978f6691356 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -27,42 +27,96 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); WINE_DECLARE_DEBUG_CHANNEL(richedit_check); WINE_DECLARE_DEBUG_CHANNEL(richedit_lists); +BOOL cursor_next_run( ME_Cursor *cursor, BOOL all_para ) +{ + ME_DisplayItem *p = cursor->pRun->next; + + while (p->type != diTextEnd) + { + if (p->type == diParagraph && !all_para) return FALSE; + else if (p->type == diRun) + { + cursor->pRun = p; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = 0; + return TRUE; + } + p = p->next; + } + return FALSE; +} + +BOOL cursor_prev_run( ME_Cursor *cursor, BOOL all_para ) +{ + ME_DisplayItem *p = cursor->pRun->prev; + + while (p->type != diTextStart) + { + if (p->type == diParagraph && !all_para) return FALSE; + else if (p->type == diRun) + { + cursor->pRun = p; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = 0; + return TRUE; + } + p = p->prev; + } + return FALSE; +} + ME_Run *run_next( ME_Run *run ) { - ME_DisplayItem *item = run_get_di( run ); + ME_Cursor cursor; + + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( run->para ); + cursor.nOffset = 0; - if (ME_NextRun( NULL, &item, FALSE )) - return &item->member.run; + if (cursor_next_run( &cursor, FALSE )) + return &cursor.pRun->member.run; return NULL; } ME_Run *run_prev( ME_Run *run ) { - ME_DisplayItem *item = run_get_di( run ); + ME_Cursor cursor; + + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( run->para ); + cursor.nOffset = 0; - if (ME_PrevRun( NULL, &item, FALSE )) - return &item->member.run; + if (cursor_prev_run( &cursor, FALSE )) + return &cursor.pRun->member.run; return NULL; } ME_Run *run_next_all_paras( ME_Run *run ) { - ME_DisplayItem *item = run_get_di( run ), *dummy = para_get_di( run->para ); + ME_Cursor cursor; - if (ME_NextRun( &dummy, &item, TRUE )) - return &item->member.run; + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( run->para ); + cursor.nOffset = 0; + + if (cursor_next_run( &cursor, TRUE )) + return &cursor.pRun->member.run; return NULL; } ME_Run *run_prev_all_paras( ME_Run *run ) { - ME_DisplayItem *item = run_get_di( run ), *dummy = para_get_di( run->para ); + ME_Cursor cursor; + + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( run->para ); + cursor.nOffset = 0; - if (ME_PrevRun( &dummy, &item, TRUE )) - return &item->member.run; + if (cursor_prev_run( &cursor, TRUE )) + return &cursor.pRun->member.run; return NULL; } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 72242194127..1fc2bfad51e 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1107,7 +1107,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, return FALSE; cursor.nOffset = 0; } - } while (cursor.pRun != endCur.pRun && ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE)); + } while (cursor.pRun != endCur.pRun && cursor_next_run( &cursor, TRUE )); if (!ME_StreamOutMove(pStream, "}\0", 2)) return FALSE;

1 0

Huw Davies : riched20: Use cell ptrs to link the cells.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: 3131f919405dd2373259f087cc779aeff9ab86a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3131f919405dd2373259f087… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 6 08:32:22 2020 +0000 riched20: Use cell ptrs to link the cells. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 4 ++-- dlls/riched20/para.c | 31 ++++++++++++++----------------- dlls/riched20/table.c | 8 +++----- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index bd839afb0c0..9c2cdd685b1 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -206,7 +206,7 @@ typedef struct tagME_Paragraph PARAFORMAT2 fmt; ME_String *text; - struct tagME_DisplayItem *pCell; /* v4.1 */ + struct tagME_Cell *cell; /* v4.1 */ ME_BorderRect border; int nCharOfs; @@ -228,7 +228,7 @@ typedef struct tagME_Cell /* v4.1 */ POINT pt; int nHeight, nWidth; int yTextOffset; /* The text offset is caused by the largest top border. */ - struct tagME_DisplayItem *prev_cell, *next_cell, *parent_cell; + struct tagME_Cell *prev_cell, *next_cell, *parent_cell; } ME_Cell; typedef struct tagME_Row diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 47640a6fd50..d01a264765a 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -126,8 +126,7 @@ BOOL para_in_table( ME_Paragraph *para ) ME_Cell *para_cell( ME_Paragraph *para ) { - if (!para->pCell) return NULL; - return &para->pCell->member.cell; + return para->cell; } ME_Row *para_first_row( ME_Paragraph *para ) @@ -625,13 +624,13 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, { ME_Cell *cell = cell_create(); ME_InsertBefore( para_get_di( new_para ), cell_get_di( cell ) ); - new_para->pCell = cell_get_di( cell ); + new_para->cell = cell; cell->next_cell = NULL; if (paraFlags & MEPF_ROWSTART) { old_para->nFlags |= MEPF_ROWSTART; cell->prev_cell = NULL; - cell->parent_cell = old_para->pCell; + cell->parent_cell = old_para->cell; if (para_cell( old_para )) cell->nNestingLevel = para_cell( old_para )->nNestingLevel + 1; else @@ -639,8 +638,8 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, } else { - cell->prev_cell = old_para->pCell; - cell_prev( cell )->next_cell = cell_get_di( cell ); + cell->prev_cell = old_para->cell; + cell_prev( cell )->next_cell = cell; assert( old_para->nFlags & MEPF_CELL ); assert( !(old_para->nFlags & MEPF_ROWSTART) ); cell->nNestingLevel = cell_prev( cell )->nNestingLevel; @@ -650,19 +649,19 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, else if (paraFlags & MEPF_ROWEND) { old_para->nFlags |= MEPF_ROWEND; - old_para->pCell = old_para->pCell->member.cell.parent_cell; - new_para->pCell = old_para->pCell; + old_para->cell = old_para->cell->parent_cell; + new_para->cell = old_para->cell; assert( para_prev( old_para )->nFlags & MEPF_CELL ); assert( !(para_prev( old_para )->nFlags & MEPF_ROWSTART) ); - if (new_para->pCell != para_next( new_para )->pCell - && para_next( new_para )->pCell - && !para_next( new_para )->pCell->member.cell.prev_cell) + if (new_para->cell != para_next( new_para )->cell + && para_next( new_para )->cell + && !cell_prev( para_next( new_para )->cell )) { /* Row starts just after the row that was ended. */ new_para->nFlags |= MEPF_ROWSTART; } } - else new_para->pCell = old_para->pCell; + else new_para->cell = old_para->cell; table_update_flags( old_para ); table_update_flags( new_para ); @@ -721,7 +720,7 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir { /* Table cell/row properties are always moved over from the removed para. */ para->nFlags = next->nFlags; - para->pCell = next->pCell; + para->cell = next->cell; /* Remove cell boundary if it is between the end paragraph run and the next * paragraph display item. */ @@ -740,10 +739,8 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir if (cell) { ME_Remove( cell_get_di( cell ) ); - if (cell_prev( cell )) - cell_prev( cell )->next_cell = cell_next( cell ) ? cell_get_di( cell_next( cell ) ) : NULL; - if (cell_next( cell )) - cell_next( cell )->prev_cell = cell_prev( cell ) ? cell_get_di( cell_prev( cell ) ) : NULL; + if (cell_prev( cell )) cell_prev( cell )->next_cell = cell_next( cell ); + if (cell_next( cell )) cell_next( cell )->prev_cell = cell_prev( cell ); ME_DestroyDisplayItem( cell_get_di( cell ) ); } diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 08f04e06ca7..8d58c3e4f8f 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -96,7 +96,7 @@ ME_Paragraph* table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragrap while (para != end_para) { - para->pCell = cell_get_di( para_cell( prev_para ) ); + para->cell = para_cell( prev_para ); para->nFlags |= MEPF_CELL; para->nFlags &= ~(MEPF_ROWSTART | MEPF_ROWEND); para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; @@ -193,14 +193,12 @@ ME_Cell *cell_create( void ) ME_Cell *cell_next( ME_Cell *cell ) { - if (!cell->next_cell) return NULL; - return &cell->next_cell->member.cell; + return cell->next_cell; } ME_Cell *cell_prev( ME_Cell *cell ) { - if (!cell->prev_cell) return NULL; - return &cell->prev_cell->member.cell; + return cell->prev_cell; } ME_Paragraph *cell_first_para( ME_Cell *cell )

1 0

Huw Davies : riched20: Use cell ptrs in the paragraph splitting and joining functions.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: b7084cd7e3b60281e7c1b619ae1dcffb93ae54fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7084cd7e3b60281e7c1b619… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 6 08:32:21 2020 +0000 riched20: Use cell ptrs in the paragraph splitting and joining functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 1 + dlls/riched20/para.c | 60 +++++++++++++++++++++++++------------------------- dlls/riched20/table.c | 6 +++++ 3 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 24e750be1de..df8e9d2b829 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -289,6 +289,7 @@ ME_Paragraph *editor_end_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ +ME_Cell *cell_create( void ) DECLSPEC_HIDDEN; ME_Paragraph *cell_end_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Paragraph *cell_first_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index e7c3c6934b9..47640a6fd50 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -243,7 +243,7 @@ static void table_update_flags( ME_Paragraph *para ) { para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; - if (para->pCell) para->nFlags |= MEPF_CELL; + if (para_cell( para )) para->nFlags |= MEPF_CELL; else para->nFlags &= ~MEPF_CELL; if (para->nFlags & MEPF_ROWEND) para->fmt.wEffects |= PFE_TABLEROWDELIMITER; @@ -623,29 +623,28 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, { if (paraFlags & (MEPF_ROWSTART | MEPF_CELL)) { - ME_DisplayItem *cell = ME_MakeDI(diCell); - ME_InsertBefore( para_get_di( new_para ), cell ); - new_para->pCell = cell; - cell->member.cell.next_cell = NULL; + ME_Cell *cell = cell_create(); + ME_InsertBefore( para_get_di( new_para ), cell_get_di( cell ) ); + new_para->pCell = cell_get_di( cell ); + cell->next_cell = NULL; if (paraFlags & MEPF_ROWSTART) { old_para->nFlags |= MEPF_ROWSTART; - cell->member.cell.prev_cell = NULL; - cell->member.cell.parent_cell = old_para->pCell; - if (old_para->pCell) - cell->member.cell.nNestingLevel = old_para->pCell->member.cell.nNestingLevel + 1; + cell->prev_cell = NULL; + cell->parent_cell = old_para->pCell; + if (para_cell( old_para )) + cell->nNestingLevel = para_cell( old_para )->nNestingLevel + 1; else - cell->member.cell.nNestingLevel = 1; + cell->nNestingLevel = 1; } else { - cell->member.cell.prev_cell = old_para->pCell; - assert(cell->member.cell.prev_cell); - cell->member.cell.prev_cell->member.cell.next_cell = cell; + cell->prev_cell = old_para->pCell; + cell_prev( cell )->next_cell = cell_get_di( cell ); assert( old_para->nFlags & MEPF_CELL ); assert( !(old_para->nFlags & MEPF_ROWSTART) ); - cell->member.cell.nNestingLevel = cell->member.cell.prev_cell->member.cell.nNestingLevel; - cell->member.cell.parent_cell = cell->member.cell.prev_cell->member.cell.parent_cell; + cell->nNestingLevel = cell_prev( cell )->nNestingLevel; + cell->parent_cell = cell_prev( cell )->parent_cell; } } else if (paraFlags & MEPF_ROWEND) @@ -653,11 +652,11 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, old_para->nFlags |= MEPF_ROWEND; old_para->pCell = old_para->pCell->member.cell.parent_cell; new_para->pCell = old_para->pCell; - assert( old_para->prev_para->member.para.nFlags & MEPF_CELL ); - assert( !(old_para->prev_para->member.para.nFlags & MEPF_ROWSTART) ); - if (new_para->pCell != new_para->next_para->member.para.pCell - && new_para->next_para->member.para.pCell - && !new_para->next_para->member.para.pCell->member.cell.prev_cell) + assert( para_prev( old_para )->nFlags & MEPF_CELL ); + assert( !(para_prev( old_para )->nFlags & MEPF_ROWSTART) ); + if (new_para->pCell != para_next( new_para )->pCell + && para_next( new_para )->pCell + && !para_next( new_para )->pCell->member.cell.prev_cell) { /* Row starts just after the row that was ended. */ new_para->nFlags |= MEPF_ROWSTART; @@ -686,9 +685,10 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, specified in use_first_fmt */ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) { - ME_DisplayItem *tmp, *pCell = NULL; + ME_DisplayItem *tmp; ME_Paragraph *next = para_next( para ); ME_Run *end_run, *next_first_run, *tmp_run; + ME_Cell *cell = NULL; int i, shift; int end_len; CHARFORMAT2W fmt; @@ -729,22 +729,22 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir { if (tmp->type == diCell) { - pCell = tmp; + cell = &tmp->member.cell; break; } } } - add_undo_split_para( editor, next, eol_str, pCell ? &pCell->member.cell : NULL ); + add_undo_split_para( editor, next, eol_str, cell ); - if (pCell) + if (cell) { - ME_Remove( pCell ); - if (pCell->member.cell.prev_cell) - pCell->member.cell.prev_cell->member.cell.next_cell = pCell->member.cell.next_cell; - if (pCell->member.cell.next_cell) - pCell->member.cell.next_cell->member.cell.prev_cell = pCell->member.cell.prev_cell; - ME_DestroyDisplayItem( pCell ); + ME_Remove( cell_get_di( cell ) ); + if (cell_prev( cell )) + cell_prev( cell )->next_cell = cell_next( cell ) ? cell_get_di( cell_next( cell ) ) : NULL; + if (cell_next( cell )) + cell_next( cell )->prev_cell = cell_prev( cell ) ? cell_get_di( cell_prev( cell ) ) : NULL; + ME_DestroyDisplayItem( cell_get_di( cell ) ); } if (!use_first_fmt) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 83b089d6dbc..08f04e06ca7 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -185,6 +185,12 @@ ME_Cell *table_row_end_cell( ME_Paragraph *para ) return cell_next( para_cell( para ) ); } +ME_Cell *cell_create( void ) +{ + ME_DisplayItem *item = ME_MakeDI( diCell ); + return &item->member.cell; +} + ME_Cell *cell_next( ME_Cell *cell ) { if (!cell->next_cell) return NULL;

1 0

Huw Davies : riched20: Use more cell helpers in some of the table functions.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: b692fb5e08cc7e635e38a49c18bb5704040d8e5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b692fb5e08cc7e635e38a49c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 6 08:32:20 2020 +0000 riched20: Use more cell helpers in some of the table functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/table.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 9d0d24fa1c3..83b089d6dbc 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -96,7 +96,7 @@ ME_Paragraph* table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragrap while (para != end_para) { - para->pCell = prev_para->pCell; + para->pCell = cell_get_di( para_cell( prev_para ) ); para->nFlags |= MEPF_CELL; para->nFlags &= ~(MEPF_ROWSTART | MEPF_ROWEND); para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; @@ -128,32 +128,31 @@ ME_Paragraph* table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) ME_Paragraph* table_row_end( ME_Paragraph *para ) { - ME_DisplayItem *cell; - assert( para ); + ME_Cell *cell; + if (para->nFlags & MEPF_ROWEND) return para; if (para->nFlags & MEPF_ROWSTART) para = para_next( para ); - cell = para->pCell; - assert(cell && cell->type == diCell); - while (cell->member.cell.next_cell) - cell = cell->member.cell.next_cell; + cell = para_cell( para ); + while (cell_next( cell )) + cell = cell_next( cell ); - para = &ME_FindItemFwd( cell, diParagraph )->member.para; + para = &ME_FindItemFwd( cell_get_di( cell ), diParagraph )->member.para; assert( para && para->nFlags & MEPF_ROWEND ); return para; } ME_Paragraph* table_row_start( ME_Paragraph *para ) { - ME_DisplayItem *cell; - assert( para ); + ME_Cell *cell; + if (para->nFlags & MEPF_ROWSTART) return para; if (para->nFlags & MEPF_ROWEND) para = para_prev( para ); - cell = para->pCell; - assert(cell && cell->type == diCell); - while (cell->member.cell.prev_cell) - cell = cell->member.cell.prev_cell; + cell = para_cell( para ); + + while (cell_prev( cell )) + cell = cell_prev( cell ); - para = &ME_FindItemBack( cell, diParagraph )->member.para; + para = &ME_FindItemBack( cell_get_di( cell ), diParagraph )->member.para; assert( para && para->nFlags & MEPF_ROWSTART ); return para; } @@ -161,11 +160,11 @@ ME_Paragraph* table_row_start( ME_Paragraph *para ) ME_Paragraph* table_outer_para( ME_Paragraph *para ) { if (para->nFlags & MEPF_ROWEND) para = para_prev( para ); - while (para->pCell) + while (para_cell( para )) { para = table_row_start( para ); - if (!para->pCell) break; - para = &ME_FindItemBack( para->pCell, diParagraph )->member.para; + if (!para_cell( para )) break; + para = &ME_FindItemBack( cell_get_di( para_cell( para ) ), diParagraph )->member.para; } return para; }

1 0

Alexandre Julliard : gdi32: Initialize the font gamma ramp with the other font options.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: a56487732e1a9c39e462b0fa1d0d36f0cee9a68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a56487732e1a9c39e462b0fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 6 12:10:54 2020 +0100 gdi32: Initialize the font gamma ramp with the other font options. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 64 +++++++++++++++++-------------------------------------- 1 file changed, 19 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index bbda64ed557..6ad03df176b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,7 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static UINT font_smoothing = GGO_BITMAP; static UINT subpixel_orientation = GGO_GRAY4_BITMAP; static BOOL antialias_fakes = TRUE; +static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); @@ -3878,7 +3879,7 @@ static DWORD get_key_value( HKEY key, const WCHAR *name, DWORD *value ) static void init_font_options(void) { HKEY key; - DWORD type, size, val; + DWORD i, type, size, val, gamma = 1400; WCHAR buffer[20]; size = sizeof(buffer); @@ -3910,8 +3911,24 @@ static void init_font_options(void) else font_smoothing = GGO_GRAY4_BITMAP; } + if (!get_key_value( key, L"FontSmoothingGamma", &val ) && val) + { + gamma = min( max( val, 1000 ), 2200 ); + } RegCloseKey( key ); } + + /* Calibrating the difference between the registry value and the Wine gamma value. + This looks roughly similar to Windows Native with the same registry value. + MS GDI seems to be rasterizing the outline at a different rate than FreeType. */ + gamma = 1000 * gamma / 1400; + for (i = 0; i < 256; i++) + { + font_gamma_ramp.encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; + font_gamma_ramp.decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; + } + font_gamma_ramp.gamma = gamma; + TRACE("gamma %d\n", font_gamma_ramp.gamma); } @@ -4424,49 +4441,6 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } -static BOOL WINAPI fill_font_gamma_ramp( INIT_ONCE *once, void *param, void **context ) -{ - struct font_gamma_ramp *ramp = param; - const DWORD gamma_default = 1400; - DWORD i, gamma; - HKEY key; - - gamma = gamma_default; - if (RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key ) == ERROR_SUCCESS) - { - if (get_key_value( key, L"FontSmoothingGamma", &gamma ) || gamma == 0) - gamma = gamma_default; - RegCloseKey( key ); - - gamma = min( max( gamma, 1000 ), 2200 ); - } - - /* Calibrating the difference between the registry value and the Wine gamma value. - This looks roughly similar to Windows Native with the same registry value. - MS GDI seems to be rasterizing the outline at a different rate than FreeType. */ - gamma = 1000 * gamma / 1400; - - for (i = 0; i < 256; i++) - { - ramp->encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; - ramp->decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; - } - - ramp->gamma = gamma; - TRACE("gamma %d\n", ramp->gamma); - - return TRUE; -} - -static struct font_gamma_ramp *get_font_gamma_ramp( void ) -{ - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - static struct font_gamma_ramp ramp; - - InitOnceExecuteOnce( &init_once, fill_font_gamma_ramp, &ramp, NULL ); - return &ramp; -} - /*********************************************************************** * FONT_SelectObject */ @@ -4493,7 +4467,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc, handle ); if (dc->font_gamma_ramp == NULL) - dc->font_gamma_ramp = get_font_gamma_ramp(); + dc->font_gamma_ramp = &font_gamma_ramp; GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle );

1 0

Huw Davies : riched20: Use paragraph and run ptrs in the cursor structure.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: 00fa9a954602b47676c71b5e3ec6ac745e8fa940 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00fa9a954602b47676c71b5e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 6 08:32:24 2020 +0000 riched20: Use paragraph and run ptrs in the cursor structure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 185 ++++++++++++++++++-------------------- dlls/riched20/clipboard.c | 2 +- dlls/riched20/editor.c | 221 ++++++++++++++++++++++------------------------ dlls/riched20/editstr.h | 4 +- dlls/riched20/paint.c | 10 +-- dlls/riched20/para.c | 28 +++--- dlls/riched20/richole.c | 14 +-- dlls/riched20/row.c | 12 +-- dlls/riched20/run.c | 88 +++++++++--------- dlls/riched20/style.c | 6 +- dlls/riched20/table.c | 82 ++++++++--------- dlls/riched20/undo.c | 14 +-- dlls/riched20/wrap.c | 8 +- dlls/riched20/writer.c | 64 +++++++------- 14 files changed, 359 insertions(+), 379 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00fa9a954602b47676c7…

1 0