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

[PATCH 1/4] mfmediaengine: Keep "preload" property.
by Nikolay Sivov 02 Nov '20

02 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 22 ++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 9 ++++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index d93e2b2f38c..64f0ae6d2a1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -87,6 +87,7 @@ struct media_engine MF_MEDIA_ENGINE_ERR error_code; HRESULT extended_code; MF_MEDIA_ENGINE_READY ready_state; + MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; IMFSourceResolver *resolver; BSTR current_source; @@ -717,16 +718,29 @@ static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + MF_MEDIA_ENGINE_PRELOAD preload; + + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + preload = engine->preload; + LeaveCriticalSection(&engine->cs); - return MF_MEDIA_ENGINE_PRELOAD_NONE; + return preload; } static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_ENGINE_PRELOAD preload) { - FIXME("(%p, %d): stub.\n", iface, preload); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, preload); + + EnterCriticalSection(&engine->cs); + engine->preload = preload; + LeaveCriticalSection(&engine->cs); + + return S_OK; } static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **buffered) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 660e5b95331..0394bcf6a0e 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -265,17 +265,20 @@ todo_wine /* Preload mode is still accessible. */ state = IMFMediaEngine_GetPreload(media_engine); -todo_wine ok(!state, "Unexpected state %d.\n", state); hr = IMFMediaEngine_SetPreload(media_engine, MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetPreload(media_engine); -todo_wine ok(state == MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC, "Unexpected state %d.\n", state); + hr = IMFMediaEngine_SetPreload(media_engine, 100); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_GetPreload(media_engine); + ok(state == 100, "Unexpected state %d.\n", state); + hr = IMFMediaEngine_GetBuffered(media_engine, &time_range); todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -- 2.28.0

2 6

[PATCH 1/3] mfplat: Consider first type entry when returning major type for stream descriptors.
by Nikolay Sivov 02 Nov '20

02 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 6 ++---- dlls/mfplat/tests/mfplat.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index ccae999b7d7..0217237d85a 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2003,10 +2003,8 @@ static HRESULT WINAPI mediatype_handler_GetMajorType(IMFMediaTypeHandler *iface, TRACE("%p, %p.\n", iface, type); EnterCriticalSection(&stream_desc->attributes.cs); - if (stream_desc->current_type) - hr = IMFMediaType_GetGUID(stream_desc->current_type, &MF_MT_MAJOR_TYPE, type); - else - hr = MF_E_ATTRIBUTENOTFOUND; + hr = IMFMediaType_GetGUID(stream_desc->current_type ? stream_desc->current_type : + stream_desc->media_types[0], &MF_MT_MAJOR_TYPE, type); LeaveCriticalSection(&stream_desc->attributes.cs); return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fed6b392b21..a0789ee6b2c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3679,6 +3679,42 @@ static void test_stream_descriptor(void) IMFMediaTypeHandler_Release(type_handler); IMFStreamDescriptor_Release(stream_desc); + + /* Major type is returned for first entry. */ + hr = MFCreateMediaType(&media_types[0]); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFCreateMediaType(&media_types[1]); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_types[0], &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_types[1], &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateStreamDescriptor(0, 2, media_types, &stream_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamDescriptor_GetMediaTypeHandler(stream_desc, &type_handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &major_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&major_type, &MFMediaType_Audio), "Unexpected major type %s.\n", wine_dbgstr_guid(&major_type)); + + hr = IMFMediaType_SetGUID(media_types[0], &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_types[1], &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &major_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&major_type, &MFMediaType_Video), "Unexpected major type %s.\n", wine_dbgstr_guid(&major_type)); + + IMFMediaType_Release(media_types[0]); + IMFMediaType_Release(media_types[1]); + + IMFMediaTypeHandler_Release(type_handler); + IMFStreamDescriptor_Release(stream_desc); } static void test_MFCalculateImageSize(void) -- 2.28.0

1 2

[PATCH 5/5] riched20: Use run ptrs in the EM_GETLINECOUNT handler.
by Huw Davies 02 Nov '20

