wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Stefan Dösinger : ddraw/tests: P8 color keying does not work on WARP.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 6ffa32b8b3c1c597dc0ef53d4ee2326c71f1f89e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffa32b8b3c1c597dc0ef53d4… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Jun 29 22:46:50 2016 +0100 ddraw/tests: P8 color keying does not work on WARP. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 28 +++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 24 +++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 24 +++++++++++++++++++++++- 4 files changed, 100 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ffa32b8b3c1c597dc0ef…

1 0

Michael Stefaniuc : user32: Use InflateRect() too when stretching the RECT in just one axis.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 488562904ffe5f05592da37fe9d6bd2b83548224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=488562904ffe5f05592da37fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 4 09:47:27 2016 +0200 user32: Use InflateRect() too when stretching the RECT in just one axis. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 179d44a..23139e9 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2376,14 +2376,9 @@ static void EDIT_SetRectNP(EDITSTATE *es, const RECT *rc) else if (es->style & WS_BORDER) { bw = GetSystemMetrics(SM_CXBORDER) + 1; bh = GetSystemMetrics(SM_CYBORDER) + 1; - es->format_rect.left += bw; - es->format_rect.right -= bw; - if (es->format_rect.bottom - es->format_rect.top - >= es->line_height + 2 * bh) - { - es->format_rect.top += bh; - es->format_rect.bottom -= bh; - } + InflateRect(&es->format_rect, -bw, 0); + if (es->format_rect.bottom - es->format_rect.top >= es->line_height + 2 * bh) + InflateRect(&es->format_rect, 0, -bh); } es->format_rect.left += es->left_margin;

1 0

