October 2020 - Wine-devel - list.winehq.org

[PATCH] wininet: Prevent use after free in logging.
by Jan Sikorski 30 Oct '20

30 Oct '20

Make logs which show values that are unmapped by cache_container_unlock_index() go before it's called. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wininet/urlcache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 3275cb19e6a..4a397b6b4de 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1808,9 +1808,9 @@ static BOOL urlcache_get_entry_info(const char *url, void *entry_info, url_entry = (const entry_url*)((LPBYTE)header + hash_entry->offset); if(url_entry->header.signature != URL_SIGNATURE) { - cache_container_unlock_index(container, header); FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&url_entry->header.signature, sizeof(DWORD))); + cache_container_unlock_index(container, header); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -2041,8 +2041,8 @@ BOOL WINAPI SetUrlCacheEntryInfoA(LPCSTR lpszUrlName, pEntry = (entry_header*)((LPBYTE)pHeader + pHashEntry->offset); if (pEntry->signature != URL_SIGNATURE) { - cache_container_unlock_index(pContainer, pHeader); FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->signature, sizeof(DWORD))); + cache_container_unlock_index(pContainer, pHeader); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -2111,9 +2111,9 @@ static BOOL urlcache_entry_get_file(const char *url, void *entry_info, DWORD *si url_entry = (entry_url*)((LPBYTE)header + hash_entry->offset); if(url_entry->header.signature != URL_SIGNATURE) { - cache_container_unlock_index(container, header); FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&url_entry->header.signature, sizeof(DWORD))); + cache_container_unlock_index(container, header); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -4004,9 +4004,9 @@ BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR url, DWORD dwFlags, FILETIME* pftLast pEntry = (const entry_header*)((LPBYTE)pHeader + pHashEntry->offset); if (pEntry->signature != URL_SIGNATURE) { + FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->signature, sizeof(DWORD))); cache_container_unlock_index(pContainer, pHeader); memset(pftLastModified, 0, sizeof(*pftLastModified)); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->signature, sizeof(DWORD))); return TRUE; } -- 2.27.0

1 0

[PATCH] comctl32: Check is a safe window.
by Chao Long 30 Oct '20

30 Oct '20

014a:014b:trace:listview:notify_hdr <= 0 014a:014b:trace:listview:notify_dispinfoT resulting code=-176 014a:014b:trace:listview:EditLblWndProcT (hwnd=0005005C, uMsg=10, wParam=0, lParam=0, isW=1) 014a:014b:trace:listview:LISTVIEW_WindowProc (hwnd=00020054 uMsg=210 wParam=2 lParam=5005c) 014a:014b:trace:listview:EditLblWndProcT (hwnd=0005005C, uMsg=18, wParam=0, lParam=0, isW=1) 014a:014b:trace:listview:EditLblWndProcT (hwnd=0005005C, uMsg=46, wParam=0, lParam=303ba4, isW=1) 014a:014b:trace:listview:LISTVIEW_WindowProc (hwnd=00020054 uMsg=14 wParam=e0324 lParam=0) 014a:014b:trace:listview:LISTVIEW_EraseBkgnd (hdc=000E0324) 014a:014b:trace:listview:EditLblWndProcT (hwnd=0005005C, uMsg=47, wParam=0, lParam=303ba4, isW=1) 014a:014b:trace:listview:EditLblWndProcT (hwnd=0005005C, uMsg=210, wParam=3ec0002, lParam=30050, isW=1) 014a:014b:trace:listview:EditLblWndProcT (hwnd=0005005C, uMsg=2, wParam=0, lParam=0, isW=1) 014a:014b:trace:listview:EditLblWndProcT (hwnd=0005005C, uMsg=8, wParam=20054, lParam=0, isW=1) 014a:014b:trace:seh:raise_exception code=c0000005 flags=0 addr=0x7d0b2b18 ip=7d0b2b18 tid=014b 014a:014b:trace:seh:raise_exception info[0]=00000000 014a:014b:trace:seh:raise_exception info[1]=00000074 014a:014b:trace:seh:raise_exception eax=00000000 ebx=003047b4 ecx=00304220 edx=00000000 esi=00304eec edi=00000000 014a:014b:trace:seh:raise_exception ebp=003046a8 esp=00304680 cs=0023 ds=002b es=002b fs=0063 gs=006b flags=00010206 The window is destroy. killfocus msg is not safe. 014a:014b:trace:listview:EditLblWndProcT (hwnd=0005005C, uMsg=2, wParam=0, lParam=0, isW=1) 014a:014b:trace:listview:EditLblWndProcT (hwnd=0005005C, uMsg=8, wParam=20054, lParam=0, isW=1)