02 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c01bd873634..66f6bd5e114 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4291,27 +4291,24 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_GETLINECOUNT: { - ME_DisplayItem *item = editor->pBuffer->pLast; - int nRows = editor->total_rows; - ME_DisplayItem *prev_para = NULL, *last_para = NULL; - - last_para = ME_FindItemBack(item, diRun); - prev_para = ME_FindItemBack(last_para, diRun); - assert(last_para); - assert(last_para->member.run.nFlags & MERF_ENDPARA); - if (editor->bEmulateVersion10 && prev_para && - last_para->member.run.nCharOfs == 0 && - prev_para->member.run.len == 1 && - *get_text( &prev_para->member.run, 0 ) == '\r') + int count = editor->total_rows; + ME_Run *prev_run, *last_run; + + last_run = para_end_run( para_prev( editor_end_para( editor ) ) ); + prev_run = run_prev_all_paras( last_run ); + + if (editor->bEmulateVersion10 && prev_run && last_run->nCharOfs == 0 && + prev_run->len == 1 && *get_text( prev_run, 0 ) == '\r') { /* In 1.0 emulation, the last solitary \r at the very end of the text (if one exists) is NOT a line break. FIXME: this is an ugly hack. This should have a more regular model. */ - nRows--; + count--; } - TRACE("EM_GETLINECOUNT: nRows==%d\n", nRows); - return max(1, nRows); + count = max(1, count); + TRACE("EM_GETLINECOUNT: count==%d\n", count); + return count; } case EM_LINEFROMCHAR: { -- 2.23.0

1 0

[PATCH 4/5] riched20: Return a row ptr from the row from row number function.
by Huw Davies 02 Nov '20

02 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 48 ++++++++++++++++++++++++------------------ dlls/riched20/editor.h | 2 +- dlls/riched20/row.c | 42 +++++++++++++----------------------- 3 files changed, 43 insertions(+), 49 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 620cb4fedcb..c01bd873634 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4237,26 +4237,32 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_GETLINE: { - ME_DisplayItem *run; + ME_Row *row; + ME_Run *run; const unsigned int nMaxChars = *(WORD *) lParam; unsigned int nCharsLeft = nMaxChars; char *dest = (char *) lParam; BOOL wroteNull = FALSE; + ME_Cursor start, end; TRACE("EM_GETLINE: row=%d, nMaxChars=%d (%s)\n", (int) wParam, nMaxChars, unicode ? "Unicode" : "Ansi"); - run = ME_FindRowWithNumber(editor, wParam); - if (run == NULL) - return 0; + row = row_from_row_number( editor, wParam ); + if (row == NULL) return 0; - while (nCharsLeft && (run = ME_FindItemFwd(run, diRunOrStartRow)) - && run->type == diRun) + row_first_cursor( row, &start ); + row_end_cursor( row, &end, TRUE ); + run = &start.pRun->member.run; + while (nCharsLeft) { - WCHAR *str = get_text( &run->member.run, 0 ); + WCHAR *str; unsigned int nCopy; + int ofs = (run == &start.pRun->member.run) ? start.nOffset : 0; + int len = (run == &end.pRun->member.run) ? end.nOffset : run->len; - nCopy = min(nCharsLeft, run->member.run.len); + str = get_text( run, ofs ); + nCopy = min( nCharsLeft, len ); if (unicode) memcpy(dest, str, nCopy * sizeof(WCHAR)); @@ -4265,6 +4271,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, nCharsLeft, NULL, NULL); dest += nCopy * (unicode ? sizeof(WCHAR) : 1); nCharsLeft -= nCopy; + if (run == &end.pRun->member.run) break; + run = row_next_run( row, run ); } /* append line termination, space allowing */ @@ -4321,20 +4329,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINEINDEX: { - ME_DisplayItem *item, *para; - int nCharOfs; + ME_Row *row; + ME_Cursor cursor; + int ofs; - if (wParam == -1) - item = ME_FindItemBack(editor->pCursors[0].pRun, diStartRow); - else - item = ME_FindRowWithNumber(editor, wParam); - if (!item) - return -1; - para = ME_GetParagraph(item); - item = ME_FindItemFwd(item, diRun); - nCharOfs = para->member.para.nCharOfs + item->member.run.nCharOfs; - TRACE("EM_LINEINDEX: nCharOfs==%d\n", nCharOfs); - return nCharOfs; + if (wParam == -1) row = row_from_cursor( editor->pCursors ); + else row = row_from_row_number( editor, wParam ); + if (!row) return -1; + + row_first_cursor( row, &cursor ); + ofs = ME_GetCursorOfs( &cursor ); + TRACE( "EM_LINEINDEX: nCharOfs==%d\n", ofs ); + return ofs; } case EM_LINELENGTH: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 5f93aa39db9..d0d34ac5afc 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -115,11 +115,11 @@ void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) DECLSPEC void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; +ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) DECLSPEC_HIDDEN; /* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); */ -ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_HIDDEN; int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; static inline ME_DisplayItem *row_get_di( ME_Row *row ) { diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index ba082244cfc..2c77962b56b 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -82,39 +82,27 @@ void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) cursor->nOffset = (item->type == diStartRow || include_eop) ? cursor->pRun->member.run.len : 0; } -/* I'm sure these functions would simplify some code in caret ops etc, - * I just didn't remember them when I wrote that code - */ - ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) { return ME_FindItemBackOrHere(item, diStartRow); } -/* -ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item) { - ME_DisplayItem *item2 = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); - if (!item2) return NULL; - return ME_FindItemBack(item, diRun); -} -*/ - -ME_DisplayItem * -ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) +ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) { - ME_DisplayItem *item = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); - int nCount = 0; + ME_Paragraph *para = editor_first_para( editor ); + ME_Row *row; + int count = 0; - while (item->type == diParagraph && - nCount + item->member.para.nRows <= nRow) - { - nCount += item->member.para.nRows; - item = item->member.para.next_para; - } - if (item->type != diParagraph) - return NULL; - for (item = ME_FindItemFwd(item, diStartRow); item && nCount < nRow; nCount++) - item = ME_FindItemFwd(item, diStartRow); - return item; + while (para_next( para ) && count + para->nRows <= row_num) + { + count += para->nRows; + para = para_next( para ); + } + if (!para_next( para )) return NULL; + + for (row = para_first_row( para ); row && count < row_num; count++) + row = row_next( row ); + + return row; } -- 2.23.0