Nikolay Sivov : dwrite: Keep original script for NO_VISUAL case.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 29abc7f172414750411cc27d5ff1ade2578f1a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29abc7f172414750411cc27d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 10:44:48 2016 +0300 dwrite: Keep original script for NO_VISUAL case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 7 +++--- dlls/dwrite/tests/analyzer.c | 52 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index e49131b..5e53a54 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -249,7 +249,8 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 length, DWRITE_SCRIPT_ANALYSIS sa; UINT32 pos, i, seq_length; - if (!length) return S_OK; + if (!length) + return S_OK; sa = get_char_sa(*text); @@ -268,11 +269,11 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 length, case Script_Common: if (cur_sa.script == Script_Unknown) cur_sa.script = sa.script; - else if (cur_sa.script != Script_Common) + else if ((cur_sa.script != Script_Common) && sa.shapes == DWRITE_SCRIPT_SHAPES_DEFAULT) sa.script = cur_sa.script; break; default: - if (cur_sa.script == Script_Unknown || cur_sa.script == Script_Common) + if ((cur_sa.script == Script_Common && cur_sa.shapes == DWRITE_SCRIPT_SHAPES_DEFAULT) || cur_sa.script == Script_Unknown) cur_sa.script = sa.script; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index d008178..1e3b318 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -906,7 +906,57 @@ static struct sa_test sa_tests[] = { { 2, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, { 4, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } }, - /* keep this as end marker */ + { + /* Inherited on its own */ + {0x300,0x300,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* Inherited followed by Latin */ + {0x300,0x300,'a',0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* Inherited mixed with Arabic and Latin */ + {0x300,'+',0x627,0x300,'a',0}, 2, + { { 0, 4, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 4, 1, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + {'a',0x300,'+',0x627,0x300,')','a',0}, 3, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 3, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 6, 1, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + /* Paired punctuation */ + { + {0x627,'(','a',')','a',0}, 2, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 2, 3, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + {0x627,'[','a',']',0x627,0}, 3, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 2, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 4, 1, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + /* Combining marks */ + { + /* dotted circle - Common, followed by accent - Inherited */ + {0x25cc,0x300,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* combining mark with explicit script value */ + {0x25cc,0x300,0x5c4,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* inherited merges with following explicit script */ + {0x25cc,0x300,'a',0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + /* keep this as end test data marker */ { {0} } };

1 0

Nikolay Sivov : dwrite: Improve script mapping generation.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: c38be91061500325911d231c77a9eaaa7da918c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38be91061500325911d231c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 10:44:47 2016 +0300 dwrite: Improve script mapping generation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 76 ++- dlls/dwrite/scripts.c | 1456 +++++++++++++++++++++++++----------------------- dlls/dwrite/scripts.h | 261 +++++---- tools/make_unicode | 185 ++++-- 4 files changed, 1055 insertions(+), 923 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c38be91061500325911d2…

1 0

Huw Davies : riched20: Pass the correct range to the EN_LINK notification when the link is wrapped.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 65feea4e5aae1e0674743f4816528f27d10efe7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65feea4e5aae1e0674743f481… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 4 08:43:23 2016 +0100 riched20: Pass the correct range to the EN_LINK notification when the link is wrapped. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 81ef55d..13a2857 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2627,6 +2627,11 @@ static int ME_CalculateClickCount(ME_TextEditor *editor, UINT msg, WPARAM wParam return clickNum; } +static BOOL is_link( ME_Run *run ) +{ + return (run->style->fmt.dwMask & CFM_LINK) && (run->style->fmt.dwEffects & CFE_LINK); +} + static BOOL ME_SetCursor(ME_TextEditor *editor) { ME_Cursor cursor; @@ -2692,8 +2697,7 @@ static BOOL ME_SetCursor(ME_TextEditor *editor) ME_Run *run; run = &cursor.pRun->member.run; - if (run->style->fmt.dwMask & CFM_LINK && - run->style->fmt.dwEffects & CFE_LINK) + if (is_link( run )) { ITextHost_TxSetCursor(editor->texthost, LoadCursorW(NULL, (WCHAR*)IDC_HAND), @@ -3128,8 +3132,7 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM ME_CharFromPos(editor, x, y, &cursor, &isExact); if (!isExact) return; - if (cursor.pRun->member.run.style->fmt.dwMask & CFM_LINK && - cursor.pRun->member.run.style->fmt.dwEffects & CFE_LINK) + if (is_link( &cursor.pRun->member.run )) { /* The clicked run has CFE_LINK set */ ME_DisplayItem *di; @@ -3143,21 +3146,15 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM /* find the first contiguous run with CFE_LINK set */ info.chrg.cpMin = ME_GetCursorOfs(&cursor); - for (di = cursor.pRun->prev; - di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); - di = di->prev) - { - info.chrg.cpMin -= di->member.run.len; - } + di = cursor.pRun; + while (ME_PrevRun( NULL, &di, FALSE ) && is_link( &di->member.run )) + info.chrg.cpMin -= di->member.run.len; /* find the last contiguous run with CFE_LINK set */ info.chrg.cpMax = ME_GetCursorOfs(&cursor) + cursor.pRun->member.run.len; - for (di = cursor.pRun->next; - di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); - di = di->next) - { - info.chrg.cpMax += di->member.run.len; - } + di = cursor.pRun; + while (ME_NextRun( NULL, &di, FALSE ) && is_link( &di->member.run )) + info.chrg.cpMax += di->member.run.len; ITextHost_TxNotify(editor->texthost, info.nmhdr.code, &info); }

1 0

Huw Davies : riched20: Add an option to constrain the run search to the current para.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 3d1d65bc2c6e1c1ece15f4021fe289be3ce1775d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d1d65bc2c6e1c1ece15f4021… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 4 08:43:22 2016 +0100 riched20: Add an option to constrain the run search to the current para. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 ++-- dlls/riched20/editor.c | 10 +++++----- dlls/riched20/editor.h | 4 ++-- dlls/riched20/list.c | 16 ++++++++++------ dlls/riched20/para.c | 2 +- dlls/riched20/writer.c | 2 +- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 177f303..170363a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -331,7 +331,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, { /* We aren't deleting anything in this run, so we will go back to the * last run we are deleting text in. */ - ME_PrevRun(&c.pPara, &c.pRun); + ME_PrevRun(&c.pPara, &c.pRun, TRUE); c.nOffset = c.pRun->member.run.len; } run = &c.pRun->member.run; @@ -1245,7 +1245,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) int x = ME_GetXForArrow(editor, pCursor); if (editor->bCaretAtEnd && !pCursor->nOffset) - if (!ME_PrevRun(&pOldPara, &pRun)) + if (!ME_PrevRun(&pOldPara, &pRun, TRUE)) return; if (nRelOfs == -1) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a07dd7f..81ef55d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1863,7 +1863,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH cursor.nOffset++; if (cursor.nOffset == cursor.pRun->member.run.len) { - ME_NextRun(&cursor.pPara, &cursor.pRun); + ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE); cursor.nOffset = 0; } } @@ -1889,7 +1889,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH if (nCurEnd == 0) { - ME_PrevRun(&pCurPara, &pCurItem); + ME_PrevRun(&pCurPara, &pCurItem, TRUE); nCurEnd = pCurItem->member.run.len; } @@ -1938,7 +1938,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH } if (nCurEnd - nMatched == 0) { - ME_PrevRun(&pCurPara, &pCurItem); + ME_PrevRun(&pCurPara, &pCurItem, TRUE); /* Don't care about pCurItem becoming NULL here; it's already taken * care of in the exterior loop condition */ nCurEnd = pCurItem->member.run.len + nMatched; @@ -1952,7 +1952,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH cursor.nOffset--; if (cursor.nOffset < 0) { - ME_PrevRun(&cursor.pPara, &cursor.pRun); + ME_PrevRun(&cursor.pPara, &cursor.pRun, TRUE); cursor.nOffset = cursor.pRun->member.run.len; } } @@ -5109,7 +5109,7 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, } cursor.nOffset = 0; - if (!ME_NextRun(&cursor.pPara, &cursor.pRun)) + if (!ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE)) goto done; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e9d1e47..cc1654a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -88,8 +88,8 @@ 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) DECLSPEC_HIDDEN; -BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run) 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; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index c57e526..ce21c59 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -63,16 +63,18 @@ static BOOL ME_DITypesEqual(ME_DIType type, ME_DIType nTypeOrClass) } } -/* Modifies run pointer to point to the next run, and modify the - * paragraph pointer if moving into the next paragraph. +/* 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 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; @@ -83,16 +85,18 @@ BOOL ME_NextRun(ME_DisplayItem **para, ME_DisplayItem **run) return FALSE; } -/* Modifies run pointer to point to the previous run, and modify the - * paragraph pointer if moving into the previous paragraph. +/* 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 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 (p->member.para.prev_para->type == diParagraph) *para = p->member.para.prev_para; } else if (p->type == diRun) { diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 6721698..c762cf0 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -364,7 +364,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, endCur.pRun = ME_FindItemFwd(pNext, diRun); endCur.nOffset = 0; startCur = endCur; - ME_PrevRun(&startCur.pPara, &startCur.pRun); + ME_PrevRun(&startCur.pPara, &startCur.pRun, TRUE); ME_SetCharFormat(editor, &startCur, &endCur, &fmt); if (!editor->bEmulateVersion10) { /* v4.1 */ diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index f76d5a5..5d74a34 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -981,7 +981,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, if (!ME_StreamOutPrint(pStream, "}")) return FALSE; } - } while (cursor.pRun != endCur.pRun && ME_NextRun(&cursor.pPara, &cursor.pRun)); + } while (cursor.pRun != endCur.pRun && ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE)); if (!ME_StreamOutMove(pStream, "}\0", 2)) return FALSE;