3 2

[PATCH 5/5] riched20: Use paragraph and run ptrs in the find text function.
by Huw Davies 30 Oct '20

30 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 85 ++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1f37258f345..c1138bd1dab 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1928,11 +1928,11 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH while (cursor.pRun && ME_GetCursorOfs(&cursor) + nLen <= nMax) { - ME_DisplayItem *pCurItem = cursor.pRun; + ME_Run *run = &cursor.pRun->member.run; int nCurStart = cursor.nOffset; int nMatched = 0; - while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurStart + nMatched ), text[nMatched], (flags & FR_MATCHCASE))) + while (run && ME_CharCompare( *get_text( run, nCurStart + nMatched ), text[nMatched], (flags & FR_MATCHCASE))) { if ((flags & FR_WHOLEWORD) && iswalnum(wLastChar)) break; @@ -1940,21 +1940,21 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH nMatched++; if (nMatched == nLen) { - ME_DisplayItem *pNextItem = pCurItem; + ME_Run *next_run = run; int nNextStart = nCurStart; WCHAR wNextChar; /* Check to see if next character is a whitespace */ if (flags & FR_WHOLEWORD) { - if (nCurStart + nMatched == pCurItem->member.run.len) + if (nCurStart + nMatched == run->len) { - pNextItem = ME_FindItemFwd(pCurItem, diRun); + next_run = run_next_all_paras( run ); nNextStart = -nMatched; } - if (pNextItem) - wNextChar = *get_text( &pNextItem->member.run, nNextStart + nMatched ); + if (next_run) + wNextChar = *get_text( next_run, nNextStart + nMatched ); else wNextChar = ' '; @@ -1971,22 +1971,28 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH TRACE("found at %d-%d\n", cursor.nOffset, cursor.nOffset + nLen); return cursor.nOffset; } - if (nCurStart + nMatched == pCurItem->member.run.len) + if (nCurStart + nMatched == run->len) { - pCurItem = ME_FindItemFwd(pCurItem, diRun); + run = run_next_all_paras( run ); nCurStart = -nMatched; } } - if (pCurItem) - wLastChar = *get_text( &pCurItem->member.run, nCurStart + nMatched ); + if (run) + wLastChar = *get_text( run, nCurStart + nMatched ); else wLastChar = ' '; cursor.nOffset++; if (cursor.nOffset == cursor.pRun->member.run.len) { - ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE); - cursor.nOffset = 0; + if (run_next_all_paras( &cursor.pRun->member.run )) + { + cursor.pRun = run_get_di( run_next_all_paras( &cursor.pRun->member.run ) ); + cursor.pPara = para_get_di( cursor.pRun->member.run.para ); + cursor.nOffset = 0; + } + else + cursor.pRun = NULL; } } } @@ -2003,19 +2009,20 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH while (cursor.pRun && ME_GetCursorOfs(&cursor) - nLen >= nMin) { - ME_DisplayItem *pCurItem = cursor.pRun; - ME_DisplayItem *pCurPara = cursor.pPara; + ME_Run *run = &cursor.pRun->member.run; + ME_Paragraph *para = &cursor.pPara->member.para; int nCurEnd = cursor.nOffset; int nMatched = 0; - if (nCurEnd == 0) + if (nCurEnd == 0 && run_prev_all_paras( run )) { - ME_PrevRun(&pCurPara, &pCurItem, TRUE); - nCurEnd = pCurItem->member.run.len; + run = run_prev_all_paras( run ); + para = run->para; + nCurEnd = run->len; } - while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurEnd - nMatched - 1 ), - text[nLen - nMatched - 1], (flags & FR_MATCHCASE) )) + while (run && ME_CharCompare( *get_text( run, nCurEnd - nMatched - 1 ), + text[nLen - nMatched - 1], (flags & FR_MATCHCASE) )) { if ((flags & FR_WHOLEWORD) && iswalnum(wLastChar)) break; @@ -2023,7 +2030,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH nMatched++; if (nMatched == nLen) { - ME_DisplayItem *pPrevItem = pCurItem; + ME_Run *prev_run = run; int nPrevEnd = nCurEnd; WCHAR wPrevChar; int nStart; @@ -2033,22 +2040,18 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH { if (nPrevEnd - nMatched == 0) { - pPrevItem = ME_FindItemBack(pCurItem, diRun); - if (pPrevItem) - nPrevEnd = pPrevItem->member.run.len + nMatched; + prev_run = run_prev_all_paras( run ); + if (prev_run) nPrevEnd = prev_run->len + nMatched; } - if (pPrevItem) - wPrevChar = *get_text( &pPrevItem->member.run, nPrevEnd - nMatched - 1 ); - else - wPrevChar = ' '; + if (prev_run) wPrevChar = *get_text( prev_run, nPrevEnd - nMatched - 1 ); + else wPrevChar = ' '; if (iswalnum(wPrevChar)) break; } - nStart = pCurPara->member.para.nCharOfs - + pCurItem->member.run.nCharOfs + nCurEnd - nMatched; + nStart = para->nCharOfs + run->nCharOfs + nCurEnd - nMatched; if (chrgText) { chrgText->cpMin = nStart; @@ -2059,22 +2062,32 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH } if (nCurEnd - nMatched == 0) { - ME_PrevRun(&pCurPara, &pCurItem, TRUE); + if (run_prev_all_paras( run )) + { + run = run_prev_all_paras( run ); + para = run->para; + } /* 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; + nCurEnd = run->len + nMatched; } } - if (pCurItem) - wLastChar = *get_text( &pCurItem->member.run, nCurEnd - nMatched - 1 ); + if (run) + wLastChar = *get_text( run, nCurEnd - nMatched - 1 ); else wLastChar = ' '; cursor.nOffset--; if (cursor.nOffset < 0) { - ME_PrevRun(&cursor.pPara, &cursor.pRun, TRUE); - cursor.nOffset = cursor.pRun->member.run.len; + if (run_prev_all_paras( &cursor.pRun->member.run ) ) + { + cursor.pRun = run_get_di( run_prev_all_paras( &cursor.pRun->member.run ) ); + cursor.pPara = para_get_di( cursor.pRun->member.run.para ); + cursor.nOffset = cursor.pRun->member.run.len; + } + else + cursor.pRun = NULL; } } } -- 2.23.0

1 0

[PATCH 4/5] riched20: Use a run ptr in the rtf row handler.
by Huw Davies 30 Oct '20

30 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 40282027dba..1f37258f345 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -987,7 +987,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) /* else fall through since v4.1 treats rtfNestRow and rtfRow the same */ case rtfRow: { - ME_DisplayItem *run; + ME_Run *run; ME_Paragraph *para; ME_Cell *cell; int i; @@ -1042,14 +1042,14 @@ void ME_RTFSpecialCharHook(RTF_Info *info) cell->nRightBoundary = tableDef->cells[i - 1].rightBoundary; } - run = ME_FindItemFwd( cell_get_di( cell) , diRun ); - if (info->editor->pCursors[0].pRun != run || + run = para_first_run( cell_first_para( cell ) ); + if (&info->editor->pCursors[0].pRun->member.run != run || info->editor->pCursors[0].nOffset) { int nOfs, nChars; /* Delete inserted cells that aren't defined. */ - info->editor->pCursors[1].pRun = run; - info->editor->pCursors[1].pPara = ME_GetParagraph(run); + info->editor->pCursors[1].pRun = run_get_di( run ); + info->editor->pCursors[1].pPara = para_get_di( run->para ); info->editor->pCursors[1].nOffset = 0; nOfs = ME_GetCursorOfs(&info->editor->pCursors[1]); nChars = ME_GetCursorOfs(&info->editor->pCursors[0]) - nOfs; -- 2.23.0

1 0

[PATCH 3/5] riched20: Use paragraph ptrs in the enter handler.
by Huw Davies 30 Oct '20

30 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 70 +++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2a3858ba038..40282027dba 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2484,7 +2484,7 @@ static BOOL handle_enter(ME_TextEditor *editor) static const WCHAR endl = '\r'; static const WCHAR endlv10[] = {'\r','\n'}; ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; + ME_Paragraph *para = &cursor.pPara->member.para; int from, to; ME_Style *style, *eop_style; @@ -2499,40 +2499,40 @@ static BOOL handle_enter(ME_TextEditor *editor) { if (!editor->bEmulateVersion10) /* v4.1 */ { - if (para->member.para.nFlags & MEPF_ROWEND) + if (para->nFlags & MEPF_ROWEND) { /* Add a new table row after this row. */ - para = para_get_di( table_append_row( editor, &para->member.para ) ); - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = table_append_row( editor, para ); + para = para_next( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return TRUE; } - else if (para == editor->pCursors[1].pPara && - cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && - para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) + else if (para == &editor->pCursors[1].pPara->member.para && + cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && + para_prev( para ) && para_prev( para )->nFlags & MEPF_ROWSTART && + !para_prev( para )->nCharOfs) { /* Insert a newline before the table. */ - para = para->member.para.prev_para; - para->member.para.nFlags &= ~MEPF_ROWSTART; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = para_prev( para ); + para->nFlags &= ~MEPF_ROWSTART; + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[1] = editor->pCursors[0]; ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - para = editor->pBuffer->pFirst->member.para.next_para; - editor_set_default_para_fmt( editor, &para->member.para.fmt ); - para->member.para.nFlags = 0; - para_mark_rewrap( editor, &para->member.para ); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].pRun->member.run.style); + para = editor_first_para( editor ); + editor_set_default_para_fmt( editor, &para->fmt ); + para->nFlags = 0; + para_mark_rewrap( editor, para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[1] = editor->pCursors[0]; - para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + para_next( para )->nFlags |= MEPF_ROWSTART; ME_CommitCoalescingUndo(editor); ME_UpdateRepaint(editor, FALSE); return TRUE; @@ -2540,17 +2540,17 @@ static BOOL handle_enter(ME_TextEditor *editor) } else /* v1.0 - 3.0 */ { - ME_DisplayItem *para = cursor.pPara; - if (ME_IsInTable(para)) + ME_Paragraph *para = &cursor.pPara->member.para; + if (para_in_table( para )) { if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) { if (from == to) { ME_ContinueCoalescingTransaction(editor); - para = para_get_di( table_append_row( editor, &para->member.para ) ); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = table_append_row( editor, para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_CommitCoalescingUndo(editor); @@ -2562,14 +2562,14 @@ static BOOL handle_enter(ME_TextEditor *editor) { ME_ContinueCoalescingTransaction(editor); if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - !ME_IsInTable(para->member.para.prev_para)) + para_prev( para ) && !para_in_table( para_prev( para ) )) { /* Insert newline before table */ - cursor.pRun = ME_FindItemBack(para, diRun); + cursor.pRun = run_get_di( para_end_run( para_prev( para ) ) ); if (cursor.pRun) { editor->pCursors[0].pRun = cursor.pRun; - editor->pCursors[0].pPara = para->member.para.prev_para; + editor->pCursors[0].pPara = para_get_di( para_prev( para ) ); } editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; @@ -2579,9 +2579,9 @@ static BOOL handle_enter(ME_TextEditor *editor) else { editor->pCursors[1] = editor->pCursors[0]; - para = para_get_di( table_append_row( editor, &para->member.para ) ); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = table_append_row( editor, para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; } @@ -2597,8 +2597,8 @@ static BOOL handle_enter(ME_TextEditor *editor) /* Normally the new eop style is the insert style, however in a list it is copied from the existing eop style (this prevents the list label style changing when the new eop is inserted). No extra ref is taken here on eop_style. */ - if (para->member.para.fmt.wNumbering) - eop_style = para->member.para.eop_run->style; + if (para->fmt.wNumbering) + eop_style = para->eop_run->style; else eop_style = style; ME_ContinueCoalescingTransaction(editor); -- 2.23.0

1 0

[PATCH 2/5] riched20: Use paragraph ptrs in the selection link check function.
by Huw Davies 30 Oct '20

30 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 057d5a31ce6..2a3858ba038 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2426,30 +2426,27 @@ ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) { - ME_DisplayItem *startPara, *endPara; - ME_DisplayItem *prev_para; - ME_Cursor *from, *to; - ME_Cursor start; - int nChars; + ME_Paragraph *start_para, *end_para; + ME_Cursor *from, *to, start; + int num_chars; if (!editor->AutoURLDetect_bEnable) return; ME_GetSelection(editor, &from, &to); /* Find paragraph previous to the one that contains start cursor */ - startPara = from->pPara; - prev_para = startPara->member.para.prev_para; - if (prev_para->type == diParagraph) startPara = prev_para; + start_para = &from->pPara->member.para; + if (para_prev( start_para )) start_para = para_prev( start_para ); /* Find paragraph that contains end cursor */ - endPara = to->pPara->member.para.next_para; + end_para = para_next( &to->pPara->member.para ); - start.pPara = startPara; - start.pRun = ME_FindItemFwd(startPara, diRun); + start.pPara = para_get_di( start_para ); + start.pRun = run_get_di( para_first_run( start_para ) ); start.nOffset = 0; - nChars = endPara->member.para.nCharOfs - startPara->member.para.nCharOfs; + num_chars = end_para->nCharOfs - start_para->nCharOfs; - ME_UpdateLinkAttribute(editor, &start, nChars); + ME_UpdateLinkAttribute( editor, &start, num_chars ); } static BOOL handle_enter(ME_TextEditor *editor) -- 2.23.0

1 0

[PATCH 1/5] riched20: Use a paragraph ptr in the stream in function.
by Huw Davies 30 Oct '20

30 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d1667dc9176..057d5a31ce6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1607,29 +1607,27 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_InternalDeleteText(editor, selStart, to - from, FALSE); /* Don't insert text at the end of the table row */ - if (!editor->bEmulateVersion10) { /* v4.1 */ - ME_DisplayItem *para = editor->pCursors->pPara; - if (para->member.para.nFlags & MEPF_ROWEND) - { - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - } - if (para->member.para.nFlags & MEPF_ROWSTART) + if (!editor->bEmulateVersion10) /* v4.1 */ + { + ME_Paragraph *para = &editor->pCursors->pPara->member.para; + if (para->nFlags & (MEPF_ROWSTART | MEPF_ROWEND)) { - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = para_next( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; } editor->pCursors[1] = editor->pCursors[0]; - } else { /* v1.0 - 3.0 */ + } + else /* v1.0 - 3.0 */ + { if (editor->pCursors[0].pRun->member.run.nFlags & MERF_ENDPARA && - ME_IsInTable(editor->pCursors[0].pRun)) + para_in_table( &editor->pCursors[0].pPara->member.para )) return 0; } - } else { + } + else + { style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); set_selection_cursors(editor, 0, 0); -- 2.23.0

1 0

[PATCH v5 1/5] comsvcs: Add ISharedPropertyGroupManager stub.
by Jactry Zeng 30 Oct '20

30 Oct '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- v5: No changes. v4: - Match argument names in .idl to the original. v3: - Make creation of group manager safe. v2: - Add CRITICAL_SECTION for struct group_manager; - Use DISPID_VALUE and DISPID_NEWENUM instead; - Improve tests. --- dlls/comsvcs/Makefile.in | 3 +- dlls/comsvcs/comsvcs_private.h | 38 ++++++++ dlls/comsvcs/main.c | 28 +++--- dlls/comsvcs/property.c | 163 +++++++++++++++++++++++++++++++++ dlls/comsvcs/tests/Makefile.in | 3 +- dlls/comsvcs/tests/property.c | 115 +++++++++++++++++++++++ include/comsvcs.idl | 65 +++++++++++++ 7 files changed, 401 insertions(+), 14 deletions(-) create mode 100644 dlls/comsvcs/comsvcs_private.h create mode 100644 dlls/comsvcs/property.c create mode 100644 dlls/comsvcs/tests/property.c diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 7845400cb2e..b4a4244bce8 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -5,7 +5,8 @@ IMPORTS = ole32 uuid EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c + main.c \ + property.c IDL_SRCS = \ comsvcs_classes.idl \ diff --git a/dlls/comsvcs/comsvcs_private.h b/dlls/comsvcs/comsvcs_private.h new file mode 100644 index 00000000000..6d299d3a881 --- /dev/null +++ b/dlls/comsvcs/comsvcs_private.h @@ -0,0 +1,38 @@ +/* + * Copyright 2020 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _COMSVCS_PRIVATE_H_ +#define _COMSVCS_PRIVATE_H_ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" +#include "comsvcs.h" +#include "initguid.h" + +#include "wine/heap.h" +#include "wine/debug.h" + +HRESULT WINAPI group_manager_create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **out); + +#endif diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 74704077ecb..b5ff952ad5b 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "rpcproxy.h" -#include "comsvcs.h" -#include "wine/heap.h" -#include "wine/debug.h" -#include "initguid.h" +#include "comsvcs_private.h" #include "comsvcs_classes.h" WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); @@ -1011,8 +1000,18 @@ static const IClassFactoryVtbl newmoniker_cf_vtbl = comsvcscf_LockServer }; +static const IClassFactoryVtbl group_manager_cf_vtbl = +{ + comsvcscf_QueryInterface, + comsvcscf_AddRef, + comsvcscf_Release, + group_manager_create, + comsvcscf_LockServer +}; + static IClassFactory DispenserManageFactory = { &comsvcscf_vtbl }; static IClassFactory NewMonikerFactory = { &newmoniker_cf_vtbl }; +static IClassFactory GroupManagerFactory = { &group_manager_cf_vtbl }; /****************************************************************** * DllGetClassObject @@ -1029,6 +1028,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) TRACE("(CLSID_NewMoniker %s %p)\n", debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&NewMonikerFactory, riid, ppv); } + else if (IsEqualGUID(&CLSID_SharedPropertyGroupManager, rclsid)) + { + TRACE("(CLSID_SharedPropertyGroupManager %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&GroupManagerFactory, riid, ppv); + } FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c new file mode 100644 index 00000000000..3c9917c926a --- /dev/null +++ b/dlls/comsvcs/property.c @@ -0,0 +1,163 @@ +/* + * Copyright 2020 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <comsvcs_private.h> + +WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); + +struct group_manager +{ + ISharedPropertyGroupManager ISharedPropertyGroupManager_iface; + LONG refcount; +}; + +static struct group_manager *group_manager = NULL; + +static inline struct group_manager *impl_from_ISharedPropertyGroupManager(ISharedPropertyGroupManager *iface) +{ + return CONTAINING_RECORD(iface, struct group_manager, ISharedPropertyGroupManager_iface); +} + +static HRESULT WINAPI group_manager_QueryInterface(ISharedPropertyGroupManager *iface, REFIID riid, void **out) +{ + struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); + + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDispatch) + || IsEqualGUID(riid, &IID_ISharedPropertyGroupManager)) + { + *out = &manager->ISharedPropertyGroupManager_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + WARN("%s not implemented.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI group_manager_AddRef(ISharedPropertyGroupManager *iface) +{ + struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); + ULONG refcount = InterlockedIncrement(&manager->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI group_manager_Release(ISharedPropertyGroupManager *iface) +{ + struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); + ULONG refcount = InterlockedDecrement(&manager->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static HRESULT WINAPI group_manager_GetTypeInfoCount(ISharedPropertyGroupManager *iface, UINT *info) +{ + FIXME("iface %p, info %p: stub.\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_GetTypeInfo(ISharedPropertyGroupManager *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("iface %p, index %u, lcid %u, info %p: stub.\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid) +{ + FIXME("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p: stub.\n", + iface, debugstr_guid(riid), names, count, lcid, dispid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_Invoke(ISharedPropertyGroupManager *iface, DISPID member, REFIID riid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr) +{ + FIXME("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p: stub.\n", + iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupManager *iface, BSTR name, LONG *isolation, + LONG *release, VARIANT_BOOL *exists, ISharedPropertyGroup **group) +{ + FIXME("iface %p, name %s, isolation %p, release %p, exists %p, group %p: stub.\n", + iface, debugstr_w(name), isolation, release, exists, group); + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_get_Group(ISharedPropertyGroupManager *iface, BSTR name, ISharedPropertyGroup **group) +{ + FIXME("iface %p, name %s, group %p: stub.\n", iface, debugstr_w(name), group); + return E_NOTIMPL; +} + +static HRESULT WINAPI group_manager_get__NewEnum(ISharedPropertyGroupManager *iface, IUnknown **retval) +{ + FIXME("iface %p, retval %p: stub.\n", iface, retval); + return E_NOTIMPL; +} + +static const ISharedPropertyGroupManagerVtbl group_manager_vtbl = +{ + group_manager_QueryInterface, + group_manager_AddRef, + group_manager_Release, + group_manager_GetTypeInfoCount, + group_manager_GetTypeInfo, + group_manager_GetIDsOfNames, + group_manager_Invoke, + group_manager_CreatePropertyGroup, + group_manager_get_Group, + group_manager_get__NewEnum +}; + +HRESULT WINAPI group_manager_create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **out) +{ + struct group_manager *manager; + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!group_manager) + { + manager = heap_alloc(sizeof(*manager)); + if (!manager) + { + *out = NULL; + return E_OUTOFMEMORY; + } + manager->ISharedPropertyGroupManager_iface.lpVtbl = &group_manager_vtbl; + manager->refcount = 1; + + if (InterlockedCompareExchangePointer((void **)&group_manager, manager, NULL)) + { + heap_free(manager); + } + } + return ISharedPropertyGroupManager_QueryInterface(&group_manager->ISharedPropertyGroupManager_iface, riid, out); +} diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in index 86da9fda662..1d9146ba5b6 100644 --- a/dlls/comsvcs/tests/Makefile.in +++ b/dlls/comsvcs/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = comsvcs.dll IMPORTS = uuid oleaut32 ole32 C_SRCS = \ - comsvcs.c + comsvcs.c \ + property.c diff --git a/dlls/comsvcs/tests/property.c b/dlls/comsvcs/tests/property.c new file mode 100644 index 00000000000..adad7bd5391 --- /dev/null +++ b/dlls/comsvcs/tests/property.c @@ -0,0 +1,115 @@ +/* + * Copyright 2020 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "comsvcs.h" + +#include "wine/test.h" + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + ok(0, "Unexpected call.\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + ok(0, "Unexpected call.\n"); + return 1; +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + ok(0, "Unexpected call.\n"); + return 0; +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_interfaces(void) +{ + ISharedPropertyGroupManager *manager, *manager1; + ULONG refcount, expected_refcount; + IDispatch *dispatch; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, &test_outer, CLSCTX_INPROC_SERVER, + &IID_ISharedPropertyGroupManager, (void **)&manager); + ok(hr == CLASS_E_NOAGGREGATION, "Got hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + expected_refcount = get_refcount(unk) + 1; + hr = IUnknown_QueryInterface(unk, &IID_ISharedPropertyGroupManager, (void **)&manager); + ok(hr == S_OK, "Got hr %#x.\n", hr); + refcount = get_refcount(unk); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + + expected_refcount = get_refcount(manager) + 1; + hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, NULL, CLSCTX_INPROC_SERVER, + &IID_ISharedPropertyGroupManager, (void **)&manager1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(manager1 == manager, "Got wrong pointer: %p.\n", manager1); + refcount = get_refcount(manager1); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + ISharedPropertyGroupManager_Release(manager1); + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void **)&dispatch); + ok(hr == S_OK, "Got hr %#x.\n", hr); + refcount = get_refcount(dispatch); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + + IDispatch_Release(dispatch); + IUnknown_Release(unk); + ISharedPropertyGroupManager_Release(manager); +} + +START_TEST(property) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +} diff --git a/include/comsvcs.idl b/include/comsvcs.idl index d64af1f5a85..ac50141174d 100644 --- a/include/comsvcs.idl +++ b/include/comsvcs.idl @@ -37,6 +37,8 @@ typedef DWORD_PTR TRANSID; ] library COMSVCSLib { + importlib("stdole2.tlb"); + [ object, hidden, @@ -96,4 +98,67 @@ library COMSVCSLib { [default] interface IDispenserManager; }; + + [ + object, + hidden, + local, + uuid(2a005c01-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedProperty : IDispatch + { + [id(DISPID_VALUE), propget] + HRESULT Value([out, retval] VARIANT *pVal); + [id(DISPID_VALUE), propput] + HRESULT Value([in] VARIANT val); + } + + [ + object, + hidden, + local, + uuid(2a005c07-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroup : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyByPosition([in] int Index, [out] VARIANT_BOOL *fExists, [out, retval] ISharedProperty **ppProp); + [id(0x00000002), propget] + HRESULT PropertyByPosition([in] int Index, [out, retval] ISharedProperty **ppProperty); + [id(0x00000003)] + HRESULT CreateProperty([in] BSTR Name, [out] VARIANT_BOOL *fExists, [out, retval] ISharedProperty **ppProp); + [id(0x00000004), propget] + HRESULT Property([in] BSTR Name, [out, retval] ISharedProperty **ppProperty); + } + + [ + object, + hidden, + local, + uuid(2a005c0d-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroupManager : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyGroup([in] BSTR Name, [in, out] LONG *dwIsoMode, [in, out] LONG *dwRelMode, + [out] VARIANT_BOOL *fExists, [out, retval] ISharedPropertyGroup **ppGroup); + [id(0x00000002), propget] + HRESULT Group([in] BSTR Name, [out, retval] ISharedPropertyGroup **ppGroup); + [id(DISPID_NEWENUM), propget] + HRESULT _NewEnum([out, retval] IUnknown **retval); + } + + [ + uuid(2a005c11-a5de-11cf-9e66-00aa00a3f464), + progid("MTxSpm.SharedPropertyGroupManager.1"), + vi_progid("MTxSpm.SharedPropertyGroupManager"), + threading(both) + ] + coclass SharedPropertyGroupManager + { + [default] interface ISharedPropertyGroupManager; + } } -- 2.28.0

2 9

[PATCH 1/2] winemac.drv: Send HTMENU instead of HTCAPTION to query window activation.
by Zhiyi Zhang 30 Oct '20

30 Oct '20

Equivalent of cfcc280905b7804efde8f42bcd6bddbe5ebd8cad for winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 066eb553f76..e7f5327fcdc 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2348,11 +2348,11 @@ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) if (can_activate_window(hwnd) && !(style & WS_MINIMIZE)) { - /* simulate a mouse click on the caption to find out + /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), - MAKELONG(HTCAPTION,WM_LBUTTONDOWN)); + MAKELONG(HTMENU, WM_LBUTTONDOWN)); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { TRACE("setting foreground window to %p\n", hwnd); -- 2.27.0

2 1

[PATCH 2/2] winex11.drv: Update a comment.
by Zhiyi Zhang 30 Oct '20

30 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 07f7a1ad502..d21d2a7fb1b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -702,7 +702,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (can_activate_window(hwnd)) { - /* simulate a mouse click on the caption to find out + /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ), -- 2.27.0

1 0