October 2020 - Wine-commits

Alexandre Julliard : gdi32: Move the other exported freetype functions to the font backend table.
by Alexandre Julliard 20 Oct '20

20 Oct '20

Module: wine Branch: master Commit: 3e7f8aa272218d1ea08994eced511beb4776493f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e7f8aa272218d1ea08994ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 20 22:07:06 2020 +0200 gdi32: Move the other exported freetype functions to the font backend table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 57 ++++++++++--- dlls/gdi32/freetype.c | 214 ++++++++++++++--------------------------------- dlls/gdi32/gdi_private.h | 22 ++++- 3 files changed, 130 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e7f8aa272218d1ea089…

1 0

Huw Davies : riched20: Pass run ptrs to the font and colour table writer function.
by Alexandre Julliard 20 Oct '20

20 Oct '20

Module: wine Branch: master Commit: 00332537773e430db2c84d185af1e4e0322e0179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00332537773e430db2c84d18… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 20 12:50:34 2020 +0100 riched20: Pass run ptrs to the font and colour table writer function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index bdbf022a405..4a6fd908fda 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -311,33 +311,32 @@ static BOOL find_color_in_colortbl( ME_OutStream *stream, COLORREF color, unsign return i < stream->nFontTblLen; } -static BOOL -ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, - ME_DisplayItem *pLastRun) +static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *first, ME_Run *last ) { - ME_DisplayItem *item = pFirstRun; + ME_Run *run = first; ME_FontTableItem *table = pStream->fonttbl; unsigned int i; ME_DisplayItem *pCell = NULL; ME_Paragraph *prev_para = NULL; - do { - CHARFORMAT2W *fmt = &item->member.run.style->fmt; + do + { + CHARFORMAT2W *fmt = &run->style->fmt; - add_font_to_fonttbl( pStream, item->member.run.style ); + add_font_to_fonttbl( pStream, run->style ); if (fmt->dwMask & CFM_COLOR && !(fmt->dwEffects & CFE_AUTOCOLOR)) add_color_to_colortbl( pStream, fmt->crTextColor ); if (fmt->dwMask & CFM_BACKCOLOR && !(fmt->dwEffects & CFE_AUTOBACKCOLOR)) add_color_to_colortbl( pStream, fmt->crBackColor ); - if (item->member.run.para != prev_para) + if (run->para != prev_para) { /* check for any para numbering text */ - if (item->member.run.para->fmt.wNumbering) - add_font_to_fonttbl( pStream, item->member.run.para->para_num.style ); + if (run->para->fmt.wNumbering) + add_font_to_fonttbl( pStream, run->para->para_num.style ); - if ((pCell = item->member.run.para->pCell)) + if ((pCell = run->para->pCell)) { ME_Border* borders[4] = { &pCell->member.cell.border.top, &pCell->member.cell.border.left, @@ -348,13 +347,12 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, add_color_to_colortbl( pStream, borders[i]->colorRef ); } - prev_para = item->member.run.para; + prev_para = run->para; } - if (item == pLastRun) - break; - item = ME_FindItemFwd(item, diRun); - } while (item); + if (run == last) break; + run = run_next_all_paras( run ); + } while (run); if (!ME_StreamOutPrint(pStream, "{\\fonttbl")) return FALSE; @@ -1007,7 +1005,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, if (!ME_StreamOutRTFHeader(pStream, dwFormat)) return FALSE; - if (!ME_StreamOutRTFFontAndColorTbl(pStream, cursor.pRun, endCur.pRun)) + if (!stream_out_font_and_colour_tbls( pStream, &cursor.pRun->member.run, &endCur.pRun->member.run )) return FALSE; /* TODO: stylesheet table */

1 0

Huw Davies : riched20: Pass paragraph ptrs to the paragraph property writers.
by Alexandre Julliard 20 Oct '20

20 Oct '20

Module: wine Branch: master Commit: 4a30e0601eec461238c274e4097e099b65e2e332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a30e0601eec461238c274e4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 20 12:50:35 2020 +0100 riched20: Pass paragraph ptrs to the paragraph property writers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 131 +++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 64 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 4a6fd908fda..182a725dbad 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -386,9 +386,8 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs return TRUE; } -static BOOL -ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, - ME_DisplayItem *para) +static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream, + ME_Paragraph *para ) { ME_DisplayItem *cell; char props[STREAMOUT_BUFFER_SIZE] = ""; @@ -397,16 +396,18 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, if (!ME_StreamOutPrint(pStream, "\\trowd")) return FALSE; - if (!editor->bEmulateVersion10) { /* v4.1 */ - PARAFORMAT2 *pFmt = &table_row_end( &para->member.para )->fmt; - para = para_get_di( table_row_start( &para->member.para ) ); - cell = para->member.para.next_para->member.para.pCell; + 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); if (pFmt->dxOffset) sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); if (pFmt->dxStartIndent) sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); - do { + do + { ME_Border* borders[4] = { &cell->member.cell.border.top, &cell->member.cell.border.left, &cell->member.cell.border.bottom, @@ -427,14 +428,16 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); cell = cell->member.cell.next_cell; } while (cell->member.cell.next_cell); - } else { /* v1.0 - 3.0 */ - const ME_Border* borders[4] = { &para->member.para.border.top, - &para->member.para.border.left, - &para->member.para.border.bottom, - &para->member.para.border.right }; - PARAFORMAT2 *pFmt = &para->member.para.fmt; - - assert(!(para->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL))); + } + else /* v1.0 - 3.0 */ + { + const ME_Border* borders[4] = { &para->border.top, + &para->border.left, + &para->border.bottom, + &para->border.right }; + PARAFORMAT2 *pFmt = &para->fmt; + + assert( !(para->nFlags & (MEPF_ROWSTART | MEPF_ROWEND | MEPF_CELL)) ); if (pFmt->dxOffset) sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); if (pFmt->dxStartIndent) @@ -533,54 +536,46 @@ static BOOL stream_out_para_num( ME_OutStream *stream, ME_Paragraph *para, BOOL return TRUE; } -static BOOL -ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, - ME_DisplayItem *para) +static BOOL stream_out_para_props( ME_TextEditor *editor, ME_OutStream *pStream, + ME_Paragraph *para ) { - PARAFORMAT2 *fmt = &para->member.para.fmt; + PARAFORMAT2 *fmt = &para->fmt; char props[STREAMOUT_BUFFER_SIZE] = ""; int i; - ME_Paragraph *prev_para = NULL; + ME_Paragraph *prev_para = para_prev( para ); - if (para->member.para.prev_para->type == diParagraph) - prev_para = &para->member.para.prev_para->member.para; - - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (para->member.para.nFlags & MEPF_ROWSTART) { + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (para->nFlags & MEPF_ROWSTART) + { pStream->nNestingLevel++; - if (pStream->nNestingLevel == 1) { - if (!ME_StreamOutRTFTableProps(editor, pStream, para)) - return FALSE; - } + if (pStream->nNestingLevel == 1) + if (!stream_out_table_props( editor, pStream, para )) return FALSE; return TRUE; - } else if (para->member.para.nFlags & MEPF_ROWEND) { + } + else if (para->nFlags & MEPF_ROWEND) + { pStream->nNestingLevel--; - if (pStream->nNestingLevel >= 1) { - if (!ME_StreamOutPrint(pStream, "{\\*\\nesttableprops")) - return FALSE; - if (!ME_StreamOutRTFTableProps(editor, pStream, para)) - return FALSE; - if (!ME_StreamOutPrint(pStream, "\\nestrow}{\\nonesttables\\par}\r\n")) - return FALSE; - } else { - if (!ME_StreamOutPrint(pStream, "\\row\r\n")) - return FALSE; + if (pStream->nNestingLevel >= 1) + { + if (!ME_StreamOutPrint(pStream, "{\\*\\nesttableprops")) return FALSE; + if (!stream_out_table_props( editor, pStream, para )) return FALSE; + if (!ME_StreamOutPrint(pStream, "\\nestrow}{\\nonesttables\\par}\r\n")) return FALSE; } + else if (!ME_StreamOutPrint(pStream, "\\row\r\n")) return FALSE; return TRUE; } - } else { /* v1.0 - 3.0 */ - if (para->member.para.fmt.dwMask & PFM_TABLE && - para->member.para.fmt.wEffects & PFE_TABLE) - { - if (!ME_StreamOutRTFTableProps(editor, pStream, para)) - return FALSE; - } + } + else /* v1.0 - 3.0 */ + { + if (para->fmt.dwMask & PFM_TABLE && para->fmt.wEffects & PFE_TABLE) + if (!stream_out_table_props( editor, pStream, para )) return FALSE; } if (prev_para && !memcmp( fmt, &prev_para->fmt, sizeof(*fmt) )) { if (fmt->wNumbering) - return stream_out_para_num( pStream, &para->member.para, FALSE ); + return stream_out_para_num( pStream, para, FALSE ); return TRUE; } @@ -588,14 +583,15 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, return FALSE; if (fmt->wNumbering) - if (!stream_out_para_num( pStream, &para->member.para, TRUE )) return FALSE; + if (!stream_out_para_num( pStream, para, TRUE )) return FALSE; - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (pStream->nNestingLevel > 0) - strcat(props, "\\intbl"); - if (pStream->nNestingLevel > 1) - sprintf(props + strlen(props), "\\itap%d", pStream->nNestingLevel); - } else { /* v1.0 - 3.0 */ + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (pStream->nNestingLevel > 0) strcat(props, "\\intbl"); + if (pStream->nNestingLevel > 1) sprintf(props + strlen(props), "\\itap%d", pStream->nNestingLevel); + } + else /* v1.0 - 3.0 */ + { if (fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE) strcat(props, "\\intbl"); } @@ -605,8 +601,10 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, * set very different from the documentation. * (Tested with RichEdit 5.50.25.0601) */ - if (fmt->dwMask & PFM_ALIGNMENT) { - switch (fmt->wAlignment) { + if (fmt->dwMask & PFM_ALIGNMENT) + { + switch (fmt->wAlignment) + { case PFA_LEFT: /* Default alignment: not emitted */ break; @@ -622,10 +620,12 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, } } - if (fmt->dwMask & PFM_LINESPACING) { + if (fmt->dwMask & PFM_LINESPACING) + { /* FIXME: MSDN says that the bLineSpacingRule field is controlled by the * PFM_SPACEAFTER flag. Is that true? I don't believe so. */ - switch (fmt->bLineSpacingRule) { + switch (fmt->bLineSpacingRule) + { case 0: /* Single spacing */ strcat(props, "\\sl-240\\slmult1"); break; @@ -676,8 +676,10 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, if (fmt->dwMask & PFM_TABSTOPS) { static const char * const leader[6] = { "", "\\tldot", "\\tlhyph", "\\tlul", "\\tlth", "\\tleq" }; - for (i = 0; i < fmt->cTabCount; i++) { - switch ((fmt->rgxTabs[i] >> 24) & 0xF) { + for (i = 0; i < fmt->cTabCount; i++) + { + switch ((fmt->rgxTabs[i] >> 24) & 0xf) + { case 1: strcat(props, "\\tqc"); break; @@ -704,7 +706,8 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, if (fmt->sStyle != -1) sprintf(props + strlen(props), "\\s%d", fmt->sStyle); - if (fmt->dwMask & PFM_SHADING) { + if (fmt->dwMask & PFM_SHADING) + { static const char * const style[16] = { "", "\\bgdkhoriz", "\\bgdkvert", "\\bgdkfdiag", "\\bgdkbdiag", "\\bgdkcross", "\\bgdkdcross", "\\bghoriz", "\\bgvert", "\\bgfdiag", @@ -1025,7 +1028,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, if (cursor.pPara != prev_para) { prev_para = cursor.pPara; - if (!ME_StreamOutRTFParaProps(editor, pStream, cursor.pPara)) + if (!stream_out_para_props( editor, pStream, &cursor.pPara->member.para )) return FALSE; }

1 0

Huw Davies : riched20: Update both co-ords during layout.
by Alexandre Julliard 20 Oct '20

20 Oct '20

Module: wine Branch: master Commit: 9098d5b300880697ef6dc86fa2f9a274d85ae878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9098d5b300880697ef6dc86f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 20 12:50:36 2020 +0100 riched20: Update both co-ords during layout. This partially fixes a regression caused by commit 195f84cfa1b81d3b526dde64f614169d5da5d86c Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 26f1c30b83f..aae95a59ce2 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1054,14 +1054,14 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) if (para_next( para )) { - if (c.pt.y != para_next( para )->pt.y) + if (c.pt.x != para_next( para )->pt.x || c.pt.y != para_next( para )->pt.y) { next = para; while (para_next( next ) && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { update_repaint( para_next( next ), &repaint ); - para_next( next )->pt.y = c.pt.y; + para_next( next )->pt = c.pt; adjust_para_y( para_next( next ), &c, &repaint ); next = para_next( next ); }

1 0

Huw Davies : riched20: Start re-wrap loop at the beginning of any table.
by Alexandre Julliard 20 Oct '20

20 Oct '20

Module: wine Branch: master Commit: 2b817872cb7fd149724d5ffdf6769448c8b533f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b817872cb7fd149724d5ffd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 20 12:50:37 2020 +0100 riched20: Start re-wrap loop at the beginning of any table. This ensures that cell heights of cells before the first marked cell are correctly adjusted. Fixes last part of a regression caused by commit 195f84cfa1b81d3b526dde64f614169d5da5d86c 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 | 5 +++++ dlls/riched20/wrap.c | 16 +++++++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index c79fa0e18f0..1f74a2eb8b4 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -207,6 +207,7 @@ int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ) DECLSPEC_HIDDEN; ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +BOOL para_in_table( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) DECLSPEC_HIDDEN; void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 0e1ceae9bbb..1db553a3478 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -119,6 +119,11 @@ ME_Run *para_end_run( ME_Paragraph *para ) return para->eop_run; } +BOOL para_in_table( ME_Paragraph *para ) +{ + return para->fmt.wEffects & PFE_TABLE; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0}; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index aae95a59ce2..4f6eb82cea7 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1026,7 +1026,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_Paragraph *para, *next; - struct wine_rb_entry *entry, *next_entry; + struct wine_rb_entry *entry, *next_entry = NULL; ME_Context c; int totalWidth = editor->nTotalWidth, prev_width; struct repaint_range repaint = { NULL, NULL }; @@ -1039,7 +1039,16 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) while (entry) { para = WINE_RB_ENTRY_VALUE( entry, ME_Paragraph, marked_entry ); - next_entry = wine_rb_next( entry ); + + /* If the first entry lies inside a table, go back to the start + of the table to ensure cell heights are kept in sync. */ + if (!next_entry && para_in_table( para ) && para != table_outer_para( para )) + { + para = table_outer_para( para ); + next_entry = entry; + } + else + next_entry = wine_rb_next( entry ); c.pt = para->pt; prev_width = para->nWidth; @@ -1054,7 +1063,8 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) if (para_next( para )) { - if (c.pt.x != para_next( para )->pt.x || c.pt.y != para_next( para )->pt.y) + if (c.pt.x != para_next( para )->pt.x || c.pt.y != para_next( para )->pt.y || + para_in_table( para )) { next = para; while (para_next( next ) && &next->marked_entry != next_entry &&

1 0

Huw Davies : riched20: Don't split the paragraph at the first \intbl.
by Alexandre Julliard 20 Oct '20

20 Oct '20

Module: wine Branch: master Commit: 218225548a212e4ece157f93439fbcef3e28ef77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=218225548a212e4ece157f93… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 20 12:50:38 2020 +0100 riched20: Don't split the paragraph at the first \intbl. The whole of the current paragraph should be included in the table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 51a6e33aef4..c91d47302cf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -658,14 +658,10 @@ void ME_RTFParAttrHook(RTF_Info *info) para = para->member.para.next_para; para = ME_InsertTableRowStartAtParagraph(info->editor, para); tableDef->tableRowStart = para; - } else { - ME_Cursor cursor; - WCHAR endl = '\r'; - cursor = info->editor->pCursors[0]; - if (cursor.nOffset || cursor.pRun->member.run.nCharOfs) - ME_InsertTextFromCursor(info->editor, 0, &endl, 1, info->style); - tableDef->tableRowStart = ME_InsertTableRowStartFromCursor(info->editor); } + else + tableDef->tableRowStart = ME_InsertTableRowStartAtParagraph( info->editor, + info->editor->pCursors[0].pPara ); info->nestingLevel = 1; info->canInheritInTbl = TRUE; }

1 0

Esme Povirk : mscoree: Implement GetTokenForVTableEntry.
by Alexandre Julliard 20 Oct '20

20 Oct '20

Module: wine Branch: master Commit: d5711a8151a0c5ed370a0b73c720de8aec3e4fd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5711a8151a0c5ed370a0b73… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Oct 20 08:23:34 2020 -0500 mscoree: Implement GetTokenForVTableEntry. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree.spec | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index a5b378b9251..f50eb5a0cd7 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -56,6 +56,16 @@ struct DomainEntry static HANDLE dll_fixup_heap; /* using a separate heap so we can have execute permission */ +static CRITICAL_SECTION fixup_list_cs; +static CRITICAL_SECTION_DEBUG fixup_list_cs_debug = +{ + 0, 0, &fixup_list_cs, + { &fixup_list_cs_debug.ProcessLocksList, + &fixup_list_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": fixup_list_cs") } +}; +static CRITICAL_SECTION fixup_list_cs = { &fixup_list_cs_debug, -1, 0, 0, 0, 0 }; + static struct list dll_fixups; WCHAR **private_path = NULL; @@ -1222,6 +1232,34 @@ static const struct vtable_fixup_thunk thunk_template = {0}; #endif +DWORD WINAPI GetTokenForVTableEntry(HINSTANCE hinst, BYTE **ppVTEntry) +{ + struct dll_fixup *fixup; + DWORD result = 0; + DWORD rva; + int i; + + TRACE("%p,%p\n", hinst, ppVTEntry); + + rva = (BYTE*)ppVTEntry - (BYTE*)hinst; + + EnterCriticalSection(&fixup_list_cs); + LIST_FOR_EACH_ENTRY(fixup, &dll_fixups, struct dll_fixup, entry) + { + if (fixup->dll != hinst) + continue; + if (rva < fixup->fixup->rva || (rva - fixup->fixup->rva >= fixup->fixup->count * sizeof(ULONG_PTR))) + continue; + i = (rva - fixup->fixup->rva) / sizeof(ULONG_PTR); + result = ((ULONG_PTR*)fixup->tokens)[i]; + break; + } + LeaveCriticalSection(&fixup_list_cs); + + TRACE("<-- %x\n", result); + return result; +} + static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) { HRESULT hr=S_OK; @@ -1356,7 +1394,9 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) return; } + EnterCriticalSection(&fixup_list_cs); list_add_tail(&dll_fixups, &fixup->entry); + LeaveCriticalSection(&fixup_list_cs); } static void FixupVTable_Assembly(HMODULE hmodule, ASSEMBLY *assembly) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 7fa68bf8b13..92dcfd89677 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -64,7 +64,7 @@ @ stub GetRequestedRuntimeVersionForCLSID @ stub GetStartupFlags @ stub GetTargetForVTableEntry -@ stub GetTokenForVTableEntry +@ stdcall GetTokenForVTableEntry(ptr ptr) @ stdcall GetVersionFromProcess(ptr ptr long ptr) @ stub GetXMLElement @ stub GetXMLElementAttribute

1 0

Derek Lesho : mfplat: Fix asynchronous object creation from URL.
by Alexandre Julliard 20 Oct '20

20 Oct '20

Module: wine Branch: master Commit: 42bba70a024060fbd698aadec20fbb6f61ad9e16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42bba70a024060fbd698aade… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 20 09:21:11 2020 -0500 mfplat: Fix asynchronous object creation from URL. 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/mfplat/main.c | 2 ++ dlls/mfplat/tests/mfplat.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a6ff97ae04a..452426d055f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5750,6 +5750,8 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu if (!(queued_result = heap_alloc_zero(sizeof(*queued_result)))) return E_OUTOFMEMORY; + queued_result->origin = origin; + IRtwqAsyncResult_GetObject(inner_result, &handler.handler); switch (origin) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 55c07adb1fe..a5388840bc5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -343,12 +343,10 @@ static HRESULT WINAPI test_create_from_url_callback_Invoke(IMFAsyncCallback *ifa object = NULL; hr = IMFSourceResolver_EndCreateObjectFromURL(resolver, result, &obj_type, &object); -todo_wine ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); hr = IMFAsyncResult_GetObject(result, &object2); ok(hr == S_OK, "Failed to get result object, hr %#x.\n", hr); -todo_wine ok(object2 == object, "Unexpected object.\n"); if (object)

1 0

Michael Stefaniuc : schtasks/tests: Use wide-char string literals.
by Alexandre Julliard 20 Oct '20

20 Oct '20

Module: wine Branch: master Commit: eda1baa8eeb2be8cc619ec0f4487e2fd68f3fde8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eda1baa8eeb2be8cc619ec0f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 20 00:31:42 2020 +0200 schtasks/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/tests/schtasks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 8f7176ac1d9..c0f4ce78365 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -169,8 +169,8 @@ static BOOL initialize_task_service(void) START_TEST(schtasks) { - static WCHAR wineW[] = {'\\','w','i','n','e',0}; - static WCHAR wine_testW[] = {'\\','w','i','n','e','\\','t','e','s','t',0}; + static WCHAR wineW[] = L"\\wine"; + static WCHAR wine_testW[] = L"\\wine\\test"; DWORD r; CoInitialize(NULL);

1 0

Michael Stefaniuc : uxtheme/tests: Use wide-char string literals.
by Alexandre Julliard 20 Oct '20

20 Oct '20

Module: wine Branch: master Commit: 43572cbd7d71931595c1275706394274c051b0fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=43572cbd7d71931595c12757… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 20 00:31:44 2020 +0200 uxtheme/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b3a861eaa6b..5b6c91dc481 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -127,10 +127,10 @@ static void test_OpenThemeData(void) HRESULT hRes; BOOL bTPDefined; - WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; - WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; - WCHAR szButtonClassList2[] = {'b','U','t','T','o','N', 0 }; - WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 }; + const WCHAR szInvalidClassList[] = L"DEADBEEF"; + const WCHAR szButtonClassList[] = L"Button"; + const WCHAR szButtonClassList2[] = L"bUtToN"; + const WCHAR szClassList[] = L"Button;ListBox"; bThemeActive = IsThemeActive(); @@ -274,10 +274,10 @@ static void test_OpenThemeDataEx(void) HWND hWnd; BOOL bThemeActive; - WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; - WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; - WCHAR szButtonClassList2[] = {'b','U','t','T','o','N', 0 }; - WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 }; + const WCHAR szInvalidClassList[] = L"DEADBEEF"; + const WCHAR szButtonClassList[] = L"Button"; + const WCHAR szButtonClassList2[] = L"bUtToN"; + const WCHAR szClassList[] = L"Button;ListBox"; if (!pOpenThemeDataEx) {

1 0