1 0

[PATCH 3/5] riched20: Use para and row ptrs in the EM_GETFIRSTVISIBLELINE handler.
by Huw Davies 02 Nov '20

02 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 38553f7add3..620cb4fedcb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4044,25 +4044,24 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return ((PARAFORMAT2 *)lParam)->dwMask; case EM_GETFIRSTVISIBLELINE: { - ME_DisplayItem *p = editor->pBuffer->pFirst; + ME_Paragraph *para = editor_first_para( editor ); + ME_Row *row; int y = editor->vert_si.nPos; - int ypara = 0; int count = 0; - int ystart, yend; - while(p) { - p = ME_FindItemFwd(p, diStartRowOrParagraphOrEnd); - if (p->type == diTextEnd) - break; - if (p->type == diParagraph) { - ypara = p->member.para.pt.y; - continue; - } - ystart = ypara + p->member.row.pt.y; - yend = ystart + p->member.row.nHeight; - if (y < yend) { - break; - } + + while (para_next( para )) + { + if (y < para->pt.y + para->nHeight) break; + count += para->nRows; + para = para_next( para ); + } + + row = para_first_row( para ); + while (row) + { + if (y < para->pt.y + row->pt.y + row->nHeight) break; count++; + row = row_next( row ); } return count; } -- 2.23.0

1 0

[PATCH 2/5] riched20: Use a run ptr in the link notify function.
by Huw Davies 02 Nov '20

02 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b54b9334265..38553f7add3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3451,8 +3451,9 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM int x,y; BOOL isExact; ME_Cursor cursor; /* The start of the clicked text. */ - + ME_Run *run; ENLINK info; + x = (short)LOWORD(lParam); y = (short)HIWORD(lParam); ME_CharFromPos(editor, x, y, &cursor, &isExact); @@ -3460,8 +3461,6 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM if (is_link( &cursor.pRun->member.run )) { /* The clicked run has CFE_LINK set */ - ME_DisplayItem *di; - info.nmhdr.hwndFrom = NULL; info.nmhdr.idFrom = 0; info.nmhdr.code = EN_LINK; @@ -3472,15 +3471,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); - di = cursor.pRun; - while (ME_PrevRun( NULL, &di, FALSE ) && is_link( &di->member.run )) - info.chrg.cpMin -= di->member.run.len; + run = &cursor.pRun->member.run; + while ((run = run_prev( run )) && is_link( run )) + info.chrg.cpMin -= run->len; /* find the last contiguous run with CFE_LINK set */ info.chrg.cpMax = ME_GetCursorOfs(&cursor) + cursor.pRun->member.run.len; - di = cursor.pRun; - while (ME_NextRun( NULL, &di, FALSE ) && is_link( &di->member.run )) - info.chrg.cpMax += di->member.run.len; + run = &cursor.pRun->member.run; + while ((run = run_next( run )) && is_link( run )) + info.chrg.cpMax += run->len; ITextHost_TxNotify(editor->texthost, info.nmhdr.code, &info); } -- 2.23.0

