wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Huw Davies : riched20: Use paragraph ptrs in FindPixelPos().
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 4366c81f49534b090b19a50285a828aaeb4bbf53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4366c81f49534b090b19a502… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:35 2020 +0100 riched20: Use paragraph ptrs in FindPixelPos(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 56 +++++++++++++++++++++++++------------------------- dlls/riched20/editor.c | 4 ++++ dlls/riched20/editor.h | 1 + 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index dde0c7faad..1c3f4b1652 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -892,41 +892,41 @@ int ME_GetCursorOfs(const ME_Cursor *cursor) } /* Helper function for ME_FindPixelPos to find paragraph within tables */ -static ME_DisplayItem* ME_FindPixelPosInTableRow(int x, int y, - ME_DisplayItem *para) +static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) { ME_DisplayItem *cell, *next_cell; - assert(para->member.para.nFlags & MEPF_ROWSTART); - cell = para->member.para.next_para->member.para.pCell; + + assert( para->nFlags & MEPF_ROWSTART ); + cell = para_next( para )->pCell; assert(cell); /* find the cell we are in */ - while ((next_cell = cell->member.cell.next_cell) != NULL) { + while ((next_cell = cell->member.cell.next_cell) != NULL) + { if (x < next_cell->member.cell.pt.x) { - para = ME_FindItemFwd(cell, diParagraph); + para = &ME_FindItemFwd( cell, diParagraph )->member.para; /* Found the cell, but there might be multiple paragraphs in * the cell, so need to search down the cell for the paragraph. */ - while (cell == para->member.para.pCell) { - if (y < para->member.para.pt.y + para->member.para.nHeight) + while (cell == para->pCell) + { + if (y < para->pt.y + para->nHeight) { - if (para->member.para.nFlags & MEPF_ROWSTART) - return ME_FindPixelPosInTableRow(x, y, para); - else - return para; + if (para->nFlags & MEPF_ROWSTART) return pixel_pos_in_table_row( x, y, para ); + else return para; } - para = para->member.para.next_para; + para = para_next( para ); } /* Past the end of the cell, so go back to the last cell paragraph */ - return para->member.para.prev_para; + return para_prev( para ); } cell = next_cell; } /* Return table row delimiter */ - para = ME_FindItemFwd(cell, diParagraph); - assert(para->member.para.nFlags & MEPF_ROWEND); - assert(para->member.para.fmt.dwMask & PFM_TABLEROWDELIMITER); - assert(para->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER); + para = table_row_end( para ); + assert( para->nFlags & MEPF_ROWEND ); + assert( para->fmt.dwMask & PFM_TABLEROWDELIMITER ); + assert( para->fmt.wEffects & PFE_TABLEROWDELIMITER ); return para; } @@ -986,7 +986,7 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol, BOOL final_eop) { - ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; + ME_Paragraph *para = editor_first_para( editor ); ME_DisplayItem *row = NULL; BOOL isExact = TRUE; @@ -997,19 +997,19 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, *is_eol = FALSE; /* find paragraph */ - for (; p != editor->pBuffer->pLast; p = p->member.para.next_para) + for (; para_next( para ); para = para_next( para )) { - if (y < p->member.para.pt.y + p->member.para.nHeight) + if (y < para->pt.y + para->nHeight) { - if (p->member.para.nFlags & MEPF_ROWSTART) - p = ME_FindPixelPosInTableRow(x, y, p); - y -= p->member.para.pt.y; - row = ME_FindItemFwd(p, diStartRow); + if (para->nFlags & MEPF_ROWSTART) + para = pixel_pos_in_table_row( x, y, para ); + y -= para->pt.y; + row = ME_FindItemFwd( para_get_di( para ), diStartRow); break; } - else if (p->member.para.nFlags & MEPF_ROWSTART) + else if (para->nFlags & MEPF_ROWSTART) { - p = para_get_di( table_row_end( &p->member.para ) ); + para = table_row_end( para ); } } /* find row */ @@ -1029,7 +1029,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, * rather than the end of the text, so the x position will be used to * determine the offset closest to the pixel position. */ isExact = FALSE; - row = ME_FindItemBack(p, diStartRow); + row = ME_FindItemBack( para_get_di( para ), diStartRow); } if (row) return ME_FindRunInRow( editor, row, x, result, is_eol ) && isExact; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e7e33c2758..a144137baa 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -280,6 +280,10 @@ static ME_TextBuffer *ME_MakeText(void) { return buf; } +ME_Paragraph *editor_first_para( ME_TextEditor *editor ) +{ + return para_next( &editor->pBuffer->pFirst->member.para ); +} static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6b97a01f82..f61caa6478 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -268,6 +268,7 @@ void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; +ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN;

1 0

Huw Davies : riched20: Use the run and para helpers in the cursor movement functions.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 586e31a1e6e524e593897285a82b90a08303db33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586e31a1e6e524e593897285… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:34 2020 +0100 riched20: Use the run and para helpers in the cursor movement functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 121 ++++++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 67 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 2fe057cdbd..dde0c7faad 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -671,7 +671,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO { /* new offset in the same paragraph */ do { - cursor->pRun = ME_FindItemBack(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_prev( &cursor->pRun->member.run ) ); } while (cursor->nOffset < cursor->pRun->member.run.nCharOfs); cursor->nOffset -= cursor->pRun->member.run.nCharOfs; return nRelOfs; @@ -688,27 +688,29 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO /* new offset in a previous paragraph */ do { - cursor->pPara = cursor->pPara->member.para.prev_para; + cursor->pPara = para_get_di( para_prev( &cursor->pPara->member.para ) ); } while (cursor->nOffset < cursor->pPara->member.para.nCharOfs); cursor->nOffset -= cursor->pPara->member.para.nCharOfs; - cursor->pRun = ME_FindItemBack(cursor->pPara->member.para.next_para, diRun); + cursor->pRun = run_get_di( para_end_run( &cursor->pPara->member.para ) ); while (cursor->nOffset < cursor->pRun->member.run.nCharOfs) { - cursor->pRun = ME_FindItemBack(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_prev( &cursor->pRun->member.run ) ); } cursor->nOffset -= cursor->pRun->member.run.nCharOfs; - } else if (cursor->nOffset >= cursor->pRun->member.run.len) { - ME_DisplayItem *next_para; + } + else if (cursor->nOffset >= cursor->pRun->member.run.len) + { + ME_Paragraph *next_para; int new_offset; new_offset = ME_GetCursorOfs(cursor); - next_para = cursor->pPara->member.para.next_para; - if (new_offset < next_para->member.para.nCharOfs) + next_para = para_next( &cursor->pPara->member.para ); + if (new_offset < next_para->nCharOfs) { /* new offset in the same paragraph */ do { cursor->nOffset -= cursor->pRun->member.run.len; - cursor->pRun = ME_FindItemFwd(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_next( &cursor->pRun->member.run ) ); } while (cursor->nOffset >= cursor->pRun->member.run.len); return nRelOfs; } @@ -723,16 +725,16 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO /* new offset in a following paragraph */ do { - cursor->pPara = next_para; - next_para = next_para->member.para.next_para; - } while (new_offset >= next_para->member.para.nCharOfs); + cursor->pPara = para_get_di( next_para ); + next_para = para_next( next_para ); + } while (new_offset >= next_para->nCharOfs); cursor->nOffset = new_offset - cursor->pPara->member.para.nCharOfs; - cursor->pRun = ME_FindItemFwd(cursor->pPara, diRun); + cursor->pRun = run_get_di( para_first_run( &cursor->pPara->member.para ) ); while (cursor->nOffset >= cursor->pRun->member.run.len) { cursor->nOffset -= cursor->pRun->member.run.len; - cursor->pRun = ME_FindItemFwd(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_next( &cursor->pRun->member.run ) ); } } /* else new offset is in the same run */ return nRelOfs; @@ -742,8 +744,8 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) { - ME_DisplayItem *pRun = cursor->pRun, *pOtherRun; - ME_DisplayItem *pPara = cursor->pPara; + ME_Run *run = &cursor->pRun->member.run, *other_run; + ME_Paragraph *para = &cursor->pPara->member.para; int nOffset = cursor->nOffset; if (nRelOfs == -1) @@ -751,40 +753,33 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) /* Backward movement */ while (TRUE) { - nOffset = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset, WB_MOVEWORDLEFT); - if (nOffset) - break; - pOtherRun = ME_FindItemBack(pRun, diRunOrParagraph); - if (pOtherRun->type == diRun) + nOffset = ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset, WB_MOVEWORDLEFT ); + if (nOffset) break; + other_run = run_prev( run ); + if (other_run) { - if (ME_CallWordBreakProc(editor, get_text( &pOtherRun->member.run, 0 ), - pOtherRun->member.run.len, - pOtherRun->member.run.len - 1, - WB_ISDELIMITER) - && !(pRun->member.run.nFlags & MERF_ENDPARA) - && !(cursor->pRun == pRun && cursor->nOffset == 0) - && !ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, 0, - WB_ISDELIMITER)) + if (ME_CallWordBreakProc( editor, get_text( other_run, 0 ), other_run->len, other_run->len - 1, WB_ISDELIMITER ) + && !(run->nFlags & MERF_ENDPARA) + && !(&cursor->pRun->member.run == run && cursor->nOffset == 0) + && !ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, 0, WB_ISDELIMITER )) break; - pRun = pOtherRun; - nOffset = pOtherRun->member.run.len; + run = other_run; + nOffset = other_run->len; } - else if (pOtherRun->type == diParagraph) + else { - if (cursor->pRun == pRun && cursor->nOffset == 0) + if (&cursor->pRun->member.run == run && cursor->nOffset == 0) { - pPara = pOtherRun; + para = run->para; /* Skip empty start of table row paragraph */ - if (pPara->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART) - pPara = pPara->member.para.prev_para; + if (para_prev( para )->nFlags & MEPF_ROWSTART) + para = para_prev( para ); /* Paragraph breaks are treated as separate words */ - if (pPara->member.para.prev_para->type == diTextStart) + if (para_get_di( para_prev( para ) )->type == diTextStart) return FALSE; - pRun = ME_FindItemBack(pPara, diRun); - pPara = pPara->member.para.prev_para; + para = para_prev( para ); + run = para_end_run( para ); } break; } @@ -797,43 +792,35 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) while (TRUE) { - if (last_delim && !ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset, WB_ISDELIMITER)) - break; - nOffset = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset, WB_MOVEWORDRIGHT); - if (nOffset < pRun->member.run.len) + if (last_delim && !ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset, WB_ISDELIMITER )) break; - pOtherRun = ME_FindItemFwd(pRun, diRunOrParagraphOrEnd); - if (pOtherRun->type == diRun) + nOffset = ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset, WB_MOVEWORDRIGHT ); + if (nOffset < run->len) break; + other_run = run_next( run ); + if (other_run) { - last_delim = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset - 1, WB_ISDELIMITER); - pRun = pOtherRun; + last_delim = ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset - 1, WB_ISDELIMITER ); + run = other_run; nOffset = 0; } - else if (pOtherRun->type == diParagraph) + else { - if (pOtherRun->member.para.nFlags & MEPF_ROWSTART) - pOtherRun = pOtherRun->member.para.next_para; - if (cursor->pRun == pRun) { - pPara = pOtherRun; - pRun = ME_FindItemFwd(pPara, diRun); + para = para_next( para ); + if (para_get_di( para )->type == diTextEnd) + { + if (&cursor->pRun->member.run == run) return FALSE; + nOffset = 0; + break; } - nOffset = 0; - break; - } - else /* diTextEnd */ - { - if (cursor->pRun == pRun) - return FALSE; + if (para->nFlags & MEPF_ROWSTART) para = para_next( para ); + if (&cursor->pRun->member.run == run) run = para_first_run( para ); nOffset = 0; break; } } } - cursor->pPara = pPara; - cursor->pRun = pRun; + cursor->pPara = para_get_di( para ); + cursor->pRun = run_get_di( run ); cursor->nOffset = nOffset; return TRUE; }