1 0

Michael Müller : shell32: Correctly compare result of SHFileOperation in UNIXFS copy/ delete functions.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: b05aa34f63f8d1a752cea9bf69d436e09c951bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05aa34f63f8d1a752cea9bf6… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jul 1 22:00:28 2016 +0200 shell32: Correctly compare result of SHFileOperation in UNIXFS copy/delete functions. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 309c941..884fc0a 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -847,7 +847,7 @@ static HRESULT UNIXFS_copy(LPCWSTR pwszDosSrc, LPCWSTR pwszDosDst) op.pFrom = pwszSrc; op.pTo = pwszDst; op.fFlags = FOF_ALLOWUNDO; - if (!SHFileOperationW(&op)) + if (SHFileOperationW(&op)) { WARN("SHFileOperationW failed\n"); res = E_FAIL; @@ -1981,7 +1981,7 @@ static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LP op.wFunc = FO_DELETE; op.pFrom = wszPathsList; op.fFlags = FOF_ALLOWUNDO; - if (!SHFileOperationW(&op)) + if (SHFileOperationW(&op)) { WARN("SHFileOperationW failed\n"); ret = E_FAIL;

1 0

Michael Stefaniuc : msctf: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 8e2db1dfe1201c5387771094e3708ce3dbf2fc25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2db1dfe1201c5387771094e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:29:56 2016 +0200 msctf: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index e645619..528414f 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1488,8 +1488,8 @@ static HRESULT EnumTfDocumentMgr_Constructor(struct list* head, IEnumTfDocumentM This->head = head; This->index = list_head(This->head); - TRACE("returning %p\n", This); - *ppOut = (IEnumTfDocumentMgrs*)This; + TRACE("returning %p\n", &This->IEnumTfDocumentMgrs_iface); + *ppOut = &This->IEnumTfDocumentMgrs_iface; return S_OK; }

1 0

Michael Stefaniuc : msimtf: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: c65325c584a5cecec49721ba7e0f643075bc6321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65325c584a5cecec49721ba7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:29:06 2016 +0200 msimtf: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimtf/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index daae817..78c26cb 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -141,7 +141,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) ActiveIMMApp_Constructor, }; - return IClassFactory_QueryInterface((IClassFactory*)&cf, riid, ppv); + return IClassFactory_QueryInterface(&cf.IClassFactory_iface, riid, ppv); } FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);

1 0

Michael Stefaniuc : dispex/tests: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: c9acabe1ddcfa2953fb0de1fb9368471be6af030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9acabe1ddcfa2953fb0de1fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:28:45 2016 +0200 dispex/tests: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dispex/tests/marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 0211cd7..c4917c6 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -356,7 +356,7 @@ static IDispatchEx *dispex_create(void) if (!This) return NULL; This->IDispatchEx_iface.lpVtbl = &dispex_vtable; This->refs = 1; - return (IDispatchEx *)This; + return &This->IDispatchEx_iface; } static void test_dispex(void)

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
68
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 July 2016