1 0

[PATCH 1/5] riched20: Use paragraph ptrs in the WM_CHAR handler.
by Huw Davies 02 Nov '20

02 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 46 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c1138bd1dab..b54b9334265 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -897,13 +897,13 @@ void ME_RTFTblAttrHook(RTF_Info *info) if (cellNum >= MAX_TABLE_CELLS) break; info->tableDef->cells[cellNum].rightBoundary = info->rtfParam; - if (cellNum < MAX_TAB_STOPS) { + if (cellNum < MAX_TAB_STOPS) + { /* Tab stops were used to store cell positions before v4.1 but v4.1 * still seems to set the tabstops without using them. */ - ME_DisplayItem *para = info->editor->pCursors[0].pPara; - PARAFORMAT2 *pFmt = &para->member.para.fmt; - pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF; - pFmt->rgxTabs[cellNum] |= 0x00FFFFFF & info->rtfParam; + PARAFORMAT2 *fmt = &info->editor->pCursors[0].pPara->member.para.fmt; + fmt->rgxTabs[cellNum] &= ~0x00FFFFFF; + fmt->rgxTabs[cellNum] |= 0x00FFFFFF & info->rtfParam; } info->tableDef->numCellsDefined++; break; @@ -2795,7 +2795,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, if ((unsigned)wstr >= ' ' || wstr == '\t') { ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; + ME_Paragraph *para = &cursor.pPara->member.para; int from, to; BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; ME_GetSelectionOfs(editor, &from, &to); @@ -2803,38 +2803,40 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, /* v4.1 allows tabs to be inserted with ctrl key down */ !(ctrl_is_down && !editor->bEmulateVersion10)) { - ME_DisplayItem *para; BOOL selected_row = FALSE; - para = cursor.pPara; if (ME_IsSelection(editor) && cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - to == ME_GetCursorOfs(&editor->pCursors[0]) && - para->member.para.prev_para->type == diParagraph) + to == ME_GetCursorOfs(&editor->pCursors[0]) && para_prev( para )) { - para = para->member.para.prev_para; + para = para_prev( para ); selected_row = TRUE; } - if (ME_IsInTable(para)) + if (para_in_table( para )) { table_handle_tab( editor, selected_row ); ME_CommitUndo(editor); return 0; } - } else if (!editor->bEmulateVersion10) { /* v4.1 */ - if (para->member.para.nFlags & MEPF_ROWEND) { - if (from == to) { - para = para->member.para.next_para; - if (para->member.para.nFlags & MEPF_ROWSTART) - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + } + else if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (para->nFlags & MEPF_ROWEND) + { + if (from == to) + { + para = para_next( para ); + if (para->nFlags & MEPF_ROWSTART) 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 */ - if (ME_IsInTable(cursor.pRun) && + } + else /* v1.0 - 3.0 */ + { + if (para_in_table( para ) && cursor.pRun->member.run.nFlags & MERF_ENDPARA && from == to) { -- 2.23.0

1 0

[PATCH 2/2] appwiz.cpl: Use zero terminated wide-char strings.
by Michael Stefaniuc 01 Nov '20

01 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index dd53d9e282e..67d61ea0d22 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -598,21 +598,18 @@ static IInternetBindInfo InstallCallbackBindInfo = { &InstallCallbackBindInfoVtb static void append_url_params( WCHAR *url ) { - static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; - static const WCHAR v_formatW[] = {'&','v','='}; - static const WCHAR winevW[] = {'&','w','i','n','e','v','='}; DWORD size = INTERNET_MAX_URL_LENGTH * sizeof(WCHAR); DWORD len = lstrlenW(url); - memcpy(url+len, arch_formatW, sizeof(arch_formatW)); - len += ARRAY_SIZE(arch_formatW); + lstrcpyW(url+len, L"?arch="); + len += lstrlenW(L"?arch="); len += MultiByteToWideChar(CP_ACP, 0, GECKO_ARCH, sizeof(GECKO_ARCH), url+len, size/sizeof(WCHAR)-len)-1; - memcpy(url+len, v_formatW, sizeof(v_formatW)); - len += ARRAY_SIZE(v_formatW); + lstrcpyW(url+len, L"&v="); + len += lstrlenW(L"&v="); len += MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len)-1; - memcpy(url+len, winevW, sizeof(winevW)); - len += ARRAY_SIZE(winevW); + lstrcpyW(url+len, L"&winev="); + len += lstrlenW(L"&winev="); MultiByteToWideChar(CP_ACP, 0, wine_get_version(), -1, url+len, size/sizeof(WCHAR)-len); } -- 2.26.2

1 0

[PATCH 1/2] appwiz.cpl: Use wide-char string literals.
by Michael Stefaniuc 01 Nov '20

01 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 52 +++++++--------------- dlls/appwiz.cpl/appwiz.c | 96 +++++++++++++--------------------------- 2 files changed, 48 insertions(+), 100 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 346411867c6..dd53d9e282e 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -109,14 +109,9 @@ static LPWSTR url = NULL; static IBinding *dwl_binding; static WCHAR *msi_file; -static const WCHAR winehomedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0}; -static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; -static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; - extern const char * CDECL wine_get_version(void); static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); -static const WCHAR kernel32_dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; static BOOL sha_check(const WCHAR *file_name) { @@ -187,14 +182,11 @@ enum install_res { static enum install_res install_file(const WCHAR *file_name) { - static const WCHAR update_cmd[] = { - 'R','E','I','N','S','T','A','L','L','=','A','L','L',' ', - 'R','E','I','N','S','T','A','L','L','M','O','D','E','=','v','o','m','u','s',0}; ULONG res; res = MsiInstallProductW(file_name, NULL); if(res == ERROR_PRODUCT_VERSION) - res = MsiInstallProductW(file_name, update_cmd); + res = MsiInstallProductW(file_name, L"REINSTALL=ALL REINSTALLMODE=vomus"); if(res != ERROR_SUCCESS) { ERR("MsiInstallProduct failed: %u\n", res); return INSTALL_FAILED; @@ -252,10 +244,8 @@ static HKEY open_config_key(void) HKEY hkey, ret; DWORD res; - static const WCHAR wine_keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; - /* @@ Wine registry key: HKCU\Software\Wine\$config_key */ - res = RegOpenKeyW(HKEY_CURRENT_USER, wine_keyW, &hkey); + res = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Wine", &hkey); if(res != ERROR_SUCCESS) return NULL; @@ -298,19 +288,18 @@ static enum install_res install_from_registered_dir(void) static enum install_res install_from_default_dir(void) { - static const WCHAR dotdotW[] = {'\\','.','.','\\',0}; const WCHAR *package_dir; WCHAR *dir_buf = NULL; enum install_res ret = INSTALL_NEXT; - if ((package_dir = _wgetenv( winebuilddirW ))) + if ((package_dir = _wgetenv( L"WINEBUILDDIR" ))) { - dir_buf = heap_alloc( lstrlenW(package_dir) * sizeof(WCHAR) + sizeof(dotdotW)); + dir_buf = heap_alloc( lstrlenW(package_dir) * sizeof(WCHAR) + sizeof(L"\\..\\") ); lstrcpyW( dir_buf, package_dir ); - lstrcatW( dir_buf, dotdotW ); + lstrcatW( dir_buf, L"\\..\\" ); package_dir = dir_buf; } - else package_dir = _wgetenv( winedatadirW ); + else package_dir = _wgetenv( L"WINEDATADIR" ); if (package_dir) { @@ -329,8 +318,6 @@ static enum install_res install_from_default_dir(void) static WCHAR *get_cache_file_name(BOOL ensure_exists) { - static const WCHAR cacheW[] = {'\\','.','c','a','c','h','e',0}; - static const WCHAR wineW[] = {'\\','w','i','n','e',0}; const char *xdg_dir; const WCHAR *home_dir; WCHAR *cache_dir, *ret; @@ -341,11 +328,11 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) { if (!(cache_dir = p_wine_get_dos_file_name( xdg_dir ))) return NULL; } - else if ((home_dir = _wgetenv( winehomedirW ))) + else if ((home_dir = _wgetenv( L"WINEHOMEDIR" ))) { - if (!(cache_dir = heap_alloc( lstrlenW(home_dir) * sizeof(WCHAR) + sizeof(cacheW) ))) return NULL; + if (!(cache_dir = heap_alloc( lstrlenW(home_dir) * sizeof(WCHAR) + sizeof(L"\\.cache") ))) return NULL; lstrcpyW( cache_dir, home_dir ); - lstrcatW( cache_dir, cacheW ); + lstrcatW( cache_dir, L"\\.cache" ); cache_dir[1] = '\\'; /* change \??\ into \\?\ */ } else return NULL; @@ -357,14 +344,14 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) return NULL; } - size = lstrlenW( cache_dir ) + ARRAY_SIZE(wineW) + lstrlenW( addon->file_name ) + 1; + size = lstrlenW( cache_dir ) + ARRAY_SIZE(L"\\wine") + lstrlenW( addon->file_name ) + 1; if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) { heap_free( cache_dir ); return NULL; } lstrcpyW( ret, cache_dir ); - lstrcatW( ret, wineW ); + lstrcatW( ret, L"\\wine" ); heap_free( cache_dir ); if (ensure_exists && !CreateDirectoryW( ret, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) @@ -583,18 +570,15 @@ static HRESULT WINAPI InstallCallbackBindInfo_GetBindInfo(IInternetBindInfo *ifa static HRESULT WINAPI InstallCallbackBindInfo_GetBindString(IInternetBindInfo *iface, ULONG string_type, WCHAR **strs, ULONG cnt, ULONG *fetched) { - static const WCHAR wine_addon_downloaderW[] = - {'W','i','n','e',' ','A','d','d','o','n',' ','D','o','w','n','l','o','a','d','e','r',0}; - switch(string_type) { case BINDSTRING_USER_AGENT: TRACE("BINDSTRING_USER_AGENT\n"); - *strs = CoTaskMemAlloc(sizeof(wine_addon_downloaderW)); + *strs = CoTaskMemAlloc(sizeof(L"Wine Addon Downloader")); if(!*strs) return E_OUTOFMEMORY; - memcpy(*strs, wine_addon_downloaderW, sizeof(wine_addon_downloaderW)); + lstrcpyW(*strs, L"Wine Addon Downloader"); *fetched = 1; return S_OK; } @@ -698,13 +682,11 @@ static void run_winebrowser(const WCHAR *url) WCHAR *args; BOOL ret; - static const WCHAR winebrowserW[] = {'\\','w','i','n','e','b','r','o','w','s','e','r','.','e','x','e',0}; - url_len = lstrlenW(url); - len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(winebrowserW)); - memcpy(app+len, winebrowserW, sizeof(winebrowserW)); - len += ARRAY_SIZE(winebrowserW) - 1; + len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(L"\\winebrowser.exe")); + lstrcpyW(app+len, L"\\winebrowser.exe"); + len += ARRAY_SIZE(L"\\winebrowser.exe") - 1; args = heap_alloc((len+1+url_len)*sizeof(WCHAR)); if(!args) @@ -771,7 +753,7 @@ BOOL install_addon(addon_t addon_type) addon = addons_info+addon_type; - p_wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32_dllW), "wine_get_dos_file_name"); + p_wine_get_dos_file_name = (void *)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "wine_get_dos_file_name"); /* * Try to find addon .msi file in following order: diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index b295e40b2f4..2bc108b63c6 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -80,32 +80,7 @@ HINSTANCE hInst; static WCHAR btnRemove[MAX_STRING_LEN]; static WCHAR btnModifyRemove[MAX_STRING_LEN]; -static const WCHAR openW[] = {'o','p','e','n',0}; - -/* names of registry keys */ -static const WCHAR BackSlashW[] = { '\\', 0 }; -static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; -static const WCHAR DisplayIconW[] = {'D','i','s','p','l','a','y','I','c','o','n',0}; -static const WCHAR DisplayVersionW[] = {'D','i','s','p','l','a','y','V','e','r','s','i','o','n',0}; -static const WCHAR PublisherW[] = {'P','u','b','l','i','s','h','e','r',0}; -static const WCHAR ContactW[] = {'C','o','n','t','a','c','t',0}; -static const WCHAR HelpLinkW[] = {'H','e','l','p','L','i','n','k',0}; -static const WCHAR HelpTelephoneW[] = {'H','e','l','p','T','e','l','e','p','h','o','n','e',0}; -static const WCHAR ModifyPathW[] = {'M','o','d','i','f','y','P','a','t','h',0}; -static const WCHAR NoModifyW[] = {'N','o','M','o','d','i','f','y',0}; -static const WCHAR ReadmeW[] = {'R','e','a','d','m','e',0}; -static const WCHAR URLUpdateInfoW[] = {'U','R','L','U','p','d','a','t','e','I','n','f','o',0}; -static const WCHAR CommentsW[] = {'C','o','m','m','e','n','t','s',0}; -static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l','S','t','r','i','n','g',0}; -static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; -static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; - -static const WCHAR PathUninstallW[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'U','n','i','n','s','t','a','l','l',0 }; +static const WCHAR PathUninstallW[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"; /****************************************************************************** * Name : DllMain @@ -184,7 +159,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) { RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); size = sizeof(value); - if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &dwType, (LPBYTE)&value, &size) + if (!RegQueryValueExW(hkeyApp, L"SystemComponent", NULL, &dwType, (BYTE *)&value, &size) && dwType == REG_DWORD && value == 1) { RegCloseKey(hkeyApp); @@ -193,22 +168,21 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) } displen = 0; uninstlen = 0; - if (!RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen)) + if (!RegQueryValueExW(hkeyApp, L"DisplayName", 0, 0, NULL, &displen)) { size = sizeof(value); - if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, (LPBYTE)&value, &size) + if (!RegQueryValueExW(hkeyApp, L"WindowsInstaller", NULL, &dwType, (BYTE *)&value, &size) && dwType == REG_DWORD && value == 1) { - static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; - int len = lstrlenW(fmtW) + lstrlenW(subKeyName); + int len = lstrlenW(L"msiexec /x%s") + lstrlenW(subKeyName); if (!(command = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto err; - wsprintfW(command, fmtW, subKeyName); + wsprintfW(command, L"msiexec /x%s", subKeyName); } - else if (!RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, NULL, &uninstlen)) + else if (!RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, NULL, &uninstlen)) { if (!(command = HeapAlloc(GetProcessHeap(), 0, uninstlen))) goto err; - RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)command, &uninstlen); + RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, (BYTE *)command, &uninstlen); } else { @@ -225,12 +199,11 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) if (!info->title) goto err; - RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, (LPBYTE)info->title, - &displen); + RegQueryValueExW(hkeyApp, L"DisplayName", 0, 0, (BYTE *)info->title, &displen); /* now get DisplayIcon */ displen = 0; - RegQueryValueExW(hkeyApp, DisplayIconW, 0, 0, NULL, &displen); + RegQueryValueExW(hkeyApp, L"DisplayIcon", 0, 0, NULL, &displen); if (displen == 0) info->icon = 0; @@ -241,8 +214,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) if (!info->icon) goto err; - RegQueryValueExW(hkeyApp, DisplayIconW, 0, 0, (LPBYTE)info->icon, - &displen); + RegQueryValueExW(hkeyApp, L"DisplayIcon", 0, 0, (BYTE *)info->icon, &displen); /* separate the index from the icon name, if supplied */ iconPtr = wcschr(info->icon, ','); @@ -254,21 +226,21 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) } } - info->publisher = get_reg_str(hkeyApp, PublisherW); - info->version = get_reg_str(hkeyApp, DisplayVersionW); - info->contact = get_reg_str(hkeyApp, ContactW); - info->helplink = get_reg_str(hkeyApp, HelpLinkW); - info->helptelephone = get_reg_str(hkeyApp, HelpTelephoneW); - info->readme = get_reg_str(hkeyApp, ReadmeW); - info->urlupdateinfo = get_reg_str(hkeyApp, URLUpdateInfoW); - info->comments = get_reg_str(hkeyApp, CommentsW); + info->publisher = get_reg_str(hkeyApp, L"Publisher"); + info->version = get_reg_str(hkeyApp, L"DisplayVersion"); + info->contact = get_reg_str(hkeyApp, L"Contact"); + info->helplink = get_reg_str(hkeyApp, L"HelpLink"); + info->helptelephone = get_reg_str(hkeyApp, L"HelpTelephone"); + info->readme = get_reg_str(hkeyApp, L"Readme"); + info->urlupdateinfo = get_reg_str(hkeyApp, L"URLUpdateInfo"); + info->comments = get_reg_str(hkeyApp, L"Comments"); /* Check if NoModify is set */ dwType = REG_DWORD; dwNoModify = 0; displen = sizeof(DWORD); - if (RegQueryValueExW(hkeyApp, NoModifyW, NULL, &dwType, (LPBYTE)&dwNoModify, &displen) + if (RegQueryValueExW(hkeyApp, L"NoModify", NULL, &dwType, (BYTE *)&dwNoModify, &displen) != ERROR_SUCCESS) { dwNoModify = 0; @@ -282,19 +254,18 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) if (!dwNoModify) { size = sizeof(value); - if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, (LPBYTE)&value, &size) + if (!RegQueryValueExW(hkeyApp, L"WindowsInstaller", NULL, &dwType, (BYTE *)&value, &size) && dwType == REG_DWORD && value == 1) { - static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','i','%','s',0}; - int len = lstrlenW(fmtW) + lstrlenW(subKeyName); + int len = lstrlenW(L"msiexec /i%s") + lstrlenW(subKeyName); if (!(info->path_modify = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto err; - wsprintfW(info->path_modify, fmtW, subKeyName); + wsprintfW(info->path_modify, L"msiexec /i%s", subKeyName); } - else if (!RegQueryValueExW(hkeyApp, ModifyPathW, 0, 0, NULL, &displen)) + else if (!RegQueryValueExW(hkeyApp, L"ModifyPath", 0, 0, NULL, &displen)) { if (!(info->path_modify = HeapAlloc(GetProcessHeap(), 0, displen))) goto err; - RegQueryValueExW(hkeyApp, ModifyPathW, 0, 0, (LPBYTE)info->path_modify, &displen); + RegQueryValueExW(hkeyApp, L"ModifyPath", 0, 0, (BYTE *)info->path_modify, &displen); } } @@ -440,8 +411,6 @@ static void UpdateButtons(HWND hWnd) */ static void InstallProgram(HWND hWnd) { - static const WCHAR filters[] = {'%','s','%','c','*','i','n','s','t','a','l','*','.','e','x','e',';','*','s','e','t','u','p','*','.','e','x','e',';','*','.','m','s','i','%','c','%','s','%','c','*','.','e','x','e','%','c','%','s','%','c','*','.','*','%','c',0} -; OPENFILENAMEW ofn; WCHAR titleW[MAX_STRING_LEN]; WCHAR filter_installs[MAX_STRING_LEN]; @@ -455,8 +424,8 @@ static void InstallProgram(HWND hWnd) LoadStringW(hInst, IDS_FILTER_PROGRAMS, filter_programs, ARRAY_SIZE(filter_programs)); LoadStringW(hInst, IDS_FILTER_ALL, filter_all, ARRAY_SIZE(filter_all)); - swprintf( FilterBufferW, MAX_PATH, filters, filter_installs, 0, 0, - filter_programs, 0, 0, filter_all, 0, 0 ); + swprintf( FilterBufferW, MAX_PATH, L"%s%c*instal*.exe;*setup*.exe;*.msi%c%s%c*.exe%c%s%c*.*%c", + filter_installs, 0, 0, filter_programs, 0, 0, filter_all, 0, 0 ); memset(&ofn, 0, sizeof(OPENFILENAMEW)); ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.hwndOwner = hWnd; @@ -476,7 +445,7 @@ static void InstallProgram(HWND hWnd) SHELLEXECUTEINFOW sei; memset(&sei, 0, sizeof(sei)); sei.cbSize = sizeof(sei); - sei.lpVerb = openW; + sei.lpVerb = L"open"; sei.nShow = SW_SHOWDEFAULT; sei.fMask = 0; sei.lpFile = ofn.lpstrFile; @@ -609,7 +578,7 @@ static INT_PTR CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, L if (iter->id == (int) lParam) { lstrcpyW(key, PathUninstallW); - lstrcatW(key, BackSlashW); + lstrcatW(key, L"\\"); lstrcatW(key, iter->regkey); /* check the application's registry entries */ @@ -959,18 +928,15 @@ static void StartApplet(HWND hWnd) static LONG start_params(const WCHAR *params) { - static const WCHAR install_geckoW[] = {'i','n','s','t','a','l','l','_','g','e','c','k','o',0}; - static const WCHAR install_monoW[] = {'i','n','s','t','a','l','l','_','m','o','n','o',0}; - if(!params) return FALSE; - if(!wcscmp(params, install_geckoW)) { + if(!wcscmp(params, L"install_gecko")) { install_addon(ADDON_GECKO); return TRUE; } - if(!wcscmp(params, install_monoW)) { + if(!wcscmp(params, L"install_mono")) { install_addon(ADDON_MONO); return TRUE; } -- 2.26.2

1 0

[PATCH] oleaut32: IFont never had an IPersistStreamInit interface.
by Damjan Jovanovic 01 Nov '20

01 Nov '20

As Nikolay Sivov incidentally noted in https://bugs.winehq.org/show_bug.cgi?id=23726#c29 the IPersistStreamInit interface on IFont "is not supported on anything newer and including XP." It is a E_NOINTERFACE on 95, 98, Me and NT4 as well. It never existed on any version of Windows, and we never should have had it either. It was added in error by commit d0372b4e6ea420eadcdfcb93f3d0706284adbb69. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/oleaut32/olefont.c | 91 ----------------------------------- dlls/oleaut32/tests/olefont.c | 5 ++ 2 files changed, 5 insertions(+), 91 deletions(-)

1 0