1 0

Huw Davies : riched20: Use paragraph and run ptrs in InsertTextFromCursor().
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 468609ae7be64627d2dd78dd94afb6a29b29b604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=468609ae7be64627d2dd78dd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:33 2020 +0100 riched20: Use paragraph and run ptrs in InsertTextFromCursor(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 24 ++++++++++++------------ dlls/riched20/editor.h | 1 + dlls/riched20/para.c | 5 +++++ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 69963e6691..2fe057cdbd 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -579,7 +579,8 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_InternalInsertTextFromCursor(editor, nCursor, &tab, 1, style, MERF_TAB); pos++; } else { /* handle EOLs */ - ME_DisplayItem *tp, *end_run, *run, *prev; + ME_Run *end_run, *run, *prev; + ME_Paragraph *new_para; int eol_len = 0; /* Check if new line is allowed for this control */ @@ -619,31 +620,30 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, if (p->nOffset == p->pRun->member.run.len) { - run = ME_FindItemFwd( p->pRun, diRun ); - if (!run) run = p->pRun; + run = run_next( &p->pRun->member.run ); + if (!run) run = &p->pRun->member.run; } else { if (p->nOffset) ME_SplitRunSimple(editor, p); - run = p->pRun; + run = &p->pRun->member.run; } - tp = ME_SplitParagraph(editor, run, style, eol_str, eol_len, 0); - - end_run = ME_FindItemBack(tp, diRun); + new_para = &ME_SplitParagraph( editor, run_get_di( run ), style, eol_str, eol_len, 0 )->member.para; + end_run = para_end_run( para_prev( new_para ) ); /* Move any cursors that were at the end of the previous run to the beginning of the new para */ - prev = ME_FindItemBack( end_run, diRun ); + prev = run_prev( end_run ); if (prev) { int i; for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == prev && - editor->pCursors[i].nOffset == prev->member.run.len) + if (editor->pCursors[i].pRun == run_get_di( prev ) && + editor->pCursors[i].nOffset == prev->len) { - editor->pCursors[i].pPara = tp; - editor->pCursors[i].pRun = run; + editor->pCursors[i].pPara = para_get_di( new_para ); + editor->pCursors[i].pRun = run_get_di( run ); editor->pCursors[i].nOffset = 0; } } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6c45a3c6b5..6b97a01f82 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -214,6 +214,7 @@ void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDD ME_Paragraph *para_next( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *para_prev( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { return (ME_DisplayItem *)((ptrdiff_t)para - offsetof(ME_DisplayItem, member)); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 0f8b76f76d..1ae7caad61 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -116,6 +116,11 @@ ME_Run *para_first_run( ME_Paragraph *para ) return NULL; } +ME_Run *para_end_run( ME_Paragraph *para ) +{ + return para->eop_run; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0};

1 0

Vijay Kiran Kamuju : hnetcfg: Return S_OK in get_StaticPortMappingCollection.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 5160c30fa75b631354586b528e3be2851a1909c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5160c30fa75b631354586b52… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Oct 10 12:44:44 2020 +0200 hnetcfg: Return S_OK in get_StaticPortMappingCollection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49449 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 2 +- dlls/hnetcfg/tests/policy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index b0821d4b68..fd4ac4977d 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -720,7 +720,7 @@ static HRESULT WINAPI upnpnat_get_StaticPortMappingCollection(IUPnPNAT *iface, I FIXME("%p, %p\n", This, collection); if(collection) *collection = NULL; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI upnpnat_get_DynamicPortMappingCollection(IUPnPNAT *iface, IDynamicPortMappingCollection **collection) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 8701455841..416049c009 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -180,7 +180,7 @@ static void test_IUPnPNAT(void) ok(hr == E_NOINTERFACE, "got: %08x\n", hr); hr = IUPnPNAT_get_StaticPortMappingCollection(nat, &static_ports); - todo_wine ok(hr == S_OK, "got: %08x\n", hr); + ok(hr == S_OK, "got: %08x\n", hr); if(hr == S_OK && static_ports) IStaticPortMappingCollection_Release(static_ports);

1 0

Anton Baskanov : amstream: Implement SSUPDATE_CONTINUOUS flag in IDirectDrawStreamSample::Update.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: aaf461b7d266b584b128d4711f9a72a059b5f537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf461b7d266b584b128d471… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Oct 10 03:57:54 2020 +0700 amstream: Implement SSUPDATE_CONTINUOUS flag in IDirectDrawStreamSample::Update. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 37 ++++--- dlls/amstream/tests/amstream.c | 224 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 247 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aaf461b7d266b584b128…

1 0

Matteo Bruni : d3dcompiler/tests: Always expect failure in test_reflection_desc_ps_output() on d3d10.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 4ced409adb110ed5e12e91b0d452029e184c87b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ced409adb110ed5e12e91b0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 13 11:05:37 2020 +0200 d3dcompiler/tests: Always expect failure in test_reflection_desc_ps_output() on d3d10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49950 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 362e070ede..bc802f016a 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1010,22 +1010,21 @@ static void test_reflection_desc_ps_output(void) { const DWORD *blob; D3D11_SIGNATURE_PARAMETER_DESC desc; - BOOL d3d10; } tests[] = { {test_reflection_desc_ps_output_blob_0, - {"SV_Target", 3, 3, D3D_NAME_TARGET, D3D_REGISTER_COMPONENT_FLOAT32, 0xf, 0, 0}, TRUE}, + {"SV_Target", 3, 3, D3D_NAME_TARGET, D3D_REGISTER_COMPONENT_FLOAT32, 0xf, 0, 0}}, {test_reflection_desc_ps_output_blob_1, - {"SV_DepthLessEqual", 0, 0xffffffff, D3D_NAME_DEPTH_LESS_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, FALSE}, + {"SV_DepthLessEqual", 0, 0xffffffff, D3D_NAME_DEPTH_LESS_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_2, - {"SV_DepthGreaterEqual", 0, 0xffffffff, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, FALSE}, + {"SV_DepthGreaterEqual", 0, 0xffffffff, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_3, - {"sV_DePtH", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, FALSE}, + {"sV_DePtH", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_4, - {"SV_Depth", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, TRUE}, + {"SV_Depth", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_5, - {"SV_COVERAGE", 0, 0xffffffff, D3D_NAME_COVERAGE, D3D_REGISTER_COMPONENT_UINT32, 0x1, 0xe, 0}, FALSE}, + {"SV_COVERAGE", 0, 0xffffffff, D3D_NAME_COVERAGE, D3D_REGISTER_COMPONENT_UINT32, 0x1, 0xe, 0}}, }; HRESULT hr; ULONG count; @@ -1038,7 +1037,7 @@ static void test_reflection_desc_ps_output(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = call_reflect(tests[i].blob, tests[i].blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - if (!D3D_COMPILER_VERSION && !tests[i].d3d10) + if (!D3D_COMPILER_VERSION) { todo_wine ok(hr == E_INVALIDARG, "(%u): got unexpected hr %x.\n", i, hr); if (SUCCEEDED(hr))

1 0

Julian Rüger : documentation: Update German translation.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 48ef770376baece17ff034a6c42c4f18ff102c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=48ef770376baece17ff034a6… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Oct 13 09:38:46 2020 +0200 documentation: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.de | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 2066bdfd04..fbf63eca22 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -21,6 +21,14 @@ enthält) folgende Befehle auf: ./configure make +Im Anschluss können Sie Wine entweder installieren: + +make install + +Oder direkt aus dem Quellverzeichnis ausführen: + +./wine notepad + Starten Sie Programme mit "wine Programmname". Weitere Informationen und Problemlösungen entnehmen Sie bitte dem Rest dieser Datei, der Man-Page von Wine und insbesondere der Vielzahl an @@ -83,11 +91,9 @@ Optionale Bibliotheken: wurden. Tipps zum Installieren fehlender Pakete finden Sie unter: https://wiki.winehq.org/Recommended_Packages - Unter 64-Bit Plattformen, falls Sie Wine als 32-Bit kompilieren (Standard), - benötigen Sie die 32-Bit-Versionen dieser Bibliotheken; Details unter - https://wiki.winehq.org/WineOn64bit - Für ein reines 64-Bit Wine (oder ein gemischtes 32- und 64-Bit Wine-Setup), - siehe https://wiki.winehq.org/Wine64 + Unter 64-Bit-Plattformen benötigen Sie auch die 32-Bit-Versionen dieser + Bibliotheken. + 4. KOMPILIEREN @@ -105,6 +111,9 @@ unter Unix zu kompilieren und zu verlinken. Mit ./configure --help können Sie sich Konfigurations-Optionen für die Kompilierung anzeigen lassen. +Weitere Informationen finden Sie unter https://wiki.winehq.org/Building_Wine + + 5. SETUP Nachdem Wine korrekt erstellt wurde, können Sie "make install" aufrufen; @@ -115,8 +124,8 @@ Vergessen Sie nicht, zuerst frühere Wine-Installationen zu entfernen, die mit der neuen in Konflikt stehen könnten. Versuchen Sie entweder "dpkg -r wine", "rpm -e wine" oder "make uninstall" vor der Installation auszuführen. -Nach der Installation können Sie das Tool "winecfg" starten. -Konfigurationshinweise finden Sie im Support-Bereich auf https://www.winehq.org/ +Nach der Installation können Sie das Konfigurationswerkzeug "winecfg" starten. +Hinweise dazu finden Sie im Support-Bereich auf https://www.winehq.org/ 6. AUSFÜHREN VON PROGRAMMEN @@ -135,8 +144,8 @@ Beispiel: Um Notepad auszuführen: wine notepad.exe liesmich.txt (Programmaufruf mit Parametern) -Wine ist nicht perfekt, daher können manche Programme abstürzen. -In diesem Fall bekommen Sie einen Log vom Absturz, den Sie beifügen sollten, +Wine ist nicht perfekt, manche Programme könnten abstürzen. +In solchen Fällen bekommen Sie einen Log vom Absturz, den Sie beifügen sollten, wenn Sie den Fehler melden.

1 0

Daniel Lehman : tzres: Add Eastern Standard Time (Mexico) Zone.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 0adafcd62c339cbad322aec942d4f289c5b6e671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0adafcd62c339cbad322aec9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 12 20:16:07 2020 -0700 tzres: Add Eastern Standard Time (Mexico) Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 11 ++ po/ar.po | 286 +++++++++++++++++++++++++++------------------------ po/ast.po | 286 +++++++++++++++++++++++++++------------------------ po/bg.po | 282 ++++++++++++++++++++++++++------------------------ po/ca.po | 286 +++++++++++++++++++++++++++------------------------ po/cs.po | 286 +++++++++++++++++++++++++++------------------------ po/da.po | 286 +++++++++++++++++++++++++++------------------------ po/de.po | 286 +++++++++++++++++++++++++++------------------------ po/el.po | 282 ++++++++++++++++++++++++++------------------------ po/en.po | 282 ++++++++++++++++++++++++++------------------------ po/en_US.po | 282 ++++++++++++++++++++++++++------------------------ po/eo.po | 286 +++++++++++++++++++++++++++------------------------ po/es.po | 286 +++++++++++++++++++++++++++------------------------ po/fa.po | 284 ++++++++++++++++++++++++++------------------------ po/fi.po | 286 +++++++++++++++++++++++++++------------------------ po/fr.po | 286 +++++++++++++++++++++++++++------------------------ po/he.po | 286 +++++++++++++++++++++++++++------------------------ po/hi.po | 282 ++++++++++++++++++++++++++------------------------ po/hr.po | 286 +++++++++++++++++++++++++++------------------------ po/hu.po | 286 +++++++++++++++++++++++++++------------------------ po/it.po | 286 +++++++++++++++++++++++++++------------------------ po/ja.po | 286 +++++++++++++++++++++++++++------------------------ po/ko.po | 286 +++++++++++++++++++++++++++------------------------ po/lt.po | 286 +++++++++++++++++++++++++++------------------------ po/ml.po | 282 ++++++++++++++++++++++++++------------------------ po/nb_NO.po | 286 +++++++++++++++++++++++++++------------------------ po/nl.po | 286 +++++++++++++++++++++++++++------------------------ po/or.po | 282 ++++++++++++++++++++++++++------------------------ po/pa.po | 282 ++++++++++++++++++++++++++------------------------ po/pl.po | 286 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 286 +++++++++++++++++++++++++++------------------------ po/pt_PT.po | 286 +++++++++++++++++++++++++++------------------------ po/rm.po | 282 ++++++++++++++++++++++++++------------------------ po/ro.po | 286 +++++++++++++++++++++++++++------------------------ po/ru.po | 282 ++++++++++++++++++++++++++------------------------ po/si.po | 286 +++++++++++++++++++++++++++------------------------ po/sk.po | 286 +++++++++++++++++++++++++++------------------------ po/sl.po | 286 +++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 284 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 284 ++++++++++++++++++++++++++------------------------ po/sv.po | 286 +++++++++++++++++++++++++++------------------------ po/ta.po | 282 ++++++++++++++++++++++++++------------------------ po/te.po | 282 ++++++++++++++++++++++++++------------------------ po/th.po | 284 ++++++++++++++++++++++++++------------------------ po/tr.po | 286 +++++++++++++++++++++++++++------------------------ po/uk.po | 282 ++++++++++++++++++++++++++------------------------ po/wa.po | 284 ++++++++++++++++++++++++++------------------------ po/wine.pot | 282 ++++++++++++++++++++++++++------------------------ po/zh_CN.po | 286 +++++++++++++++++++++++++++------------------------ po/zh_TW.po | 286 +++++++++++++++++++++++++++------------------------ 51 files changed, 7248 insertions(+), 6713 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0adafcd62c339cbad322…

1 0

Paul Gofman : ntdll: Always align stack in call_user_apc_dispatcher() on x86_64.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 53f7cb3c0888c852e0b4fdc9366c6ce53a54f433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53f7cb3c0888c852e0b4fdc9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 13 02:52:18 2020 +0300 ntdll: Always align stack in call_user_apc_dispatcher() on x86_64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49860 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e11b2c70b5..00b07c4270 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2011,6 +2011,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "jrcxz 1f\n\t" "movq 0x98(%rcx),%rax\n\t" /* context_ptr->Rsp */ "leaq -0x5c0(%rax),%rsp\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) */ + "andq $~15,%rsp\n\t" "jmp 2f\n" "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ "leaq -0x4d0(%rax),%rsp\n\t"

1 0

Michael Stefaniuc : opcservices: Use wide-char string literals.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 43301cc14b6c20e8837865e486d9b8a23c697614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43301cc14b6c20e8837865e4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 23:17:49 2020 +0200 opcservices: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 3 +-- dlls/opcservices/package.c | 54 ++++++++++++++++------------------------------ dlls/opcservices/uri.c | 7 +++--- 3 files changed, 22 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43301cc14b6c20e88378…

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
80
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 October 2020